Merge ~lucaskanashiro/ubuntu/+source/libdebian-installer:fix-ftbfs-gcc-10 into ubuntu/+source/libdebian-installer:ubuntu/devel

[Lucas Kanashiro]

Fix FTBFS with GCC-10. The reason of this build failure is GCC changing the default from -fcommon to -fno-common. The proposed patch was applied in Debian in the past to fix a GCC-8 build failure, so no need to forward it.

Here is the PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/groovy-libdebian-installer/+packages

[Sergio Durigan Junior (sergiodj)]

On Monday, August 03 2020, Lucas Kanashiro wrote:

> Lucas Kanashiro has proposed merging ~lucaskanashiro/ubuntu/+source/libdebian-installer:fix-ftbfs-gcc-10 into ubuntu/+source/libdebian-installer:ubuntu/devel.
>
> Requested reviews:
> Canonical Server Team (canonical-server)

I'll review this one.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Sergio Durigan Junior (sergiodj)]

Everything looks good to me, the only minor request I have is to expand the changelog entry and mention that the failure happened because of the change in the compiler behaviour. This might prove useful in the future :-).

Thanks!

review: Needs Fixing

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Sergio, I expanded the changelog entry. Is that good enough now?

[Sergio Durigan Junior (sergiodj)]

That's perfect, thanks Lucas!

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Great, uploaded:

$ git push pkg upload/0.110ubuntu4
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 8 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.37 KiB | 233.00 KiB/s, done.
Total 11 (delta 8), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/libdebian-installer
 * [new tag] upload/0.110ubuntu4 -> upload/0.110ubuntu4

$ dput ubuntu ../libdebian-installer_0.110ubuntu4_source.changes
Checking signature on .changes
gpg: ../libdebian-installer_0.110ubuntu4_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../libdebian-installer_0.110ubuntu4.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libdebian-installer_0.110ubuntu4.dsc: done.
  Uploading libdebian-installer_0.110ubuntu4.tar.xz: done.
  Uploading libdebian-installer_0.110ubuntu4_source.changes: done.
Successfully uploaded packages.

Unmerged commits

765c4e7... by Lucas Kanashiro on 2020-08-03

Update changelog

b49d9f0... by Lucas Kanashiro on 2020-08-03

Fix FTBFS with GCC-10: Mark di_parser_fieldinfo constants extern

Origin: https://salsa.debian.org/installer-team/libdebian-installer/-/commit/4cde0f39

799acc0... by Mathieu Trudel-Lapierre on 2018-10-04

Import patches-unapplied version 0.110ubuntu3 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 5c0fb43765793bcb88d1413b342e2adf9b8e6384

New changelog entries:
  * src/tree.c: Silence GCC's implicit-fallthrough warning by being explicit
    in this binary tree rotate code that there's not fallthrough; we're
    covering all tree rotation cases already (all paths in switch() already
    return().

5c0fb43... by Julian Andres Klode on 2018-04-20

Import patches-unapplied version 0.110ubuntu2 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: cfeb6fefa910f99fba4d566a0cf153218a057e92

New changelog entries:
  * src/system/devfs.c: Include sys/sysmacros.h to fix FTBFS caused by
    major/minor definition errors

cfeb6fe... by Balint Reczey on 2017-05-18

Import patches-unapplied version 0.110ubuntu1 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 1a06676931bda4367889b05d5fcf0ff0a06724af

New changelog entries:
  * Merge from Debian unstable. (LP: #1688246) Remaining changes:
    - Add more OMAP4 Panda support.
    - Add OMAP4 Blaze support.
    - Add Freescale "P4080 DS" and "QEMU e500" support.
    - Point to Bazaar packaging repository on Launchpad

1a06676... by Christian Perrier on 2017-03-22

Import patches-unapplied version 0.110 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 18acf81d2af076957b9034a6c098ea98131608b7

New changelog entries:
  [ Martin Michlmayr ]
  * subarch-arm-linux.c: Add NETGEAR ReadyNAS Duo v2. Closes: #855965

18acf81... by Bastian Blank on 2017-03-05

Import patches-unapplied version 0.109 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d93ad362192fa547783cf35c38ccaa9efb39dc7b

New changelog entries:
  [ Samuel Thibault ]
  * Fix build with gcc-7. Closes: #853489
  [ Steven Chamberlain ]
  * Parse SHA256 fields in Packages files. (closes: #856210)
  * Parse SHA256 fields in Release files.
  [ Bastian Blank ]
  * Update versions for changed symbols.
    - Add Breaks on cdebootrap.

d93ad36... by Christian Perrier on 2016-08-30

Import patches-unapplied version 0.108 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 93ba40ac19c8bf7f921d8f9572979cb707010f29

New changelog entries:
  [ Helmut Grohne ]
  * Make Build-Depends: check optional via <!nocheck> profile.
    Closes: #787044.

93ba40a... by Christian Perrier on 2016-06-20

Import patches-unapplied version 0.107 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 657db49117c54b50d1ff7e3442a55b3132d8032a

New changelog entries:
  [ Steve McIntyre ]
  * armel/armhf: Fix missing efi include FTBFS

657db49... by Christian Perrier on 2016-06-12

Import patches-unapplied version 0.106 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 829c2e5be98375f465ca36e957398fb0acfab751

New changelog entries:
  [ Steve McIntyre ]
  * armhf: Add EFI detection.
  [ Mathieu Trudel-Lapierre ]
  * validate the presence of efivars *or* vars under /sys/firmware/efi to
    decide whether we should show the system as running in EFI mode;
    either of these paths is required for efibootmgr to set a BootEntry at
    the end of installation. Closes: #826665

diff --git a/debian/changelog b/debian/changelog
index c3bc9e5..c1719c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdebian-installer (0.110ubuntu4) groovy; urgency=medium
+
+  * Fix FTBFS with GCC-10: Mark di_parser_fieldinfo constants extern. GCC-10
+    changed the default from -fcommon to -fno-common which makes the gcc code
+    generator to emit globals without explicit initializers from .bss to .data.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 03 Aug 2020 15:34:56 -0300
+
 libdebian-installer (0.110ubuntu3) cosmic; urgency=medium
 
   * src/tree.c: Silence GCC's implicit-fallthrough warning by being explicit
diff --git a/include/debian-installer/package_internal.h b/include/debian-installer/package_internal.h
index d410ce2..eb6fdd1 100644
--- a/include/debian-installer/package_internal.h
+++ b/include/debian-installer/package_internal.h
@@ -33,7 +33,7 @@ typedef struct internal_di_package_parser_data internal_di_package_parser_data;
  * @internal
  * parser info
  */
-const di_parser_fieldinfo
+extern const di_parser_fieldinfo
   internal_di_package_parser_field_status,
   internal_di_package_parser_field_essential,
   internal_di_package_parser_field_priority,
diff --git a/include/debian-installer/packages_internal.h b/include/debian-installer/packages_internal.h
index f17bc36..5def708 100644
--- a/include/debian-installer/packages_internal.h
+++ b/include/debian-installer/packages_internal.h
@@ -84,7 +84,7 @@ struct di_packages_resolve_dependencies_do_real_list_append_data
 di_parser_write_entry_next
   internal_di_packages_parser_write_entry_next;
 
-const di_parser_fieldinfo
+extern const di_parser_fieldinfo
   internal_di_packages_parser_field_package;
 
 /** @} */