diff options
| author |   Kristian Fiskerstrand <k_f@gentoo.org> | 2015-06-28 19:19:39 +0000 |
|---|---|---|
| committer | Kristian Fiskerstrand <k_f@gentoo.org> | 2015-06-28 19:19:39 +0000 |
| commit | 5bdf55accc98e177e0e57a791617834acf47700d (patch) | |
| tree | 68af0c8b297cef9e6e9fc4a0d4dfcc1f41399268 /dev-libs/libgcrypt/files | |
| parent | Drop unused local USE-description: 'swig' (diff) | |
| download | gentoo-2-5bdf55accc98e177e0e57a791617834acf47700d.tar.gz gentoo-2-5bdf55accc98e177e0e57a791617834acf47700d.tar.bz2 gentoo-2-5bdf55accc98e177e0e57a791617834acf47700d.zip | |
Fix compile issue on fbsd (bug #494740). Cleanup old.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x250B7AFED6379D85!)
Diffstat (limited to 'dev-libs/libgcrypt/files')
3 files changed, 49 insertions, 30 deletions
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch deleted file mode 100644 index 05c40fbe52ab..000000000000 --- a/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac 2014-01-23 12:16:46.291335724 +0100 -+++ configure.ac 2014-01-23 17:25:50.021776443 +0100 -@@ -73,7 +73,7 @@ - VERSION=$PACKAGE_VERSION - - AC_CONFIG_SRCDIR([src/libgcrypt.vers]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([serial-tests]) - AC_CONFIG_HEADER(config.h) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_LIBOBJ_DIR([compat]) diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch deleted file mode 100644 index 7e8047219944..000000000000 --- a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -r 9dc4a391dd6d mpi/generic/mpi-asm-defs.h ---- a/mpi/generic/mpi-asm-defs.h Tue Jul 29 16:44:47 2014 +0200 -+++ b/mpi/generic/mpi-asm-defs.h Tue Jul 29 16:47:43 2014 +0200 -@@ -1,7 +1,12 @@ --/* This file defines some basic constants for the MPI machinery. We -- * need to define the types on a per-CPU basis, so it is done with -- * this file here. */ -+/* AMD64 compiled with x32 fails in assembly due to incorrect -+ * size of long detected. Using compiler information to detect -+ * this since it is no longer per-architecture -+ */ -+#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && defined(__ILP32__) -+#define BYTES_PER_MPI_LIMB 8 -+#else - #define BYTES_PER_MPI_LIMB (SIZEOF_UNSIGNED_LONG) -+#endif - - - diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.3-freebsd-mpi.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.3-freebsd-mpi.patch new file mode 100644 index 000000000000..121caca56cbb --- /dev/null +++ b/dev-libs/libgcrypt/files/libgcrypt-1.6.3-freebsd-mpi.patch @@ -0,0 +1,49 @@ +From a36ee7501f68ad7ebcfe31f9659430b9d2c3ddd1 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Thu, 11 Jun 2015 16:19:49 +0900 +Subject: [PATCH 1/1] mpi: Support FreeBSD 10 or later. + +* mpi/config.links: Include FreeBSD 10 to 29. + +-- + +Thanks to Yuta SATOH. + +GnuPG-bug-id: 1936, 1974 +--- + mpi/config.links | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/mpi/config.links b/mpi/config.links +index 2fb5e8a..3ead4f0 100644 +--- a/mpi/config.links ++++ b/mpi/config.links +@@ -50,11 +50,12 @@ case "${host}" in + path="" + mpi_cpu_arch="x86" + ;; +- i[3467]86*-*-openbsd* | \ +- i[3467]86*-*-freebsd*-elf | \ +- i[3467]86*-*-freebsd[3-9]* | \ +- i[3467]86*-*-freebsdelf* | \ +- i[3467]86*-*-netbsd* | \ ++ i[3467]86*-*-openbsd* | \ ++ i[3467]86*-*-freebsd*-elf | \ ++ i[3467]86*-*-freebsd[3-9]* | \ ++ i[3467]86*-*-freebsd[12][0-9]*| \ ++ i[3467]86*-*-freebsdelf* | \ ++ i[3467]86*-*-netbsd* | \ + i[3467]86*-*-k*bsd*) + echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h + cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h +@@ -64,6 +65,7 @@ case "${host}" in + i586*-*-openbsd* | \ + i586*-*-freebsd*-elf | \ + i586*-*-freebsd[3-9]* | \ ++ i586*-*-freebsd[12][0-9]*| \ + i586*-*-freebsdelf* | \ + i586*-*-netbsd* | \ + i586*-*-k*bsd* | \ +-- +2.1.4 + |