[oe-commits] org.oe.dev libgcrypt: add 1.4.1 and actually ship the pkgconfig file we add

[koen commit]

libgcrypt: add 1.4.1 and actually ship the pkgconfig file we add

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 04208912bb82173c9a9b7fbe02dc7929c3e58484
ViewMTN: http://monotone.openembedded.org/revision/info/04208912bb82173c9a9b7fbe02dc7929c3e58484
Files:
1
packages/libgcrypt/libgcrypt-1.4.1
packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch
packages/libgcrypt/libgcrypt_1.4.1.bb
packages/libgcrypt/libgcrypt.inc
Diffs:

#
# mt diff -r5e2b4e267373069562e3a2b58a9d42cc9eb94621 -r04208912bb82173c9a9b7fbe02dc7929c3e58484
#
#
#
# add_dir "packages/libgcrypt/libgcrypt-1.4.1"
# 
# add_file "packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch"
#  content [b1721a7c1917fbbedd8c8384cba1b945ca321d73]
# 
# add_file "packages/libgcrypt/libgcrypt_1.4.1.bb"
#  content [739f80799762bff94c485c0068d6d67bc1e823c3]
# 
# patch "packages/libgcrypt/libgcrypt.inc"
#  from [8e21adfdd89aea4f3065efcdd7086b8a9e5e455e]
#    to [f4dfeb6d39585d87730512fe8f03a115a442e9be]
#
============================================================
--- packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch	b1721a7c1917fbbedd8c8384cba1b945ca321d73
+++ packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch	b1721a7c1917fbbedd8c8384cba1b945ca321d73
@@ -0,0 +1,49 @@
+Index: libgcrypt-1.4.0/configure.ac
+===================================================================
+--- libgcrypt-1.4.0.orig/configure.ac
++++ libgcrypt-1.4.0/configure.ac
+@@ -1072,6 +1072,7 @@ cipher/Makefile
+ doc/Makefile
+ src/Makefile
+ src/gcrypt.h
++src/libgcrypt.pc
+ src/libgcrypt-config
+ src/versioninfo.rc
+ tests/Makefile
+Index: libgcrypt-1.4.0/src/libgcrypt.pc.in
+===================================================================
+--- /dev/null
++++ libgcrypt-1.4.0/src/libgcrypt.pc.in
+@@ -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
++# Author: Simon Josefsson
++#
++# This file is free software; as a special exception the author gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++#
++# This file is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++# API info
++api_version=@LIBGCRYPT_CONFIG_API_VERSION@
++
++# Misc information.
++symmetric_ciphers=@LIBGCRYPT_CIPHERS@
++asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
++digests=@LIBGCRYPT_DIGESTS@
++
++Name: libgcrypt
++Description: GNU crypto library
++URL: http://www.gnupg.org
++Version: @VERSION@
++Libs: -L${libdir} -lgcrypt
++Libs.private: -L${libdir} -lgpg-error
++Cflags: -I${includedir} 
============================================================
--- packages/libgcrypt/libgcrypt_1.4.1.bb	739f80799762bff94c485c0068d6d67bc1e823c3
+++ packages/libgcrypt/libgcrypt_1.4.1.bb	739f80799762bff94c485c0068d6d67bc1e823c3
@@ -0,0 +1,2 @@
+require libgcrypt.inc
+
============================================================
--- packages/libgcrypt/libgcrypt.inc	8e21adfdd89aea4f3065efcdd7086b8a9e5e455e
+++ packages/libgcrypt/libgcrypt.inc	f4dfeb6d39585d87730512fe8f03a115a442e9be
@@ -7,16 +7,18 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/li
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
            file://add-pkgconfig-support.patch;patch=1"
 
-inherit autotools binconfig pkgconfig
+inherit autotools binconfig pkgconfig lib_package
 
 EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 
 ARM_INSTRUCTION_SET = "arm"
 
+do_install_append() {
+	install -d ${D}/${libdir}/pkgconfig/
+	cp ${S}/src/*.pc ${D}/${libdir}/pkgconfig/
+}
+
 do_stage() {
 	autotools_stage_all
 }
 
-# move libgcrypt-config into -dev package
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}"