From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 01/16] dhcp: Fix libdir issue for multilib
Date: Fri, 22 Jul 2011 00:25:49 -0700 [thread overview]
Message-ID: <bf4052365f2e197d25d83fa6eb4e4684fe3112ae.1311318447.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1311318447.git.sgw@linux.intel.com>
In-Reply-To: <cover.1311318447.git.sgw@linux.intel.com>
From: Mei Lei <lei.mei@intel.com>
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
.../dhcp/dhcp-4.2.0/fix-external-bind.patch | 14 +++++++-------
meta/recipes-connectivity/dhcp/dhcp4.inc | 2 +-
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 f03936d..4f11655 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 885cc19..bdaa5e9 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 () {
--
1.7.3.4
next prev parent reply other threads:[~2011-07-22 7:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 7:25 [CONSOLIDATED PULL 00/16] July 22, 2011 Saul Wold
2011-07-22 7:25 ` Saul Wold [this message]
2011-07-22 7:25 ` [CONSOLIDATED PULL 02/16] linux-yocto: kernel-3.0 support recipe Saul Wold
2011-07-22 7:25 ` [CONSOLIDATED PULL 03/16] kernel: copy defconfig to {B} vs {S} Saul Wold
2011-07-22 7:25 ` [CONSOLIDATED PULL 04/16] linux-yocto: update LICENSE to GPLv2 Saul Wold
2011-07-22 7:25 ` [CONSOLIDATED PULL 05/16] kern-tools: update SRCREV Saul Wold
2011-07-22 7:25 ` [CONSOLIDATED PULL 06/16] default-versions: Update pulseaudio as arm no longer needs a seperate backport Saul Wold
2011-07-22 7:52 ` Koen Kooi
2011-07-22 7:25 ` [CONSOLIDATED PULL 07/16] mesa-xlib, mesa-dri: Probe for newlocale() before using it Saul Wold
2011-07-22 7:25 ` [CONSOLIDATED PULL 08/16] task-core-tools.bb: Exclude lttng-ust for x86_64/uclibc Saul Wold
2011-07-22 7:25 ` [CONSOLIDATED PULL 09/16] uclibc: Add patch header for sync_file_range2.patch Saul Wold
2011-07-22 7:25 ` [CONSOLIDATED PULL 10/16] strace: Define own sigmask macro if not defined already in signal.h Saul Wold
2011-07-22 7:25 ` [CONSOLIDATED PULL 11/16] util-linux: Replace sigsetmask with posix compliant functions Saul Wold
2011-07-22 7:26 ` [CONSOLIDATED PULL 12/16] .gitignore: Update build ignores to have wildcard Saul Wold
2011-07-22 7:26 ` [CONSOLIDATED PULL 13/16] tclibc-uclibc: Fix TARGET_OS for powerpc Saul Wold
2011-07-22 7:26 ` [CONSOLIDATED PULL 14/16] glib-2.0: fix a compilation issue due to dtrace Saul Wold
2011-07-22 7:26 ` [CONSOLIDATED PULL 15/16] python: fix security vulnerability Saul Wold
2011-07-22 7:26 ` [CONSOLIDATED PULL 16/16] fix Upstream-Status line for few patches Saul Wold
2011-07-22 10:51 ` [CONSOLIDATED PULL 00/16] July 22, 2011 Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bf4052365f2e197d25d83fa6eb4e4684fe3112ae.1311318447.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox