summaryrefslogtreecommitdiffhomepage
path: root/subr
diff options
context:
space:
mode:
Diffstat (limited to 'subr')
-rw-r--r--subr/pkg_autoconf.subr36
-rw-r--r--subr/pkg_configure.subr2
-rw-r--r--subr/pkg_setup_env.subr2
3 files changed, 22 insertions, 18 deletions
diff --git a/subr/pkg_autoconf.subr b/subr/pkg_autoconf.subr
index 981dae74..e8bf0572 100644
--- a/subr/pkg_autoconf.subr
+++ b/subr/pkg_autoconf.subr
@@ -15,22 +15,26 @@ pkg_autoconf() {
-exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;;
if [ -e "${WORKDIR}/${PKG_SUBDIR}/configure.ac" ]\
&& [ ! -e "${WORKDIR}/${PKG_SUBDIR}/configure" ]; then
- if [ -e "${WORKDIR}/${PKG_SUBDIR}/autogen.sh" ]; then
- for __ in "${WORKDIR}/${PKG_SUBDIR}/build-aux" "${WORKDIR}/${PKG_SUBDIR}"; do
- if [ -e "${__}" ]; then
- echo install -m 0700 \
- "${MIDIPIX_BUILD_PWD}/etc/config.sub" \
- "${__}/config.sub";
- install -m 0700 \
- "${MIDIPIX_BUILD_PWD}/etc/config.sub" \
- "${__}/config.sub";
- break;
- fi;
- done;
- (build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && "${SHELL}" ./autogen.sh) || exit 1;
- else
- (build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && autoconf) || exit 1;
- fi;
+ for __ in bootstrap autogen.sh ""; do
+ if [ -z "${__}" ]; then
+ (build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && autoconf)\
+ || exit 1 && break;
+ elif [ -e "${WORKDIR}/${PKG_SUBDIR}/${__}" ]; then
+ for ___ in "${WORKDIR}/${PKG_SUBDIR}/build-aux" "${WORKDIR}/${PKG_SUBDIR}"; do
+ if [ -e "${___}" ]; then
+ echo install -m 0700 \
+ "${MIDIPIX_BUILD_PWD}/etc/config.sub" \
+ "${___}/config.sub";
+ install -m 0700 \
+ "${MIDIPIX_BUILD_PWD}/etc/config.sub" \
+ "${___}/config.sub";
+ break;
+ fi;
+ done;
+ (build_fileop cd "${WORKDIR}/${PKG_SUBDIR}" && "${SHELL}" "${__}")\
+ || exit 1 && break;
+ fi;
+ done;
fi;
for __ in ${PKG_BUILD_DIR} ${PKG_CONFIG_CACHE_EXTRA}; do
build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${WORKDIR}/${__}/";
diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr
index 1d53d8b6..f876e1e3 100644
--- a/subr/pkg_configure.subr
+++ b/subr/pkg_configure.subr
@@ -9,8 +9,8 @@ pkg_configure() {
PKG_CONFIGURE="${WORKDIR}/${PKG_SUBDIR}/configure";
fi;
if [ -x "${PKG_CONFIGURE}" ]; then
- export CFLAGS_FOR_BUILD="${HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT}";
CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \
LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \
${PKG_CONFIGURE} \
${PKG_CONFIGURE_ARGS} ${PKG_CONFIGURE_ARGS_EXTRA} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG};
diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr
index 83c24117..fb7b4566 100644
--- a/subr/pkg_setup_env.subr
+++ b/subr/pkg_setup_env.subr
@@ -22,7 +22,7 @@ pkg_setup_env() {
else
[ -n "${PKG_ENV_VARS_EXTRA}" ] && set_env_vars_with_sep : "${PKG_ENV_VARS_EXTRA}";
[ -z "${PKG_FNAME}" ] && PKG_FNAME="${PKG_URL##*/}";
- [ -z "${PKG_SUBDIR}" ] && PKG_SUBDIR="${PKG_FNAME%%.tar*}";
+ [ -z "${PKG_SUBDIR}" ] && PKG_SUBDIR="${PKG_FNAME%%.t*}";
[ -z "${PKG_TARGET}" ] && PKG_TARGET="${TARGET}";
[ -z "${MIDIPIX_BUILD_PWD}" ] && MIDIPIX_BUILD_PWD="$(pwd)";
if [ -z "${PKG_BUILD_DIR}" ]; then