diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-09-17 11:40:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-09-17 11:40:58 +0000 |
| commit | 76d209198e0f392baca28e2cf15624799b851ace (patch) | |
| tree | 5f4698902fe17c334e745ca491fbab46868856ba | |
| parent | 0a5a2aadb7789251a2cba285e0a680951c5db573 (diff) | |
| parent | 40d93c9db9f7aebf86adabbc969f44835b35bd0d (diff) | |
Merge "Fix: version tag 18.07"
| -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 c220c72..a373fef 100644 --- a/pkg/deb/control +++ b/pkg/deb/control @@ -1,5 +1,5 @@ Package: dmm -Version: 18.04 +Version: 18.07 Section: tuils Priority: optional Depends: libc6, libstdc++6, libgcc1 diff --git a/pkg/rpm/dmm.spec b/pkg/rpm/dmm.spec index 1545d25..c9b8c75 100644 --- a/pkg/rpm/dmm.spec +++ b/pkg/rpm/dmm.spec @@ -1,5 +1,5 @@ Name: dmm -Version: 18.04 +Version: 18.07 Release: 1%{?dist} Summary: DMM Project diff --git a/scripts/generate_dmm_rpm.sh b/scripts/generate_dmm_rpm.sh index 792c2a3..76d65a1 100755 --- a/scripts/generate_dmm_rpm.sh +++ b/scripts/generate_dmm_rpm.sh @@ -17,7 +17,7 @@ cur_directory=${PWD} name="dmm" -version="18.04" +version="18.07" mkdir -p ~/rpmbuild/SOURCES diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c71659c..1069e7f 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.04") +ADD_DEFINITIONS(-D_GNU_SOURCE -DNSTACK_GETVER_VERSION="18.07") #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 9f64af9..814e5a5 100644 --- a/stacks/lwip_stack/CMakeLists.txt +++ b/stacks/lwip_stack/CMakeLists.txt @@ -69,7 +69,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.04") +ADD_DEFINITIONS(-D_GNU_SOURCE -DNSTACK_GETVER_VERSION="18.07") SET(JSON_C_SRC ${CMAKE_CURRENT_LIST_DIR}/../../thirdparty/json/json-c-0.12.1) INCLUDE(ExternalProject) |