[csw-devel] SF.net SVN: gar:[11698] csw/mgar/pkg/libtool/branches

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Nov 23 15:26:33 CET 2010 

Revision: 11698
          http://gar.svn.sourceforge.net/gar/?rev=11698&view=rev
Author:   dmichelsen
Date:     2010-11-23 14:26:33 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
libtool: Make branches for legacy share lib package libltdl3 and current libtool 2.4

Modified Paths:
--------------
    csw/mgar/pkg/libtool/branches/libldtl3/Makefile
    csw/mgar/pkg/libtool/branches/libldtl3/checksums
    csw/mgar/pkg/libtool/branches/libtool24/Makefile
    csw/mgar/pkg/libtool/branches/libtool24/checksums

Added Paths:
-----------
    csw/mgar/pkg/libtool/branches/libldtl3/
    csw/mgar/pkg/libtool/branches/libtool24/

Modified: csw/mgar/pkg/libtool/branches/libldtl3/Makefile
===================================================================
--- csw/mgar/pkg/libtool/trunk/Makefile	2010-11-22 16:18:07 UTC (rev 11693)
+++ csw/mgar/pkg/libtool/branches/libldtl3/Makefile	2010-11-23 14:26:33 UTC (rev 11698)
@@ -1,16 +1,7 @@
 GARNAME = libtool
-GARVERSION = 2.2.10
+GARVERSION = 1.5.26
 CATEGORIES = devel
 
-EXTRA_MODULATORS = GARVERSION GARCOMPILER
-MODULATIONS_GARVERSION = 1.5.26 2.2.10
-MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS12
-
-# Modulate over compiler only for 2.2.6
-SKIP_MODULATIONS = $(foreach I,sparcv8 sparcv9 i386 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-1.5.26-garcompiler-$C))
-# Compile 64 bit libraries only with SOS12
-SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.10-garcompiler-$C))
-
 DESCRIPTION = A generic library support tool
 define BLURB
   GNU libtool is a generic library support script. Libtool hides the complexity
@@ -19,83 +10,33 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz)
-DISTFILES    = $(SOURCEFILES)
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 
-PATCH_LIBTOOL = patch-libtool.diff
-PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.10-garcompiler-SOS12 = $(PATCH_LIBTOOL)
-PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.10-garcompiler-SOS12 = $(PATCH_LIBTOOL)
-DISTFILES += $(PATCH_LIBTOOL)
+PACKAGES = CSWlibltdl3
+CATALOGNAME = libltdl3
 
-NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES))
-
-EXTRA_TAGS = gcc3 gcc4 sos12
-COMPILER_TAGNAME_GCC3 = gcc3
-COMPILER_TAGNAME_GCC4 = gcc4
-COMPILER_TAGNAME_SOS12 = sos12
-
-PACKAGES = CSWlibtool CSWlibtoolrt
-CATALOGNAME_CSWlibtoolrt = libtool_rt
-
 SPKG_SOURCEURL = http://www.gnu.org/software/libtool/
 
-RUNTIME_DEP_PKGS_CSWlibtool = CSWlibtoolrt
+SPKG_DESC_CSWlibtoolrt = Runtime library for libtool 1.5.x
 
-SPKG_DESC_CSWlibtool   = A generic library support tool
-SPKG_DESC_CSWlibtoolrt = A generic library support tool runtime libraries
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
 BUILD64 = 1
-NOISAEXEC = 1
+NOISALIST = 1
 
-SKIPTEST = 1
+# There are three Fortran tests failing, which probably is not relevant to
+# libltdl.so functionaility
+#   FAIL: f77demo-make.test
+#   FAIL: f77demo-make.test
+#   FAIL: f77demo-make.test
+SKIPTEST ?= 1
+
 TEST_TARGET = check
 
-   MERGE_SCRIPTS_isa-default-garversion-1.5.26-garcompiler-SOS12 = copy-only
-      MERGE_DIRS_isa-default-garversion-1.5.26-garcompiler-SOS12 = $(libdir)
- MERGE_SCRIPTS_isa-default64-garversion-1.5.26-garcompiler-SOS12 = copy-relocated-only
-    MERGE_DIRS_isa-default64-garversion-1.5.26-garcompiler-SOS12 = $(libdir)
+PKGFILES_CSWlibltdl3 = $(PKGFILES_RT)
 
