libgcrypt: Sync with OE and fix patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4088 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
b431cdd56f
commit
4e2e099dd5
|
@ -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}
|
||||
|
|
|
@ -3,15 +3,11 @@ SECTION = "libs"
|
|||
PRIORITY = "optional"
|
||||
LICENSE = "GPL LGPL FDL"
|
||||
DEPENDS = "libgpg-error"
|
||||
PR = "r1"
|
||||
|
||||
# move libgcrypt-config into -dev package
|
||||
FILES_${PN} = "${libdir}/lib*.so.*"
|
||||
FILES_${PN}-dev += "${bindir}"
|
||||
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
|
||||
file://add-pkgconfig-support.patch;patch=1"
|
||||
|
||||
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz"
|
||||
|
||||
inherit autotools binconfig
|
||||
inherit autotools binconfig pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
|
||||
|
||||
|
@ -20,3 +16,7 @@ ARM_INSTRUCTION_SET = "arm"
|
|||
do_stage() {
|
||||
autotools_stage_all
|
||||
}
|
||||
|
||||
# move libgcrypt-config into -dev package
|
||||
FILES_${PN} = "${libdir}/lib*.so.*"
|
||||
FILES_${PN}-dev += "${bindir}"
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
require libgcrypt.inc
|
||||
|
||||
PR = "r2"
|
||||
PR = "r4"
|
||||
|
|
Loading…
Reference in New Issue