Pass on CPPFLAGS and LDFLAGS as well at build time. Add and refreshed in d/patches...

diff --git a/debian/changelog b/debian/changelog
index 100a69e499d7dba4180017b4d2a0c56f9f7e3693..d369ecdef6b4d80a8517e149a9908ea9cfbd2217 100644 (file)
--- 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 <hoexter@debian.org>  Fri, 13 Sep 2019 16:52:23 +0200
+

 jattach (1.5-1) unstable; urgency=medium
 
   * Initial release (Closes: #939577)
 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 a5b351f40b6cc2fcf0739d163cfd6c9d9431e519..fb07492be992757385260c26bd470aa2415920ec 100644 (file)
--- 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 <hoexter@debian.org>
 
  exported by dh.
 Author: Sven Hoexter <hoexter@debian.org>
 

---- 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
 @@ -16,7 +16,6 @@ else
      SOURCES=$(RPM_ROOT)/SOURCES
      SPEC_FILE=jattach.spec


@@ -13,3 +15,12 @@ Author: Sven Hoexter <hoexter@debian.org>
      JATTACH_EXE=jattach
    endif
  endif
      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