qt3: remove rpath
This commit is contained in:
parent
8b8883bb98
commit
e1f0a23c55
@ -1,3 +1,4 @@
|
||||
4e867c2504fe0c4e3fe32e8464db225d qt-x11-free-3.3.5-no-rpath.patch
|
||||
dc1384c03ac08af21f6fefab32d982cf qt-x11-free-3.3.6.tar.bz2
|
||||
7f17be4be458fd40e9bfb9c80a33b48a qt3-3.3.6-1-patches.tar.bz2
|
||||
7d8d3356a17201832e361df69c63e9a4 qt3-3.3.6-gcc4.patch
|
||||
|
@ -6,9 +6,11 @@
|
||||
|
||||
name=qt3
|
||||
version=3.3.6
|
||||
release=1
|
||||
release=2
|
||||
source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-$version.tar.bz2 \
|
||||
http://crux.danm.de/files/dist/$name/$version/$name-$version-1-patches.tar.bz2 $name-$version-gcc4.patch)
|
||||
http://crux.danm.de/files/dist/$name/$version/$name-$version-1-patches.tar.bz2
|
||||
$name-$version-gcc4.patch
|
||||
qt-x11-free-3.3.5-no-rpath.patch)
|
||||
|
||||
build() {
|
||||
cd qt-x11-free-$version
|
||||
@ -20,6 +22,7 @@ build() {
|
||||
|
||||
# gcc4 + 64bit issue
|
||||
patch -p1 -i $SRC/$name-$version-gcc4.patch
|
||||
patch -p0 -i $SRC/qt-x11-free-3.3.5-no-rpath.patch
|
||||
|
||||
local SQL
|
||||
if [ "`pkginfo -i | grep mysql`" ];then
|
||||
|
25
qt3/qt-x11-free-3.3.5-no-rpath.patch
Normal file
25
qt3/qt-x11-free-3.3.5-no-rpath.patch
Normal file
@ -0,0 +1,25 @@
|
||||
Avoid setting rpath
|
||||
|
||||
http://cvs.mandriva.com/cgi-bin/viewvc.cgi/SPECS/qt3/qt-x11-free-3.3.5-no-rpath.patch?revision=1.3&view=markup
|
||||
|
||||
--- mkspecs/linux-g++-64/qmake.conf
|
||||
+++ mkspecs/linux-g++-64/qmake.conf
|
||||
@@ -59,7 +59,7 @@
|
||||
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-soname,
|
||||
QMAKE_LFLAGS_THREAD =
|
||||
-QMAKE_RPATH = -Wl,-rpath,
|
||||
+QMAKE_RPATH =
|
||||
|
||||
QMAKE_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD = -ldl
|
||||
--- mkspecs/linux-g++/qmake.conf
|
||||
+++ mkspecs/linux-g++/qmake.conf
|
||||
@@ -56,7 +56,6 @@
|
||||
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-soname,
|
||||
QMAKE_LFLAGS_THREAD =
|
||||
-QMAKE_RPATH = -Wl,-rpath,
|
||||
|
||||
QMAKE_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD = -ldl
|
Loading…
x
Reference in New Issue
Block a user