summaryrefslogtreecommitdiffhomepage
path: root/nc110.local.patch
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-06-28 19:38:43 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>2016-06-28 19:38:54 +0000
commit9e86930c227028d8b4caa043ce9653645405824e (patch)
tree15840e3551eab14c5eea96fc0e567087fec0bfda /nc110.local.patch
parent77171dc9e46707351014190ef7bf2fbefe1921a7 (diff)
downloadmidipix_build-9e86930c227028d8b4caa043ce9653645405824e.tar.bz2
midipix_build-9e86930c227028d8b4caa043ce9653645405824e.tar.xz
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.
Diffstat (limited to 'nc110.local.patch')
-rw-r--r--nc110.local.patch26
1 files changed, 25 insertions, 1 deletions
diff --git a/nc110.local.patch b/nc110.local.patch
index 92976f94..052ef4f6 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