Package: release.debian.org Severity: normal Tags: buster User: release.debian....@packages.debian.org X-Debbugs-CC: Moritz Mühlenhoff <j...@debian.org> X-Debbugs-CC: Adrian Bunk <b...@debian.org> Usertags: pu
[ Reason ]
The upload of openexr 2.2.1-4.1+deb10u1 to Debian Buster broke the build for
pre-C++-11 packages which include the openexr headers. The build breaks with
things like:
In file included from /usr/include/c++/8/cstdint:35,
from /usr/include/OpenEXR/ImfFrameBuffer.h:55,
from /usr/include/OpenEXR/ImfInputFile.h:47,
from codecs/openexr.cc:24:
/usr/include/c++/8/bits/c++0x_warning.h:32:2: error: #error This file
requires compiler and library support for the ISO C++ 2011 standard. This
support must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
#error This file requires compiler and library support \
^~~~~
The build system changes to switch from -std=gnu++98 to GCC-default from
exactimage 1.0.2-8 was added to the Debian buster package to fix the FTBFS on
buster.
[ Impact ]
Package fails to build under Debian Buster 10.6 (and newer)
[ Tests ]
The build was tested to verify that it actually builds now. Only minor tests
were performed on the binaries to make sure that they don't immediately crash.
[ Risks ]
None known at the moment
[ Checklist ]
[*] *all* changes are documented in the d/changelog
[*] I reviewed all changes and I approve them
[*] attach debdiff against the package in stable
[*] the issue is verified as fixed in unstable
[ Other info ]
See http://bugs.debian.org/968829 bug which was just recently re-opened for
the regression in Debian Buster.
I have not yet uploaded the change to stable but will do this after I get an
approval for the attached change.
Kind regards,
Svendiff -Nru exactimage-1.0.2/debian/changelog exactimage-1.0.2/debian/changelog --- exactimage-1.0.2/debian/changelog 2019-02-03 17:49:58.000000000 +0100 +++ exactimage-1.0.2/debian/changelog 2021-04-25 07:57:10.000000000 +0200 @@ -1,3 +1,16 @@ +exactimage (1.0.2-1+deb10u1) buster; urgency=medium + + * debian/rules: + - Add -fpermissive to fix FTBFS due to missing C++11 "constexp" + * debian/patches: + - Add adapt-for-nicer-per-file-_C-FLAGS-per-source-input-name.patch, + added-fpermissive-where-currently-necessary.patch, + if-we-can-not-easily-use-the-input-module-name-for-C-FLAS.patch, + Updated-per-file-C-FLAGS-to-likely-final-delimiter.patch, + Fix build with C++11 and OpenEXR 2.5.x (Closes: #968829) + + -- Sven Eckelmann <s...@narfation.org> Sun, 25 Apr 2021 07:57:10 +0200 + exactimage (1.0.2-1) unstable; urgency=medium * New Upstream Version diff -Nru exactimage-1.0.2/debian/patches/adapt-for-nicer-per-file-_C-FLAGS-per-source-input-name.patch exactimage-1.0.2/debian/patches/adapt-for-nicer-per-file-_C-FLAGS-per-source-input-name.patch --- exactimage-1.0.2/debian/patches/adapt-for-nicer-per-file-_C-FLAGS-per-source-input-name.patch 1970-01-01 01:00:00.000000000 +0100 +++ exactimage-1.0.2/debian/patches/adapt-for-nicer-per-file-_C-FLAGS-per-source-input-name.patch 2021-04-25 07:57:10.000000000 +0200 @@ -0,0 +1,38 @@ +From: rene <rene@cfa9e8bd-72fe-0310-85ed-f28a7036cb6a> +Date: Sun, 29 Sep 2019 19:42:13 +0000 +Subject: * adapt for nicer per file _C*FLAGS per source input name + +Bug-Debian: https://bugs.debian.org/968580 +Origin: upstream, https://svn.exactcode.de/exact-image/trunk@2349 cfa9e8bd-72fe-0310-85ed-f28a7036cb6a +--- + api/Makefile | 2 +- + frontends/Makefile | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/api/Makefile b/api/Makefile +index 243a27a..1240ab1 100644 +--- a/api/Makefile ++++ b/api/Makefile +@@ -9,7 +9,7 @@ CPPFLAGS += $(BARDECODEINCS) + LDFLAGS += $(BARDECODELIBS) + endif + +-objdir/api/api.o_CXXFLAGS := -fpermissive ++$(X_MODULE)/api.cc_CXXFLAGS := -fpermissive + + # we have an own install + _X_BUILD_IMPLICIT := $(_X_BUILD_IMPLICIT) +diff --git a/frontends/Makefile b/frontends/Makefile +index 875be16..3ebea5a 100644 +--- a/frontends/Makefile ++++ b/frontends/Makefile +@@ -15,7 +15,7 @@ DEPS = $(image_BINARY) $(codecs_BINARY) $(bardecode_BINARY) $(X_OUTARCH)/utility + CPPFLAGS += -I utility + #LDFLAGS += -lGL -lGLU -lglut -L/usr/X11/lib64 + +-objdir/frontends/bardecode.o_CXXFLAGS := -fpermissive +-objdir/frontends/econvert.o_CXXFLAGS := -fpermissive ++$(X_MODULE)/bardecode.cc_CXXFLAGS := -fpermissive ++$(X_MODULE)/econvert.cc_CXXFLAGS := -fpermissive + + include build/bottom.make diff -Nru exactimage-1.0.2/debian/patches/added-fpermissive-where-currently-necessary.patch exactimage-1.0.2/debian/patches/added-fpermissive-where-currently-necessary.patch --- exactimage-1.0.2/debian/patches/added-fpermissive-where-currently-necessary.patch 1970-01-01 01:00:00.000000000 +0100 +++ exactimage-1.0.2/debian/patches/added-fpermissive-where-currently-necessary.patch 2021-04-25 07:57:10.000000000 +0200 @@ -0,0 +1,48 @@ +From: rene <rene@cfa9e8bd-72fe-0310-85ed-f28a7036cb6a> +Date: Sun, 29 Sep 2019 19:22:47 +0000 +Subject: * added -fpermissive where currently necessary + +Bug-Debian: https://bugs.debian.org/968580 +Origin: upstream, https://svn.exactcode.de/exact-image/trunk@2348 cfa9e8bd-72fe-0310-85ed-f28a7036cb6a +--- + api/Makefile | 2 ++ + bardecode/Makefile | 2 ++ + frontends/Makefile | 3 +++ + 3 files changed, 7 insertions(+) + +diff --git a/api/Makefile b/api/Makefile +index ba4999b..243a27a 100644 +--- a/api/Makefile ++++ b/api/Makefile +@@ -9,6 +9,8 @@ CPPFLAGS += $(BARDECODEINCS) + LDFLAGS += $(BARDECODELIBS) + endif + ++objdir/api/api.o_CXXFLAGS := -fpermissive ++ + # we have an own install + _X_BUILD_IMPLICIT := $(_X_BUILD_IMPLICIT) + X_BUILD_IMPLICIT := 0 +diff --git a/bardecode/Makefile b/bardecode/Makefile +index b723c0d..5a6a29a 100644 +--- a/bardecode/Makefile ++++ b/bardecode/Makefile +@@ -7,4 +7,6 @@ DEPS = + + CPPFLAGS += -I bardecode + ++objdir/bardecode/CXXFLAGS := -fpermissive ++ + include build/bottom.make +diff --git a/frontends/Makefile b/frontends/Makefile +index 27ca5b1..875be16 100644 +--- a/frontends/Makefile ++++ b/frontends/Makefile +@@ -15,4 +15,7 @@ DEPS = $(image_BINARY) $(codecs_BINARY) $(bardecode_BINARY) $(X_OUTARCH)/utility + CPPFLAGS += -I utility + #LDFLAGS += -lGL -lGLU -lglut -L/usr/X11/lib64 + ++objdir/frontends/bardecode.o_CXXFLAGS := -fpermissive ++objdir/frontends/econvert.o_CXXFLAGS := -fpermissive ++ + include build/bottom.make diff -Nru exactimage-1.0.2/debian/patches/Build-as-C-98-code-to-avoid-errors-when-compiling-as-C-11.patch exactimage-1.0.2/debian/patches/Build-as-C-98-code-to-avoid-errors-when-compiling-as-C-11.patch --- exactimage-1.0.2/debian/patches/Build-as-C-98-code-to-avoid-errors-when-compiling-as-C-11.patch 2019-02-03 17:49:58.000000000 +0100 +++ exactimage-1.0.2/debian/patches/Build-as-C-98-code-to-avoid-errors-when-compiling-as-C-11.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -From: Sven Eckelmann <s...@narfation.org> -Date: Fri, 22 Jan 2016 15:11:29 +0100 -Subject: Build as C++98 code to avoid errors when compiling as C++11 - -Bug-Debian: https://bugs.debian.org/811784 ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 2074c42..5e06cbc 100644 ---- a/Makefile -+++ b/Makefile -@@ -22,7 +22,7 @@ CXXFLAGS += -fPIC - # we have some unimplemented colorspaces in the Image::iterator :-( - CFLAGS += $(call cc-option,-Wno-switch -Wno-switch-enum,) - --CXXFLAGS := $(CFLAGS) -Wno-sign-compare -+CXXFLAGS := $(CFLAGS) -Wno-sign-compare -std=gnu++98 - - ifeq "$(STATIC)" "1" - X_EXEFLAGS += -static diff -Nru exactimage-1.0.2/debian/patches/if-we-can-not-easily-use-the-input-module-name-for-C-FLAS.patch exactimage-1.0.2/debian/patches/if-we-can-not-easily-use-the-input-module-name-for-C-FLAS.patch --- exactimage-1.0.2/debian/patches/if-we-can-not-easily-use-the-input-module-name-for-C-FLAS.patch 1970-01-01 01:00:00.000000000 +0100 +++ exactimage-1.0.2/debian/patches/if-we-can-not-easily-use-the-input-module-name-for-C-FLAS.patch 2021-04-25 07:57:10.000000000 +0200 @@ -0,0 +1,113 @@ +From: rene <rene@cfa9e8bd-72fe-0310-85ed-f28a7036cb6a> +Date: Sun, 29 Sep 2019 20:52:17 +0000 +Subject: * if we can not easily use the input module name for /C*FLASG, + at least create the variable name automatically w/o error prone typing + +Bug-Debian: https://bugs.debian.org/968580 +Origin: upstream, https://svn.exactcode.de/exact-image/trunk@2351 cfa9e8bd-72fe-0310-85ed-f28a7036cb6a +--- + Makefile | 2 +- + api/lua/Makefile | 2 +- + api/perl/Makefile | 2 +- + api/php/Makefile | 2 +- + api/python/Makefile | 2 +- + api/ruby/Makefile | 4 ++-- + bardecode/Makefile | 4 +--- + 7 files changed, 8 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index bb10e95..fa5394e 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + include config.make + +-X_OUTARCH := ./objdir ++X_OUTARCH := objdir + + X_BUILD_IMPLICIT=0 + include utility/Makefile +diff --git a/api/lua/Makefile b/api/lua/Makefile +index f38bb35..fe2640b 100644 +--- a/api/lua/Makefile ++++ b/api/lua/Makefile +@@ -4,7 +4,7 @@ BINARY = ExactImage + BINARY_EXT = $(X_DYNEXT) + DEPS = $(image_BINARY) $(bardecode_BINARY) $(codecs_BINARY) $(api_BINARY) $($(X_MODULE)_OUTPUT)/api-lua-wrap.cc + +-objdir/api/lua/CXXFLAGS := -I api $(LUAINCS) -fno-strict-aliasing ++$($(X_MODULE)_OUTPUT)/CXXFLAGS := -I api $(LUAINCS) -fno-strict-aliasing + + $($(X_MODULE)_OUTPUT)/api-lua-wrap.cc: $(X_MODULE)/../api.hh $(X_MODULE)/../api-swig.hh + $(Q)echo " SWIG $(dir $@)" +diff --git a/api/perl/Makefile b/api/perl/Makefile +index 5408416..8ebd2d3 100644 +--- a/api/perl/Makefile ++++ b/api/perl/Makefile +@@ -4,7 +4,7 @@ BINARY = ExactImage + BINARY_EXT = $(X_DYNEXT) + DEPS = $(image_BINARY) $(bardecode_BINARY) $(codecs_BINARY) $(api_BINARY) $($(X_MODULE)_OUTPUT)/api-perl-wrap.cc + +-objdir/api/perl/CXXFLAGS := -I api $(PERLINCS) ++$($(X_MODULE)_OUTPUT)/CXXFLAGS := -I api $(PERLINCS) + + $($(X_MODULE)_OUTPUT)/api-perl-wrap.cc: $(X_MODULE)/../api.hh $(X_MODULE)/../api-swig.hh + $(Q)echo " SWIG $(dir $@)" +diff --git a/api/php/Makefile b/api/php/Makefile +index 28360d6..89e2670 100644 +--- a/api/php/Makefile ++++ b/api/php/Makefile +@@ -4,7 +4,7 @@ BINARY = ExactImage + BINARY_EXT = $(X_DYNEXT) + DEPS = $(image_BINARY) $(bardecode_BINARY) $(codecs_BINARY) $(api_BINARY) $($(X_MODULE)_OUTPUT)/api-php-wrap.cc + +-objdir/api/php/CXXFLAGS := -I api $(PHPINCS) -fno-strict-aliasing ++$($(X_MODULE)_OUTPUT)/CXXFLAGS := -I api $(PHPINCS) -fno-strict-aliasing + + $($(X_MODULE)_OUTPUT)/api-php-wrap.cc: $(X_MODULE)/../api.hh $(X_MODULE)/../api-swig.hh + $(Q)echo " SWIG $(dir $@)" +diff --git a/api/python/Makefile b/api/python/Makefile +index 0210bd2..32f3538 100644 +--- a/api/python/Makefile ++++ b/api/python/Makefile +@@ -4,7 +4,7 @@ BINARY = _ExactImage + BINARY_EXT = $(X_DYNEXT) + DEPS = $(image_BINARY) $(bardecode_BINARY) $(codecs_BINARY) $(api_BINARY) $($(X_MODULE)_OUTPUT)/api-python-wrap.cc + +-objdir/api/python/CXXFLAGS := -I api $(PYTHONINCS) ++$($(X_MODULE)_OUTPUT)/CXXFLAGS := -I api $(PYTHONINCS) + + $($(X_MODULE)_OUTPUT)/api-python-wrap.cc: $(X_MODULE)/../api.hh $(X_MODULE)/../api-swig.hh + $(Q)echo " SWIG $(dir $@)" +diff --git a/api/ruby/Makefile b/api/ruby/Makefile +index 4575f84..6df7c0a 100644 +--- a/api/ruby/Makefile ++++ b/api/ruby/Makefile +@@ -4,8 +4,8 @@ BINARY = ExactImage + BINARY_EXT = $(X_DYNEXT) + DEPS = $(image_BINARY) $(bardecode_BINARY) $(codecs_BINARY) $(api_BINARY) $($(X_MODULE)_OUTPUT)/api-ruby-wrap.cc + +-objdir/api/ruby/CXXFLAGS := -I api $(RUBYINCS) +-objdir/api/ruby/LDFLAGS := $(RUBYINCS) ++$($(X_MODULE)_OUTPUT)/CXXFLAGS := -I api $(RUBYINCS) ++$($(X_MODULE)_OUTPUT)/LDFLAGS := $(RUBYINCS) + + $($(X_MODULE)_OUTPUT)/api-ruby-wrap.cc: $(X_MODULE)/../api.hh $(X_MODULE)/../api-swig.hh + $(Q)echo " SWIG $(dir $@)" +diff --git a/bardecode/Makefile b/bardecode/Makefile +index 5a6a29a..eb84fc1 100644 +--- a/bardecode/Makefile ++++ b/bardecode/Makefile +@@ -2,11 +2,9 @@ include build/top.make + + BINARY = bardecode + BINARY_EXT = $(X_LIBEXT) +- + DEPS = + + CPPFLAGS += -I bardecode +- +-objdir/bardecode/CXXFLAGS := -fpermissive ++$($(X_MODULE)_OUTPUT)/CXXFLAGS := -fpermissive + + include build/bottom.make diff -Nru exactimage-1.0.2/debian/patches/Install-module-to-perl-vendor-path.patch exactimage-1.0.2/debian/patches/Install-module-to-perl-vendor-path.patch --- exactimage-1.0.2/debian/patches/Install-module-to-perl-vendor-path.patch 2019-02-03 17:49:58.000000000 +0100 +++ exactimage-1.0.2/debian/patches/Install-module-to-perl-vendor-path.patch 2021-04-25 07:57:10.000000000 +0200 @@ -9,7 +9,7 @@ 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/perl/Makefile b/api/perl/Makefile -index 5408416..aa764a6 100644 +index 8ebd2d3..d617d9c 100644 --- a/api/perl/Makefile +++ b/api/perl/Makefile @@ -3,6 +3,7 @@ include build/top.make @@ -18,7 +18,7 @@ DEPS = $(image_BINARY) $(bardecode_BINARY) $(codecs_BINARY) $(api_BINARY) $($(X_MODULE)_OUTPUT)/api-perl-wrap.cc +PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}') - objdir/api/perl/CXXFLAGS := -I api $(PERLINCS) + $($(X_MODULE)_OUTPUT)/CXXFLAGS := -I api $(PERLINCS) @@ -20,5 +21,5 @@ X_BUILD_IMPLICIT := $(_X_BUILD_IMPLICIT) all:: $($(X_MODULE)_BINARY) diff -Nru exactimage-1.0.2/debian/patches/Respect-CFLAGS-from-the-environment.patch exactimage-1.0.2/debian/patches/Respect-CFLAGS-from-the-environment.patch --- exactimage-1.0.2/debian/patches/Respect-CFLAGS-from-the-environment.patch 2019-02-03 17:49:58.000000000 +0100 +++ exactimage-1.0.2/debian/patches/Respect-CFLAGS-from-the-environment.patch 2021-04-25 07:57:10.000000000 +0200 @@ -9,7 +9,7 @@ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/Makefile b/Makefile -index bb10e95..2074c42 100644 +index fa5394e..536dff1 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,6 @@ X_BUILD_IMPLICIT=0 diff -Nru exactimage-1.0.2/debian/patches/series exactimage-1.0.2/debian/patches/series --- exactimage-1.0.2/debian/patches/series 2019-02-03 17:49:58.000000000 +0100 +++ exactimage-1.0.2/debian/patches/series 2021-04-25 07:57:10.000000000 +0200 @@ -1,3 +1,7 @@ +added-fpermissive-where-currently-necessary.patch +adapt-for-nicer-per-file-_C-FLAGS-per-source-input-name.patch +updated-per-file-C-FLAGS-to-likely-final-delimiter.patch +if-we-can-not-easily-use-the-input-module-name-for-C-FLAS.patch Respect-CFLAGS-from-the-environment.patch Use-PIC-version-of-static-AGG-library.patch Disable-dead-code-that-is-causing-compilation-errors.patch @@ -8,7 +12,6 @@ Fix-buffer-overflow-when-decoding-code128-code_set_c.patch Drop-date-to-make-build-reproducible.patch giflib5.patch -Build-as-C-98-code-to-avoid-errors-when-compiling-as-C-11.patch Fix-typo-s-optinally-optionally.patch Don-t-compile-dynamic-shared-objects-as-PIE.patch Fix-CVE-2015-8366-Index-overflow-in-smal_decode_segment.patch diff -Nru exactimage-1.0.2/debian/patches/updated-per-file-C-FLAGS-to-likely-final-delimiter.patch exactimage-1.0.2/debian/patches/updated-per-file-C-FLAGS-to-likely-final-delimiter.patch --- exactimage-1.0.2/debian/patches/updated-per-file-C-FLAGS-to-likely-final-delimiter.patch 1970-01-01 01:00:00.000000000 +0100 +++ exactimage-1.0.2/debian/patches/updated-per-file-C-FLAGS-to-likely-final-delimiter.patch 2021-04-25 07:57:10.000000000 +0200 @@ -0,0 +1,38 @@ +From: rene <rene@cfa9e8bd-72fe-0310-85ed-f28a7036cb6a> +Date: Sun, 29 Sep 2019 20:33:35 +0000 +Subject: * updated per file C*FLAGS to likely final / delimiter + +Bug-Debian: https://bugs.debian.org/968580 +Origin: upstream, https://svn.exactcode.de/exact-image/trunk@2350 cfa9e8bd-72fe-0310-85ed-f28a7036cb6a +--- + api/Makefile | 2 +- + frontends/Makefile | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/api/Makefile b/api/Makefile +index 1240ab1..e37810c 100644 +--- a/api/Makefile ++++ b/api/Makefile +@@ -9,7 +9,7 @@ CPPFLAGS += $(BARDECODEINCS) + LDFLAGS += $(BARDECODELIBS) + endif + +-$(X_MODULE)/api.cc_CXXFLAGS := -fpermissive ++$(X_MODULE)/api.cc/CXXFLAGS := -fpermissive + + # we have an own install + _X_BUILD_IMPLICIT := $(_X_BUILD_IMPLICIT) +diff --git a/frontends/Makefile b/frontends/Makefile +index 3ebea5a..b99d0fe 100644 +--- a/frontends/Makefile ++++ b/frontends/Makefile +@@ -15,7 +15,7 @@ DEPS = $(image_BINARY) $(codecs_BINARY) $(bardecode_BINARY) $(X_OUTARCH)/utility + CPPFLAGS += -I utility + #LDFLAGS += -lGL -lGLU -lglut -L/usr/X11/lib64 + +-$(X_MODULE)/bardecode.cc_CXXFLAGS := -fpermissive +-$(X_MODULE)/econvert.cc_CXXFLAGS := -fpermissive ++$(X_MODULE)/bardecode.cc/CXXFLAGS := -fpermissive ++$(X_MODULE)/econvert.cc/CXXFLAGS := -fpermissive + + include build/bottom.make diff -Nru exactimage-1.0.2/debian/rules exactimage-1.0.2/debian/rules --- exactimage-1.0.2/debian/rules 2019-02-03 17:49:58.000000000 +0100 +++ exactimage-1.0.2/debian/rules 2021-04-25 07:57:10.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS=hardening=+all -export DEB_CFLAGS_MAINT_APPEND=-fopenmp -ffunction-sections -fdata-sections +export DEB_CFLAGS_MAINT_APPEND=-fopenmp -ffunction-sections -fdata-sections -fpermissive export DEB_CPPFLAGS_MAINT_APPEND = -D_FILE_OFFSET_BITS=64 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,--gc-sections PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
signature.asc
Description: This is a digitally signed message part.
