diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-11-16 15:04:04 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-11-16 16:07:49 +0100 |
| commit | 0610d8b6288e055b7b5e63d6cfe49333b5842cb8 (patch) | |
| tree | 9d4e71b2d753f59e88107fe6e06cfd9450a2c5e5 /build/pkg.build | |
| parent | dac2367b6221dab5bd367094534b981867e9891b (diff) | |
| download | midipix_build-0610d8b6288e055b7b5e63d6cfe49333b5842cb8.tar.bz2 midipix_build-0610d8b6288e055b7b5e63d6cfe49333b5842cb8.tar.xz | |
cmake: fix build and clean up cmake.vars.
Diffstat (limited to 'build/pkg.build')
| -rw-r--r-- | build/pkg.build | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build/pkg.build b/build/pkg.build index 1a9746b3..c7300df8 100644 --- a/build/pkg.build +++ b/build/pkg.build @@ -125,13 +125,17 @@ else fi; if [ -x ${PKG_CONFIGURE} ]\ && ! is_build_script_done configure; then - if test_cmd pkg_${PKG_NAME}_configure_pre; then - pkg_${PKG_NAME}_configure_pre; + if test_cmd pkg_${PKG_NAME}_configure; then + pkg_${PKG_NAME}_configure; + else + if test_cmd pkg_${PKG_NAME}_configure_pre; then + pkg_${PKG_NAME}_configure_pre; + fi; + CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_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}; fi; - CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_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}; set_build_script_done configure clean -build; else __no_autoconf=1; |