diff mbox

package/openvmtools: do not force -I/usr/include in CPPFLAGS

Message ID 1411297275-6888-1-git-send-email-yann.morin.1998@free.fr
State Accepted
Headers show

Commit Message

Yann E. MORIN Sept. 21, 2014, 11:01 a.m. UTC
Fixes:
    http://autobuild.buildroot.net/results/447/4473d8a99ffec1fde491d172520e86ae1e69fae7/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 .../openvmtools-04-dont-force-cppflags.patch       | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/openvmtools/openvmtools-04-dont-force-cppflags.patch

Comments

Karoly Kasza Sept. 21, 2014, 12:40 p.m. UTC | #1
Hi Yann,

I was just looking for the same problem at
http://autobuild.buildroot.net/results/2e0/2e0c15fded8b1043e916c34a795da0a06c8534fb/build-end.log
. Thanks for the fix - the patch number should become 05 I think if applied
committed after http://patchwork.ozlabs.org/patch/389396/ .

BR,
Karoly

On Sun, Sep 21, 2014 at 1:01 PM, Yann E. MORIN <yann.morin.1998@free.fr>
wrote:

> Fixes:
>
> http://autobuild.buildroot.net/results/447/4473d8a99ffec1fde491d172520e86ae1e69fae7/
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  .../openvmtools-04-dont-force-cppflags.patch       | 22
> ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644
> package/openvmtools/openvmtools-04-dont-force-cppflags.patch
>
> diff --git a/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> b/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> new file mode 100644
> index 0000000..8f904b1
> --- /dev/null
> +++ b/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> @@ -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
> + ])
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
Yann E. MORIN Sept. 21, 2014, 12:48 p.m. UTC | #2
Károly, All,

On 2014-09-21 14:40 +0200, Károly Kasza spake thusly:
> I was just looking for the same problem at
> http://autobuild.buildroot.net/results/2e0/2e0c15fded8b1043e916c34a795da0a06c8534fb/build-end.log

Yup, same problem. I just looked at the frontpage of the autobuilders,
so missed that one.

> . Thanks for the fix - the patch number should become 05 I think if applied
> committed after http://patchwork.ozlabs.org/patch/389396/ .

Yes.

Whoever commits this fix may rename whichever he applies last. ;-)

Regards,
Yann E. MORIN.

> BR,
> Karoly
> 
> On Sun, Sep 21, 2014 at 1:01 PM, Yann E. MORIN <yann.morin.1998@free.fr>
> wrote:
> 
> > Fixes:
> >
> > http://autobuild.buildroot.net/results/447/4473d8a99ffec1fde491d172520e86ae1e69fae7/
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > ---
> >  .../openvmtools-04-dont-force-cppflags.patch       | 22
> > ++++++++++++++++++++++
> >  1 file changed, 22 insertions(+)
> >  create mode 100644
> > package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> >
> > diff --git a/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> > b/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> > new file mode 100644
> > index 0000000..8f904b1
> > --- /dev/null
> > +++ b/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> > @@ -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
> > + ])
> > --
> > 1.9.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> >
> 
> 
> 
> -- 
> 
> Üdv,
> KK
Yann E. MORIN Sept. 21, 2014, 12:53 p.m. UTC | #3
All,

On 2014-09-21 13:01 +0200, Yann E. MORIN spake thusly:
> Fixes:
>     http://autobuild.buildroot.net/results/447/4473d8a99ffec1fde491d172520e86ae1e69fae7/
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  .../openvmtools-04-dont-force-cppflags.patch       | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> 
> diff --git a/package/openvmtools/openvmtools-04-dont-force-cppflags.patch b/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> new file mode 100644
> index 0000000..8f904b1
> --- /dev/null
> +++ b/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
> @@ -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=" "

I suddenly realise it is not obvious why I left a space in there.

That's on purpose, otherwise ./configure gets awfully confused, and
does not even try to find PAM headers and simply bails out before even
doing anything to detect PAM.

I can re-spin with a better commit log (and/or a comment in the patch)
if needed. Or it can be added by the committer. ;-)

Regards,
Yann E. MORIN.

> +       fi
> +       if test -n "$2"; then
> +-         CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2"
> ++         : CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2"
> +       fi
> +    fi
> + ])
> -- 
> 1.9.1
>
Thomas Petazzoni Sept. 21, 2014, 5:37 p.m. UTC | #4
Dear Yann E. MORIN,

On Sun, 21 Sep 2014 13:01:15 +0200, Yann E. MORIN wrote:
> Fixes:
>     http://autobuild.buildroot.net/results/447/4473d8a99ffec1fde491d172520e86ae1e69fae7/
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  .../openvmtools-04-dont-force-cppflags.patch       | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 package/openvmtools/openvmtools-04-dont-force-cppflags.patch

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/package/openvmtools/openvmtools-04-dont-force-cppflags.patch b/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
new file mode 100644
index 0000000..8f904b1
--- /dev/null
+++ b/package/openvmtools/openvmtools-04-dont-force-cppflags.patch
@@ -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
+ ])