* [gentoo-commits] gentoo-x86 commit in dev-libs/nspr: ChangeLog nspr-4.9.4.ebuild
@ 2012-11-25 12:53 Jory Pratt (anarchy)
0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt (anarchy) @ 2012-11-25 12:53 UTC (permalink / raw
To: gentoo-commits
anarchy 12/11/25 12:53:56
Modified: ChangeLog
Added: nspr-4.9.4.ebuild
Log:
nspr version bump, fix bug #436200
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x9019241D)
Revision Changes Path
1.202 dev-libs/nspr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.202&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.202&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?r1=1.201&r2=1.202
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- ChangeLog 21 Nov 2012 21:52:53 -0000 1.201
+++ ChangeLog 25 Nov 2012 12:53:56 -0000 1.202
@@ -1,6 +1,11 @@
# 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.201 2012/11/21 21:52:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.202 2012/11/25 12:53:56 anarchy Exp $
+
+*nspr-4.9.4 (25 Nov 2012)
+
+ 25 Nov 2012; <anarchy@gentoo.org> +nspr-4.9.4.ebuild:
+ nspr version bump, fix bug #436200
21 Nov 2012; Markus Meier <maekke@gentoo.org> nspr-4.9.2.ebuild:
arm stable, bug #439586
1.1 dev-libs/nspr/nspr-4.9.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?rev=1.1&content-type=text/plain
Index: nspr-4.9.4.ebuild
===================================================================
# 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.4.ebuild,v 1.1 2012/11/25 12:53:56 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
# 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 $(file "${T}"/test.o) in
*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";;
*32-bit*|*ppc*|*i386*) ;;
*) 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
$(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/nsinstall.c \
-o config/native-nsinstall || die "failed to build nsinstall"
$(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/now.c \
-o config/native-now || die "failed to build now"
sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk
for d in pr/src lib/libc/src lib/ds; do
sed -s 's#/now$#/native-now#' -i ${d}/Makefile
done
fi
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || 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"
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/nspr: ChangeLog nspr-4.9.4.ebuild
@ 2013-01-16 16:35 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2013-01-16 16:35 UTC (permalink / raw
To: gentoo-commits
jer 13/01/16 16:35:10
Modified: ChangeLog nspr-4.9.4.ebuild
Log:
Stable for HPPA (bug #450940).
(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.206 dev-libs/nspr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.206&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.206&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?r1=1.205&r2=1.206
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- ChangeLog 6 Jan 2013 18:14:51 -0000 1.205
+++ ChangeLog 16 Jan 2013 16:35:10 -0000 1.206
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/nspr
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.205 2013/01/06 18:14:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.206 2013/01/16 16:35:10 jer Exp $
+
+ 16 Jan 2013; Jeroen Roovers <jer@gentoo.org> nspr-4.9.4.ebuild:
+ Stable for HPPA (bug #450940).
06 Jan 2013; Raúl Porcel <armin76@gentoo.org> nspr-4.9.ebuild,
nspr-4.9.1.ebuild, nspr-4.9.2.ebuild, nspr-4.9.2-r1.ebuild,
1.3 dev-libs/nspr/nspr-4.9.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?r1=1.2&r2=1.3
Index: nspr-4.9.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nspr-4.9.4.ebuild 6 Jan 2013 18:14:51 -0000 1.2
+++ nspr-4.9.4.ebuild 16 Jan 2013 16:35:10 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.2 2013/01/06 18:14:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.3 2013/01/16 16:35:10 jer Exp $
EAPI=3
WANT_AUTOCONF="2.1"
@@ -15,7 +15,7 @@
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~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() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/nspr: ChangeLog nspr-4.9.4.ebuild
@ 2013-01-28 4:37 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2013-01-28 4:37 UTC (permalink / raw
To: gentoo-commits
vapier 13/01/28 04:37:36
Modified: ChangeLog nspr-4.9.4.ebuild
Log:
Clean up toolchain/cross-compiling logic.
(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.213 dev-libs/nspr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.213&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?rev=1.213&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/ChangeLog?r1=1.212&r2=1.213
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- ChangeLog 21 Jan 2013 16:27:50 -0000 1.212
+++ ChangeLog 28 Jan 2013 04:37:36 -0000 1.213
@@ -1,21 +1,9 @@
# ChangeLog for dev-libs/nspr
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.212 2013/01/21 16:27:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.213 2013/01/28 04:37:36 vapier Exp $
21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
- Stable for sparc, wrt bug #450940
-
- 21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
- Stable for ppc, wrt bug #450940
-
- 21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
- Stable for ppc64, wrt bug #450940
-
- 20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
- Stable for x86, wrt bug #450940
-
- 20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.9.4.ebuild:
- Stable for amd64, wrt bug #450940
+ Stable for sparc/ppc/ppc64/x86/amd64, wrt bug #450940
16 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> nspr-4.9.1.ebuild,
nspr-4.9.2.ebuild, nspr-4.9.2-r1.ebuild, nspr-4.9.4.ebuild:
1.10 dev-libs/nspr/nspr-4.9.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild?r1=1.9&r2=1.10
Index: nspr-4.9.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nspr-4.9.4.ebuild 21 Jan 2013 16:27:50 -0000 1.9
+++ nspr-4.9.4.ebuild 28 Jan 2013 04:37:36 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.9 2013/01/21 16:27:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.10 2013/01/28 04:37:36 vapier Exp $
EAPI=3
WANT_AUTOCONF="2.1"
@@ -47,35 +47,36 @@
src_configure() {
cd "${S}"/build
+ # We use the standard BUILD_xxx but nspr uses HOST_xxx
+ tc-export_build_env BUILD_CC
+ export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+ tc-export AR CC CXX RANLIB
+ [[ ${CBUILD} != ${CHOST} ]] \
+ && export CROSS_COMPILE=1 \
+ || unset CROSS_COMPILE
+
+ local myconf
echo > "${T}"/test.c
- $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
case $(file "${T}"/test.o) in
- *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";;
+ *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
*32-bit*|*ppc*|*i386*) ;;
*) 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 \
+ # Ancient autoconf needs help finding the right tools.
+ LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \
+ ac_cv_path_AR="${AR}" \
+ econf \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
$(use_enable debug) \
$(use_enable !debug optimize) \
- ${myconf} || die "econf failed"
+ ${myconf}
}
src_compile() {
cd "${S}"/build
- if tc-is-cross-compiler; then
- $(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/nsinstall.c \
- -o config/native-nsinstall || die "failed to build nsinstall"
- $(tc-getBUILD_CC) $BUILD_CFLAGS -DXP_UNIX ../mozilla/nsprpub/config/now.c \
- -o config/native-now || die "failed to build now"
- sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk
- for d in pr/src lib/libc/src lib/ds; do
- sed -s 's#/now$#/native-now#' -i ${d}/Makefile
- done
- fi
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "failed to build"
+ emake || die "failed to build"
}
src_install () {
@@ -85,10 +86,8 @@
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
+ einfo "removing static libraries as upstream has requested!"
+ rm -f *.a || die "failed to remove static libraries."
local n=
# aix-soname.patch does this already
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-28 4:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-16 16:35 [gentoo-commits] gentoo-x86 commit in dev-libs/nspr: ChangeLog nspr-4.9.4.ebuild Jeroen Roovers (jer)
-- strict thread matches above, loose matches on Subject: below --
2013-01-28 4:37 Mike Frysinger (vapier)
2012-11-25 12:53 Jory Pratt (anarchy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox