public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH 2/2] multilib-minimal.eclass: use run_in_build_dir().
@ 2014-10-23 20:31 Davide Pesavento
  2014-10-23 21:08 ` Michał Górny
  0 siblings, 1 reply; 3+ messages in thread
From: Davide Pesavento @ 2014-10-23 20:31 UTC (permalink / raw
  To: gentoo-dev; +Cc: hasufell


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

Index: multilib-minimal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v
retrieving revision 1.9
diff -u -r1.9 multilib-minimal.eclass
--- multilib-minimal.eclass 2 May 2014 16:16:37 -0000 1.9
+++ multilib-minimal.eclass 23 Oct 2014 20:24:23 -0000
@@ -30,7 +30,7 @@
 esac


-inherit eutils multilib-build
+inherit eutils multibuild multilib-build

 EXPORT_FUNCTIONS src_configure src_compile src_test src_install

@@ -41,17 +41,14 @@
  multilib-minimal_abi_src_configure() {
  debug-print-function ${FUNCNAME} "$@"

- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
  if declare -f multilib_src_configure >/dev/null ; then
  multilib_src_configure
  else
  default_src_configure
  fi
- popd >/dev/null || die
  }

- multilib_parallel_foreach_abi multilib-minimal_abi_src_configure
+ multilib_parallel_foreach_abi run_in_build_dir
multilib-minimal_abi_src_configure
 }

 multilib-minimal_src_compile() {
@@ -60,16 +57,14 @@
  multilib-minimal_abi_src_compile() {
  debug-print-function ${FUNCNAME} "$@"

- pushd "${BUILD_DIR}" >/dev/null || die
  if declare -f multilib_src_compile >/dev/null ; then
  multilib_src_compile
  else
  default_src_compile
  fi
- popd >/dev/null || die
  }

- multilib_foreach_abi multilib-minimal_abi_src_compile
+ multilib_foreach_abi run_in_build_dir multilib-minimal_abi_src_compile
 }

 multilib-minimal_src_test() {
@@ -78,16 +73,14 @@
  multilib-minimal_abi_src_test() {
  debug-print-function ${FUNCNAME} "$@"

- pushd "${BUILD_DIR}" >/dev/null || die
  if declare -f multilib_src_test >/dev/null ; then
  multilib_src_test
  else
  default_src_test
  fi
- popd >/dev/null || die
  }

- multilib_foreach_abi multilib-minimal_abi_src_test
+ multilib_foreach_abi run_in_build_dir multilib-minimal_abi_src_test
 }

 multilib-minimal_src_install() {
@@ -96,7 +89,6 @@
  multilib-minimal_abi_src_install() {
  debug-print-function ${FUNCNAME} "$@"

- pushd "${BUILD_DIR}" >/dev/null || die
  if declare -f multilib_src_install >/dev/null ; then
  multilib_src_install
  else
@@ -111,9 +103,8 @@

  multilib_prepare_wrappers
  multilib_check_headers
- popd >/dev/null || die
  }
- multilib_foreach_abi multilib-minimal_abi_src_install
+ multilib_foreach_abi run_in_build_dir multilib-minimal_abi_src_install
  multilib_install_wrappers

  if declare -f multilib_src_install_all >/dev/null ; then

[-- Attachment #1.2: Type: text/html, Size: 5909 bytes --]

[-- Attachment #2: multilib-minimal.patch --]
[-- Type: application/octet-stream, Size: 2499 bytes --]

Index: multilib-minimal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v
retrieving revision 1.9
diff -u -r1.9 multilib-minimal.eclass
--- multilib-minimal.eclass	2 May 2014 16:16:37 -0000	1.9
+++ multilib-minimal.eclass	23 Oct 2014 20:24:20 -0000
@@ -30,7 +30,7 @@
 esac
 
 
-inherit eutils multilib-build
+inherit eutils multibuild multilib-build
 
 EXPORT_FUNCTIONS src_configure src_compile src_test src_install
 
@@ -41,17 +41,14 @@
 	multilib-minimal_abi_src_configure() {
 		debug-print-function ${FUNCNAME} "$@"
 
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
 		if declare -f multilib_src_configure >/dev/null ; then
 			multilib_src_configure
 		else
 			default_src_configure
 		fi
-		popd >/dev/null || die
 	}
 
-	multilib_parallel_foreach_abi multilib-minimal_abi_src_configure
+	multilib_parallel_foreach_abi run_in_build_dir multilib-minimal_abi_src_configure
 }
 
 multilib-minimal_src_compile() {
@@ -60,16 +57,14 @@
 	multilib-minimal_abi_src_compile() {
 		debug-print-function ${FUNCNAME} "$@"
 
-		pushd "${BUILD_DIR}" >/dev/null || die
 		if declare -f multilib_src_compile >/dev/null ; then
 			multilib_src_compile
 		else
 			default_src_compile
 		fi
-		popd >/dev/null || die
 	}
 
-	multilib_foreach_abi multilib-minimal_abi_src_compile
+	multilib_foreach_abi run_in_build_dir multilib-minimal_abi_src_compile
 }
 
 multilib-minimal_src_test() {
@@ -78,16 +73,14 @@
 	multilib-minimal_abi_src_test() {
 		debug-print-function ${FUNCNAME} "$@"
 
-		pushd "${BUILD_DIR}" >/dev/null || die
 		if declare -f multilib_src_test >/dev/null ; then
 			multilib_src_test
 		else
 			default_src_test
 		fi
-		popd >/dev/null || die
 	}
 
-	multilib_foreach_abi multilib-minimal_abi_src_test
+	multilib_foreach_abi run_in_build_dir multilib-minimal_abi_src_test
 }
 
 multilib-minimal_src_install() {
@@ -96,7 +89,6 @@
 	multilib-minimal_abi_src_install() {
 		debug-print-function ${FUNCNAME} "$@"
 
-		pushd "${BUILD_DIR}" >/dev/null || die
 		if declare -f multilib_src_install >/dev/null ; then
 			multilib_src_install
 		else
@@ -111,9 +103,8 @@
 
 		multilib_prepare_wrappers
 		multilib_check_headers
-		popd >/dev/null || die
 	}
-	multilib_foreach_abi multilib-minimal_abi_src_install
+	multilib_foreach_abi run_in_build_dir multilib-minimal_abi_src_install
 	multilib_install_wrappers
 
 	if declare -f multilib_src_install_all >/dev/null ; then

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

* Re: [gentoo-dev] [PATCH 2/2] multilib-minimal.eclass: use run_in_build_dir().
  2014-10-23 20:31 [gentoo-dev] [PATCH 2/2] multilib-minimal.eclass: use run_in_build_dir() Davide Pesavento
@ 2014-10-23 21:08 ` Michał Górny
  2014-10-31  1:06   ` Davide Pesavento
  0 siblings, 1 reply; 3+ messages in thread
From: Michał Górny @ 2014-10-23 21:08 UTC (permalink / raw
  To: Davide Pesavento; +Cc: gentoo-dev, hasufell

[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]

Dnia 2014-10-23, o godz. 22:31:39
Davide Pesavento <pesa@gentoo.org> napisał(a):

> Index: multilib-minimal.eclass
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v
> retrieving revision 1.9
> diff -u -r1.9 multilib-minimal.eclass
> --- multilib-minimal.eclass 2 May 2014 16:16:37 -0000 1.9
> +++ multilib-minimal.eclass 23 Oct 2014 20:24:23 -0000
> @@ -30,7 +30,7 @@
>  esac
> 
> 
> -inherit eutils multilib-build
> +inherit eutils multibuild multilib-build
> 
>  EXPORT_FUNCTIONS src_configure src_compile src_test src_install
> 
> @@ -41,17 +41,14 @@
>   multilib-minimal_abi_src_configure() {
>   debug-print-function ${FUNCNAME} "$@"
> 
> - mkdir -p "${BUILD_DIR}" || die
> - pushd "${BUILD_DIR}" >/dev/null || die
>   if declare -f multilib_src_configure >/dev/null ; then
>   multilib_src_configure
>   else
>   default_src_configure
>   fi
> - popd >/dev/null || die

NAK. No real gain in this, while indirection makes the eclass harder to
read.

-- 
Best regards,
Michał Górny

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 949 bytes --]

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

* Re: [gentoo-dev] [PATCH 2/2] multilib-minimal.eclass: use run_in_build_dir().
  2014-10-23 21:08 ` Michał Górny
