aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2017-12-28 13:53:00 +0800
committerArmin Kuster <akuster808@gmail.com>2018-02-01 07:32:04 -0800
commite8abea891199f077bd471d371a79d5f863a2f44a (patch)
tree354bd6cdbe41e8e19575f5c8470300233cbce223
parented6ed8d6ffff188d1a42072f8248bf377b1b651b (diff)
downloadmeta-openembedded-contrib-e8abea891199f077bd471d371a79d5f863a2f44a.tar.gz
meta-openembedded-contrib-e8abea891199f077bd471d371a79d5f863a2f44a.tar.bz2
meta-openembedded-contrib-e8abea891199f077bd471d371a79d5f863a2f44a.zip
leveldb: fix checking for SSE flag
The build_detect_platform-Check-for-__SSE4_2__.patch tries to use fgrep with pipe to get the SSE flag. But actually it would fail with error: fgrep: /tmp/leveldb_build_detect_platform-cxx.25886: No such file or directory That means it can not get the correct SSE flag. We should make sure the fgrep command runs after g++ command has finished and redirect the stdout and stderr to /dev/null to avoid make error: Makefile:18: *** missing separator. Stop. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> (cherry picked from commit fa211625598c9cc2ef965bf95548d21930622aaa) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch b/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch
index bbabf688d8..8f93cb325b 100644
--- a/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch
+++ b/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch
@@ -19,14 +19,15 @@ Index: git/build_detect_platform
===================================================================
--- git.orig/build_detect_platform
+++ git/build_detect_platform
-@@ -230,13 +230,12 @@ EOF
+@@ -224,13 +224,13 @@ EOF
rm -f $CXXOUTPUT 2>/dev/null
# Test if gcc SSE 4.2 is supported
- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -msse4.2 2>/dev/null <<EOF
-+ $CXX $CXXFLAGS -Werror -x c++ - -o $CXXOUTPUT -msse4.2 -dD -E 2>/dev/null | fgrep __SSE4_2__ $CXXOUTPUT 2>/dev/null <<EOF
++ $CXX $CXXFLAGS -Werror -x c++ - -o $CXXOUTPUT -msse4.2 -dD -E 2>/dev/null <<EOF
int main() {}
EOF
++ eval fgrep __SSE4_2__ $CXXOUTPUT >/dev/null 2>&1
if [ "$?" = 0 ]; then
PLATFORM_SSEFLAGS="-msse4.2"
fi