- squash more rpath's
This commit is contained in:
Rex Dieter
parent
7d9f43aea1
commit
827dd60918
|
|
@ -1,26 +0,0 @@
|
|||
diff -up kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-05-21 10:00:15.000000000 +0200
|
||||
+++ kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake 2010-05-21 10:09:42.195154891 +0200
|
||||
@@ -1014,12 +1014,20 @@ if (UNIX)
|
||||
|
||||
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
|
||||
if("${_isSystemLibDir}" STREQUAL "-1")
|
||||
- set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||||
+ #message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
|
||||
+ #message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
|
||||
+ #list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
|
||||
+ #message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
|
||||
+ #if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
|
||||
+ # message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
|
||||
+ # list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
|
||||
+ #endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
|
||||
endif("${_isSystemLibDir}" STREQUAL "-1")
|
||||
|
||||
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
|
||||
endif (APPLE)
|
||||
endif (UNIX)
|
||||
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
diff -up kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-11-20 16:28:26.945612607 -0600
|
||||
+++ kdelibs-4.5.80/cmake/modules/FindKDE4Internal.cmake 2010-11-20 18:18:01.926613935 -0600
|
||||
@@ -1042,7 +1042,7 @@ if (UNIX)
|
||||
|
||||
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
|
||||
endif (APPLE)
|
||||
endif (UNIX)
|
||||
|
||||
diff -up kdelibs-4.5.80/kdewidgets/CMakeLists.txt.no_rpath kdelibs-4.5.80/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.5.80/kdewidgets/CMakeLists.txt.no_rpath 2010-11-20 16:28:26.784363550 -0600
|
||||
+++ kdelibs-4.5.80/kdewidgets/CMakeLists.txt 2010-11-20 18:20:09.111363760 -0600
|
||||
@@ -46,14 +46,14 @@ if(QT_QTDESIGNER_FOUND)
|
||||
kde4_add_plugin(kdewidgets ${kdewidgets_PART_SRCS})
|
||||
|
||||
target_link_libraries(kdewidgets ${KDE4_KIO_LIBS})
|
||||
- if(NOT WIN32)
|
||||
- set_target_properties(kdewidgets PROPERTIES
|
||||
- INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||
- SKIP_BUILD_RPATH TRUE
|
||||
- BUILD_WITH_INSTALL_RPATH TRUE
|
||||
- INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||
- )
|
||||
- endif(NOT WIN32)
|
||||
+# if(NOT WIN32)
|
||||
+# set_target_properties(kdewidgets PROPERTIES
|
||||
+# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||
+# SKIP_BUILD_RPATH TRUE
|
||||
+# BUILD_WITH_INSTALL_RPATH TRUE
|
||||
+# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||
+# )
|
||||
+# endif(NOT WIN32)
|
||||
|
||||
install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||||
|
||||
@@ -76,14 +76,14 @@ if(QT_QTDESIGNER_FOUND)
|
||||
kde4_add_plugin(kdedeprecated ${kdedeprecated_PART_SRCS})
|
||||
|
||||
target_link_libraries(kdedeprecated ${KDE4_KIO_LIBS})
|
||||
- if(NOT WIN32)
|
||||
- set_target_properties(kdedeprecated PROPERTIES
|
||||
- INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||
- SKIP_BUILD_RPATH TRUE
|
||||
- BUILD_WITH_INSTALL_RPATH TRUE
|
||||
- INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||
- )
|
||||
- endif(NOT WIN32)
|
||||
+# if(NOT WIN32)
|
||||
+# set_target_properties(kdedeprecated PROPERTIES
|
||||
+# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||
+# SKIP_BUILD_RPATH TRUE
|
||||
+# BUILD_WITH_INSTALL_RPATH TRUE
|
||||
+# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||
+# )
|
||||
+# endif(NOT WIN32)
|
||||
|
||||
install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||||
endif(NOT KDE_NO_DEPRECATED)
|
||||
@@ -111,14 +111,14 @@ if(QT_QTDESIGNER_FOUND)
|
||||
kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
|
||||
|
||||
target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
|
||||
- if(NOT WIN32)
|
||||
- set_target_properties(kdewebkitwidgets PROPERTIES
|
||||
- INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||
- SKIP_BUILD_RPATH TRUE
|
||||
- BUILD_WITH_INSTALL_RPATH TRUE
|
||||
- INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||
- )
|
||||
- endif(NOT WIN32)
|
||||
+# if(NOT WIN32)
|
||||
+# set_target_properties(kdewebkitwidgets PROPERTIES
|
||||
+# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||
+# SKIP_BUILD_RPATH TRUE
|
||||
+# BUILD_WITH_INSTALL_RPATH TRUE
|
||||
+# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||
+# )
|
||||
+# endif(NOT WIN32)
|
||||
|
||||
install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||||
|
||||
@@ -147,14 +147,14 @@ if(QT_QTDESIGNER_FOUND)
|
||||
kde4_add_plugin(kde3supportwidgets ${kde3supportwidgets_PART_SRCS})
|
||||
|
||||
target_link_libraries(kde3supportwidgets ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS})
|
||||
- if(NOT WIN32)
|
||||
- set_target_properties(kde3supportwidgets PROPERTIES
|
||||
- INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||
- SKIP_BUILD_RPATH TRUE
|
||||
- BUILD_WITH_INSTALL_RPATH TRUE
|
||||
- INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||
- )
|
||||
- endif(NOT WIN32)
|
||||
+# if(NOT WIN32)
|
||||
+# set_target_properties(kde3supportwidgets PROPERTIES
|
||||
+# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||
+# SKIP_BUILD_RPATH TRUE
|
||||
+# BUILD_WITH_INSTALL_RPATH TRUE
|
||||
+# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||
+# )
|
||||
+# endif(NOT WIN32)
|
||||
|
||||
install(TARGETS kde3supportwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||||
endif (QT_QT3SUPPORT_FOUND)
|
||||
12
kdelibs.spec
12
kdelibs.spec
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.5.80
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -81,7 +81,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
|
|||
# this extra hassle (even though cmake is *supposed* to not add standard
|
||||
# paths (like /usr/lib64) already! With this, we can drop
|
||||
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
||||
Patch27: kdelibs-4.4.80-no_rpath.patch
|
||||
Patch27: kdelibs-4.5.80-no_rpath.patch
|
||||
|
||||
## upstreamable
|
||||
# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
|
||||
|
|
@ -453,11 +453,6 @@ rm -rf %{buildroot}
|
|||
%{_kde4_libexecdir}/start_kdeinit
|
||||
%{_kde4_libexecdir}/start_kdeinit_wrapper
|
||||
%{_kde4_libdir}/kde4/plugins/
|
||||
# FIXME: comes from rpath snippets in kdewidgets/CMakeLists.txt
|
||||
#ERROR 0001: file '/usr/lib64/kde4/plugins/designer/kde3supportwidgets.so' contains a standard rpath '/usr/lib64' in [/usr/lib64]
|
||||
#ERROR 0001: file '/usr/lib64/kde4/plugins/designer/kdedeprecated.so' contains a standard rpath '/usr/lib64' in [/usr/lib64]
|
||||
#ERROR 0001: file '/usr/lib64/kde4/plugins/designer/kdewebkitwidgets.so' contains a standard rpath '/usr/lib64' in [/usr/lib64]
|
||||
#ERROR 0001: file '/usr/lib64/kde4/plugins/designer/kdewidgets.so' contains a standard rpath '/usr/lib64' in [/usr/lib64]
|
||||
%{_kde4_sysconfdir}/xdg/menus/*.menu
|
||||
%{_mandir}/man1/checkXML.1*
|
||||
%{_mandir}/man1/kde4-config.1*
|
||||
|
|
@ -512,6 +507,9 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Nov 20 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.80-2
|
||||
- squash more rpath's
|
||||
|
||||
* Sat Nov 20 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.80-1
|
||||
- 4.5.80 (4.6beta1)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue