diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-05-14 11:24:24 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-05-14 11:24:24 +0000 |
commit | 9f536d91d690f72fdf5c4a0ebec0845cd6b497b1 (patch) | |
tree | 44a80448ec8450df61b0919ee4654c97f9984517 /lang | |
parent | 406d4e05dfb425e47a2230cd5c3d254782050f1b (diff) | |
download | pkgsrc-9f536d91d690f72fdf5c4a0ebec0845cd6b497b1.tar.gz |
Disable custom (and broken) Solaris linking, fixes 64-bit build.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/clisp/distinfo | 6 | ||||
-rw-r--r-- | lang/clisp/patches/patch-aa | 22 | ||||
-rw-r--r-- | lang/clisp/patches/patch-src_configure | 13 |
3 files changed, 31 insertions, 10 deletions
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo index 4a48d4ea4d6..6374c483652 100644 --- a/lang/clisp/distinfo +++ b/lang/clisp/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.28 2013/10/26 22:03:49 joerg Exp $ +$NetBSD: distinfo,v 1.29 2014/05/14 11:24:24 jperkin Exp $ SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323 RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76 Size (clisp-2.49.tar.gz) = 9823111 bytes -SHA1 (patch-aa) = 1a0af21eb2c2de898a7cb3500ce72f15581bfeb8 +SHA1 (patch-aa) = aa7e25685ed5818f45b550eba0011683dc36bc90 SHA1 (patch-ab) = 225873ed24e4a1f343acc8e3163c8151e9958c77 SHA1 (patch-ac) = c31fcd65d7d37aeaf69c0eee9499bff596b6619b -SHA1 (patch-src_configure) = 3bd4462cf8bb54ec68e03dd10076b4b09a172fc7 +SHA1 (patch-src_configure) = 861681456cb768b7f308aa88e77f1cee1edb2090 SHA1 (patch-src_lispbibl.d) = 122cdcc570065b7518b391d9433c5994c3925880 diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa index 846961fae8d..d72125d15b7 100644 --- a/lang/clisp/patches/patch-aa +++ b/lang/clisp/patches/patch-aa @@ -1,12 +1,13 @@ -$NetBSD: patch-aa,v 1.18 2010/07/09 18:08:05 asau Exp $ +$NetBSD: patch-aa,v 1.19 2014/05/14 11:24:25 jperkin Exp $ Override library subdirectory name for consistency. Don't use cache file to avoid trailing space problem. Support staged installation of modules. +Fix SunOS linking. ---- src/makemake.in.orig 2010-07-07 19:15:35.000000000 +0400 -+++ src/makemake.in 2010-07-08 01:39:27.000000000 +0400 -@@ -1416,42 +1416,42 @@ +--- src/makemake.in.orig 2010-07-07 15:15:35.000000000 +0000 ++++ src/makemake.in +@@ -1416,42 +1416,42 @@ if [ "${with_dynamic_modules}" != no ]; XCC_PICFLAG='' ;; esac @@ -63,7 +64,16 @@ Support staged installation of modules. ;; *) echo "$0: how do you create a shared library on ${host_os}?" >&2; ;; -@@ -1917,7 +1917,7 @@ +@@ -1542,7 +1542,7 @@ if [ $CROSS = false ] ; then + # Newer versions of Solaris (Solaris 2.2 and newer) don't have + # libdl_stubs.a any more. This means that you cannot link -static ! + XCLFLAGS=`echol "$XCLFLAGS" | sed -e 's/-B*static//g'` +- SOLARIS_LINKING=1 # Even more hacks needed?? ++ SOLARIS_LINKING= # Even more hacks needed?? + BINARY_DISTRIB=1 + ;; + hpux*) +@@ -1917,7 +1917,7 @@ echol "htmldir = ${HTMLDIR}" echol "psdir = ${PSDIR}" echol "pdfdir = ${PDFDIR}" echol "libdir = ${LIBDIR}" @@ -72,7 +82,7 @@ Support staged installation of modules. test -n "$USE_GETTEXT" && echol "localedir = ${LOCALEDIR}" echol "elispdir = ${ELISPDIR}" echol "vimdir = ${VIMDIR}" -@@ -3315,7 +3315,7 @@ +@@ -3315,7 +3315,7 @@ for var in ${PRECIOUS_VARS}; do done # we must use $(SHELL) for sub-configures because when the top CONFIG_SHELL # is bash, config.cache may be unparsable with sh on Solaris diff --git a/lang/clisp/patches/patch-src_configure b/lang/clisp/patches/patch-src_configure index b5cd4308f0b..0ef2a35e9c4 100644 --- a/lang/clisp/patches/patch-src_configure +++ b/lang/clisp/patches/patch-src_configure @@ -1,4 +1,6 @@ -$NetBSD: patch-src_configure,v 1.1 2013/10/26 22:03:50 joerg Exp $ +$NetBSD: patch-src_configure,v 1.2 2014/05/14 11:24:25 jperkin Exp $ + +Fix shell syntax. --- src/configure.orig 2010-07-07 17:22:03.000000000 +0000 +++ src/configure @@ -47,6 +49,15 @@ $NetBSD: patch-src_configure,v 1.1 2013/10/26 22:03:50 joerg Exp $ done fi +@@ -22898,7 +22898,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cl_cv_have_ffcall" >&5 + $as_echo "$cl_cv_have_ffcall" >&6; } + if test $cl_use_ffcall = yes -a $cl_cv_have_ffcall = no; then +- if "$ac_cv_build" = "$ac_cv_host" ; then host_arg=""; ++ if test "$ac_cv_build" = "$ac_cv_host" ; then host_arg=""; + else host_arg=" --host=$ac_cv_host"; + fi + as_fn_error "despite --with-ffcall, FFCALL was not found @@ -23566,9 +23566,9 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |