| 1 |
anarchy 12/01/10 02:14:37 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: nspr-4.8.9-r1.ebuild |
| 5 |
Log: |
| 6 |
Ensure cflags are passed during linking, bug #365975 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.176 dev-libs/nspr/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.176&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.176&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?r1=1.175&r2=1.176 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v |
| 20 |
retrieving revision 1.175 |
| 21 |
retrieving revision 1.176 |
| 22 |
diff -u -r1.175 -r1.176 |
| 23 |
--- ChangeLog 25 Nov 2011 17:25:27 -0000 1.175 |
| 24 |
+++ ChangeLog 10 Jan 2012 02:14:37 -0000 1.176 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for dev-libs/nspr |
| 27 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.175 2011/11/25 17:25:27 xarthisius Exp $ |
| 29 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.176 2012/01/10 02:14:37 anarchy Exp $ |
| 31 |
+ |
| 32 |
+*nspr-4.8.9-r1 (10 Jan 2012) |
| 33 |
+ |
| 34 |
+ 10 Jan 2012; Jory A. Pratt <anarchy@g.o> +nspr-4.8.9-r1.ebuild, |
| 35 |
+ +files/nspr-4.8.9-link-flags.patch: |
| 36 |
+ Ensure cflags are passed during linking, bug #365975 |
| 37 |
|
| 38 |
25 Nov 2011; Kacper Kowalik <xarthisius@g.o> nspr-4.8.9.ebuild: |
| 39 |
ppc64 stable wrt #388045 |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 dev-libs/nspr/nspr-4.8.9-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.8.9-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.8.9-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: nspr-4.8.9-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2012 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.9-r1.ebuild,v 1.1 2012/01/10 02:14:37 anarchy Exp $ |
| 53 |
|
| 54 |
EAPI=3 |
| 55 |
|
| 56 |
inherit eutils multilib toolchain-funcs versionator |
| 57 |
|
| 58 |
MIN_PV="$(get_version_component_range 2)" |
| 59 |
|
| 60 |
DESCRIPTION="Netscape Portable Runtime" |
| 61 |
HOMEPAGE="http://www.mozilla.org/projects/nspr/" |
| 62 |
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" |
| 63 |
|
| 64 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
| 65 |
SLOT="0" |
| 66 |
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" |
| 67 |
IUSE="debug" |
| 68 |
|
| 69 |
src_prepare() { |
| 70 |
mkdir build inst |
| 71 |
epatch "${FILESDIR}"/${PN}-4.8-config.patch |
| 72 |
epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch |
| 73 |
epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch |
| 74 |
epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch |
| 75 |
epatch "${FILESDIR}"/${PN}-4.8-pkgconfig-gentoo-3.patch |
| 76 |
epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch |
| 77 |
epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch |
| 78 |
epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch |
| 79 |
# Patch needs updating |
| 80 |
#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch |
| 81 |
epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch |
| 82 |
epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch |
| 83 |
# make sure it won't find Perl out of Prefix |
| 84 |
sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die |
| 85 |
|
| 86 |
# Respect LDFLAGS |
| 87 |
sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ |
| 88 |
mozilla/nsprpub/config/rules.mk |
| 89 |
|
| 90 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 91 |
# Fix pkgconfig for Darwin (no RPATH stuff) |
| 92 |
sed -i -e 's/-Wl,-R${\?libdir}\?//' \ |
| 93 |
"${S}"/mozilla/nsprpub/config/nspr-config.in \ |
| 94 |
"${S}"/mozilla/nsprpub/config/nspr.pc.in || die |
| 95 |
fi |
| 96 |
} |
| 97 |
|
| 98 |
src_configure() { |
| 99 |
cd "${S}"/build |
| 100 |
|
| 101 |
echo > "${T}"/test.c |
| 102 |
$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o |
| 103 |
case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in |
| 104 |
ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; |
| 105 |
ELFCLASS32*|POWERPC*|I386*|ARM*) ;; |
| 106 |
*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; |
| 107 |
esac |
| 108 |
|
| 109 |
myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" |
| 110 |
|
| 111 |
ECONF_SOURCE="../mozilla/nsprpub" econf \ |
| 112 |
$(use_enable debug) \ |
| 113 |
$(use_enable !debug optimize) \ |
| 114 |
${myconf} || die "econf failed" |
| 115 |
} |
| 116 |
|
| 117 |
src_compile() { |
| 118 |
cd "${S}"/build |
| 119 |
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" |
| 120 |
} |
| 121 |
|
| 122 |
src_install () { |
| 123 |
# Their build system is royally confusing, as usual |
| 124 |
MINOR_VERSION=${MIN_PV} # Used for .so version |
| 125 |
cd "${S}"/build |
| 126 |
emake DESTDIR="${D}" install || die "emake install failed" |
| 127 |
|
| 128 |
cd "${ED}"/usr/$(get_libdir) |
| 129 |
for file in *.a; do |
| 130 |
einfo "removing static libraries as upstream has requested!" |
| 131 |
rm -f ${file} || die "failed to remove static libraries." |
| 132 |
done |
| 133 |
|
| 134 |
local n= |
| 135 |
# aix-soname.patch does this already |
| 136 |
[[ ${CHOST} == *-aix* ]] || |
| 137 |
for file in *$(get_libname); do |
| 138 |
n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) |
| 139 |
mv ${file} ${n} || die "failed to mv files around" |
| 140 |
ln -s ${n} ${file} || die "failed to symlink files." |
| 141 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 142 |
install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die |
| 143 |
fi |
| 144 |
done |
| 145 |
|
| 146 |
# install nspr-config |
| 147 |
dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" |
| 148 |
|
| 149 |
# create pkg-config file |
| 150 |
insinto /usr/$(get_libdir)/pkgconfig/ |
| 151 |
doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file" |
| 152 |
|
| 153 |
# Remove stupid files in /usr/bin |
| 154 |
rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" |
| 155 |
} |
| 156 |
|
| 157 |
pkg_postinst() { |
| 158 |
ewarn |
| 159 |
ewarn "Please make sure you run revdep-rebuild after upgrade." |
| 160 |
ewarn "This is *extremely* important to ensure your system nspr works properly." |
| 161 |
ewarn |
| 162 |
} |
Archives