From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 12 Sep 2010 22:00:56 +0000 (+0200)
Subject: libgcrypt: Fix build with LTO.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9449c3387dee41cce3ed6345549e47d6a6def6dd;p=ipfire-3.x.git

libgcrypt: Fix build with LTO.
---

diff --git a/pkgs/core/libgcrypt/libgcrypt.nm b/pkgs/core/libgcrypt/libgcrypt.nm
index 6729a3bad..6c501443b 100644
--- a/pkgs/core/libgcrypt/libgcrypt.nm
+++ b/pkgs/core/libgcrypt/libgcrypt.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = libgcrypt
 PKG_VER        = 1.4.6
-PKG_REL        = 0
+PKG_REL        = 1
 
 PKG_MAINTAINER =
 PKG_GROUP      = System/Libraries
@@ -35,7 +35,6 @@ PKG_LICENSE    = LGPLv2.1+
 PKG_SUMMARY    = A general-purpose cryptography library.
 
 PKG_BUILD_DEPS+= gcc-c++ libgpg-error-devel
-#PKG_DEPS-$(PKG_NAME)-devel += libgpg-error-devel # XXX
 
 define PKG_DESCRIPTION
 	Libgcrypt is a general purpose crypto library based on the code used \
diff --git a/pkgs/core/libgcrypt/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch b/pkgs/core/libgcrypt/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch
new file mode 100644
index 000000000..7b4671fbe
--- /dev/null
+++ b/pkgs/core/libgcrypt/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch
@@ -0,0 +1,24 @@
+diff -up libgcrypt-1.4.5/tests/Makefile.am.ImplicitDSOLinking libgcrypt-1.4.5/tests/Makefile.am
+--- libgcrypt-1.4.5/tests/Makefile.am.ImplicitDSOLinking	2009-04-02 04:25:34.000000000 -0500
++++ libgcrypt-1.4.5/tests/Makefile.am	2010-02-14 14:28:49.792383613 -0600
+@@ -36,7 +36,7 @@ TESTS += benchmark
+ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+ 
+-LDADD = ../src/libgcrypt.la $(DL_LIBS)
++LDADD = ../src/libgcrypt.la $(DL_LIBS) $(GPG_ERROR_LIBS)
+ 
+ EXTRA_PROGRAMS = testapi pkbench
+ noinst_PROGRAMS = $(TESTS) fipsdrv
+diff -up libgcrypt-1.4.5/tests/Makefile.in.ImplicitDSOLinking libgcrypt-1.4.5/tests/Makefile.in
+--- libgcrypt-1.4.5/tests/Makefile.in.ImplicitDSOLinking	2009-12-11 09:43:30.000000000 -0600
++++ libgcrypt-1.4.5/tests/Makefile.in	2010-02-14 14:29:30.232368780 -0600
+@@ -334,7 +334,7 @@ top_srcdir = @top_srcdir@
+ # a built header.
+ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+-LDADD = ../src/libgcrypt.la $(DL_LIBS)
++LDADD = ../src/libgcrypt.la $(DL_LIBS) $(GPG_ERROR_LIBS)
+ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl
+ all: all-am
+