[Git][debian-gis-team/qgis][master] Drop unused PYTHON_LIBRARY variable.

[Bas Couwenberg (@sebastic)]

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


Commits:
8d07568c by Bas Couwenberg at 2022-11-27T08:22:58+01:00
Drop unused PYTHON_LIBRARY variable.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+qgis (3.22.13+dfsg-2) UNRELEASED; urgency=medium
+
+  * Drop unused PYTHON_LIBRARY variable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 27 Nov 2022 08:22:04 +0100
+
 qgis (3.22.13+dfsg-1) unstable; urgency=medium
 
   * Update symbols for other architectures.


=====================================
debian/rules
=====================================
@@ -57,8 +57,6 @@ 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]
 
@@ -99,16 +97,9 @@ CMAKE_OPTS := \
 	-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so \
 	-DWITH_HANA=TRUE \
 	-DWITH_EPT=TRUE \
+	-DPython_FIND_UNVERSIONED_NAMES=FIRST \
 	-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR)
 
-
-ifeq ($(PYTHON_GE_38),1)
-	CMAKE_OPTS += -DPYTHON_LIBRARY=$(shell python3-config --ldflags --embed | sed -e 's at -L\(.*\) -L[^ ]* -l\([^ ]*\) .*$$@\1/lib\2.so@')
-	CMAKE_OPTS += -DPython_FIND_UNVERSIONED_NAMES=FIRST
-else
-	CMAKE_OPTS += -DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's at -L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$@\1/lib\2.so@')
-endif
-
 ifneq ($(SHA),)
 	CMAKE_OPTS += -DSHA=$(SHA)
 endif



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/8d07568c7cc9cf966fb0e0252efc23f856d130f1
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/20221127/b67c2093/attachment-0001.htm>