Attached patch drops all uses of -march=native from monav source
package. Build tested under Ubuntu/armel.
diff -Nru monav-0.3/debian/changelog monav-0.3/debian/changelog
--- monav-0.3/debian/changelog	2011-06-11 19:19:27.000000000 +0200
+++ monav-0.3/debian/changelog	2011-06-15 14:49:50.000000000 +0200
@@ -1,3 +1,9 @@
+monav (0.3-3build2) oneiric; urgency=low
+
+  * Drop -march=native as this is not available on !x86 architectures.
+
+ -- Marcin Juszkiewicz <marcin.juszkiew...@linaro.org>  Wed, 15 Jun 2011 14:49:22 +0200
+
 monav (0.3-3build1) oneiric; urgency=low
 
   * No change rebuild for protobuf transition.
diff -Nru monav-0.3/debian/patches/05-drop-march-native.patch monav-0.3/debian/patches/05-drop-march-native.patch
--- monav-0.3/debian/patches/05-drop-march-native.patch	1970-01-01 01:00:00.000000000 +0100
+++ monav-0.3/debian/patches/05-drop-march-native.patch	2011-06-15 16:15:42.000000000 +0200
@@ -0,0 +1,131 @@
+Description: Drop -march=native as this is not available on !x86 architectures
+Author: Marcin Juszkiewicz <marcin.juszkiew...@linaro.org>
+Origin: other
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626671
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/monav/+bug/791312
+Forwarded: no
+Last-Update: 2011-06-15
+
+--- monav-0.3.orig/plugins/gpsgrid/gpsgrid.pro
++++ monav-0.3/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-0.3.orig/plugins/testimporter/testimporter.pro
++++ monav-0.3/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-0.3.orig/plugins/contractionhierarchies/contractionhierarchies.pro
++++ monav-0.3/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-0.3.orig/plugins/osmrenderer/qtilerenderer.pro
++++ monav-0.3/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-0.3.orig/plugins/osmrenderer/mapnikrenderer.pro
++++ monav-0.3/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-0.3.orig/plugins/osmrenderer/osmrenderer.pro
++++ monav-0.3/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-0.3.orig/plugins/unicodetournamenttrie/unicodetournamenttrie.pro
++++ monav-0.3/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-0.3.orig/plugins/osmimporter/osmimporter.pro
++++ monav-0.3/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-0.3.orig/preprocessor/preprocessor-gui.pro
++++ monav-0.3/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-0.3.orig/preprocessor/preprocessor.pro
++++ monav-0.3/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-0.3.orig/routingdaemon/daemontest.pro
++++ monav-0.3/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-0.3.orig/routingdaemon/routingdaemon.pro
++++ monav-0.3/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 -Nru monav-0.3/debian/patches/series monav-0.3/debian/patches/series
--- monav-0.3/debian/patches/series	2011-04-26 12:36:08.000000000 +0200
+++ monav-0.3/debian/patches/series	2011-06-15 16:07:51.000000000 +0200
@@ -1,3 +1,4 @@
 02-toll-booth_routing.patch
 03-dont_embed_resources.patch
 04-fix_typos.patch
+05-drop-march-native.patch
_______________________________________________
Pkg-osm-maint mailing list
Pkg-osm-maint@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-maint

Reply via email to