summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-24 10:59:20 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-26 11:45:07 +0000
commite8c02ead5ce130492eb11457f58cc4d28a330132 (patch)
tree68f62563613342b34b34c2ecf884f17149d000ef
parent868a81e869a6193aada2073ae533d937a1c0baf4 (diff)
downloadopenembedded-core-e8c02ead5ce130492eb11457f58cc4d28a330132.tar.gz
openembedded-core-e8c02ead5ce130492eb11457f58cc4d28a330132.tar.bz2
openembedded-core-e8c02ead5ce130492eb11457f58cc4d28a330132.tar.xz
openembedded-core-e8c02ead5ce130492eb11457f58cc4d28a330132.zip
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] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 000000000..e005ac658
--- /dev/null
+++ b/meta/recipes-support/gnupg/gnupg-1.4.7/configure.patch
@@ -0,0 +1,17 @@
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: gnupg-1.4.7/configure.ac
+===================================================================
+--- gnupg-1.4.7.orig/configure.ac
++++ gnupg-1.4.7/configure.ac
+@@ -827,7 +827,6 @@ else
+ AC_SUBST(USE_NLS)
+ AC_SUBST(USE_INCLUDED_LIBINTL)
+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
+- AM_PO_SUBDIRS
+ fi
+
+ 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 daea5aad2..f033659c2 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"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5="
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
-PR = "r4"
+PR = "r5"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \
file://long-long-thumb.patch \
- file://mips_gcc4.4.patch"
+ file://configure.patch \
+ file://mips_gcc4.4.patch \
+ file://curl_typeof_fix_backport.patch"
-SRC_URI[md5sum] = "dcf7ed712997888d616e029637bfc303"
-SRC_URI[sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38"
-
-S = "${WORKDIR}/gnupg-${PV}"
+SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c"
+SRC_URI[sha256sum] = "69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d"
inherit autotools gettext
@@ -73,7 +73,8 @@ EXTRA_OECONF = "--disable-ldap \
--with-bzip2=${STAGING_LIBDIR}/.. \
--disable-selinux-support \
--with-readline=${STAGING_LIBDIR}/.. \
- ac_cv_sys_symbol_underscore=yes"
+ ac_cv_sys_symbol_underscore=no \
+ "
do_install () {
autotools_do_install