From: Robin H. Johnson Date: Tue, 10 Oct 2006 12:15:26 +0000 (+0000) Subject: Bug #150731, use_enable debug to fix an upstream crash. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=05339d935a89779c81bdeb831973f499644553ee;p=gentoo.git Bug #150731, use_enable debug to fix an upstream crash. Package-Manager: portage-2.1.2_pre2-r5 --- diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 24bb1dfde921..99274dde160c 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.58 2006/09/27 21:44:40 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.59 2006/10/10 12:15:26 robbat2 Exp $ + +*nspr-4.6.3-r1 (10 Oct 2006) + + 10 Oct 2006; Robin H. Johnson +nspr-4.6.3-r1.ebuild: + Bug #150731, use_enable debug to fix an upstream crash. 27 Sep 2006; Bryan Østergaard nspr-4.6.3.ebuild: Stable on ia64. diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 9338041779b7..87b0980c4f34 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -73,14 +73,18 @@ EBUILD nspr-4.6.2.ebuild 2647 RMD160 c89f5ed293c7e65159335f9c040177f0af4857d9 SH MD5 5d5790de6ee6271694ce9c07f9f6b0d6 nspr-4.6.2.ebuild 2647 RMD160 c89f5ed293c7e65159335f9c040177f0af4857d9 nspr-4.6.2.ebuild 2647 SHA256 efa9e7cb6a871ef8f9c10aa5f2430243bca0a918ff8587027682136da1c39cb7 nspr-4.6.2.ebuild 2647 +EBUILD nspr-4.6.3-r1.ebuild 2724 RMD160 1e0eb93359593e2e398236d4a63d6e20d8b1fb63 SHA1 1783c8a35bdc7192c5d110a422e5933a3351dbfe SHA256 3f33f1ed2eded89633916bf2b7e437e59c75ce5b7928298212545396e6149d33 +MD5 6e0752efb396b902712793135c843cdb nspr-4.6.3-r1.ebuild 2724 +RMD160 1e0eb93359593e2e398236d4a63d6e20d8b1fb63 nspr-4.6.3-r1.ebuild 2724 +SHA256 3f33f1ed2eded89633916bf2b7e437e59c75ce5b7928298212545396e6149d33 nspr-4.6.3-r1.ebuild 2724 EBUILD nspr-4.6.3.ebuild 2683 RMD160 1e365a70c20ad2bb8cf43d98439cc1ffb2fc7c7c SHA1 527dda0f4a9dd66294eeada35cf5d1f9975f1212 SHA256 56406ddc569c8ca478729d751bf0804ae97670cb7e080a336f2c3f9c0803c76f MD5 151a190386a2fac9112456c2fa9e9f6d nspr-4.6.3.ebuild 2683 RMD160 1e365a70c20ad2bb8cf43d98439cc1ffb2fc7c7c nspr-4.6.3.ebuild 2683 SHA256 56406ddc569c8ca478729d751bf0804ae97670cb7e080a336f2c3f9c0803c76f nspr-4.6.3.ebuild 2683 -MISC ChangeLog 6904 RMD160 d4265724a950e7dd49c636eea90b0d5fd0945b87 SHA1 92e9a1fa20f23dc774b7c346b53e07dae1a027db SHA256 b27106518ffdd579981172d62843b43be9c7af0018541cf0b4c3b9f13372d1ad -MD5 b70f124d7ff2218bc1d98345382cbcf4 ChangeLog 6904 -RMD160 d4265724a950e7dd49c636eea90b0d5fd0945b87 ChangeLog 6904 -SHA256 b27106518ffdd579981172d62843b43be9c7af0018541cf0b4c3b9f13372d1ad ChangeLog 6904 +MISC ChangeLog 7070 RMD160 6b93cbc161e3e9212e588d741901075c927e0406 SHA1 fd133371cbbe6186bad44bb835b47c8ea5796122 SHA256 e48a28364b25f38564dd7557c9051ff3053610ecb60e0bc8a49623578e7913f3 +MD5 78fc46afa98fd9c537237d70af54e9a8 ChangeLog 7070 +RMD160 6b93cbc161e3e9212e588d741901075c927e0406 ChangeLog 7070 +SHA256 e48a28364b25f38564dd7557c9051ff3053610ecb60e0bc8a49623578e7913f3 ChangeLog 7070 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 MD5 243e4cd9809545d12f991b2d417040e1 metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 metadata.xml 159 @@ -109,3 +113,6 @@ SHA256 42768340161ff276c9b905c94e7f04c1d76fcd9525a354559cc6fb5f52f401c9 files/di MD5 53019c1dc21897a3661cefaefeeaea48 files/digest-nspr-4.6.3 235 RMD160 c1d0b4ef1b2eaea6c2f00d9db8b60d21b0f6c841 files/digest-nspr-4.6.3 235 SHA256 82d736986dd37fa8bff6a9c087f916915aff244b64f3f85350be22f901034203 files/digest-nspr-4.6.3 235 +MD5 53019c1dc21897a3661cefaefeeaea48 files/digest-nspr-4.6.3-r1 235 +RMD160 c1d0b4ef1b2eaea6c2f00d9db8b60d21b0f6c841 files/digest-nspr-4.6.3-r1 235 +SHA256 82d736986dd37fa8bff6a9c087f916915aff244b64f3f85350be22f901034203 files/digest-nspr-4.6.3-r1 235 diff --git a/dev-libs/nspr/files/digest-nspr-4.6.3-r1 b/dev-libs/nspr/files/digest-nspr-4.6.3-r1 new file mode 100644 index 000000000000..ea0a022c4dd6 --- /dev/null +++ b/dev-libs/nspr/files/digest-nspr-4.6.3-r1 @@ -0,0 +1,3 @@ +MD5 d529cf2d1676e4c38bf7d530098865e6 nspr-4.6.3.tar.gz 1301965 +RMD160 b9cdde13afabfc6af02817781b2ca274ce5588b6 nspr-4.6.3.tar.gz 1301965 +SHA256 69f323e359a4751c883fbfc3affe5ea255fc89e77107e97736d2440bc22010d1 nspr-4.6.3.tar.gz 1301965 diff --git a/dev-libs/nspr/nspr-4.6.3-r1.ebuild b/dev-libs/nspr/nspr-4.6.3-r1.ebuild new file mode 100644 index 000000000000..fe2ebe2cb59f --- /dev/null +++ b/dev-libs/nspr/nspr-4.6.3-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.3-r1.ebuild,v 1.1 2006/10/10 12:15:26 robbat2 Exp $ + +inherit eutils gnuconfig + +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" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="ipv6 debug" + +DEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + mkdir build inst + epatch "${FILESDIR}"/${PN}-4.6.1-config.patch + epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch + epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch + epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch + epatch "${FILESDIR}"/${PN}-4.6.3-fbsd62.patch + gnuconfig_update +} + +src_compile() { + cd build + + if use amd64 || use ppc64 || use ia64 || use s390; then + myconf="${myconf} --enable-64bit" + else + myconf="" + fi + + if use ipv6; then + myconf="${myconf} --enable-ipv6" + fi + + ../mozilla/nsprpub/configure \ + --build=${CBUILD:-${CHOST}} \ + --host=${CHOST} \ + --prefix=/usr \ + --libdir=/usr/$(get_libdir)/nspr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + $(use_enable debug) \ + ${myconf} || die "./configure failed" + make || die +} + +src_install () { + # Their build system is royally fucked, as usual + MINOR_VERSION=6 + cd ${S}/build + make install + insinto /usr + doins -r dist/* + rm -rf ${D}/usr/bin/lib*.so + + #removing includes/nspr/md as per fedora spec + # i.e a waste of space! + rm -rf ${D}/usr/include/nspr/md + + # there have been /usr/lib/nspr changes (like the ldpath below), but never + # have I seen any libraries end up in this directory. lets fix that. + # note: I tried doing this fix via the build system. It wont work. + if [ ! -e ${D}/usr/lib/nspr ] ; then + mkdir -p ${D}/usr/lib/nspr + mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr + mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr + fi + # and while we're at it, lets make it actually use the arch's libdir damnit + if [ "lib" != "$(get_libdir)" ] ; then + mv ${D}/usr/lib ${D}/usr/$(get_libdir) + fi + #and while at it move them to files with versions-ending + #and link them back :) + cd ${D}/usr/$(get_libdir)/nspr + for file in *.so; do + mv ${file} ${file}.${MINOR_VERSION} + ln -s ${file}.${MINOR_VERSION} ${file} + done + # cope with libraries being in /usr/lib/nspr + dodir /etc/env.d + echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr + + # install nspr-config + insinto /usr/bin + doins ${S}/build/config/nspr-config + chmod a+x ${D}/usr/bin/nspr-config + + # create pkg-config file + insinto /usr/$(get_libdir)/pkgconfig/ + doins ${S}/build/config/nspr.pc +}