diff options
author | Jory Pratt <anarchy@gentoo.org> | 2012-06-22 02:57:33 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2012-06-22 02:57:33 +0000 |
commit | 46ac9ab81bb9d7b37c5e6e3ab19d7634846b07f6 (patch) | |
tree | 596d730c2158ca23d22b9af949e7ca885ba9fa02 /dev-libs | |
parent | Add a mask for mythtv-0.25.1 while its developed (diff) | |
download | gentoo-2-46ac9ab81bb9d7b37c5e6e3ab19d7634846b07f6.tar.gz gentoo-2-46ac9ab81bb9d7b37c5e6e3ab19d7634846b07f6.tar.bz2 gentoo-2-46ac9ab81bb9d7b37c5e6e3ab19d7634846b07f6.zip |
Add x32 support, bug 422625
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/nspr/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/nspr/files/nspr-4.9.1-x32.patch | 68 | ||||
-rw-r--r-- | dev-libs/nspr/nspr-4.9.1-r1.ebuild | 108 |
3 files changed, 183 insertions, 1 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 837183add461..702d3e020799 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.189 2012/06/19 05:05:07 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.190 2012/06/22 02:57:33 anarchy Exp $ + +*nspr-4.9.1-r1 (22 Jun 2012) + + 22 Jun 2012; Jory A. Pratt <anarchy@gentoo.org> +nspr-4.9.1-r1.ebuild, + +files/nspr-4.9.1-x32.patch: + Add support for x32, bug #422625 19 Jun 2012; Andreas Schuerch <nativemad@gentoo.org> nspr-4.9.1.ebuild: x86 stable, thanks Mikle Kolyada diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32.patch b/dev-libs/nspr/files/nspr-4.9.1-x32.patch new file mode 100644 index 000000000000..dd7a8be747ec --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.9.1-x32.patch @@ -0,0 +1,68 @@ +diff -urN a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg +--- a/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-05-18 16:55:29.000000000 -0500 ++++ b/mozilla/nsprpub/pr/include/md/_linux.cfg 2012-06-21 15:10:35.397358851 -0500 +@@ -211,7 +211,7 @@ + #define PR_BYTES_PER_DWORD_LOG2 3 + + #elif defined(__x86_64__) +- ++#ifdef __LP64__ + #define IS_LITTLE_ENDIAN 1 + #undef IS_BIG_ENDIAN + #define IS_64 +@@ -256,6 +256,54 @@ + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#else ++ ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#endif ++ + #elif defined(__mc68000__) + + #undef IS_LITTLE_ENDIAN + diff --git a/dev-libs/nspr/nspr-4.9.1-r1.ebuild b/dev-libs/nspr/nspr-4.9.1-r1.ebuild new file mode 100644 index 000000000000..3ba665987b1c --- /dev/null +++ b/dev-libs/nspr/nspr-4.9.1-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.1-r1.ebuild,v 1.1 2012/06/22 02:57:33 anarchy Exp $ + +EAPI=3 +WANT_AUTOCONF="2.1" + +inherit autotools eutils multilib toolchain-funcs versionator + +MIN_PV="$(get_version_component_range 2)" + +DESCRIPTION="Netscape Portable Runtime" +HOMEPAGE="http://www.mozilla.org/projects/nspr/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" + +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="debug" + +src_prepare() { + mkdir build inst + epatch "${FILESDIR}"/${PN}-4.8-config.patch + epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch + epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch + epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch + epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch + epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch + epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch + # Patch needs updating + #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch + epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch + epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch + epatch "${FILESDIR}"/${PN}-4.9.1-x32.patch + + # We must run eautoconf to regenerate configure + cd "${S}"/mozilla/nsprpub + eautoconf + + # make sure it won't find Perl out of Prefix + sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ + "${S}"/mozilla/nsprpub/config/rules.mk || die +} + +src_configure() { + cd "${S}"/build + + echo > "${T}"/test.c + $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o + case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in + ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; + ELFCLASS32*|POWERPC*|I386*|ARM*) ;; + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; + esac + + myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" + + LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \ + $(use_enable debug) \ + $(use_enable !debug optimize) \ + ${myconf} || die "econf failed" +} + +src_compile() { + cd "${S}"/build + if tc-is-cross-compiler; then + emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \ + -C config nsinstall || die "failed to build" + mv config/{,native-}nsinstall + sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk + rm config/nsinstall.o + fi + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" +} + +src_install () { + # Their build system is royally confusing, as usual + MINOR_VERSION=${MIN_PV} # Used for .so version + cd "${S}"/build + emake DESTDIR="${D}" install || die "emake install failed" + + cd "${ED}"/usr/$(get_libdir) + for file in *.a; do + einfo "removing static libraries as upstream has requested!" + rm -f ${file} || die "failed to remove static libraries." + done + + local n= + # aix-soname.patch does this already + [[ ${CHOST} == *-aix* ]] || + for file in *$(get_libname); do + n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) + mv ${file} ${n} || die "failed to mv files around" + ln -s ${n} ${file} || die "failed to symlink files." + if [[ ${CHOST} == *-darwin* ]]; then + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die + fi + done + + # install nspr-config + dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" + + # Remove stupid files in /usr/bin + rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" +} |