[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/libomemo][debian/master] 3 commits: d/patches: Fix crossbuild issue

[Evangelos Ribeiro Tzaras (@devrtz)]

Evangelos Ribeiro Tzaras pushed to branch debian/master at Debian On Mobile / libomemo


Commits:
973c90bf by Helmut Grohne at 2022-01-13T12:08:43+01:00
d/patches: Fix crossbuild issue

Using $(CC) makes sure we use the host multiarch triplet.

- - - - -
2436cd42 by Evangelos Ribeiro Tzaras at 2022-01-13T12:10:24+01:00
Document and release 0.7.0-2

- - - - -
2b620ee2 by Evangelos Ribeiro Tzaras at 2022-01-13T11:36:36+00:00
Merge branch 'fix-crossbuild' into 'debian/master'

d/patches: Fix crossbuild issue and release

See merge request DebianOnMobile-team/libomemo!2
- - - - -


4 changed files:

- debian/changelog
- + debian/patches/cross.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+libomemo (0.7.0-2) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix cross-misbuild: Derive the multiarch triplet from the host CC.
+    (Closes: #1003476)
+
+  [ Evangelos Ribeiro Tzaras ]
+  * CI: disable aptly
+  * d/patches: Unbreak parallel builds
+
+ -- Evangelos Ribeiro Tzaras <devrtz-debian at fortysixandtwo.eu>  Thu, 13 Jan 2022 12:03:10 +0100
+
 libomemo (0.7.0-1) unstable; urgency=medium
 
   [Evangelos Ribeiro Tzaras]


=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,18 @@
+From: f2440aeb98c8dd8fa796f9c84b711f8debf34951
+From: Helmut Grohne <helmut at subdivi.de>
+Date: Thu, 13 Jan 2022 12:00:34 +0100
+Subject: Fix crossbuild issue
+
+Don't hardcode gcc because that will pick up the build architecture,
+rather than the desired host architecture.
+--- libomemo-0.7.0.orig/Makefile
++++ libomemo-0.7.0/Makefile
+@@ -6,7 +6,7 @@
+ MKDIR = mkdir
+ MKDIR_P = mkdir -p
+ 
+-ARCH = $(shell gcc -print-multiarch)
++ARCH = $(shell $(CC) -print-multiarch)
+ VER_MAJ = 0
+ VERSION = 0.7.0
+ 


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001-Makefile-Fix-possible-race-condition-in-test-targets.patch
+cross.patch


=====================================
debian/rules
=====================================
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDTOOLS=1
+-include /usr/share/dpkg/buildtools.mk
 
 # version are the first two decimals
 SOVERSION := 0.7.0



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libomemo/-/compare/3d7d1c106023d32db0c2737ec8bbbddbe1b9ddf2...2b620ee26654e61344d5064fc538cab8108e24eb

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/libomemo/-/compare/3d7d1c106023d32db0c2737ec8bbbddbe1b9ddf2...2b620ee26654e61344d5064fc538cab8108e24eb
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/debian-on-mobile-maintainers/attachments/20220113/9c49e7e1/attachment-0001.htm>