diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-02-02 10:18:40 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-03 15:56:34 +0000 |
commit | b1d4d3599fb03959f3e3d9c804a0ccc76c255dab (patch) | |
tree | 703ccd0a1005cda1fc802fbd9fcb12277892ad71 /meta | |
parent | 954a0bf236bf04455b4d4e0daa69fa2fa713a4ae (diff) | |
download | poky-b1d4d3599fb03959f3e3d9c804a0ccc76c255dab.tar.gz |
gnupg: Add gplv2 version 1.4.7
(From OE-Core rev: daff80c595616de10f32e74e2881e851707c7ff9)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch | 42 | ||||
-rw-r--r-- | meta/recipes-support/gnupg/gnupg_1.4.7.bb | 92 |
3 files changed, 146 insertions, 0 deletions
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch new file mode 100644 index 0000000000..dd4ec73eca --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | --- gnupg/mpi/longlong.h~ 2006-02-14 10:09:55.000000000 +0000 | ||
2 | +++ gnupg/mpi/longlong.h 2008-10-27 13:11:09.000000000 +0000 | ||
3 | @@ -181,7 +181,7 @@ | ||
4 | /*************************************** | ||
5 | ************** ARM ****************** | ||
6 | ***************************************/ | ||
7 | -#if defined (__arm__) && W_TYPE_SIZE == 32 | ||
8 | +#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__) | ||
9 | #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ | ||
10 | __asm__ ("adds %1, %4, %5\n" \ | ||
11 | "adc %0, %2, %3" \ | ||
12 | |||
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch new file mode 100644 index 0000000000..b101a5bbe7 --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Index: gnupg-1.4.10/mpi/longlong.h | ||
2 | =================================================================== | ||
3 | --- gnupg-1.4.10.orig/mpi/longlong.h 2008-12-11 17:39:43.000000000 +0100 | ||
4 | +++ gnupg-1.4.10/mpi/longlong.h 2010-03-27 14:27:53.000000000 +0100 | ||
5 | @@ -706,18 +706,35 @@ | ||
6 | #endif /* __m88110__ */ | ||
7 | #endif /* __m88000__ */ | ||
8 | |||
9 | +/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ | ||
10 | +#if defined (__GNUC__) && defined (__GNUC_MINOR__) | ||
11 | +#define __GNUC_PREREQ(maj, min) \ | ||
12 | + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) | ||
13 | +#else | ||
14 | +#define __GNUC_PREREQ(maj, min) 0 | ||
15 | +#endif | ||
16 | + | ||
17 | /*************************************** | ||
18 | ************** MIPS ***************** | ||
19 | ***************************************/ | ||
20 | #if defined (__mips__) && W_TYPE_SIZE == 32 | ||
21 | -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | ||
22 | +#if __GNUC_PREREQ (4,4) | ||
23 | +#define umul_ppmm(w1, w0, u, v) \ | ||
24 | + do { \ | ||
25 | + UDItype __ll = (UDItype)(u) * (v); \ | ||
26 | + w1 = __ll >> 32; \ | ||
27 | + w0 = __ll; \ | ||
28 | + } while (0) | ||
29 | +#endif | ||
30 | +#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) | ||
31 | #define umul_ppmm(w1, w0, u, v) \ | ||
32 | __asm__ ("multu %2,%3" \ | ||
33 | : "=l" ((USItype)(w0)), \ | ||
34 | "=h" ((USItype)(w1)) \ | ||
35 | : "d" ((USItype)(u)), \ | ||
36 | "d" ((USItype)(v))) | ||
37 | -#else | ||
38 | +#endif | ||
39 | +#if !defined (umul_ppmm) | ||
40 | #define umul_ppmm(w1, w0, u, v) \ | ||
41 | __asm__ ("multu %2,%3 \n" \ | ||
42 | "mflo %0 \n" \ | ||
diff --git a/meta/recipes-support/gnupg/gnupg_1.4.7.bb b/meta/recipes-support/gnupg/gnupg_1.4.7.bb new file mode 100644 index 0000000000..daea5aad2a --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg_1.4.7.bb | |||
@@ -0,0 +1,92 @@ | |||
1 | DESCRIPTION = "gnupg - GNU privacy guard" | ||
2 | HOMEPAGE = "http://www.gnupg.org/" | ||
3 | DEPENDS = "zlib bzip2 readline" | ||
4 | SECTION = "console/utils" | ||
5 | |||
6 | LICENSE = "GPLv2" | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=" | ||
9 | |||
10 | PR = "r4" | ||
11 | |||
12 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${PV}.tar.bz2 \ | ||
13 | file://long-long-thumb.patch \ | ||
14 | file://mips_gcc4.4.patch" | ||
15 | |||
16 | SRC_URI[md5sum] = "dcf7ed712997888d616e029637bfc303" | ||
17 | SRC_URI[sha256sum] = "a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38" | ||
18 | |||
19 | S = "${WORKDIR}/gnupg-${PV}" | ||
20 | |||
21 | inherit autotools gettext | ||
22 | |||
23 | # --with-egd-socket=NAME use NAME for the EGD socket | ||
24 | # --with-photo-viewer=FIXED_VIEWER set a fixed photo ID viewer | ||
25 | # --with-included-zlib use the zlib code included here | ||
26 | # --with-capabilities use linux capabilities default=no | ||
27 | # --with-mailprog=NAME use "NAME -t" for mail transport | ||
28 | # --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib | ||
29 | # --without-libiconv-prefix don't search for libiconv in includedir and libdir | ||
30 | # --with-included-gettext use the GNU gettext library included here | ||
31 | # --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib | ||
32 | # --without-libintl-prefix don't search for libintl in includedir and libdir | ||
33 | # --without-readline do not support fancy command line editing | ||
34 | # --with-included-regex use the included GNU regex library | ||
35 | # --with-zlib=DIR use libz in DIR | ||
36 | # --with-bzip2=DIR look for bzip2 in DIR | ||
37 | # --enable-static-rnd=egd|unix|linux|auto | ||
38 | # --disable-dev-random disable the use of dev random | ||
39 | # --disable-asm do not use assembler modules | ||
40 | # --enable-m-guard enable memory guard facility | ||
41 | # --enable-selinux-support | ||
42 | # enable SELinux support | ||
43 | # --disable-card-support disable OpenPGP card support | ||
44 | # --disable-gnupg-iconv disable the new iconv code | ||
45 | # --enable-backsigs enable the experimental backsigs code | ||
46 | # --enable-minimal build the smallest gpg binary possible | ||
47 | # --disable-rsa disable the RSA public key algorithm | ||
48 | # --disable-idea disable the IDEA cipher | ||
49 | # --disable-cast5 disable the CAST5 cipher | ||
50 | # --disable-blowfish disable the BLOWFISH cipher | ||
51 | # --disable-aes disable the AES, AES192, and AES256 ciphers | ||
52 | # --disable-twofish disable the TWOFISH cipher | ||
53 | # --disable-sha256 disable the SHA-256 digest | ||
54 | # --disable-sha512 disable the SHA-384 and SHA-512 digests | ||
55 | # --disable-bzip2 disable the BZIP2 compression algorithm | ||
56 | # --disable-exec disable all external program execution | ||
57 | # --disable-photo-viewers disable photo ID viewers | ||
58 | # --disable-keyserver-helpers disable all external keyserver support | ||
59 | # --disable-ldap disable LDAP keyserver interface | ||
60 | # --disable-hkp disable HKP keyserver interface | ||
61 | # --disable-http disable HTTP key fetching interface | ||
62 | # --disable-finger disable Finger key fetching interface | ||
63 | # --disable-mailto disable email keyserver interface | ||
64 | # --disable-keyserver-path disable the exec-path option for keyserver helpers | ||
65 | # --enable-key-cache=SIZE Set key cache to SIZE (default 4096) | ||
66 | # --disable-largefile omit support for large files | ||
67 | # --disable-dns-srv disable the use of DNS SRV in HKP and HTTP | ||
68 | # --disable-nls do not use Native Language Support | ||
69 | # --disable-regex do not handle regular expressions in trust sigs | ||
70 | |||
71 | EXTRA_OECONF = "--disable-ldap \ | ||
72 | --with-zlib=${STAGING_LIBDIR}/.. \ | ||
73 | --with-bzip2=${STAGING_LIBDIR}/.. \ | ||
74 | --disable-selinux-support \ | ||
75 | --with-readline=${STAGING_LIBDIR}/.. \ | ||
76 | ac_cv_sys_symbol_underscore=yes" | ||
77 | |||
78 | do_install () { | ||
79 | autotools_do_install | ||
80 | install -d ${D}${docdir}/${PN} | ||
81 | mv ${D}${datadir}/${PN}/* ${D}/${docdir}/${PN}/ || : | ||
82 | mv ${D}${prefix}/doc/* ${D}/${docdir}/${PN}/ || : | ||
83 | } | ||
84 | |||
85 | # split out gpgv from main package | ||
86 | RDEPENDS_${PN} = "gpgv" | ||
87 | PACKAGES =+ "gpgv" | ||
88 | FILES_gpgv = "${bindir}/gpgv" | ||
89 | |||
90 | # Exclude debug files from the main packages | ||
91 | FILES_${PN} = "${bindir}/* ${datadir}/${PN} ${libexecdir}/${PN}/*" | ||
92 | FILES_${PN}-dbg += "${libexecdir}/${PN}/.debug" | ||