[csw-devel] SF.net SVN: gar:[14438] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Apr 28 18:07:06 CEST 2011 

Revision: 14438
          http://gar.svn.sourceforge.net/gar/?rev=14438&view=rev
Author:   dmichelsen
Date:     2011-04-28 16:07:05 +0000 (Thu, 28 Apr 2011)

Log Message:
-----------
libcurl2: Split off soname specific library

Modified Paths:
--------------
    csw/mgar/pkg/libcurl2/branches/curl-7.21.2/Makefile
    csw/mgar/pkg/libcurl2/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libcurl2/
    csw/mgar/pkg/libcurl2/branches/curl-7.21.2/

Removed Paths:
-------------
    csw/mgar/pkg/libcurl2/trunk/files/curlbuild.h
    csw/mgar/pkg/libcurl2/trunk/files/libcurl.so.3.0.0.i
    csw/mgar/pkg/libcurl2/trunk/files/libcurl.so.3.0.0.s

Modified: csw/mgar/pkg/libcurl2/branches/curl-7.21.2/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile	2010-12-08 03:48:13 UTC (rev 11840)
+++ csw/mgar/pkg/libcurl2/branches/curl-7.21.2/Makefile	2011-04-28 16:07:05 UTC (rev 14438)
@@ -15,10 +15,6 @@
 
 MASTER_SITES = http://curl.haxx.se/download/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += libcurl.so.3.0.0.s
-DISTFILES += libcurl.so.2.0.2.s
-DISTFILES += libcurl.so.3.0.0.i
-DISTFILES += libcurl.so.2.0.2.i
 DISTFILES += curlbuild.h
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -43,7 +39,12 @@
 EXTRA_CONFIGURE_ARGS_features-full    = --enable-ares --with-spnego=$(libdir)
 EXTRA_CONFIGURE_ARGS_features-full   += --enable-ldap --enable-ldaps
 
+EXTRA_LDFLAGS = -L$(libdir)/libnet-new
+
+EXTRA_LD_OPTIONS = -f libcurl-full.so.4.2.0
+
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-static --enable-shared
 CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl
 CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs
 CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES))
@@ -127,22 +128,10 @@
 
 # end checkpkg happiness section
 
+#build-modulated: EXTRA_LD_OPTIONS=$(EXTRA_LD_OPTIONS_features-$(FEATURES))
+
 include gar/category.mk
 
-post-install-isa-sparcv8-features-minimal:
-	ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0
-	ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2
-	ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
-	ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
-	@$(MAKECOOKIE)
-
-post-install-isa-i386-features-minimal:
-	cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0
-	cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2
-	ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
-	ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
-	@$(MAKECOOKIE)
-
 post-merge:
 	ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libcurl2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile	2011-04-28 00:39:23 UTC (rev 14426)
+++ csw/mgar/pkg/libcurl2/trunk/Makefile	2011-04-28 16:07:05 UTC (rev 14438)
@@ -2,7 +2,7 @@
 VERSION = 7.21.2
 CATEGORIES = net
 
-DESCRIPTION = Command line tool and library for client-side URL transfers.
+DESCRIPTION = Command line tool and library for client-side URL transfers
 define BLURB
   curl and libcurl is a tool for transferring files using URL syntax. It
   supports HTTP, HTTPS, FTP, FTPS, DICT, TELNET, LDAP, FILE, and GOPHER, as
@@ -14,135 +14,36 @@
 endef
 
 MASTER_SITES = http://curl.haxx.se/download/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += libcurl.so.3.0.0.s
 DISTFILES += libcurl.so.2.0.2.s
-DISTFILES += libcurl.so.3.0.0.i
 DISTFILES += libcurl.so.2.0.2.i
-DISTFILES += curlbuild.h
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PACKAGES += CSWlibcurl2
+CATALOGNAME_CSWlibcurl2 = libcurl2
+SPKG_DESC_CSWlibcurl2 = Library for client-side URL transfers, libcurl.so.2
+RUNTIME_DEP_PKGS_CSWlibcurl2 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibcurl2 += CSWzlib
 
