Étienne Mollier pushed to branch master at Debian Med / e-mem
Commits: 5ee68e9e by Helmut Grohne at 2020-12-09T18:08:26+01:00 inlined patch from Helmut Grohne This fixes failure to cross build from source, as documented in Bug#976876. - - - - - c0b3dc52 by Étienne Mollier at 2020-12-09T18:11:03+01:00 add cppflags.patch - - - - - c3e95772 by Étienne Mollier at 2020-12-09T18:14:12+01:00 reviewed remove_unused_mpopcnt_option.patch The patch is for Debian policy, so marked the forwarding not needed. - - - - - 0e5c6384 by Étienne Mollier at 2020-12-09T18:15:13+01:00 hardening.patch part of the MR - - - - - 580a6fb0 by Étienne Mollier at 2020-12-09T18:25:28+01:00 add myself to uploaders - - - - - 57c7075d by Étienne Mollier at 2020-12-09T18:27:59+01:00 routine-update: Ready to upload to unstable - - - - - 7 changed files: - debian/changelog - debian/control - + debian/patches/cppflags.patch - + debian/patches/cross.patch - debian/patches/hardening.patch - debian/patches/remove_unused_mpopcnt_option.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +e-mem (1.0.1-4) unstable; urgency=medium + + [ Helmut Grohne ] + * add cross.patch, fix FTCBFS. (Closes: #976876) + + [ Étienne Mollier ] + * add cppflags.patch, fix blhc warnings. + * mark remove_unused_mpopcnt_option.patch forwarding not needed. + * add myself to uploaders. + + -- Étienne Mollier <[email protected]> Wed, 09 Dec 2020 18:27:36 +0100 + e-mem (1.0.1-3) unstable; urgency=medium * Standards-Version: 4.5.1 (routine-update) ===================================== debian/control ===================================== @@ -1,6 +1,7 @@ Source: e-mem Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Andreas Tille <[email protected]> +Uploaders: Andreas Tille <[email protected]>, + Étienne Mollier <[email protected]> Section: science Priority: optional Build-Depends: debhelper-compat (= 13), ===================================== debian/patches/cppflags.patch ===================================== @@ -0,0 +1,17 @@ +Description: add CPPFLAGS to fix blhc warnings +Author: Étienne Mollier <[email protected]> +Forwarded: https://github.com/lucian-ilie/E-MEM/pull/3 +Last-Update: 2020-12-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- e-mem.orig/Makefile ++++ e-mem/Makefile +@@ -36,7 +36,7 @@ + + bin: + @echo :: Compiling \"$(NAME)\" \($(CPUARCH)\) ... +- $(CXX) $(CXXFLAGS) $(CSRCS) $(CLIBS) -o $(BIN_DIR)/$(EXEC) $(LDFLAGS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CSRCS) $(CLIBS) -o $(BIN_DIR)/$(EXEC) $(LDFLAGS) + chmod 755 $(BIN_DIR)/$(EXEC) + @echo :: Done + ===================================== debian/patches/cross.patch ===================================== @@ -0,0 +1,50 @@ +Description: e-mem FTCBFS: unusual compiler variable naming + e-mem fails to cross build from source, because it uses the variable CC + to store a C++ compiler. During a cross build, dh_auto_build overrides + it with a C compiler, which fails linking e-mem. Please use standard + variables (CXX/CXXFLAGS) to make e-mem cross buildable out of the box. +Author: Helmut Grohne <[email protected]> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976876 +Forwarded: https://github.com/lucian-ilie/E-MEM/pull/3 +Reviewed-by: Étienne Mollier <[email protected]> +Last-Update: 2020-12-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- e-mem-1.0.1.orig/Makefile ++++ e-mem-1.0.1/Makefile +@@ -2,9 +2,9 @@ + BIN_DIR := $(CURDIR) + endif + +-CC = g++ ++CXX = g++ + EXEC = e-mem +-CFLAGS += -Wall -Wextra -Wunused -std=gnu++0x -fopenmp ++CXXFLAGS += -Wall -Wextra -Wunused -std=gnu++0x -fopenmp + CDEBUG = -g -ggdb -gdwarf-3 -DDEBUG + CPROF = -g -ggdb -gdwarf-3 -DDEBUG -pg + COPTIMIZE = -Wuninitialized -O3 -fomit-frame-pointer +@@ -19,11 +19,11 @@ + CPUARCH := $(shell uname -m) + + ifeq ($(MAKECMDGOALS),debug) +- CFLAGS += $(CDEBUG) ++ CXXFLAGS += $(CDEBUG) + else ifeq ($(MAKECMDGOALS),profile) +- CFLAGS += $(CPROF) ++ CXXFLAGS += $(CPROF) + else +- CFLAGS += $(COPTIMIZE) ++ CXXFLAGS += $(COPTIMIZE) + endif + + .PHONY: all clean pack bin +@@ -36,7 +36,7 @@ + + bin: + @echo :: Compiling \"$(NAME)\" \($(CPUARCH)\) ... +- $(CC) $(CFLAGS) $(CSRCS) $(CLIBS) -o $(BIN_DIR)/$(EXEC) $(LDFLAGS) ++ $(CXX) $(CXXFLAGS) $(CSRCS) $(CLIBS) -o $(BIN_DIR)/$(EXEC) $(LDFLAGS) + chmod 755 $(BIN_DIR)/$(EXEC) + @echo :: Done + ===================================== debian/patches/hardening.patch ===================================== @@ -1,7 +1,8 @@ Author: Andreas Tille <[email protected]> Last-Update: Wed, 03 May 2017 09:14:34 +0200 Description: Propagate hardening options - +Forwarded: https://github.com/lucian-ilie/E-MEM/pull/3 +Reviewed-By: Étienne Mollier <[email protected]> --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ endif ===================================== debian/patches/remove_unused_mpopcnt_option.patch ===================================== @@ -9,7 +9,8 @@ Description: Software in Debian is supposed to run on the baseline of the . Disassembling the binary in unstable reveals that gcc did not em any popcnt instructions on amd64. - +Forwarded: not-needed +Reviewed-By: Étienne Mollier <[email protected]> --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ endif ===================================== debian/patches/series ===================================== @@ -1,3 +1,5 @@ fix_test_script.patch hardening.patch remove_unused_mpopcnt_option.patch +cross.patch +cppflags.patch View it on GitLab: https://salsa.debian.org/med-team/e-mem/-/compare/a8ca916d16f27109b5976101f15d2db1d03ca4fd...57c7075ddea597861efd6ade10a30da89098af24 -- View it on GitLab: https://salsa.debian.org/med-team/e-mem/-/compare/a8ca916d16f27109b5976101f15d2db1d03ca4fd...57c7075ddea597861efd6ade10a30da89098af24 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
