diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2015-01-05 18:39:10 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2015-01-05 18:49:43 +0900 |
| commit | 245cca39b77c03307e53a4e4c830154882b7d79e (patch) | |
| tree | c32f1b4b4858752dff33bb4280b6304ec7c2b1c9 | |
| parent | sys-apps/gentoo-functions: prefix manpages (diff) | |
| download | android-245cca39b77c03307e53a4e4c830154882b7d79e.tar.gz android-245cca39b77c03307e53a4e4c830154882b7d79e.tar.bz2 android-245cca39b77c03307e53a4e4c830154882b7d79e.zip | |
sys-apps/portage: update patch, test if ldconfig exists. Bug 532100
| -rw-r--r-- | sys-apps/portage/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/portage/files/portage-2.2.14-ldconfig.patch | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 8005081..53a4c7a 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -9,7 +9,7 @@ AUX portage-2.2.01.19981-ebuildshell.patch 3304 SHA256 2b7f313afe62815b791835da8 AUX portage-2.2.01.20020-ebuildshell.patch 4736 SHA256 92f91c788e3591fb71f55b7a04df8bd0baee767e2561649182bf1b814a0451a8 SHA512 785059ad71e1d9172338926df22883bf70560c3f22f84da74aa21b872b52c9dd05ca61fe8bb786a2da7e4756ae3568f35ca6d7a6ec22b9be419efab6529b8f52 WHIRLPOOL 63ba30a2fa005cca2a6866178938e4ce83bed8ca3a5cbc9bcbcffc888ef4561c27d45f29707db26574c96b8a0c0ed565a0224d64bed8191a1179ae6ace325904 AUX portage-2.2.01.20239-ebuildshell.patch 5292 SHA256 602efac969b76b33e46f927bb6d5ddaff837f2d69dba446c05116fd6e9d6aaf9 SHA512 9f79c62482cacfe4d52d9b7a42969c5090ec1dd6c55ac67ac0697fa3261d00d437e32a46987d242d3380b459d1af2cdfdacec5d72b7aa905146bbf5759158bdf WHIRLPOOL 2ee6f82ec9dc8c44704c1badeafa207656dac9ce49443616b4ebfd402e872c71434e049f4436ed04009e633a00b4863dd35e79a80ba4e710ac1af6579a9decdf AUX portage-2.2.10.1-case-insensitive-fs.patch 13475 SHA256 e9ca3560b580e1df7bdf7424c76b5bf022c4189ed6ae51370f88895d5c00031d SHA512 6c7b4cba0827d0b29f1be1fc6fb42b1703f373f6825be14f43506921e71075b6967191cf79e4e659c0f37c96de6cbdbdc1e04cd0e668a563a4a3c3be9e97f773 WHIRLPOOL 839ebc4214add69531f9f8a387ed155006c77c396031a116a6b79814a09e6591d5e8905e8398541ca213e60aacd0265e2f941858bbfcc3551a2ff5768a87f432 -AUX portage-2.2.14-ldconfig.patch 1139 SHA256 3ccf2649dd76a1093aec62479da57bd53f3e2a4995bec5bd312149aa78ecff9b SHA512 c94602e611edc8363abc0c904ac9b12fb5d19bc3d80a6cfda5d4aef70c936b77eb376bf0c63cb21b4e6fce14c113f6be1ae9950705b3f6e9d35fba766a35e147 WHIRLPOOL 02128e5ddde6969450fb17da55e335f2d64423d73864b98806092db8e669d290f56e57b3e166df7909408729068c9637f72ea97b418958203f35efc87e5d8cae +AUX portage-2.2.14-ldconfig.patch 1230 SHA256 50c5f886599aeeec6776da812ebd32964ef138ab63792dc84d0545d3072c20de SHA512 bdc4ee5642e5347e8ad5e776147bfa0ca8901ca312648d02406365c9929a703698321d6b1fd44dcac6225e5099b9140eaed785f7da368ef80c2645e9a33e3869 WHIRLPOOL 62c153821af6924593d8c61b31d66e478634c350b217a1cc7da3728b2ff393e706fe408b1c5e09783f7898dcd4cf983f9d2e748980234e65cd392b38bb0e82aa AUX portage-2.2.7-ebuildshell.patch 6030 SHA256 c654f5e0b60a4a930ec973b306246d9e920d89b7536bda56c72f38d1ed56445d SHA512 c4bfa44be5d706a9206fcab884e3ad7b0530ec315f9b824fd77f06ff5482414af3e3aaadbc059a49712b2a2e203320f367e2d8c64bf1fceb78495d940fd3fd2a WHIRLPOOL a468e4d5b5d1c493415188c500ea04388e34bc5e5f5a03d61ea5aea8d5b029e2a4426c52471729345a4293eb7c9b747948f75b64982452d96a920a3ac5e528e6 AUX portage-2.2.7-macho-relative-install_names.patch 2811 SHA256 de767ffb6d29625ca9ba0f33765a59a55bbdf2f3b2c1d9989a73a474ae55c388 SHA512 8555d04e4fc361c500d6c18c30f54f178164477f6c1fbb5fd30d5f89671f95915243e92b655e4264f748c2f29f0cf3e7a5fe439316cc6faebc752172557f0a89 WHIRLPOOL f5f92a762e7455dddfa2ffe3ba27c78ec1533c40920acc96a5e65d89ea93f7657f8bf7771e805d7d62c6f60944dccde72de3f34cee1d14c7db667b27cdd76d55 AUX portage-2.2.7-sandbox.patch 723 SHA256 b6b941659a4cdbdafc65bf9977d7a92255b553c49e8f445862dcb00567906fec SHA512 fcf4bc7826bab92b1847dcecaf5def212b4eecdb4ac87b10b0668ea470d5836f3d68eb4ccf61345b39f9265c7f31ef3562de58b2ee4bb3096a71c0567343d810 WHIRLPOOL 3699c7a2a0e6229d337760d07ce40e45b949614518ae292d74ca4297d3e9e5f3eb5edeb7f59c8821a6bfcf981cf1363f4f3d03c16af533276f577b1ff3d8c264 diff --git a/sys-apps/portage/files/portage-2.2.14-ldconfig.patch b/sys-apps/portage/files/portage-2.2.14-ldconfig.patch index 76fc348..9a44649 100644 --- a/sys-apps/portage/files/portage-2.2.14-ldconfig.patch +++ b/sys-apps/portage/files/portage-2.2.14-ldconfig.patch @@ -1,4 +1,4 @@ -commit 3fb24230a2369513b1f36cba3d772bc517265e81 +commit eaf1d1bc3d25dbbbba7de8eb09f6db7ec5f2dd28 Author: Benda Xu <heroxbd@gentoo.org> Date: Wed Dec 10 10:45:31 2014 +0900 @@ -7,10 +7,10 @@ Date: Wed Dec 10 10:45:31 2014 +0900 It does not affect prefix-rpath, and handles prefix-libc(RAP) correctly. diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py -index ace492c..4437881 100644 +index ace492c..5e732ad 100644 --- a/pym/portage/util/env_update.py +++ b/pym/portage/util/env_update.py -@@ -306,13 +306,13 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, +@@ -306,13 +306,15 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, if not libdir_contents_changed: makelinks = False @@ -19,6 +19,8 @@ index ace492c..4437881 100644 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: |