* [gentoo-commits] gentoo-x86 commit in dev-libs/nspr: nspr-4.8.4-r1.ebuild ChangeLog
@ 2010-07-21 14:00 Jeremy Olexa (darkside)
0 siblings, 0 replies; only message in thread
From: Jeremy Olexa (darkside) @ 2010-07-21 14:00 UTC (permalink / raw
To: gentoo-commits
darkside 10/07/21 14:00:18
Modified: nspr-4.8.4-r1.ebuild ChangeLog
Log:
Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patches, etc. Approved by mozilla team in IRC, reference bug 328119
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-libs/nspr/nspr-4.8.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.8.4-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.8.4-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.8.4-r1.ebuild?r1=1.1&r2=1.2
Index: nspr-4.8.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.4-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspr-4.8.4-r1.ebuild 16 May 2010 18:39:14 -0000 1.1
+++ nspr-4.8.4-r1.ebuild 21 Jul 2010 14:00:18 -0000 1.2
@@ -1,6 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.4-r1.ebuild,v 1.1 2010/05/16 18:39:14 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.4-r1.ebuild,v 1.2 2010/07/21 14:00:18 darkside Exp $
+
+EAPI=3
inherit eutils multilib toolchain-funcs versionator
@@ -12,41 +14,49 @@
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+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.8-pkgconfig-gentoo-3.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
+ epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch
+ epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+ # make sure it won't find Perl out of Prefix
+ sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die
# Respect LDFLAGS
sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
mozilla/nsprpub/config/rules.mk
}
-src_compile() {
+src_configure() {
cd "${S}"/build
echo > "${T}"/test.c
$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
case $(file "${T}"/test.o) in
- *64-bit*) myconf="${myconf} --enable-64bit";;
- *32-bit*) ;;
+ *64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";;
+ *32-bit*|*ppc*|*i386*|*"RISC System/6000"*) ;;
*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
esac
- myconf="${myconf} --libdir=/usr/$(get_libdir)"
+ myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
ECONF_SOURCE="../mozilla/nsprpub" econf \
$(use_enable debug) \
$(use_enable !debug optimize) \
${myconf} || die "econf failed"
+}
+
+src_compile() {
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build"
}
@@ -56,15 +66,22 @@
cd "${S}"/build
emake DESTDIR="${D}" install || die "emake install failed"
- cd "${D}"/usr/$(get_libdir)
+ 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 staic libraries."
done
- for file in *.so; do
- mv ${file} ${file}.${MINOR_VERSION} || die "failed to mv files around"
- ln -s ${file}.${MINOR_VERSION} ${file} || die "failed to symlink files."
+ 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
@@ -75,7 +92,7 @@
doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file"
# Remove stupid files in /usr/bin
- rm -f "${D}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+ rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
}
pkg_postinst() {
1.145 dev-libs/nspr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?r1=1.144&r2=1.145
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- ChangeLog 2 Jul 2010 09:14:32 -0000 1.144
+++ ChangeLog 21 Jul 2010 14:00:18 -0000 1.145
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/nspr
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.144 2010/07/02 09:14:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.145 2010/07/21 14:00:18 darkside Exp $
+
+ 21 Jul 2010; Jeremy Olexa <darkside@gentoo.org>
+ +files/nspr-4.7.1-solaris.patch, +files/nspr-4.7.4-solaris.patch,
+ +files/nspr-4.8.3-aix-gcc.patch, +files/nspr-4.8.3-aix-soname.patch,
+ nspr-4.8.4-r1.ebuild, +files/nspr-4.8.4-darwin-install_name.patch:
+ Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patches,
+ etc. Approved by mozilla team in IRC, reference bug 328119
02 Jul 2010; Guy Martin <gmsoft@gentoo.org> nspr-4.8.4.ebuild:
hppa stable, #324735
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-07-21 14:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-21 14:00 [gentoo-commits] gentoo-x86 commit in dev-libs/nspr: nspr-4.8.4-r1.ebuild ChangeLog Jeremy Olexa (darkside)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox