[PATCH xinit 1/3] Drop $RAWCPPFLAGS when generating startx

[Gaetan Nadon]

On 14-03-25 07:56 AM, Hans de Goede wrote:
> startx.cpp contains things like #if defined(__SCO__), and
> $RAWCPPFLAGS contains -undef causing these to not get set.
>
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
> ---
>  cpprules.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/cpprules.in b/cpprules.in
> index 0931bee..781676a 100644
> --- a/cpprules.in
> +++ b/cpprules.in
> @@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
>  SUFFIXES = .cpp
>  
>  .cpp:
> -	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
> +	$(AM_V_GEN)$(RAWCPP) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@

 1. It looks like it has been this way for a very long time. Have you
    investigated why it isn't a problem today?

 2. This is going to change the xinitrc for Apple. How confident are you
    that the patch will not create a problem?
    I found on the net
    (http://arstechnica.com/civis/viewtopic.php?f=19&t=371721) a user
    posting his copy of xinitrc for Apple.

    if [ -f "$sysresources" ]; then

        xrdb -merge "$sysresources"

    fi

    When removing -undef, my guess is that the command will be "XRDB
    -nocpp -merge $sysresources". Right or wrong, I don't know.

 3. As for SCO, this OS is no longer supported, so we will never know.
    Take a look at app/xdm/config/Xsession.cpp.

 4. Aside from "undef", there is the option "traditional" that the patch
    also throws away. It has to do with the treatment of whitespace. Any
    idea on what happens to other platforms and/or other non-gnu compilers?


The -undef flag was added in Sept 2005. Are you running into a problem?
There is a mystery to be resolved...
http://cgit.freedesktop.org/xorg/util/macros/commit/?id=d690e4a9febd07988d149a967791c5629c17b258

If these defines have always been useless, a bigger cleanup could be done.

For reference, this is how RAWCPPFLAGS get populated from util/macros:

    # Check for flag to avoid builtin definitions - assumes unix is
    predefined,
    # which is not the best choice for supporting other OS'es, but
    covers most
    # of the ones we need for now.
    AC_MSG_CHECKING([if $RAWCPP requires -undef])
    AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])])
    if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
        AC_MSG_RESULT([no])
    else
        if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'`
    -eq 1 ; then
            RAWCPPFLAGS=-undef
            AC_MSG_RESULT([yes])
        # under Cygwin unix is still defined even with -undef
        elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c
    'unix'` -eq 1 ; then
            RAWCPPFLAGS="-undef -ansi"
            AC_MSG_RESULT([yes, with -ansi])
        else
            AC_MSG_ERROR([${RAWCPP} defines unix with or without
    -undef.  I don't know what to do.])
        fi
    fi
    rm -f conftest.$ac_ext

    AC_MSG_CHECKING([if $RAWCPP requires -traditional])
    AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve  
    "whitespace"?]])])
    if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   \"'` -eq
    1 ; then
        AC_MSG_RESULT([no])
    else
        if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c
    'preserve   \"'` -eq 1 ; then
            RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
            AC_MSG_RESULT([yes])
        else
            AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or
    without -traditional.  I don't know what to do.])
        fi
    fi
    rm -f conftest.$ac_ext
    AC_SUBST(RAWCPPFLAGS)
    ]) # XORG_PROG_RAWCPP







-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140325/ced56128/attachment.html>