[Git][debian-gis-team/qgis][master] Manually add --embed to rules file to fix FTBFS due to change in behaviour of...

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / qgis


Commits:
40c4264f by Bas Couwenberg at 2020-01-26T11:21:22+01:00
Manually add --embed to rules file to fix FTBFS due to change in behaviour of python3-config --ldflags (from doko). (closes: #949864)

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,9 @@
 qgis (3.4.15+dfsg-2) UNRELEASED; urgency=medium
 
   * Bump Standards-Version to 4.5.0, no changes.
+  * Manually add --embed to rules file to fix FTBFS due to change in
+    behaviour of python3-config --ldflags (from doko).
+    (closes: #949864)
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 25 Jan 2020 11:11:29 +0100
 


=====================================
debian/rules
=====================================
@@ -57,6 +57,8 @@ GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
 GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
 GRASSABI=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2,3|sed -e 's/RC/-/'))
 
+PYTHON_GE_38=$(shell python3 -c 'import sys; print(1) if(sys.version_info[0] > 3 or (sys.version_info[0] == 3 and sys.version_info[1] >= 8)) else print(0)')
+
 # Include percentage of started edges
 export NINJA_STATUS=[%f/%t %p]
 
@@ -92,8 +94,13 @@ CMAKE_OPTS := \
 	-DWITH_SERVER=TRUE \
 	-DWITH_SERVER_PLUGINS=TRUE \
 	-DWITH_QWTPOLAR=FALSE \
-	-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
-	-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
+	-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR)
+
+ifeq ($(PYTHON_GE_38),1)
+	CMAKE_OPTS += -DPYTHON_LIBRARY=$(shell python3-config --ldflags --embed | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
+else
+	CMAKE_OPTS += -DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
+endif
 
 ifneq ($(SHA),)
 	CMAKE_OPTS += -DSHA=$(SHA)



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/40c4264f4d842e725ebb906d67ea336c0e43b1e2

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/commit/40c4264f4d842e725ebb906d67ea336c0e43b1e2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200126/7d5bd376/attachment-0001.html>