[Pkg-osm-commits] [SCM] monav branch, master, updated. debian/0.3-3-1-g8c4940e

[David Paleino]

The following commit has been merged in the master branch:
commit 8c4940ec8153ab100e1210c41193f5d2796d0bdc
Author: David Paleino <dapal at debian.org>
Date:   Sat May 14 16:04:09 2011 +0200

    Drop -march=native from the compilation (Closes: #626671)

diff --git a/debian/changelog b/debian/changelog
index 8b36a01..45b7514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monav (0.3-4) UNRELEASED; urgency=low
+
+  * Drop -march=native from the compilation (Closes: #626671)
+
+ -- David Paleino <dapal at debian.org>  Sat, 14 May 2011 16:03:46 +0200
+
 monav (0.3-3) unstable; urgency=low
 
   * Compile in release mode, just add debugging symbols in the process
diff --git a/debian/patches/05-drop_marchnative.patch b/debian/patches/05-drop_marchnative.patch
new file mode 100644
index 0000000..7d8bbb3
--- /dev/null
+++ b/debian/patches/05-drop_marchnative.patch
@@ -0,0 +1,144 @@
+From: David Paleino <dapal at debian.org>
+Subject: drop -march=native, since it's not supported everywhere in Debianù
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626671
+Origin: vendor
+Forwarded: not-needed
+
+---
+ plugins/contractionhierarchies/contractionhierarchies.pro |    1 -
+ plugins/gpsgrid/gpsgrid.pro                               |    1 -
+ plugins/osmimporter/osmimporter.pro                       |    2 +-
+ plugins/osmrenderer/mapnikrenderer.pro                    |    1 -
+ plugins/osmrenderer/osmrenderer.pro                       |    1 -
+ plugins/osmrenderer/qtilerenderer.pro                     |    1 -
+ plugins/testimporter/testimporter.pro                     |    2 +-
+ plugins/unicodetournamenttrie/unicodetournamenttrie.pro   |    2 +-
+ preprocessor/preprocessor-gui.pro                         |    1 -
+ preprocessor/preprocessor.pro                             |    1 -
+ routingdaemon/daemontest.pro                              |    1 -
+ routingdaemon/routingdaemon.pro                           |    1 -
+ 12 files changed, 3 insertions(+), 12 deletions(-)
+
+--- monav.orig/plugins/contractionhierarchies/contractionhierarchies.pro
++++ monav/plugins/contractionhierarchies/contractionhierarchies.pro
+@@ -7,7 +7,6 @@ DESTDIR = ../../bin/plugins_preprocessor
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function \
+ 		 -fopenmp
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function \
+--- monav.orig/plugins/gpsgrid/gpsgrid.pro
++++ monav/plugins/gpsgrid/gpsgrid.pro
+@@ -28,7 +28,6 @@ HEADERS += ../../interfaces/ipreprocesso
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function
+ }
+--- monav.orig/plugins/osmimporter/osmimporter.pro
++++ monav/plugins/osmimporter/osmimporter.pro
+@@ -31,7 +31,7 @@ SOURCES += osmimporter.cpp \
+ DESTDIR = ../../bin/plugins_preprocessor
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+-	QMAKE_CXXFLAGS_RELEASE += -O3 -march=native -Wno-unused-function
++	QMAKE_CXXFLAGS_RELEASE += -O3 -Wno-unused-function
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function
+ }
+ 
+--- monav.orig/plugins/osmrenderer/mapnikrenderer.pro
++++ monav/plugins/osmrenderer/mapnikrenderer.pro
+@@ -16,7 +16,6 @@ DESTDIR = ../../bin/plugins_preprocessor
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function \
+ 		 -fopenmp
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function \
+--- monav.orig/plugins/osmrenderer/osmrenderer.pro
++++ monav/plugins/osmrenderer/osmrenderer.pro
+@@ -13,7 +13,6 @@ DESTDIR = ../../bin/plugins_preprocessor
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function
+ }
+--- monav.orig/plugins/osmrenderer/qtilerenderer.pro
++++ monav/plugins/osmrenderer/qtilerenderer.pro
+@@ -21,7 +21,6 @@ DESTDIR = ../../bin/plugins_preprocessor
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function
+ }
+--- monav.orig/plugins/testimporter/testimporter.pro
++++ monav/plugins/testimporter/testimporter.pro
+@@ -10,7 +10,7 @@ SOURCES += \
+ DESTDIR = ../../bin/plugins_preprocessor
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+-	QMAKE_CXXFLAGS_RELEASE += -O3 -march=native -Wno-unused-function
++	QMAKE_CXXFLAGS_RELEASE += -O3 -Wno-unused-function
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function
+ }
+ 
+--- monav.orig/plugins/unicodetournamenttrie/unicodetournamenttrie.pro
++++ monav/plugins/unicodetournamenttrie/unicodetournamenttrie.pro
+@@ -26,7 +26,7 @@ HEADERS += unicodetournamenttrie.h \
+ 
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+-	QMAKE_CXXFLAGS_RELEASE += -O3 -march=native -Wno-unused-function
++	QMAKE_CXXFLAGS_RELEASE += -O3 -Wno-unused-function
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function
+ }
+ 
+--- monav.orig/preprocessor/preprocessor-gui.pro
++++ monav/preprocessor/preprocessor-gui.pro
+@@ -45,7 +45,6 @@ FORMS += preprocessingwindow.ui \
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function \
+ 		 -fopenmp
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function \
+--- monav.orig/preprocessor/preprocessor.pro
++++ monav/preprocessor/preprocessor.pro
+@@ -39,7 +39,6 @@ TARGET = monav-preprocessor
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function \
+ 		 -fopenmp
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function \
+--- monav.orig/routingdaemon/daemontest.pro
++++ monav/routingdaemon/daemontest.pro
+@@ -9,7 +9,6 @@ QT +=network
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function
+ }
+--- monav.orig/routingdaemon/routingdaemon.pro
++++ monav/routingdaemon/routingdaemon.pro
+@@ -12,7 +12,6 @@ QT +=network
+ unix {
+ 	QMAKE_CXXFLAGS_RELEASE -= -O2
+ 	QMAKE_CXXFLAGS_RELEASE += -O3 \
+-		 -march=native \
+ 		 -Wno-unused-function
+ 	QMAKE_CXXFLAGS_DEBUG += -Wno-unused-function
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 15cf0e3..e3db94b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 02-toll-booth_routing.patch
 03-dont_embed_resources.patch
 04-fix_typos.patch
+05-drop_marchnative.patch

-- 
fast navigation system featuring exact routing