From 27e4ba5dde69a4412c689c26504780683d6113f3618efc0935183c7f3432e062 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 13 Sep 2018 11:19:17 +0000 Subject: [PATCH] fix build OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=107 --- cmake-3.12.patch | 73 +++++++++++++++++++++++++++++++++++++++++++++++ mapserver.changes | 1 + mapserver.spec | 6 ++-- 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 cmake-3.12.patch diff --git a/cmake-3.12.patch b/cmake-3.12.patch new file mode 100644 index 0000000..687198d --- /dev/null +++ b/cmake-3.12.patch @@ -0,0 +1,73 @@ +Description: Fix errors with CMake 3.12 for get_target_property commands. +Author: Bas Couwenberg +Bug: https://github.com/mapserver/mapserver/issues/5646 +Bug-Debian: https://bugs.debian.org/906605 + +--- a/mapscript/java/CMakeLists.txt ++++ b/mapscript/java/CMakeLists.txt +@@ -42,6 +42,14 @@ ADD_CUSTOM_COMMAND(TARGET javamapscript + COMMENT "Compiling java source files, creating mapscript.jar" + ) + ++# Workaround for CMake 3.12 error: ++# ++# The LOCATION property may not be read from target "foo". Use ++# the target name directly with add_custom_command, or use the generator ++# expression $, as appropriate. ++ ++cmake_policy(SET CMP0026 OLD) ++ + get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_javamapscript_REAL_NAME} LOCATION) + install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION lib/jni) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.jar DESTINATION share/java) +--- a/mapscript/perl/CMakeLists.txt ++++ b/mapscript/perl/CMakeLists.txt +@@ -18,6 +18,14 @@ if(APPLE) + set_target_properties(perlmapscript PROPERTIES SUFFIX ".bundle") + endif(APPLE) + ++# Workaround for CMake 3.12 error: ++# ++# The LOCATION property may not be read from target "foo". Use ++# the target name directly with add_custom_command, or use the generator ++# expression $, as appropriate. ++ ++cmake_policy(SET CMP0026 OLD) ++ + get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_perlmapscript_REAL_NAME} LOCATION) + set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm) + install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR}/auto/mapscript) +--- a/mapscript/python/CMakeLists.txt ++++ b/mapscript/python/CMakeLists.txt +@@ -39,6 +39,14 @@ set_target_properties(${SWIG_MODULE_pyth + + execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + ++# Workaround for CMake 3.12 error: ++# ++# The LOCATION property may not be read from target "foo". Use ++# the target name directly with add_custom_command, or use the generator ++# expression $, as appropriate. ++ ++cmake_policy(SET CMP0026 OLD) ++ + get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_pythonmapscript_REAL_NAME} LOCATION) + set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py) + install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES}) +--- a/mapscript/ruby/CMakeLists.txt ++++ b/mapscript/ruby/CMakeLists.txt +@@ -32,6 +32,14 @@ if(APPLE) + set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES SUFFIX ".bundle") + endif(APPLE) + ++# Workaround for CMake 3.12 error: ++# ++# The LOCATION property may not be read from target "foo". Use ++# the target name directly with add_custom_command, or use the generator ++# expression $, as appropriate. ++ ++cmake_policy(SET CMP0026 OLD) ++ + get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME} LOCATION) + execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDORARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE) + install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_VENDORARCHDIR}) diff --git a/mapserver.changes b/mapserver.changes index 58ce7d5..d1d4653 100644 --- a/mapserver.changes +++ b/mapserver.changes @@ -2,6 +2,7 @@ Thu Sep 13 09:28:34 UTC 2018 - Dirk Stoecker - update to final release +- Fix build with newer cmake: cmake-3.12.patch ------------------------------------------------------------------- Thu Jun 7 11:51:11 UTC 2018 - opensuse@dstoecker.de diff --git a/mapserver.spec b/mapserver.spec index bb98cda..fb499cd 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -37,6 +37,8 @@ Url: https://www.mapserver.org/ Source: https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM Fix PHP7 support Patch1: https://patch-diff.githubusercontent.com/raw/mapserver/mapserver/pull/5461.patch +# PATCH-FIX-UPSTREAM https://github.com/mapserver/mapserver/issues/5646 +Patch2: https://salsa.debian.org/debian-gis-team/mapserver/raw/a039ff238258e7c3b9206b4a55d5d46eb4289dbd/debian/patches/cmake-3.12.patch BuildRequires: FastCGI-devel BuildRequires: apache2-devel BuildRequires: autoconf @@ -196,8 +198,8 @@ against the C Mapserver library. %prep %setup -q -n %{name}-%{version} -%global _default_patch_fuzz 1 -%patch1 -p1 +%global _default_patch_fuzz 5 +%autopatch -p1 %build mkdir build