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 AF0E61382C5 for ; Sat, 24 Apr 2021 23:19:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5F39E0849; Sat, 24 Apr 2021 23:19:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 BDAE2E0849 for ; Sat, 24 Apr 2021 23:19:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 280EB3413DA for ; Sat, 24 Apr 2021 23:19:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6287730 for ; Sat, 24 Apr 2021 23:19:41 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1619264964.203e6852f620e793c5662129ca6e5a911496f652.telans@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/files/, x11-libs/gtk-fortran/ X-VCS-Repository: repo/proj/guru X-VCS-Files: x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild X-VCS-Directories: x11-libs/gtk-fortran/files/ x11-libs/gtk-fortran/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: 203e6852f620e793c5662129ca6e5a911496f652 X-VCS-Branch: master Date: Sat, 24 Apr 2021 23:19:41 +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: 32073838-9fc0-44b7-8678-6351ba75f487 X-Archives-Hash: 1f2f6f049fed41af81f44a6ff587e06b commit: 203e6852f620e793c5662129ca6e5a911496f652 Author: Sergey Torokhov yandex ru> AuthorDate: Sat Apr 24 11:49:24 2021 +0000 Commit: Theo Anderson posteo de> CommitDate: Sat Apr 24 11:49:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=203e6852 x11-libs/gtk-fortran: add USE="static-libs" conditional patch Closes: https://bugs.gentoo.org/781812 Signed-off-by: Sergey Torokhov yandex.ru> .../gtk-fortran-20.04_skip-static-build.patch | 32 ++++++++++++++++++++++ x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch b/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch new file mode 100644 index 000000000..fb7cdd2cc --- /dev/null +++ b/x11-libs/gtk-fortran/files/gtk-fortran-20.04_skip-static-build.patch @@ -0,0 +1,32 @@ +diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -73,17 +73,16 @@ + endif() + + #====================================================== +-# Defining the static and shared gtk-fortran libraries: ++# Defining the shared gtk-fortran libraries: + #====================================================== + add_library(gtk-fortran_object OBJECT ${sources}) + # To build position independent shared libraries: + set_property(TARGET gtk-fortran_object PROPERTY POSITION_INDEPENDENT_CODE TRUE) + +-add_library(gtk-fortran_static STATIC $) + add_library(gtk-fortran_shared SHARED $) + target_link_libraries(gtk-fortran_shared ${GTK_LIBRARIES}) + +-set_target_properties(gtk-fortran_static gtk-fortran_shared PROPERTIES ++set_target_properties(gtk-fortran_shared PROPERTIES + OUTPUT_NAME ${gtk_V_fortran} + VERSION "0.1" + SOVERSION "0.1") +@@ -131,7 +130,7 @@ + #================== + # Files to install: + #================== +-install(TARGETS gtk-fortran_static gtk-fortran_shared ++install(TARGETS gtk-fortran_shared + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild index 8bb1099e1..02d8cd0a1 100644 --- a/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild +++ b/x11-libs/gtk-fortran/gtk-fortran-20.04.ebuild @@ -18,7 +18,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples high-level plplot" +IUSE="examples high-level plplot static-libs" REQUIRED_USE="plplot? ( high-level )" RDEPEND=" @@ -43,6 +43,8 @@ src_prepare() { sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \ -e "s: add_subdirectory(sketcher)::" CMakeLists.txt || die + use !static-libs && eapply "${FILESDIR}/${P}_skip-static-build.patch" + cmake_src_prepare }