From: Sven Höxter Date: Fri, 13 Sep 2019 14:52:53 +0000 (+0200) Subject: Pass on CPPFLAGS and LDFLAGS as well at build time. Add and refreshed in d/patches... X-Git-Tag: debian/1.5-2~3 X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fjattach.git;a=commitdiff_plain;h=5bb382184c752ce4e19664654562f48a5c473b97 Pass on CPPFLAGS and LDFLAGS as well at build time. Add and refreshed in d/patches/do-not-override-CFLAGS --- diff --git a/debian/changelog b/debian/changelog index 100a69e..d369ecd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jattach (1.5-2) UNRELEASED; urgency=medium + + * Pass on CPPFLAGS and LDFLAGS as well at build time. + Add and refreshed in d/patches/do-not-override-CFLAGS + + -- Sven Hoexter Fri, 13 Sep 2019 16:52:23 +0200 + jattach (1.5-1) unstable; urgency=medium * Initial release (Closes: #939577) diff --git a/debian/patches/do-not-override-CFLAGS b/debian/patches/do-not-override-CFLAGS index a5b351f..fb07492 100644 --- a/debian/patches/do-not-override-CFLAGS +++ b/debian/patches/do-not-override-CFLAGS @@ -3,8 +3,10 @@ Description: do not override CFLAGS exported by dh. Author: Sven Hoexter ---- jattach-1.5.orig/Makefile -+++ jattach-1.5/Makefile +Index: jattach/Makefile +=================================================================== +--- jattach.orig/Makefile ++++ jattach/Makefile @@ -16,7 +16,6 @@ else SOURCES=$(RPM_ROOT)/SOURCES SPEC_FILE=jattach.spec @@ -13,3 +15,12 @@ Author: Sven Hoexter JATTACH_EXE=jattach endif endif +@@ -27,7 +26,7 @@ build: + mkdir -p build + + build/jattach: src/jattach_posix.c +- $(CC) $(CFLAGS) -DJATTACH_VERSION=\"$(JATTACH_VERSION)\" -o $@ $^ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DJATTACH_VERSION=\"$(JATTACH_VERSION)\" -o $@ $^ + + build/jattach.exe: src/jattach_windows.c + $(CL) $(CFLAGS) /DJATTACH_VERSION=\"$(JATTACH_VERSION)\" /Fobuild/jattach.obj /Fe$@ $^ advapi32.lib /link /SUBSYSTEM:CONSOLE,5.02