diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.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, 0 insertions, 56 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 deleted file mode 100644 index be61eb846..000000000 --- a/poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch +++ /dev/null @@ -1,56 +0,0 @@ -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@ - |