[gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/

[Anthony G. Basile]

commit:     1e102eb71943a8a94d619c9fe141176040c8a608
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 22:57:25 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 22:57:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e102eb7

sys-libs/uclibc-ng: make compat sym links for libm.so and friends optional

Package-Manager: portage-2.3.0

 sys-libs/uclibc-ng/metadata.xml          |  2 ++
 sys-libs/uclibc-ng/uclibc-ng-9999.ebuild | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sys-libs/uclibc-ng/metadata.xml b/sys-libs/uclibc-ng/metadata.xml
index 1e21008..c54e93b 100644
--- a/sys-libs/uclibc-ng/metadata.xml
+++ b/sys-libs/uclibc-ng/metadata.xml
@@ -16,5 +16,7 @@
        </longdescription>
        <use>
                <flag name="rpc">Enable sun nis/rpc support (you should use 
libtirpc though)</flag>
+               <flag name="symlink-compat">Explicitly add sym links for 
libdl.so.0, libm.so.0, and
+               friends for backward compatibility with 
sys-libs/uclibc-ng-1.0.17 and earlier</flag>
        </use>
 </pkgmetadata>

diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild 
b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
index 3cb1ea9..15713cf 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 rpc crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 rpc symlink-compat 
crosscompile_opts_headers-only"
 RESTRICT="strip"
 
 # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
@@ -379,14 +379,16 @@ src_install() {
                return 0
        fi
 
-       dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0
-       dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0
-       dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0
-       dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0
-       dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0
-       dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0
-       dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0
-       dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0
+       if use symlink-compat; then
+               dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0
+               dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0
+               dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0
+               dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0
+               dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0
+               dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0
+               dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0
+               dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0
+       fi
 
        emake DESTDIR="${D}" install_utils
        dobin extra/scripts/getent