r45155 - /packages/opencv/tags/2.3.1-10/debian/rules

iwamatsu at users.alioth.debian.org iwamatsu at users.alioth.debian.org
Thu Jun 28 03:57:05 UTC 2012


Author: iwamatsu
Date: Thu Jun 28 03:57:05 2012
New Revision: 45155

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45155
Log:
Remove unnecessary option of build config.

Modified:
    packages/opencv/tags/2.3.1-10/debian/rules

Modified: packages/opencv/tags/2.3.1-10/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/tags/2.3.1-10/debian/rules?rev=45155&op=diff
==============================================================================
--- packages/opencv/tags/2.3.1-10/debian/rules (original)
+++ packages/opencv/tags/2.3.1-10/debian/rules Thu Jun 28 03:57:05 2012
@@ -4,7 +4,6 @@
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_HOST_CPU)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # These don't need to be exported and if they are we'll get the flags
@@ -14,7 +13,7 @@
 unexport LDFLAGS
 
 # SSE options
-ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+ifeq ($(DEB_HOST_ARCH),amd64)
 CMAKE_ARCH_FLAGS = -DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSSE3=OFF 
 else
 CMAKE_ARCH_FLAGS = -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_SSSE3=OFF 
@@ -58,7 +57,7 @@
 	-DCMAKE_SKIP_RPATH=ON
 
 %:
-	dh $@ --with quilt --buildsystem=cmake
+	dh $@ --buildsystem=cmake
 
 override_dh_clean:
 	rm -rf modules/python/src2/hdr_parser.pyc




More information about the debian-science-commits mailing list