Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/
Date: Sat, 08 Jan 2022 17:13:33
Message-Id: 1641661993.3f004ec2c67122130d0bca02a6e0dc1516204218.polynomial-c@gentoo
1 commit: 3f004ec2c67122130d0bca02a6e0dc1516204218
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 8 16:58:10 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 8 17:13:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f004ec2
7
8 dev-libs/nspr: Bump to version 4.33
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 dev-libs/nspr/Manifest | 1 +
13 dev-libs/nspr/nspr-4.33.ebuild | 122 +++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 123 insertions(+)
15
16 diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
17 index ed52a5de2931..df9ec508c8ec 100644
18 --- a/dev-libs/nspr/Manifest
19 +++ b/dev-libs/nspr/Manifest
20 @@ -1,3 +1,4 @@
21 DIST nspr-4.30.tar.gz 1078175 BLAKE2B dcd55c9e267602e74a8e640f6a5f4bc47160f887fa528f409be33e78b21f0ab7e19df46fb6e729907a41c587b3d79f560da52463632660ef26c85b60e3cdc011 SHA512 b0d22e915f0533aa38e30e3cfd949d966d44d4c107d5f1a9d35b49cbbe759fda70f5d70f01d79fcf6b229128619f778a220df63ef7d07c21b616f9c44914a33e
22 DIST nspr-4.31.tar.gz 1078163 BLAKE2B f1682a85e425c7babc40f1cbff4ec5b1101e04279df89c91520992bd288185cd52f682d4924e65a4620975d339d7704e359bfd36ac32e5ffebb8527d03f13171 SHA512 1f37d04721335288dd8a5cf700ead5a56cee73365e619f3da90f6067830b78a050a525950686bcdd14fcf61faffd1141ec46d4180a0dd10375f7e9fef6eac6ed
23 DIST nspr-4.32.tar.gz 1079004 BLAKE2B fda56b2a3fbbff8542e213b20a5935376694ea171d2cd014f93a711980411afe195835996c1612376d37eac028071ce58008e1fbf7a16176141fc18aa8163a73 SHA512 da9b65b374783d20a2e589211b411816d899e296e91175d376e59df1919144c1808c155a234d6ceefdf7b8ae8f47cec98d92a5aa3150a579513251860e50dcb7
24 +DIST nspr-4.33.tar.gz 1078948 BLAKE2B b46e1c02ab7e5c442288a2cba2868166adb9461950d35fcd76074e3340734057f2b1bbeb3c700f38edf3710323ffd34576dd644814c379033de2a380c54d4fe3 SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e
25
26 diff --git a/dev-libs/nspr/nspr-4.33.ebuild b/dev-libs/nspr/nspr-4.33.ebuild
27 new file mode 100644
28 index 000000000000..c0dd76d1aa2e
29 --- /dev/null
30 +++ b/dev-libs/nspr/nspr-4.33.ebuild
31 @@ -0,0 +1,122 @@
32 +# Copyright 1999-2022 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=7
36 +
37 +inherit autotools toolchain-funcs multilib-minimal
38 +
39 +MIN_PV="$(ver_cut 2)"
40 +
41 +DESCRIPTION="Netscape Portable Runtime"
42 +HOMEPAGE="https://www.mozilla.org/projects/nspr/"
43 +SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
44 +
45 +LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
46 +SLOT="0"
47 +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"
48 +IUSE="debug"
49 +
50 +MULTILIB_CHOST_TOOLS=(
51 + /usr/bin/nspr-config
52 +)
53 +
54 +PATCHES=(
55 + "${FILESDIR}"/${PN}-4.23-prtime.patch
56 + "${FILESDIR}"/${PN}-4.7.1-solaris.patch
57 + "${FILESDIR}"/${PN}-4.10.6-solaris.patch
58 + "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
59 + "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
60 + # We do not need to pass -L$libdir via nspr-config --libs
61 + "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
62 +)
63 +
64 +src_prepare() {
65 + cd "${S}"/nspr || die
66 +
67 + default
68 +
69 + use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
70 +
71 + # rename configure.in to configure.ac for new autotools compatibility
72 + if [[ -e "${S}"/nspr/configure.in ]] ; then
73 + einfo "Renaming configure.in to configure.ac"
74 + mv "${S}"/nspr/configure.{in,ac} || die
75 + else
76 + elog "configure.in rename logic can be removed from ebuild."
77 + fi
78 +
79 + # We must run eautoconf to regenerate configure
80 + eautoconf
81 +
82 + # make sure it won't find Perl out of Prefix
83 + sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
84 +
85 + # Respect LDFLAGS
86 + sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
87 + "${S}"/nspr/config/rules.mk || die
88 +}
89 +
90 +multilib_src_configure() {
91 + # We use the standard BUILD_xxx but nspr uses HOST_xxx
92 + tc-export_build_env BUILD_CC
93 + export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
94 + tc-export AR CC CXX RANLIB
95 + [[ ${CBUILD} != ${CHOST} ]] \
96 + && export CROSS_COMPILE=1 \
97 + || unset CROSS_COMPILE
98 +
99 + local myconf=(
100 + --libdir="${EPREFIX}/usr/$(get_libdir)"
101 + $(use_enable debug)
102 + $(use_enable !debug optimize)
103 + )
104 +
105 + # The configure has some fancy --enable-{{n,x}32,64bit} switches
106 + # that trigger some code conditional to platform & arch. This really
107 + # matters for the few common arches (x86, ppc) but we pass a little
108 + # more of them to be future-proof.
109 +
110 + # use ABI first, this will work for most cases
111 + case "${ABI}" in
112 + alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
113 + n32) myconf+=( --enable-n32 );;
114 + x32) myconf+=( --enable-x32 );;
115 + s390x|*64) myconf+=( --enable-64bit );;
116 + default) # no abi actually set, fall back to old check
117 + einfo "Running a short build test to determine 64bit'ness"
118 + echo > "${T}"/test.c || die
119 + ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
120 + case $(file "${T}"/test.o) in
121 + *32-bit*x86-64*) myconf+=( --enable-x32 );;
122 + *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
123 + *32-bit*|*ppc*|*i386*) ;;
124 + *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
125 + esac ;;
126 + *) ;;
127 + esac
128 +
129 + # Ancient autoconf needs help finding the right tools.
130 + LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
131 + ac_cv_path_AR="${AR}" \
132 + econf "${myconf[@]}"
133 +}
134 +
135 +multilib_src_install() {
136 + # Their build system is royally confusing, as usual
137 + MINOR_VERSION=${MIN_PV} # Used for .so version
138 + emake DESTDIR="${D}" install
139 +
140 + einfo "removing static libraries as upstream has requested!"
141 + rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
142 +
143 + # install nspr-config
144 + dobin config/nspr-config
145 +
146 + # Remove stupid files in /usr/bin
147 + rm "${ED}"/usr/bin/prerr.properties || die
148 +
149 + # This is used only to generate prerr.c and prerr.h at build time.
150 + # No other projects use it, and we don't want to depend on perl.
151 + # Talked to upstream and they agreed w/punting.
152 + rm "${ED}"/usr/bin/compile-et.pl || die
153 +}