From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5C82F138253 for ; Thu, 12 May 2016 13:41:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FBC8E07D9; Thu, 12 May 2016 13:41:22 +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 5E278E07D9 for ; Thu, 12 May 2016 13:41:21 +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 3926A340988 for ; Thu, 12 May 2016 13:41:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E80C967 for ; Thu, 12 May 2016 13:41:18 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1463060236.cc17b17ba7645aa6d0b31bdddabcebed94aa7aaf.haubi@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/coreutils/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: sys-apps/coreutils/Manifest sys-apps/coreutils/coreutils-8.25.ebuild X-VCS-Directories: sys-apps/coreutils/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: cc17b17ba7645aa6d0b31bdddabcebed94aa7aaf X-VCS-Branch: master Date: Thu, 12 May 2016 13:41:18 +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: 0c745e6e-4eb2-49ee-aa55-241731e21f06 X-Archives-Hash: 1cf7cd8970069e66e0b1ccd9028156b4 commit: cc17b17ba7645aa6d0b31bdddabcebed94aa7aaf Author: Michael Haubenwallner ssi-schaefer com> AuthorDate: Thu May 12 10:57:52 2016 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Thu May 12 13:37:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cc17b17b coreutils-8.25: support /bin being a symlink Disable symlinks from /usr/bin/ to /bin/ when /bin is a symlink. This is necessary for Cygwin to have all the dlls in the same directory as all the exes, as there is no such thing like an embedded runpath. sys-apps/coreutils/Manifest | 3 ++- sys-apps/coreutils/coreutils-8.25.ebuild | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 98f2d6b..5a51305 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -3,6 +3,7 @@ AUX coreutils-7.4-hppa-hpux.patch 502 SHA256 d9e1c3f4db41393752d0e4ca8aefff8c3bd AUX coreutils-7.5-interix-setgroups.patch 439 SHA256 9b8cd13c7273effe0c9355efb89159a4235c42d7c6c7573448bb06249323afaa SHA512 391d60645d6f8ab4e78f917c08e5ef939c662ed429a47b3b7c85b670c52e39da35db26d8f9dd9fe8bf0d7726744f3cdaa2542a1cd44ffb1a148dc93c5d1737f9 WHIRLPOOL 706b0d016f6a9dadee1fbbaae90695be2329809470c6da53e6c7ad9fddcd19614b8cf8ba26beb10b5bf26f5f4c3f0bba2d8eea4fdd5c60740cacfcba68fa2978 AUX coreutils-8.22-mint.patch 3894 SHA256 1853e4f86c8455b41037acf4f2bd65a428b050f302920ad23358f30730a2291e SHA512 3f779203d6751bdbeec5ac2d4fc9d1b10d52ae97c7c83f9edb7ac783b075e0e312ad4f12e27772cbedfc240dc4bb9f5232dd7f7edc81a492a530e655eb9d2d30 WHIRLPOOL cb33f6e89a2a1edcdd550c16f821085529045eed08405a44fe99385f83c1ce9b620a56a249eed7e539a6053a7bc2bc486d594193f6817e247ed6cfebe46ba285 AUX coreutils-8.23-non-elf.patch 847 SHA256 8f877e4b51c9d6d287418db25cebeae47b464945758d03aeb43181c311e8d0f2 SHA512 b3863be7f37d4e57101438885da160d23c4178ee325941a603cdec3595a9886beff0f4d3ba6b4490ba6f89eb8cb7bc1c54e47ffe4d62c8acbca5ab933131489e WHIRLPOOL 32a43b70a6537e034f241855d299872c711f97a32a13cba5742419e7e07b9a147d905f8504295ebe85daa46263d0e6bbdc3347d654428a9b87b9d2f439949a6e +AUX coreutils-8.25-cygwin-3.patch 50429 SHA256 49de897135e8641db0e5ccc0f764bbac7b3e12aa8fe438f53c0a70e0b0136bf9 SHA512 44ce2be687eae10c5aa406fbcb6c2cc49ad571478742a1305b0a73404ef3f0118d3251e5bf4a5dbc2b3a65e22e6331219b14854dc14dbd990ad82bd358862298 WHIRLPOOL 416d7163e87c86f882e726669d514ee818e32de1e89dae6f8daa2269b5f5119d702d79bf5bcceb49bef66a23d41f297f522adfe2d818b5e017319d6ed933e081 AUX coreutils-8.5-interix-double.patch 2019 SHA256 1cdcccdcd972bfb5935fc1b2d2b160ba656c67c13a7d3db40d10f8d8752c0c6a SHA512 28d6b492f232517c038a59b713284c5a6dd8f360d463583e0481d373609ac8447ed8793ca91524fbddd6c59f588434c1d05b9d6587d168c1a042e6c9776278b4 WHIRLPOOL 189a2fb5e0b9bbd3477d62b6ad7301f8bdfeeeb6b2a2fb44a2e1e8ec06b90636bb224ce1ca16ab3a7225fdca7e73e5d821558b539c93fadd2ccf4082c149ea39 AUX coreutils-8.5-interix-warn-mount.patch 716 SHA256 9eb15d7afd7db3fe3dd77544e863d3e093ed85f45a2d585faee64526cc64e16a SHA512 95565e680b41c658b8f5bcd84b2d09c482e1514d34afcbc721151fa5595baccf87aa3ecaa03df14d1904a7246daa350affbcd20065da87252231fdf47ff6b3fb WHIRLPOOL 2e62f5d73ccd37c404c462bc41f8ca06619130fd691242dcff26fbce491752ea36c0977a4cb6b57ad2ae69b5f8d9ae39cd194dd13567a69003e0cd07acf4d12f AUX coreutils-8.8-hppa-hpux.patch 478 SHA256 585bbf80cd12bb60de6be8dd4bd6ea3b0cf3724081ba02688764c939ddfacffe SHA512 51a6336a2a6db61d6e2894b8c75fe6b2242e62001d411b8e0b4e4c949e4c81499b1df4990b82b81507a329bedb486440322f5f5246ab4735584896d71fa1f4d9 WHIRLPOOL bee1672b2e6614f1744215d6c0e4a99b83530509c5f3fa83f5d18700d2b5fdbeb58041c38907cc3c6117d09548ba206d202c49a56ef9393d2022cbd3716ed4a3 @@ -27,5 +28,5 @@ EBUILD coreutils-8.22-r1.ebuild 6015 SHA256 08c11cfbd5947d24c48ef169ebf0fe2bc87e EBUILD coreutils-8.22.ebuild 6317 SHA256 7962673e3eeece23fa543eeec7f4ebc9d3bc14254ddc5c98d1c1778508121b9b SHA512 63203170b5378158fed7fdfdb203e3fddf4ac8be79428e7fe4eb475fc800870a9ecda12dcc63a37dfe811aa57b543b414dad847568b18a00f63bbd5a88446914 WHIRLPOOL 45f47540f7114f3e45e41fa36d4d1cace21bafbadac80d29ad6372487f63d9f36537ee03b7a0a4923e743d3294c17a7e1cb96c8ef42e386706bd152a58d2aa28 EBUILD coreutils-8.23-r00.1.ebuild 6267 SHA256 53c2a4bef763782b3dc6f9c00a3b32ca37dd9fcc1c8096fd41633e2a91e2eb4e SHA512 dc5f1f83dc592a6e0fbf37afb3494d7300f34f63a9b81f8eee08c6f5d2826487fb1c06d3c94ababd6e3ce4430737ffa917ffa00e77e2e51ed07b156d21b45e6d WHIRLPOOL 49548aad93722d42720dd3bd99fdc6eba76eb272cc320e49875a1dc784cc411eadfe2048d0399e8936c26c360861b30c92a0975186e8de008233ca48bbddd4c3 EBUILD coreutils-8.24.ebuild 6596 SHA256 1e82dda3c1a0b1b6c47af214dffac24ffee45bc19efdd2c403e05890267d078b SHA512 e78d9f8f6e99a767cbc809126284161643af220808753adff57b52e129686ee3a208e7d1742694fd0dd8f3b28d238df759169866da861b7539e9a79b490bd930 WHIRLPOOL 08e2b1ce22af8a0b3b40b62dfc0b6fb739bd22b5db349874ff2c9b70cb14fa247bbb2c896b4db9564f5e6466d62b2483a96fb3c58c2e781419eedb6373108e37 -EBUILD coreutils-8.25.ebuild 6851 SHA256 d3b1a63c2358050268bd664c688d4aa7fece44df146af9133e52bb23a493f152 SHA512 9726525fa87d75d972c6e29032f63808167f8f6dbc83c0cf658cbb29dd1c12f34e4bcad63697f9b76801d108324036d30f7642bd0a74279e697e3640a9a18b4c +EBUILD coreutils-8.25.ebuild 6900 SHA256 98f61ae6a343f0a438a34468b5117ad91ec1ec205ea72a94f3c5f9c2539a81a3 SHA512 258344167c076450bed2a94b34beda6f0bc8b6c159228bedda2749d883a7b0f703d3990968567b0ad947e776acc626920a4b0c6cd26a7b495224073e7b2725a4 WHIRLPOOL 32aff23c4f8883afee59948549ea35f106f3d605b108aa60f70796d9a7de252617a500b7b8bc8c70aeb2136ec2e3c0422bdce57429fb030ae57c375bc1527a67 MISC metadata.xml 668 SHA256 5861c2e0c2723f166f6c52bd9726f5d5020286f6e475c4746516f0cfd59ebe47 SHA512 347e830a93a0fcbaa2ab9104761ad0e0c42dbbe28d4cf29fc953bc21055051afd3c8e0ab0dbecf5c27faf1335f82b3601be78cc8980365b85db5a7a86419bb1c WHIRLPOOL 091d55503649ee267113ab47f3192b5740961b18f1f542d4ffacded2f7ccfff528ac31ac771b9da220d3486dc10812b91c26a8f6859b4cc51a55d2c2648419ea diff --git a/sys-apps/coreutils/coreutils-8.25.ebuild b/sys-apps/coreutils/coreutils-8.25.ebuild index b34f290..c5d8b13 100644 --- a/sys-apps/coreutils/coreutils-8.25.ebuild +++ b/sys-apps/coreutils/coreutils-8.25.ebuild @@ -176,8 +176,10 @@ src_install() { local com="basename chroot cut dir dirname du env expr head mkfifo mktemp readlink seq sleep sort tail touch tr tty vdir wc yes" mv ${com} ../../bin/ || die "could not move common bins" - # create a symlink for uname in /usr/bin/ since autotools require it + # create a symlink for uname in /usr/bin/ since autotools require it, + # as long as /bin is not a symlink (to /usr/bin eventually) local x + [[ -L ${EROOT}/bin ]] || for x in ${com} uname ; do dosym /bin/${x} /usr/bin/${x} done