Configure : conditionally output HAIKU_ADD_ALTERNATIVE_GCC_LIBS = 1

[mmadia]

Another build automation enhancement :

Similar to Changeset [29161], modify configure to conditionally output HAIKU_ADD_ALTERNATIVE_GCC_LIBS = 1 to a *BuildConfig file residing in HAIKU_OUTPUT_DIR

I'm willing to implement this. Please give me an idea of what would be acceptable.

[mmadia]

This script shows one method for adding HAIKU_ADD_ALTERNATIVE_GCC_LIBS = 1 to HAIKU_OUTPUT_DIR/UserBuildConfig.

I've yet to attempt integrating this into the build system.

#!/bin/sh
# THESE VARIABLES exist for testing purposes.
HAIKU_OUTPUT_DIR='.'
infile="$HAIKU_OUTPUT_DIR/UserBuildConfig"
outfile="$HAIKU_OUTPUT_DIR/TempBuildConfig"

# check if HAIKU_OUTPUT_DIR/UserBuildConfig exists
# If yes, delete any lines containing HAIKU_ADD_ALTERNATIVE_GCC_LIBS
if [ -f "$infile" ] ; then
  grep -Ev HAIKU_ADD_ALTERNATIVE_GCC_LIBS "$infile" > "$outfile"
  mv -f "$outfile" "$infile"
fi
# Add line to HAIKU_OUTPUT_DIR/UserBuildConfig
echo "HAIKU_ADD_ALTERNATIVE_GCC_LIBS = 1 " >> "$infile"

[mmadia]

created against hrev29571

[mmadia]

The attached configure.3424.diff was tested with
../haiku/configure
../haiku/configure --alternative-gcc-output-dir ../gcc4
both commands were tested with and without a pre-existing HAIKU_OUTPUT_DIR/build/UserBuildConfig

note: configure was being run outside of haiku's source directory

[bonefish]

Generally I'm not very fond of editing user files programmatically. In this case I think the better alternative is to set the variable in the generated BuildConfig. That would still allow it to be unset in the UserBuildConfig.

[mmadia]

revision 2, hopefully much cleaner

[mmadia]

configure.3424-rev2.diff creates a new variable , addAlternativeGCCLibs=0 and sets it =1 when --alternative-gcc-output-dir is detected.

This is added to ${outputDir}/build/BuildConfig: HAIKU_ADD_ALTERNATIVE_GCC_LIBS ?= "${addAlternativeGCCLibs}" ;

On a side note, is there any reason why ${alternativeGCCOutputDir} is not encapsulated in double quotes?

[bonefish]

Replying to mmadia:

configure.3424-rev2.diff creates a new variable , addAlternativeGCCLibs=0 and sets it =1 when --alternative-gcc-output-dir is detected.

This is added to ${outputDir}/build/BuildConfig: HAIKU_ADD_ALTERNATIVE_GCC_LIBS ?= "${addAlternativeGCCLibs}" ;

Applied in hrev29607, but adjusted a bit. Since HAIKU_ADD_ALTERNATIVE_GCC_LIBS is only tested for non-emptiness, setting it to 0 wouldn't work.

On a side note, is there any reason why ${alternativeGCCOutputDir} is not encapsulated in double quotes?

ATM path names with spaces aren't really supported anyway, so that doesn't really make a difference.