File fix-dev-deps.patch of Package wiringPi

Overview Repositories Revisions Requests Users Attributes Meta

File fix-dev-deps.patch of Package wiringPi (Revision 140c0d1b73ecf2f4a0b707754b6a2b54)

Currently displaying revision 140c0d1b73ecf2f4a0b707754b6a2b54 , Show latest

Author: Dave Jones <dave.jones@canonical.com>
Description: Fix various dependencies
 The libwiringPiDev library is missing a link dependency on libwiringPi. It
 also needs to include the path to the libwiringPi headers. The gpio utility
 has extraneous lib dependencies (librt, libm, and libcrypt). Finally, for
 libwiringPi itself, the libraries to link with must be placed at the end of
 the command line or the linker (with the now default -as-needed option) won't
 declare the exported nameds in the libraries as needed.

--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -36,7 +36,7 @@
 CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
 
 LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
-LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
+LIBS    = -lwiringPi -lwiringPiDev -lpthread
 
 # May not need to  alter anything below this line
 ###############################################################################
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -74,7 +74,8 @@
 
 $(DYNAMIC):	$(OBJ)
 	$Q echo "[Link (Dynamic)]"
-	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
+	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(OBJ) $(LIBS)
+	$Q ln -sf libwiringPi.so.$(VERSION) libwiringPi.so
 
 .c.o:
 	$Q echo [Compile] $<
--- a/devLib/Makefile
+++ b/devLib/Makefile
@@ -36,11 +36,11 @@
 
 #DEBUG	= -g -O0
 DEBUG	= -O2
-INCLUDE	= -I.
+INCLUDE	= -I. -I../wiringPi
 DEFS	= -D_GNU_SOURCE
 CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
 
-LIBS    =
+LIBS    = -lpthread -lwiringPi
 
 ###############################################################################
 
@@ -67,7 +67,7 @@
 
 $(DYNAMIC):	$(OBJ)
 	$Q echo "[Link (Dynamic)]"
-	$Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ)
+	$Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -L ../wiringPi $(OBJ) $(LIBS)
 
 .c.o:
 	$Q echo [Compile] $<

Places

File fix-dev-deps.patch of Package wiringPi (Revision 140c0d1b73ecf2f4a0b707754b6a2b54)

Places