diff options
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch | 83 |
1 files changed, 40 insertions, 43 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch b/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch index f128731c64..898b1fc7ec 100644 --- a/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch +++ b/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch | |||
@@ -23,11 +23,11 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
23 | server/tests/Makefile.am | 7 +++---- | 23 | server/tests/Makefile.am | 7 +++---- |
24 | 8 files changed, 26 insertions(+), 43 deletions(-) | 24 | 8 files changed, 26 insertions(+), 43 deletions(-) |
25 | 25 | ||
26 | diff --git a/client/Makefile.am b/client/Makefile.am | 26 | Index: dhcp-4.3.6/client/Makefile.am |
27 | index 84d8131..e776bf0 100644 | 27 | =================================================================== |
28 | --- a/client/Makefile.am | 28 | --- dhcp-4.3.6.orig/client/Makefile.am |
29 | +++ b/client/Makefile.am | 29 | +++ dhcp-4.3.6/client/Makefile.am |
30 | @@ -15,7 +15,7 @@ dhclient_SOURCES = $(srcdir)/clparse.c $(srcdir)/dhclient.c $(srcdir)/dhc6.c \ | 30 | @@ -15,7 +15,7 @@ dhclient_SOURCES = $(srcdir)/clparse.c $ |
31 | scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ | 31 | scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ |
32 | scripts/netbsd scripts/nextstep scripts/openbsd \ | 32 | scripts/netbsd scripts/nextstep scripts/openbsd \ |
33 | scripts/solaris scripts/openwrt | 33 | scripts/solaris scripts/openwrt |
@@ -37,11 +37,11 @@ index 84d8131..e776bf0 100644 | |||
37 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc | 37 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
38 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 | 38 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 |
39 | EXTRA_DIST = $(man_MANS) | 39 | EXTRA_DIST = $(man_MANS) |
40 | diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am | 40 | Index: dhcp-4.3.6/common/tests/Makefile.am |
41 | index 2f98d22..8745e88 100644 | 41 | =================================================================== |
42 | --- a/common/tests/Makefile.am | 42 | --- dhcp-4.3.6.orig/common/tests/Makefile.am |
43 | +++ b/common/tests/Makefile.am | 43 | +++ dhcp-4.3.6/common/tests/Makefile.am |
44 | @@ -15,26 +15,23 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest | 44 | @@ -15,26 +15,23 @@ ATF_TESTS += alloc_unittest dns_unittest |
45 | alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c | 45 | alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c |
46 | alloc_unittest_LDADD = $(ATF_LDFLAGS) | 46 | alloc_unittest_LDADD = $(ATF_LDFLAGS) |
47 | alloc_unittest_LDADD += ../libdhcp.a \ | 47 | alloc_unittest_LDADD += ../libdhcp.a \ |
@@ -73,11 +73,11 @@ index 2f98d22..8745e88 100644 | |||
73 | 73 | ||
74 | check: $(ATF_TESTS) | 74 | check: $(ATF_TESTS) |
75 | @if test $(top_srcdir) != ${top_builddir}; then \ | 75 | @if test $(top_srcdir) != ${top_builddir}; then \ |
76 | diff --git a/configure.ac b/configure.ac | 76 | Index: dhcp-4.3.6/configure.ac |
77 | index 8e9f509..bfe988a 100644 | 77 | =================================================================== |
78 | --- a/configure.ac | 78 | --- dhcp-4.3.6.orig/configure.ac |
79 | +++ b/configure.ac | 79 | +++ dhcp-4.3.6/configure.ac |
80 | @@ -47,16 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") | 80 | @@ -47,16 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$c |
81 | # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. | 81 | # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. |
82 | AC_USE_SYSTEM_EXTENSIONS | 82 | AC_USE_SYSTEM_EXTENSIONS |
83 | 83 | ||
@@ -96,11 +96,11 @@ index 8e9f509..bfe988a 100644 | |||
96 | 96 | ||
97 | AC_CONFIG_HEADERS([includes/config.h]) | 97 | AC_CONFIG_HEADERS([includes/config.h]) |
98 | 98 | ||
99 | diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am | 99 | Index: dhcp-4.3.6/dhcpctl/Makefile.am |
100 | index 9b2486e..784cdf7 100644 | 100 | =================================================================== |
101 | --- a/dhcpctl/Makefile.am | 101 | --- dhcp-4.3.6.orig/dhcpctl/Makefile.am |
102 | +++ b/dhcpctl/Makefile.am | 102 | +++ dhcp-4.3.6/dhcpctl/Makefile.am |
103 | @@ -3,19 +3,17 @@ BINDLIBDIR = @BINDDIR@ | 103 | @@ -3,19 +3,17 @@ BINDLIBDIR = @BINDDIR@/lib |
104 | AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) | 104 | AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) |
105 | 105 | ||
106 | bin_PROGRAMS = omshell | 106 | bin_PROGRAMS = omshell |
@@ -126,12 +126,12 @@ index 9b2486e..784cdf7 100644 | |||
126 | - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a | 126 | - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
127 | +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ | 127 | +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ |
128 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc | 128 | + -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
129 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am | 129 | Index: dhcp-4.3.6/omapip/Makefile.am |
130 | index e4a8599..c0c7a1e 100644 | 130 | =================================================================== |
131 | --- a/omapip/Makefile.am | 131 | --- dhcp-4.3.6.orig/omapip/Makefile.am |
132 | +++ b/omapip/Makefile.am | 132 | +++ dhcp-4.3.6/omapip/Makefile.am |
133 | @@ -1,10 +1,10 @@ | 133 | @@ -1,10 +1,10 @@ |
134 | BINDLIBDIR = @BINDDIR@ | 134 | BINDLIBDIR = @BINDDIR@/lib |
135 | AM_CPPFLAGS = -I$(top_srcdir)/includes | 135 | AM_CPPFLAGS = -I$(top_srcdir)/includes |
136 | 136 | ||
137 | -lib_LIBRARIES = libomapi.a | 137 | -lib_LIBRARIES = libomapi.a |
@@ -151,11 +151,11 @@ index e4a8599..c0c7a1e 100644 | |||
151 | - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a | 151 | - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a |
152 | +svtest_LDADD = libomapi.la -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc | 152 | +svtest_LDADD = libomapi.la -L$(BINDLIBDIR) -lirs -ldns -lisccfg -lisc |
153 | 153 | ||
154 | diff --git a/relay/Makefile.am b/relay/Makefile.am | 154 | Index: dhcp-4.3.6/relay/Makefile.am |
155 | index b3bf578..f47009f 100644 | 155 | =================================================================== |
156 | --- a/relay/Makefile.am | 156 | --- dhcp-4.3.6.orig/relay/Makefile.am |
157 | +++ b/relay/Makefile.am | 157 | +++ dhcp-4.3.6/relay/Makefile.am |
158 | @@ -4,9 +4,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | 158 | @@ -4,9 +4,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst |
159 | 159 | ||
160 | sbin_PROGRAMS = dhcrelay | 160 | sbin_PROGRAMS = dhcrelay |
161 | dhcrelay_SOURCES = dhcrelay.c | 161 | dhcrelay_SOURCES = dhcrelay.c |
@@ -167,11 +167,11 @@ index b3bf578..f47009f 100644 | |||
167 | man_MANS = dhcrelay.8 | 167 | man_MANS = dhcrelay.8 |
168 | EXTRA_DIST = $(man_MANS) | 168 | EXTRA_DIST = $(man_MANS) |
169 | 169 | ||
170 | diff --git a/server/Makefile.am b/server/Makefile.am | 170 | Index: dhcp-4.3.6/server/Makefile.am |
171 | index b5d8c2d..d7f876d 100644 | 171 | =================================================================== |
172 | --- a/server/Makefile.am | 172 | --- dhcp-4.3.6.orig/server/Makefile.am |
173 | +++ b/server/Makefile.am | 173 | +++ dhcp-4.3.6/server/Makefile.am |
174 | @@ -15,10 +15,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ | 174 | @@ -15,10 +15,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c |
175 | dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c | 175 | dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c |
176 | 176 | ||
177 | dhcpd_CFLAGS = $(LDAP_CFLAGS) | 177 | dhcpd_CFLAGS = $(LDAP_CFLAGS) |
@@ -185,11 +185,11 @@ index b5d8c2d..d7f876d 100644 | |||
185 | 185 | ||
186 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 | 186 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |
187 | EXTRA_DIST = $(man_MANS) | 187 | EXTRA_DIST = $(man_MANS) |
188 | diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am | 188 | Index: dhcp-4.3.6/server/tests/Makefile.am |
189 | index 9821081..de95872 100644 | 189 | =================================================================== |
190 | --- a/server/tests/Makefile.am | 190 | --- dhcp-4.3.6.orig/server/tests/Makefile.am |
191 | +++ b/server/tests/Makefile.am | 191 | +++ dhcp-4.3.6/server/tests/Makefile.am |
192 | @@ -19,10 +19,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ | 192 | @@ -19,10 +19,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa |
193 | ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ | 193 | ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ |
194 | ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c | 194 | ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c |
195 | 195 | ||
@@ -203,6 +203,3 @@ index 9821081..de95872 100644 | |||
203 | 203 | ||
204 | ATF_TESTS = | 204 | ATF_TESTS = |
205 | if HAVE_ATF | 205 | if HAVE_ATF |
206 | -- | ||
207 | 1.8.3.1 | ||
208 | |||