klibc - Feb 2012 - Bug#653790: klibc/s390x: searches for include in the wrong path

On Sat, 31 Dec 2011, Aurelien Jarno wrote:
> s390 and s390x are sharing the same include files, in 
> /usr/lib/klibc/include/arch/s390. However klcc seatches for the s390x 
> includes in /usr/lib/klibc/include/arch/s390x, which doesn't exist.
> 
> The patch below fixes the issue by using the ARCHDIR variable instead 
> of the ARCH one in klcc. It's one possible fix, another possible fix 
> would be to use a symlink, or to split s390 and s390x in two different
> architectures as anyway they don't share so much code.
thanks applied and pushed.

will upload to Debian in next days.
 
 
> --- klibc-1.5.25.orig/klcc/klcc.in
> +++ klibc-1.5.25/klcc/klcc.in
> @@ -3,7 +3,7 @@
>  use IPC::Open3;
>  
>  # Standard includes
> - at includes = ("-I${prefix}/${KCROSS}include/arch/${ARCH}",
> + at includes = ("-I${prefix}/${KCROSS}include/arch/${ARCHDIR}",
>  	     "-I${prefix}/${KCROSS}include/bits${BITSIZE}",
>  	     "-I${prefix}/${KCROSS}include");
>  
> --- klibc-1.5.25.orig/klcc/Kbuild
> +++ klibc-1.5.25/klcc/Kbuild
> @@ -10,6 +10,7 @@ $(obj)/$(KLIBCCROSS)klibc.config: $(src)
>  	@echo "  GEN     $@"
>  	$(Q)rm -f $@
>  	$(Q)echo 'ARCH=$(KLIBCARCH)' >> $@
> +	$(Q)echo 'ARCHDIR=$(KLIBCARCHDIR)' >> $@
>  	$(Q)echo 'CROSS=$(KLIBCROSS)' >> $@
>  	$(Q)echo 'KCROSS=$(KCROSS)' >> $@
>  	$(Q)echo 'CC=$(KLIBCCC)' >> $@
> 
> 
> -- System Information:
> Debian Release: wheezy/sid
>   APT prefers unstable
>   APT policy: (500, 'unstable')
> Architecture: s390x
> 
> Kernel: Linux 3.1.0-1-s390x (SMP w/2 CPU cores)
> Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> 
-- 
maks