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/
Date: Sun, 30 Oct 2016 22:57:57
Message-Id: 1477868267.1e102eb71943a8a94d619c9fe141176040c8a608.blueness@gentoo
1 commit: 1e102eb71943a8a94d619c9fe141176040c8a608
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 30 22:57:25 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 22:57:47 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e102eb7
7
8 sys-libs/uclibc-ng: make compat sym links for libm.so and friends optional
9
10 Package-Manager: portage-2.3.0
11
12 sys-libs/uclibc-ng/metadata.xml | 2 ++
13 sys-libs/uclibc-ng/uclibc-ng-9999.ebuild | 20 +++++++++++---------
14 2 files changed, 13 insertions(+), 9 deletions(-)
15
16 diff --git a/sys-libs/uclibc-ng/metadata.xml b/sys-libs/uclibc-ng/metadata.xml
17 index 1e21008..c54e93b 100644
18 --- a/sys-libs/uclibc-ng/metadata.xml
19 +++ b/sys-libs/uclibc-ng/metadata.xml
20 @@ -16,5 +16,7 @@
21 </longdescription>
22 <use>
23 <flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
24 + <flag name="symlink-compat">Explicitly add sym links for libdl.so.0, libm.so.0, and
25 + friends for backward compatibility with sys-libs/uclibc-ng-1.0.17 and earlier</flag>
26 </use>
27 </pkgmetadata>
28
29 diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
30 index 3cb1ea9..15713cf 100644
31 --- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
32 +++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
33 @@ -24,7 +24,7 @@ fi
34
35 LICENSE="LGPL-2"
36 SLOT="0"
37 -IUSE="debug hardened iconv ipv6 rpc crosscompile_opts_headers-only"
38 +IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only"
39 RESTRICT="strip"
40
41 # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
42 @@ -379,14 +379,16 @@ src_install() {
43 return 0
44 fi
45
46 - dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0
47 - dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0
48 - dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0
49 - dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0
50 - dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0
51 - dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0
52 - dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0
53 - dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0
54 + if use symlink-compat; then
55 + dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0
56 + dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0
57 + dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0
58 + dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0
59 + dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0
60 + dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0
61 + dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0
62 + dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0
63 + fi
64
65 emake DESTDIR="${D}" install_utils
66 dobin extra/scripts/getent