[csw-devel] SF.net SVN: gar:[19187] csw/mgar/pkg/libxspf/trunk

[dmichelsen at users.sourceforge.net]

Revision: 19187
          http://gar.svn.sourceforge.net/gar/?rev=19187&view=rev
Author:   dmichelsen
Date:     2012-09-11 10:37:52 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
libxspf/trunk: Sanitize package name

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

Added Paths:
-----------
    csw/mgar/pkg/libxspf/trunk/files/0001-Keep-norunpath-during-linkage.patch

Modified: csw/mgar/pkg/libxspf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxspf/trunk/Makefile	2012-09-11 10:20:16 UTC (rev 19186)
+++ csw/mgar/pkg/libxspf/trunk/Makefile	2012-09-11 10:37:52 UTC (rev 19187)
@@ -12,26 +12,28 @@
 MASTER_SITES = $(SF_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.lzma
 
+PATCHFILES += 0001-Keep-norunpath-during-linkage.patch
+
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.lzma
 
-PACKAGES = CSWlibxspf4 CSWlibxspfdevel
+PACKAGES += CSWlibxspf4
+SPKG_DESC_CSWlibxspf4 = XSPF playlist reading and writing support for C++ applications, libxspf.so.4
+PKGFILES_CSWlibxspf4 += $(call pkgfiles_lib,libxspf.so.4)
+RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWliburiparser1
+RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWlibexpat1
 
-CATALOGNAME_CSWlibxspf4 = libxspf4
-CATALOGNAME_CSWlibxspfdevel = libxspf_devel
+PACKAGES += CSWlibxspf-dev
+SPKG_DESC_CSWlibxspf-dev = Development files for libxspf.so.4
+RUNTIME_DEP_PKGS_CSWlibxspf-dev += CSWlibxspf4
+RUNTIME_DEP_PKGS_CSWlibxspf-dev += CSWliburiparser1
+RUNTIME_DEP_PKGS_CSWlibxspf-dev += CSWlibexpat1
+OBSOLETED_BY_CSWlibxspf-dev += CSWlibxspfdevel
+CATALOGNAME_CSWlibxspfdevel = libxspf_devel_stub
 
-SPKG_DESC_CSWlibxspf4 = $(DESCRIPTION) Runtime Libraries
-SPKG_DESC_CSWlibxspfdevel = $(DESCRIPTION) Development Files
+EXTRA_LINKER_FLAGS += -norunpath
 
-RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWliburiparser1
-RUNTIME_DEP_PKGS_CSWlibxspf4 += CSWexpat
-RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWlibxspf4
-RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWliburiparser1
-RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWexpat
-
 BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-PKGFILES_CSWlibxspf4 = $(PKGFILES_RT)
-
 include gar/category.mk

Added: csw/mgar/pkg/libxspf/trunk/files/0001-Keep-norunpath-during-linkage.patch
===================================================================
--- csw/mgar/pkg/libxspf/trunk/files/0001-Keep-norunpath-during-linkage.patch	                        (rev 0)
+++ csw/mgar/pkg/libxspf/trunk/files/0001-Keep-norunpath-during-linkage.patch	2012-09-11 10:37:52 UTC (rev 19187)
@@ -0,0 +1,25 @@
+From 1d9434d46cafd3e4e2ce434bb5e4791e20ca1b8d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 11 Sep 2012 11:40:11 +0200
+Subject: [PATCH] Keep -norunpath during linkage
+
+---
+ build-aux/ltmain.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
+index e589475..c03c27f 100644
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -1690,7 +1690,7 @@ EOF
+       # -F/path gives path to uninstalled frameworks, gcc on darwin
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath)
+ 
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+-- 
+1.7.10.3
+

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