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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Feb 22 14:17:00 CET 2010


Revision: 8732
          http://gar.svn.sourceforge.net/gar/?rev=8732&view=rev
Author:   dmichelsen
Date:     2010-02-22 13:17:00 +0000 (Mon, 22 Feb 2010)

Log Message:
-----------
neon: Add minimal/full alternatives

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

Modified: csw/mgar/pkg/neon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/neon/trunk/Makefile	2010-02-22 11:17:26 UTC (rev 8731)
+++ csw/mgar/pkg/neon/trunk/Makefile	2010-02-22 13:17:00 UTC (rev 8732)
@@ -2,8 +2,9 @@
 GARVERSION = 0.29.3
 CATEGORIES = lib
 
-EXTRA_MODULATORS = GARVERSION
+EXTRA_MODULATORS = GARVERSION FEATURES
 MODULATIONS_GARVERSION = 0.26.4 0.29.3
+MODULATIONS_FEATURES = minimal full
 
 DESCRIPTION = Neon HTTP and WebDAV client library
 define BLURB
@@ -20,26 +21,33 @@
 
 NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES))
 
-PACKAGES = CSWneon CSWneon-devel
+PACKAGES = CSWneon CSWneonfull CSWneon-devel
 
 CATALOGNAME_CSWneon = neon
+CATALOGNAME_CSWneonfull = neon_full
 CATALOGNAME_CSWneon-devel = neon_devel
 
-RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy
+RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois
+RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy
 RUNTIME_DEP_PKGS_CSWneon-devel = CSWneon
 
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWneon)
+BUILD_DEP_PKGS = $(sort $(RUNTIME_DEP_PKGS_CSWneon) $(RUNTIME_DEP_PKGS_CSWneonfull))
 
-SPKG_DESC_CSWneon       = Neon HTTP and WebDAV client library
+SPKG_DESC_CSWneon       = Neon HTTP and WebDAV client library (minimal dependencies)
+SPKG_DESC_CSWneonfull   = Neon HTTP and WebDAV client library (full featured)
 SPKG_DESC_CSWneon-devel = Neon HTTP and WebDAV development support
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois
+CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --with-ssl=openssl
 CONFIGURE_ARGS += --with-expat
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES))
 
 BUILD64 = 1
 NOISAEXEC = 1
@@ -48,18 +56,44 @@
 INSTALL_OVERRIDE_VARS = docdir
 INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon
 
-MERGE_SCRIPTS_isa-default-garversion-0.26.4 = copy-only
-MERGE_DIRS_isa-default-garversion-0.26.4 = $(libdir)
-MERGE_SCRIPTS_isa-default64-garversion-0.26.4 = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-0.26.4 = $(libdir)
+# isa-sparcv8-garversion-0.26.4-features-minimal isa-sparcv8-garversion-0.26.4-features-full isa-sparcv8-garversion-0.29.3-features-minimal isa-sparcv8-garversion-0.29.3-features-full isa-sparcv9-garversion-0.26.4-features-minimal isa-sparcv9-garversion-0.26.4-features-full isa-sparcv9-garversion-0.29.3-features-minimal isa-sparcv9-garversion-0.29.3-features-full
 
-MERGE_SCRIPTS_isa-default-garversion-0.29.3 = copy-all
-MERGE_SCRIPTS_isa-default64-garversion-0.29.3 = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-0.29.3 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+# 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.*,,"
 
-PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL)
+EXTRA_PAX_ARGS += -s ",$(libdir)/libneon\.so\.,$(libdir_install)/libneon-$(FEATURES).so.,p"
+EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES))
+
+MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-minimal = copy-only
+MERGE_DIRS_isa-default-garversion-0.26.4-features-minimal = $(libdir)
+MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-minimal = copy-relocated-only
+MERGE_DIRS_isa-default64-garversion-0.26.4-features-minimal = $(libdir)
+MERGE_SCRIPTS_isa-default-garversion-0.26.4-features-full = copy-relocated-only
+MERGE_DIRS_isa-default-garversion-0.26.4-features-full = $(libdir)
+MERGE_SCRIPTS_isa-default64-garversion-0.26.4-features-full = copy-relocated-only
+MERGE_DIRS_isa-default64-garversion-0.26.4-features-full = $(libdir)
+
+MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-minimal = copy-all
+MERGE_SCRIPTS_isa-default64-garversion-0.29.3-features-minimal = copy-relocated-only
+MERGE_DIRS_isa-default64-garversion-0.29.3-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-default-garversion-0.29.3-features-full = copy-relocated-only
+MERGE_DIRS_isa-default-garversion-0.29.3-features-full = $(libdir)
+MERGE_SCRIPTS_isa-default64-garversion-0.29.3-features-full = copy-relocated-only
+MERGE_DIRS_isa-default64-garversion-0.29.3-features-full = $(libdir)
+
 PKGFILES_CSWneon-devel += $(docdir)/.*
 
 EXTRA_LINKER_FLAGS = -lintl
 
+ALTERNATIVES_CSWneon = minimal
+ALTERNATIVES_CSWneonfull = full
+ALTERNATIVE_minimal  = $(libdir)/libneon.so.27 neon $(libdir)/libneon-minimal.so.27 200
+ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.27
+ALTERNATIVE_full     = $(libdir)/libneon.so.27 neon $(libdir)/libneon-full.so.27 100
+ALTERNATIVE_full    += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.27
+
+PKGFILES_CSWneonfull = .*-full.*
+PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL)
+
 include gar/category.mk


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