From ce52b415ff5250f5d0d7b224b154a55a9bebc0af Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 9 Mar 2022 19:49:02 +0100 Subject: [PATCH] dev-libs/nspr: Sync with gentoo It's from gentoo commit a07107453890b58dab9b02e0b97f0b0367dc248a. --- .../third_party/portage-stable/dev-libs/nspr/Manifest | 2 +- .../portage-stable/dev-libs/nspr/metadata.xml | 2 +- .../nspr/{nspr-4.25.ebuild => nspr-4.33.ebuild} | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-libs/nspr/{nspr-4.25.ebuild => nspr-4.33.ebuild} (93%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest index 131b1010ee..658056250b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest @@ -1 +1 @@ -DIST nspr-4.25.tar.gz 1079633 BLAKE2B 377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2 SHA512 b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562 +DIST nspr-4.33.tar.gz 1078948 BLAKE2B b46e1c02ab7e5c442288a2cba2868166adb9461950d35fcd76074e3340734057f2b1bbeb3c700f38edf3710323ffd34576dd644814c379033de2a380c54d4fe3 SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/metadata.xml index cf9988e49a..83cf207dd4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/metadata.xml @@ -1,5 +1,5 @@ - + mozilla@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.25.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.33.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.25.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.33.ebuild index 22a70f0cfd..7be0ae41e4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.25.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.33.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,13 +8,13 @@ inherit autotools toolchain-funcs multilib-minimal MIN_PV="$(ver_cut 2)" DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" +HOMEPAGE="https://www.mozilla.org/projects/nspr/" SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug elibc_musl" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="debug" MULTILIB_CHOST_TOOLS=( /usr/bin/nspr-config @@ -60,7 +60,7 @@ multilib_src_configure() { # 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 + tc-export AR AS CC CXX RANLIB [[ ${CBUILD} != ${CHOST} ]] \ && export CROSS_COMPILE=1 \ || unset CROSS_COMPILE @@ -98,6 +98,7 @@ multilib_src_configure() { # Ancient autoconf needs help finding the right tools. LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ ac_cv_path_AR="${AR}" \ + ac_cv_path_AS="${AS}" \ econf "${myconf[@]}" }