[jhbuild] [3.0] Add a patch to fix libgcrypt build
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] [3.0] Add a patch to fix libgcrypt build
- Date: Thu, 13 May 2010 01:12:20 +0000 (UTC)
commit 5cc3f797e94d8dc340cd9ab343479c4a41619471
Author: William Jon McCann <jmccann redhat com>
Date: Wed May 12 21:11:15 2010 -0400
[3.0] Add a patch to fix libgcrypt build
Fixes https://bugs.g10code.com/gnupg/issue1226
modulesets/gnome-external-deps-3.0.modules | 4 ++-
patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch | 24 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 4f34da3..66ddf16 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -289,7 +289,9 @@
<branch module="libgcrypt/libgcrypt-1.4.5.tar.bz2"
repo="gnupg.org" version="1.4.5"
hash="sha256:496f907c5324de75367ec61c63bfeed1309ef0bc64845dc20b3597731abd9e40"
- md5sum="cc2017ad09b4543f8b3b5e9a53cfd89d" size="1148382" />
+ md5sum="cc2017ad09b4543f8b3b5e9a53cfd89d" size="1148382">
+ <patch file="libgcrypt-1.4.5-ImplicitDSOLinking.patch" strip="1"/>
+ </branch>
<dependencies>
<dep package="libgpg-error" />
</dependencies>
diff --git a/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch b/patches/libgcrypt-1.4.5-ImplicitDSOLinking.patch
new file mode 100644
index 0000000..7b4671f
--- /dev/null
+++ b/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
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]