-
-
Notifications
You must be signed in to change notification settings - Fork 454
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build/pkgs/{soplex,scip}: Re-add rebased rpath patches
- Loading branch information
Showing
2 changed files
with
98 additions
and
0 deletions.
There are no files selected for viewing
46 changes: 46 additions & 0 deletions
46
build/pkgs/scip/patches/0001-CMakeLists.txt-Remove-hardcoded-RPATH-settings.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
From 5a05bcd05b75ca8f6b2228b08f57ff71ba46329b Mon Sep 17 00:00:00 2001 | ||
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu> | ||
Date: Sun, 3 Mar 2024 18:15:12 -0800 | ||
Subject: [PATCH] CMakeLists.txt: Remove hardcoded RPATH settings | ||
|
||
--- | ||
src/CMakeLists.txt | 9 +-------- | ||
1 file changed, 1 insertion(+), 8 deletions(-) | ||
|
||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 5392127c5d..995d194aee 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -5,8 +5,7 @@ include(GNUInstallDirs) | ||
|
||
function(setLibProperties targetname outputname) | ||
set_target_properties(${targetname} PROPERTIES | ||
- OUTPUT_NAME ${outputname} | ||
- MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") | ||
+ OUTPUT_NAME ${outputname}) | ||
endfunction(setLibProperties) | ||
|
||
set(CMAKE_C_STANDARD 99) | ||
@@ -1118,7 +1117,6 @@ add_dependencies(scip scip_update_githash) | ||
set_target_properties(libscip PROPERTIES | ||
VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}.${SCIP_VERSION_SUB} | ||
SOVERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR} | ||
- INSTALL_RPATH_USE_LINK_PATH TRUE | ||
CXX_VISIBILITY_PRESET hidden | ||
C_VISIBILITY_PRESET hidden | ||
VISIBILITY_INLINES_HIDDEN 1) | ||
@@ -1128,11 +1126,6 @@ target_include_directories(scip BEFORE PUBLIC | ||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> | ||
$<INSTALL_INTERFACE:include>) | ||
|
||
-# set the install rpath to the installed destination | ||
-set_target_properties(scip PROPERTIES | ||
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" | ||
- INSTALL_RPATH_USE_LINK_PATH TRUE) | ||
- | ||
# install the header files of scip | ||
install(FILES ${lpiheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lpi) | ||
install(FILES ${dijkstraheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dijkstra) | ||
-- | ||
2.42.0 | ||
|
52 changes: 52 additions & 0 deletions
52
build/pkgs/soplex/patches/0001-CMakeLists.txt-src-CMakeLists.txt-Remove-hardcoded-R.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
From d96dd5fbfb790ab961243ef2cb5f1d0137e1f8a5 Mon Sep 17 00:00:00 2001 | ||
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu> | ||
Date: Sun, 3 Mar 2024 18:09:53 -0800 | ||
Subject: [PATCH] CMakeLists.txt, src/CMakeLists.txt: Remove hardcoded RPATH | ||
settings | ||
|
||
--- | ||
CMakeLists.txt | 3 --- | ||
src/CMakeLists.txt | 6 +----- | ||
2 files changed, 1 insertion(+), 8 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 25317fc0..310d29a0 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -65,9 +65,6 @@ if(NOT CMAKE_BUILD_TYPE) | ||
set(CMAKE_BUILD_TYPE Release) | ||
endif() | ||
|
||
-# set the correct rpath for OS X | ||
-set(CMAKE_MACOSX_RPATH ON) | ||
- | ||
# use C++14 standard | ||
set(CMAKE_CXX_STANDARD 14) | ||
|
||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index d259115d..ffdf0435 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -3,8 +3,7 @@ | ||
# | ||
function(setLibProperties targetname outputname) | ||
set_target_properties(${targetname} PROPERTIES | ||
- OUTPUT_NAME ${outputname} | ||
- MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") | ||
+ OUTPUT_NAME ${outputname}) | ||
endfunction(setLibProperties) | ||
|
||
include(GNUInstallDirs) | ||
@@ -208,9 +207,6 @@ endif() | ||
add_executable(example EXCLUDE_FROM_ALL example.cpp) | ||
target_link_libraries(example libsoplex) | ||
|
||
-# set the install rpath to the installed destination | ||
-set_target_properties(soplex PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") | ||
- | ||
# install the header files of soplex | ||
install(FILES ${headers} ${PROJECT_BINARY_DIR}/soplex/config.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/soplex) | ||
install(FILES soplex.h soplex.hpp soplex_interface.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) | ||
-- | ||
2.42.0 | ||
|