Skip to contentSkip to conversation

glibc-initial-2.3.2 build failes (wrong patch)

PATCH Superseded Martin Dietze 2 participants 4 messages Jun 7, 2009

lore
Share & tools
lore
#0 lore raw

Hi,

I just pulled from the git and started a rebuild, found that
glibc-initial-2.3.2 no longer builds on my system (nylon, mtx-1). It looks like the wrong patch is picked for applying:

| NOTE: Applying patch 'hppa-syscall.patch' (org.openembedded.dev/recipes/glibc/glibc-2.3.2/hppa-syscall.patch)
| NOTE: Applying patch 'glibc23-errno-hack.patch' (org.openembedded.dev/recipes/glibc/glibc-2.3.2/glibc23-errno-hack.patch)
| NOTE: Applying patch '90_glibc232-statvfs.patch' (org.openembedded.dev/recipes/glibc/glibc-2.3.2/90_glibc232-statvfs.patch)
| NOTE: Applying patch '90_glibc232-timezones.patch' (org.openembedded.dev/recipes/glibc/glibc-2.3.2/90_glibc232-timezones.patch)
| NOTE: Applying patch 'arm-memcpy.patch' (org.openembedded.dev/recipes/glibc/glibc-2.4/arm-memcpy.patch)
| NOTE: Applying patch 'arm-longlong.patch' (org.openembedded.dev/recipes/glibc/glibc-2.4/arm-longlong.patch)
| ERROR: Error in executing: /var/src/OE/org.openembedded.dev/recipes/glibc/glibc-initial_2.3.2.bb
| ERROR: Exception:<class 'CmdError'> Message:Command Error: exit status: 1  Output:
| Applying patch arm-longlong.patch
| can't find file to patch at input line 3
| Perhaps you used the wrong -p or --strip option?
| The text leading up to this was:
| --------------------------
| |--- glibc-2.4/stdlib/longlong.h.ark    2006-03-11 22:49:27.000000000 +0100
| |+++ glibc-2.4/stdlib/longlong.h        2006-03-11 22:55:12.000000000 +0100

I cannot find any reason why arm-memcpy.patch and arm-longlong.patch from the glibc-2.4 directory are used while both files are available in glibc-2.3.2. Any idea anyone?

Cheers,

M'bert

Signature · 3 lines
----------- / http://herbert.the-little-red-haired-girl.org / -------------
=+= 
Ed, the greatest WYGIWYG editor of all.
#1 lore raw
Quoted 7 lines · Martin Dietze

I just pulled from the git and started a rebuild, found that
glibc-initial-2.3.2 no longer builds on my system (nylon, mtx-1). It looks like the wrong patch is picked for applying:

I cannot find any reason why arm-memcpy.patch and arm-longlong.patch from the glibc-2.4 directory are used while both files are available in glibc-2.3.2. Any idea anyone?

Hi Martin,

I think the problem was introduced by 75bfa83fffb270c871aee698c3899111901c576d. I converted FILESPATH to FILESPATHPKG and in the process removed some that looked like they'd be covered by the defaults... well, they would have, if glibc-initial.inc didn't override to always add "glibc-2.4" to the front :)

I think the solution is to remove the FILESPATHPKG override from glibc-initial.inc. After looking through the rest of the files again, it looks like the glibc_2.[5-9]*.bb (not -initial) each add glibc-2.4 to the search path one way or another, and they are included by -initial, so there's no need to do it in the initial.inc. Can you give it a shot and see if it fixes the build for 2.3.2?

Mike

#2 lore raw
Quoted 6 lines · Michael Smith

I think the solution is to remove the FILESPATHPKG override from glibc-initial.inc. After looking through the rest of the files again, it looks like the glibc_2.[5-9]*.bb (not -initial) each add glibc-2.4 to the search path one way or another, and they are included by -initial, so there's no need to do it in the initial.inc. Can you give it a shot and see if it fixes the build for 2.3.2?

Did so, and it looks good!

Cheers,

M'bert

Signature · 4 lines
----------- / http://herbert.the-little-red-haired-girl.org / -------------
=+= 
Chinese is a lousy language for scrabble
           -- Neal Stephenson
#3 lore raw

PATCH 1/1 glibc-initial.inc: remove FILESPATHPKG setting to fix glibc-initial_2.3.2

All v2.5+ recipes add glibc-2.4 as a FILESDIR or FILESPATHPKG if they need it, so it's not required in the inc anymore.

---
 recipes/glibc/glibc-initial.inc |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
recipes/glibc/glibc-initial.inc +0 -1
index cd65924..6468f0d 100644
@@ -1,7 +1,6 @@
 SECTION = "libs"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATHPKG =. "glibc-2.4:"
 
 PACKAGES = ""
 PACKAGES_DYNAMIC = ""
Signature · 1 line
1.6.3