Set the correct multilib path for wiringPi

3 files changed, 115 insertions, 3 deletions

diff --git a/dev-libs/wiringPi/Manifest b/dev-libs/wiringPi/Manifest
index 0c105aa..bb0b131 100644
--- a/dev-libs/wiringPi/Manifest
+++ b/dev-libs/wiringPi/Manifest
@@ -1,6 +1,7 @@
 AUX 2.44-devLib_Makefile.patch 801 SHA256 baba50e9776602ea03780d6faaf4820a9083b19dd60637116d531b7fefa24ecb SHA512 4e11b29040a31d91d107aebbcded416b02ea5ff8e60cdfba68e9e1a36e6d87d21b97947ff3ccb2a48f4edbf7c645d171f45a531a4e93e1db30f860d16881ac32 WHIRLPOOL 57f6c052132e82b56297296b90b834cd6ddb67bca48bca69163f9545e75fc1527ae80fa362bccc991197f6075fb2abbca57e806b4a8c15ba074a412d27ffda21
+AUX 2.44-multilib_strict.patch 5579 SHA256 0564f1c4d7b4d932e4be117f96bbc2491165dd869adff24d497f306690c9fb64 SHA512 fbacc6a098e51553981a2cf67f93c5360aa6beeb8d3b6ba56e8c07d35d2a32672cdbe41dfdd6f2dd61693e907d359b1e62624444df74b02a76e407935e744704 WHIRLPOOL ec502ac699ca2f76874c190ad634bd39f4194b9b973fbcca092a771d391937194047510090ba676ea3675bef99a159718abe055c37ef9e1618793b3b01e8ef13
 AUX 2.44-wiringPi_Makefile.patch 587 SHA256 2d51793065269ec3eebc85ffd43399bafe00b4ae0ce3a319fe513538dd8b2cb9 SHA512 fd7f369fce120facd89a4346278552a6bfc30b69868a9e4a1223067fa44a82fcc7d8189c86431b14b155c424d85aa703de1472c10cd75661a058be22290f1539 WHIRLPOOL c674c849ec80ffc8b2314a8f56630488af80a1a9fc1370674f277e0b72ac97edbd838c0e6667baed3c1876ced719fa320da5e6f08ed3e84618117889fbdee081
 AUX devLib_Makefile.patch 976 SHA256 058b8341ed58cdd6a879edcb2c86e8e3c4bfbbad4f3bf3cfce4f66c7a5d38f09 SHA512 ad88b569d24b8c25832f5c4d60aeb895c5f4abac305737419a0644c581cd12d113e9620c58a70f67bdea3506f839eba788561b6e61dc0090c6df837bfdc82e3c WHIRLPOOL ab96f407e0201ea80a8dbc9a31006178feeaeb4d694e6db1ac288cc380f73ecda6035c2b14937618c480cf1ccbc86e153beb54933e273bb0d317bd1407175b37
 AUX wiringPi_Makefile.patch 782 SHA256 3943ce41bb617ed79e96aaeeade12d7ee56e9253994527376e200b95f51c5a6c SHA512 9f4758df45c1ebde15bf42f14ec608c7d62ba2e624a6a971a5d2812024386f0c621de2dc539035884bcfce16314c07975ed019023492dd5d6e9dc9f042f4e888 WHIRLPOOL 85b3b9e78c8de6fc90447df32a9b8ae4130400d838b68ab28eda23427a04331c22c1825441aeb244191e9264a46b8aa592636f7d313510c44eac2ee8157d097c
 DIST wiringPi-2.44.tar.gz 159030 SHA256 548ffb87bdf147758503a3aa5a725ef90525134c2ec9d04d3e0ed452c2c5f7ce SHA512 b21bb602ee27232562ae0ce603b5d0537dc5cce5bc803adeba9bdb2b5eaec8df8205fb122c72624d12ead2f64176139c3e7fc17c8429297391911535bd8f159b WHIRLPOOL df5bebf2a743af0328abb7ac0a61efa1767ca0dddacdeeb36512eb0d362b504bf36fb07f3fc7c91f5e1b25647b14afe3a148f5340a246ce5335dec0dac60bb7f
