.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=140
2024-09-02 09:52:33 +00:00 · 2024-09-02 09:52:33 +00:00 · fe87fd5ba3
commit fe87fd5ba3
parent af415ff2f6
2 changed files with 39 additions and 24 deletions
--- a/clisp-2.49-configure.dif
+++ b/clisp-2.49-configure.dif
@ -5,13 +5,13 @@
 clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure.in     |    2 -
 clisp-2.49.93+git20240704.f5acef38/modules/libsvm/libsvm.lisp      |    2 -
 clisp-2.49.93+git20240704.f5acef38/src/lispbibl.d                  |   16 ++++++----
- clisp-2.49.93+git20240704.f5acef38/src/makemake.in                 |    8 ++++-
+ clisp-2.49.93+git20240704.f5acef38/src/makemake.in                 |   12 ++++++-
 clisp-2.49.93+git20240704.f5acef38/utils/ccmp2c.c                  |    1 
 clisp-2.49.93+git20240704.f5acef38/utils/modprep.lisp              |    2 -
- 9 files changed, 26 insertions(+), 13 deletions(-)
+ 9 files changed, 30 insertions(+), 13 deletions(-)

 --- clisp-2.49.93+git20240704.f5acef38/configure
-+++ clisp-2.49.93+git20240704.f5acef38/configure	2024-08-29 06:36:55.221117779 +0000
+++ clisp-2.49.93+git20240704.f5acef38/configure	2024-09-02 09:45:26.969435182 +0000
@@ -429,11 +429,11 @@ do
         passnext=makemake ;;
 
@ -27,7 +27,7 @@
         prev=vimdir
         passnext=both ;;
 --- clisp-2.49.93+git20240704.f5acef38/modules/clx/new-clx/Makefile.in
-+++ clisp-2.49.93+git20240704.f5acef38/modules/clx/new-clx/Makefile.in	2024-08-29 11:29:26.062049361 +0000
+++ clisp-2.49.93+git20240704.f5acef38/modules/clx/new-clx/Makefile.in	2024-09-02 09:45:26.969435182 +0000
@@ -18,7 +18,7 @@ distribdir =
 ### Custom defs.
 CCMP2C = ../../ccmp2c
@ -37,19 +37,8 @@
 X_CFLAGS = @X_CFLAGS@
 
 # default target: make the module
--- clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure.in
-+++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure.in	2024-08-29 10:51:10.118941018 +0000
-@@ -16,7 +16,7 @@ AC_LIB_LINKFLAGS([svm])
- BOLD_MSG([LibSVM (Headers)])
- AC_SUBST(LIBSVM_CFLAGS)
- AC_SUBST(LIBSVM_LIBS)
-AC_CHECK_HEADERS(svm.h)
-+AC_CHECK_HEADERS([libsvm/svm.h])
- if test "$ac_cv_header_svm_h" = "no"; then
-   AC_MSG_ERROR([cannot find LibSVM headers])
- fi
 --- clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure
-+++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure	2024-08-29 10:50:28.015691883 +0000
+++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure	2024-09-02 09:45:26.973435115 +0000
@@ -5526,7 +5526,7 @@ printf "%s\n" "$as_me: ${term_bold}** Li
 
 
@ -59,8 +48,19 @@
 if test "x$ac_cv_header_svm_h" = xyes
 then :
   printf "%s\n" "#define HAVE_SVM_H 1" >>confdefs.h
+--- clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure.in
+++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure.in	2024-09-02 09:45:26.969435182 +0000
+@@ -16,7 +16,7 @@ AC_LIB_LINKFLAGS([svm])
+ BOLD_MSG([LibSVM (Headers)])
+ AC_SUBST(LIBSVM_CFLAGS)
+ AC_SUBST(LIBSVM_LIBS)
+-AC_CHECK_HEADERS(svm.h)
+AC_CHECK_HEADERS([libsvm/svm.h])
+ if test "$ac_cv_header_svm_h" = "no"; then
+   AC_MSG_ERROR([cannot find LibSVM headers])
+ fi
 --- clisp-2.49.93+git20240704.f5acef38/modules/libsvm/libsvm.lisp
-+++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/libsvm.lisp	2024-08-29 10:50:46.759357613 +0000
+++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/libsvm.lisp	2024-09-02 09:45:26.973435115 +0000
@@ -15,7 +15,7 @@
 
 (default-foreign-language :stdc)
