Build perk{,_host} w/ pkg.build.

29 files changed, 15 insertions, 60 deletions

diff --git a/001.binutils_host.build b/001.perk_host.build
index 52bb82e5..52bb82e5 120000
--- a/001.binutils_host.build
+++ b/001.perk_host.build
diff --git a/003.psxstub.build b/002.binutils_host.build
index 52bb82e5..52bb82e5 120000
--- a/003.psxstub.build
+++ b/002.binutils_host.build
diff --git a/002.gcc.stage1.build b/002.gcc.stage1.build
deleted file mode 120000
index c3b435df..00000000
--- a/002.gcc.stage1.build
+++ /dev/null
@@ -1 +0,0 @@
-008.gcc.full.build
\ No newline at end of file
diff --git a/003.gcc.stage1.build b/003.gcc.stage1.build
new file mode 120000
index 00000000..f1fa8b29
--- /dev/null
+++ b/003.gcc.stage1.build
@@ -0,0 +1 @@
+009.gcc.full.build
\ No newline at end of file
diff --git a/004.musl.no-complex.build b/004.musl.no-complex.build
deleted file mode 120000
index 59c5eff4..00000000
--- a/004.musl.no-complex.build
+++ /dev/null
@@ -1 +0,0 @@
-006.musl.full.build
\ No newline at end of file
diff --git a/009.pkgconf_host.build b/004.psxstub.build
index 52bb82e5..52bb82e5 120000
--- a/009.pkgconf_host.build
+++ b/004.psxstub.build
diff --git a/003.psxstub.vars b/004.psxstub.vars
index d9c467d1..d9c467d1 100644
--- a/003.psxstub.vars
+++ b/004.psxstub.vars
diff --git a/005.gcc.runtime.build b/005.gcc.runtime.build
deleted file mode 120000
index c3b435df..00000000
--- a/005.gcc.runtime.build
+++ /dev/null
@@ -1 +0,0 @@
-008.gcc.full.build
\ No newline at end of file
diff --git a/005.musl.no-complex.build b/005.musl.no-complex.build
new file mode 120000
index 00000000..5455612b
--- /dev/null
+++ b/005.musl.no-complex.build
@@ -0,0 +1 @@
+007.musl.full.build
\ No newline at end of file
diff --git a/006.gcc.runtime.build b/006.gcc.runtime.build
new file mode 120000
index 00000000..f1fa8b29
--- /dev/null
+++ b/006.gcc.runtime.build
@@ -0,0 +1 @@
+009.gcc.full.build
\ No newline at end of file
diff --git a/007.gcc.libstdc++-v3.build b/007.gcc.libstdc++-v3.build
deleted file mode 120000
index c3b435df..00000000
--- a/007.gcc.libstdc++-v3.build
+++ /dev/null
@@ -1 +0,0 @@
-008.gcc.full.build
\ No newline at end of file
diff --git a/006.musl.full.build b/007.musl.full.build
index 4c6e2310..4c6e2310 100644
--- a/006.musl.full.build
+++ b/007.musl.full.build
diff --git a/008.gcc.libstdc++-v3.build b/008.gcc.libstdc++-v3.build
new file mode 120000
index 00000000..f1fa8b29
--- /dev/null
+++ b/008.gcc.libstdc++-v3.build
@@ -0,0 +1 @@
+009.gcc.full.build
\ No newline at end of file
diff --git a/008.gcc.full.build b/009.gcc.full.build
index eaba17d3..eaba17d3 100644
--- a/008.gcc.full.build
+++ b/009.gcc.full.build
diff --git a/103.gmp.build b/010.pkgconf_host.build
index 52bb82e5..52bb82e5 120000
--- a/103.gmp.build
+++ b/010.pkgconf_host.build
diff --git a/009.pkgconf_host.vars b/010.pkgconf_host.vars
index 3443633b..3443633b 100644
--- a/009.pkgconf_host.vars
+++ b/010.pkgconf_host.vars
diff --git a/104.mpfr.build b/101.perk.build
index 52bb82e5..52bb82e5 120000
--- a/104.mpfr.build
+++ b/101.perk.build
diff --git a/101.perk.native.build b/101.perk.native.build
deleted file mode 100644
index b0a47150..00000000
--- a/101.perk.native.build
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# . ./build.vars and set -o errexit -o noglob are assumed.
-#
-
-if ! is_build_script_done fetch; then
-	fetch_git perk ${GITROOT}/perk;
-	set_build_script_done fetch -configure;
-fi;
-if [ "${3}" = native ]; then
-	set_build_dir ${2} native;
-	if ! is_build_script_done configure; then
-		rm_if_exists -m -c ${PKG_BUILD_DIR};
-		../perk/configure --prefix=/usr;
-		set_build_script_done configure clean -build;
-	else
-		cd ${PKG_BUILD_DIR};
-	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
-		make;
-		set_build_script_done build -install;
-	fi;
-	if ! is_build_script_done install; then
-		make DESTDIR=${PREFIX} install;
-		set_build_script_done install finish;
-	fi;
-elif [ "${3}" = cross ]; then
-	set_build_dir ${2} cross;
-	if ! is_build_script_done configure; then
-		rm_if_exists -m -c ${PKG_BUILD_DIR};
-		../perk/configure --prefix=/usr --target=${TARGET};
-		set_build_script_done configure clean -build;
-	else
-		cd ${PKG_BUILD_DIR};
-	fi;
-	if ! is_build_script_done clean; then
-		make ${MAKEFLAGS} clean;
-		set_build_script_done clean -build;
-	fi;
-	if ! is_build_script_done build; then
-		make;
-		set_build_script_done build -install;
-	fi;
-	if ! is_build_script_done install; then
-		make DESTDIR=${PKG_PREFIX} install;
-		set_build_script_done install finish;
-	fi;
-fi;
-
-# vim:filetype=sh
diff --git a/105.mpc.build b/102.gmp.build
index 52bb82e5..52bb82e5 120000
--- a/105.mpc.build
+++ b/102.gmp.build
diff --git a/102.perk.cross.build b/102.perk.cross.build
deleted file mode 120000
index f0ace4a3..00000000
--- a/102.perk.cross.build
+++ /dev/null
@@ -1 +0,0 @@
-101.perk.native.build
\ No newline at end of file
diff --git a/106.libelf.build b/103.mpfr.build
index 52bb82e5..52bb82e5 120000
--- a/106.libelf.build
+++ b/103.mpfr.build
diff --git a/107.binutils.build b/104.mpc.build
index 52bb82e5..52bb82e5 120000
--- a/107.binutils.build
+++ b/104.mpc.build
diff --git a/105.libelf.build b/105.libelf.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/105.libelf.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/106.binutils.build b/106.binutils.build
new file mode 120000
index 00000000..52bb82e5
--- /dev/null
+++ b/106.binutils.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/107.musl.native.build b/107.musl.native.build
new file mode 120000
index 00000000..5455612b
--- /dev/null
+++ b/107.musl.native.build
@@ -0,0 +1 @@
+007.musl.full.build
\ No newline at end of file
diff --git a/108.gcc.native.build b/108.gcc.native.build
new file mode 120000
index 00000000..f1fa8b29
--- /dev/null
+++ b/108.gcc.native.build
@@ -0,0 +1 @@
+009.gcc.full.build
\ No newline at end of file
diff --git a/108.musl.native.build b/108.musl.native.build
deleted file mode 120000
index 59c5eff4..00000000
--- a/108.musl.native.build
+++ /dev/null
@@ -1 +0,0 @@
-006.musl.full.build
\ No newline at end of file
diff --git a/109.gcc.native.build b/109.gcc.native.build
deleted file mode 120000
index c3b435df..00000000
--- a/109.gcc.native.build
+++ /dev/null
@@ -1 +0,0 @@
-008.gcc.full.build
\ No newline at end of file
diff --git a/build.vars b/build.vars
index 24e92a7e..3da1c8ba 100644
--- a/build.vars
+++ b/build.vars
@@ -94,6 +94,10 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_HOST_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_VERSION}.tar.bz2};
 : ${PKG_BINUTILS_HOST_CONFIGURE_ARGS:=--disable-werror --prefix=${PREFIX} --target=${TARGET} --with-sysroot=${PREFIX_CROSS}};
 : ${PKG_BINUTILS_HOST_SLIBTOOL:=slibtool-static};
