diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2016-06-20 08:21:00 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2016-06-20 08:21:00 +0900 |
| commit | e0ae42e4365e0be78cb94d2a2604374a1a7bb111 (patch) | |
| tree | 556b74c97cb53f407e06cf3df104e39c3a8266ce | |
| parent | app-shells/bash: introduce fprefixify. (diff) | |
| download | android-e0ae42e4365e0be78cb94d2a2604374a1a7bb111.tar.gz android-e0ae42e4365e0be78cb94d2a2604374a1a7bb111.tar.bz2 android-e0ae42e4365e0be78cb94d2a2604374a1a7bb111.zip | |
sys-apps/portage: call ldconfig.
Bug: 532100
| -rw-r--r-- | sys-apps/portage/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch | 34 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.0_rc1-r1.ebuild | 1 |
3 files changed, 37 insertions, 1 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 794f025..6017c18 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,10 +1,11 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5 AUX portage-2.2.28-distcc-eprefix.patch 1215 SHA256 15de29f5b8bf9b3f49c730bbeaa4414b55866a82874a54f0ecbbb0f58a16d781 SHA512 bb630624d61d546d2ecfaad18274ae66139d3e0848293c64c69806ae13d380dc979ff658b517801ba407062270a49ca525b62ee89c47b83c324b664b364e37b6 WHIRLPOOL ccc5c5aff1d2b426e9603a16ef455a81ee5ae0cd03043adf704b7b091b536543018a8f32e995c0668fe02fdfc7bec5a6c6b1060162c424061375458fd0e820c8 +AUX portage-2.3.0-ldconfig-path.patch 1349 SHA256 f39a31df3beeedbe031b09a60a62dd0de65487aece21d3755d03de54acb09e0a SHA512 0443a5fc650b5115827091a363223ca769e59f023ce6fbe9f5c90f326c1468c31a6833494e084e95111c98da48992732f1f25ce40f9320e51e9b63b6fa773617 WHIRLPOOL 7378ad8de383670bfeb01564db760dcd122b34f268a73b108980f478cf11c500b366cc82e0069c4367fcfea0d32584544ce3df864d234ce14faf5897eb51d1ab AUX portage-2.3.0-prefix-path-only.patch 1089 SHA256 e72cb1f1c1ad9d2c5b6179930d87fcb5fc58cc8a25eed654a166463d5a75749a SHA512 6b28b9df57651237599736bf582e286e44353f47d5f0f0e4a65cd6d3ff87a0f216e0948f0e0aa2874d86233e14c832f0060cc264eee7c668e2d9be3df1279823 WHIRLPOOL eb100086ebd20f7956c47320159f6ce1aed22edd5f48671f8e2bd11d66e979fd0175a6e0bf1ad1caf5860ae51635fe197d74ae7c13f025778ede8f5a81bf4caa AUX portage-2.3.0-scanelf-path.patch 948 SHA256 b87d80dcdb9588ae92ab8824ad64df43351b89142a9a2f0a0a20dbd3f0b8a8f5 SHA512 fef3ae7a5f6ee4d6a2469670a2ec04b697d4a5cd1950c638fdd3ab4f290f8b45f26f3c521c614140ea22d05be60080bb7c685f3b167a7554a17f51903278a25d WHIRLPOOL a2b6287f7f367e599a70df50cfd541b9d2ddf9f7c72140055cc1674b22997bdacb1a6b414765db63ebdb98f6d8231f59c8e3e223369d8f386c001fd5c6cd2db4 AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928 DIST portage-2.2.28.tar.bz2 969138 SHA256 da8148a1a9275c87f535679e41b1bb3a1380ba0f903b80510017517e4c5229d0 SHA512 d21bf7e7dcc0a779a13df6a959e5d4291492fce2a5525b67e9a4705888021f9c08b8d78cd32b2eb930ac5428c40383e4e46da5a7b1ed5c9c9c42314c0f1c6a0b WHIRLPOOL 1b9584b0243b46c70d0778aad57df2d3ea99e19f243280e542c29e6fed0634b72de6b203a3c296c2977d1a6e5e5250b910574176c692d2c7c27c0938528bb43d DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe EBUILD portage-2.2.28.ebuild 11798 SHA256 167af8bf2aaa76fa2b36dce1b3396f81f1bd5af2b0daffc710402780eeb823b3 SHA512 a7500e828da21775412b655eae1f7dac49eab7cd55c18f774ddbec501d4f2c2364cdff94b6d2faa4b230ff9ca63084dd3c8c8d28234c3f40150bb9a02d6e3935 WHIRLPOOL 9267f3f7ecd8aecf126dd4d92b9412dedf0335365798dc411f51d062f0328f852b387b5594f797ee49603fe0355670eb6ff401b71fcf736a944b4e2970da01c5 -EBUILD portage-2.3.0_rc1-r1.ebuild 11604 SHA256 2b2425bce224c20b1491d8917ab6288cf2936cda29426fbf2a3d37f4c936f458 SHA512 b82f75de8aa1e91242eae29864121cf5a1420be8eea715168f8b13ae1dd01d0c1d5e9b18160055a079d1176e4e2a2bb3d6b6f93e8c3052e590c881c31fa07698 WHIRLPOOL c5cb05de853f8e26aa59b9675efac221c800baed720b5fb388816bbe2374cc4452e372ec2d1c45a50e4fe1cfc2317b425814f842aa811406803a2862f9c24db0 +EBUILD portage-2.3.0_rc1-r1.ebuild 11651 SHA256 2ad29bbb196cf1aee3101e40d18b81537371358327614c1752e427ee713801fe SHA512 b289f6fb24e159ad99248438739607d5e670b1c3d5353d64708e4751961e249d81a9fabf7fe3fc274533982aeca96c091f5cb2787af7a6030d18b313d3172728 WHIRLPOOL 77b92fbecfc492aef0edeffc1742dc839bbe21fae0b6308c9f91bb96909b17d97933c15b2cacf7ec746847c63a376c280ecb28b293e7e1876df657ed3b4841b0 MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166 diff --git a/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch b/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch new file mode 100644 index 0000000..65fbd3e --- /dev/null +++ b/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch @@ -0,0 +1,34 @@ +commit dde7fb0919d40cc5585e8a603046e7098371ad69 +Author: Benda Xu <heroxbd@gentoo.org> +Date: Wed Dec 10 10:45:31 2014 +0900 + + let env-update call ldconfig if it exists + + In Prefix, let env-update call ldconfig if it exists. + + It does not affect prefix-rpath, and handles prefix-libc(RAP) correctly. + + Signed-off-by: Fabian Groffen <grobian@gentoo.org> + +diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py +index ace492c..5e732ad 100644 +--- a/pym/portage/util/env_update.py ++++ b/pym/portage/util/env_update.py +@@ -306,13 +306,15 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, + if not libdir_contents_changed: + makelinks = False + +- ldconfig = "/sbin/ldconfig" ++ ldconfig = eprefix + "/sbin/ldconfig" + if "CHOST" in settings and "CBUILD" in settings and \ + settings["CHOST"] != settings["CBUILD"]: + ldconfig = find_binary("%s-ldconfig" % settings["CHOST"]) ++ elif not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)): ++ ldconfig = None + + # Only run ldconfig as needed +- if makelinks and ldconfig and not eprefix: ++ if makelinks and ldconfig: + # ldconfig has very different behaviour between FreeBSD and Linux + if ostype == "Linux" or ostype.lower().endswith("gnu"): + # We can't update links if we haven't cleaned other versions first, as diff --git a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild index c76e5b2..51bca3f 100644 --- a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild +++ b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild @@ -82,6 +82,7 @@ PATCHES=("${FILESDIR}/portage-2.3.0_rc1.patch" "${FILESDIR}"/${PN}-2.2.28-distcc-eprefix.patch "${FILESDIR}"/${PN}-2.3.0-scanelf-path.patch "${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch + "${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch ) pkg_setup() { |