diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-11-15 01:13:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-11-15 01:13:45 +0000 |
| commit | cfee5312f82e6f04f1c5d5155b8128dd91865bc6 (patch) | |
| tree | 434c1edd6b24d0831fcd61c746cd61889ff41edf | |
| parent | 38ab17eba275f56868dd2c7ebb350e09cdd6c615 (diff) | |
| parent | cc93ddec5ea87e6d3e5a4bc96b89ab8cf52a48b8 (diff) | |
Merge "Release: update to 18.10 version"
| -rw-r--r-- | pkg/deb/control | 2 | ||||
| -rw-r--r-- | pkg/rpm/dmm.spec | 2 | ||||
| -rwxr-xr-x | scripts/generate_dmm_rpm.sh | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | stacks/lwip_stack/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkg/deb/control b/pkg/deb/control index a373fef..24302e3 100644 --- a/pkg/deb/control +++ b/pkg/deb/control @@ -1,5 +1,5 @@ Package: dmm -Version: 18.07 +Version: 18.10 Section: tuils Priority: optional Depends: libc6, libstdc++6, libgcc1 diff --git a/pkg/rpm/dmm.spec b/pkg/rpm/dmm.spec index 79dfb05..51ebef1 100644 --- a/pkg/rpm/dmm.spec +++ b/pkg/rpm/dmm.spec @@ -1,5 +1,5 @@ Name: dmm -Version: 18.07 +Version: 18.10 Release: 1%{?dist} Summary: DMM Project diff --git a/scripts/generate_dmm_rpm.sh b/scripts/generate_dmm_rpm.sh index 76d65a1..f43e8cf 100755 --- a/scripts/generate_dmm_rpm.sh +++ b/scripts/generate_dmm_rpm.sh @@ -17,7 +17,7 @@ cur_directory=${PWD} name="dmm" -version="18.07" +version="18.10" mkdir -p ~/rpmbuild/SOURCES diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1069e7f..0eca7a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,7 +42,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,noexecstack -mcmodel=medium") SET(COMPLE_CONFIG ${PROJECT_SOURCE_DIR}/src/framework/common/include/compile_config.h) ADD_DEFINITIONS(-include ${COMM_CONFIG}) ADD_DEFINITIONS(-include ${COMPLE_CONFIG}) -ADD_DEFINITIONS(-D_GNU_SOURCE -DNSTACK_GETVER_VERSION="18.07") +ADD_DEFINITIONS(-D_GNU_SOURCE -DNSTACK_GETVER_VERSION="18.10") #LINK_DIRECTORIES(${LIB_PATH_SHARED} ${LIB_PATH_STATIC}) if(WITH_SECUREC_LIB) diff --git a/stacks/lwip_stack/CMakeLists.txt b/stacks/lwip_stack/CMakeLists.txt index 3992f20..5a5ca94 100644 --- a/stacks/lwip_stack/CMakeLists.txt +++ b/stacks/lwip_stack/CMakeLists.txt @@ -65,7 +65,7 @@ execute_process( COMMAND sh ${CMAKE_CURRENT_LIST_DIR}/release/lwip_helper_files/download_lwip.sh ) -ADD_DEFINITIONS(-D_GNU_SOURCE -DNSTACK_GETVER_VERSION="18.07") +ADD_DEFINITIONS(-D_GNU_SOURCE -DNSTACK_GETVER_VERSION="18.10") SET(JSON_C_SRC ${CMAKE_CURRENT_LIST_DIR}/../../thirdparty/json/json-c-0.12.1) INCLUDE(ExternalProject) |