@ -71,7 +71,7 @@
 (defvar *libsvm-output* *standard-output* "The stream for svm.so messages.")
 (cl:defun write-string-to-libsvm-output (s)
 --- clisp-2.49.93+git20240704.f5acef38/src/lispbibl.d
-+++ clisp-2.49.93+git20240704.f5acef38/src/lispbibl.d	2024-08-29 06:36:55.221117779 +0000
+++ clisp-2.49.93+git20240704.f5acef38/src/lispbibl.d	2024-09-02 09:45:26.973435115 +0000
@@ -178,7 +178,7 @@
   #define PC386 /* IBMPC-compatible with 80386/80486-processor */
 #endif
@ -119,7 +119,7 @@
   #elif !(oint_addr_shift==0)
     #define type_data_object(type,data)  \
 --- clisp-2.49.93+git20240704.f5acef38/src/makemake.in
-+++ clisp-2.49.93+git20240704.f5acef38/src/makemake.in	2024-08-29 06:36:55.221117779 +0000
+++ clisp-2.49.93+git20240704.f5acef38/src/makemake.in	2024-09-02 09:46:45.708085247 +0000
@@ -248,6 +248,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
 # Handle --with-... arguments
 while test -z "$endofargs"; do
@ -144,7 +144,18 @@
 
 test "${verbose}" = true -o "${verbose}" = yes && \
   cat <<EOF >&2
-@@ -4036,8 +4041,9 @@ if [ $CROSS = false ] ; then
+@@ -1367,6 +1372,10 @@ if [ $XCC_GCC = true ] ; then
+     XCFLAGS=${XCFLAGS}" -pthread"
+   fi
+ 
+  if [ -n "${MYCFLAGS}" ] ; then
+    XCFLAGS=$XCFLAGS" ${MYCFLAGS}"
+  fi
+
+ else
+ 
+   if [ $CROSS = false ] ; then
+@@ -4036,8 +4045,9 @@ if [ $CROSS = false ] ; then
     echol
     if [ "${with_dynamic_modules}" != no ]; then
       depends="full install-modules force"
@ -156,7 +167,7 @@
       echotab "DESTDIR=\`cd \"\$(DESTDIR)\$(lisplibdir)\"; pwd\` CLISP='./clisp -q -norc' ./clisp-link install \$(MODULES)"
       echol
 --- clisp-2.49.93+git20240704.f5acef38/utils/ccmp2c.c
-+++ clisp-2.49.93+git20240704.f5acef38/utils/ccmp2c.c	2024-08-29 09:03:44.413971085 +0000
+++ clisp-2.49.93+git20240704.f5acef38/utils/ccmp2c.c	2024-09-02 09:45:26.977435045 +0000
@@ -1042,6 +1042,7 @@ main (int argc, char *argv[])
   infilename = argv[1];
 
@ -166,7 +177,7 @@
   printf ("#include <stdlib.h>\n");
   printf ("#include <string.h>\n");
 --- clisp-2.49.93+git20240704.f5acef38/utils/modprep.lisp
-+++ clisp-2.49.93+git20240704.f5acef38/utils/modprep.lisp	2024-08-29 06:36:55.221117779 +0000
+++ clisp-2.49.93+git20240704.f5acef38/utils/modprep.lisp	2024-09-02 09:45:26.977435045 +0000
@@ -328,7 +328,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))))))
--- a/clisp.spec
+++ b/clisp.spec
@ -181,13 +181,16 @@ export PATH="$PATH:."
    DEBUG=
    export CC="gcc"
 %endif
+export MYCFLAGS=""
 %ifarch s390x ppc64 ppc64le
 %{expand:%%global optflags %(echo "%{optflags}"|sed -r -e s/-fstack-protector-strong// -e s/-fstack-clash-protection//)}
 %add_optflags -fno-pie -fno-PIE
 %add_ldflags -no-pie
+MYCFLAGS=-O
 %endif
 %ifarch %arm
-%add_optflags -O
+%{expand:%%global optflags %(echo "%{optflags}"|sed -r -e s/-O[0-9]/-O/g)}
+MYCFLAGS=-O
 %endif
 %ifarch aarch64
 %endif
@ -199,12 +202,14 @@ export PATH="$PATH:."
 %endif
 %ifarch %ix86
 %add_optflags -ffloat-store
+MYCFLAGS=-O
 %endif
 %ifarch x86_64 sparc sparc64 ia64 s390x ppc64 ppc64le
 %add_optflags -fno-gcse
 %endif
 %ifarch ia64 s390x ppc64 ppc64le
 %{expand:%%global optflags %(echo "%{optflags}"|sed -r -e s/-O[0-9]/-O/g)}
+MYCFLAGS=-O
 %endif
 %ifarch sparc sparc64
 %add_optflags -mcpu=v9
@ -224,7 +229,6 @@ port=''
 %ifarch s390x
 ##port='--enable-portability'
 %endif
-export MYCFLAGS="%{optflags}"

 #
 # Report final architectures