[med-svn] [Git][med-team/terraphast][master] 2 commits: Avoid setting RPATH completely.

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / terraphast


Commits:
49a7dda4 by Andreas Tille at 2022-01-21T19:16:09+01:00
Avoid setting RPATH completely.

- - - - -
dc67ac5a by Andreas Tille at 2022-01-21T19:18:52+01:00
Upload to new

- - - - -


2 changed files:

- debian/changelog
- debian/patches/dynamic_lib.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,5 @@
-terraphast (0.0+git20200413.8af2e4c-1) UNRELEASED; urgency=medium
+terraphast (0.0+git20200413.8af2e4c-1) unstable; urgency=medium
 
-  * Initial release (Closes: #<bug>)
+  * Initial release (Closes: #1004148)
 
- -- Andreas Tille <tille at debian.org>  Wed, 20 Oct 2021 09:51:23 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 21 Jan 2022 19:18:40 +0100


=====================================
debian/patches/dynamic_lib.patch
=====================================
@@ -16,7 +16,7 @@ Description: Attempt to create shared library
  		lib/advanced.cpp
  		lib/bigint.cpp
  		lib/bipartitions.cpp
-@@ -74,6 +74,18 @@ add_library(terraces
+@@ -74,6 +74,17 @@ add_library(terraces
  		include/terraces/subtree_extraction.hpp
  		include/terraces/trees.hpp
  )
@@ -25,7 +25,6 @@ Description: Attempt to create shared library
 +set_target_properties(terraces PROPERTIES
 +        VERSION ${VERSION}
 +        SOVERSION ${SOVERSION}
-+        SKIP_BUILD_RPATH TRUE
 +)
 +
 +target_include_directories(terraces_static
@@ -35,7 +34,7 @@ Description: Attempt to create shared library
  target_include_directories(terraces
  		PUBLIC include
  		PRIVATE lib
-@@ -83,35 +95,50 @@ if(TERRAPHAST_USE_GMP)
+@@ -83,35 +94,49 @@ if(TERRAPHAST_USE_GMP)
  	find_package(GMP)
  	if(GMP_FOUND)
  		message(STATUS "GMP libraries found")
@@ -64,7 +63,6 @@ Description: Attempt to create shared library
 +	set_target_properties(terraces_c PROPERTIES
 +        		VERSION ${VERSION}
 +		        SOVERSION ${SOVERSION}
-+                        SKIP_BUILD_RPATH TRUE
 +	)
 +	target_include_directories(terraces_c_static PUBLIC c_include)
  	target_include_directories(terraces_c PUBLIC c_include)
@@ -89,6 +87,15 @@ Description: Attempt to create shared library
  		target_compile_definitions(terraces_c PRIVATE _GLIBCXX_DEBUG) # PRIVATE since no stdlib objects are used
  	endif()
  endif()
+@@ -142,6 +167,8 @@ if(TERRAPHAST_BUILD_APPS)
+ 	set(terraces_targets ${terraces_targets} app validated_run verbose_run isomorphic reroot subtree tree_gen site_gen nwk_to_dot)
+ endif()
+ 
++set_target_properties(${terraces_targets} PROPERTIES SKIP_BUILD_RPATH TRUE)
++
+ #####################################################################
+ # build tests
+ #####################################################################
 @@ -216,12 +243,15 @@ else()
  	endif()
  endif()



View it on GitLab: https://salsa.debian.org/med-team/terraphast/-/compare/1db961c6cf3b142922fdb709c8b03c16d1d31a88...dc67ac5adc5816ec5eee16e4ced5dceeb0a64955

-- 
View it on GitLab: https://salsa.debian.org/med-team/terraphast/-/compare/1db961c6cf3b142922fdb709c8b03c16d1d31a88...dc67ac5adc5816ec5eee16e4ced5dceeb0a64955
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220121/37464eca/attachment-0001.htm>