From 44d9b48e3b6d7d0df5847598d077e326858cda44 Mon Sep 17 00:00:00 2001
From: chenzhiyu <chen-zhiyu+chen.zhiyu@users.noreply.github.com>
Date: Thu, 10 Sep 2020 16:53:18 +0800
Subject: [PATCH] add musl changes

---
 paddle/fluid/inference/CMakeLists.txt  | 2 +-
 paddle/fluid/inference/check_symbol.sh | 2 +-
 paddle/fluid/platform/enforce.h        | 4 ++--
 paddle/fluid/platform/macros.h         | 6 +++---
 paddle/fluid/platform/port.h           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt
index 9dc96fdfe86..33c22ca01ec 100644
--- a/paddle/fluid/inference/CMakeLists.txt
+++ b/paddle/fluid/inference/CMakeLists.txt
@@ -92,7 +92,7 @@ if(NOT APPLE AND NOT WIN32)
   set_target_properties(paddle_fluid_shared PROPERTIES LINK_FLAGS "${LINK_FLAGS}")
   # check symbol hidden
   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/check_symbol.cmake
-    "execute_process(COMMAND bash -c \"${CMAKE_CURRENT_SOURCE_DIR}/check_symbol.sh"
+    "execute_process(COMMAND sh -c \"${CMAKE_CURRENT_SOURCE_DIR}/check_symbol.sh"
     " ${CMAKE_CURRENT_BINARY_DIR}/libpaddle_fluid.so\" RESULT_VARIABLE symbol_res)\n"
     "if(NOT \"\${symbol_res}\" STREQUAL \"0\")\n"
     "  message(FATAL_ERROR \"Check symbol failed.\")\n"
diff --git a/paddle/fluid/inference/check_symbol.sh b/paddle/fluid/inference/check_symbol.sh
index b6b7d1f20ba..a0f64796576 100755
--- a/paddle/fluid/inference/check_symbol.sh
+++ b/paddle/fluid/inference/check_symbol.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 lib=$1
 if [ $# -ne 1 ]; then echo "No input library"; exit -1 ; fi
diff --git a/paddle/fluid/platform/enforce.h b/paddle/fluid/platform/enforce.h
index ce1ec507307..784760a65a4 100644
--- a/paddle/fluid/platform/enforce.h
+++ b/paddle/fluid/platform/enforce.h
@@ -230,13 +230,13 @@ inline std::string SimplifyDemangleStr(std::string str) {
 }
 
 inline std::string GetCurrentTraceBackString() {
-  static constexpr int TRACE_STACK_LIMIT = 100;
+  //static constexpr int TRACE_STACK_LIMIT = 100;
   std::ostringstream sout;
 
   sout << "\n\n--------------------------------------\n";
   sout << "C++ Traceback (most recent call last):";
   sout << "\n--------------------------------------\n";
-#if !defined(_WIN32)
+#if !defined(_WIN32) && 0
   void* call_stack[TRACE_STACK_LIMIT];
   auto size = backtrace(call_stack, TRACE_STACK_LIMIT);
   auto symbols = backtrace_symbols(call_stack, size);
diff --git a/paddle/fluid/platform/macros.h b/paddle/fluid/platform/macros.h
index 32b7efc04c1..7ab63cc10c1 100644
--- a/paddle/fluid/platform/macros.h
+++ b/paddle/fluid/platform/macros.h
@@ -25,6 +25,6 @@ limitations under the License. */
   classname& operator=(classname&&) = delete
 #endif
 
-#if defined(__FLT_MAX__)
-#define FLT_MAX __FLT_MAX__
-#endif  // __FLT_MAX__
+//#if defined(__FLT_MAX__)
+//#define FLT_MAX __FLT_MAX__
+//#endif  // __FLT_MAX__
diff --git a/paddle/fluid/platform/port.h b/paddle/fluid/platform/port.h
index c1b81159aca..0c4d41a7835 100644
--- a/paddle/fluid/platform/port.h
+++ b/paddle/fluid/platform/port.h
@@ -26,7 +26,7 @@
 
 #if !defined(_WIN32)
 #include <dlfcn.h>     //  dladdr
-#include <execinfo.h>  // backtrace
+//#include <execinfo.h>  // backtrace
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <algorithm>  // std::accumulate
-- 
GitLab