• Bug#264283: Patch

    From Jurij Smakov@1:229/2 to All on Fri Aug 13 10:40:07 2004
    From: [email protected]

    tags 264283 + patch
    thanks

    Hello,

    The patch below fixes the FTBFS with dash as /bin/sh (tested in
    pbuilder with both /bin/sh -> dash and /bin/sh -> bash). It would be
    cleaner to set the SHELL in top-level Makefile, but it turns out that it
    is notoriously hard to propagate the SHELL settings to sub-make, so the
    chance to break something is larger. I also could not make the awk command
    to work, so replaced it with the compiler vesrion only.

    --------------------------------cut here----------------------------------
    diff -aur vertex-0.1.14_orig/vertex/makefile_append.ini vertex-0.1.14/vertex/makefile_append.ini
    --- vertex-0.1.14_orig/vertex/makefile_append.ini 2004-08-13 01:39:05.000000000 -0400
    +++ vertex-0.1.14/vertex/makefile_append.ini 2004-08-13 01:40:07.000000000 -0400
    @@ -1,6 +1,6 @@
    # Appended stuff starts here
    #
    -
    +SHELL=/bin/bash
    # C++ flags:
    CPPFLAGS = -D__cplusplus -Dc_plusplus

    @@ -20,7 +20,7 @@
    EXPORT_COMPILETIMEINFO_H = echo -n -e "\
    \#ifndef COMPILETIMEINFO_H\n\
    \#define COMPILETIMEINFO_H\n\
    -\#define COMPILE_COMPILER\t\"`$(CPP) --version| awk '{printf("%s\\n",$0)}'`\"\n\
    +\#define COMPILE_COMPILER\t\"`$(CPP) --version| head -n 1`\"\n\
    \#define COMPILE_USER\t\t\"$(USER)\"\n\
    \#define COMPILE_LOCATION\t\"`uname -n`\"\n\
    \#define COMPILE_DATE\t\t`date +\"%s\"`\n\
    --------------------------------cut here----------------------------------

    Best regards,

    Jurij Smakov [email protected]
    Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC


    --
    To UNSUBSCRIBE, email to [email protected]
    with a