Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Apply patches by Helmut Grohne to fix FTCBFS. (closes: #911233)
· 63e945d4
Bas Couwenberg
authored
Oct 17, 2018
63e945d4
Set distribution to unstable.
· b117a568
Bas Couwenberg
authored
Oct 17, 2018
b117a568
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
b117a568
ossim (2.5.2-2) unstable; urgency=medium
* Team upload.
* Apply patches by Helmut Grohne to fix FTCBFS.
(closes: #911233)
-- Bas Couwenberg <sebastic@debian.org> Wed, 17 Oct 2018 17:11:19 +0200
ossim (2.5.2-1) unstable; urgency=medium
* Team upload.
...
...
debian/patches/cross-build.patch
0 → 100644
View file @
b117a568
Description: Don't set CMAKE_LIBRARY_PATH for cross builds.
Author: Helmut Grohne <helmut@subdivi.de>
Bug-Debian: https://bugs.debian.org/911233
Forwarded: https://github.com/ossimlabs/ossim/issues/208
--- a/cmake/CMakeModules/OssimCommonVariables.cmake
+++ b/cmake/CMakeModules/OssimCommonVariables.cmake
@@ -265,7 +265,6 @@
MACRO(OSSIM_ADD_COMMON_SETTINGS)
SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};${OSSIM_DEPENDENCIES}/lib${LIBSUFFIX}")
SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};${OSSIM_DEPENDENCIES}/include")
ENDIF()
- SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};/usr/lib;/usr/local/lib;/usr/lib64;/usr/lib/x86_64-linux-gnu")
SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};${OSSIM_DEV_HOME}/ossim/include;/usr/include;/usr/local/include")
#################################### ADd some common options for all modules to use ###################################
debian/patches/series
View file @
b117a568
spelling-errors.patch
cross-build.patch
debian/rules
View file @
b117a568
...
...
@@ -38,6 +38,7 @@ CMAKE_OPTS = \
-DBUILD_SHARED_LIBS=ON \
-DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 \
-DGEOS_INCLUDE_DIR=/usr/include/geos \
-DINSTALL_LIBRARY_DIR:STRING=lib \
-DOSSIM_BUILD_DATE=$(BUILD_DATE)
override_dh_auto_clean:
...
...