summaryrefslogtreecommitdiffstats
path: root/meta/packages/libgcrypt
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-03-19 22:48:56 +0000
committerRichard Purdie <richard@openedhand.com>2008-03-19 22:48:56 +0000
commit4e2e099dd592e6126dc20a25ce71d982a4503424 (patch)
tree8739612f69fb30a0bd44dcb79be34eadbf75bd62 /meta/packages/libgcrypt
parentb431cdd56f807a92aaa2b77748d6cf6ea4f09307 (diff)
downloadpoky-4e2e099dd592e6126dc20a25ce71d982a4503424.tar.gz
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')
-rw-r--r--meta/packages/libgcrypt/files/add-pkgconfig-support.patch41
-rw-r--r--meta/packages/libgcrypt/libgcrypt.inc14
-rw-r--r--meta/packages/libgcrypt/libgcrypt_1.2.4.bb2
3 files changed, 22 insertions, 35 deletions
diff --git a/meta/packages/libgcrypt/files/add-pkgconfig-support.patch b/meta/packages/libgcrypt/files/add-pkgconfig-support.patch
index 9b00e8262a..24a59787a2 100644
--- a/meta/packages/libgcrypt/files/add-pkgconfig-support.patch
+++ b/meta/packages/libgcrypt/files/add-pkgconfig-support.patch
@@ -1,17 +1,19 @@
1diff -Nur libgcrypt-1.2.4/configure.ac libgcrypt11-1.2.4/configure.ac 1Index: libgcrypt-1.2.4/configure.ac
2--- libgcrypt-1.2.4/configure.ac 2007-02-01 19:41:06.000000000 +0100 2===================================================================
3+++ libgcrypt11-1.2.4/configure.ac 2007-02-11 13:05:36.000000000 +0100 3--- libgcrypt-1.2.4.orig/configure.ac 2008-03-19 22:14:50.000000000 +0000
4@@ -808,6 +808,7 @@ 4+++ libgcrypt-1.2.4/configure.ac 2008-03-19 22:14:58.000000000 +0000
5@@ -807,6 +807,7 @@
6 doc/Makefile
5 src/Makefile 7 src/Makefile
6 src/gcrypt.h 8 src/gcrypt.h
7 src/libgcrypt-config
8+src/libgcrypt.pc 9+src/libgcrypt.pc
10 src/libgcrypt-config
9 tests/Makefile 11 tests/Makefile
10 w32-dll/Makefile 12 w32-dll/Makefile
11 ]) 13Index: libgcrypt-1.2.4/src/libgcrypt.pc.in
12diff -Nur libgcrypt-1.2.4/src/libgcrypt.pc.in libgcrypt11-1.2.4/src/libgcrypt.pc.in 14===================================================================
13--- libgcrypt-1.2.4/src/libgcrypt.pc.in 1970-01-01 01:00:00.000000000 +0100 15--- /dev/null 1970-01-01 00:00:00.000000000 +0000
14+++ libgcrypt11-1.2.4/src/libgcrypt.pc.in 2007-02-11 13:03:30.000000000 +0100 16+++ libgcrypt-1.2.4/src/libgcrypt.pc.in 2008-03-19 22:14:58.000000000 +0000
15@@ -0,0 +1,32 @@ 17@@ -0,0 +1,32 @@
16+# Process this file with autoconf to produce a pkg-config metadata file. 18+# Process this file with autoconf to produce a pkg-config metadata file.
17+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation 19+# 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
42+Description: GNU crypto library 44+Description: GNU crypto library
43+URL: http://www.gnupg.org 45+URL: http://www.gnupg.org
44+Version: @VERSION@ 46+Version: @VERSION@
45+Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@ 47+Libs: -L${libdir} -lgcrypt
46+Libs.private: @GPG_ERROR_LIBS@ 48+Libs.private: -L${libdir} -lgpg-error
47+Cflags: -I${includedir} @LIBGCRYPT_CONFIG_CFLAGS@ @GPG_ERROR_CFLAGS@ 49+Cflags: -I${includedir}
48diff -Nur libgcrypt-1.2.4/src/Makefile.am libgcrypt11-1.2.4/src/Makefile.am
49--- libgcrypt-1.2.4/src/Makefile.am 2006-11-30 16:38:18.000000000 +0100
50+++ libgcrypt11-1.2.4/src/Makefile.am 2007-02-11 13:10:03.000000000 +0100
51@@ -27,6 +27,11 @@
52
53 lib_LTLIBRARIES = libgcrypt.la
54
55+# Pkg-config script.
56+pkgconfigdir = $(libdir)/pkgconfig
57+pkgconfig_DATA = libgcrypt.pc
58+DISTCLEANFILES = $(pkgconfig_DATA)
59+
60 if HAVE_LD_VERSION_SCRIPT
61 libgcrypt_version_script_cmd = -Wl,--version-script=$(srcdir)/libgcrypt.vers
62 else
diff --git a/meta/packages/libgcrypt/libgcrypt.inc b/meta/packages/libgcrypt/libgcrypt.inc
index 74205da673..65f78db647 100644
--- a/meta/packages/libgcrypt/libgcrypt.inc
+++ b/meta/packages/libgcrypt/libgcrypt.inc
@@ -3,15 +3,11 @@ SECTION = "libs"
3PRIORITY = "optional" 3PRIORITY = "optional"
4LICENSE = "GPL LGPL FDL" 4LICENSE = "GPL LGPL FDL"
5DEPENDS = "libgpg-error" 5DEPENDS = "libgpg-error"
6PR = "r1"
7 6
8# move libgcrypt-config into -dev package 7SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
9FILES_${PN} = "${libdir}/lib*.so.*" 8 file://add-pkgconfig-support.patch;patch=1"
10FILES_${PN}-dev += "${bindir}"
11
12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz"
13 9
14inherit autotools binconfig 10inherit autotools binconfig pkgconfig
15 11
16EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" 12EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
17 13
@@ -20,3 +16,7 @@ ARM_INSTRUCTION_SET = "arm"
20do_stage() { 16do_stage() {
21 autotools_stage_all 17 autotools_stage_all
22} 18}
19
20# move libgcrypt-config into -dev package
21FILES_${PN} = "${libdir}/lib*.so.*"
22FILES_${PN}-dev += "${bindir}"
diff --git a/meta/packages/libgcrypt/libgcrypt_1.2.4.bb b/meta/packages/libgcrypt/libgcrypt_1.2.4.bb
index 2fe98d62e3..500775e3a6 100644
--- a/meta/packages/libgcrypt/libgcrypt_1.2.4.bb
+++ b/meta/packages/libgcrypt/libgcrypt_1.2.4.bb
@@ -1,3 +1,3 @@
1require libgcrypt.inc 1require libgcrypt.inc
2 2
3PR = "r2" 3PR = "r4"