Subject: Re-enable FFI for mips/mipsel
From: Thiemo Seufer <[email-masked]>
To: [email-masked]
Date: Mon, 10 Jul 2006 22:35:47 +0100

Package: clisp
Version: 2.38-8
Tags: patch

The appended patch re-enables FFI for mips/mipsel.

Thiemo

diff -urpN clisp-2.38.away/debian/rules clisp-2.38/debian/rules
--- clisp-2.38.away/debian/rules	2006-07-10 18:58:29.000000000 +0100
+++ clisp-2.38/debian/rules	2006-07-10 22:24:51.000000000 +0100
@@ -32,7 +32,7 @@ ifneq (,$(filter sparc ,$(DEB_BUILD_ARCH
 	export CC=/usr/bin/gcc-4.1 -mcpu=v9 -D SAFETY=3 -D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP $(EXTRACFLAGS)
 endif
 
-ifneq (,$(filter arm hppa ia64 m68k s390 ,$(DEB_BUILD_ARCH)))
+ifneq (,$(filter arm hppa ia64 m68k mips mipsel s390 ,$(DEB_BUILD_ARCH)))
         # Disable FFI 
 	FFI=--without-dynamic-ffi
 	MODULES=--with-module=clx/mit-clx
diff -urpN clisp-2.38.away/ffcall/avcall/configure clisp-2.38/ffcall/avcall/configure
--- clisp-2.38.away/ffcall/avcall/configure	2006-07-10 19:38:33.000000000 +0100
+++ clisp-2.38/ffcall/avcall/configure	2006-01-02 22:57:38.000000000 +0000
@@ -3119,8 +3119,6 @@ echo "$as_me:$LINENO: result: $cl_cv_hos
 echo "${ECHO_T}$cl_cv_host_mipsn32" >&6
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;
diff -urpN clisp-2.38.away/ffcall/callback/configure clisp-2.38/ffcall/callback/configure
--- clisp-2.38.away/ffcall/callback/configure	2006-07-10 19:58:48.000000000 +0100
+++ clisp-2.38/ffcall/callback/configure	2006-01-02 22:57:38.000000000 +0000
@@ -3100,8 +3100,6 @@ echo "$as_me:$LINENO: result: $cl_cv_hos
 echo "${ECHO_T}$cl_cv_host_mipsn32" >&6
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;
diff -urpN clisp-2.38.away/ffcall/callback/trampoline_r/configure clisp-2.38/ffcall/callback/trampoline_r/configure
--- clisp-2.38.away/ffcall/callback/trampoline_r/configure	2006-07-10 19:58:19.000000000 +0100
+++ clisp-2.38/ffcall/callback/trampoline_r/configure	2006-01-02 22:57:39.000000000 +0000
@@ -3143,8 +3143,6 @@ echo "$as_me:$LINENO: result: $cl_cv_hos
 echo "${ECHO_T}$cl_cv_host_mipsn32" >&6
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;
diff -urpN clisp-2.38.away/ffcall/callback/vacall_r/configure clisp-2.38/ffcall/callback/vacall_r/configure
--- clisp-2.38.away/ffcall/callback/vacall_r/configure	2006-07-10 19:58:37.000000000 +0100
+++ clisp-2.38/ffcall/callback/vacall_r/configure	2006-01-02 22:57:39.000000000 +0000
@@ -3119,8 +3119,6 @@ echo "$as_me:$LINENO: result: $cl_cv_hos
 echo "${ECHO_T}$cl_cv_host_mipsn32" >&6
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;
diff -urpN clisp-2.38.away/ffcall/m4/general.m4 clisp-2.38/ffcall/m4/general.m4
--- clisp-2.38.away/ffcall/m4/general.m4	2006-07-10 19:57:28.000000000 +0100
+++ clisp-2.38/ffcall/m4/general.m4	2006-01-02 22:57:39.000000000 +0000
@@ -230,8 +230,6 @@ AC_EGREP_CPP(yes,
 ])
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;
diff -urpN clisp-2.38.away/ffcall/trampoline/configure clisp-2.38/ffcall/trampoline/configure
--- clisp-2.38.away/ffcall/trampoline/configure	2006-07-10 19:57:52.000000000 +0100
+++ clisp-2.38/ffcall/trampoline/configure	2006-01-02 22:57:39.000000000 +0000
@@ -6192,8 +6192,6 @@ echo "$as_me:$LINENO: result: $cl_cv_hos
 echo "${ECHO_T}$cl_cv_host_mipsn32" >&6
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;
diff -urpN clisp-2.38.away/ffcall/vacall/configure clisp-2.38/ffcall/vacall/configure
--- clisp-2.38.away/ffcall/vacall/configure	2006-07-10 19:56:58.000000000 +0100
+++ clisp-2.38/ffcall/vacall/configure	2006-01-02 22:57:39.000000000 +0000
@@ -2920,8 +2920,6 @@ echo "$as_me:$LINENO: result: $cl_cv_hos
 echo "${ECHO_T}$cl_cv_host_mipsn32" >&6
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;
diff -urpN clisp-2.38.away/src/autoconf/aclocal.m4 clisp-2.38/src/autoconf/aclocal.m4
--- clisp-2.38.away/src/autoconf/aclocal.m4	2006-07-10 19:53:05.000000000 +0100
+++ clisp-2.38/src/autoconf/aclocal.m4	2006-01-02 22:57:48.000000000 +0000
@@ -1896,8 +1896,6 @@ AC_EGREP_CPP(yes,
 ])
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;
diff -urpN clisp-2.38.away/src/m4/general.m4 clisp-2.38/src/m4/general.m4
--- clisp-2.38.away/src/m4/general.m4	2006-07-10 19:56:35.000000000 +0100
+++ clisp-2.38/src/m4/general.m4	2006-01-02 22:57:50.000000000 +0000
@@ -230,8 +230,6 @@ AC_EGREP_CPP(yes,
 ])
 if test $cl_cv_host_mipsn32 = yes; then
   host_cpu_abi=mipsn32
-else
-  host_cpu_abi=mips
 fi
 fi
     ;;