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

[chninkel at users.sourceforge.net]

Revision: 21285
          http://gar.svn.sourceforge.net/gar/?rev=21285&view=rev
Author:   chninkel
Date:     2013-06-05 20:15:43 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
gnutls/trunk: add a workaround to make sure xtra libraries not liked against libgnutls28

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

Modified: csw/mgar/pkg/gnutls/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls/trunk/Makefile	2013-06-05 19:26:12 UTC (rev 21284)
+++ csw/mgar/pkg/gnutls/trunk/Makefile	2013-06-05 20:15:43 UTC (rev 21285)
@@ -36,11 +36,11 @@
 PACKAGES += CSWlibgnutls26
 CATALOGNAME_CSWlibgnutls = libgnutls26
 SPKG_DESC_CSWlibgnutls26 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.26
-PKGFILES_CSWlibgnutls26 = $(PKGFILES_RT)
+PKGFILES_CSWlibgnutls26 = $(call baseisadirs,$(libdir),[^/-]*\.so\.\d+(\.\d+)*)
+PKGFILES_CSWlibgnutls26 += $(call baseisadirs,$(libdir),[^/-]*-extra\.so\.\d+(\.\d+)*)
 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibnettle4
 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibgc1
 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibhogweed2
 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-6
@@ -62,8 +62,12 @@
 # If defined with the default value, the test breaks
 # so we only keep the required items
 LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE)
+# Workaround to make sure gnutls26 extra libraries
+# are linked against gnutls26 and not gnutls28
+LD_OPTIONS += -L$(abspath $(WORKSRC))/lib/.libs
 
 # We put all libs in one package as they are .so.26 and are all bumped together
 CHECKPKG_OVERRIDES_CSWlibgnutls26 += shared-lib-pkgname-mismatch
 
 include gar/category.mk
+

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