Debian Codegraph @

debian/patches/lib_rename.patch

raw
1 Index: dolfin/CMakeLists.txt
2 ===================================================================
3 --- dolfin.orig/CMakeLists.txt 2020-08-28 22:10:35.631866823 +0800
4 +++ dolfin/CMakeLists.txt 2020-08-28 22:10:35.627866800 +0800
5 @@ -500,6 +500,7 @@
6 set(DOLFIN_LIBRARY_PROPERTIES ${DOLFIN_LIBRARY_PROPERTIES}
7 VERSION ${DOLFIN_LIBRARY_VERSION}
8 SOVERSION ${DOLFIN_VERSION_MAJOR}.${DOLFIN_VERSION_MINOR}
9 + OUTPUT_NAME "dolfin${LIB_NAME_EXT}"
10 )
11 endif()
12
13 Index: dolfin/cmake/templates/dolfin.pc.in
14 ===================================================================
15 --- dolfin.orig/cmake/templates/dolfin.pc.in 2020-08-28 22:10:35.631866823 +0800
16 +++ dolfin/cmake/templates/dolfin.pc.in 2020-08-28 22:10:35.627866800 +0800
17 @@ -13,5 +13,5 @@
18 Version: @DOLFIN_VERSION@
19 Requires: @PKG_REQUIRES@
20 Conflicts:
21 -Libs: @PKG_LINKFLAGS@ -L${libdir} -ldolfin
22 +Libs: @PKG_LINKFLAGS@ -L${libdir} -ldolfin@LIB_NAME_EXT@
23 Cflags: @PKG_CXXFLAGS@ -DDOLFIN_VERSION=\"@DOLFIN_VERSION@\" ${definitions} -I${includedir} @PKG_INCLUDES@
24 Index: dolfin/python/dolfin/jit/jit.py
25 ===================================================================
26 --- dolfin.orig/python/dolfin/jit/jit.py 2020-08-28 22:10:35.631866823 +0800
27 +++ dolfin/python/dolfin/jit/jit.py 2020-08-28 22:10:35.627866800 +0800
28 @@ -5,6 +5,7 @@
29 import hashlib
30 import dijitso
31 import dolfin.cpp as cpp
32 +import dolfin.la as la
33
34 from dolfin.cpp import MPI
35 from functools import wraps
36 @@ -12,7 +13,9 @@
37 from dolfin.cpp.parameter import parameters
38
39 # Get DOLFIN pkg-config data
40 -if pkgconfig.exists("dolfin"):
41 +if la.la_index_dtype()==la.int64 and pkgconfig.exists("dolfin64"):
42 + dolfin_pc = pkgconfig.parse("dolfin64")
43 +elif pkgconfig.exists("dolfin"):
44 dolfin_pc = pkgconfig.parse("dolfin")
45 else:
46 raise RuntimeError("Could not find DOLFIN pkg-config file. Please make sure appropriate paths are set.")
47 Index: dolfin/dolfin/CMakeLists.txt
48 ===================================================================
49 --- dolfin.orig/dolfin/CMakeLists.txt 2020-08-28 22:10:35.631866823 +0800
50 +++ dolfin/dolfin/CMakeLists.txt 2020-08-28 22:10:35.627866800 +0800
51 @@ -343,8 +343,8 @@
52 get_target_property(BOOST_INCLUDE_DIR Boost::boost INTERFACE_INCLUDE_DIRECTORIES)
53
54 # Configure and install pkg-config file
55 -configure_file(${DOLFIN_CMAKE_DIR}/templates/dolfin.pc.in ${CMAKE_BINARY_DIR}/dolfin.pc @ONLY)
56 -install(FILES ${CMAKE_BINARY_DIR}/dolfin.pc
57 +configure_file(${DOLFIN_CMAKE_DIR}/templates/dolfin.pc.in ${CMAKE_BINARY_DIR}/dolfin${LIB_NAME_EXT}.pc @ONLY)
58 +install(FILES ${CMAKE_BINARY_DIR}/dolfin${LIB_NAME_EXT}.pc
59 DESTINATION ${DOLFIN_PKGCONFIG_DIR}
60 COMPONENT Development
61 )
62 Index: dolfin/cmake/templates/DOLFINConfig.cmake.in
63 ===================================================================
64 --- dolfin.orig/cmake/templates/DOLFINConfig.cmake.in 2020-08-28 22:10:35.631866823 +0800
65 +++ dolfin/cmake/templates/DOLFINConfig.cmake.in 2020-08-28 22:10:38.000000000 +0800
66 @@ -43,7 +43,7 @@
67 set(DOLFIN_3RD_PARTY_INCLUDE_DIRS "@DOLFIN_DEP_INCLUDE_DIRECTORIES@;@DOLFIN_DEP_SYSTEM_INCLUDE_DIRECTORIES@")
68
69 # DOLFIN library
70 -set(DOLFIN_LIBRARIES dolfin)
71 +set(DOLFIN_LIBRARIES dolfin${DOLFIN_LIB_NAME_EXT})
72
73 # Version
74 set(DOLFIN_VERSION_MAJOR "@DOLFIN_VERSION_MAJOR@")