diff options
| author | Mark Ferrell <major@homeonderanged.org> | 2012-05-01 21:59:04 -0500 |
|---|---|---|
| committer | Mark Ferrell <major@homeonderanged.org> | 2012-05-01 21:59:04 -0500 |
| commit | a6199d033f8e967c5658938208738b19c6978f54 (patch) | |
| tree | e69ede34b3fd5765f6a4241f5f7fb9669ae3fc5d | |
| parent | 06d559978f86f401f2ceec338dff3fcbd65505e3 (diff) | |
Refresh the environ before compile
| -rwxr-xr-x | scripts/builder/build-package | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/builder/build-package b/scripts/builder/build-package index c57a209..761fc1f 100755 --- a/scripts/builder/build-package +++ b/scripts/builder/build-package @@ -41,14 +41,6 @@ pkg_compile() make ${MAKE_OPTS} && make DESTDIR="${D}" install } -# pkgconfig can be a right pita... -PKG_CONFIG_LIBDIR="${SYSROOT}/usr/share/pkgconfig:${SYSROOT}/usr/lib/pkgconfig" -export PKG_CONFIG_LIBDIR PKG_CONFIG_PATH -export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}" - -# Don't pass along the builder jobcontrol data to child processes -unset MAKEFLAGS - import "${1}" ## Cleanup the build build environment @@ -108,6 +100,16 @@ eval "$(build-query --toolchain "${CHOST}")" mkenv "compile" PKG_LOGFILE="${L}/compile.log" +# pkgconfig can be a right pita... +PKG_CONFIG_LIBDIR="${SYSROOT}/usr/share/pkgconfig:${SYSROOT}/usr/lib/pkgconfig" +export PKG_CONFIG_LIBDIR PKG_CONFIG_PATH +export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}" + +# Don't pass along the builder jobcontrol data to child processes +unset MAKEFLAGS + +import "${1}" + ## Prep the build environment # Technically much of this should have been done in build-prep, and this sort # of duplication of work may be useful to make a function within the top-level |