From 33bf6eb7530dd841d25fc4537e7659a52abc5f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E6=99=93=E4=BC=9F?=
 <39303645+Shixiaowei02@users.noreply.github.com>
Date: Thu, 21 Jan 2021 14:21:15 +0800
Subject: [PATCH] revert external gflags, test=develop (#30623)

---
 cmake/external/gflags.cmake             | 3 ---
 paddle/fluid/inference/check_symbol.sh  | 2 +-
 paddle/fluid/inference/paddle_fluid.map | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/cmake/external/gflags.cmake b/cmake/external/gflags.cmake
index 34f5d7e2bef..576598b4ac6 100644
--- a/cmake/external/gflags.cmake
+++ b/cmake/external/gflags.cmake
@@ -30,8 +30,6 @@ ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR})
 
-set(GFLAGS_NAMESPACE "paddle_gflags")
-
 cache_third_party(extern_gflags
     REPOSITORY   ${GFLAGS_REPOSITORY}
     TAG          ${GFLAGS_TAG}
@@ -59,7 +57,6 @@ ExternalProject_Add(
                     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
                     -DBUILD_TESTING=OFF
                     -DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
-                    -DGFLAGS_NAMESPACE=${GFLAGS_NAMESPACE} 
                     ${EXTERNAL_OPTIONAL_ARGS}
     CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${GFLAGS_INSTALL_DIR}
                      -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
diff --git a/paddle/fluid/inference/check_symbol.sh b/paddle/fluid/inference/check_symbol.sh
index acf7f2bac52..1d9b566e6c4 100755
--- a/paddle/fluid/inference/check_symbol.sh
+++ b/paddle/fluid/inference/check_symbol.sh
@@ -18,7 +18,7 @@ lib=$1
 if [ $# -ne 1 ]; then echo "No input library"; exit -1 ; fi
 
 num_paddle_syms=$(nm -D "${lib}" | grep -c paddle )
-num_google_syms=$(nm -D "${lib}" | grep google | grep -v paddle | grep -v brpc | grep -v fL | grep -c "T " )
+num_google_syms=$(nm -D "${lib}" | grep google | grep -v paddle | grep -v brpc | grep -c "T " )
 
 if [ $num_paddle_syms -le 0 ]; then echo "Have no paddle symbols"; exit -1 ; fi
 if [ $num_google_syms -ge 1 ]; then echo "Have some google symbols"; exit -1 ; fi
diff --git a/paddle/fluid/inference/paddle_fluid.map b/paddle/fluid/inference/paddle_fluid.map
index c1554a00888..5bb9b8d7562 100644
--- a/paddle/fluid/inference/paddle_fluid.map
+++ b/paddle/fluid/inference/paddle_fluid.map
@@ -3,7 +3,6 @@
 		*paddle*;
 		*Pass*;
 		*profile*;
-		*fL*;
 	local:
 		*;
 };
-- 
GitLab