--- qt4-build.eclass?revision=1.103 2011-12-11 21:03:08.000000000 +0400 +++ qt4-build.eclass 2011-12-11 21:09:27.000000000 +0400 @@ -244,7 +244,7 @@ fi # Bug 282984 && Bug 295530 - sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ + sed -e "/^SYSTEM_VARIABLES/i CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nexport CFLAGS=\"${CFLAGS}\"\nexport CXXFLAGS=\"${CXXFLAGS}\"\nexport LDFLAGS=\"${LDFLAGS}\"" \ -i configure || die "sed qmake compilers failed" # Bug 321335 @@ -253,6 +253,11 @@ xargs -0 \ sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \ -i || die "sed test compilers failed" + find ./config.tests -type f -name "*.test" -exec grep -lZ '^\(CXX\|L\)FLAGS' '{}' \; | \ + xargs -0 \ + sed -e '/^CXXFLAGS/ s/""/"$CXXFLAGS"/' \ + -e '/^LFLAGS/ s/""/"$LFLAGS $LDFLAGS"/' \ + -i || die "sed test flags failed" fi # Bug 172219