commit: fbee23c113df5cc0e082abead6e45b08700c60b1 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Mon Nov 3 18:47:36 2014 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Tue Nov 4 18:33:06 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=fbee23c1
dev-libs/gmp: support for powerpc Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> --- dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch | 20 +++++ dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch | 17 ++++ dev-libs/gmp/gmp-5.1.3-r99.ebuild | 120 +++++++++++++++++++++++++ dev-libs/gmp/metadata.xml | 8 ++ 4 files changed, 165 insertions(+) diff --git a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch b/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch new file mode 100644 index 0000000..093bec1 --- /dev/null +++ b/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch @@ -0,0 +1,20 @@ +fixed executable stack + +http://bugs.gentoo.org/115038 + +--- gmp-4.1.4/configure ++++ gmp-4.1.4/configure +@@ -21689,6 +21689,13 @@ + fi + echo "')" >> $gmp_configm4 + echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4 ++# Gentoo hack ++case $host_os in ++ *linux*) ++ echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4 ++ echo '.previous' >> $gmp_configm4 ++ ;; ++esac + + # Create Makefiles + # FIXME: Upcoming version of autoconf/automake may not like broken lines. diff --git a/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch b/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch new file mode 100644 index 0000000..7fe6752 --- /dev/null +++ b/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch @@ -0,0 +1,17 @@ +Make it work with secure_plt +diff -ru a/gmp-5.1.3/mpn/powerpc32/elf.m4 b/gmp-5.1.3/mpn/powerpc32/elf.m4 +--- a/gmp-5.1.3/mpn/powerpc32/elf.m4 ++++ b/gmp-5.1.3/mpn/powerpc32/elf.m4 +@@ -41,8 +41,10 @@ + m4_assert_numargs(2) + `ifdef(`PIC',` + mflr r0 +- bl _GLOBAL_OFFSET_TABLE_@local-4 +- mflr $1 ++ bcl 20, 31, 1f ++1: mflr $1 ++ addis $1, $1, (_GLOBAL_OFFSET_TABLE_-1b)@ha ++ addi $1, $1, (_GLOBAL_OFFSET_TABLE_-1b)@l + mtlr r0 + lwz $1, $2@got($1) + ',` diff --git a/dev-libs/gmp/gmp-5.1.3-r99.ebuild b/dev-libs/gmp/gmp-5.1.3-r99.ebuild new file mode 100644 index 0000000..b045ff9 --- /dev/null +++ b/dev-libs/gmp/gmp-5.1.3-r99.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.19 2014/05/14 14:41:58 ago Exp $ + +EAPI="4" + +inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal + +MY_PV=${PV/_p*} +MY_P=${PN}-${MY_PV} +PLEVEL=${PV/*p} +DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers" +HOMEPAGE="http://gmplib.org/"; +SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz + ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz + doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="amd64 arm ~mips x86" +IUSE="doc cxx pgo static-libs" + +DEPEND="sys-devel/m4 + app-arch/xz-utils" +RDEPEND="abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20131008-r1 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] +)" + +S=${WORKDIR}/${MY_P} + +DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache ) +HTML_DOCS=( doc ) +MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) + +src_prepare() { + [[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV} + epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch + + epatch "${FILESDIR}"/${PN}-5.1.3-secure-plt.patch + + # note: we cannot run autotools here as gcc depends on this package + elibtoolize + + # GMP uses the "ABI" env var during configure as does Gentoo (econf). + # So, to avoid patching the source constantly, wrap things up. + mv configure configure.wrapped || die + cat <<-\EOF > configure + #!/bin/sh + exec env ABI="$GMPABI" "$0.wrapped" "$@" + EOF + chmod a+rx configure +} + +multilib_src_configure() { + # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works + # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613) + if [[ ${CHOST} == hppa2.0-* ]] ; then + export GMPABI="1.0" + fi + + # ABI mappings (needs all architectures supported) + case ${ABI} in + 32|x86) GMPABI=32;; + 64|amd64|n64) GMPABI=64;; + [onx]32) GMPABI=${ABI};; + esac + export GMPABI + + tc-export CC + ECONF_SOURCE="${S}" econf \ + --localstatedir=/var/state/gmp \ + --enable-shared \ + $(use_enable cxx) \ + $(use_enable static-libs static) +} + +multilib_src_compile() { + emake + + if use pgo ; then + emake -j1 -C tune tuneup + ebegin "Trying to generate tuned data" + ./tune/tuneup | tee gmp.mparam.h.new + if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then + mv gmp.mparam.h.new gmp-mparam.h || die + emake clean + emake + fi + fi +} + +multilib_src_test() { + emake check +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + # should be a standalone lib + rm -f "${D}"/usr/$(get_libdir)/libgmp.la + # this requires libgmp + local la="${D}/usr/$(get_libdir)/libgmpxx.la" + use static-libs \ + && sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \ + || rm -f "${la}" +} + +multilib_src_install_all() { + einstalldocs + use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/ +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libgmp.so.3 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3 +} diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml new file mode 100644 index 0000000..b419bd1 --- /dev/null +++ b/dev-libs/gmp/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> +<herd>toolchain</herd> +<use> + <flag name='pgo'>after building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag> +</use> +</pkgmetadata>
