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

[dmichelsen at users.sourceforge.net]

Revision: 8820
          http://gar.svn.sourceforge.net/gar/?rev=8820&view=rev
Author:   dmichelsen
Date:     2010-02-25 15:47:37 +0000 (Thu, 25 Feb 2010)

Log Message:
-----------
neon: More fixes for alternatives

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

Modified: csw/mgar/pkg/neon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/neon/trunk/Makefile	2010-02-25 15:38:11 UTC (rev 8819)
+++ csw/mgar/pkg/neon/trunk/Makefile	2010-02-25 15:47:37 UTC (rev 8820)
@@ -27,8 +27,8 @@
 CATALOGNAME_CSWneonfull = neon_full
 CATALOGNAME_CSWneon-devel = neon_devel
 
-RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois
-RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy
+RUNTIME_DEP_PKGS_CSWneon = CSWexpat CSWosslrt CSWzlib CSWggettextrt
+RUNTIME_DEP_PKGS_CSWneonfull = CSWexpat CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy
 RUNTIME_DEP_PKGS_CSWneon-devel = CSWneon
 
 BUILD_DEP_PKGS = $(sort $(RUNTIME_DEP_PKGS_CSWneon) $(RUNTIME_DEP_PKGS_CSWneonfull))
@@ -40,7 +40,7 @@
 # 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-minimal = --without-libproxy --without-pakchois --without-gssapi
 CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois
 
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -61,15 +61,19 @@
 # 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 += -s ",$(libdir)/libneon\.so\.,$(libdir_install)/libneon-$(FEATURES).so.,p"
 EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES))
 
+EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.26\.0\.4\),\1-$(FEATURES)\2,p"
+EXTRA_PAX_ARGS-32 += -s ",\(\.$(libdir)/libneon\)\(\.so\.27\.2\.3\),\1-$(FEATURES)\2,p"
+EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.26\.0\.4\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p"
+EXTRA_PAX_ARGS-64 += -s ",\.$(libdir)/libneon\(\.so\.27\.2\.3\),.$(libdir_install)/$(ISA)/libneon-$(FEATURES)\1,p"
+EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS-$(MEMORYMODEL))
+
 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_SCRIPTS_isa-default-garversion-0.26.4-features-full = copy-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)
@@ -77,23 +81,33 @@
 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_SCRIPTS_isa-default-garversion-0.29.3-features-full = copy-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)
 
+EXTRA_LINKER_FLAGS = -lintl
+
+PKGFILES_CSWneonfull = .*-full.*
+PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL)
 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)
+ALTERNATIVE_minimal  = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-minimal.so.27.2.3 100
+ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.27.2.3
+ALTERNATIVE_minimal += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-minimal.so.26.0.4
+ALTERNATIVE_minimal += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-minimal.so.26.0.4
 
+ALTERNATIVE_full     = $(libdir)/libneon.so.27.2.3 neon $(libdir)/libneon-full.so.27.2.3 200
+ALTERNATIVE_full    += $(libdir)/$(ISA_DEFAULT64)/libneon.so.27.2.3 neon64 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.27.2.3
+ALTERNATIVE_full    += $(libdir)/libneon.so.26.0.4 neon.26 $(libdir)/libneon-full.so.26.0.4
+ALTERNATIVE_full    += $(libdir)/$(ISA_DEFAULT64)/libneon.so.26.0.4 neon64.26 $(libdir)/$(ISA_DEFAULT64)/libneon-full.so.26.0.4
+
 include gar/category.mk
+
+#post-install-modulated:
+#	rm -f $(DESTDIR)$(libdir)/libneon.so
+#	gln -s libneon.so.27 $(DESTDIR)$(libdir)/libneon.so
+#	@$(MAKECOOKIE)


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