summaryrefslogtreecommitdiffstats
path: root/debian/patches/0004-library_paths.diff
blob: abc8d66008ce4604f49ec3327e739ec8eaa704b4 (plain)
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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
From: Debian DNS Packaging <pkg-dns-devel@lists.alioth.debian.org>
Date: Fri, 24 Nov 2017 16:26:54 +0000
Subject: _library_paths

    Makefile.in: be explicit about library paths

    Debian policy requires that all dependent libs be in the .so, not just the
    immediately depended ones.

    Signed-off-by: LaMont Jones <lamont@debian.org>
---
 lib/dns/Makefile.in    | 4 +++-
 lib/irs/Makefile.in    | 4 +++-
 lib/isc/Makefile.in    | 3 +++
 lib/isccc/Makefile.in  | 4 +++-
 lib/isccfg/Makefile.in | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 4a8549e..e0fcca4 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -37,7 +37,7 @@ ISCLIBS =	../../lib/isc/libisc.@A@
 
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 
-LIBS =		@LIBS@
+LIBS =		@LIBS@ -L../../lib/isc -lcrypto
 
 # Alphabetically
 
@@ -155,6 +155,7 @@ libdns.la: ${OBJS}
 		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
 		${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
+	ln -sf .libs/libdns.so .
 
 include: gen
 	${MAKE} include/dns/enumtype.h
@@ -206,6 +207,7 @@ clean distclean::
 newrr::
 	rm -f code.h include/dns/enumtype.h include/dns/enumclass.h
 	rm -f include/dns/rdatastruct.h
+	rm -f libdns.so
 
 rdata.@O@: include
 
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index fc11447..4bb85b1 100644
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -36,7 +36,7 @@ SRCS =		context.c \
 		gai_strerror.c getaddrinfo.c getnameinfo.c \
 		resconf.c
 
-LIBS =		@LIBS@
+LIBS =		@LIBS@ -L../../lib/isc -L../../lib/dns -L../../lib/isccfg -lcrypto -lisc -ldns -lisccfg
 
 SUBDIRS =	include
 TESTDIRS =	@UNITTESTS@
@@ -61,6 +61,7 @@ libirs.la: ${OBJS} version.@O@
 		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la -rpath ${libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
 		${OBJS} version.@O@ ${LIBS}
+	ln -sf .libs/libirs.so .
 
 timestamp: libirs.@A@
 	touch timestamp
@@ -78,3 +79,4 @@ uninstall::
 
 clean distclean::
 	rm -f libirs.@A@ libirs.la timestamp
+	rm -f libdns.so
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index ba53ef1..ba3f013 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -120,12 +120,14 @@ libisc.la: ${OBJS} ${SYMTBLOBJS}
 		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
 		${OBJS} ${SYMTBLOBJS} ${LIBS}
+	ln -sf .libs/libisc.so .
 
 libisc-nosymtbl.la: ${OBJS}
 	${LIBTOOL_MODE_LINK} \
 		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
 		${OBJS} ${LIBS}
+	ln -sf .libs/libisc-nosymtbl.so .
 
 timestamp: libisc.@A@ libisc-nosymtbl.@A@
 	touch timestamp
@@ -144,3 +146,4 @@ uninstall::
 clean distclean::
 	rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
 	libisc-nosymtbl.la timestamp
+	rm -f libisc.so libisc-nosymtbl.so
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index ca88e98..8d875bc 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -31,7 +31,7 @@ ISCCCLIBS =	../../lib/isccc/libisccc.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 ISCCCDEPLIBS =	libisccc.@A@
 
-LIBS =		@LIBS@
+LIBS =		@LIBS@ -L../../lib/isc
 
 SUBDIRS =	include
 
@@ -67,6 +67,7 @@ libisccc.la: ${OBJS}
 		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccc.la -rpath ${libdir} \
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
 		${OBJS} ${ISCLIBS} ${LIBS}
+	ln -sf .libs/libisccc.so .
 
 timestamp: libisccc.@A@
 	touch timestamp
@@ -82,3 +83,4 @@ uninstall::
 
 clean distclean::
 	rm -f libisccc.@A@ timestamp
+	rm -f libisccc.so
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index f459bd5..0c42b2a 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -29,7 +29,7 @@ ISCCFGLIBS =	../../lib/cfg/libisccfg.@A@
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
 ISCCFGDEPLIBS =	libisccfg.@A@
 
-LIBS =		@LIBS@
+LIBS =		@LIBS@ -L../dns -L../isc -L../isccc
 
 SUBDIRS =	include
 TESTDIRS =	@UNITTESTS@