summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-24 18:59:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-26 11:45:23 (GMT)
commitc02bea652b615569e2204f8db864d73c5bb10cbc (patch)
tree45c7d2ad7f587e7855211a25cfa4041ee707c1ca /meta/recipes-support
parent43d9193f691428a3d94247c4f54384b698fcc892 (diff)
downloadpoky-c02bea652b615569e2204f8db864d73c5bb10cbc.tar.gz
gnupg: Update checksum, fix configure and compliation issues
This recipe was added, but did not have the correct checksum information for the LIC_FILES_CHKSUM or the SRC_URI. Also disable Documetnation for now due to older autotools issue. [YOCTO #1966] (From OE-Core rev: e8c02ead5ce130492eb11457f58cc4d28a330132) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch17
-rw-r--r--meta/recipes-support/gnupg/gnupg_1.4.7.bb17
2 files changed, 26 insertions, 8 deletions
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
new file mode 100644
index 0000000..e005ac6
--- /dev/null
+++ b/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
@@ -0,0 +1,17 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6Index: gnupg-1.4.7/configure.ac
7===================================================================
8--- gnupg-1.4.7.orig/configure.ac
9+++ gnupg-1.4.7/configure.ac
10@@ -827,7 +827,6 @@ else
11 AC_SUBST(USE_NLS)
12 AC_SUBST(USE_INCLUDED_LIBINTL)
13 AC_SUBST(BUILD_INCLUDED_LIBINTL)
14- AM_PO_SUBDIRS
15 fi
16
17 if test "$try_extensions" = yes || test x"$card_support" = xyes ; then
diff --git a/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/meta/recipes-support/gnupg/gnupg_1.4.7.bb
index daea5aa..f033659 100644
--- a/meta/recipes-support/gnupg/gnupg_1.4.7.bb
+++ b/meta/recipes-support/gnupg/gnupg_1.4.7.bb
@@ -5,18 +5,18 @@ SECTION = "console/utils"
5 5
6LICENSE = "GPLv2" 6LICENSE = "GPLv2"
7 7
8LIC_FILES_CHKSUM = "file://COPYING;md5=" 8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
9 9
10PR = "r4" 10PR = "r5"
11 11
12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \ 12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
13 file://long-long-thumb.patch \ 13 file://long-long-thumb.patch \
14 file://mips_gcc4.4.patch" 14 file://configure.patch \
15 file://mips_gcc4.4.patch \
16 file://curl_typeof_fix_backport.patch"
15 17
16SRC_URI[md5sum] = "dcf7ed712997888d616e029637bfc303" 18SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c"
17SRC_URI[sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38" 19SRC_URI[sha256sum] = "69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d"
18
19S = "${WORKDIR}/gnupg-${PV}"
20 20
21inherit autotools gettext 21inherit autotools gettext
22 22
@@ -73,7 +73,8 @@ EXTRA_OECONF = "--disable-ldap \
73 --with-bzip2=${STAGING_LIBDIR}/.. \ 73 --with-bzip2=${STAGING_LIBDIR}/.. \
74 --disable-selinux-support \ 74 --disable-selinux-support \
75 --with-readline=${STAGING_LIBDIR}/.. \ 75 --with-readline=${STAGING_LIBDIR}/.. \
76 ac_cv_sys_symbol_underscore=yes" 76 ac_cv_sys_symbol_underscore=no \
77 "
77 78
78do_install () { 79do_install () {
79 autotools_do_install 80 autotools_do_install