Ticket #9167: spkg-take2.diff

.hgignore

@@ -1 @@
-src
+src/

SPKG.txt

@@ -68 +68 @@
 
 == Changelog ==
 
+=== ecl-12.7.1.p1 (Jean-Pierre Flori, 20 August 2012) ===
+ * #9167: follow Cygwin's DLLs naming scheme.
+
 === ecl-12.7.1.p0 (Jean-Pierre Flori, 27 November 2012) ===
  * #13324: upgrade to upstream version 12.7.1.
  * Add a patch (cygwin.patch) to let ECL build on Cygwin (integrated upstream).

deleted file patches/libraries.d.patch

@@ -1 @@
-diff -ru src.orig/src/c/ffi/libraries.d src/src/c/ffi/libraries.d
---- src.orig/src/c/ffi/libraries.d      2012-11-27 21:02:11.047665129 +0100
-+++ src/src/c/ffi/libraries.d   2012-11-27 21:02:24.999540043 +0100
-@@ -70,6 +70,7 @@
- #endif /* ENABLE_DLOPEN */
- #include <ecl/ecl-inl.h>
- #include <ecl/internal.h>
-+#include <sys/stat.h>
- 
- #define GC_call_with_alloc_lock(f,arg) f(arg)
- 

new file patches/src_Makefile.in.patch

@@ +1 @@
+--- src.orig/src/Makefile.in    2012-08-20 18:42:21.909723075 +0200
++++ src/src/Makefile.in 2012-08-20 18:39:46.749728842 +0200
+@@ -174,10 +174,14 @@
+          if test -s $$i ; then \
+           if echo $$i | grep dll; then \
+            $(INSTALL_LIBRARY) $$i $(DESTDIR)$(bindir); \
+-          fi; \
+-          $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \
++          else \
++           $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \
++          fi \
+          fi \
+        done
++       if [ "x@IMPLIB_NAME@" != "x" -a -f "@IMPLIB_NAME@" ]; then \
++         $(INSTALL_LIBRARY) @IMPLIB_NAME@ $(DESTDIR)$(libdir); \
++       fi
+        if [ "x@SONAME@" != "x" -a -f "@SONAME@" ]; then \
+          ( cd $(DESTDIR)$(libdir) && $(RM) -f @SONAME3@ @SONAME2@ @SONAME1@ && \
+            mv @SONAME@ @SONAME3@ && \

new file patches/src_aclocal.m4.patch

@@ +1 @@
+--- src.orig/src/aclocal.m4     2012-08-20 18:42:21.329723093 +0200
++++ src/src/aclocal.m4  2012-08-20 18:39:45.981728872 +0200
+@@ -232,6 +232,8 @@
+ AC_SUBST(LIBEXT)
+ AC_SUBST(SHAREDEXT)dnl Name components of a dynamically linked library
+ AC_SUBST(SHAREDPREFIX)
++AC_SUBST(IMPLIB_EXT)dnl        Name components of a dynamically linked library import file
++AC_SUBST(IMPLIB_PREFIX)
+ AC_SUBST(OBJEXT)dnl    These are set by autoconf
+ AC_SUBST(EXEEXT)
+ AC_SUBST(INSTALL_TARGET)dnl Which type of installation: flat directory or unix like.
+@@ -241,6 +243,8 @@
+ ECL_LDRPATH=''
+ SHAREDEXT='so'
+ SHAREDPREFIX='lib'
++IMPLIB_EXT=''
++IMPLIB_PREFIX=''
+ LIBPREFIX='lib'
+ LIBEXT='a'
+ PICFLAG='-fPIC'
+@@ -252,6 +256,8 @@
+ clibs=''
+ SONAME=''
+ SONAME_LDFLAGS=''
++IMPLIB_NAME=''
++IMPLIB_LDFLAGS=''
+ case "${host_os}" in
+        # libdir may have a dollar expression inside
+        linux*)
+@@ -344,10 +350,14 @@
+                shared='yes'
+                THREAD_CFLAGS='-D_THREAD_SAFE'
+                THREAD_LIBS='-lpthread'
+-               SHARED_LDFLAGS="-shared ${LDFLAGS}"
+-               BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
+-               SHAREDPREFIX=''
++               SHARED_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
++               BUNDLE_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
++               SHAREDPREFIX='cyg'
+                SHAREDEXT='dll'
++               IMPLIB_PREFIX='lib'
++               IMPLIB_EXT='dll.a'
++               IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
++               IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
+                PICFLAG=''
+                ;;
+        mingw*)
+@@ -357,10 +367,14 @@
+                 enable_threads='yes'
+                THREAD_CFLAGS='-D_THREAD_SAFE'
+                THREAD_GC_FLAGS='--enable-threads=win32'
+-               SHARED_LDFLAGS=''
+-               BUNDLE_LDFLAGS=''
++               SHARED_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
++               BUNDLE_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
+                SHAREDPREFIX=''
+                SHAREDEXT='dll'
++               IMPLIB_PREFIX='lib'
++               IMPLIB_EXT='dll.a'
++               IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
++               IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
+                PICFLAG=''
+                INSTALL_TARGET='flatinstall'
+                TCPLIBS='-lws2_32'
+Seulement dans src/src: autom4te.cache

