diff options
| -rw-r--r-- | community/spim/APKBUILD | 6 | ||||
| -rw-r--r-- | community/spim/flex-2.6-compat.patch | 17 | ||||
| -rw-r--r-- | community/spim/respect-env.patch | 38 |
3 files changed, 33 insertions, 28 deletions
diff --git a/community/spim/APKBUILD b/community/spim/APKBUILD index 4e585c6c6a..86c35b7173 100644 --- a/community/spim/APKBUILD +++ b/community/spim/APKBUILD @@ -15,8 +15,6 @@ subpackages="$pkgname-doc" source="http://pages.cs.wisc.edu/~larus/SPIM/${pkgname}-${pkgver}.tar.gz flex-2.6-compat.patch respect-env.patch" - -patch_args="-p0" builddir="$srcdir"/$pkgname-$pkgver build() { @@ -37,5 +35,5 @@ package() { } sha512sums="c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf spim-8.0.tar.gz -787df8e61cb4dd11a6dfdd217d1c990a8335d2790cd6327faf09811094821c8485bd44990c934e699a877938f81777302fdd60845ac27afbd5dc5b9b59db0132 flex-2.6-compat.patch -68e9f39bbcee4524557389fac2a617b1b588f2df7a1a807ce8a646053345b6a5f7aba6dda23d4821283783b654baa01763923cb70501a03467c5302f173383ef respect-env.patch" +627507dbf2f8c8019372641a9ff04eace2b1db44e7e481efab795cfab22a44cb5d7fb847c8da59d3b74420ea73369d9c2692fecc1c115d9a8f128e31b2fbf059 flex-2.6-compat.patch +b8b685b044e2a640fb96fcf62c8c220b6de5f1f50a3add31b17f36d4b564c417195d0b9a25ed0c50ced429f066621bbc84124134a6ef62391a0e6531d6383919 respect-env.patch" diff --git a/community/spim/flex-2.6-compat.patch b/community/spim/flex-2.6-compat.patch index 596e76bb3f..d043659349 100644 --- a/community/spim/flex-2.6-compat.patch +++ b/community/spim/flex-2.6-compat.patch @@ -1,13 +1,12 @@ -Description: Fix parsing when built with flex 2.6 -Origin: https://sourceforge.net/p/spimsimulator/code/679/ -Bug: https://sourceforge.net/p/spimsimulator/bugs/66/ -Bug-Debian: https://bugs.debian.org/860011 -Last-Update: 2017-04-20 +spim-8.0 doesn't work with fex >= 2.6.0 [0]. This patch has been +applied upstream [1] and fixes this bug. -Index: CPU/scanner.l -=================================================================== ---- CPU/scanner.l -+++ CPU/scanner.l +[0]: https://sourceforge.net/p/spimsimulator/bugs/66/ +[1]: https://sourceforge.net/p/spimsimulator/code/679/ + +diff -upr spim-8.0.orig/CPU/scanner.l spim-8.0/CPU/scanner.l +--- spim-8.0.orig/CPU/scanner.l 2018-10-25 17:34:20.381424484 +0200 ++++ spim-8.0/CPU/scanner.l 2018-10-25 17:34:33.554843193 +0200 @@ -316,7 +316,8 @@ initialize_scanner (FILE *in_file) yyin = in_file; #ifdef FLEX_SCANNER diff --git a/community/spim/respect-env.patch b/community/spim/respect-env.patch index c7c8925c4e..da69699d9b 100644 --- a/community/spim/respect-env.patch +++ b/community/spim/respect-env.patch @@ -1,6 +1,13 @@ ---- spim/Makefile 2010-08-01 22:14:53.352906061 +0200 -+++ spim/Makefile 2010-08-01 22:15:00.994905920 +0200 -@@ -66,13 +66,13 @@ +This patch has been taken from Gentoo [0] it is required because the +spim build system doesn't pickup our environment variables for +configuring the compilation process (e.g. CC, CFLAGS, LDFLAGS, …). + +[0]: https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/spim/files/spim-8.0-r1-respect_env.patch + +diff -upr spim-8.0.orig/spim/Makefile spim-8.0/spim/Makefile +--- spim-8.0.orig/spim/Makefile 2018-10-25 17:33:32.657781846 +0200 ++++ spim-8.0/spim/Makefile 2018-10-25 17:33:38.627820543 +0200 +@@ -66,13 +66,13 @@ DOC_DIR = ../Documentation # Full path for the directory that will hold the executable files: @@ -17,7 +24,7 @@ # If you have flex, use it instead of lex. If you use flex, define this -@@ -104,11 +104,10 @@ +@@ -104,11 +104,10 @@ ENDIAN=`cat configuration` DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\"" @@ -31,7 +38,7 @@ CSH = bash # lex.yy.c is usually compiled with -O to speed it up. -@@ -122,10 +121,10 @@ +@@ -122,10 +121,10 @@ OBJS = spim-utils.o run.o mem.o inst.o d spim: force @@ -44,7 +51,7 @@ force: configuration -@@ -143,19 +142,19 @@ +@@ -143,19 +142,19 @@ test: spim @echo @echo "Testing tt.bare.s:" $(CSH) -c "./spim -delayed_branches -delayed_loads -noexception -file $(TEST_DIR)/tt.bare.s >& test.out" @@ -67,7 +74,7 @@ @echo @echo -@@ -166,13 +165,13 @@ +@@ -166,13 +165,13 @@ test_bare: spim @echo @echo "Testing tt.alu.bare.s:" $(CSH) -c "./spim -bare -noexception -file $(TEST_DIR)/tt.alu.bare.s >& test.out" @@ -83,7 +90,7 @@ @echo @echo -@@ -192,8 +191,6 @@ +@@ -192,8 +191,6 @@ install: spim install -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)/exceptions.s install-man: @@ -92,9 +99,10 @@ very-clean: clean rm -f configuration ---- xspim/Makefile 2010-08-01 22:14:53.351905921 +0200 -+++ xspim/Makefile 2010-08-01 22:26:08.361917058 +0200 -@@ -169,18 +169,18 @@ +diff -upr spim-8.0.orig/xspim/Makefile spim-8.0/xspim/Makefile +--- spim-8.0.orig/xspim/Makefile 2018-10-25 17:33:32.657781846 +0200 ++++ spim-8.0/xspim/Makefile 2018-10-25 17:33:38.631153898 +0200 +@@ -169,18 +169,18 @@ TCLIBDIR = /usr/lib VARDBDIR = $(VARDIR)/lib @@ -117,7 +125,7 @@ CXXFILT = c++filt -@@ -199,14 +199,14 @@ +@@ -199,14 +199,14 @@ CXXEXTRA_INCLUDES = COMPRESS = compress GZIPCMD = gzip @@ -136,7 +144,7 @@ LEX = flex -l M4 = m4 -@@ -270,18 +270,18 @@ +@@ -270,18 +270,18 @@ CXXEXTRA_INCLUDES = COL = col COLFLAGS = -b @@ -160,7 +168,7 @@ MODRANLIB = ranlib -@@ -330,7 +330,7 @@ +@@ -330,7 +330,7 @@ MODLDCOMBINEFLAGS = -r ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) @@ -169,7 +177,7 @@ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = $(INSTALLED_LIBS) LDPOSTLIB = -@@ -339,9 +339,9 @@ +@@ -339,9 +339,9 @@ MODLDCOMBINEFLAGS = -r LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) |