summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCtibor Brančík <ctibor@brancik.cz>2018-07-30 21:25:09 +0200
committerCtibor Brančík <ctibor@brancik.cz>2018-07-30 21:25:09 +0200
commit0372cfd7407ee3d8effd46719b30cf1f7a07390d (patch)
treee75d250f52bf8ec7e45c6e35e9b5f3ed8d95bf0b
parentb1b65d4451751b3ce173231c5f7da9044dd761c3 (diff)
downloadbrancik-overlay-0372cfd7407ee3d8effd46719b30cf1f7a07390d.tar.gz
brancik-overlay-0372cfd7407ee3d8effd46719b30cf1f7a07390d.tar.bz2
Adjust patch for dev-libs/wiringPi
-rw-r--r--dev-libs/wiringPi/files/2.44-makefiles.patch42
-rw-r--r--dev-libs/wiringPi/wiringPi-2.44-r7.ebuild1
2 files changed, 21 insertions, 22 deletions
diff --git a/dev-libs/wiringPi/files/2.44-makefiles.patch b/dev-libs/wiringPi/files/2.44-makefiles.patch
index 1cdf417..c36ee01 100644
--- a/dev-libs/wiringPi/files/2.44-makefiles.patch
+++ b/dev-libs/wiringPi/files/2.44-makefiles.patch
@@ -1,26 +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
+diff -urN wiringPi-2.44/devLib/Makefile wiringPi-2.44.new/devLib/Makefile
+--- wiringPi-2.44/devLib/Makefile 2018-07-30 21:17:30.855974224 +0200
++++ wiringPi-2.44.new/devLib/Makefile 2018-07-30 21:19:09.916828129 +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
+ $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)
+ .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
+--- wiringPi-2.44/wiringPi/Makefile 2018-07-30 21:17:30.851974149 +0200
++++ wiringPi-2.44.new/wiringPi/Makefile 2018-07-30 21:19:32.980259756 +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
+ $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)
+ .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 f3376b6..13975b8 100644
--- a/dev-libs/wiringPi/wiringPi-2.44-r7.ebuild
+++ b/dev-libs/wiringPi/wiringPi-2.44-r7.ebuild
@@ -36,7 +36,6 @@ src_prepare() {
# purge upstream email addresses as Gentoo is an unsupported platform
for DIR in wiringPi devLib gpio; do
sed -e "s#/include#/include/${PN}#" \
- -e 's:\($Q \)ln -sf:#\1ln -sf:g' \
-e 's:/man/man:/share/man/man:g' \
-e 's:/bin:/sbin:g' \
-e 's:4755:0755:g' \