-   MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-SOS12 = copy-all
- MERGE_SCRIPTS_isa-default64-garversion-2.2.10-garcompiler-SOS12 = copy-relocated-only
-    MERGE_DIRS_isa-default64-garversion-2.2.10-garcompiler-SOS12 = $(libdir)
-
-    MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-GCC3 = copy-tags
-    MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-GCC4 = copy-tags
-
-PKGFILES_CSWlibtoolrt = $(PKGFILES_RT)
-
-CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibtoolrt
-
 include gar/category.mk
 
-post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool)
-post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER)))
-
-patch-libtool:
-	cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1)
-	# Remove arch-specific flags from the libtool-compilation so they don't spoil the target build
-	perl -pi -e 's/^LTCFLAGS=.*/LTCFLAGS="-O"/' $(DESTDIR)$(bindir)/libtool
-	@$(MAKECOOKIE)
-
-install-libtool-%:
-	perl -ane 'print if( /^available_tags/ ); $$p = 1 if( /^# ### BEGIN LIBTOOL CONFIG/ ); print if( $$p ); $$p = 0 if( /^# ### END LIBTOOL CONFIG/ )' \
-		<$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.conf
-	perl -ane '$$p = 1 if( /^# ### BEGIN LIBTOOL TAG CONFIG/ ); print if( $$p ); if( /^# ### END LIBTOOL TAG CONFIG/ ) { $$p = 0; print "\n"; }' \
-		<$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.tags
-	@$(MAKECOOKIE)
-
-merge-copy-tags:
-	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
-		-s ",^\(\..*\.conf\)\$$,\1,p" \
-		-s ",^\(\..*\.tags\)\$$,\1,p" \
-		-s ",.*,," \
-		. $(PKGROOT) \
-	)
-	@$(MAKECOOKIE)
-
-

Modified: csw/mgar/pkg/libtool/branches/libldtl3/checksums
===================================================================
--- csw/mgar/pkg/libtool/trunk/checksums	2010-11-22 16:18:07 UTC (rev 11693)
+++ csw/mgar/pkg/libtool/branches/libldtl3/checksums	2010-11-23 14:26:33 UTC (rev 11698)
@@ -1,3 +1 @@
 aa9c5107f3ec9ef4200eb6556f3b3c29  libtool-1.5.26.tar.gz
-b745d220e88163fcd9eea0a90ccf21b0  libtool-2.2.10.tar.gz
-92bb3c7712498b6a5993ab5d5fc8f077  patch-libtool.diff

Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile
===================================================================
--- csw/mgar/pkg/libtool/trunk/Makefile	2010-11-22 16:18:07 UTC (rev 11693)
+++ csw/mgar/pkg/libtool/branches/libtool24/Makefile	2010-11-23 14:26:33 UTC (rev 11698)
@@ -1,16 +1,16 @@
 GARNAME = libtool
-GARVERSION = 2.2.10
+GARVERSION = 2.4
 CATEGORIES = devel
 
-EXTRA_MODULATORS = GARVERSION GARCOMPILER
-MODULATIONS_GARVERSION = 1.5.26 2.2.10
+EXTRA_MODULATORS = GARCOMPILER
 MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS12
 
-# Modulate over compiler only for 2.2.6
-SKIP_MODULATIONS = $(foreach I,sparcv8 sparcv9 i386 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-1.5.26-garcompiler-$C))
+# Modulate over compiler only for 2.4
 # Compile 64 bit libraries only with SOS12
-SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.10-garcompiler-$C))
+SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garcompiler-$C))
 
+# TODO: Make sure -xnorunpath / -norunpath stays in cc and CC
+
 DESCRIPTION = A generic library support tool
 define BLURB
   GNU libtool is a generic library support script. Libtool hides the complexity
@@ -19,30 +19,32 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-SOURCEFILES  = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz)
-DISTFILES    = $(SOURCEFILES)
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.xz
 
 PATCH_LIBTOOL = patch-libtool.diff
-PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.10-garcompiler-SOS12 = $(PATCH_LIBTOOL)
-PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.10-garcompiler-SOS12 = $(PATCH_LIBTOOL)
+PATCHFILES_POSTINSTALL_isa-i386-garversion-2.4-garcompiler-SOS12 = $(PATCH_LIBTOOL)
+PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.4-garcompiler-SOS12 = $(PATCH_LIBTOOL)
 DISTFILES += $(PATCH_LIBTOOL)
 
-NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES))
-
 EXTRA_TAGS = gcc3 gcc4 sos12
 COMPILER_TAGNAME_GCC3 = gcc3
 COMPILER_TAGNAME_GCC4 = gcc4
 COMPILER_TAGNAME_SOS12 = sos12
 
