summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2012-02-07 21:52:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:59:35 +0000
commitadbe09435abf291a163825a4b49582c200be83aa (patch)
treed53acf294c4831ba22788c3393a35f9f66c77ad3 /meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch
parenta470400cf8455d9f6f16905bfae59a3511ae5d4c (diff)
downloadpoky-adbe09435abf291a163825a4b49582c200be83aa.tar.gz
dhcp: Update to 4.2.3-P2
1. Update to 4.2.3-P2 2. From 4.2.0 final release, -lcrypto check was removed and we compile static libraries from bind that are linked to libcrypto. This is why i added a patch in order to add -lcrypto to LIBS. 3. Add openssl in DEPENDS as we need libcrypto from this package 4. Drop installing /var/lib/dhcp/ as it is handled in pkg_postinst (From OE-Core rev: 1cd882c47865a501d5401bad44e1c7f460ce2699) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch103
1 files changed, 103 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch
new file mode 100644
index 0000000000..4f11655812
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch
@@ -0,0 +1,103 @@
1Upstream-Status: Pending
2
311/30/2010
4--with-libbind=PATH is available but not used by Makefile,
5this patch is to allow building with external bind
6
7Signed-off-by: Qing He <qing.he@intel.com>
8
9diff --git a/Makefile.am b/Makefile.am
10index 928d926..cd17af8 100644
11--- a/Makefile.am
12+++ b/Makefile.am
13@@ -21,7 +21,7 @@ EXTRA_DIST = RELNOTES LICENSE \
14 util/bindvar.sh \
15 bind/Makefile bind/bind.tar.gz bind/version.tmp
16
17-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
18+SUBDIRS = includes tests common dst omapip client dhcpctl relay server
19
20 nobase_include_HEADERS = dhcpctl/dhcpctl.h
21
22diff --git a/client/Makefile.am b/client/Makefile.am
23index 77ed055..5a77f2d 100644
24--- a/client/Makefile.am
25+++ b/client/Makefile.am
26@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
27 scripts/netbsd scripts/nextstep scripts/openbsd \
28 scripts/solaris scripts/openwrt
29 dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
30- ../bind/lib/libdns.a ../bind/lib/libisc.a
31+ $(libbind)/libdns.a $(libbind)/libisc.a
32 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
33 EXTRA_DIST = $(man_MANS)
34
35diff --git a/configure.ac b/configure.ac
36index ff832aa..60d342c 100644
37--- a/configure.ac
38+++ b/configure.ac
39@@ -500,6 +500,7 @@ no)
40 libbind="$use_libbind"
41 ;;
42 esac
43+AC_SUBST([libbind])
44
45 # OpenLDAP support.
46 AC_ARG_WITH(ldap,
47diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
48index 61049be..85aefa3 100644
49--- a/dhcpctl/Makefile.am
50+++ b/dhcpctl/Makefile.am
51@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
52
53 omshell_SOURCES = omshell.c
54 omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
55- ../bind/lib/libdns.a ../bind/lib/libisc.a
56+ $(libbind)/libdns.a $(libbind)/libisc.a
57
58 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
59
60 cltest_SOURCES = cltest.c
61 cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
62- ../bind/lib/libdns.a ../bind/lib/libisc.a
63\ No newline at end of file
64+ $(libbind)/libdns.a $(libbind)/libisc.a
65diff --git a/omapip/Makefile.am b/omapip/Makefile.am
66index 595950a..17f2233 100644
67--- a/omapip/Makefile.am
68+++ b/omapip/Makefile.am
69@@ -10,5 +10,5 @@ man_MANS = omapi.3
70 EXTRA_DIST = $(man_MANS)
71
72 svtest_SOURCES = test.c
73-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
74+svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a
75
76diff --git a/relay/Makefile.am b/relay/Makefile.am
77index d8757ca..a7885da 100644
78--- a/relay/Makefile.am
79+++ b/relay/Makefile.am
80@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
81 sbin_PROGRAMS = dhcrelay
82 dhcrelay_SOURCES = dhcrelay.c
83 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
84- ../bind/lib/libdns.a ../bind/lib/libisc.a
85+ $(libbind)/libdns.a $(libbind)/libisc.a
86 man_MANS = dhcrelay.8
87 EXTRA_DIST = $(man_MANS)
88
89diff --git a/server/Makefile.am b/server/Makefile.am
90index cdfaf47..d2c254b 100644
91--- a/server/Makefile.am
92+++ b/server/Makefile.am
93@@ -8,8 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
94
95 dhcpd_CFLAGS = $(LDAP_CFLAGS)
96 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
97- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
98- ../bind/lib/libisc.a
99+ ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \
100+ $(libbind)/libisc.a
101
102 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
103 EXTRA_DIST = $(man_MANS)