diff options
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | 109 |
1 files changed, 51 insertions, 58 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch index 7d1d867986..b71c93dd6d 100644 --- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch +++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | |||
@@ -19,82 +19,75 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
19 | server/Makefile.am | 2 +- | 19 | server/Makefile.am | 2 +- |
20 | 6 files changed, 9 insertions(+), 5 deletions(-) | 20 | 6 files changed, 9 insertions(+), 5 deletions(-) |
21 | 21 | ||
22 | diff --git a/client/Makefile.am b/client/Makefile.am | 22 | Index: dhcp-4.4.1/common/Makefile.am |
23 | index 2cb83d8..4730bb3 100644 | 23 | =================================================================== |
24 | --- a/client/Makefile.am | 24 | --- dhcp-4.4.1.orig/common/Makefile.am |
25 | +++ b/client/Makefile.am | 25 | +++ dhcp-4.4.1/common/Makefile.am |
26 | @@ -7,11 +7,11 @@ SUBDIRS = . tests | ||
27 | BINDLIBDIR = @BINDDIR@/lib | ||
28 | |||
29 | AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ | ||
30 | - -DLOCALSTATEDIR='"$(localstatedir)"' | ||
31 | + -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes | ||
32 | |||
33 | dist_sysconf_DATA = dhclient.conf.example | ||
34 | sbin_PROGRAMS = dhclient | ||
35 | -dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ | ||
36 | +dhclient_SOURCES = $(srcdir)/clparse.c $(srcdir)/dhclient.c $(srcdir)/dhc6.c \ | ||
37 | scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ | ||
38 | scripts/netbsd scripts/nextstep scripts/openbsd \ | ||
39 | scripts/solaris scripts/openwrt | ||
40 | diff --git a/common/Makefile.am b/common/Makefile.am | ||
41 | index 113aee8..0f24fbb 100644 | ||
42 | --- a/common/Makefile.am | ||
43 | +++ b/common/Makefile.am | ||
44 | @@ -1,4 +1,5 @@ | 26 | @@ -1,4 +1,5 @@ |
45 | -AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' | 27 | -AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
46 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' | 28 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' |
47 | + | 29 | + |
48 | AM_CFLAGS = $(LDAP_CFLAGS) | 30 | AM_CFLAGS = $(LDAP_CFLAGS) |
49 | 31 | ||
50 | noinst_LIBRARIES = libdhcp.a | 32 | lib_LIBRARIES = libdhcp.a |
51 | diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am | 33 | Index: dhcp-4.4.1/dhcpctl/Makefile.am |
52 | index ceb0de1..ba8dd8b 100644 | 34 | =================================================================== |
53 | --- a/dhcpctl/Makefile.am | 35 | --- dhcp-4.4.1.orig/dhcpctl/Makefile.am |
54 | +++ b/dhcpctl/Makefile.am | 36 | +++ dhcp-4.4.1/dhcpctl/Makefile.am |
55 | @@ -1,5 +1,7 @@ | 37 | @@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@ |
56 | BINDLIBDIR = @BINDDIR@/lib | 38 | BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ |
39 | BINDLIBISCDIR=@BINDLIBISCDIR@ | ||
57 | 40 | ||
58 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) | 41 | +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) |
59 | + | 42 | + |
60 | bin_PROGRAMS = omshell | 43 | bin_PROGRAMS = omshell |
61 | lib_LIBRARIES = libdhcpctl.a | 44 | lib_LIBRARIES = libdhcpctl.a |
62 | noinst_PROGRAMS = cltest | 45 | noinst_PROGRAMS = cltest |
63 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am | 46 | Index: dhcp-4.4.1/server/Makefile.am |
64 | index 446a594..dd1afa0 100644 | 47 | =================================================================== |
65 | --- a/omapip/Makefile.am | 48 | --- dhcp-4.4.1.orig/server/Makefile.am |
66 | +++ b/omapip/Makefile.am | 49 | +++ dhcp-4.4.1/server/Makefile.am |
67 | @@ -1,4 +1,5 @@ | 50 | @@ -4,7 +4,7 @@ |
68 | BINDLIBDIR = @BINDDIR@/lib | 51 | # production code. Sadly, we are not there yet. |
52 | SUBDIRS = . tests | ||
53 | |||
54 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' | ||
55 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | ||
56 | |||
57 | dist_sysconf_DATA = dhcpd.conf.example | ||
58 | sbin_PROGRAMS = dhcpd | ||
59 | Index: dhcp-4.4.1/client/Makefile.am | ||
60 | =================================================================== | ||
61 | --- dhcp-4.4.1.orig/client/Makefile.am | ||
62 | +++ dhcp-4.4.1/client/Makefile.am | ||
63 | @@ -5,7 +5,7 @@ | ||
64 | SUBDIRS = . tests | ||
65 | |||
66 | AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' | ||
67 | -AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' | ||
68 | +AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes | ||
69 | |||
70 | dist_sysconf_DATA = dhclient.conf.example | ||
71 | sbin_PROGRAMS = dhclient | ||
72 | Index: dhcp-4.4.1/omapip/Makefile.am | ||
73 | =================================================================== | ||
74 | --- dhcp-4.4.1.orig/omapip/Makefile.am | ||
75 | +++ dhcp-4.4.1/omapip/Makefile.am | ||
76 | @@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@ | ||
77 | BINDLIBDNSDIR=@BINDLIBDNSDIR@ | ||
78 | BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@ | ||
79 | BINDLIBISCDIR=@BINDLIBISCDIR@ | ||
69 | +AM_CPPFLAGS = -I$(top_srcdir)/includes | 80 | +AM_CPPFLAGS = -I$(top_srcdir)/includes |
70 | 81 | ||
71 | lib_LIBRARIES = libomapi.a | 82 | lib_LIBRARIES = libomapi.a |
72 | noinst_PROGRAMS = svtest | 83 | noinst_PROGRAMS = svtest |
73 | diff --git a/relay/Makefile.am b/relay/Makefile.am | 84 | Index: dhcp-4.4.1/relay/Makefile.am |
74 | index 3060eca..6d652f6 100644 | 85 | =================================================================== |
75 | --- a/relay/Makefile.am | 86 | --- dhcp-4.4.1.orig/relay/Makefile.am |
76 | +++ b/relay/Makefile.am | 87 | +++ dhcp-4.4.1/relay/Makefile.am |
77 | @@ -1,6 +1,6 @@ | 88 | @@ -1,4 +1,4 @@ |
78 | BINDLIBDIR = @BINDDIR@/lib | ||
79 | |||
80 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' | 89 | -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' |
81 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | 90 | +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes |
82 | 91 | ||
83 | sbin_PROGRAMS = dhcrelay | 92 | sbin_PROGRAMS = dhcrelay |
84 | dhcrelay_SOURCES = dhcrelay.c | 93 | dhcrelay_SOURCES = dhcrelay.c |
85 | diff --git a/server/Makefile.am b/server/Makefile.am | ||
86 | index 54feedf..3990b9c 100644 | ||
87 | --- a/server/Makefile.am | ||
88 | +++ b/server/Makefile.am | ||
89 | @@ -6,7 +6,7 @@ SUBDIRS = . tests | ||
90 | |||
91 | BINDLIBDIR = @BINDDIR@/lib | ||
92 | |||
93 | -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' | ||
94 | +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes | ||
95 | |||
96 | dist_sysconf_DATA = dhcpd.conf.example | ||
97 | sbin_PROGRAMS = dhcpd | ||
98 | -- | ||
99 | 1.8.3.1 | ||
100 | |||