summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-12-15 14:49:30 (GMT)
committerTobias Markmann <tm@ayena.de>2016-12-15 14:49:46 (GMT)
commit6cd7bef6eb507f979d7c964769429ef46e3e5aa9 (patch)
tree322d5c80e7be477758a8e97ecd8a64fbb09836de /Swift/QtUI
parent864904bcd7931ff7453ecb1de72496e4e3cf9c96 (diff)
parent2efefdc5ae847f5d187762e474d75c61560cba19 (diff)
downloadswift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.zip
swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.tar.bz2
Merge branch 'swift-3.x’
* swift-3.x: - Fix building Swift on 32-bit Linux distributions - Remove optional_fwd.hpp use; workaround for Boost Bug #12179 - Split COPYING.thirdparty in contributions/dependencies - Fixes for building packages on Debian Conflicts: BuildTools/SCons/SConstruct Sluift/Console.h Sluift/ITunesInterface.h Sluift/Terminal.h Swift/Packaging/Debian/debian/control.in Swift/QtUI/SConscript Swiften/Elements/Stanza.h Swiften/FileTransfer/FileTransferTransporter.h Swiften/FileTransfer/IBBReceiveSession.h Swiften/JID/JID.h Swiften/Network/BoostConnectionServer.h Swiften/Network/ConnectionServer.h Swiften/Parser/AttributeMap.h Test-Information: Builds on macOS 10.12.1 with clang trunk. Change-Id: I9f41ab199f227bc106721627ea994313c68e5cfe
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/SConscript12
1 files changed, 11 insertions, 1 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index acfe7d0..88cb1ac 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -71,6 +71,16 @@ if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
myenv.EnableQt4Modules(qt4modules, debug = False, version = qt_version)
+myenv.Append(CPPPATH = ["."])
+
+# Qt requires applications to be build with the -fPIC flag on some 32-bit Linux distributions.
+if env["PLATFORM"] == "posix" :
+ testEnv = myenv.Clone()
+ conf = Configure(testEnv)
+ if conf.CheckDeclaration("QT_REDUCE_RELOCATIONS", "#include <QtCore/qconfig.h>") and conf.CheckDeclaration("__i386__"):
+ myenv.AppendUnique(CXXFLAGS = "-fPIC")
+ testEnv = conf.Finish()
+
if env["PLATFORM"] == "win32" :
#myenv.Append(LINKFLAGS = ["/SUBSYSTEM:CONSOLE"])
myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
@@ -313,7 +323,7 @@ commonResources = {
}
myenv["TEXTFILESUFFIX"] = ""
-myenv.MyTextfile(target = "COPYING", source = [myenv.File("../../COPYING.gpl"), myenv.File("../../COPYING.thirdparty")], LINESEPARATOR = "\n\n========\n\n\n")
+myenv.MyTextfile(target = "COPYING", source = [myenv.File("../../COPYING.gpl"), myenv.File("../../COPYING.thirdparty"), myenv.File("../../COPYING.dependencies")], LINESEPARATOR = "\n\n========\n\n\n")
################################################################################
# Translation