From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-lang/icon/files/icon-9.4.3-flags.patch | 62 ++++++++++++++++ dev-lang/icon/files/icon-9.5.0-flags.patch | 75 +++++++++++++++++++ dev-lang/icon/files/icon-9.5.1-flags.patch | 75 +++++++++++++++++++ dev-lang/icon/files/tests-943.patch | 113 +++++++++++++++++++++++++++++ 4 files changed, 325 insertions(+) create mode 100644 dev-lang/icon/files/icon-9.4.3-flags.patch create mode 100644 dev-lang/icon/files/icon-9.5.0-flags.patch create mode 100644 dev-lang/icon/files/icon-9.5.1-flags.patch create mode 100644 dev-lang/icon/files/tests-943.patch (limited to 'dev-lang/icon/files') diff --git a/dev-lang/icon/files/icon-9.4.3-flags.patch b/dev-lang/icon/files/icon-9.4.3-flags.patch new file mode 100644 index 000000000000..cdb5adcd1b4e --- /dev/null +++ b/dev-lang/icon/files/icon-9.4.3-flags.patch @@ -0,0 +1,62 @@ +--- icon.v943src/ipl/cfuncs/Makefile ++++ icon.v943src/ipl/cfuncs/Makefile +@@ -25,7 +25,7 @@ + # library + + $(FUNCLIB): $(FUNCS) mklib.sh +- CC="$(CC)" CFLAGS="$(CFLAGS)" sh mklib.sh $(FUNCLIB) $(FUNCS) ++ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" sh mklib.sh $(FUNCLIB) $(FUNCS) + $(FUNCS): icall.h + + +--- icon.v943src/ipl/cfuncs/mklib.sh ++++ icon.v943src/ipl/cfuncs/mklib.sh +@@ -11,7 +11,7 @@ + set -x + case "$SYS" in + Linux*|*BSD*|GNU*) +- gcc -shared -o $LIBNAME -fPIC "$@";; ++ $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";; + Darwin*) + cc -bundle -undefined suppress -flat_namespace -o $LIBNAME "$@";; + SunOS*) +--- icon.v943src/src/common/Makefile ++++ icon.v943src/src/common/Makefile +@@ -8,7 +8,7 @@ + common: doincl $(OBJS) gpxmaybe + + doincl: doincl.c ../h/arch.h +- $(CC) $(CFLAGS) -o doincl doincl.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o doincl doincl.c + -./doincl -o ../../bin/rt.h ../h/rt.h + + patchstr: patchstr.c +@@ -29,7 +29,7 @@ + ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h + + ../h/arch.h: infer.c +- $(CC) $(CFLAGS) -o infer infer.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o infer infer.c + ./infer >../h/arch.h + + identify.o: ../h/version.h +@@ -46,7 +46,7 @@ + + # for rswitch, $(CFLAGS) is deliberately omitted (-O may cause problems) + rswitch.o: ../h/define.h ../h/arch.h $(RSW) +- $(CC) -c $(RSW) ++ $(CC) $(CFLAGS) -O0 -c $(RSW) + + + # The following section is needed if changes are made to the Icon grammar, +--- icon.v943src/src/runtime/Makefile ++++ icon.v943src/src/runtime/Makefile +@@ -39,7 +39,7 @@ + + iconx: $(OBJS) + cd ../common; $(MAKE) +- $(CC) $(RLINK) -o iconx $(OBJS) $(XL) $(RLIBS) $(TL) ++ $(CC) $(LDFLAGS) $(RLINK) -o iconx $(OBJS) $(XL) $(RLIBS) $(TL) + cp iconx ../../bin + strip $(SFLAGS) ../../bin/iconx$(EXE) + diff --git a/dev-lang/icon/files/icon-9.5.0-flags.patch b/dev-lang/icon/files/icon-9.5.0-flags.patch new file mode 100644 index 000000000000..33fa9485c206 --- /dev/null +++ b/dev-lang/icon/files/icon-9.5.0-flags.patch @@ -0,0 +1,75 @@ +--- icon-v950src/ipl/cfuncs/Makefile ++++ icon-v950src/ipl/cfuncs/Makefile +@@ -25,7 +25,7 @@ + # library + + $(FUNCLIB): $(FUNCS) mklib.sh +- CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../bin" \ ++ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../bin" \ + sh mklib.sh $(FUNCLIB) $(FUNCS) + $(FUNCS): icall.h + +--- icon-v950src/ipl/cfuncs/mklib.sh ++++ icon-v950src/ipl/cfuncs/mklib.sh +@@ -12,7 +12,7 @@ + set -x + case "$SYS" in + Linux*|*BSD*|GNU*) +- $CC -shared -o $LIBNAME -fPIC "$@";; ++ $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";; + CYGWIN*) + # move the win32 import library for iconx.exe callbacks + # created when iconx.exe was built +--- icon-v950src/ipl/packs/loadfunc/Makefile ++++ icon-v950src/ipl/packs/loadfunc/Makefile +@@ -28,7 +28,7 @@ + echo '$$define FUNCLIB "./$(FUNCLIB)"' >libnames.icn + + $(FUNCLIB): $(FUNCS) +- CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../../bin" \ ++ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../../bin" \ + sh $(MKLIB) $(FUNCLIB) $(FUNCS) + + +--- icon-v950src/src/common/Makefile ++++ icon-v950src/src/common/Makefile +@@ -8,7 +8,7 @@ + common: $(OBJS) gpxmaybe + + patchstr: patchstr.c +- $(CC) $(CFLAGS) -o patchstr patchstr.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o patchstr patchstr.c + + gpxmaybe: + -if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi +@@ -25,7 +25,7 @@ + ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h + + ../h/arch.h: infer.c +- $(CC) $(CFLAGS) -o infer infer.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o infer infer.c + ./infer >../h/arch.h + + identify.o: ../h/version.h +--- icon-v950src/src/rtt/Makefile ++++ icon-v950src/src/rtt/Makefile +@@ -22,7 +22,7 @@ + + + rtt: $(OBJ) +- $(CC) $(LDFLAGS) -o rtt $(OBJ) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o rtt $(OBJ) + + library: $(OBJ) + rm -rf rtt.a +--- icon-v950src/src/runtime/Makefile ++++ icon-v950src/src/runtime/Makefile +@@ -30,7 +30,7 @@ + + iconx: $(COBJS) $(XOBJS) + cd ../common; $(MAKE) +- $(CC) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS) + cp iconx ../../bin + strip $(SFLAGS) ../../bin/iconx$(EXE) + diff --git a/dev-lang/icon/files/icon-9.5.1-flags.patch b/dev-lang/icon/files/icon-9.5.1-flags.patch new file mode 100644 index 000000000000..ff659b28bbc2 --- /dev/null +++ b/dev-lang/icon/files/icon-9.5.1-flags.patch @@ -0,0 +1,75 @@ +--- icon-v951src/ipl/cfuncs/Makefile ++++ icon-v951src/ipl/cfuncs/Makefile +@@ -25,7 +25,7 @@ + # library + + $(FUNCLIB): $(FUNCS) mklib.sh +- CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../bin" \ ++ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../bin" \ + sh mklib.sh $(FUNCLIB) $(FUNCS) + $(FUNCS): icall.h + +--- icon-v951src/ipl/cfuncs/mklib.sh ++++ icon-v951src/ipl/cfuncs/mklib.sh +@@ -12,7 +12,7 @@ + set -x + case "$SYS" in + Linux*|*BSD*|GNU*) +- $CC -shared -o $LIBNAME -fPIC "$@";; ++ $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";; + CYGWIN*) + # move the win32 import library for iconx.exe callbacks + # created when iconx.exe was built +--- icon-v951src/ipl/packs/loadfunc/Makefile ++++ icon-v951src/ipl/packs/loadfunc/Makefile +@@ -28,7 +28,7 @@ + echo '$$define FUNCLIB "./$(FUNCLIB)"' >libnames.icn + + $(FUNCLIB): $(FUNCS) +- CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../../bin" \ ++ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../../bin" \ + sh $(MKLIB) $(FUNCLIB) $(FUNCS) + + +--- icon-v951src/src/common/Makefile ++++ icon-v951src/src/common/Makefile +@@ -8,7 +8,7 @@ + common: $(OBJS) gpxmaybe + + patchstr: patchstr.c +- $(CC) $(CFLAGS) -o patchstr patchstr.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o patchstr patchstr.c + + gpxmaybe: + -if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi +@@ -25,7 +25,7 @@ + ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h + + ../h/arch.h: infer.c +- $(CC) $(CFLAGS) -o infer infer.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o infer infer.c + ./infer >../h/arch.h + + identify.o: ../h/version.h +--- icon-v951src/src/rtt/Makefile ++++ icon-v951src/src/rtt/Makefile +@@ -22,7 +22,7 @@ + + + rtt: $(OBJ) +- $(CC) $(LDFLAGS) -o rtt $(OBJ) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o rtt $(OBJ) + + library: $(OBJ) + rm -rf rtt.a +--- icon-v951src/src/runtime/Makefile ++++ icon-v951src/src/runtime/Makefile +@@ -30,7 +30,7 @@ + + iconx: $(COBJS) $(XOBJS) + cd ../common; $(MAKE) +- $(CC) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS) + cp iconx ../../bin + strip $(SFLAGS) ../../bin/iconx$(EXE) + diff --git a/dev-lang/icon/files/tests-943.patch b/dev-lang/icon/files/tests-943.patch new file mode 100644 index 000000000000..75108cab1936 --- /dev/null +++ b/dev-lang/icon/files/tests-943.patch @@ -0,0 +1,113 @@ +diff -uprN icon.v943src_base/tests/general/io.icn icon.v943src/tests/general/io.icn +--- icon.v943src_base/tests/general/io.icn 2002-03-11 14:21:18.000000000 -0700 ++++ icon.v943src/tests/general/io.icn 2006-04-01 10:35:14.590948251 -0700 +@@ -6,7 +6,7 @@ procedure main() + local L, f, m, n, t1, t2 + + L := [&input, &output, &errout, +- m := open("/etc/motd") | stop("no /etc/motd"), ++ m := open("/etc/gentoo-release") | stop("no /etc/gentoo-release"), + n := open("/dev/null", "w") | stop("no /dev/null")] + L := sort(L) + every f := !L do +@@ -21,10 +21,10 @@ procedure main() + every write(!&input) \ 2 + + write() +- write("flush /etc/motd: ", image(flush(m)) | "FAILED") +- write("close /etc/motd: ", image(close(m)) | "FAILED") +- write("close /etc/motd: ", image(close(m)) | "FAILED") +- write("flush /etc/motd: ", image(flush(m)) | "FAILED") ++ write("flush /etc/gentoo-release: ", image(flush(m)) | "FAILED") ++ write("close /etc/gentoo-release: ", image(close(m)) | "FAILED") ++ write("close /etc/gentoo-release: ", image(close(m)) | "FAILED") ++ write("flush /etc/gentoo-release: ", image(flush(m)) | "FAILED") + + write() + write("flush /dev/null: ", image(flush(n)) | "FAILED") +diff -uprN icon.v943src_base/tests/general/io.std icon.v943src/tests/general/io.std +--- icon.v943src_base/tests/general/io.std 2002-03-11 14:21:18.000000000 -0700 ++++ icon.v943src/tests/general/io.std 2006-04-01 10:35:31.071362086 -0700 +@@ -2,7 +2,7 @@ file: &errout + file: &input + file: &output + file: file(/dev/null) +-file: file(/etc/motd) ++file: file(/etc/gentoo-release) + + aaa + bbbb +@@ -13,10 +13,10 @@ ffffffff + ggggggggg + hhhhhhhhhh + +-flush /etc/motd: file(/etc/motd) +-close /etc/motd: file(/etc/motd) +-close /etc/motd: file(/etc/motd) +-flush /etc/motd: file(/etc/motd) ++flush /etc/gentoo-release: file(/etc/gentoo-release) ++close /etc/gentoo-release: file(/etc/gentoo-release) ++close /etc/gentoo-release: file(/etc/gentoo-release) ++flush /etc/gentoo-release: file(/etc/gentoo-release) + + flush /dev/null: file(/dev/null) + close /dev/null: file(/dev/null) +@@ -109,7 +109,7 @@ file(sed 's/^/=()= /' io.icn) + > =()= local L, f, m, n, t1, t2 + > =()= + > =()= L := [&input, &output, &errout, +-> =()= m := open("/etc/motd") | stop("no /etc/motd"), ++> =()= m := open("/etc/gentoo-release") | stop("no /etc/gentoo-release"), + > =()= n := open("/dev/null", "w") | stop("no /dev/null")] + + file(ls io.i?n io.d?t io.s?d) +diff -uprN icon.v943src_base/tests/general/kwds.std icon.v943src/tests/general/kwds.std +--- icon.v943src_base/tests/general/kwds.std 2002-07-10 18:29:28.000000000 -0600 ++++ icon.v943src/tests/general/kwds.std 2006-04-01 10:35:37.103317654 -0700 +@@ -20,8 +20,10 @@ + &features: ASCII + &features: co-expressions + &features: environment variables ++ &features: event monitoring + &features: keyboard functions + &features: large integers ++ &features: multiple programs + &features: pipes + &features: system function + &input: &input +diff -uprN icon.v943src_base/tests/general/nargs.std icon.v943src/tests/general/nargs.std +--- icon.v943src_base/tests/general/nargs.std 2001-12-06 15:54:01.000000000 -0700 ++++ icon.v943src/tests/general/nargs.std 2006-04-01 10:35:43.282223496 -0700 +@@ -15,7 +15,7 @@ + 1 delay + 2 delete + -2 detab +- 2 display ++ 3 display + 1 dtor + -2 entab + 0 errorclear +@@ -43,12 +43,12 @@ + 4 match + 2 member + 1 move +- 1 name ++ 2 name + 1 numeric + 1 ord + 1 pop + 1 pos +- 2 proc ++ 3 proc + 1 pull + -2 push + -2 put +@@ -79,7 +79,7 @@ + 2 trim + 1 type + 4 upto +- 1 variable ++ 3 variable + 1 where + -1 write + -1 writes -- cgit v1.2.3