[Git][debian-gis-team/postgis][master] Revert LTO changes.

[Bas Couwenberg (@sebastic)]

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


Commits:
8e652f3b by Bas Couwenberg at 2023-07-27T09:24:46+02:00
Revert LTO changes.

- - - - -


3 changed files:

- debian/changelog
- debian/rules
- debian/tests/test-extension-creation


Changes:

=====================================
debian/changelog
=====================================
@@ -6,8 +6,6 @@ postgis (3.3.3+dfsg-4) UNRELEASED; urgency=medium
     https://trac.osgeo.org/postgis/ticket/5448
   * Add patch to fix FTBFS on powerpc architectures.
     https://trac.osgeo.org/postgis/ticket/5450
-  * Disable LTO on i386 instead of ignoring test failures.
-    https://trac.osgeo.org/postgis/ticket/5448
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 27 Jul 2023 07:39:16 +0200
 


=====================================
debian/rules
=====================================
@@ -18,21 +18,13 @@ include /usr/share/dpkg/pkg-info.mk
 include /usr/share/postgresql-common/pgxs_debian_control.mk
 
 # Ignore testsuite failures on these architectures
-IGNORE_TEST_FAILURE_ARCHS = mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64
+IGNORE_TEST_FAILURE_ARCHS = i386 mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64
 ifneq (,$(filter $(DEB_BUILD_ARCH),$(IGNORE_TEST_FAILURE_ARCHS)))
 	TEST_FAIL_COMMAND = echo "Ignoring test failures"
 else
 	TEST_FAIL_COMMAND = exit 1
 endif
 
-# Disable LTO on i386
-ifneq (,$(filter $(DEB_BUILD_ARCH),i386))
-export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
-ENABLE_LTO=--disable-lto
-else
-ENABLE_LTO=--enable-lto
-endif
-
 # Upstream version (including ~rcN) for symbols version
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 


=====================================
debian/tests/test-extension-creation
=====================================
@@ -8,7 +8,7 @@ unset LC_ALL LANGUAGE
 ARCH="$(dpkg-architecture -qDEB_BUILD_ARCH)"
 
 case $ARCH in
-	armel|armhf|mips|mips64el|mipsel|s390x|alpha|hppa|hurd-i386|kfreebsd-i386|powerpc|ppc64|sparc64)
+	armel|armhf|i386|mips|mips64el|mipsel|s390x|alpha|hppa|hurd-i386|kfreebsd-i386|powerpc|ppc64|sparc64)
 		echo "Ignoring test failures on problematic architectures"
 		TEST_FAIL_EXITCODE=77 ;;
 	*)



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/8e652f3b36d91e553bfa5af4e42d9fc8337d652b
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/20230727/a50ec902/attachment-0001.htm>