[osrm] 02/05: Disable osrm-components build, fails to build with GDAL 2.0.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osrm.

commit 39334890dd1d2a40a294154d604ee7a40e986c0a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 7 03:31:25 2016 +0100

    Disable osrm-components build, fails to build with GDAL 2.0.
---
 debian/changelog                             |  1 +
 debian/osrm-dev.install                      |  5 -----
 debian/osrm-tools.install                    |  7 +++++-
 debian/osrm-tools.manpages                   |  2 +-
 debian/patches/disable-osrm-components.patch | 33 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 6 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 654fac7..d0d0604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ osrm (4.9.1+ds-1~exp2) UNRELEASED; urgency=medium
   * Update Vcs-Git URL to use HTTPS.
   * Bump Standards-Version to 3.9.7, no changes.
   * Add patch for 'edges' typo.
+  * Disable osrm-components build, fails to build with GDAL 2.0.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Feb 2016 02:30:30 +0100
 
diff --git a/debian/osrm-dev.install b/debian/osrm-dev.install
index 92d18e0..8bf1ff2 100755
--- a/debian/osrm-dev.install
+++ b/debian/osrm-dev.install
@@ -1,8 +1,3 @@
 #!/usr/bin/dh-exec
-usr/bin/osrm-check-hsgr
-usr/bin/osrm-cli
-usr/bin/osrm-io-benchmark
-usr/bin/osrm-springclean
-usr/bin/osrm-unlock-all
 usr/include/
 usr/lib/*	usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/osrm-tools.install b/debian/osrm-tools.install
index 4781507..9c0649c 100644
--- a/debian/osrm-tools.install
+++ b/debian/osrm-tools.install
@@ -1 +1,6 @@
-debian/tmp/usr/bin/osrm-components /usr/bin/
+debian/tmp/usr/bin/osrm-check-hsgr   /usr/bin/
+debian/tmp/usr/bin/osrm-cli          /usr/bin/
+#debian/tmp/usr/bin/osrm-components   /usr/bin/
+debian/tmp/usr/bin/osrm-io-benchmark /usr/bin/
+debian/tmp/usr/bin/osrm-springclean  /usr/bin/
+debian/tmp/usr/bin/osrm-unlock-all   /usr/bin/
diff --git a/debian/osrm-tools.manpages b/debian/osrm-tools.manpages
index 5ada37e..7bf7d65 100644
--- a/debian/osrm-tools.manpages
+++ b/debian/osrm-tools.manpages
@@ -1 +1 @@
-debian/man/osrm-components.1
+#debian/man/osrm-components.1
diff --git a/debian/patches/disable-osrm-components.patch b/debian/patches/disable-osrm-components.patch
new file mode 100644
index 0000000..852fc4a
--- /dev/null
+++ b/debian/patches/disable-osrm-components.patch
@@ -0,0 +1,33 @@
+Description: Don't build osrm-components with GDAL 2.x, FTFBS.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://github.com/Project-OSRM/osrm-backend/issues/1738
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -345,16 +345,16 @@ endif()
+ 
+ if(BUILD_TOOLS)
+   message(STATUS "Activating OSRM internal tools")
+-  find_package(GDAL)
+-  if(GDAL_FOUND)
+-    add_executable(osrm-components tools/components.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>)
+-    target_link_libraries(osrm-components ${TBB_LIBRARIES})
+-    include_directories(SYSTEM ${GDAL_INCLUDE_DIR})
+-    target_link_libraries(osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES})
+-    install(TARGETS osrm-components DESTINATION bin)
+-  else()
+-    message(FATAL_ERROR "libgdal and/or development headers not found")
+-  endif()
++#  find_package(GDAL)
++#  if(GDAL_FOUND AND NOT GDAL2)
++#    add_executable(osrm-components tools/components.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>)
++#    target_link_libraries(osrm-components ${TBB_LIBRARIES})
++#    include_directories(SYSTEM ${GDAL_INCLUDE_DIR})
++#    target_link_libraries(osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES})
++#    install(TARGETS osrm-components DESTINATION bin)
++#  else()
++#    message(FATAL_ERROR "libgdal and/or development headers not found")
++#  endif()
+   add_executable(osrm-cli tools/simpleclient.cpp $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:COORDINATE>)
+   target_link_libraries(osrm-cli ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM)
+   target_link_libraries(osrm-cli ${TBB_LIBRARIES})
diff --git a/debian/patches/series b/debian/patches/series
index d1a8513..b3b5759 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use-libosmium-package.patch
 occurred-typo.patch
 edges-typo.patch
+disable-osrm-components.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git