Improve multiarch support for sunxi-mali

extras-buildpkgs/sunxi-mali-r3p0/debian/patches/fix-libdir.patch

@@ -1,13 +0,0 @@
-diff --git a/Makefile.setup b/Makefile.setup
-index 9b1ef0d..4cf549b 100644
---- a/Makefile.setup
-+++ b/Makefile.setup
-@@ -1,6 +1,7 @@
- DESTDIR ?= /
- prefix ?= /usr/
--libdir ?= $(DESTDIR)$(prefix)lib/
-+libsubdir ?= 
-+libdir ?= $(DESTDIR)$(prefix)lib/$(libsubdir)/
- includedir ?= $(DESTDIR)$(prefix)/include
- 
- INSTALL ?= install

extras-buildpkgs/sunxi-mali-r3p0/debian/patches/fix-multiarch.patch

@@ -1,11 +1,12 @@
 diff --git a/.gitignore b/.gitignore
-index 6865abf..e8a3713 100644
+index 6865abf..2f0cfe4 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -1,2 +1,3 @@
+@@ -1,2 +1,4 @@
  config.mk
  *~
 +*.pc
++!Makefile.pc
 diff --git a/Makefile b/Makefile
 index 60d4a0f..ba752a8 100644
 --- a/Makefile
@@ -34,21 +35,24 @@ index 60d4a0f..ba752a8 100644
  	$(MAKE) -C test test
 diff --git a/Makefile.pc b/Makefile.pc
 new file mode 100644
-index 0000000..c51d18c
+index 0000000..cbdd167
 --- /dev/null
 +++ b/Makefile.pc
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,24 @@
 +include Makefile.setup
 +include config.mk
 +
 +all:
 +	echo "prefix=$(prefix)" > egl.pc
++	echo "libdir=$(prefix)lib/$(libsubdir)/" >> egl.pc
 +	cat egl.pc.in >> egl.pc
 +	sed -i "s/MVERSION/${MALI_VERSION}/g" egl.pc
 +	echo "prefix=$(prefix)" > gles_cm.pc
++	echo "libdir=$(prefix)lib/$(libsubdir)/" >> gles_cm.pc
 +	cat gles_cm.pc.in >> gles_cm.pc
 +	sed -i "s/MVERSION/${MALI_VERSION}/g" gles_cm.pc
 +	echo "prefix=$(prefix)" > glesv2.pc
++	echo "libdir=$(prefix)lib/$(libsubdir)/" >> glesv2.pc
 +	cat glesv2.pc.in >> glesv2.pc
 +	sed -i "s/MVERSION/${MALI_VERSION}/g" glesv2.pc
 +
@@ -59,14 +63,26 @@ index 0000000..c51d18c
 +clean:
 +	$(RM) egl.pc gles_cm.pc glesv2.pc
 +
+diff --git a/Makefile.setup b/Makefile.setup
+index 9b1ef0d..4cf549b 100644
+--- a/Makefile.setup
++++ b/Makefile.setup
+@@ -1,6 +1,7 @@
+ DESTDIR ?= /
+ prefix ?= /usr/
+-libdir ?= $(DESTDIR)$(prefix)lib/
++libsubdir ?= 
++libdir ?= $(DESTDIR)$(prefix)lib/$(libsubdir)/
+ includedir ?= $(DESTDIR)$(prefix)/include
+ 
+ INSTALL ?= install
 diff --git a/egl.pc.in b/egl.pc.in
 new file mode 100644
-index 0000000..0697183
+index 0000000..e5917b0
 --- /dev/null
 +++ b/egl.pc.in
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,10 @@
 +exec_prefix=${prefix}
-+libdir=${prefix}/lib
 +includedir=${prefix}/include
 +
 +Name: egl
@@ -78,12 +94,11 @@ index 0000000..0697183
 +Cflags: -I${includedir}
 diff --git a/gles_cm.pc.in b/gles_cm.pc.in
 new file mode 100644
-index 0000000..22bc348
+index 0000000..86f30fb
 --- /dev/null
 +++ b/gles_cm.pc.in
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,10 @@
 +exec_prefix=${prefix}
-+libdir=${prefix}/lib
 +includedir=${prefix}/include
 +
 +Name: gles_cm
@@ -95,12 +110,11 @@ index 0000000..22bc348
 +Cflags: -I${includedir}
 diff --git a/glesv2.pc.in b/glesv2.pc.in
 new file mode 100644
-index 0000000..efef2ed
+index 0000000..21cc87b
 --- /dev/null
 +++ b/glesv2.pc.in
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,10 @@
 +exec_prefix=${prefix}
-+libdir=${prefix}/lib
 +includedir=${prefix}/include
 +
 +Name: glesv2

extras-buildpkgs/sunxi-mali-r3p0/debian/patches/series

@@ -1,2 +1 @@
-pr-8.patch
-fix-libdir.patch
+fix-multiarch.patch

extras-buildpkgs/sunxi-mali-r3p0/debian/rules

@@ -12,6 +12,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 override_dh_auto_clean:
 override_dh_strip:
 
+override_dh_auto_build:
+	dh_auto_build -- libsubdir=$(DEB_HOST_MULTIARCH)
+
 override_dh_auto_configure:
 	make config VERSION=r3p0 ABI=armhf EGL_TYPE=x11