From a6087b4263869fc5d36482cc4f58857338055e40 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbrodkorb@conet.de>
Date: Wed, 11 Feb 2015 15:23:32 +0100
Subject: better handling of staging area for apps using wiringPi

---
 package/wiringPi/Makefile                        |  7 +------
 package/wiringPi/patches/patch-devLib_Makefile   | 23 +++++++++++++++++++++--
 package/wiringPi/patches/patch-wiringPi_Makefile | 23 +++++++++++++++++++++--
 3 files changed, 43 insertions(+), 10 deletions(-)

(limited to 'package/wiringPi')

diff --git a/package/wiringPi/Makefile b/package/wiringPi/Makefile
index 8d7dd2db2..da6a45fb8 100644
--- a/package/wiringPi/Makefile
+++ b/package/wiringPi/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		wiringPi
 PKG_VERSION:=		72b2af231be337d45a557ce6ca3ed1eeb6675ffd
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_DESCR:=		gpio access library for the raspberry pi
 PKG_SECTION:=		libs/misc
 PKG_HASH:=		ddc71b86f71e7e5104a89f88a68bea20122b6ea9f8c535219d180bf89502a69d
@@ -36,11 +36,6 @@ wiringpi-install:
 	$(INSTALL_DIR) $(IDIR_WIRINGPI)/usr/lib
 	$(CP) $(WRKBUILD)/wiringPi/libwiringPi.so* $(IDIR_WIRINGPI)/usr/lib
 	$(CP) $(WRKBUILD)/devLib/libwiringPiDev.so* $(IDIR_WIRINGPI)/usr/lib
-	(cd $(IDIR_WIRINGPI)/usr/lib; ln -sf libwiringPi.so.2.25 libwiringPi.so)
-	(cd $(IDIR_WIRINGPI)/usr/lib; ln -sf libwiringPi.so.2.25 libwiringPi.so.2)
-	(cd $(IDIR_WIRINGPI)/usr/lib; ln -sf libwiringPiDev.so.2.25 libwiringPiDev.so)
-	(cd $(IDIR_WIRINGPI)/usr/lib; ln -sf libwiringPiDev.so.2.25 libwiringPiDev.so.2)
-	$(CP) $(WRKBUILD)/wiringPi/*.h $(STAGING_TARGET_DIR)/usr/include
 	$(INSTALL_DIR) $(IDIR_WIRINGPI)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/gpio/gpio $(IDIR_WIRINGPI)/usr/bin
 
diff --git a/package/wiringPi/patches/patch-devLib_Makefile b/package/wiringPi/patches/patch-devLib_Makefile
index fa53b1601..d37acee2d 100644
--- a/package/wiringPi/patches/patch-devLib_Makefile
+++ b/package/wiringPi/patches/patch-devLib_Makefile
@@ -1,6 +1,16 @@
 --- wiringPi-72b2af231be337d45a557ce6ca3ed1eeb6675ffd.orig/devLib/Makefile	2015-02-11 09:58:24.000000000 +0100
-+++ wiringPi-72b2af231be337d45a557ce6ca3ed1eeb6675ffd/devLib/Makefile	2015-02-11 10:20:01.648739557 +0100
-@@ -30,10 +30,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
++++ wiringPi-72b2af231be337d45a557ce6ca3ed1eeb6675ffd/devLib/Makefile	2015-02-11 14:55:25.328819419 +0100
+@@ -22,18 +22,18 @@
+ #################################################################################
+ 
+ VERSION=$(shell cat ../VERSION)
+-DESTDIR=/usr
+-PREFIX=/local
++DESTDIR?=
++PREFIX=
+ 
+ STATIC=libwiringPiDev.a
+ DYNAMIC=libwiringPiDev.so.$(VERSION)
  
  #DEBUG	= -g -O0
  DEBUG	= -O2
@@ -28,3 +38,12 @@
  
  .PHONY:	clean
  clean:
+@@ -86,7 +87,7 @@ install:	$(DYNAMIC)
+ 	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+ 	@install -m 0755 libwiringPiDev.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
+ 	@ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
+-	@ldconfig
++	@ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so.2
+ 
+ .PHONY:	install-static
+ install-static:	$(STATIC)
diff --git a/package/wiringPi/patches/patch-wiringPi_Makefile b/package/wiringPi/patches/patch-wiringPi_Makefile
index 4695031e6..4dac54612 100644
--- a/package/wiringPi/patches/patch-wiringPi_Makefile
+++ b/package/wiringPi/patches/patch-wiringPi_Makefile
@@ -1,6 +1,16 @@
 --- wiringPi-72b2af231be337d45a557ce6ca3ed1eeb6675ffd.orig/wiringPi/Makefile	2015-02-11 09:58:24.000000000 +0100
-+++ wiringPi-72b2af231be337d45a557ce6ca3ed1eeb6675ffd/wiringPi/Makefile	2015-02-11 10:20:20.360739647 +0100
-@@ -30,10 +30,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
++++ wiringPi-72b2af231be337d45a557ce6ca3ed1eeb6675ffd/wiringPi/Makefile	2015-02-11 13:29:16.820794439 +0100
+@@ -22,18 +22,18 @@
+ #################################################################################
+ 
+ VERSION=$(shell cat ../VERSION)
+-DESTDIR=/usr
+-PREFIX=/local
++DESTDIR?=
++PREFIX=/usr
+ 
+ STATIC=libwiringPi.a
+ DYNAMIC=libwiringPi.so.$(VERSION)
  
  #DEBUG	= -g -O0
  DEBUG	= -O2
@@ -28,3 +38,12 @@
  
  
  .PHONY:	clean
+@@ -110,7 +111,7 @@ install:	$(DYNAMIC)
+ 	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+ 	@install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
+ 	@ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
+-	@ldconfig
++	@ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so.2
+ 
+ .PHONY:	install-static
+ install-static:	$(STATIC)
-- 
cgit v1.2.3