package/openvmtools: do not force -I/usr/include in CPPFLAGS
authorYann E. MORIN <yann.morin.1998@free.fr>
Sun, 21 Sep 2014 11:01:15 +0000 (13:01 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 21 Sep 2014 17:29:57 +0000 (19:29 +0200)
Fixes:
    http://autobuild.buildroot.net/results/447/4473d8a99ffec1fde491d172520e86ae1e69fae7/

[Thomas: change patch sequence number to 05, since another patch added
a 04 patch in the mean time.]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/openvmtools/openvmtools-05-dont-force-cppflags.patch [new file with mode: 0644]

diff --git a/package/openvmtools/openvmtools-05-dont-force-cppflags.patch b/package/openvmtools/openvmtools-05-dont-force-cppflags.patch
new file mode 100644 (file)
index 0000000..8f904b1
--- /dev/null
@@ -0,0 +1,22 @@
+m4: do not force -I/usr/include in CPPFLAGS
+
+This is so horribly broken for cross-compilation. :-(
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN openvmtools-9.4.6-1770165.orig/m4/vmtools.m4 openvmtools-9.4.6-1770165/m4/vmtools.m4
+--- openvmtools-9.4.6-1770165.orig/m4/vmtools.m4       2014-07-02 00:21:14.000000000 +0200
++++ openvmtools-9.4.6-1770165/m4/vmtools.m4    2014-09-21 12:39:15.901659888 +0200
+@@ -281,10 +281,10 @@
+       if test "$os" = freebsd; then
+          CUSTOM_$1_CPPFLAGS="-I/usr/local/include"
+       else
+-         CUSTOM_$1_CPPFLAGS="-I/usr/include"
++         CUSTOM_$1_CPPFLAGS=" "
+       fi
+       if test -n "$2"; then
+-         CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2"
++         : CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2"
+       fi
+    fi
+ ])