+: ${PKG_PERK_HOST_URL:=${GITROOT}/perk};
+: ${PKG_PERK_HOST_URL_TYPE:=git};
+: ${PKG_PERK_HOST_CONFIGURE_ARGS="--prefix=/usr"};
+: ${PKG_PERK_HOST_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX}"};
 : ${PKG_PKGCONF_HOST_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f};
 : ${PKG_PKGCONF_HOST_VERSION:=0.9.12};
 : ${PKG_PKGCONF_HOST_URL:=https://github.com/pkgconf/pkgconf/releases/download/pkgconf-${PKG_PKGCONF_HOST_VERSION}/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.bz2};
@@ -137,6 +141,9 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_MUSL_VERSION:=1.1.12};
 : ${PKG_MUSL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e};
 : ${PKG_MUSL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz};
+: ${PKG_PERK_URL:=${GITROOT}/perk};
+: ${PKG_PERK_URL_TYPE:=git};
+: ${PKG_PERK_CONFIGURE_ARGS="--prefix=/usr --target=${TARGET}"};
 : ${PKG_SLIBTOOL_URL:=git://midipix.org/slibtool};
 : ${PKG_SLIBTOOL_URL_TYPE:=git};
 : ${PKG_SLIBTOOL_CONFIGURE_ARGS="--host=${TARGET} --prefix=/ --target=${TARGET}"};