[Git][debian-gis-team/postgis][master] 2 commits: Re-enable SFCGAL support, FTBFS with CGAL 4.12 is fixed.

[Bas Couwenberg]

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


Commits:
83c7d487 by Bas Couwenberg at 2018-06-29T12:27:02+02:00
Re-enable SFCGAL support, FTBFS with CGAL 4.12 is fixed.

- - - - -
2f0e2a11 by Bas Couwenberg at 2018-06-29T20:54:43+02:00
Disable PIE only on older Ubuntu releases.

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/liblwgeom-2.4-0.symbols
- debian/rules
- debian/tests/test-extension-creation


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgis (2.4.4+dfsg-5) UNRELEASED; urgency=medium
+
+  * Re-enable SFCGAL support, FTBFS with CGAL 4.12 is fixed.
+  * Disable PIE only on older Ubuntu releases.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 Apr 2018 16:39:56 +0200
+
 postgis (2.4.4+dfsg-4) unstable; urgency=medium
 
   * Add patches to fix parallel build of other extensions.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,9 @@ Build-Depends: autoconf2.13,
                libjson-c-dev | libjson0-dev (>= 0.9~),
                libproj-dev (>= 4.6.0),
                libprotobuf-c-dev,
-#               libsfcgal-dev [!armel],
+               libsfcgal-dev [!armel],
                libxml2-dev (>= 2.5.0~),
+               lsb-release,
                po-debconf,
                postgresql-all,
                postgresql-common (>= 148~),


=====================================
debian/control.in
=====================================
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,8 +24,9 @@ Build-Depends: autoconf2.13,
                libjson-c-dev | libjson0-dev (>= 0.9~),
                libproj-dev (>= 4.6.0),
                libprotobuf-c-dev,
-#               libsfcgal-dev [!armel],
+               libsfcgal-dev [!armel],
                libxml2-dev (>= 2.5.0~),
+               lsb-release,
                po-debconf,
                postgresql-all,
                postgresql-common (>= 148~),


=====================================
debian/liblwgeom-2.4-0.symbols
=====================================
--- a/debian/liblwgeom-2.4-0.symbols
+++ b/debian/liblwgeom-2.4-0.symbols
@@ -2,11 +2,11 @@ liblwgeom-2.4.so.0 #PACKAGE# #MINVER#
  GBOX2GEOS at Base 2.2.0
  GEOS2LWGEOM at Base 2.0.0
  LWGEOM2GEOS at Base 2.0.0
-# (arch=!armel)LWGEOM2SFCGAL at Base 2.2.0
+ (arch=!armel)LWGEOM2SFCGAL at Base 2.2.0
  LWGEOM_GEOS_buildArea at Base 2.0.0
  LWGEOM_GEOS_getPointN at Base 2.0.0
  MULTITYPE at Base 2.1.5
-# (arch=!armel)SFCGAL2LWGEOM at Base 2.2.0
+ (arch=!armel)SFCGAL2LWGEOM at Base 2.2.0
  UF_create at Base 2.2.0
  UF_destroy at Base 2.2.0
  UF_find at Base 2.2.0
@@ -437,8 +437,8 @@ liblwgeom-2.4.so.0 #PACKAGE# #MINVER#
  lwgeom_set_geodetic at Base 2.0.0
  lwgeom_set_handlers at Base 2.1.0
  lwgeom_set_srid at Base 2.0.0
-# (arch=!armel)lwgeom_sfcgal_noop at Base 2.2.0
-# (arch=!armel)lwgeom_sfcgal_version at Base 2.2.0
+ (arch=!armel)lwgeom_sfcgal_noop at Base 2.2.0
+ (arch=!armel)lwgeom_sfcgal_version at Base 2.2.0
  lwgeom_sharedpaths at Base 2.0.0
  lwgeom_simplify at Base 2.0.0
  lwgeom_snap at Base 2.0.0


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,12 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 # Disable PIE on Ubuntu where it's still problematic
 VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
+DISTRIBUTION_RELEASE       := $(shell lsb_release -cs)
 
 ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
-	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+  ifneq (,$(filter $(DISTRIBUTION_RELEASE),trusty xenial artful bionic))
+    export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+  endif
 endif
 
 include /usr/share/dpkg/pkg-info.mk


=====================================
debian/tests/test-extension-creation
=====================================
--- a/debian/tests/test-extension-creation
+++ b/debian/tests/test-extension-creation
@@ -5,7 +5,7 @@ set -eu
 for v in $(pg_buildext supported-versions); do
 	pg_virtualenv -v $v sh -e <<-'EOF'
 	# test extension
-	for ext in postgis fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
+	for ext in postgis postgis_sfcgal fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
 		psql -eXc "CREATE EXTENSION $ext"
 	done
 	EOF



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/f1e29422226b0a125b678ede65215cff2362602f...2f0e2a11589eb2fdd5067cf2a93c77e4e611c892

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/f1e29422226b0a125b678ede65215cff2362602f...2f0e2a11589eb2fdd5067cf2a93c77e4e611c892
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/20180629/697026f3/attachment-0001.html>