[csw-devel] SF.net SVN: gar:[14458] csw/mgar/pkg/libcurl4/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 14458
          http://gar.svn.sourceforge.net/gar/?rev=14458&view=rev
Author:   dmichelsen
Date:     2011-04-29 12:34:38 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
libcurl4: Add missing dependencies, disable static libs

Modified Paths:
--------------
    csw/mgar/pkg/libcurl4/trunk/Makefile

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2011-04-29 10:01:30 UTC (rev 14457)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2011-04-29 12:34:38 UTC (rev 14458)
@@ -72,6 +72,12 @@
 RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11
 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWcurl += CSWosslrt
+# Double-legacy packages may not even depend on CSWcurlrt, so we must
+# also directly depend on CSWlibcurl2 and CSWlibcurl3
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl2
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl3
+CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl2
+CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl3
 
 BUILD_DEP_PKGS += CSWoldapdevel
 BUILD_DEP_PKGS += CSWossldevel
@@ -96,6 +102,7 @@
 EXTRA_LDFLAGS = -L$(libdir)/libnet-new
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --with-ssl=/opt/csw/ssl
 CONFIGURE_ARGS += --with-ca-path=/opt/csw/ssl/certs
 CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_features-$(FEATURES))
@@ -126,6 +133,9 @@
 MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only
 MERGE_DIRS_isa-default64-features-full = $(libdir)
 
+# TBD: Use alternatives on curl-config between minimal and feature as it is possible to
+# use options to find out about installed features and protocols by calling it.
+
 include gar/category.mk
 
 post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libcurl-feature.so.4


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