tinyscheme: Fix non-PIE binary and init.scm path

Fixes #134.
9 years ago · eba3897713
3 changed files with 28 additions and 3 deletions
--- a/packages/tinyscheme/build.sh
+++ b/packages/tinyscheme/build.sh
@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://tinyscheme.sourceforge.net/home.html
 TERMUX_PKG_DESCRIPTION="Very small scheme implementation"
 TERMUX_PKG_VERSION=1.41
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tinyscheme/tinyscheme/tinyscheme-1.41/tinyscheme-1.41.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
-# TERMUX_PKG_DEPENDS="pcre, openssl, libuuid"
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl --disable-iri"

 AR+=" crs"
 LD=$CC
@ -15,3 +14,8 @@ LD=$CC
 #TSX_TARFILE=$TERMUX_PKG_CACHEDIR/tsx-1.1.tar.gz
 #test ! -f $TSX_TARFILE && curl -o $TSX_TARFILE "http://heras-gilsanz.com/manuel/tsx-1.1.tgz"
 #}
+
+termux_step_post_make_install () {
+	mkdir -p $TERMUX_PREFIX/share/tinyscheme/
+	cp $TERMUX_PKG_SRCDIR/init.scm $TERMUX_PREFIX/share/tinyscheme/
+}
--- a/packages/tinyscheme/makefile.patch
+++ b/packages/tinyscheme/makefile.patch
@ -1,6 +1,6 @@
 diff -u -r ../tinyscheme-1.41/makefile ./makefile
 --- ../tinyscheme-1.41/makefile	2013-04-14 16:08:33.000000000 -0400
-+++ ./makefile	2016-01-24 18:02:10.122962806 -0500
+++ ./makefile	2016-02-03 07:50:01.896212523 -0500
@@ -18,7 +18,6 @@
 #AR= echo
 
@ -21,6 +21,15 @@ diff -u -r ../tinyscheme-1.41/makefile ./makefile
 DEBUG=-g -Wno-char-subscripts -O
 SYS_LIBS= -ldl -lm
 PLATFORM_FEATURES= -DSUN_DL=1
+@@ -77,7 +73,7 @@
+ 	$(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS)
+ 
+ scheme$(EXE_EXT): $(OBJS)
+-	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
+	$(CC) $(CFLAGS) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
+ 
+ $(STATICLIBTARGET): $(OBJS)
+ 	$(AR) $@ $(OBJS)
@@ -96,3 +92,6 @@
 tags: TAGS
 TAGS: $(TAGS_SRCS)
--- a/packages/tinyscheme/schema.c.patch
+++ b/packages/tinyscheme/schema.c.patch
@ -0,0 +1,12 @@
+diff -u -r ../tinyscheme-1.41/scheme.c ./scheme.c
+--- ../tinyscheme-1.41/scheme.c	2013-04-14 16:08:33.000000000 -0400
+++ ./scheme.c	2016-02-03 08:22:19.137873950 -0500
+@@ -101,7 +101,7 @@
+ #endif
+ 
+ #ifndef InitFile
+-# define InitFile "init.scm"
+# define InitFile "@TERMUX_PREFIX@/share/tinyscheme/init.scm"
+ #endif
+ 
+ #ifndef FIRST_CELLSEGS