oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

Remove DEBIAN option

Browse source 
This hasn't been used in a long time; the debian packaging lives in
separate branches instead.
This commit is contained in:
Jason Rhinelander 2020-05-17 19:21:00 -03:00
parent a45bec7c4f
commit ab4ee954b9
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -33,7 +33,6 @@ endif()
option(SHADOW "use shadow testing framework. linux only" OFF) option(SHADOW "use shadow testing framework. linux only" OFF)
option(XSAN "use sanitiser, if your system has it" OFF) option(XSAN "use sanitiser, if your system has it" OFF)
option(JEMALLOC "use jemalloc. Not required on BSD" OFF) option(JEMALLOC "use jemalloc. Not required on BSD" OFF)
option(DEBIAN "build for debian" OFF)
option(TESTNET "testnet build" OFF) option(TESTNET "testnet build" OFF)
option(WITH_SHARED "build shared library" OFF) option(WITH_SHARED "build shared library" OFF)
option(WITH_COVERAGE "generate coverage data" OFF) option(WITH_COVERAGE "generate coverage data" OFF)
@ -121,7 +120,7 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND SHADOW)
message( FATAL_ERROR "shadow-framework is Linux only" ) message( FATAL_ERROR "shadow-framework is Linux only" )
endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND SHADOW) endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND SHADOW)
if(NOT DEBIAN AND NOT MSVC_VERSION) if(NOT MSVC_VERSION)
set(OPTIMIZE_FLAGS -O3) set(OPTIMIZE_FLAGS -O3)
set(DEBUG_FLAGS -O0 -g3) set(DEBUG_FLAGS -O0 -g3)
endif() endif()
@ -177,9 +176,7 @@ if (WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
include(cmake/cross_compile.cmake) include(cmake/cross_compile.cmake)
endif(WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE) endif(WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE)
if(DEBIAN) if(NATIVE_BUILD)
add_definitions(-DDEBIAN)
elseif(NATIVE_BUILD)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL ppc64le) if(CMAKE_SYSTEM_PROCESSOR STREQUAL ppc64le)
set(CRYPTO_FLAGS -mcpu=native -mtune=native) set(CRYPTO_FLAGS -mcpu=native -mtune=native)
else() else()

9
llarp/constants/defaults.hpp
View file

@ -11,20 +11,11 @@
#define DEFAULT_RESOLVER_AU "1.1.1.1" #define DEFAULT_RESOLVER_AU "1.1.1.1"
#endif #endif
#ifdef DEBIAN
#ifndef DEFAULT_LOKINET_USER
#define DEFAULT_LOKINET_USER "debian-lokinet"
#endif
#ifndef DEFAULT_LOKINET_GROUP
#define DEFAULT_LOKINET_GROUP "debian-lokinet"
#endif
#else
#ifndef DEFAULT_LOKINET_USER #ifndef DEFAULT_LOKINET_USER
#define DEFAULT_LOKINET_USER "lokinet" #define DEFAULT_LOKINET_USER "lokinet"
#endif #endif
#ifndef DEFAULT_LOKINET_GROUP #ifndef DEFAULT_LOKINET_GROUP
#define DEFAULT_LOKINET_GROUP "lokinet" #define DEFAULT_LOKINET_GROUP "lokinet"
#endif #endif
#endif
#endif #endif