racket: Manipulate TERMUX_PKG_SRCDIR after patch

This allows patching all files the normal way.

diff --git a/disabled-packages/racket/build.sh b/disabled-packages/racket/build.sh
index d9b40e6..a12ef3c 100644 (file)
--- a/disabled-packages/racket/build.sh
+++ b/disabled-packages/racket/build.sh
@@ -1,7 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://racket-lang.org
 TERMUX_PKG_DESCRIPTION="Full-spectrum programming language going beyond Lisp and Scheme"
-TERMUX_PKG_VERSION=6.6
+TERMUX_PKG_VERSION=6.7
 TERMUX_PKG_SRCURL=https://mirror.racket-lang.org/installers/${TERMUX_PKG_VERSION}/racket-minimal-${TERMUX_PKG_VERSION}-src-builtpkgs.tgz
+TERMUX_PKG_SHA256=4203d9b51a0de7ea549db966cfa49a736f8605ab51e2f198cbdb9cfaf428b0f3
 TERMUX_PKG_FOLDERNAME=racket-${TERMUX_PKG_VERSION}
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_DEPENDS="libffi, libandroid-support"
@@ -12,15 +13,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-racket=$TERMUX_PKG_HOSTBUILD_DIR/racke
 _CROSS_LIBTOOL_DIR=$TERMUX_PKG_CACHEDIR/libtool-cross-2.4.6-${TERMUX_HOST_PLATFORM}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-lt=$_CROSS_LIBTOOL_DIR/bin/${TERMUX_HOST_PLATFORM}-libtool"
 
-termux_step_pre_configure () {
-  LDFLAGS+=" -llog"
-}
-
-termux_step_pre_make () {
-       cd "$TERMUX_PKG_SRCDIR/.."
-       sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PKG_BUILDER_DIR/system.rkt.patch.special | patch -p1
-}
-
 termux_step_post_extract_package () {
        if [ ! -d $_CROSS_LIBTOOL_DIR ]; then
                LIBTOOL_TARFILE=$TERMUX_PKG_CACHEDIR/libtool-2.4.6.tar.gz
@@ -33,6 +25,17 @@ termux_step_post_extract_package () {
                ./configure --prefix=$_CROSS_LIBTOOL_DIR --host=$TERMUX_HOST_PLATFORM --program-prefix=${TERMUX_HOST_PLATFORM}-
                make install
        fi
+}
+
+termux_step_host_build () {
+       $TERMUX_PKG_SRCDIR/src/configure ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
+       make -j $TERMUX_MAKE_PROCESSES
+}
+
+termux_step_pre_configure () {
+       # Due to use of syslog.
+       LDFLAGS+=" -llog"
 
+       # Do this after patching:
        export TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
 }

diff --git a/disabled-packages/racket/system.rkt.patch.special b/disabled-packages/racket/collects-racket-system.rkt.patch
similarity index 61%
rename from disabled-packages/racket/system.rkt.patch.special
rename to disabled-packages/racket/collects-racket-system.rkt.patch
index e70955e..317dfa5 100644 (file)
--- a/disabled-packages/racket/system.rkt.patch.special
+++ b/disabled-packages/racket/collects-racket-system.rkt.patch
@@ -1,7 +1,6 @@
-diff -u -r a/collects/racket/system.rkt ./collects/racket/system.rkt
-index 9de72fe..78beae6 100644
---- a/racket/collects/racket/system.rkt
-+++ ./collects/racket/system.rkt
+diff -u -r ../racket-6.6/collects/racket/system.rkt ./collects/racket/system.rkt
+--- ../racket-6.6/collects/racket/system.rkt   2016-04-15 16:33:56.000000000 -0400
++++ ./collects/racket/system.rkt       2016-11-22 16:45:09.576844179 -0500
 @@ -17,7 +17,7 @@
  
  (define (shell-path/args who argstr)

diff --git a/disabled-packages/racket/port.c.patch b/disabled-packages/racket/port.c.patch
index a9e5b12..a276c42 100644 (file)
--- a/disabled-packages/racket/port.c.patch
+++ b/disabled-packages/racket/port.c.patch
@@ -4,9 +4,9 @@ equivalent sysconf(_SC_OPEN_MAX)."
 
 - https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/AXhZapYuHi8
 
-diff -u -r ../../racket-6.4/src/racket/src/port.c ./racket/src/port.c
+diff -u -r ../../racket-6.4/src/racket/src/port.c ./racket/src/src/port.c
 --- ../../racket-6.4/src/racket/src/port.c     2016-01-14 12:11:20.000000000 -0500
-+++ ./racket/src/port.c        2016-04-10 17:43:40.039414493 -0400
++++ ./src/racket/src/port.c    2016-04-10 17:43:40.039414493 -0400
 @@ -1090,7 +1090,7 @@
  # ifdef USE_ULIMIT
      dynamic_fd_size = ulimit(4, 0);