aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2019-04-17 11:02:04 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2019-04-17 11:02:04 +0200
commit87d43aff3f3dd79798d18fcddb5dd092229cf1df (patch)
treec8142f27b226cd7a8e4490fdfc9a1e4e23ff8850
parent72d3d9f7cebad705a7763790456b7df15158af4e (diff)
downloadaports-87d43aff3f3dd79798d18fcddb5dd092229cf1df.tar.bz2
aports-87d43aff3f3dd79798d18fcddb5dd092229cf1df.tar.xz
community/spim: remove aport
upstream for this particular version of spim is dead. Upstream is now maintaining a software called QtSpim which I am not interested in maintaining. From the spim website: The newest version of Spim is called QtSpim […] QtSpim is the version of Spim that currently being actively maintaned. The other versions are still available, but are no longer maintained or updated.
-rw-r--r--community/spim/APKBUILD39
-rw-r--r--community/spim/flex-2.6-compat.patch19
-rw-r--r--community/spim/respect-env.patch191
3 files changed, 0 insertions, 249 deletions
diff --git a/community/spim/APKBUILD b/community/spim/APKBUILD
deleted file mode 100644
index 0eca3e4922..0000000000
--- a/community/spim/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
-pkgname=spim
-pkgver=8.0
-pkgrel=3
-pkgdesc="Simulator for MIPS32"
-url="http://spimsimulator.sourceforge.net/"
-arch="all"
-license="BSD-3-Clause"
-depends=""
-depends_dev=""
-makedepends="bash flex bison"
-install=""
-subpackages="$pkgname-doc"
-source="http://pages.cs.wisc.edu/~larus/SPIM/${pkgname}-${pkgver}.tar.gz
- flex-2.6-compat.patch
- respect-env.patch"
-builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
- make configuration $pkgname \
- -C "$builddir"/$pkgname
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" -C $pkgname install
-
- install -Dm644 Documentation/spim.man \
- "$pkgdir"/usr/share/man/man1/spim.1
- for i in ChangeLog Documentation/BLURB README VERSION; do
- install -Dm644 $i \
- "$pkgdir"/usr/share/doc/$pkgname/${i##*/}
- done
-}
-
-sha512sums="c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf spim-8.0.tar.gz
-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
deleted file mode 100644
index d043659349..0000000000
--- a/community/spim/flex-2.6-compat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-spim-8.0 doesn't work with fex >= 2.6.0 [0]. This patch has been
-applied upstream [1] and fixes this bug.
-
-[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
- yyrestart(in_file);
--#if (YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33)
-+#define YY_FLEX_VERSION (YY_FLEX_MAJOR_VERSION * 1000 + YY_FLEX_MINOR_VERSION * 100 + YY_FLEX_SUBMINOR_VERSION)
-+#if YY_FLEX_VERSION >= 2533
- /* flex 2.5.33 flipped the polarity of this flag (sigh) */
- yy_init = 0;
- #else
diff --git a/community/spim/respect-env.patch b/community/spim/respect-env.patch
deleted file mode 100644
index da69699d9b..0000000000
--- a/community/spim/respect-env.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-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:
--BIN_DIR = /usr/local/bin
-+BIN_DIR = $(DESTDIR)/usr/bin
-
- # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib/spim
-+EXCEPTION_DIR = $(DESTDIR)/var/lib/spim
-
- # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/local/man/en
-+MAN_DIR = $(DESTDIR)/usr/share/man
-
-
- # If you have flex, use it instead of lex. If you use flex, define this
-@@ -104,11 +104,10 @@ ENDIAN=`cat configuration`
-
- DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""
-
--CC = gcc
--CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
-+CC ?= gcc
-+CFLAGS += -I. -I$(CPU_DIR) $(DEFINES) -Wall
- YFLAGS = -d --file-prefix=y
- YCFLAGS =
--LDFLAGS = -lm
- CSH = bash
-
- # lex.yy.c is usually compiled with -O to speed it up.
-@@ -122,10 +121,10 @@ OBJS = spim-utils.o run.o mem.o inst.o d
-
-
- spim: force
-- make -f Makefile spim2
-+ $(MAKE) -f Makefile spim2
-
- spim2: $(OBJS) spim.o
-- $(CC) -g $(OBJS) spim.o $(LDFLAGS) -o spim -lm
-+ $(CC) $(OBJS) spim.o $(LDFLAGS) -o spim -lm
-
-
- force: configuration
-@@ -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"
-- @tail -2 test.out
-+ @tail -n2 test.out
- @echo
-
- @echo
- @echo "Testing tt.core.s:"
- $(CSH) -c "./spim -ef $(CPU_DIR)/exceptions.s -file $(TEST_DIR)/tt.core.s < $(TEST_DIR)/tt.in >& test.out"
-- @tail -2 test.out
-+ @tail -n2 test.out
- @echo
-
- @echo
- @echo "Testing tt.endian.s:"
- $(CSH) -c "./spim -ef $(CPU_DIR)/exceptions.s -file $(TEST_DIR)/tt.endian.s >& test.out"
-- @tail -2 test.out
-+ @tail -n2 test.out
- @echo
- @echo
-
-@@ -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"
-- @tail -2 test.out
-+ @tail -n2 test.out
- @echo
-
- @echo
- @echo "Testing tt.fpt.bare.s:"
- $(CSH) -c "./spim -bare -noexception -file $(TEST_DIR)/tt.fpu.bare.s >& test.out"
-- @tail -2 test.out
-+ @tail -n2 test.out
- @echo
- @echo
-
-@@ -192,8 +191,6 @@ install: spim
- install -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)/exceptions.s
-
- install-man:
-- install -d $(MAN_DIR)
-- install -m 0444 $(DOC_DIR)/spim.man $(MAN_DIR)
-
- very-clean: clean
- rm -f configuration
-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
-
-- AR = ar clq
-+ AR = $(AR) clq
-
- # Nice try but useless: make will inherit BOOTSTRAPCFLAGS
- # from top Makefile
- BOOTSTRAPCFLAGS =
-
-- CC = gcc -m32
-- AS = gcc -m32 -c -x assembler
-+ CC ?= gcc -m32
-+ AS ?= gcc -m32 -c -x assembler
-
- .SUFFIXES: .cc
-
-- CXX = c++ -m32
-+ CXX ?= c++ -m32
-
- CXXFILT = c++filt
-
-@@ -199,14 +199,14 @@ CXXEXTRA_INCLUDES =
- COMPRESS = compress
- GZIPCMD = gzip
-
-- CPP = cpp $(STD_CPP_DEFINES)
-- RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
-- PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
-+ CPP = $(CPP) $(STD_CPP_DEFINES)
-+ RAWCPP = $(CPP) -undef $(STD_CPP_OPTIONS)
-+ PREPROCESSCMD = $(CC) -E $(STD_CPP_DEFINES)
-
- INSTALL = install
- INSTALLFLAGS = -c
-
-- LD = gcc -m32 -nostdlib
-+ LD ?= $(CC) -nostdlib
-
- LEX = flex -l
- M4 = m4
-@@ -270,18 +270,18 @@ CXXEXTRA_INCLUDES =
- COL = col
- COLFLAGS = -b
-
-- MODCC = gcc -m32
-+ MODCC ?= $(CC)
-
-- MODCPP = cpp
-+ MODCPP = $(CPP)
- MODCFLAGS = $(CFLAGS)
-- MODAS = gcc -m32 -c -x assembler
-+ MODAS ?= $(CC) -c -x assembler
- MODASFLAGS =
-
-- MODLD = gcc -m32 -nostdlib
-+ MODLD ?= $(CC) -nostdlib
-
- MODLDFLAGS =
- MODLDCOMBINEFLAGS = -r
-- MODAR = ar clq
-+ MODAR ?= $(AR) clq
-
- MODRANLIB = ranlib
-
-@@ -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)
-- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ CFLAGS += $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = $(INSTALLED_LIBS)
- LDPOSTLIB =
-@@ -339,9 +339,9 @@ MODLDCOMBINEFLAGS = -r
-
- LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-
-- CCLINK = $(CC)
-+ CCLINK = $(CC) $(LDFLAGS)
-
-- CXXLINK = $(CXX)
-+ CXXLINK = $(CXX) $(LDFLAGS)
-
- LDSTRIPFLAGS = -x
- LDCOMBINEFLAGS = -r