AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Merge pull request #744 from chipitsine/12.04

Browse Source 
Merge PR #744: gitlab-ci: enable ubuntu 12.04 builds
This commit is contained in:
Ilya Shipitsin 2018-10-12 01:16:34 +05:00 committed by GitHub
commit c2600e64a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -1,6 +1,6 @@
.ubuntu: &ubuntu_def .ubuntu: &ubuntu_def
variables: variables:
CMAKE_VERSION: 3.12.1 CMAKE_VERSION: 3.9.6
before_script: before_script:
- REPOSITORY="$PWD" && cd .. - REPOSITORY="$PWD" && cd ..
- apt-get update && apt-get install -y dpkg-dev wget g++ gcc libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev git file - apt-get update && apt-get install -y dpkg-dev wget g++ gcc libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev git file
@ -23,11 +23,7 @@ trusty:
<<: *ubuntu_def <<: *ubuntu_def
image: ubuntu:trusty image: ubuntu:trusty
# precise:
# there's no cmake3 for 12.04 <<: *ubuntu_def
# maybe, there's ppa ? image: ubuntu:precise
#
#precise:
# <<: *ubuntu_def
# image: ubuntu:precise

3
CMakeLists.txt
View File

@ -26,6 +26,9 @@ if (NOT ${PROJECT_VERSION} VERSION_EQUAL "${CurrentBuild_MAJOR}.${CurrentBuild_M
message (FATAL_ERROR "PROJECT_VERSION does not match to src/CurrentBuild.txt") message (FATAL_ERROR "PROJECT_VERSION does not match to src/CurrentBuild.txt")
endif() endif()
include(CheckIncludeFile)
Check_Include_File(sys/auxv.h HAVE_SYS_AUXV)
configure_file("${SoftEtherVPN_SOURCE_DIR}/AUTHORS.TXT" "${SoftEtherVPN_SOURCE_DIR}/src/bin/hamcore/authors.txt" COPYONLY) configure_file("${SoftEtherVPN_SOURCE_DIR}/AUTHORS.TXT" "${SoftEtherVPN_SOURCE_DIR}/src/bin/hamcore/authors.txt" COPYONLY)
set(BUILD_DIRECTORY ${SoftEtherVPN_SOURCE_DIR}/build) set(BUILD_DIRECTORY ${SoftEtherVPN_SOURCE_DIR}/build)

15
src/Mayaqua/CMakeLists.txt
View File

@ -19,11 +19,24 @@ find_package(ZLIB REQUIRED)
# In some cases libiconv is not included in libc # In some cases libiconv is not included in libc
find_library(LIB_ICONV iconv) find_library(LIB_ICONV iconv)
if(HAVE_SYS_AUXV)
add_subdirectory(cpu_features) add_subdirectory(cpu_features)
endif()
target_include_directories(mayaqua PRIVATE cpu_features/include) target_include_directories(mayaqua PRIVATE cpu_features/include)
target_link_libraries(mayaqua cpu_features OpenSSL::SSL OpenSSL::Crypto Threads::Threads ZLIB::ZLIB) target_link_libraries(mayaqua OpenSSL::SSL OpenSSL::Crypto Threads::Threads ZLIB::ZLIB)
if(HAVE_SYS_AUXV)
target_link_libraries(mayaqua cpu_features)
else()
add_definitions(-DSKIP_CPU_FEATURES)
endif()
find_library(LIB_RT rt)
if(LIB_RT)
target_link_libraries(mayaqua rt)
endif()
if(LIB_ICONV) if(LIB_ICONV)
target_link_libraries(mayaqua ${LIB_ICONV}) target_link_libraries(mayaqua ${LIB_ICONV})

4
src/Mayaqua/Encrypt.c
View File

@ -148,7 +148,11 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <intrin.h> // For __cpuid() #include <intrin.h> // For __cpuid()
#else // _MSC_VER #else // _MSC_VER
#ifndef SKIP_CPU_FEATURES
#include "cpu_features_macros.h" #include "cpu_features_macros.h"
#endif
#if defined(CPU_FEATURES_ARCH_X86) #if defined(CPU_FEATURES_ARCH_X86)
#include "cpuinfo_x86.h" #include "cpuinfo_x86.h"
#elif defined(CPU_FEATURES_ARCH_ARM) #elif defined(CPU_FEATURES_ARCH_ARM)