summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-07-21 16:46:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 11:47:44 +0100
commit83a1a46b707895c564b8dc393917b09cc283bf27 (patch)
tree79a3c1b3428e3ed14efb5bfcfc63cdae09798d77 /meta/recipes-connectivity
parent6b9379e9d409713e5bd9bb46b38968d41cd834e1 (diff)
downloadopenembedded-core-83a1a46b707895c564b8dc393917b09cc283bf27.tar.gz
openembedded-core-83a1a46b707895c564b8dc393917b09cc283bf27.tar.bz2
openembedded-core-83a1a46b707895c564b8dc393917b09cc283bf27.zip
dhcp: Fix libdir issue for multilib
Signed-off-by: Mei Lei <lei.mei@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch14
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp4.inc2
2 files changed, 8 insertions, 8 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
index f03936d5f9..4f11655812 100644
--- 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
@@ -28,7 +28,7 @@ index 77ed055..5a77f2d 100644
scripts/solaris scripts/openwrt
dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libdns.a ../bind/lib/libisc.a
-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
@@ -53,7 +53,7 @@ index 61049be..85aefa3 100644
omshell_SOURCES = omshell.c
omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libdns.a ../bind/lib/libisc.a
-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a
libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
@@ -61,7 +61,7 @@ index 61049be..85aefa3 100644
cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libdns.a ../bind/lib/libisc.a
\ No newline at end of file
-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a
diff --git a/omapip/Makefile.am b/omapip/Makefile.am
index 595950a..17f2233 100644
--- a/omapip/Makefile.am
@@ -71,7 +71,7 @@ index 595950a..17f2233 100644
svtest_SOURCES = test.c
-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
-+svtest_LDADD = libomapi.a $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a
diff --git a/relay/Makefile.am b/relay/Makefile.am
index d8757ca..a7885da 100644
@@ -82,7 +82,7 @@ index d8757ca..a7885da 100644
dhcrelay_SOURCES = dhcrelay.c
dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libdns.a ../bind/lib/libisc.a
-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a
man_MANS = dhcrelay.8
EXTRA_DIST = $(man_MANS)
@@ -96,8 +96,8 @@ index cdfaf47..d2c254b 100644
dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
- ../bind/lib/libisc.a
-+ ../dhcpctl/libdhcpctl.a $(libbind)/lib/libdns.a \
-+ $(libbind)/lib/libisc.a
++ ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \
++ $(libbind)/libisc.a
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS)
diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index 885cc19413..bdaa5e9b00 100644
--- a/meta/recipes-connectivity/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
@@ -25,7 +25,7 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
--with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
--with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
--with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
- --with-libbind=${STAGING_LIBDIR}/.. \
+ --with-libbind=${STAGING_LIBDIR}/ \
"
do_compile_prepend () {