1 # HG changeset patch |
|
2 # User Praveen Kumar Muthuswamy <[email protected]> |
|
3 # Date 1428520414 25200 |
|
4 # Wed Apr 08 12:13:34 2015 -0700 |
|
5 # Node ID 045f212982ea4578a9dafb925ad62cf366802dc6 |
|
6 # Parent 6470d3cc3ce1677a8283cdf15257c2b8c0ab43c9 |
|
7 /* |
|
8 * This patch file (dhcp-dynamiclibraries.patch) was developed in-house to |
|
9 * allow isc-dhcp to build and package shared objects for libomapi, libdhcpctl, |
|
10 * and libdst. Upstream (ISC) has been made aware of this requirement and the |
|
11 * the patch through a service ticket and they are actively working on |
|
12 * developing the patch. |
|
13 */ |
|
14 |
|
15 diff --git a/client/Makefile.am b/client/Makefile.am |
|
16 --- a/client/Makefile.am |
|
17 +++ b/client/Makefile.am |
|
18 @@ -5,7 +5,7 @@ |
|
19 scripts/netbsd scripts/nextstep scripts/openbsd \ |
|
20 scripts/solaris scripts/openwrt |
|
21 dhclient_LDADD = ../common/libdhcp.a ../minires/libres.a \ |
|
22 - ../omapip/libomapi.a ../dst/libdst.a |
|
23 + ../omapip/libomapi.la ../dst/libdst.la |
|
24 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 |
|
25 EXTRA_DIST = $(man_MANS) |
|
26 |
|
27 diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am |
|
28 --- a/common/tests/Makefile.am |
|
29 +++ b/common/tests/Makefile.am |
|
30 @@ -13,7 +13,7 @@ |
|
31 alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c |
|
32 alloc_unittest_LDADD = $(ATF_LDFLAGS) |
|
33 alloc_unittest_LDADD += ../libdhcp.a \ |
|
34 - ../../omapip/libomapi.a ../../dst/libdst.a ../../minires/libres.a |
|
35 + ../../omapip/libomapi.la ../../dst/libdst.la ../../minires/libres.a |
|
36 |
|
37 check: $(ATF_TESTS) |
|
38 atf-run | atf-report |
|
39 diff --git a/configure.ac b/configure.ac |
|
40 --- a/configure.ac |
|
41 +++ b/configure.ac |
|
42 @@ -37,7 +37,7 @@ |
|
43 # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. |
|
44 AC_USE_SYSTEM_EXTENSIONS |
|
45 |
|
46 -AC_PROG_RANLIB |
|
47 +AC_PROG_LIBTOOL |
|
48 AC_CONFIG_HEADERS([includes/config.h]) |
|
49 |
|
50 # we sometimes need to know byte order for building packets |
|
51 diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am |
|
52 --- a/dhcpctl/Makefile.am |
|
53 +++ b/dhcpctl/Makefile.am |
|
54 @@ -1,15 +1,16 @@ |
|
55 bin_PROGRAMS = omshell |
|
56 -lib_LIBRARIES = libdhcpctl.a |
|
57 +lib_LTLIBRARIES = libdhcpctl.la |
|
58 +libdhcpctl_la_LDFLAGS = -version-info 1 |
|
59 noinst_PROGRAMS = cltest |
|
60 man_MANS = omshell.1 dhcpctl.3 |
|
61 EXTRA_DIST = $(man_MANS) |
|
62 |
|
63 omshell_SOURCES = omshell.c |
|
64 -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../minires/libres.a \ |
|
65 - ../omapip/libomapi.a ../dst/libdst.a |
|
66 +omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../minires/libres.a \ |
|
67 + ../omapip/libomapi.la ../dst/libdst.la |
|
68 |
|
69 -libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c |
|
70 +libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c |
|
71 |
|
72 cltest_SOURCES = cltest.c |
|
73 -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../minires/libres.a \ |
|
74 - ../omapip/libomapi.a ../dst/libdst.a |
|
75 +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../minires/libres.a \ |
|
76 + ../omapip/libomapi.la ../dst/libdst.la |
|
77 diff --git a/dst/Makefile.am b/dst/Makefile.am |
|
78 --- a/dst/Makefile.am |
|
79 +++ b/dst/Makefile.am |
|
80 @@ -1,8 +1,9 @@ |
|
81 AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 |
|
82 |
|
83 -lib_LIBRARIES = libdst.a |
|
84 +lib_LTLIBRARIES = libdst.la |
|
85 +libdst_la_LDFLAGS = -version-info 1 |
|
86 |
|
87 -libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ |
|
88 +libdst_la_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \ |
|
89 base64.c prandom.c |
|
90 |
|
91 EXTRA_DIST = dst_internal.h md5.h md5_locl.h |
|
92 diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
|
93 --- a/omapip/Makefile.am |
|
94 +++ b/omapip/Makefile.am |
|
95 @@ -1,7 +1,8 @@ |
|
96 -lib_LIBRARIES = libomapi.a |
|
97 +lib_LTLIBRARIES = libomapi.la |
|
98 +libomapi_la_LDFLAGS = -version-info 1 |
|
99 noinst_PROGRAMS = svtest |
|
100 |
|
101 -libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ |
|
102 +libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ |
|
103 errwarn.c listener.c dispatch.c generic.c support.c \ |
|
104 handle.c message.c convert.c hash.c auth.c inet_addr.c \ |
|
105 array.c trace.c mrtrace.c toisc.c iscprint.c |
|
106 @@ -9,5 +10,5 @@ |
|
107 EXTRA_DIST = $(man_MANS) |
|
108 |
|
109 svtest_SOURCES = test.c |
|
110 -svtest_LDADD = libomapi.a ../dst/libdst.a |
|
111 +svtest_LDADD = libomapi.la ../dst/libdst.la |
|
112 |
|
113 diff --git a/relay/Makefile.am b/relay/Makefile.am |
|
114 --- a/relay/Makefile.am |
|
115 +++ b/relay/Makefile.am |
|
116 @@ -2,7 +2,7 @@ |
|
117 |
|
118 sbin_PROGRAMS = dhcrelay |
|
119 dhcrelay_SOURCES = dhcrelay.c |
|
120 -dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a ../minires/libres.a |
|
121 +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dst/libdst.la ../minires/libres.a |
|
122 man_MANS = dhcrelay.8 |
|
123 EXTRA_DIST = $(man_MANS) |
|
124 |
|
125 diff --git a/server/Makefile.am b/server/Makefile.am |
|
126 --- a/server/Makefile.am |
|
127 +++ b/server/Makefile.am |
|
128 @@ -13,9 +13,9 @@ |
|
129 dhcpv6.c mdb6.c |
|
130 |
|
131 # libomapi.a this is here twice to handle circular library dependencies :( |
|
132 -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a \ |
|
133 - ../dhcpctl/libdhcpctl.a ../minires/libres.a \ |
|
134 - ../omapip/libomapi.a |
|
135 +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dst/libdst.la \ |
|
136 + ../dhcpctl/libdhcpctl.la ../minires/libres.a \ |
|
137 + ../omapip/libomapi.la |
|
138 |
|
139 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |
|
140 EXTRA_DIST = $(man_MANS) |
|
141 diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am |
|
142 --- a/server/tests/Makefile.am |
|
143 +++ b/server/tests/Makefile.am |
|
144 @@ -17,8 +17,8 @@ |
|
145 ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ |
|
146 ../dhcpd.c |
|
147 |
|
148 -DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ |
|
149 - $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/dst/libdst.a \ |
|
150 +DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \ |
|
151 + $(top_builddir)/dhcpctl/libdhcpctl.la $(top_builddir)/dst/libdst.la \ |
|
152 $(top_builddir)/minires/libres.a |
|
153 |
|
154 ATF_TESTS = |
|