diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/rules | 24 |
2 files changed, 25 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 65d0d7019..8fbd569af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +weechat (0.3.6-2) unstable; urgency=low + + * Update debian/rules to use build flags from dpkg-buildflags when it's + possible (ie: with dpkg >= 1.16.1). + + -- Emmanuel Bouthenot <kolter@debian.org> Sat, 29 Oct 2011 07:31:14 +0000 + weechat (0.3.6-1) unstable; urgency=low * New upstream release diff --git a/debian/rules b/debian/rules index 17e24cc89..ea5f22c9c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,33 @@ #!/usr/bin/make -f +# Default build flags +CFLAGS = -g -O2 +LDFLAGS = -Wl,-Bsymbolic-functions + +# dpkg >= 1.16.1 provides enhanced build flags (hardening features, etc.) +DPKG_EXPORT_BUILDFLAGS = 1 +-include /usr/share/dpkg/buildflags.mk + builddir/Makefile: mkdir -p builddir cd builddir && \ cmake .. \ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ - -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-O2 -g $(CFLAGS)" \ - -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="-Wl,-z,defs" \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS)" \ + -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -build: build-stamp -build-stamp: builddir/Makefile - dh_testdir +#build: build-stamp +#build-stamp: builddir/Makefile +# dh_testdir +# $(MAKE) -C builddir VERBOSE=1 +# touch $@ + +override_dh_auto_build: builddir/Makefile $(MAKE) -C builddir - touch $@ + dh_auto_build override_dh_auto_configure: # the package also has autotools buildsys and |