new file patches/src_c_ffi_libraries.d.patch

@@ +1 @@
+--- src.orig/src/c/ffi/libraries.d      2012-08-20 18:42:23.009723031 +0200
++++ src/src/c/ffi/libraries.d   2012-08-20 18:39:48.173728789 +0200
+@@ -70,6 +70,7 @@
+ #endif /* ENABLE_DLOPEN */
+ #include <ecl/ecl-inl.h>
+ #include <ecl/internal.h>
++#include <sys/stat.h>
+ 
+ #define GC_call_with_alloc_lock(f,arg) f(arg)
+ 
+Seulement dans src/src/c/ffi: libraries.d.orig

new file patches/src_compile.lsp.in.patch

@@ +1 @@
+--- src.orig/src/compile.lsp.in 2012-08-20 18:42:20.949723111 +0200
++++ src/src/compile.lsp.in      2012-08-20 18:39:45.481728892 +0200
+@@ -42,7 +42,7 @@
+ ;;;
+ ;;; * Add include path to not yet installed headers, and remove include flag
+ ;;;   (-I) to installed directory, and Notice that we must explicitely mention
+-;;;   libecl.so/ecl.dll instead of using -lecl. This is to avoid interference
++;;;   libecl.so/cygecl.dll instead of using -lecl. This is to avoid interference
+ ;;;   with an already installed copy of ECL.
+ ;;;
+ (setq c::*cc-flags*
+@@ -50,7 +50,7 @@
+       #+msvc "@CFLAGS@ @ECL_CFLAGS@"
+       c::*ecl-include-directory* "@true_builddir@/"
+       c::*ecl-library-directory* "@true_builddir@/")
+-#-:wants-dlopen 
++#-:wants-dlopen
+ (setf c::*ld-flags*
+       "@LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@")
+ #+(and :wants-dlopen (not nonstop))
+@@ -124,7 +124,7 @@
+ ;;;
+ ;;; We do not need the -rpath flag for the library, nor -lecl.
+ ;;;
+-(let* ((c::*ld-shared-flags* #-msvc "@SHARED_LDFLAGS@ @LDFLAGS@ @SONAME_LDFLAGS@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@"
++(let* ((c::*ld-shared-flags* #-msvc " @IMPLIB_LDFLAGS@ @SHARED_LDFLAGS@ @LDFLAGS@ @SONAME_LDFLAGS@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@"
+                             #+msvc "@SHARED_LDFLAGS@ @LDFLAGS@ @STATICLIBS@ @CLIBS@")
+        (c::*cc-flags* (concatenate 'string "-DECL_API -I@true_builddir@/c " c::*cc-flags*))
+        (extra-args nil))

new file patches/src_configure.in.patch

@@ +1 @@
+--- src.orig/src/configure.in   2012-08-20 18:42:25.061722957 +0200
++++ src/src/configure.in        2012-08-20 18:39:50.849728693 +0200
+@@ -570,6 +570,19 @@
+ AC_SUBST(SONAME)
+ AC_SUBST(SONAME_LDFLAGS)
+ 
++dnl ----------------------------------------------------------------------
++dnl IMPLIB_NAME is only active when IMPLIB_NAME is non nil
++dnl
++AC_MSG_CHECKING(for import name)
++if test "${enable_soname}" != yes; then
++   IMPLIB_NAME=''
++   AC_MSG_RESULT([none])
++else
++   AC_MSG_RESULT([${IMPLIB_NAME}])
++fi
++AC_SUBST(IMPLIB_NAME)
++AC_SUBST(IMPLIB_LDFLAGS)
++
+ dnl Related to that, the package version number
+ ECL_VERSION_NUMBER=$(($PACKAGE_MAJOR * 10000 + $PACKAGE_MINOR * 100 + $PACKAGE_LEAST))
+ AC_SUBST(ECL_VERSION_NUMBER)

new file patches/src_configure.patch

@@ +1 @@
+--- src.orig/src/configure      2012-08-20 18:42:25.253722948 +0200
++++ src/src/configure   2012-08-20 18:40:38.161727146 +0200
+@@ -709,6 +709,8 @@
+ LIBEXT
+ SHAREDEXT
+ SHAREDPREFIX
++IMPLIB_EXT
++IMPLIB_PREFIX
+ INSTALL_TARGET
+ thehost
+ ECL_GC_DIR
+@@ -725,6 +727,8 @@
+ SONAME1
+ SONAME
+ SONAME_LDFLAGS
++IMPLIB_NAME
++IMPLIB_LDFLAGS
+ ECL_VERSION_NUMBER
+ XMKMF
+ CL_FIXNUM_TYPE
+@@ -4513,10 +4517,13 @@
+ 
+ 
+ 
++
+ ECL_GC_DIR=gc
+ ECL_LDRPATH=''
+ SHAREDEXT='so'
+ SHAREDPREFIX='lib'
++IMPLIB_EXT=''
++IMPLIB_PREFIX=''
+ LIBPREFIX='lib'
+ LIBEXT='a'
+ PICFLAG='-fPIC'
+@@ -4528,6 +4535,8 @@
+ clibs=''
+ SONAME=''
+ SONAME_LDFLAGS=''
++IMPLIB_NAME=''
++IMPLIB_LDFLAGS=''
+ case "${host_os}" in
+        # libdir may have a dollar expression inside
+        linux*)
+@@ -4620,10 +4629,14 @@
+                shared='yes'
+                THREAD_CFLAGS='-D_THREAD_SAFE'
+                THREAD_LIBS='-lpthread'
+-               SHARED_LDFLAGS="-shared ${LDFLAGS}"
+-               BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
+-               SHAREDPREFIX=''
++               SHARED_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
++               BUNDLE_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
++               SHAREDPREFIX='cyg'
+                SHAREDEXT='dll'
++               IMPLIB_PREFIX='lib'
++               IMPLIB_EXT='dll.a'
++               IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
++               IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
+                PICFLAG=''
+                ;;
+        mingw*)
+@@ -4633,10 +4646,14 @@
+                 enable_threads='yes'
+                THREAD_CFLAGS='-D_THREAD_SAFE'
+                THREAD_GC_FLAGS='--enable-threads=win32'
+-               SHARED_LDFLAGS=''
+-               BUNDLE_LDFLAGS=''
++               SHARED_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
++               BUNDLE_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
+                SHAREDPREFIX=''
+                SHAREDEXT='dll'
++               IMPLIB_PREFIX='lib'
++               IMPLIB_EXT='dll.a'
++               IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
++               IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
+                PICFLAG=''
+                INSTALL_TARGET='flatinstall'
+                TCPLIBS='-lws2_32'
+@@ -5215,7 +5232,7 @@
+ else
+   ac_cv_header_stdc=no
+ fi
+-rm -f -r conftest*
++rm -f conftest*
+ 
+ fi
+ 
+@@ -5236,7 +5253,7 @@
+ else
+   ac_cv_header_stdc=no
+ fi
+-rm -f -r conftest*
++rm -f conftest*
+ 
+ fi
+ 
+@@ -6993,6 +7010,19 @@
+ 
+ 
+ 
++{ echo "$as_me:$LINENO: checking for import name" >&5
++echo $ECHO_N "checking for import name... $ECHO_C" >&6; }
++if test "${enable_soname}" != yes; then
++   IMPLIB_NAME=''
++   { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
++else
++   { echo "$as_me:$LINENO: result: ${IMPLIB_NAME}" >&5
++echo "${ECHO_T}${IMPLIB_NAME}" >&6; }
++fi
++
++
++
+ ECL_VERSION_NUMBER=$(($PACKAGE_MAJOR * 10000 + $PACKAGE_MINOR * 100 + $PACKAGE_LEAST))
+ 
+ 
+@@ -7058,7 +7088,7 @@
+       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+     done
+     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+-    for ac_extension in a so sl dylib la dll; do
++    for ac_extension in a so sl; do
+       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+         test -f "$ac_im_libdir/libX11.$ac_extension"; then
+        ac_im_usrlibdir=$ac_im_libdir; break
+@@ -7211,7 +7241,7 @@
+ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ do
+   # Don't even attempt the hair of trying to link an X program!
+-  for ac_extension in a so sl dylib la dll; do
++  for ac_extension in a so sl; do
+     if test -r "$ac_dir/libX11.$ac_extension"; then
+       ac_x_libraries=$ac_dir
+       break 2
+@@ -7752,7 +7782,7 @@
+ else
+   ac_cv_header_stdc=no
+ fi
+-rm -f -r conftest*
++rm -f conftest*
+ 
+ fi
+ 
+@@ -7773,7 +7803,7 @@
+ else
+   ac_cv_header_stdc=no
+ fi
+-rm -f -r conftest*
++rm -f conftest*
+ 
+ fi
+ 
+@@ -11836,7 +11866,7 @@
+ else
+   ac_cv_prog_gcc_traditional=no
+ fi
+-rm -f -r conftest*
++rm -f conftest*
+ 
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+@@ -11853,7 +11883,7 @@
+   $EGREP "$ac_pattern" >/dev/null 2>&1; then
+   ac_cv_prog_gcc_traditional=yes
+ fi
+-rm -f -r conftest*
++rm -f conftest*
+ 
+   fi
+ fi
+@@ -13062,7 +13092,7 @@
+ #define SELECT_TYPE_ARG5 ($3)
+ _ACEOF
+ 
+-rm -f -r conftest*
++rm -f conftest*
+ 
+ { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+@@ -15242,8 +15272,8 @@
+ LIBEXT!$LIBEXT$ac_delim
+ SHAREDEXT!$SHAREDEXT$ac_delim
+ SHAREDPREFIX!$SHAREDPREFIX$ac_delim
+-INSTALL_TARGET!$INSTALL_TARGET$ac_delim
+-thehost!$thehost$ac_delim
++IMPLIB_EXT!$IMPLIB_EXT$ac_delim
++IMPLIB_PREFIX!$IMPLIB_PREFIX$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -15285,6 +15315,8 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++INSTALL_TARGET!$INSTALL_TARGET$ac_delim
++thehost!$thehost$ac_delim
+ ECL_GC_DIR!$ECL_GC_DIR$ac_delim
+ INFOEXT!$INFOEXT$ac_delim
+ INSTALL_INFO!$INSTALL_INFO$ac_delim
+@@ -15299,6 +15331,8 @@
+ SONAME1!$SONAME1$ac_delim
+ SONAME!$SONAME$ac_delim
+ SONAME_LDFLAGS!$SONAME_LDFLAGS$ac_delim
++IMPLIB_NAME!$IMPLIB_NAME$ac_delim
++IMPLIB_LDFLAGS!$IMPLIB_LDFLAGS$ac_delim
+ ECL_VERSION_NUMBER!$ECL_VERSION_NUMBER$ac_delim
+ XMKMF!$XMKMF$ac_delim
+ CL_FIXNUM_TYPE!$CL_FIXNUM_TYPE$ac_delim
+@@ -15323,7 +15357,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5