rpms/kdesdk/devel kdesdk-3.97.0-kompare-static-fPIC.patch, NONE, 1.1 kdesdk.spec, 1.81, 1.82 kdesdk-3.97.0-kompare-shared-libs.patch, 1.3, NONE
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Tue Dec 11 07:39:43 UTC 2007
Author: kkofler
Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10554/devel
Modified Files:
kdesdk.spec
Added Files:
kdesdk-3.97.0-kompare-static-fPIC.patch
Removed Files:
kdesdk-3.97.0-kompare-shared-libs.patch
Log Message:
Give up on shared convenience libraries for now, need export macros etc., try this instead:
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
- build Kompare's static convenience libraries with -fPIC
kdesdk-3.97.0-kompare-static-fPIC.patch:
--- NEW FILE kdesdk-3.97.0-kompare-static-fPIC.patch ---
diff -ur kdesdk-3.96.2-fix-kompare-rev6/kompare/libdialogpages/CMakeLists.txt kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/CMakeLists.txt
--- kdesdk-3.96.2-fix-kompare-rev6/kompare/libdialogpages/CMakeLists.txt 2007-07-26 12:38:11.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/CMakeLists.txt 2007-12-11 08:35:51.000000000 +0100
@@ -17,6 +17,9 @@
kde4_add_library(dialogpages ${dialogpages_PART_SRCS})
+# CMAKE_SHARED_LIBRARY_CFLAGS expands to -fPIC on targets which need it
+set_target_properties(dialogpages COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CFLAGS})
+
target_link_libraries(dialogpages ${KDE4_KDECORE_LIBS} )
install(TARGETS dialogpages DESTINATION ${LIB_INSTALL_DIR})
diff -ur kdesdk-3.96.2-fix-kompare-rev6/kompare/libdiff2/CMakeLists.txt kdesdk-3.96.2-fix-kompare/kompare/libdiff2/CMakeLists.txt
--- kdesdk-3.96.2-fix-kompare-rev6/kompare/libdiff2/CMakeLists.txt 2007-07-26 12:38:10.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/libdiff2/CMakeLists.txt 2007-12-11 08:35:20.000000000 +0100
@@ -21,6 +21,9 @@
kde4_add_library(diff2 ${diff2_PART_SRCS})
+# CMAKE_SHARED_LIBRARY_CFLAGS expands to -fPIC on targets which need it
+set_target_properties(diff2 COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CFLAGS})
+
target_link_libraries(diff2 ${KDE4_KDECORE_LIBS} )
install(TARGETS diff2 DESTINATION ${LIB_INSTALL_DIR})
Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kdesdk.spec 11 Dec 2007 06:29:57 -0000 1.81
+++ kdesdk.spec 11 Dec 2007 07:38:59 -0000 1.82
@@ -9,7 +9,7 @@
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
Patch0: kdesdk-3.96.2-fix-kompare.patch
-Patch1: kdesdk-3.97.0-kompare-shared-libs.patch
+Patch1: kdesdk-3.97.0-kompare-static-fPIC.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kde-filesystem >= 4
@@ -85,6 +85,9 @@
mkdir %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}
+# remove static libraries internal to Kompare
+rm -f %{buildroot}%{_kde4_libdir}/libdialogpages.a %{buildroot}%{_kde4_libdir}/libdiff2.a
+
# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
@@ -171,8 +174,7 @@
%changelog
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
-- build Kompare's convenience libraries as shared so we don't end up with
- non-PIC static libraries linked into shared libraries
+- build Kompare's static convenience libraries with -fPIC
* Mon Dec 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
- updated fix-kompare patch (rev 6)
--- kdesdk-3.97.0-kompare-shared-libs.patch DELETED ---
More information about the scm-commits
mailing list