update to 8.12.0 (new numbering scheme, but >old version)

a few patches to deal with shared libraries. there is lisp code to deal with recognizing .so, so until someone dives in and adapts it for OpenBSD, keep a libecl.so...
2009-03-16 11:19:12 +00:00 · 2009-03-16 11:19:12 +00:00 · 78870ad865
commit 78870ad865
parent caab4bdcba
7 changed files with 115 additions and 32 deletions
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.2 2008/08/19 23:45:58 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2009/03/16 11:19:12 espie Exp $

-COMMENT = embeddable common-lisp
-CATEGORIES = lang
+COMMENT = 	embeddable common-lisp
+CATEGORIES = 	lang

-DISTNAME = ecl-0.9l
-PKGNAME = ecl-0.9l
-WRKDIST = ${WRKDIR}/ecl-0.9l
-EXTRACT_SUFX = .tgz
+V =		8.12.0
+DISTNAME = 	ecl-$V
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/}
 HOMEPAGE = http://ecls.sourceforge.net/
+SUBST_VARS =	V

 # GPLv2 or later
 PERMIT_PACKAGE_CDROM = Yes
@ -17,13 +16,15 @@ PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP = Yes


-CONFIGURE_STYLE = gnu
-USE_GMAKE = Yes
-USE_LIBTOOL = Yes
-NO_REGRESS = Yes
+SHARED_LIBS +=		ecl	0.0
+CONFIGURE_STYLE = 	gnu
+USE_GMAKE = 		Yes
+USE_LIBTOOL = 		Yes
+NO_REGRESS = 		Yes
 CONFIGURE_ENV +=	LDFLAGS='-pthread -L${LOCALBASE}/lib' \
 			CPPFLAGS=-I${LOCALBASE}/include \
-			CFLAGS='${CFLAGS} -pthread'
+			CFLAGS='${CFLAGS} -pthread' \
+			ECLLIB_VERSION=${LIBecl_VERSION}

 CONFIGURE_ARGS += 	--enable-boehm=system \
 			--with-system-gmp \
--- a/lang/ecl/distinfo
+++ b/lang/ecl/distinfo
@ -1,5 +1,5 @@
-MD5 (ecl-0.9l.tgz) = or/4TM06SqdtFO46J3A43w==
-RMD160 (ecl-0.9l.tgz) = wZjxVBFbgeLV3H8Kt/sL8Y2WguQ=
-SHA1 (ecl-0.9l.tgz) = rA+XYaJ/BpxAbtCpSQPx5R6kWLw=
-SHA256 (ecl-0.9l.tgz) = pQoyibrrLhOV49fx5WPaBsIOKiLuF0UW/0MTEi8udBE=
-SIZE (ecl-0.9l.tgz) = 4989464
+MD5 (ecl-8.12.0.tar.gz) = sEBdAvkZT2+FFX/hYGVMxw==
+RMD160 (ecl-8.12.0.tar.gz) = Y8TZNFCxyavyXaE1+v6TrlHu2Jg=
+SHA1 (ecl-8.12.0.tar.gz) = 279aggGw4rGJtXX67o+w5bvmTKI=
+SHA256 (ecl-8.12.0.tar.gz) = t7OMEclm7GQY29JLymcHEDNEXfThFqDDq4Ij7k1w2r0=
+SIZE (ecl-8.12.0.tar.gz) = 5000878
--- a/lang/ecl/patches/patch-src_Makefile_in
+++ b/lang/ecl/patches/patch-src_Makefile_in
@ -0,0 +1,24 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2009/03/16 11:19:12 espie Exp $
+--- src/Makefile.in.orig	Wed Dec 17 16:41:52 2008
+++ src/Makefile.in	Mon Mar 16 11:25:55 2009
+@@ -143,18 +143,13 @@ install-base:
+ 	for i in BUILD-STAMP help.doc ; do \
+ 	  $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \
+ 	done
+	cp libecl.so $(LSP_LIBRARIES)
+ 	for i in $(LSP_LIBRARIES) $(LIBRARIES); do \
+ 	  if test -s $$i ; then \
+ 	   $(INSTALL_PROGRAM) $$i $(DESTDIR)$(libdir); \
+ 	  fi \
+ 	done
+-	if [ "x@SONAME@" != "x" ]; then \
+-	  ( cd $(DESTDIR)$(libdir) && rm -f @SONAME3@ @SONAME2@ @SONAME1@ && \
+-	    mv @SONAME@ @SONAME3@ && \
+-	    $(LN_S) @SONAME3@ @SONAME2@ && \
+-	    $(LN_S) @SONAME3@ @SONAME1@ && \
+-	    $(LN_S) @SONAME3@ @SONAME@ ) \
+-	fi
+	cd $(DESTDIR)$(libdir) && ln -s $(LSP_LIBRARIES) libecl.so
+ 	for i in c/dpp$(EXE) ecl_min$(EXE) `cat MODULES`; do \
+ 	  case $$i in \
+ 	    *.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \
--- a/lang/ecl/patches/patch-src_compile_lsp_in
+++ b/lang/ecl/patches/patch-src_compile_lsp_in
@ -0,0 +1,38 @@
+$OpenBSD: patch-src_compile_lsp_in,v 1.1 2009/03/16 11:19:12 espie Exp $
+--- src/compile.lsp.in.orig	Mon Mar 16 10:45:42 2009
+++ src/compile.lsp.in	Mon Mar 16 10:50:38 2009
+@@ -48,19 +48,19 @@
+       "@LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@")
+ #+(and :wants-dlopen (not nonstop))
+ (setf c::*ld-flags*
+-      "@LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@"
+      "@LDFLAGS@ -L. -lecl @LIBS@"
+       c::*ld-shared-flags*
+-      "@SHARED_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@"
+      "@SHARED_LDFLAGS@ @LDFLAGS@ -L. -lecl @LIBS@ @FASL_LIBS@"
+       c::*ld-bundle-flags*
+-      "@BUNDLE_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@")
+      "@BUNDLE_LDFLAGS@ @LDFLAGS@ -L. -lecl @LIBS@ @FASL_LIBS@")
+ ;;; FIXME: The nonstop platform does not support soname
+ #+(and :wants-dlopen nonstop)
+ (setf c::*ld-flags*
+-      "@LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@"
+      "@LDFLAGS@ -Wld=-L.,-lecl @LIBS@"
+       c::*ld-shared-flags*
+-      "@SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@"
+      "@SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-L.,-lecl @LIBS@ @FASL_LIBS@"
+       c::*ld-bundle-flags*
+-      "@BUNDLE_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@")
+      "@BUNDLE_LDFLAGS@ @LDFLAGS@ -Wld=-L.,-lecl @LIBS@ @FASL_LIBS@")
+ 
+ ;;;
+ ;;; * Avoid name clashes with user supplied code.
+@@ -103,7 +103,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 "@SHARED_LDFLAGS@ @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))
--- a/lang/ecl/patches/patch-src_configure
+++ b/lang/ecl/patches/patch-src_configure
@ -0,0 +1,19 @@
+$OpenBSD: patch-src_configure,v 1.1 2009/03/16 11:19:12 espie Exp $
+--- src/configure.orig	Wed Dec 17 16:41:52 2008
+++ src/configure	Mon Mar 16 10:43:57 2009
+@@ -10964,13 +10964,14 @@ _ACEOF
+ 
+ fi
+ 
+: ${ECLLIB_VERSION:=8.12}
+ if test ${enable_shared} = "yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_DLOPEN 1
+ _ACEOF
+ 
+-  LSP_LIBRARIES="${SHAREDPREFIX}ecl.${SHAREDEXT}"
+  LSP_LIBRARIES="${SHAREDPREFIX}ecl.${SHAREDEXT}.${ECLLIB_VERSION}"
+ 
+ LSP_FEATURES="(cons :wants-dlopen ${LSP_FEATURES})"
+ 
--- a/lang/ecl/pkg/PFRAG.shared
+++ b/lang/ecl/pkg/PFRAG.shared
@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/05/06 09:31:25 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2009/03/16 11:19:12 espie Exp $
 lib/libecl.so
+@lib lib/libecl.so.${LIBecl_VERSION}
--- a/lang/ecl/pkg/PLIST
+++ b/lang/ecl/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/08/19 23:45:58 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/03/16 11:19:12 espie Exp $
 %%SHARED%%
@bin bin/ecl
 bin/ecl-config
@ -20,19 +20,19 @@ include/ecl/stacks.h
 include/ecl/unify.h
@info info/ecl.info
@info info/ecldev.info
-lib/ecl/
-lib/ecl/BUILD-STAMP
-lib/ecl/asdf.fas
-lib/ecl/cmp.fas
-lib/ecl/defsystem.fas
-lib/ecl/dpp
-lib/ecl/ecl_min
-lib/ecl/help.doc
-lib/ecl/profile.fas
-lib/ecl/rt.fas
-lib/ecl/serve-event.fas
-lib/ecl/sockets.fas
-lib/ecl/sysfun.lsp
+lib/ecl-${V}/
+lib/ecl-${V}/BUILD-STAMP
+lib/ecl-${V}/asdf.fas
+lib/ecl-${V}/cmp.fas
+lib/ecl-${V}/defsystem.fas
+lib/ecl-${V}/dpp
+lib/ecl-${V}/ecl_min
+lib/ecl-${V}/help.doc
+lib/ecl-${V}/profile.fas
+lib/ecl-${V}/rt.fas
+lib/ecl-${V}/serve-event.fas
+lib/ecl-${V}/sockets.fas
+lib/ecl-${V}/sysfun.lsp
@man man/man1/ecl-config.1
@man man/man1/ecl.1
@comment share/doc/Copyright