0002-si_types-h-fix-build-with-gcc-10.patch 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. si_types.h: fix build with gcc 10
  2. Drop service_t, p_service_t, transponder_t and p_transponder_t to avoid
  3. the following build failure with gcc 10 (which defaults to -fno-common):
  4. /home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -lrt -o w_scan atsc_psip_section.o countries.o descriptors.o diseqc.o dump-dvbscan.o dump-vdr.o dump-xine.o dump-mplayer.o dump-vlc-m3u.o dvbscan.o lnb.o parse-dvbscan.o satellites.o scan.o section.o tools.o emulate.o dump-xml.o iconv_codes.o char-coding.o
  5. /home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x404): multiple definition of `p_transponder_t'; countries.o:(.bss+0x0): first defined here
  6. /home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x408): multiple definition of `transponder_t'; countries.o:(.bss+0x4): first defined here
  7. /home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x480): multiple definition of `p_service_t'; countries.o:(.bss+0x7c): first defined here
  8. /home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x484): multiple definition of `service_t'; countries.o:(.bss+0x80): first defined here
  9. Fixes:
  10. - http://autobuild.buildroot.org/results/5640442cb4ba06bcbcf31540a64f5665862d39f7
  11. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  12. diff -Nura w_scan-20170107.orig/si_types.h w_scan-20170107/si_types.h
  13. --- w_scan-20170107.orig/si_types.h 2020-09-20 11:09:56.776963441 +0200
  14. +++ w_scan-20170107/si_types.h 2020-09-20 11:13:13.149232478 +0200
  15. @@ -114,7 +114,7 @@
  16. uint32_t logical_channel_number;
  17. uint8_t running;
  18. void * priv;
  19. -} service_t, * p_service_t;
  20. +};
  21. /*******************************************************************************
  22. /* transponder type.
  23. @@ -201,7 +201,7 @@
  24. /*----------------------------*/
  25. char * network_name;
  26. network_change_t network_change;
  27. -} __attribute__((packed)) transponder_t, * p_transponder_t;
  28. +} __attribute__((packed));
  29. /*******************************************************************************
  30. /* satellite channel routing type.