diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch')
-rw-r--r-- | poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch new file mode 100644 index 000000000..be61eb846 --- /dev/null +++ b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch @@ -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@ + |