Bugzilla Bug 61482

Hi,

app-shells/sash-3.6 will fail when using linux26-headers-2.6.7-r4:

>>> emerge (1 of 74) app-shells/sash-3.6 to /
>>> md5 src_uri ;-) sash-3.6.tar.gz
>>> Unpacking source...
>>> Unpacking sash-3.6.tar.gz to /var/tmp/portage/sash-3.6/work
 * Applying sash-3.6-fix-includes.patch...                                                                       [ ok ]
readline
 * Applying sash-3.6-readline.patch...                                                                           [ ok ]
ppc64
 * Applying sash-3.6-ppc64-includes.patch...                                                                     [ ok ]
>>> Source unpacked.
gcc -mtune=970 -O3 -pipe -fsigned-char -mabi=altivec -Wall -Wmissing-prototypes -DHAVE_GZIP=1 -DHAVE_LINUX_ATTR=1 
-DHAVE_LINUX_MOUNT=1 -DHAVE_BSD_MOUNT=0 -DMOUNT_TYPE='"ext3"' -DHAVE_READLINE   -c -o sash.o sash.c
sash.c: In function `fileman_completion':
sash.c:536: warning: implicit declaration of function `completion_matches'
sash.c:536: warning: assignment makes pointer from integer without a cast
sash.c: In function `command_generator':
sash.c:561: warning: suggest parentheses around assignment used as truth value
sash.c: At top level:
sash.c:1454: warning: 'showPrompt' defined but not used
gcc -mtune=970 -O3 -pipe -fsigned-char -mabi=altivec -Wall -Wmissing-prototypes -DHAVE_GZIP=1 -DHAVE_LINUX_ATTR=1 
-DHAVE_LINUX_MOUNT=1 -DHAVE_BSD_MOUNT=0 -DMOUNT_TYPE='"ext3"' -DHAVE_READLINE   -c -o cmds.o cmds.c
In file included from /usr/include/linux/prefetch.h:14,
                 from /usr/include/linux/list.h:5,
                 from /usr/include/linux/wait.h:12,
                 from /usr/include/linux/fs.h:12,
                 from cmds.c:21:
/usr/include/asm/processor.h:550: error: parse error before "vector128"
/usr/include/asm/processor.h:556: error: parse error before '}' token
In file included from /usr/include/linux/fs.h:12,
                 from cmds.c:21:
/usr/include/linux/wait.h: In function `init_waitqueue_head':
/usr/include/linux/wait.h:58: error: `SPIN_LOCK_UNLOCKED' undeclared (first use in this function)
/usr/include/linux/wait.h:58: error: (Each undeclared identifier is reported only once
/usr/include/linux/wait.h:58: error: for each function it appears in.)
make: *** [cmds.o] Error 1

!!! ERROR: app-shells/sash-3.6 failed.
!!! Function src_compile, Line 33, Exitcode 2
!!! (no error message)

Just an enhancement bug! ;-)

Markus

add: using gcc-3.4.1

works fine with linux26-headers-2.6.3-r1

Markus

and is broken with linux26-headers2.6.7 :-/

what about 2.6.8.1 ?

*** Bug 61488 has been marked as a duplicate of this bug. ***

*** Bug 61493 has been marked as a duplicate of this bug. ***

Created an attachment (id=40636) [details]
Patch

Please try this patch on your headers (apply to /usr/include/asm). Thanks!

the patch works with linux26-headers-2.6.7-r4, but it gives some new errors
with 2.6.8.1. So 2.6.7 are the way to go.. :-)

Markus

Would you mind pasting the errors with 2.6.8.1 please?

Created an attachment (id=40974) [details]
sash output using 2.6.8.1

sure... here it is.

Markus

Try running (in bash/zsh):

%> sed -i -e "s/\([ "$'\t'"]\)u32/\1__u32/g;s/\([ "$'\t'"]\)u16/\1__u16/g;s/\([ "$'\t'"]\)u8/\1__u8/g;s/\([ "$'\t'"]\)u64/\1__u64/g;" /usr/include/asm/iSeries/*
%> sed -i -e "s/\([ "$'\t'"]\)u32/\1__u32/g;s/\([ "$'\t'"]\)u16/\1__u16/g;s/\([ "$'\t'"]\)u8/\1__u8/g;s/\([ "$'\t'"]\)u64/\1__u64/g;" /usr/include/asm/*

Created an attachment (id=40976) [details]
sash output with 2.6.8.1 and "sed ..."

the command reduces the errors! :-)

Markus

Hrm, can you attach /usr/include/asm/iSeries/ItLpPaca.h ?

Created an attachment (id=40989) [details]
/usr/include/asm/iSeries/ItLpPaca.h

Hrm, weird. Looks like the sed didn't pick up line 101 and 102 of
/usr/include/asm/iSeries/ItLpPaca.h for you, but it did here. Want to change
those from "volatile u64" to "volatile __u64"? Then make the following change
on /usr/include/asm/page.h:

@@ -90,6 +91,8 @@
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr)       _ALIGN(addr, PAGE_SIZE)

+typedef struct { unsigned long pte; } pte_t;
+
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 #include <asm/naca.h>
@@ -128,7 +131,6 @@
  * These are used to make use of C type-checking.
  * Entries in the pte table are 64b, while entries in the pgd & pmd are 32b.
  */
-typedef struct { unsigned long pte; } pte_t;
 typedef struct { unsigned int  pmd; } pmd_t;
 typedef struct { unsigned int  pgd; } pgd_t;
 typedef struct { unsigned long pgprot; } pgprot_t;

... and tell me how that goes.

Hi,

sash-3.6, mac-fdisk-0.1-r2 and kbd-1.12-r2 all compile now! :-)

Markus

should I build a patch which includes all changes or are you willing to do it?

Markus

I'm doing it - it should be in CVS in a few minutes and reach the rsync servers
within an hour. Please test linux26-headers-2.6.8.1-r1 when it appears and
please tell me if things work/fail :-)

I cannot emerge it:

(...)
  CRC32c CRC algorithm (CRYPTO_CRC32C) [N/m/y/?] (NEW) n
  Testing module (CRYPTO_TEST) [M/n/y/?] m
*
* Library routines
*
CRC-CCITT functions (CRC_CCITT) [M/y/?] (NEW) m
CRC32 functions (CRC32) [Y/?] y
CRC32c (Castagnoli, et al) Cyclic Redundancy-Check (LIBCRC32C) [N/m/y/?] 
(NEW) n
  SPLIT   include/linux/autoconf.h -> include/config/*
  CC      scripts/mod/empty.o
  HOSTCC  scripts/mod/mk_elfconfig
  MKELF   scripts/mod/elfconfig.h
  HOSTCC  scripts/mod/file2alias.o
  HOSTCC  scripts/mod/modpost.o
  HOSTCC  scripts/mod/sumversion.o
  HOSTLD  scripts/mod/modpost
  HOSTCC  scripts/conmakehash
  HOSTCC  scripts/kallsyms
  HOSTCC  scripts/pnmtologo
  HOSTCC  scripts/bin2c
  CC      arch/ppc64/kernel/asm-offsets.s
In file included from include/asm/system.h:13,
                 from include/linux/list.h:6,
                 from include/linux/signal.h:4,
                 from arch/ppc64/kernel/asm-offsets.c:17:
include/asm/page.h:152: error: conflicting types for 'pte_t'
include/asm/page.h:94: error: previous declaration of 'pte_t' was here
make[1]: *** [arch/ppc64/kernel/asm-offsets.s] Error 1
make: *** [arch/ppc64/kernel/asm-offsets.s] Error 2

!!! ERROR: sys-kernel/linux26-headers-2.6.8.1-r1 failed.
!!! Function src_compile, Line 81, Exitcode 2
!!! prepare failed

Markus

Ok, should be fixed now... You want a
sys-kernel/linux26-headers/files/linux26-headers-2.6.8.1-appCompat.patch with a
MD5 of a7fc9c7093167bfa5e435df748e0cce5.

Finally it works like a charm! :-)

linux26-headers-2.6.8.1-r1 merges succesfully and sash/mac-fdisk/kbd also compiles.

Changeing status to FIXED.

Markus

time to stick a fork in it!