public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH] multilib eclass support for building binaries for none-default ABI
@ 2013-08-25 13:44 Thomas Sachau
  2013-08-25 14:15 ` Ulrich Mueller
  2013-08-26 16:06 ` Alexis Ballier
  0 siblings, 2 replies; 15+ messages in thread
From: Thomas Sachau @ 2013-08-25 13:44 UTC (permalink / raw
  To: gentoo-dev


[-- Attachment #1.1: Type: text/plain, Size: 1069 bytes --]

After some discussion on IRC, it seems like limiting the building of
binaries only for the default ABI is no subject to change, but the
following workaround suggested by ssuminem seems to have been accepted
by every side, so i will include the preferred patch in one week.

workaround: add a variable, which changes the return of the function
checking for the current ABI (always true with variable, without only
true, when $ABI == $DEFAULT_ABI)

first version (multilib1.patch) directly changes the output of the
currently used multilib_is_native_abi() function:

pro: no need to change already modified ebuilds

second version (multilib2.patch) creates a new function, which should
then be used by ebuild authors to check, if they should build
ABI-specific content or not (using build_binaries() function instead of
multilib_is_native_abi() function)

pro: seperate function, so multilib_is_native_abi() can still be used,
when really just one build is needed for everyone

Happy bikesh(r)edding

-- 

Thomas Sachau
Gentoo Linux Developer

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: multilib1.patch --]
[-- Type: text/x-patch; name="multilib1.patch", Size: 405 bytes --]

--- /usr/portage/eclass/multilib-build.eclass	2013-08-08 20:57:54.000000000 +0200
+++ multilib-build.eclass	2013-08-25 15:28:10.000000000 +0200
@@ -373,7 +373,11 @@
 
 	[[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
 
-	[[ ${ABI} == ${DEFAULT_ABI} ]]
+	if [[ ${COMPLETE_MULTILIB} == yes ]] ; then
+		return 0
+	else
+		[[ ${ABI} == ${DEFAULT_ABI} ]]
+	fi
 }
 
 _MULTILIB_BUILD=1

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: multilib2.patch --]
[-- Type: text/x-patch; name="multilib2.patch", Size: 475 bytes --]

--- /usr/portage/eclass/multilib-build.eclass	2013-08-08 20:57:54.000000000 +0200
+++ multilib-build.eclass	2013-08-25 15:30:40.000000000 +0200
@@ -376,5 +376,17 @@
 	[[ ${ABI} == ${DEFAULT_ABI} ]]
 }
 
+build_binaries() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	[[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments"
+
+	if [[ ${COMPLETE_MULTILIB} == yes ]] ; then
+		return 0
+	else
+		multilib_is_native_abi
+	fi
+}
+		
 _MULTILIB_BUILD=1
 fi

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 379 bytes --]

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2013-09-17 14:23 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-25 13:44 [gentoo-dev] [PATCH] multilib eclass support for building binaries for none-default ABI Thomas Sachau
2013-08-25 14:15 ` Ulrich Mueller
2013-08-25 14:30   ` Michał Górny
2013-08-26 14:08     ` Ian Stakenvicius
2013-08-25 19:34   ` Thomas Sachau
2013-08-25 20:17     ` Michał Górny
2013-08-25 21:55       ` Thomas Sachau
2013-08-26  6:43         ` Michał Górny
2013-09-17 12:41     ` Thomas Sachau
2013-08-26 14:07   ` Ian Stakenvicius
2013-09-17 12:30     ` Thomas Sachau
2013-08-26 14:16   ` Alexis Ballier
2013-08-26 16:06 ` Alexis Ballier
2013-09-17 12:38   ` Thomas Sachau
2013-09-17 14:22     ` Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox