Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 152655 - xorg-server-1.1.1-r1 can't find an unexistent (from 2.6.15 ?) asm/kbio.h file on sparc
Summary: xorg-server-1.1.1-r1 can't find an unexistent (from 2.6.15 ?) asm/kbio.h file...
Status: RESOLVED NEEDINFO
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: Sparc Linux
: High normal (vote)
Assignee: Gentoo X packagers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-10-24 06:51 UTC by Cedric Godin
Modified: 2007-05-08 05:59 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
The correct, upstream fix (1.1.1-get-correct-struct-member-name-with-autoconf.patch,5.32 KB, patch)
2006-10-24 09:06 UTC, Donnie Berkholz (RETIRED)
Details | Diff
the "corrected" upstream patch (1.1.1-sparc64-kbio-fix.patch,5.44 KB, patch)
2006-10-26 01:45 UTC, Cedric Godin
Details | Diff
patch for the ebuild (xorg-server-1.1.1-r1.ebuild.patch,453 bytes, patch)
2006-10-26 01:46 UTC, Cedric Godin
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Cedric Godin 2006-10-24 06:51:10 UTC
trying to emerge xorg-server-1.1.1-r1 gives :

sparc-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I../../../../include -I../../../../include -I../../../../include -I../../../../include -I../../../../include -I../../../../include -I../../../../include -I../../../../include -I../../../../hw/xfree86 -I../../../../hw/xfree86/include -I../../../../hw/xfree86/common -I../../../../hw/xfree86/os-support -I../../../../hw/xfree86/os-support/bus -I../../../../os -I/usr/include/drm -DUSESTDRES -DHAVE_SYSV_IPC -DHAVE_XORG_CONFIG_H -DXF86PM -DHAVE_APM -DXFree86Server -DXFree86LOADER -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I../../../../include -I../../../../include -I../../../../Xext -I../../../../composite -I../../../../damageext -I../../../../xfixes -I../../../../Xi -I../../../../mi -I../../../../miext/shadow -I../../../../miext/damage -I../../../../render -I../../../../randr -I../../../../fb -mcpu=ultrasparc -mtune=v9 -O2 -MT lnx_io.lo -MD -MP -MF .deps/lnx_io.Tpo -c lnx_io.c  -fPIC -DPIC -o .libs/lnx_io.o
lnx_io.c:77:22: asm/kbio.h: No such file or directory
make[5]: *** [lnx_io.lo] Error 1

I did find a patch on the ubuntu archive for this problem :
https://lists.ubuntu.com/archives/ubuntu-patches/2006-July/000620.html
Comment 1 Donnie Berkholz (RETIRED) gentoo-dev 2006-10-24 09:06:57 UTC
Created attachment 100389 [details, diff]
The correct, upstream fix

Here's the right patch, from upstream, instead of the temporary hack Ubuntu added.
Comment 2 Donnie Berkholz (RETIRED) gentoo-dev 2006-10-24 09:08:16 UTC
Looks like that still needs a line removed for kbio.h in configure.ac, however. If you remove that line and change 1061,25 to 1061,24, it oughta work as expected.
Comment 3 Cedric Godin 2006-10-25 02:14:52 UTC
I did create the patch and changed the ebuild to use it and all compiled OK. Thank you for the fast answer.
Comment 4 Cedric Godin 2006-10-25 07:20:36 UTC
sorry, but i was wrong, the patch didn't apply :(

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < /usr/portage/x11-base/xorg-server/files/1.1.1-sparc64-kbio-fix.patch

========================================
patching file configure.ac
Hunk #1 FAILED at 1071.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
patching file hw/xfree86/os-support/linux/lnx_io.c
Hunk #1 succeeded at 67 with fuzz 1.
Hunk #2 FAILED at 75.
1 out of 3 hunks FAILED -- saving rejects to file hw/xfree86/os-support/linux/lnx_io.c.rej
patching file hw/xfree86/os-support/linux/lnx_kbd.c
Hunk #3 FAILED at 113.
1 out of 4 hunks FAILED -- saving rejects to file hw/xfree86/os-support/linux/lnx_kbd.c.rej
patching file include/xorg-config.h.in
Hunk #1 succeeded at 112 (offset 6 lines).
========================================

I will try to correct and make it succeed
Comment 5 Donnie Berkholz (RETIRED) gentoo-dev 2006-10-25 10:33:52 UTC
Cool. If you don't have any luck, let me know and I'll have a go at it. I just posted the patch straight from git.
Comment 6 Cedric Godin 2006-10-26 01:45:30 UTC
Created attachment 100514 [details, diff]
the "corrected" upstream patch

here is the patch, it did pass compilation. Note that you need to add it in the ebuild (ebuild patch attached too).
Comment 7 Cedric Godin 2006-10-26 01:46:19 UTC
Created attachment 100515 [details, diff]
patch for the ebuild

patch for the ebuild
Comment 8 Joshua Baergen (RETIRED) gentoo-dev 2006-11-05 12:03:47 UTC
Donnie, I'll let you make the call on whether this is ready for inclusion.
Comment 9 Donnie Berkholz (RETIRED) gentoo-dev 2006-11-05 22:29:23 UTC
It's pretty much good. I'd like it split into the original upstream patch, then the new fix layered on top of it, though. Might be able to generate that by reverse-patching the original fix in git checkout, then applying this and generating a diff.
Comment 10 Donnie Berkholz (RETIRED) gentoo-dev 2007-05-08 05:59:01 UTC
Is this still an issue in xorg-server 1.3? Please reopen when you reply.