From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 909EC138334 for ; Wed, 26 Dec 2018 16:37:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CA1AE08DB; Wed, 26 Dec 2018 16:37:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B59DE08DB for ; Wed, 26 Dec 2018 16:37:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56324335C47 for ; Wed, 26 Dec 2018 16:37:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 400C8463 for ; Wed, 26 Dec 2018 16:37:34 +0000 (UTC) From: "Luca Barbato" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Luca Barbato" Message-ID: <1545842230.9feafbf86f1a5cd99f50a010b6a3940e48e10613.lu_zero@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/srt/, net-libs/srt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch net-libs/srt/srt-1.3.1.ebuild X-VCS-Directories: net-libs/srt/ net-libs/srt/files/ X-VCS-Committer: lu_zero X-VCS-Committer-Name: Luca Barbato X-VCS-Revision: 9feafbf86f1a5cd99f50a010b6a3940e48e10613 X-VCS-Branch: master Date: Wed, 26 Dec 2018 16:37:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4a62313e-d161-455d-9dc4-c22f28c0d2d8 X-Archives-Hash: da25cda84f2a51a8f6782599fa9d939a commit: 9feafbf86f1a5cd99f50a010b6a3940e48e10613 Author: Luca Barbato gentoo org> AuthorDate: Wed Dec 26 16:37:04 2018 +0000 Commit: Luca Barbato gentoo org> CommitDate: Wed Dec 26 16:37:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9feafbf8 net-libs/srt: Fix bug 672088 Thanks to Dennis Schridde gmx.net> for the fix. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Luca Barbato gentoo.org> ...-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch | 64 ++++++++++++++++++++++ net-libs/srt/srt-1.3.1.ebuild | 1 + 2 files changed, 65 insertions(+) diff --git a/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch b/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch new file mode 100644 index 00000000000..2859ed1bac3 --- /dev/null +++ b/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch @@ -0,0 +1,64 @@ +From 09afc227e0880b12a98e18ee8182f89c3a80e3a6 Mon Sep 17 00:00:00 2001 +From: Dennis Schridde +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 $, 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 $) + endif() + + set (stransmit_path $/stransmit${CMAKE_EXECUTABLE_SUFFIX}) + add_custom_command( + TARGET srt-live-transmit + POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} $ ${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 $ +- # 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 + diff --git a/net-libs/srt/srt-1.3.1.ebuild b/net-libs/srt/srt-1.3.1.ebuild index d326da6dca6..f73f9d54a82 100644 --- a/net-libs/srt/srt-1.3.1.ebuild +++ b/net-libs/srt/srt-1.3.1.ebuild @@ -33,6 +33,7 @@ DOCS=( README.md ) PATCHES=( "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" "${FILESDIR}/${P}-no-rpath.patch" + "${FILESDIR}/${P}-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch" ) src_prepare() {