summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-07-19 14:25:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-19 15:13:40 +0100
commit9393207bcd64c161ab228392888ec82538dab327 (patch)
tree1bd8bb9a3997da0e42312339f9e4a050ff176432
parent50af58cedb3153f058d23a0a9584cf69bdcce81b (diff)
downloadpoky-9393207bcd64c161ab228392888ec82538dab327.tar.gz
libgcrypt: merge bb and inc file
(From OE-Core rev: 4b48c0afdf24c4fc71479893c262b5f35d8c188a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt.inc50
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.7.7.bb50
2 files changed, 49 insertions, 51 deletions
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
deleted file mode 100644
index 3c7e89aa92..0000000000
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ /dev/null
@@ -1,50 +0,0 @@
1SUMMARY = "General purpose cryptographic library based on the code from GnuPG"
2HOMEPAGE = "http://directory.fsf.org/project/libgcrypt/"
3BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
4SECTION = "libs"
5
6# helper program gcryptrnd and getrandom are under GPL, rest LGPL
7LICENSE = "GPLv2+ & LGPLv2.1+ & GPLv3+"
8LICENSE_${PN} = "LGPLv2.1+"
9LICENSE_${PN}-dev = "GPLv2+ & LGPLv2.1+"
10LICENSE_dumpsexp-dev = "GPLv3+"
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
13 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
14
15DEPENDS = "libgpg-error"
16
17UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
18SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
19 file://add-pkgconfig-support.patch \
20 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
21 file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \
22 file://fix-undefined-reference-to-pthread.patch \
23"
24
25BINCONFIG = "${bindir}/libgcrypt-config"
26
27inherit autotools texinfo binconfig-disabled pkgconfig
28
29EXTRA_OECONF = "--disable-asm"
30
31PACKAGECONFIG ??= "capabilities"
32PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap"
33
34do_configure_prepend () {
35 # Else this could be used in preference to the one in aclocal-copy
36 rm -f ${S}/m4/gpg-error.m4
37}
38
39# libgcrypt.pc is added locally and thus installed here
40do_install_append() {
41 install -d ${D}/${libdir}/pkgconfig
42 install -m 0644 ${B}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
43}
44
45PACKAGES =+ "dumpsexp-dev"
46
47FILES_${PN}-dev += "${bindir}/hmac256"
48FILES_dumpsexp-dev += "${bindir}/dumpsexp"
49
50BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.7.7.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.7.7.bb
index 2bc21d2e69..7f7d852fb3 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.7.7.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.7.7.bb
@@ -1,4 +1,52 @@
1require libgcrypt.inc 1SUMMARY = "General purpose cryptographic library based on the code from GnuPG"
2HOMEPAGE = "http://directory.fsf.org/project/libgcrypt/"
3BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
4SECTION = "libs"
2 5
6# helper program gcryptrnd and getrandom are under GPL, rest LGPL
7LICENSE = "GPLv2+ & LGPLv2.1+ & GPLv3+"
8LICENSE_${PN} = "LGPLv2.1+"
9LICENSE_${PN}-dev = "GPLv2+ & LGPLv2.1+"
10LICENSE_dumpsexp-dev = "GPLv3+"
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
13 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
14
15DEPENDS = "libgpg-error"
16
17UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
18SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
19 file://add-pkgconfig-support.patch \
20 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
21 file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \
22 file://fix-undefined-reference-to-pthread.patch \
23"
3SRC_URI[md5sum] = "36ace8f8dc4b1a82793ae759bbfc806f" 24SRC_URI[md5sum] = "36ace8f8dc4b1a82793ae759bbfc806f"
4SRC_URI[sha256sum] = "0e72e91290d553c303095a50ea660279d8f11b76c6c86e826f470442fcdf1edd" 25SRC_URI[sha256sum] = "0e72e91290d553c303095a50ea660279d8f11b76c6c86e826f470442fcdf1edd"
26
27BINCONFIG = "${bindir}/libgcrypt-config"
28
29inherit autotools texinfo binconfig-disabled pkgconfig
30
31EXTRA_OECONF = "--disable-asm"
32
33PACKAGECONFIG ??= "capabilities"
34PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap"
35
36do_configure_prepend () {
37 # Else this could be used in preference to the one in aclocal-copy
38 rm -f ${S}/m4/gpg-error.m4
39}
40
41# libgcrypt.pc is added locally and thus installed here
42do_install_append() {
43 install -d ${D}/${libdir}/pkgconfig
44 install -m 0644 ${B}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
45}
46
47PACKAGES =+ "dumpsexp-dev"
48
49FILES_${PN}-dev += "${bindir}/hmac256"
50FILES_dumpsexp-dev += "${bindir}/dumpsexp"
51
52BBCLASSEXTEND = "native nativesdk"