From 75a203ce9044974fd5027654348c7a4414877e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Sun, 7 Feb 2016 16:54:05 +0100 Subject: - Followup to last commit. - Inserted dalist, ntapi, pemagine, psxtypes, psxscl, and ntctty in between build levels 1 (binutils...) and 2 (coreutils...) which is now build level 3. - Added SHA256 manifest for the upstream patches of bash, as verifying the signatures provided would tie in GnuPG as a dependency. --- 001.binutils.host.build | 2 +- 200.coreutils.build | 62 -------------------------------------------- 200.dalist.build | 1 + 201.diffutils.build | 1 - 201.ntapi.build | 1 + 202.findutils.build | 1 - 202.pemagine.build | 1 + 203.patch.build | 1 - 203.psxtypes.build | 1 + 204.gawk.build | 1 - 204.psxscl.build | 31 ++++++++++++++++++++++ 205.bash.build | 1 - 205.ntctty.build | 1 + 206.make.build | 1 - 207.libz.build | 42 ------------------------------ 208.gzip.build | 1 - 209.grep.build | 1 - 210.sed.build | 1 - 300.coreutils.build | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 301.diffutils.build | 1 + 302.findutils.build | 1 + 303.patch.build | 1 + 304.gawk.build | 1 + 305.bash.build | 1 + 305.bash.vars | 45 ++++++++++++++++++++++++++++++++ 306.make.build | 1 + 307.libz.build | 42 ++++++++++++++++++++++++++++++ 308.gzip.build | 1 + 309.grep.build | 1 + 310.sed.build | 1 + build.sh | 4 ++- build.subr | 6 ++--- build.vars | 8 ++++++ 33 files changed, 216 insertions(+), 118 deletions(-) delete mode 100644 200.coreutils.build create mode 120000 200.dalist.build delete mode 120000 201.diffutils.build create mode 120000 201.ntapi.build delete mode 120000 202.findutils.build create mode 120000 202.pemagine.build delete mode 120000 203.patch.build create mode 120000 203.psxtypes.build delete mode 120000 204.gawk.build create mode 100644 204.psxscl.build delete mode 120000 205.bash.build create mode 120000 205.ntctty.build delete mode 120000 206.make.build delete mode 100644 207.libz.build delete mode 120000 208.gzip.build delete mode 120000 209.grep.build delete mode 120000 210.sed.build create mode 100644 300.coreutils.build create mode 120000 301.diffutils.build create mode 120000 302.findutils.build create mode 120000 303.patch.build create mode 120000 304.gawk.build create mode 120000 305.bash.build create mode 100644 305.bash.vars create mode 120000 306.make.build create mode 100644 307.libz.build create mode 120000 308.gzip.build create mode 120000 309.grep.build create mode 120000 310.sed.build diff --git a/001.binutils.host.build b/001.binutils.host.build index f22e447c..5b9b303f 120000 --- a/001.binutils.host.build +++ b/001.binutils.host.build @@ -1 +1 @@ -200.coreutils.build \ No newline at end of file +300.coreutils.build \ No newline at end of file diff --git a/200.coreutils.build b/200.coreutils.build deleted file mode 100644 index 844f90b9..00000000 --- a/200.coreutils.build +++ /dev/null @@ -1,62 +0,0 @@ -parse_with_pkg_name ${2} \ - coreutils diffutils findutils patch \ - gawk bash make grep sed binutils; -if is_build_script_done finished; then - exit 212; -else - fetch ${PKG_URL} ${PKG_SHA256SUM}; - if [ "x${PKG_NAME}" = "xbinutils" ]\ - && [ "x${3}" = "xhost" ]; then - _no_config_cache=$(_no_destdir:=1); - _configure_args="--disable-werror --prefix=${PREFIX} --with-sysroot=${PREFIX_TARGET}"; - set_build_dir ${PKG_SUBDIR} cross; - else - _no_config_cache=$(_no_destdir:=1); - _configure_args="-C --host=${HOST_NATIVE} --prefix="; - set_build_dir ${PKG_SUBDIR} native; - fi; - _configure_args="${_configure_args}${PKG_CONFIGURE_EXTRA_ARGS:+ ${PKG_CONFIGURE_EXTRA_ARGS}}"; -fi; -if ! is_build_script_done extracted; then - rm_if_exists ${PKG_SUBDIR}; - tar -axf ${PKG_FNAME}; - set_build_script_done extracted -patched; -fi; -if ! is_build_script_done patched; then - if [ -n "${PKG_PATCHES_EXTRA}" ]; then - (rm_if_exists -m -c ${PKG_SUBDIR}-patches-extra; - wget -c -nd -np -r -R \*.htm\* ${PKG_PATCHES_EXTRA} - for _patch_fname in \ - $(find . -type f -not -iname \*.sig | sort); do - patch -d ../${PKG_SUBDIR} -p0 \ - < ${_patch_fname}; - done); wait; - fi; - patch -d ${PKG_SUBDIR} -p1 \ - < portage/${PKG_SUBDIR}.midipix.patch; - set_build_script_done patched -configured; -fi; -if ! is_build_script_done configured; then - rm_if_exists -m -c ${BUILD_DIR}; - [ ${_no_config_cache:-0} -eq 0 ] &&\ - cp ../portage/config.cache .; - ../${PKG_SUBDIR}/configure \ - ${_configure_args} --target=${TARGET}; - set_build_script_done configured -built; -else - cd ${BUILD_DIR}; -fi; -if ! is_build_script_done built; then - make ${MAKEFLAGS}; - set_build_script_done built -installed; -fi; -if ! is_build_script_done installed; then - if [ ${_no_destdir:-0} -eq 0 ]; then - make ${MAKEFLAGS} DESTDIR=${PREFIX_NATIVE} install; - else - make ${MAKEFLAGS} install; - fi; - set_build_script_done installed finished; -fi; - -# vim:filetype=sh diff --git a/200.dalist.build b/200.dalist.build new file mode 120000 index 00000000..44d66684 --- /dev/null +++ b/200.dalist.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/201.diffutils.build b/201.diffutils.build deleted file mode 120000 index f22e447c..00000000 --- a/201.diffutils.build +++ /dev/null @@ -1 +0,0 @@ -200.coreutils.build \ No newline at end of file diff --git a/201.ntapi.build b/201.ntapi.build new file mode 120000 index 00000000..44d66684 --- /dev/null +++ b/201.ntapi.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/202.findutils.build b/202.findutils.build deleted file mode 120000 index f22e447c..00000000 --- a/202.findutils.build +++ /dev/null @@ -1 +0,0 @@ -200.coreutils.build \ No newline at end of file diff --git a/202.pemagine.build b/202.pemagine.build new file mode 120000 index 00000000..44d66684 --- /dev/null +++ b/202.pemagine.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/203.patch.build b/203.patch.build deleted file mode 120000 index f22e447c..00000000 --- a/203.patch.build +++ /dev/null @@ -1 +0,0 @@ -200.coreutils.build \ No newline at end of file diff --git a/203.psxtypes.build b/203.psxtypes.build new file mode 120000 index 00000000..44d66684 --- /dev/null +++ b/203.psxtypes.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/204.gawk.build b/204.gawk.build deleted file mode 120000 index f22e447c..00000000 --- a/204.gawk.build +++ /dev/null @@ -1 +0,0 @@ -200.coreutils.build \ No newline at end of file diff --git a/204.psxscl.build b/204.psxscl.build new file mode 100644 index 00000000..697ac861 --- /dev/null +++ b/204.psxscl.build @@ -0,0 +1,31 @@ +# Order: dalist ntapi pemagine psxtypes psxscl ntctty + +parse_with_pkg_name ${2} \ + dalist ntapi ntctty pemagine psxscl psxtypes; +if is_build_script_done finished; then + exit 212; +else + fetch_git ${PKG_SUBDIR} ${PKG_URL}; + set_build_dir ${PKG_SUBDIR} cross; +fi; +if ! is_build_script_done configured; then + rm_if_exists -m -c ${BUILD_DIR}; + ../${PKG_SUBDIR}/configure \ + --prefix=${PREFIX_NATIVE} \ + --host=${HOST_NATIVE} \ + --target=${TARGET} \ + --sysroot=/; + set_build_script_done configured -built; +else + cd ${BUILD_DIR}; +fi; +if ! is_build_script_done built; then + make ${MAKEFLAGS}; + set_build_script_done built -installed; +fi; +if ! is_build_script_done installed; then + make ${MAKEFLAGS} install; + set_build_script_done installed finished; +fi; + +# vim:filetype=sh diff --git a/205.bash.build b/205.bash.build deleted file mode 120000 index f22e447c..00000000 --- a/205.bash.build +++ /dev/null @@ -1 +0,0 @@ -200.coreutils.build \ No newline at end of file diff --git a/205.ntctty.build b/205.ntctty.build new file mode 120000 index 00000000..44d66684 --- /dev/null +++ b/205.ntctty.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/206.make.build b/206.make.build deleted file mode 120000 index f22e447c..00000000 --- a/206.make.build +++ /dev/null @@ -1 +0,0 @@ -200.coreutils.build \ No newline at end of file diff --git a/207.libz.build b/207.libz.build deleted file mode 100644 index a6f48d59..00000000 --- a/207.libz.build +++ /dev/null @@ -1,42 +0,0 @@ -parse_with_pkg_name ${2} libz gzip; -if is_build_script_done finished; then - exit 212; -else - fetch ${PKG_URL} ${PKG_SHA256SUM}; -fi; -if ! is_build_script_done extracted; then - rm_if_exists ${PKG_FNAME%%.tar*}; - tar -axf ${PKG_FNAME}; - set_build_script_done extracted -configured; -fi; -if ! is_build_script_done configured; then - set_build_dir ${PKG_FNAME%%-*} native; - rm_if_exists -c -m ${BUILD_DIR}; - cp ../portage/config.cache .; - ../${PKG_SUBDIR}/configure \ - --host=${HOST_NATIVE} \ - --prefix= \ - --target=${TARGET}; - set_build_script_done configured -built; -else - cd ${BUILD_DIR}; -fi; -if ! is_build_script_done built; then - if [ "x${2}" = "xlibz" ]; then - make -j18; - elif [ "x${2}" = "xgzip" ]; then - make clean; - make; - fi; - set_build_script_done built -installed; -fi; -if ! is_build_script_done installed; then - if [ "x${2}" = "xlibz" ]; then - make -j18 DESTDIR=${PREFIX_NATIVE} install; - elif [ "x${2}" = "xgzip" ]; then - cp gunzip gzip zcat ${PREFIX_NATIVE}/bin; - fi; - set_build_script_done installed finished; -fi; - -# vim:filetype=sh diff --git a/208.gzip.build b/208.gzip.build deleted file mode 120000 index ffee5580..00000000 --- a/208.gzip.build +++ /dev/null @@ -1 +0,0 @@ -207.libz.build \ No newline at end of file diff --git a/209.grep.build b/209.grep.build deleted file mode 120000 index f22e447c..00000000 --- a/209.grep.build +++ /dev/null @@ -1 +0,0 @@ -200.coreutils.build \ No newline at end of file diff --git a/210.sed.build b/210.sed.build deleted file mode 120000 index f22e447c..00000000 --- a/210.sed.build +++ /dev/null @@ -1 +0,0 @@ -200.coreutils.build \ No newline at end of file diff --git a/300.coreutils.build b/300.coreutils.build new file mode 100644 index 00000000..36bb0587 --- /dev/null +++ b/300.coreutils.build @@ -0,0 +1,69 @@ +parse_with_pkg_name ${2} \ + coreutils diffutils findutils patch \ + gawk bash make grep sed binutils; +if is_build_script_done finished; then + exit 212; +else + fetch ${PKG_URL} ${PKG_SHA256SUM}; + if [ "x${PKG_NAME}" = "xbinutils" ]\ + && [ "x${3}" = "xhost" ]; then + _no_config_cache=${_no_destdir:=1}; + _configure_args="--disable-werror --prefix=${PREFIX} --with-sysroot=${PREFIX_TARGET}"; + set_build_dir ${PKG_SUBDIR} cross; + else + _no_config_cache=${_no_destdir:=1}; + _configure_args="-C --host=${HOST_NATIVE} --prefix="; + set_build_dir ${PKG_SUBDIR} native; + fi; + _configure_args="${_configure_args}${PKG_CONFIGURE_EXTRA_ARGS:+ ${PKG_CONFIGURE_EXTRA_ARGS}}"; +fi; +if ! is_build_script_done extracted; then + rm_if_exists ${PKG_SUBDIR}; + tar -axf ${PKG_FNAME}; + set_build_script_done extracted -patched; +fi; +if ! is_build_script_done patched; then + if [ -n "${PKG_PATCHES_EXTRA}" ]; then + (rm_if_exists -m -c ${PKG_SUBDIR}-patches-extra; + wget -c -nd -np -r -R \*.htm\* -R \*.sig ${PKG_PATCHES_EXTRA} + for _patch_fname in \ + $(find . -type f -not -iname \*.sig | sort); do + patch -d ../${PKG_SUBDIR} -p0 \ + < ${_patch_fname}; + done; + for _patch_fname in ${PKG_PATCHES_EXTRA_MANIFEST}; do + _patch_sha256sum=${2}; shift; + if ! compare_hash ${_patch_fname} ${_patch_sha256sum}; then + log_msg fail "Error: hash mismatch for patch file \`${_patch_fname}'."; + exit 1; + fi; + done); wait; + fi; + patch -d ${PKG_SUBDIR} -p1 \ + < portage/${PKG_SUBDIR}.midipix.patch; + set_build_script_done patched -configured; +fi; +if ! is_build_script_done configured; then + rm_if_exists -m -c ${BUILD_DIR}; + [ ${_no_config_cache:-0} -eq 0 ] &&\ + cp ../portage/config.cache .; + ../${PKG_SUBDIR}/configure \ + ${_configure_args} --target=${TARGET}; + set_build_script_done configured -built; +else + cd ${BUILD_DIR}; +fi; +if ! is_build_script_done built; then + make ${MAKEFLAGS}; + set_build_script_done built -installed; +fi; +if ! is_build_script_done installed; then + if [ ${_no_destdir:-0} -eq 0 ]; then + make ${MAKEFLAGS} DESTDIR=${PREFIX_NATIVE} install; + else + make ${MAKEFLAGS} install; + fi; + set_build_script_done installed finished; +fi; + +# vim:filetype=sh diff --git a/301.diffutils.build b/301.diffutils.build new file mode 120000 index 00000000..5b9b303f --- /dev/null +++ b/301.diffutils.build @@ -0,0 +1 @@ +300.coreutils.build \ No newline at end of file diff --git a/302.findutils.build b/302.findutils.build new file mode 120000 index 00000000..5b9b303f --- /dev/null +++ b/302.findutils.build @@ -0,0 +1 @@ +300.coreutils.build \ No newline at end of file diff --git a/303.patch.build b/303.patch.build new file mode 120000 index 00000000..5b9b303f --- /dev/null +++ b/303.patch.build @@ -0,0 +1 @@ +300.coreutils.build \ No newline at end of file diff --git a/304.gawk.build b/304.gawk.build new file mode 120000 index 00000000..5b9b303f --- /dev/null +++ b/304.gawk.build @@ -0,0 +1 @@ +300.coreutils.build \ No newline at end of file diff --git a/305.bash.build b/305.bash.build new file mode 120000 index 00000000..5b9b303f --- /dev/null +++ b/305.bash.build @@ -0,0 +1 @@ +300.coreutils.build \ No newline at end of file diff --git a/305.bash.vars b/305.bash.vars new file mode 100644 index 00000000..b1333b3c --- /dev/null +++ b/305.bash.vars @@ -0,0 +1,45 @@ +PKG_BASH_PATCHES_EXTRA_MANIFEST=" +bash43-001 ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 +bash43-002 eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b +bash43-003 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d +bash43-004 5ea0a42c6506720d26e6d3c5c358e9a0d49f6f189d69a8ed34d5935964821338 +bash43-005 1ac83044032b9f5f11aeca8a344ae3c524ec2156185d3adbb8ad3e7a165aa3fa +bash43-006 a0648ee72d15e4a90c8b77a5c6b19f8d89e28c1bc881657d22fe26825f040213 +bash43-007 1113e321c59cf6a8648a36245bbe4217cf8acf948d71e67886dad7d486f8f3a3 +bash43-008 9941a98a4987192cc5ce3d45afe879983cad2f0bec96d441a4edd9033767f95e +bash43-009 c0226d6728946b2f53cdebf090bcd1c01627f01fee03295768605caa80bb40a5 +bash43-010 ce05799c0137314c70c7b6ea0477c90e1ac1d52e113344be8e32fa5a55c9f0b7 +bash43-011 7c63402cdbc004a210f6c1c527b63b13d8bb9ec9c5a43d5c464a9010ff6f7f3b +bash43-012 3e1379030b35fbcf314e9e7954538cf4b43be1507142b29efae39eef997b8c12 +bash43-013 bfa8ca5336ab1f5ef988434a4bdedf71604aa8a3659636afa2ce7c7446c42c79 +bash43-014 5a4d6fa2365b6eb725a9d4966248b5edf7630a4aeb3fa8d526b877972658ac13 +bash43-015 13293e8a24e003a44d7fe928c6b1e07b444511bed2d9406407e006df28355e8d +bash43-016 92d60bcf49f61bd7f1ccb9602bead6f2c9946d79dea0e5ec0589bb3bfa5e0773 +bash43-017 1267c25c6b5ba57042a7bb6c569a6de02ffd0d29530489a16666c3b8a23e7780 +bash43-018 7aa8b40a9e973931719d8cc72284a8fb3292b71b522db57a5a79052f021a3d58 +bash43-019 a7a91475228015d676cafa86d2d7aa9c5d2139aa51485b6bbdebfdfbcf0d2d23 +bash43-020 ca5e86d87f178128641fe91f2f094875b8c1eb2de9e0d2e9154f5d5cc0336c98 +bash43-021 41439f06883e6bd11c591d9d5e9ae08afbc2abd4b935e1d244b08100076520a9 +bash43-022 fd4d47bb95c65863f634c4706c65e1e3bae4ee8460c72045c0a0618689061a88 +bash43-023 9ac250c7397a8f53dbc84dfe790d2a418fbf1fe090bcece39b4a5c84a2d300d4 +bash43-024 3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e622d3f960f6c +bash43-025 1e5186f5c4a619bb134a1177d9e9de879f3bb85d9c5726832b03a762a2499251 +bash43-026 2ecc12201b3ba4273b63af4e9aad2305168cf9babf6d11152796db08724c214d +bash43-027 1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f076dabe +bash43-028 e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d +bash43-029 4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292 +bash43-030 85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b +bash43-031 cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d +bash43-032 889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a +bash43-033 fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16 +bash43-034 f1694f04f110defe1330a851cc2768e7e57ddd2dfdb0e3e350ca0e3c214ff889 +bash43-035 370d85e51780036f2386dc18c5efe996eba8e652fc1973f0f4f2ab55a993c1e3 +bash43-036 ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd5170bc5fd27c +bash43-037 33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813 +bash43-038 adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367 +bash43-039 ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec +bash43-040 84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b +bash43-041 4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a +bash43-042 ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919"; + +# vim:filetype=sh diff --git a/306.make.build b/306.make.build new file mode 120000 index 00000000..5b9b303f --- /dev/null +++ b/306.make.build @@ -0,0 +1 @@ +300.coreutils.build \ No newline at end of file diff --git a/307.libz.build b/307.libz.build new file mode 100644 index 00000000..a6f48d59 --- /dev/null +++ b/307.libz.build @@ -0,0 +1,42 @@ +parse_with_pkg_name ${2} libz gzip; +if is_build_script_done finished; then + exit 212; +else + fetch ${PKG_URL} ${PKG_SHA256SUM}; +fi; +if ! is_build_script_done extracted; then + rm_if_exists ${PKG_FNAME%%.tar*}; + tar -axf ${PKG_FNAME}; + set_build_script_done extracted -configured; +fi; +if ! is_build_script_done configured; then + set_build_dir ${PKG_FNAME%%-*} native; + rm_if_exists -c -m ${BUILD_DIR}; + cp ../portage/config.cache .; + ../${PKG_SUBDIR}/configure \ + --host=${HOST_NATIVE} \ + --prefix= \ + --target=${TARGET}; + set_build_script_done configured -built; +else + cd ${BUILD_DIR}; +fi; +if ! is_build_script_done built; then + if [ "x${2}" = "xlibz" ]; then + make -j18; + elif [ "x${2}" = "xgzip" ]; then + make clean; + make; + fi; + set_build_script_done built -installed; +fi; +if ! is_build_script_done installed; then + if [ "x${2}" = "xlibz" ]; then + make -j18 DESTDIR=${PREFIX_NATIVE} install; + elif [ "x${2}" = "xgzip" ]; then + cp gunzip gzip zcat ${PREFIX_NATIVE}/bin; + fi; + set_build_script_done installed finished; +fi; + +# vim:filetype=sh diff --git a/308.gzip.build b/308.gzip.build new file mode 120000 index 00000000..84e1ba09 --- /dev/null +++ b/308.gzip.build @@ -0,0 +1 @@ +307.libz.build \ No newline at end of file diff --git a/309.grep.build b/309.grep.build new file mode 120000 index 00000000..5b9b303f --- /dev/null +++ b/309.grep.build @@ -0,0 +1 @@ +300.coreutils.build \ No newline at end of file diff --git a/310.sed.build b/310.sed.build new file mode 120000 index 00000000..5b9b303f --- /dev/null +++ b/310.sed.build @@ -0,0 +1 @@ +300.coreutils.build \ No newline at end of file diff --git a/build.sh b/build.sh index f027084b..21cf1f2c 100755 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname) #trap (set -o errexit; mkdir -p ${PREFIX} ${WORKDIR}); BUILD_NFINI=${BUILD_NSKIP:=${BUILD_NFAIL:=${BUILD_NBUILT:=0}}}; -for BUILD_LVL in 0 1 2; do +for BUILD_LVL in 0 1 2 3; do for BUILD_SCRIPT_FNAME in ${BUILD_LVL}[0-9][0-9].*.build; do if [ -n "${DEBUG_SCRIPT}" ]\ && [ "x${DEBUG_SCRIPT}" != "x${BUILD_SCRIPT_FNAME}" ]; then @@ -23,6 +23,8 @@ for BUILD_LVL in 0 1 2; do SCRIPT_FNAME=${BUILD_SCRIPT_FNAME}; _pwd=$(pwd); \ export CFLAGS="$(eval echo \${CFLAGS_LVL${BUILD_LVL}})"; \ cd ${WORKDIR}; . ${_pwd}/build.subr; \ + [ -f ${_pwd}/${SCRIPT_FNAME%.build}.vars ] && \ + . ${_pwd}/${SCRIPT_FNAME%.build}.vars; \ . ${_pwd}/${BUILD_SCRIPT_FNAME}); case ${BUILD_SCRIPT_RC:=${?}} in 0) log_msg succ "Finished build script \`${BUILD_SCRIPT_FNAME}'."; diff --git a/build.subr b/build.subr index f07e297a..ea487558 100644 --- a/build.subr +++ b/build.subr @@ -93,10 +93,10 @@ log_msg() { }; parse_with_pkg_name() { - _pkg_name=${1}; shift; + PKG_NAME=${1}; shift; while [ $# -ge 0 ]; do - if [ "x${_pkg_name}" = "x${1}" ]; then - _pkg_NAME=$(echo "${_pkg_name}" | tr a-z A-Z); + if [ "x${PKG_NAME}" = "x${1}" ]; then + _pkg_NAME=$(echo "${PKG_NAME}" | tr a-z A-Z); for _vname in \ configure_extra_args no_libtool_midipix \ patches_extra prefix prefix_extra sha256sum \ diff --git a/build.vars b/build.vars index 26f79723..73e42da3 100644 --- a/build.vars +++ b/build.vars @@ -12,6 +12,7 @@ : ${CFLAGS_LVL0:=-O0}; : ${CFLAGS_LVL1:=-g3 -O0}; : ${CFLAGS_LVL2:=-g3 -O0}; +: ${CFLAGS_LVL3:=-g3 -O0}; : ${GITROOT:=git://midipix.org}; : ${HOST_NATIVE:=x86_64-nt64-midipix}; : ${LOG_MSG_FAIL_COLOUR:=91}; @@ -96,4 +97,11 @@ TIMESTAMP_FMT="%Y/%m/%d %H:%M:%S"; : ${PKG_SED_VERSION:=4.2.2}; : ${PKG_SED_URL:=https://ftp.gnu.org/gnu/sed/sed-${PKG_SED_VERSION}.tar.bz2}; +: ${PKG_DALIST_URL:=${GITROOT}/dalist}; +: ${PKG_NTAPI_URL:=${GITROOT}/ntapi}; +: ${PKG_NTCTTY_URL:=${GITROOT}/ntctty}; +: ${PKG_PEMAGINE_URl:=${GITROOT}/pemagine}; +: ${PKG_PSXSCL_URL:=${GITROOT}/psxscl}; +: ${PKG_PSXTYPES_URL:=${GITROOT}/psxtypes}; + # vim:filetype=sh -- cgit v1.2.3