This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new eecbee2 fix_brpc_get_verion_name
new 4cb1334 Merge pull request #987 from zyearn/fix_brpc_get_verion_name
eecbee2 is described below
commit eecbee23e9b3bf369788de0ab4939ccf04d87c14
Author: zhujiashun <[email protected]>
AuthorDate: Fri Dec 6 14:27:16 2019 +0800
fix_brpc_get_verion_name
---
CMakeLists.txt | 2 +-
Makefile | 2 +-
tools/{get_brpc_version.sh => get_brpc_revision.sh} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38469e4..e4602fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ include_directories(
)
execute_process(
- COMMAND bash -c "${PROJECT_SOURCE_DIR}/tools/get_brpc_version.sh
${PROJECT_SOURCE_DIR} | tr -d '\n'"
+ COMMAND bash -c "${PROJECT_SOURCE_DIR}/tools/get_brpc_revision.sh
${PROJECT_SOURCE_DIR} | tr -d '\n'"
OUTPUT_VARIABLE BRPC_REVISION
)
diff --git a/Makefile b/Makefile
index 8428d65..656a6e6 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ include config.mk
# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8
# 3. Removed -Werror: Not block compilation for non-vital warnings, especially
when the
# code is tested on newer systems. If the code is used in production, add
-Werror back
-CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE
-DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS -DNDEBUG -DBRPC_REVISION=\"$(shell
./tools/get_brpc_version.sh .)\"
+CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE
-DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS -DNDEBUG -DBRPC_REVISION=\"$(shell
./tools/get_brpc_revision.sh .)\"
CXXFLAGS=$(CPPFLAGS) -O2 -pipe -Wall -W -fPIC -fstrict-aliasing
-Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer -std=c++0x
CFLAGS=$(CPPFLAGS) -O2 -pipe -Wall -W -fPIC -fstrict-aliasing
-Wno-unused-parameter -fno-omit-frame-pointer
DEBUG_CXXFLAGS = $(filter-out -DNDEBUG,$(CXXFLAGS)) -DUNIT_TEST
-DBVAR_NOT_LINK_DEFAULT_VARIABLES
diff --git a/tools/get_brpc_version.sh b/tools/get_brpc_revision.sh
similarity index 100%
rename from tools/get_brpc_version.sh
rename to tools/get_brpc_revision.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
