diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-03-20 14:33:22 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-03-20 14:33:22 +0100 |
| commit | 4e0cf74eaa8ef3249c0132954a93b5dbbfc326c0 (patch) | |
| tree | 06815da6e950258715be89ed0747fbc569673d45 | |
| parent | thunderbird/nss/nspr security bump (diff) | |
| download | mozilla-4e0cf74eaa8ef3249c0132954a93b5dbbfc326c0.tar.gz mozilla-4e0cf74eaa8ef3249c0132954a93b5dbbfc326c0.tar.bz2 mozilla-4e0cf74eaa8ef3249c0132954a93b5dbbfc326c0.zip | |
Synced with portage
| -rw-r--r-- | dev-libs/nspr/nspr-4.10.4.ebuild | 14 | ||||
| -rw-r--r-- | dev-libs/nss/nss-3.16.ebuild | 7 |
2 files changed, 10 insertions, 11 deletions
diff --git a/dev-libs/nspr/nspr-4.10.4.ebuild b/dev-libs/nspr/nspr-4.10.4.ebuild index 93f225ed..4a61b847 100644 --- a/dev-libs/nspr/nspr-4.10.4.ebuild +++ b/dev-libs/nspr/nspr-4.10.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.3.ebuild,v 1.1 2014/02/05 07:43:05 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.1 2014/03/20 13:31:07 polynomial-c Exp $ -EAPI=3 +EAPI=5 WANT_AUTOCONF="2.1" inherit autotools eutils multilib toolchain-funcs versionator @@ -74,22 +74,22 @@ src_configure() { src_compile() { cd "${S}"/build - emake || die "failed to build" + emake } 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" + emake DESTDIR="${D}" install cd "${ED}"/usr/$(get_libdir) einfo "removing static libraries as upstream has requested!" - rm -f *.a || die "failed to remove static libraries." + rm *.a || die "failed to remove static libraries." # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" + dobin "${S}"/build/config/nspr-config # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" + rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" } diff --git a/dev-libs/nss/nss-3.16.ebuild b/dev-libs/nss/nss-3.16.ebuild index ccd6b922..eefa5e7c 100644 --- a/dev-libs/nss/nss-3.16.ebuild +++ b/dev-libs/nss/nss-3.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.5.ebuild,v 1.1 2014/02/22 10:42:36 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.1 2014/03/20 13:32:21 polynomial-c Exp $ EAPI=5 inherit eutils flag-o-matic multilib toolchain-funcs @@ -150,13 +150,12 @@ src_compile() { XCFLAGS="${BUILD_CFLAGS}" \ emake -j1 -C coreconf \ CC="${BUILD_CC}" \ - $(nssbits BUILD_) \ - || die + $(nssbits BUILD_) makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) # Then build the target tools. for d in . lib/dbm ; do - emake -j1 "${makeargs[@]}" -C ${d} || die "${d} make failed" + emake -j1 "${makeargs[@]}" -C ${d} done } |