Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 5b9ede0403237c7dace972affa65cf64a1aadd0e / . / poky / meta / recipes-connectivity / dhcp / dhcp / 0008-tweak-to-support-external-bind.patch
blob: a20b5f96f68b8556551b654ac0f66c5549ca561d [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]1From 92875f5cc44914515e50c11c503a09cec90497b2 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 Jun 2016 22:51:44 -0400
4Subject: [PATCH 08/11] tweak to support external bind
5
6Tweak the external bind to oe-core's sysroot rather than
7external bind source build.
8
9Upstream-Status: Inappropriate <oe-core specific>
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 client/Makefile.am | 2 +-
14 client/tests/Makefile.am | 2 +-
15 common/tests/Makefile.am | 2 +-
16 dhcpctl/Makefile.am | 2 +-
17 omapip/Makefile.am | 2 +-
18 relay/Makefile.am | 2 +-
19 server/Makefile.am | 2 +-
20 server/tests/Makefile.am | 2 +-
21 8 files changed, 8 insertions(+), 8 deletions(-)
22
Brad Bishopc4ea0752018-11-15 14:30:15 -0800[diff] [blame]23Index: dhcp-4.3.6/client/Makefile.am
24===================================================================
25--- dhcp-4.3.6.orig/client/Makefile.am
26+++ dhcp-4.3.6/client/Makefile.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]27@@ -4,7 +4,7 @@
28 # production code. Sadly, we are not there yet.
29 SUBDIRS = . tests
30
31-BINDLIBDIR = @BINDDIR@/lib
32+BINDLIBDIR = @BINDDIR@
33
34 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
35 -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
Brad Bishopc4ea0752018-11-15 14:30:15 -0800[diff] [blame]36Index: dhcp-4.3.6/client/tests/Makefile.am
37===================================================================
38--- dhcp-4.3.6.orig/client/tests/Makefile.am
39+++ dhcp-4.3.6/client/tests/Makefile.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]40@@ -1,6 +1,6 @@
41 SUBDIRS = .
42
43-BINDLIBDIR = @BINDDIR@/lib
44+BINDLIBDIR = @BINDDIR@
45
46 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
47 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
Brad Bishopc4ea0752018-11-15 14:30:15 -0800[diff] [blame]48Index: dhcp-4.3.6/common/tests/Makefile.am
49===================================================================
50--- dhcp-4.3.6.orig/common/tests/Makefile.am
51+++ dhcp-4.3.6/common/tests/Makefile.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]52@@ -1,6 +1,6 @@
53 SUBDIRS = .
54
55-BINDLIBDIR = @BINDDIR@/lib
56+BINDLIBDIR = @BINDDIR@
57
58 AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
59
Brad Bishopc4ea0752018-11-15 14:30:15 -0800[diff] [blame]60Index: dhcp-4.3.6/dhcpctl/Makefile.am
61===================================================================
62--- dhcp-4.3.6.orig/dhcpctl/Makefile.am
63+++ dhcp-4.3.6/dhcpctl/Makefile.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]64@@ -1,4 +1,4 @@
65-BINDLIBDIR = @BINDDIR@/lib
66+BINDLIBDIR = @BINDDIR@
67
68 AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
69
Brad Bishopc4ea0752018-11-15 14:30:15 -0800[diff] [blame]70Index: dhcp-4.3.6/omapip/Makefile.am
71===================================================================
72--- dhcp-4.3.6.orig/omapip/Makefile.am
73+++ dhcp-4.3.6/omapip/Makefile.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]74@@ -1,4 +1,4 @@
75-BINDLIBDIR = @BINDDIR@/lib
76+BINDLIBDIR = @BINDDIR@
77 AM_CPPFLAGS = -I$(top_srcdir)/includes
78
Brad Bishopc4ea0752018-11-15 14:30:15 -0800[diff] [blame]79 lib_LTLIBRARIES = libomapi.la
80Index: dhcp-4.3.6/relay/Makefile.am
81===================================================================
82--- dhcp-4.3.6.orig/relay/Makefile.am
83+++ dhcp-4.3.6/relay/Makefile.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]84@@ -1,4 +1,4 @@
85-BINDLIBDIR = @BINDDIR@/lib
86+BINDLIBDIR = @BINDDIR@
87
88 AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
89
Brad Bishopc4ea0752018-11-15 14:30:15 -0800[diff] [blame]90Index: dhcp-4.3.6/server/Makefile.am
91===================================================================
92--- dhcp-4.3.6.orig/server/Makefile.am
93+++ dhcp-4.3.6/server/Makefile.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]94@@ -4,7 +4,7 @@
95 # production code. Sadly, we are not there yet.
96 SUBDIRS = . tests
97
98-BINDLIBDIR = @BINDDIR@/lib
99+BINDLIBDIR = @BINDDIR@
100
101 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
102
Brad Bishopc4ea0752018-11-15 14:30:15 -0800[diff] [blame]103Index: dhcp-4.3.6/server/tests/Makefile.am
104===================================================================
105--- dhcp-4.3.6.orig/server/tests/Makefile.am
106+++ dhcp-4.3.6/server/tests/Makefile.am
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]107@@ -1,6 +1,6 @@
108 SUBDIRS = .
109
110-BINDLIBDIR = @BINDDIR@/lib
111+BINDLIBDIR = @BINDDIR@
112
113 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
114 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)