Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 76c370a929e5ab5dbc81c2fbcf4e50f4fbc08ce9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Tue, 15 Aug 2017 15:53:37 +0800 |
| 4 | Subject: [PATCH 10/11] build shared libs |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Port patches from Fedora to build shared libs rather than static libs. |
| 9 | |
| 10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 11 | |
| 12 | Rebase to 4.3.6 |
| 13 | |
| 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 15 | --- |
| 16 | client/Makefile.am | 4 ++-- |
| 17 | common/tests/Makefile.am | 13 +++++-------- |
| 18 | configure.ac | 12 ++---------- |
| 19 | dhcpctl/Makefile.am | 14 ++++++-------- |
| 20 | omapip/Makefile.am | 7 +++---- |
| 21 | relay/Makefile.am | 5 ++--- |
| 22 | server/Makefile.am | 7 +++---- |
| 23 | server/tests/Makefile.am | 7 +++---- |
| 24 | 8 files changed, 26 insertions(+), 43 deletions(-) |
| 25 | |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 26 | Index: dhcp-4.3.6/client/Makefile.am |
| 27 | =================================================================== |
| 28 | --- dhcp-4.3.6.orig/client/Makefile.am |
| 29 | +++ dhcp-4.3.6/client/Makefile.am |
| 30 | @@ -15,7 +15,7 @@ dhclient_SOURCES = $(srcdir)/clparse.c $ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 31 | scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ |
| 32 | scripts/netbsd scripts/nextstep scripts/openbsd \ |
| 33 | scripts/solaris scripts/openwrt |
| 34 | -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ |
| 35 | - $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 36 | +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ |
| 37 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
| 38 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 |
| 39 | EXTRA_DIST = $(man_MANS) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 40 | Index: dhcp-4.3.6/common/tests/Makefile.am |
| 41 | =================================================================== |
| 42 | --- dhcp-4.3.6.orig/common/tests/Makefile.am |
| 43 | +++ dhcp-4.3.6/common/tests/Makefile.am |
| 44 | @@ -15,26 +15,23 @@ ATF_TESTS += alloc_unittest dns_unittest |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 45 | alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c |
| 46 | alloc_unittest_LDADD = $(ATF_LDFLAGS) |
| 47 | alloc_unittest_LDADD += ../libdhcp.a \ |
| 48 | - ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ |
| 49 | - $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 50 | + ../../omapip/libomapi.la -L$(BINDLIBDIR) -ldns -lisccfg -lisc |
| 51 | |
| 52 | dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c |
| 53 | dns_unittest_LDADD = $(ATF_LDFLAGS) |
| 54 | dns_unittest_LDADD += ../libdhcp.a \ |
| 55 | - ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ |
| 56 | - $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 57 | + ../../omapip/libomapi.la -L$(BINDLIBDIR) -ldns -lisccfg -lisc |
| 58 | |
| 59 | misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c |
| 60 | misc_unittest_LDADD = $(ATF_LDFLAGS) |
| 61 | misc_unittest_LDADD += ../libdhcp.a \ |
| 62 | - ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ |
| 63 | - $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 64 | + ../../omapip/libomapi.la -L$(BINDLIBDIR) -ldns -lisccfg -lisc |
| 65 | |
| 66 | ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c |
| 67 | ns_name_unittest_LDADD = $(ATF_LDFLAGS) |
| 68 | ns_name_unittest_LDADD += ../libdhcp.a \ |
| 69 | - ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \ |
| 70 | - $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 71 | + ../../omapip/libomapi.a -L$(BINDLIBDIR) \ |
| 72 | + -ldns -lisccfg -lisc |
| 73 | |
| 74 | check: $(ATF_TESTS) |
| 75 | @if test $(top_srcdir) != ${top_builddir}; then \ |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 76 | Index: dhcp-4.3.6/configure.ac |
| 77 | =================================================================== |
| 78 | --- dhcp-4.3.6.orig/configure.ac |
| 79 | +++ dhcp-4.3.6/configure.ac |
| 80 | @@ -47,16 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$c |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 81 | # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. |
| 82 | AC_USE_SYSTEM_EXTENSIONS |
| 83 | |
| 84 | -AC_PROG_RANLIB |
| 85 | - |
| 86 | -AC_PATH_PROG(AR, ar) |
| 87 | -AC_SUBST(AR) |
| 88 | - |
| 89 | -if test "X$AR" = "X"; then |
| 90 | - AC_MSG_ERROR([ |
| 91 | -ar program not found. Please fix your PATH to include the directory in |
| 92 | -which ar resides, or set AR in the environment with the full path to ar.]) |
| 93 | -fi |
| 94 | +# Use libtool to simplify building of shared libraries |
| 95 | +AC_PROG_LIBTOOL |
| 96 | |
| 97 | AC_CONFIG_HEADERS([includes/config.h]) |
| 98 | |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 99 | Index: dhcp-4.3.6/dhcpctl/Makefile.am |
| 100 | =================================================================== |
| 101 | --- dhcp-4.3.6.orig/dhcpctl/Makefile.am |
| 102 | +++ dhcp-4.3.6/dhcpctl/Makefile.am |
| 103 | @@ -3,19 +3,17 @@ BINDLIBDIR = @BINDDIR@/lib |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 104 | AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) |
| 105 | |
| 106 | bin_PROGRAMS = omshell |
| 107 | -lib_LIBRARIES = libdhcpctl.a |
| 108 | +lib_LTLIBRARIES = libdhcpctl.la |
| 109 | noinst_PROGRAMS = cltest |
| 110 | man_MANS = omshell.1 dhcpctl.3 |
| 111 | EXTRA_DIST = $(man_MANS) |
| 112 | |
| 113 | omshell_SOURCES = omshell.c |
| 114 | -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
| 115 | - $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ |
| 116 | - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 117 | +omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ |
| 118 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
| 119 | |
| 120 | -libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c |
| 121 | +libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c |
| 122 | |
| 123 | cltest_SOURCES = cltest.c |
| 124 | -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
| 125 | - $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ |
| 126 | - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 127 | +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ |
| 128 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 129 | Index: dhcp-4.3.6/omapip/Makefile.am |
| 130 | =================================================================== |
| 131 | --- dhcp-4.3.6.orig/omapip/Makefile.am |
| 132 | +++ dhcp-4.3.6/omapip/Makefile.am |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 133 | @@ -1,10 +1,10 @@ |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 134 | BINDLIBDIR = @BINDDIR@/lib |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 135 | AM_CPPFLAGS = -I$(top_srcdir)/includes |
| 136 | |
| 137 | -lib_LIBRARIES = libomapi.a |
| 138 | +lib_LTLIBRARIES = libomapi.la |
| 139 | noinst_PROGRAMS = svtest |
| 140 | |
| 141 | -libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ |
| 142 | +libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ |
| 143 | errwarn.c listener.c dispatch.c generic.c support.c \ |
| 144 | handle.c message.c convert.c hash.c auth.c inet_addr.c \ |
| 145 | array.c trace.c toisc.c iscprint.c isclib.c |
| 146 | @@ -13,6 +13,5 @@ man_MANS = omapi.3 |
| 147 | EXTRA_DIST = $(man_MANS) |
| 148 | |
| 149 | svtest_SOURCES = test.c |
| 150 | -svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ |
| 151 | - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 152 | +svtest_LDADD = libomapi.la -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
| 153 | |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 154 | Index: dhcp-4.3.6/relay/Makefile.am |
| 155 | =================================================================== |
| 156 | --- dhcp-4.3.6.orig/relay/Makefile.am |
| 157 | +++ dhcp-4.3.6/relay/Makefile.am |
| 158 | @@ -4,9 +4,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 159 | |
| 160 | sbin_PROGRAMS = dhcrelay |
| 161 | dhcrelay_SOURCES = dhcrelay.c |
| 162 | -dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 163 | - $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ |
| 164 | - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
| 165 | +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ |
| 166 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
| 167 | man_MANS = dhcrelay.8 |
| 168 | EXTRA_DIST = $(man_MANS) |
| 169 | |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 170 | Index: dhcp-4.3.6/server/Makefile.am |
| 171 | =================================================================== |
| 172 | --- dhcp-4.3.6.orig/server/Makefile.am |
| 173 | +++ dhcp-4.3.6/server/Makefile.am |
| 174 | @@ -15,10 +15,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 175 | dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c |
| 176 | |
| 177 | dhcpd_CFLAGS = $(LDAP_CFLAGS) |
| 178 | -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 179 | - ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ |
| 180 | - $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ |
| 181 | - $(BINDLIBDIR)/libisc.a $(LDAP_LIBS) |
| 182 | +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ |
| 183 | + ../dhcpctl/libdhcpctl.la -L$(BINDLIBDIR) \ |
| 184 | + -lirs -ldns -lisccfg -lisc $(LDAP_LIBS) |
| 185 | |
| 186 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |
| 187 | EXTRA_DIST = $(man_MANS) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 188 | Index: dhcp-4.3.6/server/tests/Makefile.am |
| 189 | =================================================================== |
| 190 | --- dhcp-4.3.6.orig/server/tests/Makefile.am |
| 191 | +++ dhcp-4.3.6/server/tests/Makefile.am |
| 192 | @@ -19,10 +19,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 193 | ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ |
| 194 | ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c |
| 195 | |
| 196 | -DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ |
| 197 | - $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \ |
| 198 | - $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \ |
| 199 | - $(BINDLIBDIR)/libisc.a |
| 200 | +DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \ |
| 201 | + $(top_builddir)/dhcpctl/libdhcpctl.la \ |
| 202 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
| 203 | |
| 204 | ATF_TESTS = |
| 205 | if HAVE_ATF |