PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

* drop boost_regex from build deps

pull/509/merge
hagen 8 years ago
parent
2bf32fb3fa
commit
5c9a69e0e8
15 changed files with 10 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .travis.yml
  2. 2
      Makefile.bsd
  3. 2
      Makefile.homebrew
  4. 3
      Makefile.linux
  5. 1
      Makefile.mingw
  6. 2
      Makefile.osx
  7. 1
      Reseed.cpp
  8. 2
      appveyor.yml
  9. 2
      build/CMakeLists.txt
  10. 2
      build/Dockerfile
  11. 1
      debian/control
  12. 2
      docs/build_notes_cross.md
  13. 1
      docs/build_notes_unix.md
  14. 4
      docs/build_notes_windows.md
  15. 1
      stdafx.h

1
.travis.yml
Unescape View File

@ -17,7 +17,6 @@ addons:
- libboost-date-time-dev - libboost-date-time-dev
- libboost-filesystem-dev - libboost-filesystem-dev
- libboost-program-options-dev - libboost-program-options-dev
- libboost-regex-dev
- libboost-system-dev - libboost-system-dev
- libboost-thread-dev - libboost-thread-dev
- libminiupnpc-dev - libminiupnpc-dev

2
Makefile.bsd
Unescape View File

@ -9,4 +9,4 @@ CXXFLAGS = -O2
NEEDED_CXXFLAGS = -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 NEEDED_CXXFLAGS = -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1
INCFLAGS = -I/usr/include/ -I/usr/local/include/ INCFLAGS = -I/usr/include/ -I/usr/local/include/
LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib 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

2
Makefile.homebrew
Unescape View File

@ -6,7 +6,7 @@ CXX = clang++
CXXFLAGS = -g -Wall -std=c++11 -DMAC_OSX CXXFLAGS = -g -Wall -std=c++11 -DMAC_OSX
INCFLAGS = -I${SSLROOT}/include -I${BOOSTROOT}/include INCFLAGS = -I${SSLROOT}/include -I${BOOSTROOT}/include
LDFLAGS = -L${SSLROOT}/lib -L${BOOSTROOT}/lib 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) ifeq ($(USE_UPNP),1)
LDFLAGS += -ldl LDFLAGS += -ldl

3
Makefile.linux
Unescape View File

@ -32,7 +32,6 @@ ifeq ($(USE_STATIC),yes)
LDLIBS = $(LIBDIR)/libboost_system.a LDLIBS = $(LIBDIR)/libboost_system.a
LDLIBS += $(LIBDIR)/libboost_date_time.a LDLIBS += $(LIBDIR)/libboost_date_time.a
LDLIBS += $(LIBDIR)/libboost_filesystem.a LDLIBS += $(LIBDIR)/libboost_filesystem.a
LDLIBS += $(LIBDIR)/libboost_regex.a
LDLIBS += $(LIBDIR)/libboost_program_options.a LDLIBS += $(LIBDIR)/libboost_program_options.a
LDLIBS += $(LIBDIR)/libcrypto.a LDLIBS += $(LIBDIR)/libcrypto.a
LDLIBS += $(LIBDIR)/libssl.a LDLIBS += $(LIBDIR)/libssl.a
@ -40,7 +39,7 @@ ifeq ($(USE_STATIC),yes)
LDLIBS += -lpthread -static-libstdc++ -static-libgcc LDLIBS += -lpthread -static-libstdc++ -static-libgcc
USE_AESNI := no USE_AESNI := no
else 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 endif
# UPNP Support (miniupnpc 1.5 or 1.6) # UPNP Support (miniupnpc 1.5 or 1.6)

1
Makefile.mingw
Unescape View File

@ -13,7 +13,6 @@ LDLIBS = \
-Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \ -Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \
-Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \ -Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \
-Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \ -Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \
-Wl,-Bstatic -lboost_regex$(BOOST_SUFFIX) \
-Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \ -Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \
-Wl,-Bstatic -lssl \ -Wl,-Bstatic -lssl \
-Wl,-Bstatic -lcrypto \ -Wl,-Bstatic -lcrypto \

2
Makefile.osx vendored
Unescape View File

