Control: tags 769646 + patch
On 27/11/14 20:51, Simon McVittie wrote:
> In the short term, the attached should work for the ability to
> build android-platform-build on the architectures where android-libutils
> exists at all (amd64 and i386).
Here is the patch that I had intended to attach.
I would recommend test-building the whole stack in an i386 chroot before
uploading, using linux32(1) to get the "right" uname
(sbuild-createchroot sets this up for you automatically).
S
diff -Nru android-platform-system-core-21/debian/patches/libandroidcutils_makefile_pkgconfig android-platform-system-core-21/debian/patches/libandroidcutils_makefile_pkgconfig
--- android-platform-system-core-21/debian/patches/libandroidcutils_makefile_pkgconfig 2014-11-18 10:59:50.000000000 +0000
+++ android-platform-system-core-21/debian/patches/libandroidcutils_makefile_pkgconfig 2014-11-27 20:37:11.000000000 +0000
@@ -58,7 +58,7 @@
+ifeq ($(shell uname -m), armhf)
+ commonSources += atomic.c
+endif
-+ifeq ($(shell uname -m), i386)
++ifeq ($(shell uname -m | sed -e 's/i[3-9]86/i386/'), i386)
+ commonSources += atomic.c
+endif
+ifeq ($(shell uname -m), mips)
