[SCM] Eigen3 packaging. branch, master, updated. upstream/3.0.2-43-gcc48802

Anton Gladky gladky.anton at gmail.com
Fri Oct 7 16:58:31 UTC 2011


The following commit has been merged in the master branch:
commit ac77708dc664581defc1f7bc66365daa2775f413
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Oct 7 18:57:19 2011 +0200

    Fix pkgconfig path. Did not work in clean environment.

diff --git a/debian/patches/fix-pkgconfig-path.patch b/debian/patches/fix-pkgconfig-path.patch
new file mode 100644
index 0000000..c0742ce
--- /dev/null
+++ b/debian/patches/fix-pkgconfig-path.patch
@@ -0,0 +1,23 @@
+Description: revert install path for pkgconfig, like it was in 3.0.2 (unreliable on Debian)
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-10-07
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -279,15 +279,9 @@
+   )
+ 
+ if(EIGEN_BUILD_PKGCONFIG)
+-    SET(path_separator ":")
+-    STRING(REPLACE ${path_separator} ";" pkg_config_libdir_search "$ENV{PKG_CONFIG_LIBDIR}")
+-    message(STATUS "searching for 'pkgconfig' directory in PKG_CONFIG_LIBDIR ( $ENV{PKG_CONFIG_LIBDIR} ), ${CMAKE_INSTALL_PREFIX}/share, and ${CMAKE_INSTALL_PREFIX}/lib")
+-    FIND_PATH(pkg_config_libdir pkgconfig ${pkg_config_libdir_search} ${CMAKE_INSTALL_PREFIX}/share ${CMAKE_INSTALL_PREFIX}/lib ${pkg_config_libdir_search})
+-    message(STATUS "found ${pkg_config_libdir}/pkgconfig" )
+-
+     configure_file(eigen3.pc.in eigen3.pc)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
+-        DESTINATION ${pkg_config_libdir}/pkgconfig
++        DESTINATION share/pkgconfig
+         )
+ endif(EIGEN_BUILD_PKGCONFIG)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7326a0a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-pkgconfig-path.patch

-- 
Eigen3 packaging. 



More information about the debian-science-commits mailing list