From patchwork Mon May 6 13:02:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Esben Haabendal X-Patchwork-Id: 241638 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 3C0C72C00EF for ; Mon, 6 May 2013 23:02:41 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 168E33F9BB for ; Mon, 6 May 2013 15:02:36 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 8C1B33F9BB for ; Mon, 6 May 2013 15:02:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=7385; q=dns/txt; s=ironport2; t=1367845354; x=1399381354; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=JpZTzrYvH9oi/bPFNO6n92+fgG64RCayVdrSIa9Atb4=; b=AVtxNF4X+Xzn4gjngz56mz+dpKwSmJH5nlLXULyGMILMRQaFPhGmiNw4 gTYCDZZQxp/TL7GnBuQBTULbA+zoA5oDdBl/DpqYbaffqcAj7TsYnQASd 4dOSq3yjDC7fcrcsbegt0EnTaKPO6GCD/TcOr11OAFKgnHiYTx33yUDF4 k=; X-IronPort-AV: E=Sophos;i="4.87,621,1363129200"; d="scan'208";a="2652623" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 06 May 2013 15:02:33 +0200 Received: from dev.prevas.dk (172.16.10.60) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.342.3; Mon, 6 May 2013 15:02:33 +0200 Received: from arh128 (unknown [172.16.11.9]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: eha) by dev.prevas.dk (Postfix) with ESMTPSA id 5DCB2819F9; Mon, 6 May 2013 15:02:33 +0200 (CEST) Received: by arh128 (Postfix, from userid 1000) id E1C03807DF; Mon, 6 May 2013 15:02:30 +0200 (CEST) From: Esben Haabendal To: Jacob Barsoe Subject: Re: [PATCH] gnupg: added new recipe References: <1363773228-32249-1-git-send-email-jabk@prevas.dk> Date: Mon, 6 May 2013 15:02:30 +0200 In-Reply-To: <1363773228-32249-1-git-send-email-jabk@prevas.dk> (Jacob Barsoe's message of "Wed, 20 Mar 2013 10:53:48 +0100") Message-ID: <87ehdkp8gp.fsf@arh128.prevas.dk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Cc: dev@oe-lite.org X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org Jacob Barsoe writes: > From: Jacob Kjaergaard > > --- > recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch | 12 +++++++ > recipes/gnupg/gnupg-1.4.10/mips_gcc4.4.patch | 42 ++++++++++++++++++++++ > recipes/gnupg/gnupg.inc | 38 ++++++++++++++++++++ > recipes/gnupg/gnupg_1.4.10.oe | 11 ++++++ > recipes/gnupg/gnupg_1.4.10.oe.sig | 1 + > 5 files changed, 104 insertions(+) > create mode 100644 recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch > create mode 100644 recipes/gnupg/gnupg-1.4.10/mips_gcc4.4.patch > create mode 100644 recipes/gnupg/gnupg.inc > create mode 100644 recipes/gnupg/gnupg_1.4.10.oe > create mode 100644 recipes/gnupg/gnupg_1.4.10.oe.sig > > diff --git a/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch b/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch > new file mode 100644 > index 0000000..dd4ec73 > --- /dev/null > +++ b/recipes/gnupg/gnupg-1.4.10/long-long-thumb.patch > @@ -0,0 +1,12 @@ > +--- gnupg/mpi/longlong.h~ 2006-02-14 10:09:55.000000000 +0000 > ++++ gnupg/mpi/longlong.h 2008-10-27 13:11:09.000000000 +0000 > +@@ -181,7 +181,7 @@ > + /*************************************** > + ************** ARM ****************** > + ***************************************/ > +-#if defined (__arm__) && W_TYPE_SIZE == 32 > ++#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) > + #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ > + __asm__ ("adds %1, %4, %5\n" \ > + "adc %0, %2, %3" \ > + > diff --git a/recipes/gnupg/gnupg-1.4.10/mips_gcc4.4.patch b/recipes/gnupg/gnupg-1.4.10/mips_gcc4.4.patch > new file mode 100644 > index 0000000..b101a5b > --- /dev/null > +++ b/recipes/gnupg/gnupg-1.4.10/mips_gcc4.4.patch > @@ -0,0 +1,42 @@ > +Index: gnupg-1.4.10/mpi/longlong.h > +=================================================================== > +--- gnupg-1.4.10.orig/mpi/longlong.h 2008-12-11 17:39:43.000000000 +0100 > ++++ gnupg-1.4.10/mpi/longlong.h 2010-03-27 14:27:53.000000000 +0100 > +@@ -706,18 +706,35 @@ > + #endif /* __m88110__ */ > + #endif /* __m88000__ */ > + > ++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ > ++#if defined (__GNUC__) && defined (__GNUC_MINOR__) > ++#define __GNUC_PREREQ(maj, min) \ > ++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) > ++#else > ++#define __GNUC_PREREQ(maj, min) 0 > ++#endif > ++ > + /*************************************** > + ************** MIPS ***************** > + ***************************************/ > + #if defined (__mips__) && W_TYPE_SIZE == 32 > +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 > ++#if __GNUC_PREREQ (4,4) > ++#define umul_ppmm(w1, w0, u, v) \ > ++ do { \ > ++ UDItype __ll = (UDItype)(u) * (v); \ > ++ w1 = __ll >> 32; \ > ++ w0 = __ll; \ > ++ } while (0) > ++#endif > ++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) > + #define umul_ppmm(w1, w0, u, v) \ > + __asm__ ("multu %2,%3" \ > + : "=l" ((USItype)(w0)), \ > + "=h" ((USItype)(w1)) \ > + : "d" ((USItype)(u)), \ > + "d" ((USItype)(v))) > +-#else > ++#endif > ++#if !defined (umul_ppmm) > + #define umul_ppmm(w1, w0, u, v) \ > + __asm__ ("multu %2,%3 \n" \ > + "mflo %0 \n" \ > diff --git a/recipes/gnupg/gnupg.inc b/recipes/gnupg/gnupg.inc > new file mode 100644 > index 0000000..31cc74d > --- /dev/null > +++ b/recipes/gnupg/gnupg.inc > @@ -0,0 +1,38 @@ > +DESCRIPTION = "gnupg - GNU privacy guard" > +HOMEPAGE = "http://www.gnupg.org/" > +LICENSE = "GPLv2" > + > +inherit autotools gettext > + > +DEPENDS = "zlib bzip2" > + > +MIRRORS =""" > +ftp://ftp.gnupg.org/gcrypt > +http://mirrors.rootmode.com/ftp.gnupg.org > +""" > + > +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2" > + > +S = "${SRCDIR}/gnupg-${PV}" > + > +EXTRA_OECONF = "--disable-ldap \ > + --with-zlib \ > + --with-bzip2 \ > + --disable-selinux-support" > + > +do_install[postfuncs] =+ "do_install_post" > + > +do_install_post() { > + install -d ${D}${docdir}/${PN} > + mv ${D}${datadir}/${PN}/* ${D}/${docdir}/${PN}/ || : > + mv ${D}${prefix}/doc/* ${D}/${docdir}/${PN}/ || : > +} > + > +# split out gpgv from main package > +RDEPENDS_gnupg = "gpgv" > +PACKAGES =+ "gpgv" > +FILES_gpgv = "${bindir}/gpgv" > + > +# Exclude debug files from the main packages > +FILES_${PN} = "${bindir}/* ${datadir}/${PN} ${libexecdir}/${PN}/*" > +FILES_${PN}-dbg += "${libexecdir}/${PN}/.debug" > diff --git a/recipes/gnupg/gnupg_1.4.10.oe b/recipes/gnupg/gnupg_1.4.10.oe > new file mode 100644 > index 0000000..5a36cf0 > --- /dev/null > +++ b/recipes/gnupg/gnupg_1.4.10.oe > @@ -0,0 +1,11 @@ > +require gnupg.inc > + > +DEPENDS += "readline" > +EXTRA_OECONF += "--with-readline ac_cv_sys_symbol_underscore=yes --without-libusb" > +# --without-readline do not support fancy command line editing > + > +SRC_URI += "file://long-long-thumb.patch" > +SRC_URI += "file://mips_gcc4.4.patch" > + > + > + > diff --git a/recipes/gnupg/gnupg_1.4.10.oe.sig b/recipes/gnupg/gnupg_1.4.10.oe.sig > new file mode 100644 > index 0000000..a5de7d6 > --- /dev/null > +++ b/recipes/gnupg/gnupg_1.4.10.oe.sig > @@ -0,0 +1 @@ > +fd1b6a5f3b2dd836b598a1123ac257b8f105615d gnupg-1.4.10.tar.bz2 Merged to master. I had to apply the following change to make it work: commit fb9182ed784cb6f4738fcae21de31ef921c9a876 Author: Esben Haabendal Date: Mon Apr 29 22:54:08 2013 +0200 gnupg: Fix mpi link problem in do_compile Fix problem with linking in tools/, with lots of error messages like: ../mpi/libmpi.a(mpi-add.o): In function `mpi_add': mpi-add.c:(.text+0x358): undefined reference to `mpihelp_sub_n' mpi-add.c:(.text+0x49c): undefined reference to `mpihelp_add_n' mpi-add.c:(.text+0x580): undefined reference to `mpihelp_sub_n' mpi-add.c:(.text+0x5e8): undefined reference to `mpihelp_sub_n' ../mpi/libmpi.a(mpi-bit.o): In function `mpi_rshift': mpi-bit.c:(.text+0x3ac): undefined reference to `mpihelp_rshift' Signed-off-by: Esben Haabendal Notes: Target version: 3.2 /Esben diff --git a/recipes/gnupg/gnupg_1.4.10.oe b/recipes/gnupg/gnupg_1.4.10.oe index 5a36cf0..41d6d1c 100644 --- a/recipes/gnupg/gnupg_1.4.10.oe +++ b/recipes/gnupg/gnupg_1.4.10.oe @@ -1,9 +1,11 @@ require gnupg.inc DEPENDS += "readline" -EXTRA_OECONF += "--with-readline ac_cv_sys_symbol_underscore=yes --without-libusb" +EXTRA_OECONF += "--with-readline" # --without-readline do not support fancy command line editing +EXTRA_OECONF += "ac_cv_sys_symbol_underscore=no --without-libusb" + SRC_URI += "file://long-long-thumb.patch" SRC_URI += "file://mips_gcc4.4.patch"