From: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
Date: Wed, 4 Nov 2020 23:05:55 +0000 (+0000)
Subject: lib_rename
X-Git-Tag: archive/raspbian/2019.2.0_git20200629.946dbd3-8+rpi1~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0fc74f694882d479c8a9b983db5203741fa76155;p=dolfin.git

lib_rename

===================================================================

Gbp-Pq: Name lib_rename.patch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe47574..8754ee1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -500,6 +500,7 @@ if (DOLFIN_WITH_LIBRARY_VERSION)
   set(DOLFIN_LIBRARY_PROPERTIES ${DOLFIN_LIBRARY_PROPERTIES}
     VERSION ${DOLFIN_LIBRARY_VERSION}
     SOVERSION ${DOLFIN_VERSION_MAJOR}.${DOLFIN_VERSION_MINOR}
+    OUTPUT_NAME "dolfin${LIB_NAME_EXT}"
   )
 endif()
 
diff --git a/cmake/templates/DOLFINConfig.cmake.in b/cmake/templates/DOLFINConfig.cmake.in
index 346b2d5..bdad95e 100644
--- a/cmake/templates/DOLFINConfig.cmake.in
+++ b/cmake/templates/DOLFINConfig.cmake.in
@@ -43,7 +43,7 @@ set(DOLFIN_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@DOLFIN_INCLUDE_DIR@")
 set(DOLFIN_3RD_PARTY_INCLUDE_DIRS "@DOLFIN_DEP_INCLUDE_DIRECTORIES@;@DOLFIN_DEP_SYSTEM_INCLUDE_DIRECTORIES@")
 
 # DOLFIN library
-set(DOLFIN_LIBRARIES dolfin)
+set(DOLFIN_LIBRARIES dolfin${DOLFIN_LIB_NAME_EXT})
 
 # Version
 set(DOLFIN_VERSION_MAJOR "@DOLFIN_VERSION_MAJOR@")
diff --git a/cmake/templates/dolfin.pc.in b/cmake/templates/dolfin.pc.in
index 3faf2c3..d6a2069 100644
--- a/cmake/templates/dolfin.pc.in
+++ b/cmake/templates/dolfin.pc.in
@@ -13,5 +13,5 @@ Description: Dynamic Object-oriented Library for FINite element computation
 Version: @DOLFIN_VERSION@
 Requires: @PKG_REQUIRES@
 Conflicts:
-Libs: @PKG_LINKFLAGS@ -L${libdir} -ldolfin
+Libs: @PKG_LINKFLAGS@ -L${libdir} -ldolfin@LIB_NAME_EXT@
 Cflags: @PKG_CXXFLAGS@ -DDOLFIN_VERSION=\"@DOLFIN_VERSION@\" ${definitions} -I${includedir} @PKG_INCLUDES@
diff --git a/dolfin/CMakeLists.txt b/dolfin/CMakeLists.txt
index fb8b53f..452cb98 100644
--- a/dolfin/CMakeLists.txt
+++ b/dolfin/CMakeLists.txt
@@ -343,8 +343,8 @@ endforeach()
 get_target_property(BOOST_INCLUDE_DIR Boost::boost INTERFACE_INCLUDE_DIRECTORIES)
 
 # Configure and install pkg-config file
-configure_file(${DOLFIN_CMAKE_DIR}/templates/dolfin.pc.in ${CMAKE_BINARY_DIR}/dolfin.pc @ONLY)
-install(FILES ${CMAKE_BINARY_DIR}/dolfin.pc
+configure_file(${DOLFIN_CMAKE_DIR}/templates/dolfin.pc.in ${CMAKE_BINARY_DIR}/dolfin${LIB_NAME_EXT}.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/dolfin${LIB_NAME_EXT}.pc
   DESTINATION ${DOLFIN_PKGCONFIG_DIR}
   COMPONENT Development
   )
diff --git a/python/dolfin/jit/jit.py b/python/dolfin/jit/jit.py
index 5ac1ba2..367b572 100644
--- a/python/dolfin/jit/jit.py
+++ b/python/dolfin/jit/jit.py
@@ -5,6 +5,7 @@ import numpy
 import hashlib
 import dijitso
 import dolfin.cpp as cpp
+import dolfin.la as la
 
 from dolfin.cpp import MPI
 from functools import wraps
@@ -12,7 +13,9 @@ import ffc
 from dolfin.cpp.parameter import parameters
 
 # Get DOLFIN pkg-config data
-if pkgconfig.exists("dolfin"):
+if la.la_index_dtype()==la.int64 and pkgconfig.exists("dolfin64"):
+    dolfin_pc = pkgconfig.parse("dolfin64")
+elif pkgconfig.exists("dolfin"):
     dolfin_pc = pkgconfig.parse("dolfin")
 else:
     raise RuntimeError("Could not find DOLFIN pkg-config file. Please make sure appropriate paths are set.")