r45341 - in /packages/opencv/tags/2.3.1-12/debian: changelog rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Tue Aug 28 02:14:17 2012
New Revision: 45341

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45341
Log:
Rewrite hardening support

Modified:
    packages/opencv/tags/2.3.1-12/debian/changelog
    packages/opencv/tags/2.3.1-12/debian/rules

Modified: packages/opencv/tags/2.3.1-12/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/changelog?rev=45341&op=diff
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/changelog (original)
+++ packages/opencv/tags/2.3.1-12/debian/changelog Tue Aug 28 02:14:17 2012
@@ -4,6 +4,8 @@
     - Add patches/switch_multiarch.patch.
     - Update *.install files.
     - Add Pre-Depends to multiarch support packages.
+  * Rewrite hardening support.
+    Fix CPPFLAGS and LDFLAGS missing.
 
  -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 09 Aug 2012 09:41:39 +0900
 

Modified: packages/opencv/tags/2.3.1-12/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-12/debian/rules?rev=45341&op=diff
==============================================================================
--- packages/opencv/tags/2.3.1-12/debian/rules (original)
+++ packages/opencv/tags/2.3.1-12/debian/rules Tue Aug 28 02:14:17 2012
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 
-CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+# http://bugs.debian.org/653916
+CFLAGS   += $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS)
+
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+LDFLAGS  += -Wl,--as-needed
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-# These don't need to be exported and if they are we'll get the flags
-# duplicated in the command line.
-unexport CFLAGS
-unexport CXXFLAGS
-unexport LDFLAGS
 
 # SSE options
 ifeq ($(DEB_HOST_ARCH),amd64)