Re: xenocara: honor CC, CXX, CXXFLAGS

[Matthieu Herrb]

On Tue, Mar 07, 2017 at 09:26:01PM +0100, Christian Weisgerber wrote:
> I noticed that the xenocara build uses "gcc" and "g++" everywhere
> if those exist at build time.  It's the result of an omission:
> CC, CXX, and CXXFLAGS simply aren't passed into the build and the
> GNU configure defaults are used.
> 
> Straightforward fix.  OK?

yes ok matthieu@

> 
> PS: Does anybody remember why we need to delete spaces at the end of
> CFLAGS?  That's a very odd requirement.

I copied it from bsd.port.mk... And there the commit message was

Author: Marc Espie 
Date:   Tue Sep 14 23:07:21 2004 +

remove trailing spaces from CFLAGS/CXXFLAGS, to please autoconf...

> 
> Index: app/xlockmore/Makefile.bsd-wrapper
> ===
> RCS file: /cvs/xenocara/app/xlockmore/Makefile.bsd-wrapper,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile.bsd-wrapper
> --- app/xlockmore/Makefile.bsd-wrapper13 Aug 2014 21:02:16 -  
> 1.12
> +++ app/xlockmore/Makefile.bsd-wrapper7 Mar 2017 17:52:27 -
> @@ -6,7 +6,10 @@ config.status:
>   AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
>   AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \
>   ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
> + CC="${CC}" \
>   CFLAGS="${CFLAGS}" \
> + CXX="${CXX}" \
> + CXXFLAGS="${CXXFLAGS}" \
>   PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
>   CONFIG_SITE=$(CONFIG_SITE) \
>   sh ${.CURDIR}/configure --prefix=${X11BASE} \
> Index: share/mk/bsd.xorg.mk
> ===
> RCS file: /cvs/xenocara/share/mk/bsd.xorg.mk,v
> retrieving revision 1.58
> diff -u -p -r1.58 bsd.xorg.mk
> --- share/mk/bsd.xorg.mk  12 Feb 2017 18:19:54 -  1.58
> +++ share/mk/bsd.xorg.mk  7 Mar 2017 02:16:07 -
> @@ -56,7 +56,10 @@ XENOCARA_PATH?=/bin:/sbin:/usr/bin:/usr
>  
>  CONFIGURE_ENV=   PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \
>   CONFIG_SITE=$(CONFIG_SITE) \
> + CC="$(CC)" \
>   CFLAGS="$(CFLAGS:C/ *$//)" \
> + CXX="$(CXX)" \
> + CXXFLAGS="$(CXXFLAGS:C/ *$//)" \
>   MAKE="${MAKE}"
>  
>  CONFIGURE_ARGS+= --disable-silent-rules
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de

-- 
Matthieu Herrb

xenocara: honor CC, CXX, CXXFLAGS

[Christian Weisgerber]

I noticed that the xenocara build uses "gcc" and "g++" everywhere
if those exist at build time.  It's the result of an omission:
CC, CXX, and CXXFLAGS simply aren't passed into the build and the
GNU configure defaults are used.

Straightforward fix.  OK?

PS: Does anybody remember why we need to delete spaces at the end of
CFLAGS?  That's a very odd requirement.

Index: app/xlockmore/Makefile.bsd-wrapper
===
RCS file: /cvs/xenocara/app/xlockmore/Makefile.bsd-wrapper,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.bsd-wrapper
--- app/xlockmore/Makefile.bsd-wrapper  13 Aug 2014 21:02:16 -  1.12
+++ app/xlockmore/Makefile.bsd-wrapper  7 Mar 2017 17:52:27 -
@@ -6,7 +6,10 @@ config.status:
AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \
ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
+   CC="${CC}" \
CFLAGS="${CFLAGS}" \
+   CXX="${CXX}" \
+   CXXFLAGS="${CXXFLAGS}" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
CONFIG_SITE=$(CONFIG_SITE) \
sh ${.CURDIR}/configure --prefix=${X11BASE} \
Index: share/mk/bsd.xorg.mk
===
RCS file: /cvs/xenocara/share/mk/bsd.xorg.mk,v
retrieving revision 1.58
diff -u -p -r1.58 bsd.xorg.mk
--- share/mk/bsd.xorg.mk12 Feb 2017 18:19:54 -  1.58
+++ share/mk/bsd.xorg.mk7 Mar 2017 02:16:07 -
@@ -56,7 +56,10 @@ XENOCARA_PATH?=  /bin:/sbin:/usr/bin:/usr
 
 CONFIGURE_ENV= PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \
CONFIG_SITE=$(CONFIG_SITE) \
+   CC="$(CC)" \
CFLAGS="$(CFLAGS:C/ *$//)" \
+   CXX="$(CXX)" \
+   CXXFLAGS="$(CXXFLAGS:C/ *$//)" \
MAKE="${MAKE}"
 
 CONFIGURE_ARGS+= --disable-silent-rules
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de