* [gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
@ 2022-03-21 10:15 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 1410c0796fcb79ccb2cba7427621459dff3001a2
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:14:19 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:14:19 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1410c079
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/portage/package/ebuild/config.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 198c6238e..95439dedb 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -1194,13 +1194,13 @@ class config:
# correct for evaluation of !test? conditionals in RESTRICT.
self.regenerate()
- if 'force-multilib' in self.features:
- #add multilib_abi internally to list of USE_EXPANDed vars
- self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "")
- self.backup_changes("USE_EXPAND")
- default_abi = self.configdict["defaults"].get('DEFAULT_ABI', '').strip()
- if default_abi:
- self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi
+ if 'force-multilib' in self.features:
+ #add multilib_abi internally to list of USE_EXPANDed vars
+ self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "")
+ self.backup_changes("USE_EXPAND")
+ default_abi = self.configdict["defaults"].get('DEFAULT_ABI', '').strip()
+ if default_abi:
+ self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi
if unprivileged:
self.features.add("unprivileged")
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
@ 2022-03-21 10:19 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:19 UTC (permalink / raw
To: gentoo-commits
commit: b66884331d72ca67c5c981c7e4b5973d9840cb89
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:19:14 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:19:14 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b6688433
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/portage/package/ebuild/config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 95439dedb..bf3a6ef09 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -1911,8 +1911,8 @@ class config:
if pkg_defaults:
defaults.extend(pkg_defaults)
defaults = " ".join(defaults)
- if self.configdict["defaults"].get("MULTILIB_ABIS", "").count(' ') != 0:
- defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "")
+ if self.configdict["defaults"].get("MULTILIB_ABIS", "").count(' ') != 0:
+ defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "")
if defaults != self.configdict["defaults"].get("USE", ""):
self.configdict["defaults"]["USE"] = defaults
has_changed = True
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
@ 2022-03-21 10:22 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:22 UTC (permalink / raw
To: gentoo-commits
commit: a9129a413cf1d83ee2faf86d1f011c5f8e171261
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:22:19 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:22:19 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a9129a41
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/portage/package/ebuild/config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index bf3a6ef09..93b1e0c59 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -2324,8 +2324,8 @@ class config:
iuse_implicit.add("bootstrap")
if 'force-multilib' in self.features:
- for multilib_abis in self.get('MULTILIB_ABIS', '').split():
- iuse_implicit.add("multilib_abi_" + multilib_abis)
+ for multilib_abis in self.get('MULTILIB_ABIS', '').split():
+ iuse_implicit.add("multilib_abi_" + multilib_abis)
return iuse_implicit
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
@ 2022-03-21 10:26 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:26 UTC (permalink / raw
To: gentoo-commits
commit: da357458c1ed26ea760314043b1ad718734a0e2b
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:25:53 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:25:53 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=da357458
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/portage/package/ebuild/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 93b1e0c59..2e1045f0c 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -2325,7 +2325,7 @@ class config:
if 'force-multilib' in self.features:
for multilib_abis in self.get('MULTILIB_ABIS', '').split():
- iuse_implicit.add("multilib_abi_" + multilib_abis)
+ iuse_implicit.add("multilib_abi_" + multilib_abis)
return iuse_implicit
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
@ 2022-03-21 10:42 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:42 UTC (permalink / raw
To: gentoo-commits
commit: 04a219428f27aaf8ab04950017706b2b833cc1db
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:41:42 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:41:42 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=04a21942
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/portage/package/ebuild/doebuild.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py
index 1829a8209..495ca901d 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -2497,10 +2497,10 @@ def _post_src_install_write_metadata(settings):
for k in metadata_keys:
v = settings.configdict["pkg"].get(k)
- if "force-multilib" in settings.features:
- v = v + " abiwrapper"
- for i in settings.get('MULTILIB_ABIS').split():
- v = v + " multilib_abi_" + i
+ if "force-multilib" in settings.features:
+ v = v + " abiwrapper"
+ for i in settings.get('MULTILIB_ABIS').split():
+ v = v + " multilib_abi_" + i
if v is not None:
write_atomic(os.path.join(build_info_dir, k), v + "\n")
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/
@ 2022-03-21 10:58 Thomas Sachau
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Sachau @ 2022-03-21 10:58 UTC (permalink / raw
To: gentoo-commits
commit: ade5266cb360226f881513c96ec9604ab6e16756
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:57:56 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:57:56 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ade5266c
Fix intend
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/portage/package/ebuild/doebuild.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py
index 495ca901d..ab158d5bb 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -2870,10 +2870,10 @@ def _post_src_install_soname_symlinks(mysettings, out):
image_dir = mysettings["D"]
#only run this function when the installation is actually done and the final
- #image_dir exists (workaround for multilib-portage as this is first called
- #before all ABIs are done and the image_dir is created)
- if not os.path.isdir (image_dir):
- return
+ #image_dir exists (workaround for multilib-portage as this is first called
+ #before all ABIs are done and the image_dir is created)
+ if not os.path.isdir (image_dir):
+ return
needed_filename = os.path.join(
mysettings["PORTAGE_BUILDDIR"], "build-info", "NEEDED.ELF.2"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-21 10:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-21 10:22 [gentoo-commits] proj/portage:multilib commit in: lib/portage/package/ebuild/ Thomas Sachau
-- strict thread matches above, loose matches on Subject: below --
2022-03-21 10:58 Thomas Sachau
2022-03-21 10:42 Thomas Sachau
2022-03-21 10:26 Thomas Sachau
2022-03-21 10:19 Thomas Sachau
2022-03-21 10:15 Thomas Sachau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox