Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 557878 Details for
Bug 672088
net-libs/srt-1.3.1 : sandbox issue
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch
srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch (text/plain), 2.69 KB, created by
Dennis Schridde
on 2018-12-15 23:19:12 UTC
(
hide
)
Description:
srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch
Filename:
MIME Type:
Creator:
Dennis Schridde
Created:
2018-12-15 23:19:12 UTC
Size:
2.69 KB
patch
obsolete
>From 09afc227e0880b12a98e18ee8182f89c3a80e3a6 Mon Sep 17 00:00:00 2001 >From: Dennis Schridde <devurandom@gmx.net> >Date: Sat, 15 Dec 2018 23:21:17 +0100 >Subject: [PATCH] CMakeLists.txt: Respect DESTDIR when creating stransmit > symlink > >Fixes: #357 >--- > CMakeLists.txt | 20 ++++++-------------- > scripts/haiUtil.cmake | 5 ----- > 2 files changed, 6 insertions(+), 19 deletions(-) > >diff --git a/CMakeLists.txt b/CMakeLists.txt >index eb2582c..fe45919 100644 >--- a/CMakeLists.txt >+++ b/CMakeLists.txt >@@ -705,28 +705,20 @@ if ( ENABLE_CXX11 ) > # For backward compatibility with the old name > if (SYMLINKABLE) > set (REPLI_COMMAND create_symlink ) >+ # It appears impossible to get the filename component from the generator >+ # expression $<TARGET_FILE:srt-live-transmit>, hence we predict it as: >+ set (srt_live_transmit_name srt-live-transmit${CMAKE_EXECUTABLE_SUFFIX}) > else() > set (REPLI_COMMAND copy) >+ set (srt_live_transmit_name $<TARGET_FILE:srt-live-transmit>) > endif() > > set (stransmit_path $<TARGET_FILE_DIR:srt-live-transmit>/stransmit${CMAKE_EXECUTABLE_SUFFIX}) > add_custom_command( > TARGET srt-live-transmit > POST_BUILD >- COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} $<TARGET_FILE:srt-live-transmit> ${stransmit_path}) >- >- if (SYMLINKABLE) >- message(STATUS "BACKWARD COMPATIBLE 'stransmit': will use symbolic link") >- srt_install_symlink(srt-live-transmit ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/stransmit) >- elseif(${CMAKE_MAJOR_VERSION} LESS 3) >- message(FATAL_ERROR "Your system can't install symbolic link to 'stransmit', copy-on-install requires cmake at least 3.0.2") >- else() >- # This installation doesn't work with cmake earlier than 3.0 >- # (looxlike cmake 2.8 somehow doesn't have a problem with resolving the $<TARGET_FILE_DIR:...> >- # inside the generated makefile, but does have problem with its own generated cmake_install.cmake :D) >- message(STATUS "BACKWARD COMPATIBLE 'stransmit': will use copying") >- install(PROGRAMS ${stransmit_path} DESTINATION ${CMAKE_INSTALL_BINDIR}) >- endif() >+ COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} ${srt_live_transmit_name} ${stransmit_path}) >+ install(FILES ${stransmit_path} DESTINATION ${CMAKE_INSTALL_BINDIR}) > > srt_add_application(srt-file-transmit ${VIRTUAL_srtsupport}) > >diff --git a/scripts/haiUtil.cmake b/scripts/haiUtil.cmake >index 417128d..f60bc11 100644 >--- a/scripts/haiUtil.cmake >+++ b/scripts/haiUtil.cmake >@@ -48,5 +48,0 @@ FUNCTION(join_arguments outvar) >-macro(srt_install_symlink filepath sympath) >- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${filepath} ${sympath})") >- install(CODE "message(\"-- Created symlink: ${sympath} -> ${filepath}\")") >-endmacro(srt_install_symlink) >- >-- >2.20.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 672088
:
556464
|
556466
|
556468
|
556470
|
556472
|
556474
|
556476
|
557872
|
557876
| 557878