-PACKAGES = CSWcurl CSWcurlrt CSWcurlrtfull CSWcurldevel
-CATALOGNAME_CSWcurl       = curl
-CATALOGNAME_CSWcurlrt     = curl_rt
-CATALOGNAME_CSWcurlrtfull = curl_rt_full
-CATALOGNAME_CSWcurldevel  = curl_devel
+# Yes, the license *is* missing
+CHECKPKG_OVERRIDES_CSWlibcurl2 += license-missing|/opt/csw/share/doc/libcurl2/license
 
-SPKG_DESC_CSWcurl       = A command line tool and library for client-side URL transfers
-SPKG_DESC_CSWcurlrt     = Curl Runtime Libraries (minimal dependencies)
-SPKG_DESC_CSWcurlrtfull = Curl Runtime Libraries (full featured)
-SPKG_DESC_CSWcurldevel  = Curl Developer Files
+VENDOR_URL = http://curl.haxx.se
 
-SPKG_SOURCEURL = http://curl.haxx.se
+# We just put the existing old libs in place for now
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS =
 
-EXTRA_MODULATORS = FEATURES
-MODULATIONS_FEATURES = minimal full
-
-EXTRA_CONFIGURE_ARGS_features-minimal = --disable-ldap --without-libssh2 --disable-ares
-EXTRA_CONFIGURE_ARGS_features-full    = --enable-ares --with-spnego=$(libdir)
-EXTRA_CONFIGURE_ARGS_features-full   += --enable-ldap --enable-ldaps
-
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl
-CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs
-CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES))
-
-BUILD64 = 1
-
-# We are doing 64 bit only for the libs
-NOISAEXEC = 1
-
-RUNTIME_DEP_PKGS_CSWcurl = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl CSWcurlrt CSWlibcares CSWlibssh2
-RUNTIME_DEP_PKGS_CSWcurlrt = CSWlibidn CSWosslrt CSWzlib 
-RUNTIME_DEP_PKGS_CSWcurlrtfull = CSWlibidn CSWoldaprt CSWosslrt CSWzlib CSWlibcares CSWlibssh2 CSWlibfbopenssl
-RUNTIME_DEP_PKGS_CSWcurldevel = CSWcurl
-
-BUILD_DEP_PKGS = $(filter-out CSWcurl CSWcurlrt,$(RUNTIME_DEP_PKGS_CSWcurl) $(RUNTIME_DEP_PKGS_CSWcurlrt) $(RUNTIME_DEP_PKGS_CSWcurlrtfull) $(RUNTIME_DEP_PKGS_CSWcurldevel))
-BUILD_DEP_PKGS += CSWoldapdevel CSWossldevel CSWlibcaresdevel CSWlibssh2devel
-
-SKIPTEST = 1
-
-# isa-sparcv8-features-minimal isa-sparcv8-features-full isa-sparcv9-features-minimal isa-sparcv9-features-full
-
-# TBD: Unify curlbuild.h with something like diff -D (sparcv9|amd64) curlbuild-32.h curlbuild-64.h > curlbuild.h
-# Inspired from http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw
-EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p"
-EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p"
-EXTRA_PAX_ARGS_32 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/libcurl-$(FEATURES).so.4.2.0,p"
-EXTRA_PAX_ARGS_64 += -s ",$(libdir)/libcurl\.so\.4\.2\.0$$,$(libdir_install)/$(ISA)/libcurl-$(FEATURES).so.4.2.0,p"
-EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL))
-
-# We select pkgconfig for minimal library bindings. As libneon is self-contained (links
-# to all necessary libs directly) the full version can simly be linked in.
-EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,,"
-EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES))
-
-MERGE_SCRIPTS_isa-default-features-minimal = copy-all
-MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only
-MERGE_DIRS_isa-default64-features-minimal = $(libdir)
-MERGE_SCRIPTS_isa-default-features-full = copy-only
-MERGE_DIRS_isa-default-features-full = $(libdir)
-MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only
-MERGE_DIRS_isa-default64-features-full = $(libdir)
-
-ALTERNATIVES_CSWcurlrt = minimal
-ALTERNATIVES_CSWcurlrtfull = full
-ALTERNATIVE_minimal  = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-minimal.so.4.2.0 100
-ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-minimal.so.4.2.0
-ALTERNATIVE_full     = $(libdir)/libcurl.so.4.2.0 curl $(libdir)/libcurl-full.so.4.2.0 200
-ALTERNATIVE_full    += $(libdir)/$(ISA_DEFAULT64)/libcurl.so.4.2.0 curl64 $(libdir)/$(ISA_DEFAULT64)/libcurl-full.so.4.2.0
-
-PKGFILES_CSWcurldevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWcurlrt = $(PKGFILES_RT)
-PKGFILES_CSWcurlrtfull = .*-full.*
-
-# recompile curl to link to new ldap, and temporarily include
-# the following block to make checkpkg happy. nothing in the curl
-# package changed, so it should be ok, no?
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibssh2
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWoldaprt
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWsasl
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcares
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibnet
-CHECKPKG_OVERRIDES_CSWcurldevel += surplus-dependency|CSWcurl
-CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrt += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-minimal.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrt += non-uniform-lib-versions-in-package|sonames=['libcurl.so.2',|'libcurl.so.3',|'libcurl.so.4']
-CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull
-CHECKPKG_OVERRIDES_CSWcurlrt += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull
-CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibcares
-CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibssh2
-CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWlibfbopenssl
-CHECKPKG_OVERRIDES_CSWcurlrt += missing-dependency|CSWoldaprt
-CHECKPKG_OVERRIDES_CSWcurlrt += surplus-dependency|CSWalternatives
-CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrtfull += soname-not-part-of-filename|soname=libcurl.so.4|filename=libcurl-full.so.4.2.0
-CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/sparcv9/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull
-CHECKPKG_OVERRIDES_CSWcurlrtfull += file-conflict|/opt/csw/lib/libcurl-full.so.4.2.0|CSWcurlrt|CSWcurlrtfull
-CHECKPKG_OVERRIDES_CSWcurlrtfull += surplus-dependency|CSWalternatives
-CHECKPKG_OVERRIDES_CSWcurlrtfull += shared-lib-pkgname-mismatch|sonames=['libcurl.so.4']|pkgname=CSWcurlrtfull|expected=['CSWlibcurl4']|
-
-# end checkpkg happiness section
-
 include gar/category.mk
 
