diff options
| author |   Martin Kelly <mkelly@xevo.com> | 2017-06-23 15:48:39 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-01 09:59:24 +0200 |
| commit | 16accb708c14f490605b02cfd8af5e74dd1f7ba7 (patch) | |
| tree | 9a892c93053562b4bcf37413103aac4fc5d2adf5 /meta-oe/recipes-support/open-vm-tools | |
| parent | 778f28874f8ae4f38763b2403cbe1fcaac7aca3d (diff) | |
| download | meta-openembedded-contrib-16accb708c14f490605b02cfd8af5e74dd1f7ba7.tar.gz | |
open-vm-tools: don't use dnet-config
dnet-config wasn't found in the PATH, and it doesn't work properly for
cross-compile anyway.
Signed-off-by: Martin Kelly <mkelly@xevo.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/open-vm-tools')
| -rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch | 41 | ||||
| -rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 3 |
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch new file mode 100644 index 0000000000..e9cb873f1a --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch @@ -0,0 +1,41 @@ +From 929150608c16644695f19cd2e0cc8a06a41cd497 Mon Sep 17 00:00:00 2001 +From: Martin Kelly <mkelly@xevo.com> +Date: Fri, 7 Apr 2017 15:20:30 -0700 +Subject: [PATCH] configure.ac: don't use dnet-config + +The dnet-config tool doesn't know about cross-compilation, so it injects +-I/usr/include into the path, causing compiler errors. So instead find dnet via +-ldnet. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Martin Kelly <mkelly@xevo.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3400b86..7d6119e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -942,7 +942,7 @@ if test "$with_dnet" = "yes"; then + AC_VMW_CHECK_LIB([dnet], + [DNET], + [], +- [dnet-config], ++ [], + [], + [dnet.h], + [intf_open], +@@ -952,7 +952,7 @@ if test "$with_dnet" = "yes"; then + + if test $have_dnet = "no"; then + AC_MSG_ERROR( +- [dnet-config was not found on your PATH. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) ++ [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) + fi + fi + +-- +2.1.4 + diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb index 6793d450b8..b3e0afca73 100644 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb @@ -24,6 +24,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://tools.conf \ file://vmtoolsd.service \ file://0001-Fix-kernel-detection.patch \ + file://0002-configure.ac-don-t-use-dnet-config.patch \ " SRCREV = "854c0bb374612f7e633b448ca273f970f154458b" @@ -76,4 +77,6 @@ do_install_append() { do_configure_prepend() { export CUSTOM_PROCPS_NAME=procps export CUSTOM_PROCPS_LIBS=-L${STAGING_LIBDIR}/libprocps.so + export CUSTOM_DNET_NAME=dnet + export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so } |