diff options
| -rw-r--r-- | build.vars | 12 | ||||
| -rw-r--r-- | pkg.build | 26 |
2 files changed, 29 insertions, 9 deletions
@@ -68,7 +68,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; # pkg.build # DEFAULT_MAKEFLAGS_BUILD=-j${BUILD_CPUS:=1}; -PKG_BUILD_VARS="BUILD_CMDLINE BUILD_DIR BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_BRANCH INSTALL_FILES INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION"; +PKG_BUILD_VARS="BUILD_CMDLINE BUILD_DIR BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIG_CACHE_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_BRANCH INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_MAKE_INSTALL PREFIX_EXTRA SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION"; PKG_LVL0_PREFIX="${PREFIX_CROSS}"; PKG_LVL0_BUILD_TYPE="host"; PKG_LVL0_CFLAGS_CONFIGURE="${PKG_LVL0_CFLAGS_CONFIGURE_DEFAULT}"; @@ -165,15 +165,25 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}"; # Build level 2 (runtime components) # : ${PKG_DALIST_URL:=${GITROOT}/dalist}; +: ${PKG_DALIST_INSTALL_TARGET_EXTRA:=install-lib}; +: ${PKG_DALIST_PREFIX_EXTRA:=${PREFIX_MINIPIX}}; : ${PKG_NTAPI_URL:=${GITROOT}/ntapi}; +: ${PKG_NTAPI_INSTALL_TARGET_EXTRA:=install-lib}; +: ${PKG_NTAPI_PREFIX_EXTRA:=${PREFIX_MINIPIX}}; : ${PKG_NTCON_URL:=${GITROOT}/ntcon}; +: ${PKG_NTCON_INSTALL_TARGET_EXTRA:=install-lib}; +: ${PKG_NTCON_PREFIX_EXTRA:=${PREFIX_MINIPIX}}; : ${PKG_NTCTTY_URL:=${GITROOT_HEAD}/ntctty}; : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0}; : ${PKG_NTCTTY_PREFIX_EXTRA:=${PREFIX_MINIPIX}}; : ${PKG_PEMAGINE_URL:=${GITROOT}/pemagine}; : ${PKG_PEMAGINE_CFLAGS_CONFIGURE_EXTRA:=-O0}; +: ${PKG_PEMAGINE_INSTALL_TARGET_EXTRA:=install-lib}; +: ${PKG_PEMAGINE_PREFIX_EXTRA:=${PREFIX_MINIPIX}}; : ${PKG_PSXSCL_URL:=${GITROOT_HEAD}/psxscl}; : ${PKG_PSXSCL_CFLAGS_CONFIGURE_EXTRA:=-O0}; +: ${PKG_PSXSCL_INSTALL_TARGET_EXTRA:=install-lib}; +: ${PKG_PSXSCL_PREFIX_EXTRA:=${PREFIX_MINIPIX}}; : ${PKG_PSXSCL_STRACE_URL:=${GITROOT_HEAD}/psxscl}; : ${PKG_PSXSCL_STRACE_CFLAGS_CONFIGURE_EXTRA="-DPSX_INTERNAL_STRACE -O0"}; : ${PKG_PSXSCL_STRACE_INSTALL_FILES:="/=lib/psxscl_strace lib/libpsxscl.so=lib/psxscl_strace/"}; @@ -175,19 +175,29 @@ if ! is_build_script_done install; then pkg_${PKG_NAME}_install; else if [ ${PKG_NO_MAKE_INSTALL:-0} -eq 0 ]; then - for __ in "" ${PKG_PREFIX_EXTRA}; do - run_cmd_unsplit make \ - ${PKG_MAKEFLAGS_INSTALL} \ - ${PKG_MAKEFLAGS_INSTALL_EXTRA} \ - AR=${AR} CC=${CC} RANLIB=${RANLIB} \ + run_cmd_unsplit make \ + ${PKG_MAKEFLAGS_INSTALL} \ + ${PKG_MAKEFLAGS_INSTALL_EXTRA} \ + AR=${AR} CC=${CC} RANLIB=${RANLIB} \ + "${PKG_CFLAGS_INSTALL:+CFLAGS=${PKG_CFLAGS_INSTALL}}" \ + "${PKG_CFLAGS_INSTALL_EXTRA:+CFLAGS+=${PKG_CFLAGS_INSTALL_EXTRA}}" \ + "${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \ + "${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \ + "${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \ + ${PKG_INSTALL_TARGET:=install}; + if [ -n "${PKG_PREFIX_EXTRA}" ]; then + run_cmd_unsplit make \ + ${PKG_MAKEFLAGS_INSTALL} \ + ${PKG_MAKEFLAGS_INSTALL_EXTRA} \ + AR=${AR} CC=${CC} RANLIB=${RANLIB} \ "${PKG_CFLAGS_INSTALL:+CFLAGS=${PKG_CFLAGS_INSTALL}}" \ "${PKG_CFLAGS_INSTALL_EXTRA:+CFLAGS+=${PKG_CFLAGS_INSTALL_EXTRA}}" \ "${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \ "${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \ "${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \ - ${PKG_INSTALL_TARGET:=install} \ - ${__:+DESTDIR=${__}}; - done; + ${PKG_INSTALL_TARGET_EXTRA:=install} \ + DESTDIR=${PKG_PREFIX_EXTRA}; + fi; fi; if test_cmd pkg_${PKG_NAME}_install_post; then pkg_${PKG_NAME}_install_post; |