Skip to contentSkip to conversation

python: Fix re-execution problem due to patching configure and configure.in

PATCH In review Richard Purdie 3 participants 6 messages Apr 16, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 python: Fix re-execution problem due to patching configure and configure.in

There was a patch patching both configure and configure.in. Since the recipes all autoreconf, this is pointless and means subsequent patch tasks fail.

The fix is to only patch configure.in.

[YOCTO #2194]

---

meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch +0 -11
index ed52936..1cb8fea 100644
@@ -14,17 +14,6 @@ Issue #12326: sys.platform is now always 'linux2' on Linux
 
 Even if Python is compiled on Linux 3.
 
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -2995,6 +2995,7 @@ then
- 	MACHDEP="$ac_md_system$ac_md_release"
- 
- 	case $MACHDEP in
-+	linux*) MACHDEP="linux2";;
- 	cygwin*) MACHDEP="cygwin";;
- 	darwin*) MACHDEP="darwin";;
- 	atheos*) MACHDEP="atheos";;
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
#1 lore raw

Op 16 apr. 2012, om 11:47 heeft Richard Purdie het volgende geschreven:

Quoted 8 lines

There was a patch patching both configure and configure.in. Since the recipes all autoreconf, this is pointless and means subsequent patch tasks fail.

The fix is to only patch configure.in.

[YOCTO #2194]

Since this changes the sources it needs a PR bump.

regards,

Koen

#2 lore raw
Quoted 5 lines · Koen Kooi

Op 16 apr. 2012, om 11:47 heeft Richard Purdie het volgende geschreven:

Quoted 3 lines

There was a patch patching both configure and configure.in. Since the recipes all autoreconf, this is pointless and means subsequent patch tasks fail.

Quoted 7 lines
Quoted 5 lines

The fix is to only patch configure.in.

[YOCTO #2194]

Since this changes the sources it needs a PR bump.

It has no effect on the packaged output which was always the criteria for PR bumps as I understood things.

Cheers,

Richard

#3 lore raw

Op 16 apr. 2012, om 13:10 heeft Richard Purdie het volgende geschreven:

Quoted 8 lines · Koen Kooi
Quoted 7 lines

Op 16 apr. 2012, om 11:47 heeft Richard Purdie het volgende geschreven:

Quoted 5 lines

There was a patch patching both configure and configure.in. Since the recipes all autoreconf, this is pointless and means subsequent patch tasks fail.

The fix is to only patch configure.in.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

[YOCTO #2194]

Since this changes the sources it needs a PR bump.

It has no effect on the packaged output which was always the criteria for PR bumps as I understood things.

But there's the exception for fixing failures like this so people don't have to -c clean(sstate) things.

regards,

Koen

#4 lore raw
Quoted 6 lines · Koen Kooi
Quoted 4 lines
Quoted 1 line

Since this changes the sources it needs a PR bump.

It has no effect on the packaged output which was always the criteria for PR bumps as I understood things.

But there's the exception for fixing failures like this so people don't have to -c clean(sstate) things.

Indeed, I had to do a manual -c cleansstate to get the benefit of this batch of rebuild fixes. The rebuilds all failed otherwise.

Steve

#5 lore raw
Quoted 11 lines · Steve Sakoman
Quoted 6 lines · Koen Kooi
Quoted 4 lines
Quoted 1 line

Since this changes the sources it needs a PR bump.

It has no effect on the packaged output which was always the criteria for PR bumps as I understood things.

But there's the exception for fixing failures like this so people don't have to -c clean(sstate) things.

Indeed, I had to do a manual -c cleansstate to get the benefit of this batch of rebuild fixes. The rebuilds all failed otherwise.

I did go back and add in a bunch of PR fixes but evidently not enough :/.

Cheers,

Richard