Skip to content

Patch dynamic linking issues on some environments #65

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 7 commits into
base: dev
Choose a base branch
from
Open

Patch dynamic linking issues on some environments #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
47e623c
Merge pull request #58 from FlameOfIgnis/dev
ignis-sec May 19, 2021
3dedec2
Remove dynamic linking flag
ignis-sec May 21, 2021
fd75cfb
Modify build pipeline accordingly for no dynamic linking
ignis-sec May 21, 2021
4da606d
refresh build cache
ignis-sec May 21, 2021
3f682f3
Add static linking flag for program_options
ignis-sec May 21, 2021
7159c87
Update argparse.h
ignis-sec May 21, 2021
45c968c
Merge branch 'dev' into patch-dyn-link
ignis-sec May 21, 2021
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
4 changes: 2 additions & 2 deletions .github/action_helpers/actions_windows_libboost.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ echo "$a$b"
echo $env:RUNNER_WORKSPACE
mkdir $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib
dir $env:GITHUB_ACTION_WIN_PROJECT\boost;
cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_program_options.dll $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\boost_program_options-vc142-mt-x64-1_76.dll;
cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_program_options.lib $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\boost_program_options-vc142-mt-x64-1_76.lib;
cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_program_options.dll $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\libboost_program_options-vc142-mt-x64-1_76.dll;
cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_program_options.lib $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\libboost_program_options-vc142-mt-x64-1_76.lib;

cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_python$a$b.dll $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\libboost_python$a$b-vc142-mt-x64-1_76.dll;
cp $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\x64\Release\lib\boost_python$a$b.lib $env:GITHUB_ACTION_WIN_PROJECT\boost\stage\lib\libboost_python$a$b-vc142-mt-x64-1_76.lib;
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
id: cache-boost
with:
path: ${{env.GITHUB_ACTION_WIN_PROJECT}}\boost
key: 'windows-boost-1.76-${{ matrix.python-version }}'
key: 'windows-llibboost-1.76-${{ matrix.python-version }}'

- name: Build Boost
id: boost
Expand Down
3 changes: 2 additions & 1 deletion MarkovPasswords/src/argparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include<string>
#include<iostream>

#define BOOST_ALL_DYN_LINK 1
//#define BOOST_ALL_DYN_LINK 1
#define Boost_USE_STATIC_LIBS 1

#include <boost/program_options.hpp>
/** @brief Structure to hold parsed cli arguements.
Expand Down