diff options
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch | 11 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.7g.ebuild | 18 |
2 files changed, 18 insertions, 11 deletions
diff --git a/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch b/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch new file mode 100644 index 000000000000..9ea804aed00b --- /dev/null +++ b/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch @@ -0,0 +1,11 @@ +Remove silly compiler flags which aren't needed. + +http://bugs.gentoo.org/92074 + +--- openssl-0.9.7g/Configure ++++ openssl-0.9.7g/Configure +@@ -407,3 +407,3 @@ + # -bpowerpc64-linux is transient option, -m64 should be the one to use... +-"linux-ppc64", "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-ppc64", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::", diff --git a/dev-libs/openssl/openssl-0.9.7g.ebuild b/dev-libs/openssl/openssl-0.9.7g.ebuild index d4d6841894f0..ac8cca420a97 100644 --- a/dev-libs/openssl/openssl-0.9.7g.ebuild +++ b/dev-libs/openssl/openssl-0.9.7g.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.8 2005/05/14 17:37:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.9 2005/05/22 09:12:49 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz" LICENSE="openssl" SLOT="0" # ia64 is ABI incompat atm, do not change the KEYWORD -KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~m68k -mips ~ppc -ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~m68k -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="emacs test bindist" RDEPEND="" @@ -25,6 +25,7 @@ src_unpack() { cd "${S}" + epatch "${FILESDIR}"/${PN}-0.9.7g-ppc64.patch epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch epatch "${FILESDIR}"/${PN}-0.9.7-hppa-fix-detection.patch epatch "${FILESDIR}"/${PN}-0.9.7-alpha-default-gcc.patch @@ -56,16 +57,11 @@ src_unpack() { for a in $( grep -n -e "^\"linux-" Configure ); do LINE=$( echo $a | awk -F: '{print $1}' ) CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' ) - # for ppc64 I have to be careful given current toolchain issues - if [[ ${ARCH} != "ppc64" ]]; then - NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::" ) $CFLAGS" - else - NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::" ) " + NEW_CFLAGS=$(echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::") + # ppc64's current toolchain sucks at optimization and will break this package + [[ $(tc-arch) != "ppc64" ]] && NEW_CFLAGS="${NEW_CFLAGS} ${CFLAGS}" - fi - - sed -i "${LINE}s:$CUR_CFLAGS:$NEW_CFLAGS:" Configure \ - || die "sed failed" + sed -i "${LINE}s:$CUR_CFLAGS:$NEW_CFLAGS:" Configure || die "sed failed" done IFS=$OLDIFS |