47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
--- qt/python.orig.pri 2015-08-05 02:37:57.000000000 +0200
|
|
+++ qt/python.pri 2015-08-06 15:00:39.629556754 +0200
|
|
@@ -14,41 +14,11 @@
|
|
}
|
|
|
|
linux {
|
|
- QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes)
|
|
- QMAKE_LFLAGS += $$system(/usr/bin/python3-config --ldflags)
|
|
+ QMAKE_CXXFLAGS += $$system(/usr/bin/python@@pythonversion@@-config --includes)
|
|
+ QMAKE_LFLAGS += $$system(/usr/bin/python@@pythonversion@@-config --ldflags)
|
|
|
|
# Even though this is in QMAKE_LFLAGS, the linker is picky about
|
|
# library ordering (so it needs to be here too).
|
|
LIBS += -lpython3.4m
|
|
-
|
|
- # ldconfig is being used to find libboost_python, but it's in a different
|
|
- # place in different distros (and is not in the default $PATH on Debian).
|
|
- # First, check to see if it's on the default $PATH.
|
|
- system(which ldconfig > /dev/null) {
|
|
- LDCONFIG_BIN = "ldconfig"
|
|
- }
|
|
- # If that failed, then search for it in its usual places.
|
|
- isEmpty(LDCONFIG_BIN) {
|
|
- for(p, $$list(/sbin/ldconfig /usr/bin/ldconfig)) {
|
|
- exists($$p): LDCONFIG_BIN = $$p
|
|
- }
|
|
- }
|
|
- # If that search failed too, then exit with an error.
|
|
- isEmpty(LDCONFIG_BIN) {
|
|
- error("Could not find ldconfig!")
|
|
- }
|
|
-
|
|
- # Check for different boost::python naming schemes
|
|
- LDCONFIG_OUT = $$system($$LDCONFIG_BIN -p|grep python)
|
|
- for (b, $$list(boost_python-py34 boost_python3)) {
|
|
- contains(LDCONFIG_OUT, "lib$${b}.so") {
|
|
- LIBS += "-l$$b"
|
|
- GOT_BOOST_PYTHON = True
|
|
- }
|
|
- }
|
|
-
|
|
- # If we couldn't find boost::python, exit with an error.
|
|
- isEmpty(GOT_BOOST_PYTHON) {
|
|
- error("Could not find boost::python3")
|
|
- }
|
|
+ LIBS += -lboost_python3
|
|
}
|