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

PATCH New Bernd Kuhls 3 participants 5 messages Feb 20, 2016 – Feb 21, 2016

Share & tools

Bernd Kuhls

author

2016-02-20 17:09 UTC #0 lore raw

PATCH 1/2 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 Bernd Kuhls <[email protected]>

---
 .../gpm/0002-Install-unversioned-solibrary.patch   | 41 ++++++++++++++++++++++
 ...e.in-Really-install-unversioned-solibrary.patch | 31 ++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 package/gpm/0002-Install-unversioned-solibrary.patch
 create mode 100644 package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch

package/gpm/0002-Install-unversioned-solibrary.patch new file +41 -0

new file mode 100644
index 0000000..27e97ac
@@ -0,0 +1,41 @@
+From 06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Mon Sep 17 00:00:00 2001
+From: Kamil Rytarowski <[email protected]>
+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 <[email protected]>
+---
+ 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. at abi_lev@ @LIBGPM_A@ $(PROG)
++all:	gpm lib/libgpm.so. at 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. at abi_full@:	$(PICS)
+ 	@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so. at abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)	
+ lib/libgpm.so. at abi_lev@:	lib/libgpm.so. at abi_full@
+ 	$(LN_S) -f libgpm.so. at abi_full@ lib/libgpm.so. at abi_lev@
+-# unneeded, isn't it?
+-#lib/libgpm.so:	lib/libgpm.so. at abi_full@
+-#	$(LN_S) -f libgpm.so. at abi_full@ lib/libgpm.so
++lib/libgpm.so:	lib/libgpm.so. at abi_full@
++	$(LN_S) -f libgpm.so. at abi_full@ lib/libgpm.so
+ 
+ include $(DEPFILE)
+

package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch new file +31 -0

new file mode 100644
index 0000000..58b260c
@@ -0,0 +1,31 @@
+From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+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 <[email protected]>
+---
+ 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 at SHLIB@" != "x" ; then \
+ 		$(INSTALL_DATA) -m 755 lib/libgpm.so. at abi_full@ $(libdir)/libgpm.so. at abi_full@	;	\
+ 		cd $(libdir) && $(LN_S) -f libgpm.so. at abi_full@ libgpm.so. at abi_lev@ 					;	\
++		cd $(libdir) && $(LN_S) -f libgpm.so. at abi_full@ libgpm.so 					;	\
+       echo "WARNING: We installed a lib, you should now call ldconfig" 						; 	\
+       echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so. at abi_full@" 								;	\
+       echo "Or to update everything just type ldconfig"											;	\
+-- 
+2.7.0
+

Signature · 1 line

2.7.0

Bernd Kuhls

author

2016-02-20 17:09 UTC #1 lore raw

PATCH 2/2 package/links: add optional support for gpm

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/links/links.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/links/links.mk +7 -0

index b62889f..28253fc 100644
@@ -50,6 +50,13 @@ else
 LINKS_CONF_OPTS += --without-bzip2
 endif
 
+ifeq ($(BR2_PACKAGE_GPM),y)
+LINKS_CONF_OPTS += --with-gpm
+LINKS_DEPENDENCIES += gpm
+else
+LINKS_CONF_OPTS += --without-gpm
+endif
+
 ifeq ($(BR2_PACKAGE_LIBEVENT),y)
 LINKS_CONF_OPTS += --with-libevent
 LINKS_DEPENDENCIES += libevent

Signature · 1 line

2.7.0

Thomas Petazzoni

Applied

2016-02-21 14:00 UTC #2 lore raw

PATCH 2/2 package/links: add optional support for gpm

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/links/links.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Yann E. MORIN

2016-02-20 17:50 UTC #3 lore raw

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

In reply to Bernd Kuhls

On 2016-02-20 18:09 +0100, Bernd Kuhls spake thusly:

Quoted 2 lines

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

Well, maybe it would make sense to use the latest git now?

The latest release, 1.20.7, which is currently in use in Buildroot, is now 3-and-a-half years old. Granted, the latest commit is not that recent either, 1.5 years old... Still, switching to git is probably a good idea, rather than bundle back-ported patches...

Regards,
Yann E. MORIN.

Quoted 113 lines

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 Bernd Kuhls <[email protected]>

---
 .../gpm/0002-Install-unversioned-solibrary.patch   | 41 ++++++++++++++++++++++
 ...e.in-Really-install-unversioned-solibrary.patch | 31 ++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 package/gpm/0002-Install-unversioned-solibrary.patch
 create mode 100644 package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch

package/gpm/0002-Install-unversioned-solibrary.patch new file +41 -0

new file mode 100644
index 0000000..27e97ac
@@ -0,0 +1,41 @@
+From 06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Mon Sep 17 00:00:00 2001
+From: Kamil Rytarowski <[email protected]>
+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 <[email protected]>
+---
+ 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. at abi_lev@ @LIBGPM_A@ $(PROG)
++all:	gpm lib/libgpm.so. at 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. at abi_full@:	$(PICS)
+ 	@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so. at abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)	
+ lib/libgpm.so. at abi_lev@:	lib/libgpm.so. at abi_full@
+ 	$(LN_S) -f libgpm.so. at abi_full@ lib/libgpm.so. at abi_lev@
+-# unneeded, isn't it?
+-#lib/libgpm.so:	lib/libgpm.so. at abi_full@
+-#	$(LN_S) -f libgpm.so. at abi_full@ lib/libgpm.so
++lib/libgpm.so:	lib/libgpm.so. at abi_full@
++	$(LN_S) -f libgpm.so. at abi_full@ lib/libgpm.so
+ 
+ include $(DEPFILE)
+

package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch new file +31 -0

new file mode 100644
index 0000000..58b260c
@@ -0,0 +1,31 @@
+From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+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 <[email protected]>
+---
+ 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 at SHLIB@" != "x" ; then \
+ 		$(INSTALL_DATA) -m 755 lib/libgpm.so. at abi_full@ $(libdir)/libgpm.so. at abi_full@	;	\
+ 		cd $(libdir) && $(LN_S) -f libgpm.so. at abi_full@ libgpm.so. at abi_lev@ 					;	\
++		cd $(libdir) && $(LN_S) -f libgpm.so. at abi_full@ libgpm.so 					;	\
+       echo "WARNING: We installed a lib, you should now call ldconfig" 						; 	\
+       echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so. at abi_full@" 								;	\
+       echo "Or to update everything just type ldconfig"											;	\
+-- 
+2.7.0
+

Signature · 6 lines

2.7.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Thomas Petazzoni

Applied

2016-02-21 14:01 UTC #4 lore raw

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

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 17 lines · Bernd Kuhls

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

Quoted 7 lines

Signed-off-by Bernd Kuhls <[email protected]>

---
 .../gpm/0002-Install-unversioned-solibrary.patch   | 41 ++++++++++++++++++++++
 ...e.in-Really-install-unversioned-solibrary.patch | 31 ++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 package/gpm/0002-Install-unversioned-solibrary.patch
 create mode 100644 package/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com