[ksirk/f18] link bundled/convenience iris lib statically

Rex Dieter rdieter at fedoraproject.org
Mon Mar 4 17:44:54 UTC 2013


commit b188a97fefc40428f76f008c98b7722b9f3af2ec
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:44:14 2013 -0600

    link bundled/convenience iris lib statically

 ksirk-4.10.1-iris_static.patch |   21 +++++++++++++++++++++
 ksirk.spec                     |    6 +++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/ksirk-4.10.1-iris_static.patch b/ksirk-4.10.1-iris_static.patch
new file mode 100644
index 0000000..8fa5dc4
--- /dev/null
+++ b/ksirk-4.10.1-iris_static.patch
@@ -0,0 +1,21 @@
+diff -up ksirk-4.10.1/ksirk/iris/src/CMakeLists.txt.iris_static ksirk-4.10.1/ksirk/iris/src/CMakeLists.txt
+--- ksirk-4.10.1/ksirk/iris/src/CMakeLists.txt.iris_static	2013-03-01 01:16:50.866751220 -0600
++++ ksirk-4.10.1/ksirk/iris/src/CMakeLists.txt	2013-03-04 11:42:15.688104835 -0600
+@@ -124,7 +124,7 @@ xmpp/zlib/zlibdecompressor.h
+ )
+ 
+ 
+-kde4_add_library(iris_ksirk SHARED ${libiris_SRCS})
++kde4_add_library(iris_ksirk STATIC ${libiris_SRCS})
+ 
+ set(iris_ksirk_libs ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY}
+ ${IDN_LIBRARY} ${QCA2_LIBRARIES} ${ZLIB_LIBRARIES})
+@@ -144,7 +144,7 @@ set_target_properties(iris_ksirk PROPERT
+                       SOVERSION 2
+                       COMPILE_FLAGS -DIRISNET_STATIC
+                       )
+-install(TARGETS iris_ksirk ${INSTALL_TARGETS_DEFAULT_ARGS})
++#install(TARGETS iris_ksirk ${INSTALL_TARGETS_DEFAULT_ARGS})
+     
+     ########### install files ###############
+     
diff --git a/ksirk.spec b/ksirk.spec
index 3a27af3..d626a75 100644
--- a/ksirk.spec
+++ b/ksirk.spec
@@ -16,11 +16,13 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 
 # use the system iris library
 Patch0: ksirk-4.10.0-system-iris.patch
+# if using bundled iris, link statically
+Patch1: ksirk-4.10.1-iris_static.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: libkdegames-devel >= %{version}
 BuildRequires: pkgconfig(qca2)
-# system-iris patch requires iris-1.0.0-0.12 only
+# system-iris patch requires iris-1.0.0-0.12
 %if 0%{?fedora}
 %define system_iris 1
 BuildRequires: pkgconfig(iris)
@@ -42,6 +44,8 @@ neighbors with your armies.
 %if 0%{?system_iris}
 %patch0 -p1 -b .system-iris
 mv ksirk/iris ksirk/iris.BAK
+%else
+%patch1 -p1 -b .iris_static
 %endif
 
 


More information about the scm-commits mailing list