Skip to content

Commit

Permalink
debian packaging: fix build on xenial
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Mar 25, 2019
1 parent cc0e375 commit b9011f0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
usr/lib/python*/*-packages/qgis/3d/__init__.py
usr/lib/python*/*-packages/qgis/_3d.so
#sid buster bionic cosmic#usr/lib/python*/*-packages/qgis/3d/__init__.py
#sid buster bionic cosmic#usr/lib/python*/*-packages/qgis/_3d.so
usr/lib/python*/*-packages/qgis/_analysis.so
usr/lib/python*/*-packages/qgis/_core.so
usr/lib/python*/*-packages/qgis/_gui.so
Expand Down
6 changes: 1 addition & 5 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ CMAKE_OPTS := \
-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\#') \
-DDOXYGEN_ON_DEMAND=TRUE
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')

ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
Expand Down Expand Up @@ -252,9 +251,6 @@ else
ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR)
endif

override_dh_auto_build-indep:
ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) apidoc

override_dh_auto_test: test-stamp

test-stamp:
Expand Down

0 comments on commit b9011f0

Please sign in to comment.