From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0BE371395E1 for ; Sun, 30 Oct 2016 22:57:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37511E0B22; Sun, 30 Oct 2016 22:57:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CEDBE0B22 for ; Sun, 30 Oct 2016 22:57:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90ECF340FC1 for ; Sun, 30 Oct 2016 22:57:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13401244E for ; Sun, 30 Oct 2016 22:57:51 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1477868267.1e102eb71943a8a94d619c9fe141176040c8a608.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/uclibc-ng/metadata.xml sys-libs/uclibc-ng/uclibc-ng-9999.ebuild X-VCS-Directories: sys-libs/uclibc-ng/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 1e102eb71943a8a94d619c9fe141176040c8a608 X-VCS-Branch: master Date: Sun, 30 Oct 2016 22:57:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9549039a-4915-4518-b759-48293dc5abc7 X-Archives-Hash: 2c6b2066d99dd88e85a356127690bcab commit: 1e102eb71943a8a94d619c9fe141176040c8a608 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Oct 30 22:57:25 2016 +0000 Commit: Anthony G. Basile gentoo 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 @@ Enable sun nis/rpc support (you should use libtirpc though) + 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 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