summaryrefslogtreecommitdiffhomepage
path: root/subr.pkg/pkg_configure.subr
diff options
context:
space:
mode:
authorLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2023-03-23 14:52:54 +0100
committerLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2023-03-23 14:52:54 +0100
commit1cbe2029e27bcfbce4f99c5788b66268255a1973 (patch)
tree00376904e65a374bc81f70571506353865922120 /subr.pkg/pkg_configure.subr
parent9d89ab1d6353b19702de400c940acbbf649e5206 (diff)
downloadmidipix_build-1cbe2029e27bcfbce4f99c5788b66268255a1973.tar.bz2
midipix_build-1cbe2029e27bcfbce4f99c5788b66268255a1973.tar.xz
Implements ccache integration, pt. II.
Diffstat (limited to 'subr.pkg/pkg_configure.subr')
-rw-r--r--subr.pkg/pkg_configure.subr49
1 files changed, 38 insertions, 11 deletions
diff --git a/subr.pkg/pkg_configure.subr b/subr.pkg/pkg_configure.subr
index 743ab9d6..5403caea 100644
--- a/subr.pkg/pkg_configure.subr
+++ b/subr.pkg/pkg_configure.subr
@@ -25,15 +25,43 @@ pkgp_configure_autotools() {
PYTHON "${PKG_PYTHON:-}" \
${_ppca_libtool:+MAKE} ${_ppca_libtool:+"make LIBTOOL=${_ppca_libtool}"};
- AR="${PKG_AR}" \
- CC="${PKG_CC}" \
- RANLIB="${PKG_RANLIB}" \
- CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
- CPPFLAGS="${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:-};
- _ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+ if [ "${PKG_CONFIGURE_ARGS_LIST:+1}" = 1 ]; then
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CPPFLAGS="${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}}" \
+ rtl_run_cmdlineV ":" "${PKG_CONFIGURE}" \
+ "${PKG_CONFIGURE_ARGS_LIST:-}" \
+ "${PKG_CONFIGURE_ARGS_EXTRA_LIST:-}";
+ _ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+ elif [ "${PKG_CONFIGURE_ARGS_EXTRA_LIST:+1}" = 1 ]; then
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CPPFLAGS="${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}}" \
+ rtl_run_cmdlineV ":" "${PKG_CONFIGURE}" \
+ ${PKG_CONFIGURE_ARGS:-} \
+ "${PKG_CONFIGURE_ARGS_EXTRA_LIST:-}";
+ _ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+ else
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CPPFLAGS="${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:-};
+ _ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+ fi;
rtl_export_vars -u \
PKG_CONFIG "${PKG_PKG_CONFIG:-}" \
@@ -177,8 +205,7 @@ pkgp_configure_sofort() {
RANLIB="${PKG_RANLIB}" \
"${PKG_CONFIGURE}" \
${PKG_CONFIGURE_ARGS:-} \
- ${PKG_CONFIGURE_ARGS_EXTRA:-} \
- ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG:-};
+ ${PKG_CONFIGURE_ARGS_EXTRA:-};
_ppcs_rc=$((${?} ? 1 : ${_ppcs_rc}));
for _ppcs_vname in ${_ppcs_vnames}; do