diff --git a/clisp-2.49-configure.dif b/clisp-2.49-configure.dif index 1e72e4d..9a21f9d 100644 --- 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 | 12 ++++++- + clisp-2.49.93+git20240704.f5acef38/src/makemake.in | 14 +++++++- clisp-2.49.93+git20240704.f5acef38/utils/ccmp2c.c | 1 clisp-2.49.93+git20240704.f5acef38/utils/modprep.lisp | 2 - - 9 files changed, 30 insertions(+), 13 deletions(-) + 9 files changed, 31 insertions(+), 14 deletions(-) --- clisp-2.49.93+git20240704.f5acef38/configure -+++ clisp-2.49.93+git20240704.f5acef38/configure 2024-09-02 09:45:26.969435182 +0000 ++++ clisp-2.49.93+git20240704.f5acef38/configure 2024-09-02 13:23:26.124850752 +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-09-02 09:45:26.969435182 +0000 ++++ clisp-2.49.93+git20240704.f5acef38/modules/clx/new-clx/Makefile.in 2024-09-02 13:23:26.124850752 +0000 @@ -18,7 +18,7 @@ distribdir = ### Custom defs. CCMP2C = ../../ccmp2c @@ -38,7 +38,7 @@ # default target: make the module --- clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure -+++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure 2024-09-02 09:45:26.973435115 +0000 ++++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure 2024-09-02 13:23:26.124850752 +0000 @@ -5526,7 +5526,7 @@ printf "%s\n" "$as_me: ${term_bold}** Li @@ -49,7 +49,7 @@ 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 ++++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/configure.in 2024-09-02 13:23:26.124850752 +0000 @@ -16,7 +16,7 @@ AC_LIB_LINKFLAGS([svm]) BOLD_MSG([LibSVM (Headers)]) AC_SUBST(LIBSVM_CFLAGS) @@ -60,7 +60,7 @@ 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-09-02 09:45:26.973435115 +0000 ++++ clisp-2.49.93+git20240704.f5acef38/modules/libsvm/libsvm.lisp 2024-09-02 13:23:26.124850752 +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-09-02 09:45:26.973435115 +0000 ++++ clisp-2.49.93+git20240704.f5acef38/src/lispbibl.d 2024-09-02 13:23:26.128850679 +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-09-02 09:46:45.708085247 +0000 ++++ clisp-2.49.93+git20240704.f5acef38/src/makemake.in 2024-09-02 13:34:28.840613211 +0000 @@ -248,6 +248,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false} # Handle --with-... arguments while test -z "$endofargs"; do @@ -155,6 +155,15 @@ else if [ $CROSS = false ] ; then +@@ -1468,7 +1477,7 @@ if [ "${with_dynamic_modules}" != no ]; + eval XCC_PICFLAG=\"${pic_flag}\" + if [ "$HSYSOS" != cygwin ]; then + eval "`./libtool --tag=CC --config | grep '^allow_undefined_flag='`" +- eval "`./libtool --tag=CC --config | grep '^archive_cmds='`" ++ eval "`./libtool --tag=CC --config | sed -rn '/^archive_cmds=/{ s/\s*-shared//; s/(\\\$compiler_flags)/\1 -shared/; p }'`" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname' + fi @@ -4036,8 +4045,9 @@ if [ $CROSS = false ] ; then echol if [ "${with_dynamic_modules}" != no ]; then @@ -167,7 +176,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-09-02 09:45:26.977435045 +0000 ++++ clisp-2.49.93+git20240704.f5acef38/utils/ccmp2c.c 2024-09-02 13:23:26.128850679 +0000 @@ -1042,6 +1042,7 @@ main (int argc, char *argv[]) infilename = argv[1]; @@ -177,7 +186,7 @@ printf ("#include \n"); printf ("#include \n"); --- clisp-2.49.93+git20240704.f5acef38/utils/modprep.lisp -+++ clisp-2.49.93+git20240704.f5acef38/utils/modprep.lisp 2024-09-02 09:45:26.977435045 +0000 ++++ clisp-2.49.93+git20240704.f5acef38/utils/modprep.lisp 2024-09-02 13:23:26.128850679 +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)))))) diff --git a/clisp.spec b/clisp.spec index f8ab61c..4f83843 100644 --- a/clisp.spec +++ b/clisp.spec @@ -61,6 +61,7 @@ BuildRequires: ffcall #%endif BuildRequires: gdbm-devel BuildRequires: glib2-devel +BuildRequires: groff BuildRequires: gtk2-devel BuildRequires: libglade2-devel BuildRequires: libsigsegv-devel