Commit 2b1bbbb7 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

package/gpm: Install libgpm.so to fix gpm detection in package links 



The unversioned library was missing in the build system, part of the fix
was backported from upstream, the final patch was sent upstream.

Fixes linking against gpm by the links package which fails to detect
gpm support when libgpm.so is not present.

Configure log from links without this patch:
checking for gpm.h... yes
checking for Gpm_Open in -lgpm... no
checking for Gpm_GetLibVersion... no

Configure log from links with this patch:
checking for gpm.h... yes
checking for Gpm_Open in -lgpm... yes
checking for Gpm_GetLibVersion... yes
checking for Gpm_Event wdx and wdy... yes

Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 5c949045

package/gpm/0002-Install-unversioned-solibrary.patch

0 → 100644
+41 −0
Original line number Diff line number Diff line 
From 06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Mon Sep 17 00:00:00 2001

From: Kamil Rytarowski <n54@gmx.com>

Date: Sat, 4 May 2013 01:30:17 +0200

Subject: [PATCH] Install unversioned solibrary



Unversioned solibraries are shipped with -devel packages in Linux

distros. Generate and install it for the consistency.



[Upstream patch backported from the github repository,

https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa]



Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

---

 src/Makefile.in | 7 +++----

 1 file changed, 3 insertions(+), 4 deletions(-)



diff --git a/src/Makefile.in b/src/Makefile.in

index 6b60ad3..7e9e2ef 100644

--- a/src/Makefile.in

+++ b/src/Makefile.in

@@ -79,7 +79,7 @@ prog/%:	prog/%.o

 #		| $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'

 

 # Do it all!

-all:	gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)

+all:	gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG)

 

 gpm:	$(GOBJ)

 	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm

@@ -168,9 +168,8 @@ lib/libgpm.so.@abi_full@:	$(PICS)

 	@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)	

 lib/libgpm.so.@abi_lev@:	lib/libgpm.so.@abi_full@

 	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@

-# unneeded, isn't it?

-#lib/libgpm.so:	lib/libgpm.so.@abi_full@

-#	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so

+lib/libgpm.so:	lib/libgpm.so.@abi_full@

+	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so

 

 include $(DEPFILE)

package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch

0 → 100644
+31 −0
Original line number Diff line number Diff line 
From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001

From: Bernd Kuhls <bernd.kuhls@t-online.de>

Date: Sat, 20 Feb 2016 17:59:52 +0100

Subject: [PATCH 1/1] src/Makefile.in: Really install unversioned solibrary



This commit is a follow-up to

https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa

which created libgpm.so but failed to include it in the install target.



Patch sent upstream: https://github.com/telmich/gpm/pull/11



Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

---

 src/Makefile.in | 1 +

 1 file changed, 1 insertion(+)



diff --git a/src/Makefile.in b/src/Makefile.in

index 7e9e2ef..bca226f 100644

--- a/src/Makefile.in

+++ b/src/Makefile.in

@@ -115,6 +115,7 @@ install:	check

 	if test "x@SHLIB@" != "x" ; then \

 		$(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@	;	\

 		cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ 					;	\

+		cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so 					;	\

       echo "WARNING: We installed a lib, you should now call ldconfig" 						; 	\

       echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" 								;	\

       echo "Or to update everything just type ldconfig"											;	\

-- 

2.7.0