diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-09-05 10:48:09 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-09-05 10:48:09 +0000 |
| commit | 43431f5683886ff260feb522332890caeb253289 (patch) | |
| tree | 645a417b54468e225f5335ce5bafa183310207f7 /dev-libs | |
| parent | * bump (diff) | |
| download | gentoo-2-43431f5683886ff260feb522332890caeb253289.tar.gz gentoo-2-43431f5683886ff260feb522332890caeb253289.tar.bz2 gentoo-2-43431f5683886ff260feb522332890caeb253289.zip | |
backport a patch to fix build on freebsd 7
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.3 x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/nss/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/nss/files/nss-fbsd7.patch | 16 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.12.ebuild | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index b453e96e176c..2d5214c4cd4b 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nss # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.126 2008/08/13 19:26:47 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.127 2008/09/05 10:48:08 aballier Exp $ + + 05 Sep 2008; Alexis Ballier <aballier@gentoo.org> +files/nss-fbsd7.patch, + nss-3.12.ebuild: + backport a patch to fix build on freebsd 7 13 Aug 2008; Raúl Porcel <armin76@gentoo.org> nss-3.11.9.ebuild, nss-3.12.ebuild: diff --git a/dev-libs/nss/files/nss-fbsd7.patch b/dev-libs/nss/files/nss-fbsd7.patch new file mode 100644 index 000000000000..932f9e0ea639 --- /dev/null +++ b/dev-libs/nss/files/nss-fbsd7.patch @@ -0,0 +1,16 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=436806 + +objformat has been deprecated for a while. elf has been the default format for +FreeBSD for a while too. objformat is gone from FreeBSD 7, so we default to elf. + +--- nss-3.12/mozilla/security/coreconf/FreeBSD.mk.old 2008-09-05 11:38:11 +0200 ++++ nss-3.12/mozilla/security/coreconf/FreeBSD.mk 2008-09-05 11:38:28 +0200 +@@ -65,7 +65,7 @@ + + ARCH = freebsd + +-MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout) ++MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf) + + ifeq ($(MOZ_OBJFORMAT),elf) + DLL_SUFFIX = so diff --git a/dev-libs/nss/nss-3.12.ebuild b/dev-libs/nss/nss-3.12.ebuild index 0a51dc6ff430..6ffd1097bf79 100644 --- a/dev-libs/nss/nss-3.12.ebuild +++ b/dev-libs/nss/nss-3.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.2 2008/08/13 19:26:47 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.ebuild,v 1.3 2008/09/05 10:48:08 aballier Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -41,6 +41,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-3.11-config.patch epatch "${FILESDIR}"/${PN}-3.12-config-1.patch epatch "${FILESDIR}"/${PN}-mips64.patch + epatch "${FILESDIR}"/${PN}-fbsd7.patch } src_compile() { |