[rkward-cvs] SF.net SVN: rkward:[4406] trunk/rkward/debian

[tfry at users.sourceforge.net]

Revision: 4406
          http://rkward.svn.sourceforge.net/rkward/?rev=4406&view=rev
Author:   tfry
Date:     2012-11-02 10:08:57 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
Explicitly append CPPLAGS, as cmake will ignore them.

Modified Paths:
--------------
    trunk/rkward/debian/changelog
    trunk/rkward/debian/rules

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2012-10-31 14:28:27 UTC (rev 4405)
+++ trunk/rkward/debian/changelog	2012-11-02 10:08:57 UTC (rev 4406)
@@ -1,7 +1,8 @@
 rkward (0.6.0z+0.6.1-0devel1) unstable; urgency=low
 
   * new upstream release
-
+  * make sure to include CPPFLAGS and LDFLAGS in call to cmake
+  
  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Wed, 24 Oct 2012 15:35:00 +0200
 
 rkward (0.6.0-1) unstable; urgency=low

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2012-10-31 14:28:27 UTC (rev 4405)
+++ trunk/rkward/debian/rules	2012-11-02 10:08:57 UTC (rev 4406)
@@ -10,6 +10,12 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
+CFLAGS += -Wall
+
+# Workaround for cmake not handling CPPFLAGS (https://wiki.debian.org/HardeningWalkthrough):
+CFLAGS += $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS)
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -20,8 +26,6 @@
 RMAJOR = $(shell echo $(RVERS) | awk -F. '{print $$1}')
 RMINOR = $(shell echo $(RVERS) | awk -F. '{print $$2}')
 
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -51,6 +55,9 @@
 		-DKDE4_USE_ALWAYS_FULL_RPATH=false \
 		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
 		-DCMAKE_C_FLAGS="$(CFLAGS)" \
+		-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
+		-DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS)" \
+		-DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS)" \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DKDE4_DISABLE_MULTIMEDIA=ON \
 		-DR_EXECUTABLE=/usr/bin/R/ \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.