From e9d704710d86de79785164dd7b75fe7e7f46da55 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Fri, 1 Apr 2016 19:35:23 +0100 Subject: development/racket: Updated for version 6.4. Fixes build failure. Signed-off-by: David Spencer --- development/racket/racket.SlackBuild | 15 +++--- development/racket/racket.info | 6 +-- .../racket/xform-errors-converting-fix.patch | 57 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 development/racket/xform-errors-converting-fix.patch (limited to 'development') diff --git a/development/racket/racket.SlackBuild b/development/racket/racket.SlackBuild index d6986812f8..e9bb528a37 100644 --- a/development/racket/racket.SlackBuild +++ b/development/racket/racket.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=racket -VERSION=${VERSION:-6.3} +VERSION=${VERSION:-6.4} SUFFIX=src # suffix of the UNIX sourcepackage BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,10 +70,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# https://github.com/racket/racket/issues/1222 +# http://copr-dist-git.fedorainfracloud.org/cgit/bthomas/racket/racket.git/plain/xform-errors-converting-fix.patch +patch -p1 < $CWD/xform-errors-converting-fix.patch + mkdir src/build cd src/build + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -81,7 +86,6 @@ cd src/build --datadir=/usr/share/$PRGNAM \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux - make make install DESTDIR=$PKG @@ -91,8 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -cd .. -mkdir $PKG/usr/doc/$PRGNAM-$VERSION/ +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/racket/racket.info b/development/racket/racket.info index e24b395630..58d3934c70 100644 --- a/development/racket/racket.info +++ b/development/racket/racket.info @@ -1,8 +1,8 @@ PRGNAM="racket" -VERSION="6.3" +VERSION="6.4" HOMEPAGE="http://racket-lang.org/" -DOWNLOAD="http://mirror.informatik.uni-tuebingen.de/mirror/racket/6.3/racket-6.3-src.tgz" -MD5SUM="006e110f0fafdd52ceeb461c5c89aed9" +DOWNLOAD="http://mirror.informatik.uni-tuebingen.de/mirror/racket/6.4/racket-6.4-src.tgz" +MD5SUM="9938340227b3f31843dc87cb17ec21c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/racket/xform-errors-converting-fix.patch b/development/racket/xform-errors-converting-fix.patch new file mode 100644 index 0000000000..687d653f4e --- /dev/null +++ b/development/racket/xform-errors-converting-fix.patch @@ -0,0 +1,57 @@ +diff -Naur racket-6.3/src/racket/src/bool.c my-racket-6.3/src/racket/src/bool.c +--- racket-6.3/src/racket/src/bool.c 2015-10-16 17:00:55.000000000 -0400 ++++ my-racket-6.3/src/racket/src/bool.c 2016-01-23 12:04:20.710628127 -0500 +@@ -202,6 +202,9 @@ + return SAME_OBJ(obj1, obj2); + } + ++#ifdef MZ_XFORM ++START_XFORM_SKIP; ++#endif + #ifdef MZ_LONG_DOUBLE + XFORM_NONGCING static MZ_INLINE int mz_long_double_eqv(long_double a, long_double b) + { +@@ -239,6 +242,10 @@ + # endif + } + #endif ++ ++#ifdef MZ_XFORM ++START_XFORM_SKIP; ++#endif + XFORM_NONGCING static MZ_INLINE int double_eqv(double a, double b) + { + # ifndef NAN_EQUALS_ANYTHING +@@ -419,6 +426,9 @@ + + return -1; + } ++#ifdef MZ_XFORM ++END_XFORM_SKIP; ++#endif + + int is_slow_equal (Scheme_Object *obj1, Scheme_Object *obj2) + { +diff -Naur racket-6.3/src/racket/src/number.c my-racket-6.3/src/racket/src/number.c +--- racket-6.3/src/racket/src/number.c 2015-10-16 17:00:55.000000000 -0400 ++++ my-racket-6.3/src/racket/src/number.c 2016-01-23 12:05:08.076767488 -0500 +@@ -1917,6 +1917,9 @@ + return (is_rational(argv[0]) ? scheme_true : scheme_false); + } + ++#ifdef MZ_XFORM ++START_XFORM_SKIP; ++#endif + XFORM_NONGCING static int double_is_integer(double d) + { + # ifdef NAN_EQUALS_ANYTHING +@@ -1943,6 +1946,9 @@ + + return 0; + } ++#ifdef MZ_XFORM ++END_XFORM_SKIP; ++#endif + + + static Scheme_Object * -- cgit v1.2.3