diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-03-19 22:48:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-03-19 22:48:56 +0000 |
| commit | 4e2e099dd592e6126dc20a25ce71d982a4503424 (patch) | |
| tree | 8739612f69fb30a0bd44dcb79be34eadbf75bd62 /meta/packages/libgcrypt/files | |
| parent | b431cdd56f807a92aaa2b77748d6cf6ea4f09307 (diff) | |
| download | openembedded-core-4e2e099dd592e6126dc20a25ce71d982a4503424.tar.gz openembedded-core-4e2e099dd592e6126dc20a25ce71d982a4503424.tar.bz2 openembedded-core-4e2e099dd592e6126dc20a25ce71d982a4503424.tar.xz openembedded-core-4e2e099dd592e6126dc20a25ce71d982a4503424.zip | |
libgcrypt: Sync with OE and fix patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4088 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/libgcrypt/files')
| -rw-r--r-- | meta/packages/libgcrypt/files/add-pkgconfig-support.patch | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/meta/packages/libgcrypt/files/add-pkgconfig-support.patch b/meta/packages/libgcrypt/files/add-pkgconfig-support.patch index 9b00e8262..24a59787a 100644 --- a/meta/packages/libgcrypt/files/add-pkgconfig-support.patch +++ b/meta/packages/libgcrypt/files/add-pkgconfig-support.patch @@ -1,17 +1,19 @@ -diff -Nur libgcrypt-1.2.4/configure.ac libgcrypt11-1.2.4/configure.ac ---- libgcrypt-1.2.4/configure.ac 2007-02-01 19:41:06.000000000 +0100 -+++ libgcrypt11-1.2.4/configure.ac 2007-02-11 13:05:36.000000000 +0100 -@@ -808,6 +808,7 @@ +Index: libgcrypt-1.2.4/configure.ac +=================================================================== +--- libgcrypt-1.2.4.orig/configure.ac 2008-03-19 22:14:50.000000000 +0000 ++++ libgcrypt-1.2.4/configure.ac 2008-03-19 22:14:58.000000000 +0000 +@@ -807,6 +807,7 @@ + doc/Makefile src/Makefile src/gcrypt.h - src/libgcrypt-config +src/libgcrypt.pc + src/libgcrypt-config tests/Makefile w32-dll/Makefile - ]) -diff -Nur libgcrypt-1.2.4/src/libgcrypt.pc.in libgcrypt11-1.2.4/src/libgcrypt.pc.in ---- libgcrypt-1.2.4/src/libgcrypt.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ libgcrypt11-1.2.4/src/libgcrypt.pc.in 2007-02-11 13:03:30.000000000 +0100 +Index: libgcrypt-1.2.4/src/libgcrypt.pc.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libgcrypt-1.2.4/src/libgcrypt.pc.in 2008-03-19 22:14:58.000000000 +0000 @@ -0,0 +1,32 @@ +# Process this file with autoconf to produce a pkg-config metadata file. +# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation @@ -42,21 +44,6 @@ diff -Nur libgcrypt-1.2.4/src/libgcrypt.pc.in libgcrypt11-1.2.4/src/libgcrypt.pc +Description: GNU crypto library +URL: http://www.gnupg.org +Version: @VERSION@ -+Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@ -+Libs.private: @GPG_ERROR_LIBS@ -+Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@ -diff -Nur libgcrypt-1.2.4/src/Makefile.am libgcrypt11-1.2.4/src/Makefile.am ---- libgcrypt-1.2.4/src/Makefile.am 2006-11-30 16:38:18.000000000 +0100 -+++ libgcrypt11-1.2.4/src/Makefile.am 2007-02-11 13:10:03.000000000 +0100 -@@ -27,6 +27,11 @@ - - lib_LTLIBRARIES = libgcrypt.la - -+# Pkg-config script. -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = libgcrypt.pc -+DISTCLEANFILES = $(pkgconfig_DATA) -+ - if HAVE_LD_VERSION_SCRIPT - libgcrypt_version_script_cmd = -Wl,--version-script=$(srcdir)/libgcrypt.vers - else ++Libs: -L${libdir} -lgcrypt ++Libs.private: -L${libdir} -lgpg-error ++Cflags: -I${includedir} |