diff --git a/200.dalist.build b/200.dalist.build deleted file mode 120000 index 44d6668..0000000 --- a/200.dalist.build +++ /dev/null @@ -1 +0,0 @@ -204.psxscl.build \ No newline at end of file diff --git a/200.psxtypes.build b/200.psxtypes.build new file mode 100644 index 0000000..add2367 --- /dev/null +++ b/200.psxtypes.build @@ -0,0 +1,14 @@ +# Order: psxtypes pemagine dalist ntapi psxscl ntcon ntctty + +parse_with_pkg_name ${2} psxtypes; +if is_build_script_done finished; then + exit 212; +else + fetch_git ${PKG_SUBDIR} ${PKG_URL}; +fi; +if ! is_build_script_done installed; then + make -C ${PKG_SUBDIR} ${MAKEFLAGS} DESTDIR=${PREFIX_NATIVE}; + set_build_script_done installed finished; +fi; + +# vim:filetype=sh diff --git a/201.ntapi.build b/201.ntapi.build deleted file mode 120000 index 44d6668..0000000 --- a/201.ntapi.build +++ /dev/null @@ -1 +0,0 @@ -204.psxscl.build \ No newline at end of file diff --git a/201.pemagine.build b/201.pemagine.build new file mode 120000 index 0000000..44d6668 --- /dev/null +++ b/201.pemagine.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/202.dalist.build b/202.dalist.build new file mode 120000 index 0000000..44d6668 --- /dev/null +++ b/202.dalist.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/202.pemagine.build b/202.pemagine.build deleted file mode 120000 index 44d6668..0000000 --- a/202.pemagine.build +++ /dev/null @@ -1 +0,0 @@ -204.psxscl.build \ No newline at end of file diff --git a/203.ntapi.build b/203.ntapi.build new file mode 120000 index 0000000..44d6668 --- /dev/null +++ b/203.ntapi.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/203.psxtypes.build b/203.psxtypes.build deleted file mode 120000 index 44d6668..0000000 --- a/203.psxtypes.build +++ /dev/null @@ -1 +0,0 @@ -204.psxscl.build \ No newline at end of file diff --git a/204.psxscl.build b/204.psxscl.build index 697ac86..3e47914 100644 --- a/204.psxscl.build +++ b/204.psxscl.build @@ -1,21 +1,19 @@ -# Order: dalist ntapi pemagine psxtypes psxscl ntctty +# Order: psxtypes pemagine dalist ntapi psxscl ntcon ntctty -parse_with_pkg_name ${2} \ - dalist ntapi ntctty pemagine psxscl psxtypes; +parse_with_pkg_name ${2} \ + dalist ntapi ntcon ntctty pemagine psxscl psxtypes; if is_build_script_done finished; then - exit 212; + 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; + ../${PKG_SUBDIR}/configure \ + --prefix=${PREFIX_NATIVE} \ + --host=${HOST_NATIVE}; + set_build_script_done configured -built; else cd ${BUILD_DIR}; fi; @@ -25,6 +23,7 @@ if ! is_build_script_done built; then fi; if ! is_build_script_done installed; then make ${MAKEFLAGS} install; + make ${MAKEFLAGS} DESTDIR=${PREFIX_NATIVE}; set_build_script_done installed finished; fi; diff --git a/205.ntcon.build b/205.ntcon.build new file mode 120000 index 0000000..44d6668 --- /dev/null +++ b/205.ntcon.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/205.ntctty.build b/205.ntctty.build deleted file mode 120000 index 44d6668..0000000 --- a/205.ntctty.build +++ /dev/null @@ -1 +0,0 @@ -204.psxscl.build \ No newline at end of file diff --git a/206.ntctty.build b/206.ntctty.build new file mode 120000 index 0000000..44d6668 --- /dev/null +++ b/206.ntctty.build @@ -0,0 +1 @@ +204.psxscl.build \ No newline at end of file diff --git a/300.coreutils.build b/300.coreutils.build index 36bb058..f222ae0 100644 --- a/300.coreutils.build +++ b/300.coreutils.build @@ -11,7 +11,7 @@ else _configure_args="--disable-werror --prefix=${PREFIX} --with-sysroot=${PREFIX_TARGET}"; set_build_dir ${PKG_SUBDIR} cross; else - _no_config_cache=${_no_destdir:=1}; + _no_config_cache=${_no_destdir:=0}; _configure_args="-C --host=${HOST_NATIVE} --prefix="; set_build_dir ${PKG_SUBDIR} native; fi; diff --git a/build.vars b/build.vars index 73e42da..d18e2d3 100644 --- a/build.vars +++ b/build.vars @@ -14,6 +14,7 @@ : ${CFLAGS_LVL2:=-g3 -O0}; : ${CFLAGS_LVL3:=-g3 -O0}; : ${GITROOT:=git://midipix.org}; +: ${GITROOT_HEAD:=git://midipix.org}; : ${HOST_NATIVE:=x86_64-nt64-midipix}; : ${LOG_MSG_FAIL_COLOUR:=91}; : ${LOG_MSG_INFO_COLOUR:=93}; @@ -97,11 +98,12 @@ 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}; +: ${PKG_DALIST_URL:=${GITROOT_HEAD}/dalist}; +: ${PKG_NTAPI_URL:=${GITROOT_HEAD}/ntapi}; +: ${PKG_NTCON_URL:=${GITROOT_HEAD}/ntcon}; +: ${PKG_NTCTTY_URL:=${GITROOT_HEAD}/ntctty}; +: ${PKG_PEMAGINE_URL:=${GITROOT_HEAD}/pemagine}; +: ${PKG_PSXSCL_URL:=${GITROOT_HEAD}/psxscl}; +: ${PKG_PSXTYPES_URL:=${GITROOT_HEAD}/psxtypes}; # vim:filetype=sh