@ 2014-10-31  1:06   ` Davide Pesavento
  0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2014-10-31  1:06 UTC (permalink / raw
  To: Michał Górny; +Cc: gentoo-dev, hasufell

On Thu, Oct 23, 2014 at 11:08 PM, Michał Górny <mgorny@gentoo.org> wrote:
> Dnia 2014-10-23, o godz. 22:31:39
> Davide Pesavento <pesa@gentoo.org> napisał(a):
>
>> Index: multilib-minimal.eclass
>> ===================================================================
>> RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v
>> retrieving revision 1.9
>> diff -u -r1.9 multilib-minimal.eclass
>> --- multilib-minimal.eclass 2 May 2014 16:16:37 -0000 1.9
>> +++ multilib-minimal.eclass 23 Oct 2014 20:24:23 -0000
>> @@ -30,7 +30,7 @@
>>  esac
>>
>>
>> -inherit eutils multilib-build
>> +inherit eutils multibuild multilib-build
>>
>>  EXPORT_FUNCTIONS src_configure src_compile src_test src_install
>>
>> @@ -41,17 +41,14 @@
>>   multilib-minimal_abi_src_configure() {
>>   debug-print-function ${FUNCNAME} "$@"
>>
>> - mkdir -p "${BUILD_DIR}" || die
>> - pushd "${BUILD_DIR}" >/dev/null || die
>>   if declare -f multilib_src_configure >/dev/null ; then
>>   multilib_src_configure
>>   else
>>   default_src_configure
>>   fi
>> - popd >/dev/null || die
>
> NAK. No real gain in this, while indirection makes the eclass harder to
> read.
>

"run_in_build_dir" sounded fairly easy to read and understand imho...
but ok, whatever... I don't really care about this TBH.

Best,
Davide


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

end of thread, other threads:[~2014-10-31  1:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-23 20:31 [gentoo-dev] [PATCH 2/2] multilib-minimal.eclass: use run_in_build_dir() Davide Pesavento
2014-10-23 21:08 ` Michał Górny
2014-10-31  1:06   ` Davide Pesavento

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