9ca8ca0046
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=56
132 lines
5.1 KiB
Plaintext
132 lines
5.1 KiB
Plaintext
|
|
|
|
diff --git a/clisp-536a48a9/configure b/clisp-536a48a9/configure
|
|
--- a/clisp-536a48a9/configure
|
|
+++ b/clisp-536a48a9/configure
|
|
@@ -392,11 +392,11 @@ do
|
|
passnext=both ;;
|
|
|
|
--vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*)
|
|
- subdir_configure_args="$subdir_configure_args $arg"
|
|
+# subdir_configure_args="$subdir_configure_args $arg"
|
|
makemake_args="$makemake_args --vimdir="`getarg "$arg"` ;;
|
|
|
|
--vimdir | --vimdi | --vimd | --vim | --vi)
|
|
- subdir_configure_args="$subdir_configure_args $arg"
|
|
+# subdir_configure_args="$subdir_configure_args $arg"
|
|
makemake_args="$makemake_args --vimdir="
|
|
prev=vimdir
|
|
passnext=both ;;
|
|
diff --git a/clisp-536a48a9/src/lispbibl.d b/clisp-536a48a9/src/lispbibl.d
|
|
--- a/clisp-536a48a9/src/lispbibl.d
|
|
+++ b/clisp-536a48a9/src/lispbibl.d
|
|
@@ -66,7 +66,7 @@
|
|
#define PC386 /* IBMPC-compatible with 80386/80486-processor */
|
|
#endif
|
|
#ifdef GENERIC_UNIX
|
|
- #if (defined(unix) && (defined(linux) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
|
|
+ #if (defined(unix) && ((defined(linux) || defined(__linux__)) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
|
|
#define PC386
|
|
#endif
|
|
#if (defined(sun) && defined(unix) && defined(sparc))
|
|
@@ -167,8 +167,14 @@
|
|
#endif
|
|
#ifdef GENERIC_UNIX
|
|
#define UNIX
|
|
- #ifdef __linux__
|
|
+ #if defined(__linux__) || defined(linux)
|
|
#define UNIX_LINUX /* Linux (Linus Torvalds Unix) */
|
|
+ #ifndef linux
|
|
+ #define linux
|
|
+ #endif
|
|
+ #ifndef __linux__
|
|
+ #define __linux__
|
|
+ #endif
|
|
#endif
|
|
#ifdef __GNU__
|
|
#define UNIX_HURD /* the GNU system (Hurd + glibc) */
|
|
@@ -1110,7 +1116,7 @@ typedef signed int signean;
|
|
address of its component 'ident' and return it as number: */
|
|
#include <stddef.h>
|
|
#ifndef offsetof
|
|
- #define offsetof(type,ident) ((ULONG)&(((type*)0)->ident))
|
|
+ #define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
|
|
#endif
|
|
/* Determine the offset of an array 'ident' in a struct of the type 'type': */
|
|
#if defined(__cplusplus) || defined(MICROSOFT)
|
|
@@ -3148,9 +3154,9 @@ typedef signed_int_with_n_bits(intVsize)
|
|
type_data_object(type,data) */
|
|
#if defined(WIDE) && defined(WIDE_STRUCT)
|
|
#if BIG_ENDIAN_P==WIDE_ENDIANNESS
|
|
- #define type_data_object(type,data) ((object){{(tint)(type),(aint)(data)}INIT_ALLOCSTAMP})
|
|
+ #define type_data_object(type,data) (object){{(tint)(type),(aint)(data)}INIT_ALLOCSTAMP}
|
|
#else
|
|
- #define type_data_object(type,data) ((object){{(aint)(data),(tint)(type)}INIT_ALLOCSTAMP})
|
|
+ #define type_data_object(type,data) (object){{(aint)(data),(tint)(type)}INIT_ALLOCSTAMP}
|
|
#endif
|
|
#elif !(oint_addr_shift==0)
|
|
#define type_data_object(type,data) \
|
|
diff --git a/clisp-536a48a9/src/makemake.in b/clisp-536a48a9/src/makemake.in
|
|
--- a/clisp-536a48a9/src/makemake.in
|
|
+++ b/clisp-536a48a9/src/makemake.in
|
|
@@ -246,6 +246,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
|
|
# Handle --with-... arguments
|
|
while test -z "$endofargs"; do
|
|
case "$1" in
|
|
+ -ignore* | --ignore* )
|
|
+ shift
|
|
+ ;;
|
|
-verb* | --verb* )
|
|
verbose=`echol "$1"|sed 's/-*v[^=]*=*//'`
|
|
test -n "${verbose}" || verbose=true
|
|
@@ -1115,6 +1118,7 @@ else
|
|
fi
|
|
|
|
# Main cpu dependencies:
|
|
+set -x
|
|
cpu=$host_cpu_c_abi
|
|
if test -z "$cpu"; then
|
|
echo "$0: WARNING: host_cpu_c_abi is void; using host_cpu=${host_cpu}" >&2
|
|
@@ -1125,6 +1129,7 @@ if test -z "$cpu"; then
|
|
* ) cpu=${host_cpu}
|
|
esac
|
|
fi
|
|
+set +x
|
|
|
|
test "${verbose}" = true -o "${verbose}" = yes && \
|
|
cat <<EOF >&2
|
|
@@ -1272,6 +1277,10 @@ if [ $XCC_GCC = true ] ; then
|
|
XCFLAGS=${XCFLAGS}" -pthread"
|
|
fi
|
|
|
|
+ if [ -n "${MYCFLAGS}" ] ; then
|
|
+ XCFLAGS=$XCFLAGS' ${MYCFLAGS} '
|
|
+ fi
|
|
+
|
|
else
|
|
|
|
if [ $TSYS = sun4 -a $CROSS = false ] ; then
|
|
@@ -3417,8 +3426,9 @@ if [ $CROSS = false ] ; then
|
|
echol
|
|
if [ "${with_dynamic_modules}" != no ]; then
|
|
depends="full install-modules force"
|
|
- line='linkkit base'
|
|
+ line='linkkit base full'
|
|
echol "install-modules : full force"
|
|
+ echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
|
|
echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/dynmod"
|
|
echotab "DESTDIR=\`cd \"\$(DESTDIR)\$(lisplibdir)\"; pwd\` CLISP='./clisp -q -norc' ./clisp-link install \$(MODULES)"
|
|
echol
|
|
diff --git a/clisp-536a48a9/utils/modprep.lisp b/clisp-536a48a9/utils/modprep.lisp
|
|
--- a/clisp-536a48a9/utils/modprep.lisp
|
|
+++ b/clisp-536a48a9/utils/modprep.lisp
|
|
@@ -327,7 +327,7 @@ FOO(bar,baz,zot) ==> FOO; (bar baz zot);
|
|
((or (char= cc #\_) (char= cc #\-)) (write-char #\_ out))
|
|
(t (format out "_~2,'0x" (char-code cc))))))
|
|
|
|
-(defvar *tag-length-limit* 2000
|
|
+(defvar *tag-length-limit* 4096
|
|
"The approximate maximum length of a C name.
|
|
This works around the failure on i18n on Alpha Linux:
|
|
/tmp/ccYZBYCX.s: Assembler messages:
|