Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/, sys-libs/uclibc-ng/files/
Date: Sat, 01 Oct 2016 13:07:29
Message-Id: 1475318364.ea4599c4074aaaa31a461bfd452f7b3a1a790d0d.blueness@gentoo
1 commit: ea4599c4074aaaa31a461bfd452f7b3a1a790d0d
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 1 10:39:24 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 1 10:39:24 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4599c4
7
8 sys-libs/uclibc-ng: version bump to 1.0.18
9
10 Package-Manager: portage-2.2.28
11
12 sys-libs/uclibc-ng/Manifest | 1 +
13 sys-libs/uclibc-ng/files/uclibc-compat-r1.patch | 15 +++++++++++++++
14 .../{uclibc-ng-9999.ebuild => uclibc-ng-1.0.18.ebuild} | 2 +-
15 sys-libs/uclibc-ng/uclibc-ng-9999.ebuild | 2 +-
16 4 files changed, 18 insertions(+), 2 deletions(-)
17
18 diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
19 index e8baa7e..2bf9152 100644
20 --- a/sys-libs/uclibc-ng/Manifest
21 +++ b/sys-libs/uclibc-ng/Manifest
22 @@ -1,2 +1,3 @@
23 DIST uClibc-ng-1.0.16.tar.bz2 2769238 SHA256 f0ded5cb1ff7aac670ca9df931fc820648d91b27085a3efecc1b7f06d65f57f6 SHA512 05110f0b6651862f16b01d1b45d59258b93686a7635815f9e050ab6b8f0eb14581782c95f305649d62aa80e78060865620a5306a657ea7e9ac396c68d61347cb WHIRLPOOL d79830b46d4bcb2f19917da936a35443da95728c25a050e5a313f6a374669be8c29d5df12a6e9ac5efc65416a0206672a70c7b6d75cb3fdc4017220e32222bf3
24 DIST uClibc-ng-1.0.17.tar.bz2 2769872 SHA256 fb4ab60698256d110bf30678a4cb27f14b3cf6eae60ed4ad21b2de5cac8c0bf3 SHA512 de6c7bf2168fe76ad0fa3a59c2c4264040383683b4774e846c97c20802d92dc478d3fcf271800f008c5b2ee06d3f50baac47bc5f28b43366e418c65b11d3bdb4 WHIRLPOOL 430fcd6992097bcd995936e36450617d0d9f57182542ffc42f0bdf021a2e7c0a5c9f8bce50c498567e9219379ef80a20e444f872429ab36dc43eda11134a03f6
25 +DIST uClibc-ng-1.0.18.tar.bz2 2754404 SHA256 71b2d401025c1235a061cfc80d394760fb37f3611566e105b39dd034f6ed001c SHA512 579ddf4470d684979ba00b71545e7c34ca48d0ad58767222835f95c1401dea5435b6a945390c992e027cc59f2b419a9d835081d08c9d2e6db8b8ddeeed24f5cd WHIRLPOOL 60cd9cc03668af81988d603edc637a8d3dba8276bc0d71e6e915263119c8cf629d293e2da73a57def5b07732cd37f35527b1bc7d3ef01ff09dd6fcc2cf7d3a59
26
27 diff --git a/sys-libs/uclibc-ng/files/uclibc-compat-r1.patch b/sys-libs/uclibc-ng/files/uclibc-compat-r1.patch
28 new file mode 100644
29 index 00000000..f47e0f9
30 --- /dev/null
31 +++ b/sys-libs/uclibc-ng/files/uclibc-compat-r1.patch
32 @@ -0,0 +1,15 @@
33 +diff -Naur uClibc-ng-1.0.18.orig/ldso/ldso/Makefile.in uClibc-ng-1.0.18/ldso/ldso/Makefile.in
34 +--- uClibc-ng-1.0.18.orig/ldso/ldso/Makefile.in 2016-09-27 15:26:37.000000000 -0400
35 ++++ uClibc-ng-1.0.18/ldso/ldso/Makefile.in 2016-10-01 06:31:44.106589780 -0400
36 +@@ -80,11 +80,6 @@
37 + $(ldso:.$(ABI_VERSION)=): | $(top_builddir)lib
38 + $(ldso:.$(ABI_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
39 + $(call link.so,$(ldso_FULL_NAME),$(ABI_VERSION))
40 +- # link for backward compatibility
41 +- (cd $(top_builddir)lib; ln -sf $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) $(UCLIBC_LDSO_NAME).so.0 )
42 +-ifeq ($(CONFIG_MIPS_NAN_2008),y)
43 +- (cd $(top_builddir)lib; ln -sf $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) $(UCLIBC_LDSO_NAME)-mipsn8.so.0)
44 +-endif
45 +
46 + $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
47 + $(Q)$(RM) $@
48
49 diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.18.ebuild
50 similarity index 99%
51 copy from sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
52 copy to sys-libs/uclibc-ng/uclibc-ng-1.0.18.ebuild
53 index 2d3a099..8635e40 100644
54 --- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
55 +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.18.ebuild
56 @@ -260,7 +260,7 @@ src_prepare() {
57 # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
58 # where MAJOR_VERSION != 0 indicates the ABI verison.
59 # We want to get rid of this and just have ABI = 0.
60 - eapply "${FILESDIR}"/uclibc-compat.patch
61 + eapply "${FILESDIR}"/uclibc-compat-r1.patch
62
63 # We need to change the major.minor.sublevel of uclibc-ng.
64 # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
65
66 diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
67 index 2d3a099..8635e40 100644
68 --- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
69 +++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
70 @@ -260,7 +260,7 @@ src_prepare() {
71 # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
72 # where MAJOR_VERSION != 0 indicates the ABI verison.
73 # We want to get rid of this and just have ABI = 0.
74 - eapply "${FILESDIR}"/uclibc-compat.patch
75 + eapply "${FILESDIR}"/uclibc-compat-r1.patch
76
77 # We need to change the major.minor.sublevel of uclibc-ng.
78 # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.