Skip to content

Feature/static link boost #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Feature/static link boost #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
379fc97
[WIP] Fix: Static link boost!
coord-e Feb 10, 2019
79a6f5c
Add: Build boost manually with -fPIC
coord-e Feb 10, 2019
f5ea73e
Delete: Dont't install boost from apt
coord-e Feb 10, 2019
6dd428f
Fix: Install ca-certificates to fix curl error
coord-e Feb 10, 2019
c8cc6d5
Change: Use curl -fsSL to silently download file
coord-e Feb 10, 2019
6bec2fe
Change: Inject boost version
coord-e Feb 10, 2019
092570b
Fix: insert travis_wait
coord-e Feb 10, 2019
0ab1674
Revert "Fix: insert travis_wait"
coord-e Feb 11, 2019
4581896
Fix: Show logs during the build of boost
coord-e Feb 11, 2019
b5df96b
Delete: Delete libboost-filesystem dependency
coord-e Feb 11, 2019
e8f5898
Merge branch 'develop' into feature/static-link-boost
coord-e Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ Pluggable servomotor driver library

## Install

[Boost.Filesystem](https://boostorg.github.io/filesystem) is required

```shell
pip install servoarray
```
Expand Down
7 changes: 6 additions & 1 deletion ci/image/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ FROM @BASE_IMAGE@
SHELL @SHELL@

RUN apt-get update -y \
&& apt-get install -y --no-install-recommends libboost-dev libboost-filesystem-dev cmake git build-essential
&& apt-get install -y --no-install-recommends cmake build-essential curl ca-certificates git

RUN mkdir -p tmp/boost && cd $_ \
&& curl -fsSL https://dl.bintray.com/boostorg/release/@BOOST_VERSION@/source/boost_@[email protected] | tar -xz --strip-components=1 \
&& ./bootstrap.sh \
&& ./b2 cxxflags=-fPIC cflags=-fPIC -a link=static --with-filesystem --with-system install

COPY scripts /scripts

Expand Down
3 changes: 3 additions & 0 deletions ci/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,14 @@ function cross_sh() {

readonly BASE_IMAGE=$(base_image)
readonly CROSS_SH=$(cross_sh)
readonly BOOST_VERSION=1.69.0

echo "BASE_IMAGE=${BASE_IMAGE}"
cat ci/image/Dockerfile.in \
| sed "s/@BASE_IMAGE@/${BASE_IMAGE//\//\\/}/g" \
| sed "s/@SHELL@/${CROSS_SH//\//\\/}/g" \
| sed "s/@BOOST_VERSION@/${BOOST_VERSION}/g" \
| sed "s/@BOOST_VERSION_U@/${BOOST_VERSION//\./_}/g" \
> ci/image/Dockerfile

docker build ci/image -t builder
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ set(SERVOARRAY_DEFAULT_CONFIG_FILES ~/.servoarrayrc ./.servoarrayrc)

option(BUILD_PYTHON "Build servoarray python module" ON)

set(Boost_USE_STATIC_LIBS ON)
find_package(Boost 1.36.0 REQUIRED COMPONENTS filesystem system)
include_directories(${Boost_INCLUDE_DIRS})

Expand Down
1 change: 0 additions & 1 deletion src/cmake/cpack.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
set(CPACK_GENERATOR "TGZ;ZIP")
set(CPACK_PACKAGE_CONTACT "coord.e <[email protected]>")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-filesystem1.62.0")

set(CPACK_PACKAGE_VERSION_MAJOR ${servoarray_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${servoarray_VERSION_MINOR})
Expand Down