-EBUILD wiringPi-2.44.ebuild 853 SHA256 0d08185b3a42e84577e0dcdbadcd9e3e54fd4221d0bbf18f291e8efd6eaf078c SHA512 7337619d08faf7af85fa4f46fbc5ce5627b0d968f2d06a63b617baef816f3445c09e2965df1b61cc20e39bda8ac4c8b48354212a967159b2d69a93a94fa5216f WHIRLPOOL aacf44e3bc6689a3273a05ed890f7bf4244e6f4ff51e0712ecb2fd52eadbe49130c7120e048d4e72ec21f1a0d952cfceb71037e09c4780d8e6e1360b5439b7d7
+EBUILD wiringPi-2.44.ebuild 937 SHA256 791d5de726aac3132796c3943195f88950549259a0bf8e320448ebe1f9fb90c8 SHA512 1f4e9720e4bf46de10804b98bb3c472e44eae7156b19ae1352adb446a3f09bc6a48a4c58a586141c3073422d370817cc35c2f8332a4369a7a59fd81bbdf81f20 WHIRLPOOL 910f3ce95124366acae8131be8f173033b037e693ede8959845187d3cb86d51469f4185dad1ba7c3846913a676bb893a3c2c7b16a9c0a4075982f4afaff5a085
diff --git a/dev-libs/wiringPi/files/2.44-multilib_strict.patch b/dev-libs/wiringPi/files/2.44-multilib_strict.patch
new file mode 100644
index 0000000..eadf77d
--- /dev/null
+++ b/dev-libs/wiringPi/files/2.44-multilib_strict.patch
@@ -0,0 +1,110 @@
+diff -Nur wiringPi-2.44/devLib/Makefile wiringPi-2.44.new/devLib/Makefile
+--- wiringPi-2.44/devLib/Makefile	2017-12-16 12:32:49.281271778 -0800
++++ wiringPi-2.44.new/devLib/Makefile	2017-12-16 12:33:18.357589214 -0800
+@@ -24,6 +24,7 @@
+ VERSION=$(shell cat ../VERSION)
+ DESTDIR?=/usr
+ PREFIX?=/local
++LIBSUBDIR?=lib
+ 
+ LDCONFIG?=ldconfig
+ 
+@@ -91,9 +92,9 @@
+ 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
+ 	$Q install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
+ 	$Q echo "[Install Dynamic Lib]"
+-	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+-	$Q install -m 0755 libwiringPiDev.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
+-	$Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
++	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/$(LIBSUBDIR)
++	$Q install -m 0755 libwiringPiDev.so.$(VERSION)			$(DESTDIR)$(PREFIX)/$(LIBSUBDIR)/libwiringPiDev.so.$(VERSION)
++	$Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/$(LIBSUBDIR)/libwiringPiDev.so
+ 
+ .PHONY:	install-static
+ install-static:	$(STATIC)
+@@ -101,8 +102,8 @@
+ 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
+ 	$Q install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
+ 	$Q echo "[Install Static Lib]"
+-	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+-	$Q install -m 0755 libwiringPiDev.a				$(DESTDIR)$(PREFIX)/lib
++	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/$(LIBSUBDIR)
++	$Q install -m 0755 libwiringPiDev.a				$(DESTDIR)$(PREFIX)/$(LIBSUBDIR)
+ 
+ .PHONY:	install-deb
+ install-deb:	$(DYNAMIC)
+@@ -110,15 +111,15 @@
+ 	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/include
+ 	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian-template/wiringPi/usr/include
+ 	$Q echo "[Install Dynamic Lib: deb]"
+-	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/lib
+-	install -m 0755 libwiringPiDev.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
+-	ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so
++	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/$(LIBSUBDIR)
++	install -m 0755 libwiringPiDev.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/$(LIBSUBDIR)/libwiringPiDev.so.$(VERSION)
++	ln -sf ~/wiringPi/debian-template/wiringPi/usr/$(LIBSUBDIR)/libwiringPiDev.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/$(LIBSUBDIR)/libwiringPiDev.so
+ 
+ .PHONY:	uninstall
+ uninstall:
+ 	$Q echo "[UnInstall]"
+ 	$Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
+-	$Q cd $(DESTDIR)$(PREFIX)/lib/     && rm -f libwiringPiDev.*
++	$Q cd $(DESTDIR)$(PREFIX)/$(LIBSUBDIR)/     && rm -f libwiringPiDev.*
+ 	$Q $(LDCONFIG)
+ 
+ 
+diff -Nur wiringPi-2.44/wiringPi/Makefile wiringPi-2.44.new/wiringPi/Makefile
+--- wiringPi-2.44/wiringPi/Makefile	2017-12-16 12:32:49.257271516 -0800
++++ wiringPi-2.44.new/wiringPi/Makefile	2017-12-16 12:33:18.405589738 -0800
+@@ -24,6 +24,7 @@
+ VERSION=$(shell cat ../VERSION)
+ DESTDIR?=/usr
+ PREFIX?=/local
++LIBSUBDIR?=lib
+ 
+ LDCONFIG?=ldconfig
+ 
+@@ -102,9 +103,9 @@
+ 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
+ 	$Q install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
+ 	$Q echo "[Install Dynamic Lib]"
+-	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+-	$Q install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
+-	$Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
++	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/$(LIBSUBDIR)
++	$Q install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/$(LIBSUBDIR)/libwiringPi.so.$(VERSION)
++	$Q ln -sf --relative $(DESTDIR)$(PREFIX)/$(LIBSUBDIR)/libwiringPi.so.$(VERSION)	$(DESTDIR)/$(LIBSUBDIR)/libwiringPi.so
+ 
+ .PHONY:	install-static
+ install-static:	$(STATIC)
+@@ -112,8 +113,8 @@
+ 	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
+ 	$Q install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
+ 	$Q echo "[Install Static Lib]"
+-	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+-	$Q install -m 0755 libwiringPi.a					$(DESTDIR)$(PREFIX)/lib
++	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/$(LIBSUBDIR)
++	$Q install -m 0755 libwiringPi.a					$(DESTDIR)$(PREFIX)/$(LIBSUBDIR)
+ 
+ .PHONY:	install-deb
+ install-deb:	$(DYNAMIC)
+@@ -121,15 +122,15 @@
+ 	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/include
+ 	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian-template/wiringPi/usr/include
+ 	$Q echo "[Install Dynamic Lib: deb]"
+-	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/lib
+-	install -m 0755 libwiringPi.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
+-	ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so
++	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/$(LIBSUBDIR)
++	install -m 0755 libwiringPi.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/$(LIBSUBDIR)/libwiringPi.so.$(VERSION)
++	ln -sf ~/wiringPi/debian-template/wiringPi/usr/$(LIBSUBDIR)/libwiringPi.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/$(LIBSUBDIR)/libwiringPi.so
+ 
+ .PHONY:	uninstall
+ uninstall:
+ 	$Q echo "[UnInstall]"
+ 	$Q cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
+-	$Q cd $(DESTDIR)$(PREFIX)/lib/     && rm -f libwiringPi.*
++	$Q cd $(DESTDIR)$(PREFIX)/$(LIBSUBDIR)/     && rm -f libwiringPi.*
+ 	$Q $(LDCONFIG)
+ 
+ 
diff --git a/dev-libs/wiringPi/wiringPi-2.44.ebuild b/dev-libs/wiringPi/wiringPi-2.44.ebuild
index c7f6d5a..b94ba46 100644
--- a/dev-libs/wiringPi/wiringPi-2.44.ebuild
+++ b/dev-libs/wiringPi/wiringPi-2.44.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="3"
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A 'wiring' like library for the Raspberry Pi"
 HOMEPAGE="http://wiringpi.com/"
@@ -23,6 +23,7 @@ MAKEDIRS="wiringPi devLib"
 src_prepare() {
 	epatch "${FILESDIR}/2.44-wiringPi_Makefile.patch"
 	epatch "${FILESDIR}/2.44-devLib_Makefile.patch"
+	epatch "${FILESDIR}/2.44-multilib_strict.patch"
 }
 
 src_compile() {
@@ -35,6 +36,6 @@ src_compile() {
 src_install() {
 	for d in ${MAKEDIRS}; do
 		cd "${WORKDIR}/${P}/${d}"	
-		emake DESTDIR="${D}/usr/" PREFIX="" install
+		emake DESTDIR="${D}/usr/" LIBSUBDIR="$(get_libdir)" PREFIX="" install
 	done
 }