@ -3,7 +3,7 @@ CXXFLAGS = -g -Wall -std=c++11 -DMAC_OSX
#CXXFLAGS = -g -O2 -Wall -std=c++11 #CXXFLAGS = -g -O2 -Wall -std=c++11
INCFLAGS = -I/usr/local/include -I/usr/local/ssl/include 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 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) ifeq ($(USE_UPNP),1)
LDFLAGS += -ldl LDFLAGS += -ldl

1
Reseed.cpp
Unescape View File

@ -1,7 +1,6 @@
#include <string.h> #include <string.h>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <boost/regex.hpp>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/asio/ssl.hpp> #include <boost/asio/ssl.hpp>
#include <openssl/ssl.h> #include <openssl/ssl.h>

2
appveyor.yml
Unescape View File

@ -125,7 +125,7 @@ install:
- cd %BOOST_ROOT% - cd %BOOST_ROOT%
- if defined msvc if not exist "stage%bitness%\lib\%boostlib%boost_system-vc%msvc%0-mt%boostdbg%*" ( - if defined msvc if not exist "stage%bitness%\lib\%boostlib%boost_system-vc%msvc%0-mt%boostdbg%*" (
bootstrap > c:\projects\instdir\build_boost.log 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 || type c:\projects\instdir\build_boost.log
) )
- if defined msvc if not exist C:\stage\OpenSSL-Win%bitness%-vc%msvc%-%type%\ ( - if defined msvc if not exist C:\stage\OpenSSL-Win%bitness%-vc%msvc%-%type%\ (

2
build/CMakeLists.txt
Unescape View File

@ -242,7 +242,7 @@ endif()
target_link_libraries(i2pdclient libi2pd) 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) if(NOT DEFINED Boost_INCLUDE_DIRS)
message(SEND_ERROR "Boost is not found, or your boost version was bellow 1.46. Please download Boost!") message(SEND_ERROR "Boost is not found, or your boost version was bellow 1.46. Please download Boost!")
endif() endif()

2
build/Dockerfile
Unescape View File

@ -1,7 +1,7 @@
FROM ubuntu FROM ubuntu
RUN apt-get update && apt-get install -y libboost-dev libboost-filesystem-dev \ 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 libssl-dev git build-essential
RUN git clone https://github.com/PurpleI2P/i2pd.git RUN git clone https://github.com/PurpleI2P/i2pd.git

1
debian/control vendored
Unescape View File

@ -4,7 +4,6 @@ Priority: extra
Maintainer: hagen <hagen@i2pmail.org> Maintainer: hagen <hagen@i2pmail.org>
Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~),
gcc (>= 4.7) | clang (>= 3.3), gcc (>= 4.7) | clang (>= 3.3),
libboost-regex-dev,
libboost-system-dev (>= 1.46), libboost-system-dev (>= 1.46),
libboost-date-time-dev, libboost-date-time-dev,
libboost-filesystem-dev, libboost-filesystem-dev,

2
docs/build_notes_cross.md
Unescape View File

@ -22,7 +22,7 @@ Proceed with building Boost normal way, but let's define dedicated staging direc
```sh ```sh
./bootstrap.sh ./bootstrap.sh
./b2 toolset=gcc-mingw target-os=windows variant=release link=static runtime-link=static address-model=64 \ ./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 --stagedir=stage-mingw-64
cd .. cd ..
``` ```

1
docs/build_notes_unix.md
Unescape View File

@ -46,7 +46,6 @@ sudo apt-get install \
libboost-date-time-dev \ libboost-date-time-dev \
libboost-filesystem-dev \ libboost-filesystem-dev \
libboost-program-options-dev \ libboost-program-options-dev \
libboost-regex-dev \
libboost-system-dev \ libboost-system-dev \
libboost-thread-dev \ libboost-thread-dev \
libssl-dev libssl-dev

4
docs/build_notes_windows.md
Unescape View File

@ -110,11 +110,11 @@ prompt to build Boost) and run the following:
cd C:\dev\boost cd C:\dev\boost
bootstrap 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 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 After Boost is compiled, set the environment variable `BOOST_ROOT` to
the directory Boost was unpacked to, e.g., C:\dev\boost. the directory Boost was unpacked to, e.g., C:\dev\boost.

1
stdafx.h
Unescape View File

@ -33,7 +33,6 @@
#include <mutex> #include <mutex>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/regex.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/date_time/local_time/local_time.hpp> #include <boost/date_time/local_time/local_time.hpp>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>

Write Preview
Loading…
Cancel
Save