diff options
Diffstat (limited to 'poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch')
| -rw-r--r-- | poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch | 69 |
1 files changed, 33 insertions, 36 deletions
diff --git a/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch index 006d18ae7..a20b5f96f 100644 --- a/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch +++ b/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch @@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> server/tests/Makefile.am | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -diff --git a/client/Makefile.am b/client/Makefile.am -index 4730bb3..84d8131 100644 ---- a/client/Makefile.am -+++ b/client/Makefile.am +Index: dhcp-4.3.6/client/Makefile.am +=================================================================== +--- dhcp-4.3.6.orig/client/Makefile.am ++++ dhcp-4.3.6/client/Makefile.am @@ -4,7 +4,7 @@ # production code. Sadly, we are not there yet. SUBDIRS = . tests @@ -33,10 +33,10 @@ index 4730bb3..84d8131 100644 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes -diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am -index 5031d0c..a8dfd26 100644 ---- a/client/tests/Makefile.am -+++ b/client/tests/Makefile.am +Index: dhcp-4.3.6/client/tests/Makefile.am +=================================================================== +--- dhcp-4.3.6.orig/client/tests/Makefile.am ++++ dhcp-4.3.6/client/tests/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . @@ -45,10 +45,10 @@ index 5031d0c..a8dfd26 100644 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) -diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am -index f6a43e4..2f98d22 100644 ---- a/common/tests/Makefile.am -+++ b/common/tests/Makefile.am +Index: dhcp-4.3.6/common/tests/Makefile.am +=================================================================== +--- dhcp-4.3.6.orig/common/tests/Makefile.am ++++ dhcp-4.3.6/common/tests/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . @@ -57,40 +57,40 @@ index f6a43e4..2f98d22 100644 AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes -diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am -index ba8dd8b..9b2486e 100644 ---- a/dhcpctl/Makefile.am -+++ b/dhcpctl/Makefile.am +Index: dhcp-4.3.6/dhcpctl/Makefile.am +=================================================================== +--- dhcp-4.3.6.orig/dhcpctl/Makefile.am ++++ dhcp-4.3.6/dhcpctl/Makefile.am @@ -1,4 +1,4 @@ -BINDLIBDIR = @BINDDIR@/lib +BINDLIBDIR = @BINDDIR@ AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -diff --git a/omapip/Makefile.am b/omapip/Makefile.am -index dd1afa0..e4a8599 100644 ---- a/omapip/Makefile.am -+++ b/omapip/Makefile.am +Index: dhcp-4.3.6/omapip/Makefile.am +=================================================================== +--- dhcp-4.3.6.orig/omapip/Makefile.am ++++ dhcp-4.3.6/omapip/Makefile.am @@ -1,4 +1,4 @@ -BINDLIBDIR = @BINDDIR@/lib +BINDLIBDIR = @BINDDIR@ AM_CPPFLAGS = -I$(top_srcdir)/includes - lib_LIBRARIES = libomapi.a -diff --git a/relay/Makefile.am b/relay/Makefile.am -index 6d652f6..b3bf578 100644 ---- a/relay/Makefile.am -+++ b/relay/Makefile.am + lib_LTLIBRARIES = libomapi.la +Index: dhcp-4.3.6/relay/Makefile.am +=================================================================== +--- dhcp-4.3.6.orig/relay/Makefile.am ++++ dhcp-4.3.6/relay/Makefile.am @@ -1,4 +1,4 @@ -BINDLIBDIR = @BINDDIR@/lib +BINDLIBDIR = @BINDDIR@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes -diff --git a/server/Makefile.am b/server/Makefile.am -index 3990b9c..b5d8c2d 100644 ---- a/server/Makefile.am -+++ b/server/Makefile.am +Index: dhcp-4.3.6/server/Makefile.am +=================================================================== +--- dhcp-4.3.6.orig/server/Makefile.am ++++ dhcp-4.3.6/server/Makefile.am @@ -4,7 +4,7 @@ # production code. Sadly, we are not there yet. SUBDIRS = . tests @@ -100,10 +100,10 @@ index 3990b9c..b5d8c2d 100644 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes -diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am -index a87c5e7..9821081 100644 ---- a/server/tests/Makefile.am -+++ b/server/tests/Makefile.am +Index: dhcp-4.3.6/server/tests/Makefile.am +=================================================================== +--- dhcp-4.3.6.orig/server/tests/Makefile.am ++++ dhcp-4.3.6/server/tests/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . @@ -112,6 +112,3 @@ index a87c5e7..9821081 100644 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) --- -1.8.3.1 - |
