* drop boost_regex from build deps

2025-01-22 13:27:17 +01:00 · 2016-05-27 00:00:00 +00:00 · 2016-05-27 00:00:00 +00:00 · 5c9a69e0e8
parent 2bf32fb3fa
commit 5c9a69e0e8
15 changed files with 10 additions and 17 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -17,7 +17,6 @@ addons:
      - libboost-date-time-dev
      - libboost-filesystem-dev
      - libboost-program-options-dev
-      - libboost-regex-dev
      - libboost-system-dev
      - libboost-thread-dev
      - libminiupnpc-dev
--- a/Makefile.bsd
+++ b/Makefile.bsd
@ -9,4 +9,4 @@ CXXFLAGS = -O2
 NEEDED_CXXFLAGS = -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1
 INCFLAGS = -I/usr/include/ -I/usr/local/include/
 LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib
-LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
+LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
--- a/Makefile.homebrew
+++ b/Makefile.homebrew
@ -6,7 +6,7 @@ CXX = clang++
 CXXFLAGS = -g -Wall -std=c++11 -DMAC_OSX
 INCFLAGS = -I${SSLROOT}/include -I${BOOSTROOT}/include
 LDFLAGS = -L${SSLROOT}/lib -L${BOOSTROOT}/lib
-LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
+LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread

 ifeq ($(USE_UPNP),1)
  LDFLAGS += -ldl
--- a/Makefile.linux
+++ b/Makefile.linux
@ -32,7 +32,6 @@ ifeq ($(USE_STATIC),yes)
  LDLIBS  = $(LIBDIR)/libboost_system.a
  LDLIBS += $(LIBDIR)/libboost_date_time.a
  LDLIBS += $(LIBDIR)/libboost_filesystem.a
-  LDLIBS += $(LIBDIR)/libboost_regex.a
  LDLIBS += $(LIBDIR)/libboost_program_options.a
  LDLIBS += $(LIBDIR)/libcrypto.a
  LDLIBS += $(LIBDIR)/libssl.a
@ -40,7 +39,7 @@ ifeq ($(USE_STATIC),yes)
  LDLIBS += -lpthread -static-libstdc++ -static-libgcc
  USE_AESNI := no
 else
-  LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
+  LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
 endif

 # UPNP Support (miniupnpc 1.5 or 1.6)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@ -13,7 +13,6 @@ LDLIBS = \
  -Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \
  -Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \
  -Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_regex$(BOOST_SUFFIX) \
  -Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \
  -Wl,-Bstatic -lssl \
  -Wl,-Bstatic -lcrypto \
--- a/Makefile.osx
+++ b/Makefile.osx
@ -3,7 +3,7 @@ CXXFLAGS = -g -Wall -std=c++11 -DMAC_OSX
 #CXXFLAGS = -g -O2 -Wall -std=c++11
 INCFLAGS = -I/usr/local/include -I/usr/local/ssl/include
 LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib -L/usr/local/ssl/lib
-LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
+LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread

 ifeq ($(USE_UPNP),1)
  LDFLAGS += -ldl
--- a/Reseed.cpp
+++ b/Reseed.cpp
@ -1,7 +1,6 @@
 #include <string.h>
 #include <fstream>
 #include <sstream>
-#include <boost/regex.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp> 
 #include <openssl/ssl.h>
--- a/appveyor.yml
+++ b/appveyor.yml
@ -125,7 +125,7 @@ install:
 - cd %BOOST_ROOT%
 - if defined msvc if not exist "stage%bitness%\lib\%boostlib%boost_system-vc%msvc%0-mt%boostdbg%*" (
    bootstrap > c:\projects\instdir\build_boost.log
-    && b2 toolset=msvc-%msvc%.0 %boost_variant% link=%type% runtime-link=%type% address-model=%bitness% --build-type=minimal --with-filesystem --with-program_options --with-regex --with-date_time --stagedir=stage%bitness% >> c:\projects\instdir\build_boost.log
+    && b2 toolset=msvc-%msvc%.0 %boost_variant% link=%type% runtime-link=%type% address-model=%bitness% --build-type=minimal --with-filesystem --with-program_options --with-date_time --stagedir=stage%bitness% >> c:\projects\instdir\build_boost.log
    || type c:\projects\instdir\build_boost.log
  )
 - if defined msvc if not exist C:\stage\OpenSSL-Win%bitness%-vc%msvc%-%type%\ (
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@ -242,7 +242,7 @@ endif()

 target_link_libraries(i2pdclient libi2pd)

-find_package ( Boost COMPONENTS system filesystem regex program_options date_time REQUIRED )
+find_package ( Boost COMPONENTS system filesystem program_options date_time REQUIRED )
 if(NOT DEFINED Boost_INCLUDE_DIRS)
  message(SEND_ERROR "Boost is not found, or your boost version was bellow 1.46. Please download Boost!")
 endif()
--- a/build/Dockerfile
+++ b/build/Dockerfile
@ -1,7 +1,7 @@
 FROM ubuntu

 RUN apt-get update && apt-get install -y libboost-dev libboost-filesystem-dev \
-       libboost-program-options-dev libboost-regex-dev libboost-date-time-dev \
+       libboost-program-options-dev libboost-date-time-dev \
       libssl-dev git build-essential

 RUN git clone https://github.com/PurpleI2P/i2pd.git
--- a/debian/control
+++ b/debian/control
@ -4,7 +4,6 @@ Priority: extra
 Maintainer: hagen <hagen@i2pmail.org>
 Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~),
 gcc (>= 4.7) | clang (>= 3.3),
- libboost-regex-dev,
 libboost-system-dev (>= 1.46),
 libboost-date-time-dev,
 libboost-filesystem-dev,
--- a/docs/build_notes_cross.md
+++ b/docs/build_notes_cross.md
@ -22,7 +22,7 @@ Proceed with building Boost normal way, but let's define dedicated staging direc
 ```sh
 ./bootstrap.sh
 ./b2 toolset=gcc-mingw target-os=windows variant=release link=static runtime-link=static address-model=64 \
-  --build-type=minimal --with-filesystem --with-program_options --with-regex --with-date_time \
+  --build-type=minimal --with-filesystem --with-program_options --with-date_time \
  --stagedir=stage-mingw-64
 cd ..
 ```
--- a/docs/build_notes_unix.md
+++ b/docs/build_notes_unix.md
@ -46,7 +46,6 @@ sudo apt-get install \
    libboost-date-time-dev \
    libboost-filesystem-dev \
    libboost-program-options-dev \
-    libboost-regex-dev \
    libboost-system-dev \
    libboost-thread-dev \
    libssl-dev
--- a/docs/build_notes_windows.md
+++ b/docs/build_notes_windows.md
@ -110,11 +110,11 @@ prompt to build Boost) and run the following:

 	cd C:\dev\boost
 	bootstrap
-	b2 toolset=msvc-12.0 --build-type=complete --with-filesystem --with-program_options --with-regex --with-date_time
+	b2 toolset=msvc-12.0 --build-type=complete --with-filesystem --with-program_options --with-date_time

 If you are on 64-bit Windows and you want to build 64-bit version as well

-	b2 toolset=msvc-12.0 --build-type=complete --stagedir=stage64 address-model=64 --with-filesystem --with-program_options --with-regex --with-date_time
+	b2 toolset=msvc-12.0 --build-type=complete --stagedir=stage64 address-model=64 --with-filesystem --with-program_options --with-date_time

 After Boost is compiled, set the environment variable `BOOST_ROOT` to
 the directory Boost was unpacked to, e.g., C:\dev\boost.
--- a/stdafx.h
+++ b/stdafx.h
@ -33,7 +33,6 @@
 #include <mutex>

 #include <boost/asio.hpp>
-#include <boost/regex.hpp>
 #include <boost/bind.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>