-post-install-isa-sparcv8-features-minimal:
-	ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0
-	ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2
-	ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
+post-install-isa-sparcv8:
+	ginstall -d $(DESTDIR)$(libdir)
+	ginstall $(WORKDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2
 	ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
 	@$(MAKECOOKIE)
 
 post-install-isa-i386-features-minimal:
-	cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0
-	cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2
-	ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
+	ginstall -d $(DESTDIR)$(libdir)
+	cp $(WORKDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2
 	ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
 	@$(MAKECOOKIE)
-
-post-merge:
-	ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h
-	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/libcurl2/trunk/files/curlbuild.h
===================================================================
--- csw/mgar/pkg/curl/trunk/files/curlbuild.h	2011-04-28 00:39:23 UTC (rev 14426)
+++ csw/mgar/pkg/libcurl2/trunk/files/curlbuild.h	2011-04-28 16:07:05 UTC (rev 14438)
@@ -1,6 +0,0 @@
-/* Allow 32 and 64 bit headers to coexist */
-#if defined __amd64 || defined __x86_64 || defined __sparcv9
-#include "curlbuild-64.h"
-#else
-#include "curlbuild-32.h"
-#endif

Deleted: csw/mgar/pkg/libcurl2/trunk/files/libcurl.so.3.0.0.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/libcurl2/trunk/files/libcurl.so.3.0.0.s
===================================================================
(Binary files differ)


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