| 1 |
polynomial-c 15/03/29 17:20:56 |
| 2 |
|
| 3 |
Added: ucommon-6.3.1-gcrypt_autotools.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ucommon-6.3.1-gcrypt_autotools.patch |
| 16 |
=================================================================== |
| 17 |
--- ucommon-6.3.1/configure.ac |
| 18 |
+++ ucommon-6.3.1/configure.ac |
| 19 |
@@ -38,8 +38,12 @@ |
| 20 |
OPENSSL_LINK="" |
| 21 |
MODULE_FLAGS="-module -shared -avoid-version" |
| 22 |
|
| 23 |
+AM_SILENT_RULES([yes]) |
| 24 |
+ |
| 25 |
CHECKFLAGS="$CHECKFLAGS" |
| 26 |
|
| 27 |
+m4_include([m4/libgcrypt.m4]) |
| 28 |
+ |
| 29 |
case "$with_crypto" in |
| 30 |
ssl|openssl) |
| 31 |
ssl="openssl" |
| 32 |
@@ -598,7 +602,8 @@ |
| 33 |
;; |
| 34 |
gnutls|gnu) |
| 35 |
if test ! -z "$GNUTLS_LIBS" ; then |
| 36 |
- SECURE_LIBS="$GNUTLS_LIBS" |
| 37 |
+ AM_PATH_LIBGCRYPT |
| 38 |
+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS" |
| 39 |
SECURE="gnutls" |
| 40 |
fi |
| 41 |
;; |
| 42 |
--- ucommon-6.3.1/utils/Makefile.am |
| 43 |
+++ ucommon-6.3.1/utils/Makefile.am |
| 44 |
@@ -10,9 +10,9 @@ |
| 45 |
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 46 |
|
| 47 |
MAINTAINERCLEANFILES = Makefile.in Makefile |
| 48 |
-AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ |
| 49 |
+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@ |
| 50 |
AM_CPPFLAGS = -I$(top_srcdir)/inc |
| 51 |
-LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ |
| 52 |
+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @LIBGCRYPT_LIBS@ |
| 53 |
EXTRA_DIST = *.1 CMakeLists.txt |
| 54 |
|
| 55 |
man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \ |
| 56 |
@@ -21,7 +21,7 @@ |
| 57 |
|
| 58 |
noinst_PROGRAMS = demoSSL |
| 59 |
demoSSL_SOURCES = ssl.cpp |
| 60 |
-demoSSL_LDFLAGS = @SECURE_LOCAL@ |
| 61 |
+demoSSL_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@ |
| 62 |
|
| 63 |
args_SOURCES = args.cpp |
Archives