Most recent commit in incubater/dde_net breaks cross build

[Janneke Nieuwenhuizen]

Hi,

This commit

    
https://git.savannah.gnu.org/cgit/hurd/incubator.git/commit/?id=be828e44b332ccfeef6f687d69b5d74b2a16323d

more specificly, this bit

--8<---------------cut here---------------start------------->8---
diff --git a/main.c b/main.c
index ec764056a..26ad4f1dd 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,8 @@
 #include <dde26.h> /* l4dde26_*() */
 #include <dde26_net.h> /* l4dde26 networking */
 
+#include <pthread.h>
+
 #include <linux/netdevice.h> /* struct sk_buff */
 #include <linux/pci.h> /* pci_unregister_driver() */
 #include <linux/init.h>  // initcall()
--8<---------------cut here---------------end--------------->8---

breaks the cross build of netdde in Guix, see below.  We're using
i586-pc-gnu-gcc (GCC) 11.3.0 and glibc-2.37.

So I'll be using the commit just before that for now.

Greetinsgs,
Janneke

starting phase `build'
  ... Compiling main.o
i586-pc-gnu-gcc -c -MD -include linux/autoconf.h    -D__KERNEL__ -DDDE_LINUX 
-D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR( main)" 
-D"KBUILD_MODNAME=KBUILD_STR( main)" -DRAM_BASE=0x0    -DSYSTEM_x86_l4v2 
-DARCH_x86 -DCPUTYPE_ -DL4API_  -Ilibdde_linux26/build/include/x86 
-Ilibdde_linux26/build/include/ 
-Ilibdde_linux26/build/include/linux-headers/asm/mach-default 
-Ilibdde_linux26/build/include/x86/linux-headers 
-Ilibdde_linux26/build/include/x86/asm 
-Ilibdde_linux26/build/include/linux-headers -Ilibdde_linux26/../libddekit -I. 
-Ilibdde_linux26/build/include/x86 -Ilibdde_linux26/build/include  -g 
-Ilibdde_linux26/include -I../include -DCONFIG_B44_PCI -DCONFIG_8139TOO_8129 
-ffunction-sections       -g -fno-strict-aliasing   -Wall -Wstrict-prototypes 
-fno-strict-aliasing  -Wno-unused  -Wno-pointer-sign -fno-common  
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c -o main.o
In file included from 
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/bits/sched.h:32,
                 from 
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/sched.h:43,
                 from 
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/pthread.h:49,
                 from 
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c:4:
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/bits/types/struct_sched_param.h:23:8:
 error: redefinition of ‘struct sched_param’
   23 | struct sched_param
      |        ^~~~~~~~~~~
In file included from 
libdde_linux26/build/include/linux-headers/linux/smp_lock.h:5,
                 from libdde_linux26/build/include/linux/hardirq.h:5,
                 from 
libdde_linux26/build/include/linux-headers/linux/interrupt.h:12,
                 from 
libdde_linux26/build/include/linux-headers/linux/netdevice.h:1063,
                 from libdde_linux26/build/include/dde26_net.h:5,
                 from 
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c:2:
libdde_linux26/build/include/linux/sched.h:44:8: note: originally defined here
   44 | struct sched_param {
      |        ^~~~~~~~~~~
In file included from 
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/pthread.h:49,
                 from 
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c:4:
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/sched.h:61:12:
 error: conflicting types for ‘sched_setscheduler’; have ‘int(__pid_t,  int,  
const struct sched_param *)’ {aka ‘int(int,  int,  const struct sched_param *)’}
   61 | extern int sched_setscheduler (__pid_t __pid, int __policy,
      |            ^~~~~~~~~~~~~~~~~~
In file included from 
libdde_linux26/build/include/linux-headers/linux/smp_lock.h:5,
                 from libdde_linux26/build/include/linux/hardirq.h:5,
                 from 
libdde_linux26/build/include/linux-headers/linux/interrupt.h:12,
                 from 
libdde_linux26/build/include/linux-headers/linux/netdevice.h:1063,
                 from libdde_linux26/build/include/dde26_net.h:5,
                 from 
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c:2:
libdde_linux26/build/include/linux/sched.h:1782:12: note: previous declaration 
of ‘sched_setscheduler’ with type ‘int(struct task_struct *, int,  struct 
sched_param *)’
 1782 | extern int sched_setscheduler(struct task_struct *, int, struct 
sched_param *);
      |            ^~~~~~~~~~~~~~~~~~
In file included from 
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/time.h:48,
                 from 
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/pthread.h:50,
                 from 
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c:4:
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/bits/types/struct_itimerspec.h:8:8:
 error: redefinition of ‘struct itimerspec’
    8 | struct itimerspec
      |        ^~~~~~~~~~
In file included from 
libdde_linux26/build/include/linux-headers/linux/skbuff.h:19,
                 from libdde_linux26/build/include/dde26_net.h:4,
                 from 
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c:2:
libdde_linux26/build/include/linux-headers/linux/time.h:211:8: note: originally 
defined here
  211 | struct itimerspec {
      |        ^~~~~~~~~~
In file included from 
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/pthread.h:50,
                 from 
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c:4:
/gnu/store/c0rmv09lbs3lywzyl7d0ljcv1k7c5kng-glibc-cross-i586-pc-gnu-2.37/include/time.h:83:15:
 error: conflicting types for ‘mktime’; have ‘time_t(struct tm *)’ {aka ‘long 
int(struct tm *)’}
   83 | extern time_t mktime (struct tm *__tp) __THROW;
      |               ^~~~~~
In file included from 
libdde_linux26/build/include/linux-headers/linux/skbuff.h:19,
                 from libdde_linux26/build/include/dde26_net.h:4,
                 from 
/tmp/guix-build-netdde-2.6.32.65-2.be828e4.drv-0/source/main.c:2:
libdde_linux26/build/include/linux-headers/linux/time.h:74:22: note: previous 
declaration of ‘mktime’ with type ‘long unsigned int(const unsigned int,  const 
unsigned int,  const unsigned int,  const unsigned int,  const unsigned int,  
const unsigned int)’
   74 | extern unsigned long mktime(const unsigned int year, const unsigned int 
mon,
      |                      ^~~~~~
make: *** [libdde_linux26/mk/binary.inc:613: main.o] Error 1

-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com