Codebase list libpolyclipping / b172a3f
Fixed multiarch build (for real) Gregor Riepl 5 years ago
4 changed file(s) with 55 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all
+5
-0
debian/changelog less more
00 libpolyclipping (6.4.2-4) UNRELEASED; urgency=medium
11
2 [Gregor Riepl]
23 * Migrated to salsa
34 * Updated standards
5
6 [Helmut Grohne]
7 * Fix FTCBFS: Let dh_auto_configure pass cross flags to cmake.
8 Closes: #915267
49
510 -- Gregor Riepl <onitake@gmail.com> Mon, 09 Jul 2018 23:23:39 +0200
611
+42
-0
debian/patches/1000-fix-multiarch-paths.patch less more
0 Index: libpolyclipping/cpp/CMakeLists.txt
1 ===================================================================
2 --- libpolyclipping.orig/cpp/CMakeLists.txt 2018-12-03 08:49:58.000000000 +0100
3 +++ libpolyclipping/cpp/CMakeLists.txt 2018-12-04 18:04:51.843773588 +0100
4 @@ -1,11 +1,9 @@
5 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
6 PROJECT(polyclipping)
7
8 +INCLUDE(GNUInstallDirs)
9 +
10 SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Release type")
11 -# The header name clipper.hpp is too generic, so install in a subdirectory
12 -SET(CMAKE_INSTALL_INCDIR "${CMAKE_INSTALL_PREFIX}/include/polyclipping")
13 -SET(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
14 -SET(CMAKE_INSTALL_PKGCONFIGDIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
15 SET(PCFILE "${CMAKE_CURRENT_BINARY_DIR}/polyclipping.pc")
16
17 SET(BUILD_SHARED_LIBS ON CACHE BOOL
18 @@ -14,8 +12,8 @@
19
20 CONFIGURE_FILE (polyclipping.pc.cmakein "${PCFILE}" @ONLY)
21
22 -INSTALL (FILES clipper.hpp DESTINATION "${CMAKE_INSTALL_INCDIR}")
23 +INSTALL (FILES clipper.hpp DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/polyclipping")
24 INSTALL (TARGETS polyclipping LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
25 -INSTALL (FILES "${PCFILE}" DESTINATION "${CMAKE_INSTALL_PKGCONFIGDIR}")
26 +INSTALL (FILES "${PCFILE}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
27
28 SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 22.0.0 SOVERSION 22 )
29 Index: libpolyclipping/cpp/polyclipping.pc.cmakein
30 ===================================================================
31 --- libpolyclipping.orig/cpp/polyclipping.pc.cmakein 2018-12-03 08:49:58.000000000 +0100
32 +++ libpolyclipping/cpp/polyclipping.pc.cmakein 2018-12-03 08:50:03.000000000 +0100
33 @@ -2,7 +2,7 @@
34 exec_prefix=@CMAKE_INSTALL_PREFIX@
35 libdir=@CMAKE_INSTALL_LIBDIR@
36 sharedlibdir=@CMAKE_INSTALL_LIBDIR@
37 -includedir=@CMAKE_INSTALL_INCDIR@
38 +includedir=@CMAKE_INSTALL_INCLUDEDIR@
39
40 Name: polyclipping
41 Description: polygon clipping library
+1
-0
debian/patches/series less more
0 1000-fix-multiarch-paths.patch
+7
-8
debian/rules less more
00 #!/usr/bin/make -f
11 # Copyright 2003-2007 Bas Wijnen <wijnen@debian.org>
2 # Copyright 2018 Gregor Riepl <onitake@gmail.com>
23 #
34 # This program is free software: you can redistribute it and/or modify
45 # it under the terms of the GNU General Public License as published by
1314 # You should have received a copy of the GNU General Public License
1415 # along with this program. If not, see <http://www.gnu.org/licenses/>.
1516
17 export DH_VERBOSE = 1
18 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
19 DPKG_EXPORT_BUILDFLAGS = 1
20 include /usr/share/dpkg/buildflags.mk
21
1622 %:
17 dh $@
18
19 override_dh_auto_build:
20 cmake cpp -DCMAKE_INSTALL_PREFIX=/usr
21
22 override_dh_auto_clean:
23 dh_auto_clean
24 rm -rf CMakeCache.txt CMakeFiles cmake_install.cmake Makefile polyclipping.pc install_manifest.txt
23 dh $@ --buildsystem=cmake --sourcedirectory=cpp