From 9e86930c227028d8b4caa043ce9653645405824e 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: Tue, 28 Jun 2016 19:38:43 +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. --- 004.psxstub.vars | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to '004.psxstub.vars') diff --git a/004.psxstub.vars b/004.psxstub.vars index 77c41c5a..2555db82 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; -- cgit v1.2.3