From: root <root@manualdev>
Date: Fri, 9 Sep 2022 15:59:33 +0000 (+0000)
Subject: Apply patch from Ubuntu to use gcc 11.
X-Git-Tag: archive/raspbian/3.17.3-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1e33411c15bab02e84e3b13bcf9c2ff8f3fad172;p=gambas3.git

Apply patch from Ubuntu to use gcc 11.
---

diff --git a/debian/changelog b/debian/changelog
index c204f7c9..34984f60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ gambas3 (3.17.3-2+rpi1) bookworm-staging; urgency=medium
   * Add build conflicts on libcgal-dev, it seems to break the build.
   * Fix clean target.
 
- -- Raspbian forward porter <root@raspbian.org>  Wed, 31 Aug 2022 09:08:50 +0000
+  [changes taken from 3.17.3-2ubuntu1 by Gianfranco Costamagna]
+  * Use gcc-11 for now to fix a strange armhf build failure
+
+ -- Peter Micheal Green <plugwash@raspbian.org>  Fri, 09 Sep 2022 15:58:13 +0000
 
 gambas3 (3.17.3-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index a5989ec4..376b1645 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Maintainer: Debian Gambas Team <team+debian-gambas@tracker.debian.org>
 Uploaders: Ian Haywood <ian@haywood.id.au>,
            Bastian Germann <bage@debian.org>,
            José L. Redrejo Rodríguez <jredrejo@debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 12), gcc-11 [armhf], g++-11 [armhf],
                gettext,
                libalure-dev,
                libbz2-dev,
diff --git a/debian/rules b/debian/rules
index 61c52cc5..b3a6309c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+ifeq (armhf,$(DEB_HOST_ARCH))
+  export CC=gcc-11
+  export CXX=g++-11
+endif
+
 #export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export XDG_DATA_HOME=$(CURDIR)/debian/tmp/usr/share