diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-09-06 05:41:11 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-09-06 05:41:11 +0000 |
| commit | 2b3989a089f84d3c3d3782d9fa2c552358a9ac99 (patch) | |
| tree | b6715696176f64f1629dbbe1f061801cb68aea1e /dev-libs/beecrypt | |
| parent | punt unused files, leftovers... (diff) | |
| download | gentoo-2-2b3989a089f84d3c3d3782d9fa2c552358a9ac99.tar.gz gentoo-2-2b3989a089f84d3c3d3782d9fa2c552358a9ac99.tar.bz2 gentoo-2-2b3989a089f84d3c3d3782d9fa2c552358a9ac99.zip | |
Drop 32bit/64bit ABI overrides since we already handle these things ourselves #423023 by Robert Trace.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/beecrypt')
| -rw-r--r-- | dev-libs/beecrypt/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch | 69 |
2 files changed, 75 insertions, 1 deletions
diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog index 7de90b2d29aa..1c662c691925 100644 --- a/dev-libs/beecrypt/ChangeLog +++ b/dev-libs/beecrypt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/beecrypt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.82 2012/06/07 16:43:17 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.83 2012/09/06 05:41:11 vapier Exp $ + + 06 Sep 2012; Mike Frysinger <vapier@gentoo.org> + files/beecrypt-4.2.1-build-system.patch: + Drop 32bit/64bit ABI overrides since we already handle these things ourselves + #423023 by Robert Trace. 07 Jun 2012; Michael Palimaka <kensington@gentoo.org> +files/beecrypt-4.2.1-gcc-4.7.patch, beecrypt-4.2.1.ebuild: diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch index b2bd64aea003..e35095f53b6e 100644 --- a/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch +++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch @@ -27,6 +27,75 @@ ]) fi fi +--- beecrypt-4.2.1/acinclude.m4 ++++ beecrypt-4.2.1/acinclude.m4 +@@ -498,15 +498,6 @@ AC_DEFUN([BEE_GNU_CC],[ + AC_SUBST(OPENMP_LIBS,"-lgomp") + fi + case $bc_target_arch in +- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona) +- CC="$CC -m64" +- ;; +- i[[3456]]86 | \ +- pentium* | \ +- athlon*) +- CC="$CC -m32" +- CCAS="$CCAS -m32" +- ;; + ia64) + case $target_os in + # HP/UX on Itanium needs to be told that a long is 64-bit! +@@ -525,17 +516,8 @@ AC_DEFUN([BEE_GNU_CC],[ + aix*) + CC="$CC -maix64" + ;; +- linux*) +- CC="$CC -m64" +- ;; + esac + ;; +- sparc | sparcv8*) +- CC="$CC -m32" +- ;; +- sparc64 | sparcv9*) +- CC="$CC -m64" +- ;; + esac + # Certain platforms needs special flags for multi-threaded code + if test "$ac_enable_threads" = yes; then +@@ -646,14 +646,6 @@ dnl BEE_GNU_CXX + AC_DEFUN([BEE_GNU_CXX],[ + AC_REQUIRE([AC_PROG_CXX]) + case $bc_target_arch in +- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona | core2) +- CXX="$CXX -m64" +- ;; +- i[[3456]]86 | \ +- pentium* | \ +- athlon*) +- CXX="$CXX -m32" +- ;; + ia64) + case $target_os in + # HP/UX on Itanium needs to be told that a long is 64-bit! +@@ -672,17 +664,8 @@ AC_DEFUN([BEE_GNU_CXX],[ + aix*) + CXX="$CXX -maix64" + ;; +- linux*) +- CXX="$CXX -m64" +- ;; + esac + ;; +- sparc | sparcv8*) +- CXX="$CXX -m32" +- ;; +- sparc64 | sparcv9*) +- CXX="$CXX -m64" +- ;; + esac + # Certain platforms needs special flags for multi-threaded code + if test "$ac_enable_threads" = yes; then --- beecrypt-4.2.1/java/Makefile.am +++ beecrypt-4.2.1/java/Makefile.am @@ -26,7 +26,7 @@ |