sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

console-tools: fix linking when using the multilib compiler 

fix-libconsole-link.patch: add patch for fixing libconsole
linking problems when using multilib gcc

(From OE-Core rev: f70371a7c2da892a480a73d8571497dd7b367c7b)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Constantin Musca 2013-02-04 11:20:18 +02:00 committed by Richard Purdie
parent 685da74485
commit 8834ca79ba
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch Normal file
View File

@ -0,0 +1,56 @@
Fix the following error detected with i586-pokymllib32-linux-gcc (the
multilib x86-64 lib32 compiler):
../lib/ctutils/.libs/libctutils.so: undefined reference to `get_kernel_sfm'
collect2: error: ld returned 1 exit status
It seems that libctutils.so (the library that uses get_kernel_sfm) must
be stated before libconsole.so (the library that exports the function) when
using multilib gcc
Upstream-Status: Pending
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Index: console-tools-0.3.2/fontfiletools/Makefile.am
===================================================================
--- console-tools-0.3.2.orig/fontfiletools/Makefile.am
+++ console-tools-0.3.2/fontfiletools/Makefile.am
@@ -10,5 +10,5 @@ EXTRA_DIST = fonts2virfont.c virfont.h
# libconsole is needed by ctutils
LDADD = ../lib/ctlocal/libctlocal.a ../lib/cfont/libcfont.la \
- ../lib/console/libconsole.la \
- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
+ ../lib/ctutils/libctutils.la \
+ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
Index: console-tools-0.3.2/vttools/Makefile.am
===================================================================
--- console-tools-0.3.2.orig/vttools/Makefile.am
+++ console-tools-0.3.2/vttools/Makefile.am
@@ -7,9 +7,9 @@ bin_PROGRAMS = chvt deallocvt writevt fg
vcstime vt-is-UTF8 openvt @RESIZECONS@
EXTRA_PROGRAMS = resizecons
-LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \
+LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \
../lib/cfont/libcfont.la \
- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
+ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
vcstime_LDADD = ../lib/ctlocal/libctlocal.a
screendump_LDADD = ../lib/ctlocal/libctlocal.a
Index: console-tools-0.3.2/kbdtools/Makefile.am
===================================================================
--- console-tools-0.3.2.orig/kbdtools/Makefile.am
+++ console-tools-0.3.2/kbdtools/Makefile.am
@@ -15,9 +15,9 @@ EXTRA_PROGRAMS = getkeycodes setkeycodes
loadkeys_SOURCES = loadkeys.y analyze.l
YFLAGS = -d
-LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \
+LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \
../lib/cfont/libcfont.la \
- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
+ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
loadkeys_LDADD = $(LDADD) @LEXLIB@

3
meta/recipes-core/console-tools/console-tools_0.3.2.bb
View File

@ -3,7 +3,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
SUMMARY = "Allows you to set-up and manipulate the Linux console."
DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
PR = "r7"
PR = "r8"
SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
file://codepage.patch \
@ -12,6 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
file://kbdrate.patch \
file://uclibc-fileno.patch \
file://nodocs.patch \
file://fix-libconsole-linking.patch \
file://lcmessage.m4 \
file://Makevars"