summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-11-30 05:45:21 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-02 13:24:59 (GMT)
commit7e4e45a6693f6f4f4d2d0aedcaae1b1f8a56f24c (patch)
tree88e09b878bf6a266c3eae0a02c3f994fab48476f /meta/recipes-connectivity/dhcp
parent070f173bdc2e4e6704ae40d0ce54b22b0940c5c8 (diff)
downloadpoky-7e4e45a6693f6f4f4d2d0aedcaae1b1f8a56f24c.tar.gz
dhcp: fix cross build
the new internal bind9 is not cross compiling friendly, use the external library Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/dhcp')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch101
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp4.inc6
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb6
3 files changed, 110 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch
new file mode 100644
index 0000000..2206b71
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch
@@ -0,0 +1,101 @@
111/30/2010
2--with-libbind=PATH is available but not used by Makefile,
3this patch is to allow building with external bind
4
5Signed-off-by: Qing He <qing.he@intel.com>
6
7diff --git a/Makefile.am b/Makefile.am
8index 928d926..cd17af8 100644
9--- a/Makefile.am
10+++ b/Makefile.am
11@@ -21,7 +21,7 @@ EXTRA_DIST = RELNOTES LICENSE \
12 util/bindvar.sh \
13 bind/Makefile bind/bind.tar.gz bind/version.tmp
14
15-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
16+SUBDIRS = includes tests common dst omapip client dhcpctl relay server
17
18 nobase_include_HEADERS = dhcpctl/dhcpctl.h
19
20diff --git a/client/Makefile.am b/client/Makefile.am
21index 77ed055..5a77f2d 100644
22--- a/client/Makefile.am
23+++ b/client/Makefile.am
24@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
25 scripts/netbsd scripts/nextstep scripts/openbsd \
26 scripts/solaris scripts/openwrt
27 dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
28- ../bind/lib/libdns.a ../bind/lib/libisc.a
29+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
30 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
31 EXTRA_DIST = $(man_MANS)
32
33diff --git a/configure.ac b/configure.ac
34index ff832aa..60d342c 100644
35--- a/configure.ac
36+++ b/configure.ac
37@@ -500,6 +500,7 @@ no)
38 libbind="$use_libbind"
39 ;;
40 esac
41+AC_SUBST([libbind])
42
43 # OpenLDAP support.
44 AC_ARG_WITH(ldap,
45diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
46index 61049be..85aefa3 100644
47--- a/dhcpctl/Makefile.am
48+++ b/dhcpctl/Makefile.am
49@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
50
51 omshell_SOURCES = omshell.c
52 omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
53- ../bind/lib/libdns.a ../bind/lib/libisc.a
54+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
55
56 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
57
58 cltest_SOURCES = cltest.c
59 cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
60- ../bind/lib/libdns.a ../bind/lib/libisc.a
61\ No newline at end of file
62+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
63diff --git a/omapip/Makefile.am b/omapip/Makefile.am
64index 595950a..17f2233 100644
65--- a/omapip/Makefile.am
66+++ b/omapip/Makefile.am
67@@ -10,5 +10,5 @@ man_MANS = omapi.3
68 EXTRA_DIST = $(man_MANS)
69
70 svtest_SOURCES = test.c
71-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
72+svtest_LDADD = libomapi.a $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
73
74diff --git a/relay/Makefile.am b/relay/Makefile.am
75index d8757ca..a7885da 100644
76--- a/relay/Makefile.am
77+++ b/relay/Makefile.am
78@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
79 sbin_PROGRAMS = dhcrelay
80 dhcrelay_SOURCES = dhcrelay.c
81 dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
82- ../bind/lib/libdns.a ../bind/lib/libisc.a
83+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
84 man_MANS = dhcrelay.8
85 EXTRA_DIST = $(man_MANS)
86
87diff --git a/server/Makefile.am b/server/Makefile.am
88index cdfaf47..d2c254b 100644
89--- a/server/Makefile.am
90+++ b/server/Makefile.am
91@@ -8,8 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
92
93 dhcpd_CFLAGS = $(LDAP_CFLAGS)
94 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
95- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
96- ../bind/lib/libisc.a
97+ ../dhcpctl/libdhcpctl.a $(libbind)/lib/libdns.a \
98+ $(libbind)/lib/libisc.a
99
100 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
101 EXTRA_DIST = $(man_MANS)
diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index f97de30..e7cff3e 100644
--- a/meta/recipes-connectivity/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
@@ -10,6 +10,8 @@ HOMEPAGE = "http://www.isc.org/"
10LICENSE = "ISC" 10LICENSE = "ISC"
11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74" 11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74"
12 12
13DEPENDS = "bind"
14
13SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ 15SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
14 file://site.h \ 16 file://site.h \
15 file://init-relay file://default-relay \ 17 file://init-relay file://default-relay \
@@ -22,7 +24,9 @@ TARGET_CFLAGS += "-D_GNU_SOURCE"
22EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ 24EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
23 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \ 25 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
24 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \ 26 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
25 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases" 27 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
28 --with-libbind=${STAGING_LIBDIR}/.. \
29 "
26 30
27do_compile_prepend () { 31do_compile_prepend () {
28 cp -f ${WORKDIR}/site.h ${S}/includes 32 cp -f ${WORKDIR}/site.h ${S}/includes
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 3f770d9..99920be 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,7 +1,9 @@
1require dhcp4.inc 1require dhcp4.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI += "file://fixincludes.patch \ 5SRC_URI += "file://fixincludes.patch \
6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ 6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
7 file://fix-client-path.patch" 7 file://fix-client-path.patch \
8 file://fix-external-bind.patch \
9 "