Update patches for dev-libs/wiringPi

4 files changed, 28 insertions, 35 deletions

diff --git a/dev-libs/wiringPi/files/2.44-devLib_Makefile.patch b/dev-libs/wiringPi/files/2.44-devLib_Makefile.patch
deleted file mode 100644
index 0bf9d91..0000000
--- a/dev-libs/wiringPi/files/2.44-devLib_Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- devLib/Makefile	2017-04-18 22:47:02.066600061 +0100
-+++ devLib/Makefile	2017-04-18 22:49:34.305024481 +0100
-@@ -37,7 +37,7 @@
- #DEBUG	= -g -O0
- DEBUG	= -O2
- CC	= gcc
--INCLUDE	= -I.
-+INCLUDE	= -I. -I../wiringPi
- DEFS	= -D_GNU_SOURCE
- CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
- 
-@@ -93,8 +93,7 @@
- 	$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 $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
--	$Q $(LDCONFIG)
-+	$Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
- 
- .PHONY:	install-static
- install-static:	$(STATIC)
diff --git a/dev-libs/wiringPi/files/2.44-makefiles.patch b/dev-libs/wiringPi/files/2.44-makefiles.patch
new file mode 100644
index 0000000..1cdf417
--- /dev/null
+++ b/dev-libs/wiringPi/files/2.44-makefiles.patch
@@ -0,0 +1,26 @@
+iff -urN wiringPi-2.44/devLib/Makefile wiringPi-2.44.new/devLib/Makefile
+--- wiringPi-2.44/devLib/Makefile       2018-07-30 20:44:55.347835224 +0200
++++ wiringPi-2.44.new/devLib/Makefile   2018-07-30 20:48:02.123365106 +0200
+@@ -93,8 +93,7 @@
+        $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 $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so
+-       $Q $(LDCONFIG)
++       $Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)       $(DESTDIR)/lib/libwiringPiDev.so
+ 
+ .PHONY:        install-static
+ install-static:        $(STATIC)
+diff -urN wiringPi-2.44/wiringPi/Makefile wiringPi-2.44.new/wiringPi/Makefile
+--- wiringPi-2.44/wiringPi/Makefile     2018-07-30 20:44:55.309835523 +0200
++++ wiringPi-2.44.new/wiringPi/Makefile 2018-07-30 20:47:33.309591901 +0200
+@@ -104,8 +104,7 @@
+        $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 $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)    $(DESTDIR)/lib/libwiringPi.so
+-       $Q $(LDCONFIG)
++       $Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)  $(DESTDIR)/lib/libwiringPi.so
+ 
+ .PHONY:        install-static
+ install-static:        $(STATIC)
diff --git a/dev-libs/wiringPi/files/2.44-wiringPi_Makefile.patch b/dev-libs/wiringPi/files/2.44-wiringPi_Makefile.patch
deleted file mode 100644
index c41d17e..0000000
--- a/dev-libs/wiringPi/files/2.44-wiringPi_Makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- wiringPi/Makefile	2017-04-18 22:50:38.951022128 +0100
-+++ wiringPi/Makefile	2017-04-18 22:51:19.747265645 +0100
-@@ -104,8 +104,7 @@
- 	$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 $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
--	$Q $(LDCONFIG)
-+	$Q ln -sf --relative $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
- 
- .PHONY:	install-static
- install-static:	$(STATIC)
diff --git a/dev-libs/wiringPi/wiringPi-2.44-r7.ebuild b/dev-libs/wiringPi/wiringPi-2.44-r7.ebuild
index d260567..f3376b6 100644
--- a/dev-libs/wiringPi/wiringPi-2.44-r7.ebuild
+++ b/dev-libs/wiringPi/wiringPi-2.44-r7.ebuild
@@ -23,6 +23,8 @@ EGIT_COMMIT="${PV}"
 DEPEND=""
 RDEPEND="
 	${DEPEND}"
+	
+PATCHES=( "${FILESDIR}/${PV}-makefiles.patch" )
 
 src_prepare() {
 	local DIR
@@ -51,8 +53,6 @@ src_prepare() {
 	# the 'Hardware' line in /proc/cpuinfo, which the wiringPi library
 	# checks, by making it look in /etc/wiringpi/cpuinfo instead
 	use arm64 && epatch "${FILESDIR}/${PV}-pseudo-cpuinfo.patch"
-	epatch "${FILESDIR}/${PV}-wiringPi_Makefile.patch"
-	epatch "${FILESDIR}/${PV}-devLib_Makefile.patch"
 	default
 }