Andreas Tille pushed to branch master at Debian Med / terraphast
Commits:
bcfe69bf by Andreas Tille at 2022-01-21T17:00:49+01:00
Complete shared lib patch
- - - - -
1 changed file:
- debian/patches/dynamic_lib.patch
Changes:
=====================================
debian/patches/dynamic_lib.patch
=====================================
@@ -29,7 +29,16 @@ Description: Attempt to create shared library
target_include_directories(terraces
PUBLIC include
PRIVATE lib
-@@ -90,20 +96,26 @@ if(TERRAPHAST_USE_GMP)
+@@ -83,35 +89,45 @@ if(TERRAPHAST_USE_GMP)
+ find_package(GMP)
+ if(GMP_FOUND)
+ message(STATUS "GMP libraries found")
++ target_link_libraries(terraces_static gmpxx gmp)
+ target_link_libraries(terraces gmpxx gmp)
++ target_compile_definitions(terraces_static PUBLIC USE_GMP)
+ target_compile_definitions(terraces PUBLIC USE_GMP)
+ else()
+ message(FATAL_ERROR "GMP libraries not found! Disable them
using -DTERRAPHAST_USE_GMP=OFF")
endif()
endif()
@@ -59,7 +68,17 @@ Description: Attempt to create shared library
endif()
#####################################################################
-@@ -216,12 +228,15 @@ else()
+ # internal compiler flags
+ #####################################################################
+ if(DEV_ENVIRONMENT AND CMAKE_BUILD_TYPE STREQUAL "Debug")
++ target_compile_definitions(terraces_static PUBLIC _GLIBCXX_DEBUG) #
PUBLIC to maintain ABI compatibility
+ target_compile_definitions(terraces PUBLIC _GLIBCXX_DEBUG) # PUBLIC to
maintain ABI compatibility
+ if(TERRAPHAST_BUILD_CLIB)
++ target_compile_definitions(terraces_c_static PRIVATE
_GLIBCXX_DEBUG) # PRIVATE since no stdlib objects are used
+ target_compile_definitions(terraces_c PRIVATE _GLIBCXX_DEBUG) #
PRIVATE since no stdlib objects are used
+ endif()
+ endif()
+@@ -216,12 +232,15 @@ else()
endif()
endif()
View it on GitLab:
https://salsa.debian.org/med-team/terraphast/-/commit/bcfe69bf53fb6a0161bbdc221d0f0c4f1ad348a0
--
View it on GitLab:
https://salsa.debian.org/med-team/terraphast/-/commit/bcfe69bf53fb6a0161bbdc221d0f0c4f1ad348a0
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
