1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
Description: Find multiarch paths in makefile
Search multiarch directories when searching for libraries in makefile
Forwarded: not-needed
Bug-Debian: http://bugs.debian.org/639747
Author: Daniel T Chen <seven.steps@gmail.com>
Author: Ian Beckwith <ianb@debian.org>
Last-Update: 2012-01-29
Index: ckermit/makefile
===================================================================
--- ckermit.orig/makefile 2012-01-29 00:15:30.000000000 +0000
+++ ckermit/makefile 2012-01-29 00:32:46.000000000 +0000
@@ -6100,10 +6100,14 @@
test -f /usr/lib/libncurses.a || \
test -f /usr/lib/libncurses.so; then \
HAVE_LIBCURSES='-lncurses'; \
+ else if test -f /usr/lib/$(MULTIARCH)/libncurses.so || \
+ test -f /usr/lib/$(MULTIARCH)/libncurses.a || \
+ test -f /usr/lib/$(MULTIARCH)/libncurses.so; then \
+ HAVE_LIBCURSES='-lncurses'; \
else if test -f /usr/lib64/libcurses.so || \
test -f /usr/lib/libcurses.a || \
test -f /usr/lib/libcurses.so; then \
- HAVE_LIBCURSES='-lcurses'; fi; fi; \
+ HAVE_LIBCURSES='-lcurses'; fi; fi; fi; \
HAVE_CURSES=''; \
if test -n '$$HAVE_LIBCURSES'; then \
if test -f /usr/include/ncurses.h; then \
@@ -6130,16 +6134,19 @@
|| test -f /usr/lib/libresolv.a || test -f /usr/lib/libresolv.so \
|| test -f /usr/lib/i386-linux-gnu/libresolv.a \
|| test -f /usr/lib/i386-linux-gnu/libresolv.so \
+ || ls /lib/$(MULTIARCH)/libresolv.* > /dev/null 2> /dev/null \
|| ls /lib/x86_64-linux-gnu/libresolv.* > /dev/null 2> /dev/null; \
then echo -lresolv; fi` \
`if test -f /usr/lib64/libcrypt.a || test -f /usr/lib64/libcrypt.so \
|| test -f /usr/lib/libcrypt.a || test -f /usr/lib/libcrypt.so \
+ || ls /lib/$(MULTIARCH)/libcrypt.* > /dev/null 2> /dev/null \
|| ls /lib/x86_64-linux-gnu/libcrypt.* > /dev/null 2> /dev/null; \
then echo -lcrypt; fi` \
`if test -f /usr/lib64/liblockdev.a || \
test -f /usr/lib64/liblockdev.so || \
test -f /usr/lib/liblockdev.a || \
- test -f /usr/lib/liblockdev.so; \
+ test -f /usr/lib/liblockdev.so \
+ ls /usr/lib/$(MULTIARCH)/liblockdev.* > /dev/null 2> /dev/null; \
then echo -llockdev; fi`" \
linuxa
@@ -6309,7 +6316,9 @@
K5CRYPTO='-lk5crypto'; \
else if ls /usr/lib64/libk5crypto* > /dev/null 2> /dev/null; then \
K5CRYPTO='-lk5crypto'; \
- fi; fi; fi; \
+ else if ls /usr/lib/$(MULTIARCH)/libk5crypto* > /dev/null 2> /dev/null; then \
+ K5CRYPTO='-lk5crypto'; \
+ fi; fi; fi; fi; \
COM_ERR=''; \
if ls /lib/libcom_err* > /dev/null 2> /dev/null; then \
COM_ERR='-lcom_err'; \
@@ -6317,7 +6326,7 @@
GSSAPILIB='-lgssapi'; \
if ls /lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
GSSAPILIB='-lgssapi_krb5'; \
- else if ls /usr/lib/libgssapi_krb5* > /dev/null 2> /dev/null; then \
+ else if ls /usr/lib/$(MULTIARCH)/libgssapi_krb5* > /dev/null 2> /dev/null; then \
GSSAPILIB='-lgssapi_krb5'; \
else K5DIR=`echo $(K5LIB) | sed 's|-L||'`; \
if ls $$K5DIR/libgssapi_krb5* > /dev/null 2> /dev/null; then \
|
