[pcl] Disabled march=native flag in PCLConfig.cmake
rmattes
rmattes at fedoraproject.org
Tue Sep 25 04:09:28 UTC 2012
commit a41499cc263eadc806803b3c67cd2811525e7bc0
Author: Rich Mattes <richmattes at gmail.com>
Date: Mon Sep 24 22:24:54 2012 -0400
Disabled march=native flag in PCLConfig.cmake
PCL-1.4.0-Source-fedora.patch | 47 +++++++++++++++++++++++++++--------------
pcl.spec | 9 +++++--
2 files changed, 37 insertions(+), 19 deletions(-)
---
diff --git a/PCL-1.4.0-Source-fedora.patch b/PCL-1.4.0-Source-fedora.patch
index e59cd5f..1155e9e 100644
--- a/PCL-1.4.0-Source-fedora.patch
+++ b/PCL-1.4.0-Source-fedora.patch
@@ -1,6 +1,6 @@
-diff -urN PCL-1.3.1-Source/cmake/pcl_targets.cmake PCL-1.3.1-Source.fedora/cmake/pcl_targets.cmake
---- PCL-1.3.1-Source/cmake/pcl_targets.cmake 2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source.fedora/cmake/pcl_targets.cmake 2012-01-16 19:40:43.433690172 +0100
+diff -up ./PCL-1.6.0-Source/cmake/pcl_targets.cmake.fedora ./PCL-1.6.0-Source/cmake/pcl_targets.cmake
+--- ./PCL-1.6.0-Source/cmake/pcl_targets.cmake.fedora 2012-07-17 19:11:32.000000000 -0400
++++ ./PCL-1.6.0-Source/cmake/pcl_targets.cmake 2012-09-24 21:53:34.066924229 -0400
@@ -1,5 +1,7 @@
include(${PROJECT_SOURCE_DIR}/cmake/pcl_utils.cmake)
@@ -9,7 +9,7 @@ diff -urN PCL-1.3.1-Source/cmake/pcl_targets.cmake PCL-1.3.1-Source.fedora/cmake
###############################################################################
# Add an option to build a subsystem or not.
# _var The name of the variable to store the option in.
-@@ -334,14 +336,14 @@
+@@ -412,14 +414,14 @@ macro(PCL_MAKE_PKGCONFIG _name _componen
LIST_TO_STRING(_ext_deps_str "${_ext_deps}")
set(PKG_EXTERNAL_DEPS ${_ext_deps_str})
foreach(_dep ${_pcl_deps})
@@ -26,10 +26,10 @@ diff -urN PCL-1.3.1-Source/cmake/pcl_targets.cmake PCL-1.3.1-Source.fedora/cmake
configure_file(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake.in ${_pc_file}
@ONLY)
install(FILES ${_pc_file} DESTINATION ${PKGCFG_INSTALL_DIR}
-diff -urN PCL-1.3.1-Source/io/CMakeLists.txt PCL-1.3.1-Source.fedora/io/CMakeLists.txt
---- PCL-1.3.1-Source/io/CMakeLists.txt 2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source.fedora/io/CMakeLists.txt 2012-01-16 19:40:43.436690163 +0100
-@@ -116,9 +116,10 @@
+diff -up ./PCL-1.6.0-Source/io/CMakeLists.txt.fedora ./PCL-1.6.0-Source/io/CMakeLists.txt
+--- ./PCL-1.6.0-Source/io/CMakeLists.txt.fedora 2012-07-17 19:11:32.000000000 -0400
++++ ./PCL-1.6.0-Source/io/CMakeLists.txt 2012-09-24 21:53:34.066924229 -0400
+@@ -139,9 +139,10 @@ if(build)
endif(OPENNI_FOUND)
set(EXT_DEPS eigen3)
@@ -43,10 +43,10 @@ diff -urN PCL-1.3.1-Source/io/CMakeLists.txt PCL-1.3.1-Source.fedora/io/CMakeLis
PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
"${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
-diff -urN PCL-1.3.1-Source/PCLConfig.cmake.in PCL-1.3.1-Source.fedora/PCLConfig.cmake.in
---- PCL-1.3.1-Source/PCLConfig.cmake.in 2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source.fedora/PCLConfig.cmake.in 2012-01-16 19:47:07.404643739 +0100
-@@ -304,9 +304,13 @@
+diff -up ./PCL-1.6.0-Source/PCLConfig.cmake.in.fedora ./PCL-1.6.0-Source/PCLConfig.cmake.in
+--- ./PCL-1.6.0-Source/PCLConfig.cmake.in.fedora 2012-07-17 19:11:32.000000000 -0400
++++ ./PCL-1.6.0-Source/PCLConfig.cmake.in 2012-09-24 21:53:58.239832655 -0400
+@@ -392,9 +392,13 @@ if(WIN32)
# PCLConfig.cmake is installed to PCL_ROOT/cmake
get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
else(WIN32)
@@ -61,13 +61,28 @@ diff -urN PCL-1.3.1-Source/PCLConfig.cmake.in PCL-1.3.1-Source.fedora/PCLConfig.
endif(WIN32)
# check whether PCLConfig.cmake is found into a PCL installation or in a build tree
-diff -urN PCL-1.3.1-Source/visualization/CMakeLists.txt PCL-1.3.1-Source.fedora/visualization/CMakeLists.txt
---- PCL-1.3.1-Source/visualization/CMakeLists.txt 2011-12-03 00:35:48.000000000 +0100
-+++ PCL-1.3.1-Source.fedora/visualization/CMakeLists.txt 2012-01-16 19:40:43.437690160 +0100
-@@ -85,3 +85,3 @@
+@@ -558,7 +562,7 @@ if(NOT "${PCL_LIBRARY_DIRS}" STREQUAL ""
+ endif(NOT "${PCL_LIBRARY_DIRS}" STREQUAL "")
+
+ # We need to export march=native for tutorials or user code
+-list (APPEND PCL_DEFINITIONS "@SSE_FLAGS@")
++#list (APPEND PCL_DEFINITIONS "@SSE_FLAGS@")
+
+ if(NOT "${PCL_DEFINITIONS}" STREQUAL "")
+ list(REMOVE_DUPLICATES PCL_DEFINITIONS)
+diff -up ./PCL-1.6.0-Source/visualization/CMakeLists.txt.fedora ./PCL-1.6.0-Source/visualization/CMakeLists.txt
+--- ./PCL-1.6.0-Source/visualization/CMakeLists.txt.fedora 2012-07-17 19:11:32.000000000 -0400
++++ ./PCL-1.6.0-Source/visualization/CMakeLists.txt 2012-09-24 21:53:34.067924266 -0400
+@@ -99,9 +99,9 @@ if(build)
+ endif()
+
+ set(EXT_DEPS "")
- if(OPENNI_FOUND)
- list(APPEND EXT_DEPS openni-dev)
- endif(OPENNI_FOUND)
+ #if(OPENNI_FOUND)
+ # list(APPEND EXT_DEPS openni-dev)
+ #endif(OPENNI_FOUND)
+ PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
+ "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
+
diff --git a/pcl.spec b/pcl.spec
index 848071d..c555569 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -1,6 +1,6 @@
Name: pcl
Version: 1.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for point cloud processing
Group: System Environment/Libraries
@@ -73,8 +73,7 @@ Library.
%prep
%setup -q -n PCL-%{version}-Source
-%patch0 -p1
-#%patch1 -p0
+%patch0 -p2 -b .fedora
# Just to make it obvious we're not using any of these
rm -rf 3rdparty
@@ -94,6 +93,7 @@ pushd build
# Don't use mflags, we're hitting out of memory errors on the koji builders
make
+make -j 2
#%{?_smp_mflags}
make doc
popd
@@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 25 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-2
+- Disabled march=native flag in PCLConfig.cmake
+
* Mon Aug 06 2012 Rich Mattes <richmattes at gmail.com> - 1.6.0-1
- Update to release 1.6.0
More information about the scm-commits
mailing list