diff options
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch')
| -rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch | 14 |
1 files changed, 7 insertions, 7 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 | |||
| 28 | scripts/solaris scripts/openwrt | 28 | scripts/solaris scripts/openwrt |
| 29 | dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | 29 | dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 30 | - ../bind/lib/libdns.a ../bind/lib/libisc.a | 30 | - ../bind/lib/libdns.a ../bind/lib/libisc.a |
| 31 | + $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a | 31 | + $(libbind)/libdns.a $(libbind)/libisc.a |
| 32 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 | 32 | man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 |
| 33 | EXTRA_DIST = $(man_MANS) | 33 | EXTRA_DIST = $(man_MANS) |
| 34 | 34 | ||
| @@ -53,7 +53,7 @@ index 61049be..85aefa3 100644 | |||
| 53 | omshell_SOURCES = omshell.c | 53 | omshell_SOURCES = omshell.c |
| 54 | omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ | 54 | omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
| 55 | - ../bind/lib/libdns.a ../bind/lib/libisc.a | 55 | - ../bind/lib/libdns.a ../bind/lib/libisc.a |
| 56 | + $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a | 56 | + $(libbind)/libdns.a $(libbind)/libisc.a |
| 57 | 57 | ||
| 58 | libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c | 58 | libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c |
| 59 | 59 | ||
| @@ -61,7 +61,7 @@ index 61049be..85aefa3 100644 | |||
| 61 | cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ | 61 | cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ |
| 62 | - ../bind/lib/libdns.a ../bind/lib/libisc.a | 62 | - ../bind/lib/libdns.a ../bind/lib/libisc.a |
| 63 | \ No newline at end of file | 63 | \ No newline at end of file |
| 64 | + $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a | 64 | + $(libbind)/libdns.a $(libbind)/libisc.a |
| 65 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am | 65 | diff --git a/omapip/Makefile.am b/omapip/Makefile.am |
| 66 | index 595950a..17f2233 100644 | 66 | index 595950a..17f2233 100644 |
| 67 | --- a/omapip/Makefile.am | 67 | --- a/omapip/Makefile.am |
| @@ -71,7 +71,7 @@ index 595950a..17f2233 100644 | |||
| 71 | 71 | ||
| 72 | svtest_SOURCES = test.c | 72 | svtest_SOURCES = test.c |
| 73 | -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a | 73 | -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a |
| 74 | +svtest_LDADD = libomapi.a $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a | 74 | +svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a |
| 75 | 75 | ||
| 76 | diff --git a/relay/Makefile.am b/relay/Makefile.am | 76 | diff --git a/relay/Makefile.am b/relay/Makefile.am |
| 77 | index d8757ca..a7885da 100644 | 77 | index d8757ca..a7885da 100644 |
| @@ -82,7 +82,7 @@ index d8757ca..a7885da 100644 | |||
| 82 | dhcrelay_SOURCES = dhcrelay.c | 82 | dhcrelay_SOURCES = dhcrelay.c |
| 83 | dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | 83 | dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 84 | - ../bind/lib/libdns.a ../bind/lib/libisc.a | 84 | - ../bind/lib/libdns.a ../bind/lib/libisc.a |
| 85 | + $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a | 85 | + $(libbind)/libdns.a $(libbind)/libisc.a |
| 86 | man_MANS = dhcrelay.8 | 86 | man_MANS = dhcrelay.8 |
| 87 | EXTRA_DIST = $(man_MANS) | 87 | EXTRA_DIST = $(man_MANS) |
| 88 | 88 | ||
| @@ -96,8 +96,8 @@ index cdfaf47..d2c254b 100644 | |||
| 96 | dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ | 96 | dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ |
| 97 | - ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ | 97 | - ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ |
| 98 | - ../bind/lib/libisc.a | 98 | - ../bind/lib/libisc.a |
| 99 | + ../dhcpctl/libdhcpctl.a $(libbind)/lib/libdns.a \ | 99 | + ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \ |
| 100 | + $(libbind)/lib/libisc.a | 100 | + $(libbind)/libisc.a |
| 101 | 101 | ||
| 102 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 | 102 | man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 |
| 103 | EXTRA_DIST = $(man_MANS) | 103 | EXTRA_DIST = $(man_MANS) |