diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-13 09:12:43 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-13 09:12:43 +0000 |
| commit | 557c73899991c3ba1b79662f8666c177ecd89683 (patch) | |
| tree | df94c07c11625fab2fa0695cc9e80da23dbc2e5d /subr | |
| parent | 22ed12c8d52e4e4318c1e929d743aaa18953b86d (diff) | |
| download | midipix_build-557c73899991c3ba1b79662f8666c177ecd89683.tar.bz2 midipix_build-557c73899991c3ba1b79662f8666c177ecd89683.tar.xz | |
patches/qpdf-6.0.0.local.patch, vars/build.vars: adds qpdf v6.0.0.
subr/pkg_configure.subr: explictly pass ${CPPFLAGS}.
subr/pkg_setup_env.subr: explicitly set ${LIBTOOL} if ${PKG_SLIBTOOL} is st.
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_configure.subr | 1 | ||||
| -rw-r--r-- | subr/pkg_setup_env.subr | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index f876e1e3..d63b16e6 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -10,6 +10,7 @@ pkg_configure() { fi; if [ -x "${PKG_CONFIGURE}" ]; then 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} \ diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr index fb7b4566..75bf5f96 100644 --- a/subr/pkg_setup_env.subr +++ b/subr/pkg_setup_env.subr @@ -40,6 +40,7 @@ pkg_setup_env() { export RANLIB="${PKG_TARGET}-ranlib"; fi; if [ "${PKG_SLIBTOOL}" != "default" ]; then + export LIBTOOL="${PKG_SLIBTOOL:-slibtool}"; export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}"; fi; fi; |