From 9e86930c227028d8b4caa043ce9653645405824e Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>
Date: Jun 28 2016 19:38:54 +0000
Subject: psxstub: removes local patch (committed upstream;) rm(1) libpsxscl.a when installing (fixes static linking.)

bash v4.3 and coreutils v8.23: link statically.
nc (netcat) v110: pass ${C,LDFLAGS} correctly.

---

diff --git a/004.psxstub.vars b/004.psxstub.vars
index 77c41c5..2555db8 100644
--- a/004.psxstub.vars
+++ b/004.psxstub.vars
@@ -3,16 +3,15 @@
 #
 
 pkg_psxstub_finish() {
-	if ! is_build_script_done patch; then
-		patch -b -d psxstub -p1			\
-			< ${MIDIPIX_BUILD_PWD}/psxstub.local.patch;
-		set_build_script_done patch -install;
-	fi;
 	if ! is_build_script_done install; then
 		if [ "${TARGET}" = i686-nt32-midipix ]	\
 		|| [ "${TARGET}" = x86_64-nt64-midipix ]; then
 			cd psxstub;
 			make ${MAKEFLAGS} DESTDIR=${PREFIX_LVL} TARGET=${TARGET} install;
+			if [ -e ${PREFIX_LVL}/lib/libpsxscl.a ]; then
+				echo rm -f ${PREFIX_LVL}/lib/libpsxscl.a;
+				rm -f ${PREFIX_LVL}/lib/libpsxscl.a;
+			fi;
 			set_build_script_done install finish;
 		fi;
 	fi;
diff --git a/build.vars b/build.vars
index 0e00ca6..968936f 100644
--- a/build.vars
+++ b/build.vars
@@ -98,7 +98,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_BASH_VERSION:=4.3};
 : ${PKG_BASH_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4};
 : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
-: ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"};
+: ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"};
 : ${PKG_BASH_PATCHES_EXTRA_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}-patches/};
 : ${PKG_BINUTILS_VERSION:=2.24.51};
 : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
@@ -114,7 +114,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_COREUTILS_VERSION:=8.23};
 : ${PKG_COREUTILS_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
-: ${PKG_COREUTILS_MAKEFLAGS_BUILD_EXTRA:="V=99"};
+: ${PKG_COREUTILS_LDFLAGS_BUILD_EXTRA:=-static};
+: ${PKG_COREUTILS_MAKEFLAGS_BUILD_EXTRA:="SHARED=0 V=99"};
 : ${PKG_CURL_VERSION:=7.47.1};
 : ${PKG_CURL_SHA256SUM:=ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.bz2};
@@ -304,6 +305,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_NETCAT_URL:=https://dl.packetstormsecurity.net/UNIX/netcat/nc110.tgz};
 : ${PKG_NETCAT_BUILD_DIR:=nc110};
 : ${PKG_NETCAT_MAKEFLAGS_BUILD_EXTRA:="midipix CC=${TARGET}-gcc"};
+: ${PKG_NETCAT_ENV_VARS_EXTRA:="CFLAGS_EXTRA=${PKG_LVL3_CFLAGS_CONFIGURE}:LDFLAGS=${PKG_LVL3_LDFLAGS_CONFIGURE}"};
 : ${PKG_NETCAT_SUBDIR:=${PKG_NETCAT_BUILD_DIR}};
 : ${PKG_NETCAT_SUBDIR_CREATE:=1};
 : ${PKG_OPENSSH_VERSION:=7.1p2};
diff --git a/nc110.local.patch b/nc110.local.patch
index 92976f9..052ef4f 100644
--- a/nc110.local.patch
+++ b/nc110.local.patch
@@ -1,5 +1,29 @@
 --- nc110/Makefile.orig	1996-03-20 03:16:06.000000000 +0000
-+++ nc110/Makefile	2016-06-15 18:44:05.819382228 +0000
++++ nc110/Makefile	2016-06-28 17:26:50.985424240 +0000
+@@ -9,12 +9,12 @@
+ # pick gcc if you'd rather , and/or do -g instead of -O if debugging
+ # debugging
+ # DFLAGS = -DTEST -DDEBUG
+-CFLAGS = -O
++CFLAGS = -O $(CFLAGS_EXTRA)
+ XFLAGS = 	# xtra cflags, set by systype targets
+ XLIBS =		# xtra libs if necessary?
+ # -Bstatic for sunos,  -static for gcc, etc.  You want this, trust me.
+ STATIC =
+-CC = cc $(CFLAGS)
++CC = cc ${CFLAGS}
+ LD = $(CC) -s	# linker; defaults to stripped executables
+ o = o		# object extension
+ 
+@@ -28,7 +28,7 @@
+ ### HARD TARGETS
+ 
+ nc:	netcat.c
+-	$(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
++	$(LD) $(CFLAGS) $(LDFLAGS) $(DFLAGS) $(XFLAGS) $(STATIC) -o nc netcat.c $(XLIBS)
+ 
+ nc-dos:
+ 	@echo "DOS?!  Maybe someday, but not now"
 @@ -109,6 +109,10 @@
  next:
  	make -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
diff --git a/psxstub.local.patch b/psxstub.local.patch
deleted file mode 100644
index a19da09..0000000
--- a/psxstub.local.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/stub.S b/stub.S
-index 1d6e11a..6874c51 100644
---- a/stub.S
-+++ b/stub.S
-@@ -1,8 +1,8 @@
- .text
- .globl __psx_init
- .globl ___psx_init
--.globl _so_entry_point
--.globl __so_entry_point
-+.weak  _so_entry_point
-+.weak  __so_entry_point
- 
- .def __psx_init;  .scl 2; .type 32; .endef
- .def ___psx_init; .scl 2; .type 32; .endef
-