Commit c5b95c2d authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

SuperBuild: rpath fix for qt4

parent b43cf013
......@@ -26,7 +26,7 @@ if(NOT __EXTERNAL_QT4__)
endif()
if(APPLE)
set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-framework -rpath")
set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-framework")
endif()
STRING(REGEX REPLACE "/$" "" CMAKE_WIN_INSTALL_PREFIX ${SB_INSTALL_PREFIX})
......@@ -82,8 +82,9 @@ if(NOT __EXTERNAL_QT4__)
)
endif()
FIX_RPATH_FOR_AUTOCONF_BUILD(QT4 "libQt*.dylib")
if(APPLE)
SUPERBUILD_PATCH_SOURCE(QT4 "patch-for-at-rpath")
endif()
set(_SB_QT_QMAKE_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/qmake)
......
diff -burN qt-everywhere-opensource-src-4.8.7.orig/mkspecs/macx-g++/qmake.conf qt-everywhere-opensource-src-4.8.7/mkspecs/macx-g++/qmake.conf
--- qt-everywhere-opensource-src-4.8.7.orig/mkspecs/macx-g++/qmake.conf 2016-04-18 17:22:33.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7/mkspecs/macx-g++/qmake.conf 2016-04-18 17:24:36.000000000 +0200
@@ -16,4 +16,7 @@
include(../common/mac.conf)
include(../common/gcc-base-macx.conf)
include(../common/g++-macx.conf)
+
+QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
+
load(qt_config)
diff -burN qt-everywhere-opensource-src-4.8.7.orig/qmake/generators/unix/unixmake2.cpp qt-everywhere-opensource-src-4.8.7/qmake/generators/unix/unixmake2.cpp
--- qt-everywhere-opensource-src-4.8.7.orig/qmake/generators/unix/unixmake2.cpp 2016-04-18 17:22:33.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7/qmake/generators/unix/unixmake2.cpp 2016-04-18 17:23:46.000000000 +0200
@@ -1180,7 +1180,7 @@
QString instpath = Option::fixPathToTargetOS(project->first("target.path"));
if(!instpath.endsWith(Option::dir_sep))
instpath += Option::dir_sep;
- soname.prepend(instpath);
+// soname.prepend(instpath);
}
project->values("QMAKE_LFLAGS_SONAME").first() += escapeFilePath(soname);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment