Skip to content

Fix build failure on i386 + lintian error

Diederik de Haas requested to merge diederik/rrdtool:fix-build-issues into master

While investigating the build failure on i386 I noticed I could not reproduce the issue on upstream's master branch on my RPi 2B (armhf thus also 32bit).
So I began backporting the upstream commits since the 1.8.0 release which might be relevant ... and noticed that that fixed the i386 failure in my Salsa CI.

This resulted in enhancing my Salsa CI MR (!3) upon which this MR is based. The first thing I did was fixing the lintian error and then I added the following upstream patches to debian/patches until Salsa's CI succeeded:

  1. "acinclude.m4: Include <stdlib.h> when using exit" (https://github.com/oetiker/rrdtool-1.x/commit/f3334fcbde0a77aa48938ba38602bff91c09cf85)
  2. "Update Version and Copyright year in git files" (https://github.com/oetiker/rrdtool-1.x/commit/e839e17c9d61f6fdc40f2f0d5a828e2f19614b0f)
  3. "Fix BUILD_DATE in rrdtool help output" (https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f)
  4. "Fix unsigned integer overflow in rrdtool first" (https://github.com/oetiker/rrdtool-1.x/commit/b74a0d64e00770384d025e40becdb2ed83c04c0c)

It was actually with the 3rd patch that the build succeeded, but fixing an unsigned integer overflow issue seems like a good idea too.
Patch 2 is probably not (strictly) needed, but in the 1.8.0 release a LOT of files still reference old versions.

I actually also have the following backported upstream patches, but they're not strictly needed to fix the i386 build failure:

  1. "Remove autogenerated files" (https://github.com/oetiker/rrdtool-1.x/commit/99275bf1da7771fdc97b6fb22f43b80e45b9442e)
  2. "Suppress several warnings of implicit fall through" (https://github.com/oetiker/rrdtool-1.x/commit/fbea00d42071335b19e6e092de97c61346e7904a)
  3. "Ensure Perl manpages install to mandir" (https://github.com/oetiker/rrdtool-1.x/commit/3c8b68009f326cd68d37158437624beaf0f7ad3b)
  4. "Suppress more implicit fall through warnings" (https://github.com/oetiker/rrdtool-1.x/commit/97e0c81695bfde3bbd2bc42cf417254e067000ed)

Those are in https://salsa.debian.org/diederik/rrdtool/-/commits/import-upstream-patches/ and I could add those too if that seems useful.

Merge request reports