public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Theo Anderson" <telans@posteo.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/files/, x11-libs/gtk-fortran/
Date: Sat, 24 Apr 2021 23:19:41 +0000 (UTC)	[thread overview]
Message-ID: <1619264964.203e6852f620e793c5662129ca6e5a911496f652.telans@gentoo> (raw)

commit:     203e6852f620e793c5662129ca6e5a911496f652
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Apr 24 11:49:24 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> 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 <torokhov-s-a <AT> 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 $<TARGET_OBJECTS:gtk-fortran_object>)
+ add_library(gtk-fortran_shared SHARED $<TARGET_OBJECTS:gtk-fortran_object>)
+ 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
 }
 


             reply	other threads:[~2021-04-24 23:19 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-24 23:19 Theo Anderson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-27  6:18 [gentoo-commits] repo/proj/guru:master commit in: x11-libs/gtk-fortran/files/, x11-libs/gtk-fortran/ Florian Schmaus
2021-04-24 23:19 Theo Anderson
2020-04-13 17:50 Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1619264964.203e6852f620e793c5662129ca6e5a911496f652.telans@gentoo \
    --to=telans@posteo.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox