Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Fix the following error detected with i586-pokymllib32-linux-gcc (the |
| 2 | multilib x86-64 lib32 compiler): |
| 3 | ../lib/ctutils/.libs/libctutils.so: undefined reference to `get_kernel_sfm' |
| 4 | collect2: error: ld returned 1 exit status |
| 5 | |
| 6 | It seems that libctutils.so (the library that uses get_kernel_sfm) must |
| 7 | be stated before libconsole.so (the library that exports the function) when |
| 8 | using multilib gcc |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
| 12 | |
| 13 | Index: console-tools-0.3.2/fontfiletools/Makefile.am |
| 14 | =================================================================== |
| 15 | --- console-tools-0.3.2.orig/fontfiletools/Makefile.am |
| 16 | +++ console-tools-0.3.2/fontfiletools/Makefile.am |
| 17 | @@ -10,5 +10,5 @@ EXTRA_DIST = fonts2virfont.c virfont.h |
| 18 | |
| 19 | # libconsole is needed by ctutils |
| 20 | LDADD = ../lib/ctlocal/libctlocal.a ../lib/cfont/libcfont.la \ |
| 21 | - ../lib/console/libconsole.la \ |
| 22 | - ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la |
| 23 | + ../lib/ctutils/libctutils.la \ |
| 24 | + ../lib/console/libconsole.la ../lib/generic/libctgeneric.la |
| 25 | Index: console-tools-0.3.2/vttools/Makefile.am |
| 26 | =================================================================== |
| 27 | --- console-tools-0.3.2.orig/vttools/Makefile.am |
| 28 | +++ console-tools-0.3.2/vttools/Makefile.am |
| 29 | @@ -7,9 +7,9 @@ bin_PROGRAMS = chvt deallocvt writevt fg |
| 30 | vcstime vt-is-UTF8 openvt @RESIZECONS@ |
| 31 | EXTRA_PROGRAMS = resizecons |
| 32 | |
| 33 | -LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \ |
| 34 | +LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \ |
| 35 | ../lib/cfont/libcfont.la \ |
| 36 | - ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la |
| 37 | + ../lib/console/libconsole.la ../lib/generic/libctgeneric.la |
| 38 | |
| 39 | vcstime_LDADD = ../lib/ctlocal/libctlocal.a |
| 40 | screendump_LDADD = ../lib/ctlocal/libctlocal.a |
| 41 | Index: console-tools-0.3.2/kbdtools/Makefile.am |
| 42 | =================================================================== |
| 43 | --- console-tools-0.3.2.orig/kbdtools/Makefile.am |
| 44 | +++ console-tools-0.3.2/kbdtools/Makefile.am |
| 45 | @@ -15,9 +15,9 @@ EXTRA_PROGRAMS = getkeycodes setkeycodes |
| 46 | loadkeys_SOURCES = loadkeys.y analyze.l |
| 47 | |
| 48 | YFLAGS = -d |
| 49 | -LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \ |
| 50 | +LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \ |
| 51 | ../lib/cfont/libcfont.la \ |
| 52 | - ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la |
| 53 | + ../lib/console/libconsole.la ../lib/generic/libctgeneric.la |
| 54 | |
| 55 | loadkeys_LDADD = $(LDADD) @LEXLIB@ |
| 56 | |