github-personal/openwrt-passwall-packages
1
0
Fork 0
mirror of https://github.com/outbackdingo/openwrt-passwall-packages.git synced 2026-01-27 02:19:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

trojan-plus: update boost1.89 build patch. (#501)

Browse Source
This commit is contained in:
zxl hhyccc
2025-08-30 22:13:05 +08:00
committed by GitHub
parent 9d0068ca00
commit 6f115e283a
1 changed files with 23 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
trojan-plus/patches/002-Fix-boost1.89-build.patch
View File

@@ -1,15 +1,16 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,18 +185,33 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -184,26 +184,45 @@ endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
if (ANDROID)
set(ANDROID_MY_LIBS ${PROJECT_SOURCE_DIR}/trojan-plus-android-libs)
- set(ANDROID_MY_LIBS ${PROJECT_SOURCE_DIR}/trojan-plus-android-libs)
+ set(ANDROID_MY_LIBS ${PROJECT_SOURCE_DIR}/trojan-plus-android-libs)
+
+ set(BOOST_VERSION_HPP ${ANDROID_MY_LIBS}/include/boost/version.hpp)
+ if(EXISTS ${BOOST_VERSION_HPP})
+ file(STRINGS ${BOOST_VERSION_HPP} BOOST_VERSION_LINE REGEX "^#define BOOST_VERSION ")
+ string(REGEX REPLACE "^#define BOOST_VERSION ([0-9]+)$" "\\1" BOOST_VERSION ${BOOST_VERSION_LINE})
+ endif()
+ find_path(BOOST_INCLUDE_DIR
+ NAMES boost/version.hpp
+ HINTS ${ANDROID_MY_LIBS}/include
+ )
+
set(ANDROID_MY_LIBS_LIBRARIES
${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libssl.a
@@ -17,8 +18,13 @@
- ${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libboost_system.a
${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libboost_program_options.a)
+ if(${BOOST_VERSION} VERSION_LESS 108900)
+ list(APPEND ANDROID_MY_LIBS_LIBRARIES ${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libboost_system.a)
+ if(BOOST_INCLUDE_DIR)
+ file(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp" BOOST_VERSION_LINE REGEX "^#define BOOST_VERSION ")
+ string(REGEX REPLACE "^#define BOOST_VERSION ([0-9]+)" "\\1" BOOST_VERSION ${BOOST_VERSION_LINE})
+
+ if(${BOOST_VERSION} VERSION_LESS 108900)
+ list(APPEND ANDROID_MY_LIBS_LIBRARIES ${ANDROID_MY_LIBS}/lib/${ANDROID_ABI}/libboost_system.a)
+ endif()
+ endif()
+
set(OPENSSL_VERSION 1.1.1)
@@ -28,7 +34,7 @@
else()
- find_package(Boost 1.66.0 REQUIRED COMPONENTS system program_options)
+ find_package(Boost 1.66.0 REQUIRED)
+ if(Boost_VERSION VERSION_LESS 108900)
+ if (Boost_MAJOR_VERSION LESS_EQUAL 1 AND Boost_MINOR_VERSION LESS 89)
+ find_package(Boost 1.66.0 REQUIRED COMPONENTS system program_options)
+ else()
+ find_package(Boost 1.66.0 REQUIRED COMPONENTS program_options)
@@ -36,135 +42,11 @@
include_directories(${Boost_INCLUDE_DIR})
target_link_libraries(trojan ${Boost_LIBRARIES})
if(MSVC)
--- a/src/core/config.cpp
+++ b/src/core/config.cpp
@@ -42,6 +42,9 @@
#include "session/session.h"
#include "ssl/ssldefaults.h"
#include "ssl/sslsession.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
add_definitions(-DBOOST_DATE_TIME_NO_LIB)
endif()
using namespace std;
using namespace boost::property_tree;
--- a/src/core/icmpd.cpp
+++ b/src/core/icmpd.cpp
@@ -27,6 +27,9 @@
#include "core/service.h"
#include "core/utils.h"
#include "session/pipelinesession.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace trojan;
using namespace std;
--- a/src/core/pipeline.cpp
+++ b/src/core/pipeline.cpp
@@ -23,6 +23,9 @@
#include "core/utils.h"
#include "proto/pipelinerequest.h"
#include "session/clientsession.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
using namespace boost::asio::ip;
--- a/src/core/service.cpp
+++ b/src/core/service.cpp
@@ -35,6 +35,9 @@
#include "session/pipelinesession.h"
#include "session/serversession.h"
#include "utils.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
--- a/src/core/utils.cpp
+++ b/src/core/utils.cpp
@@ -32,6 +32,9 @@
#include "core/service.h"
#include "core/version.h"
#include "log.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
using namespace boost::asio::ip;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,6 +33,9 @@
#include "core/service.h"
#include "core/version.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
using namespace boost::asio;
--- a/src/session/clientsession.cpp
+++ b/src/session/clientsession.cpp
@@ -27,6 +27,9 @@
#include "proto/trojanrequest.h"
#include "proto/udppacket.h"
#include "ssl/sslsession.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
using namespace boost::asio::ip;
--- a/src/session/pipelinesession.cpp
+++ b/src/session/pipelinesession.cpp
@@ -29,6 +29,9 @@
#include "core/utils.h"
#include "proto/trojanrequest.h"
#include "serversession.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
using namespace boost::asio::ip;
--- a/src/session/serversession.cpp
+++ b/src/session/serversession.cpp
@@ -26,6 +26,9 @@
#include "core/utils.h"
#include "proto/trojanrequest.h"
#include "proto/udppacket.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
using namespace boost::asio::ip;
--- a/src/session/session.cpp
+++ b/src/session/session.cpp
@@ -22,6 +22,9 @@
#include "session.h"
#include "core/service.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
--- a/src/session/udpforwardsession.cpp
+++ b/src/session/udpforwardsession.cpp
@@ -30,6 +30,9 @@
#include "proto/trojanrequest.h"
#include "proto/udppacket.h"
#include "ssl/sslsession.h"
+#if BOOST_VERSION >= 108900
+#include <boost/system.hpp>
+#endif
using namespace std;
using namespace boost::asio::ip;
- find_package(OpenSSL 1.1.0 REQUIRED)
+ find_package(OpenSSL 1.1.1 REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
target_link_libraries(trojan ${OPENSSL_LIBRARIES})
endif()