-PACKAGES = CSWlibtool CSWlibtoolrt
+PACKAGES = CSWlibtool CSWlibltdl7 CSWlibtoolrt
+
+CATALOGNAME_CSWlibtool = libtool
+CATALOGNAME_CSWlibltdl7 = libltdl7
 CATALOGNAME_CSWlibtoolrt = libtool_rt
 
 SPKG_SOURCEURL = http://www.gnu.org/software/libtool/
 
-RUNTIME_DEP_PKGS_CSWlibtool = CSWlibtoolrt
+RUNTIME_DEP_PKGS_CSWlibtool = CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWlibtoolrt = CSWlibltdl3 CSWlibltdl7
 
 SPKG_DESC_CSWlibtool   = A generic library support tool
-SPKG_DESC_CSWlibtoolrt = A generic library support tool runtime libraries
+SPKG_DESC_CSWlibltdl7  = Libtool libltdl.so.7 from libtool 2.x
+SPKG_DESC_CSWlibtoolrt = Runtime libraries for libtool
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -52,24 +54,23 @@
 BUILD64 = 1
 NOISAEXEC = 1
 
-SKIPTEST = 1
 TEST_TARGET = check
 
-   MERGE_SCRIPTS_isa-default-garversion-1.5.26-garcompiler-SOS12 = copy-only
-      MERGE_DIRS_isa-default-garversion-1.5.26-garcompiler-SOS12 = $(libdir)
- MERGE_SCRIPTS_isa-default64-garversion-1.5.26-garcompiler-SOS12 = copy-relocated-only
-    MERGE_DIRS_isa-default64-garversion-1.5.26-garcompiler-SOS12 = $(libdir)
+   MERGE_SCRIPTS_isa-default-garcompiler-SOS12 = copy-all
+ MERGE_SCRIPTS_isa-default64-garcompiler-SOS12 = copy-relocated-only
+    MERGE_DIRS_isa-default64-garcompiler-SOS12 = $(libdir)
 
-   MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-SOS12 = copy-all
- MERGE_SCRIPTS_isa-default64-garversion-2.2.10-garcompiler-SOS12 = copy-relocated-only
-    MERGE_DIRS_isa-default64-garversion-2.2.10-garcompiler-SOS12 = $(libdir)
+    MERGE_SCRIPTS_isa-default-garcompiler-GCC3 = copy-tags
+    MERGE_SCRIPTS_isa-default-garcompiler-GCC4 = copy-tags
 
-    MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-GCC3 = copy-tags
-    MERGE_SCRIPTS_isa-default-garversion-2.2.10-garcompiler-GCC4 = copy-tags
+PKGFILES_CSWlibltdl7 = $(PKGFILES_RT)
+PKGFILES_CSWlibtoolrt = NONE
 
-PKGFILES_CSWlibtoolrt = $(PKGFILES_RT)
+ARCHALL_CSWlibtoolrt = 1
 
-CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibtoolrt
+CHECKPKG_OVERRIDES_CSWlibtool += surplus-dependency|CSWlibltdl7
+CHECKPKG_OVERRIDES_CSWlibtoolrt += surplus-dependency|CSWlibltdl3
+CHECKPKG_OVERRIDES_CSWlibtoolrt += surplus-dependency|CSWlibltdl7
 
 include gar/category.mk
 
@@ -89,7 +90,7 @@
 		<$(DESTDIR)$(bindir)/libtool >$(DESTDIR)$(datadir)/libtool/$*.tags
 	@$(MAKECOOKIE)
 
-merge-copy-tags:
+merge-copy-tags: $(PKGROOT)
 	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
 		-s ",^\(\..*\.conf\)\$$,\1,p" \
 		-s ",^\(\..*\.tags\)\$$,\1,p" \

Modified: csw/mgar/pkg/libtool/branches/libtool24/checksums
===================================================================
--- csw/mgar/pkg/libtool/trunk/checksums	2010-11-22 16:18:07 UTC (rev 11693)
+++ csw/mgar/pkg/libtool/branches/libtool24/checksums	2010-11-23 14:26:33 UTC (rev 11698)
@@ -1,3 +1 @@
-aa9c5107f3ec9ef4200eb6556f3b3c29  libtool-1.5.26.tar.gz
-b745d220e88163fcd9eea0a90ccf21b0  libtool-2.2.10.tar.gz
-92bb3c7712498b6a5993ab5d5fc8f077  patch-libtool.diff
+4e6144439d95d7332dc50ace6dd24c55  libtool-2.4.tar.xz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list