Skip to content

Remove s2n dependency #96

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

Merged
hannahilea merged 2 commits into from
Dec 10, 2025
Merged

Remove s2n dependency #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccd1119
remove s2n
hannahilea Dec 9, 2025
a104dea
Merge branch 'master' into hr/revert-aws-static
hannahilea Dec 10, 2025
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/workflows/.build-osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
make for-travis -j16
shell: bash
env:
extra_targets: "aws_s2n_tls"
extra_targets: ""
- name: List built dependencies
run: make list-built
shell: bash
Expand All @@ -60,4 +60,4 @@ jobs:
shell: bash
env:
# GDAL currently doesn't build on m-chip, ref #93
EXPECTED_DEPS_COUNT: "${{ matrix.runs-on == 'macos-15' && 12 || 13 }}"
EXPECTED_DEPS_COUNT: "${{ matrix.runs-on == 'macos-15' && 11 || 12 }}"
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- echo "# ubuntu-focal - prefix '$prefix'" >&2
- export extra_targets="aws_s2n_tls"
- echo "# ubuntu-focal - extra_targets '$extra_targets'" >&2
- export EXPECTED_DEPS_COUNT=13
- export EXPECTED_DEPS_COUNT=12
- echo "# ubuntu-focal - Expecting to build and install $EXPECTED_DEPS_COUNT dependencies." >&2
- make -j16 for-travis
- make list-built
Expand Down
37 changes: 0 additions & 37 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ aws_cdk=aws_sdk_cpp
aws_cdk_tag=1.11.665
# There is no dist - we pull this from github using a tag

aws_s2n_tls=aws_s2n_tls
aws_s2n_tls_tag=v1.6.1
# There is no dist - we pull this from github using a tag

bison=bison-3.3
bison_dist=$(bison).tar.xz

Expand Down Expand Up @@ -217,39 +213,6 @@ aws_cdk-really-clean: aws_cdk-clean
.PHONY: aws_cdk
aws_cdk: aws_cdk-install-stamp

# AWS s2n-tls (conditionally required by AWS SDK)
aws_s2n_tls_src=$(src)/$(aws_s2n_tls)-$(aws_s2n_tls_tag)
aws_s2n_tls_prefix=$(prefix)/deps

$(aws_s2n_tls_src)-stamp:
git clone --depth 1 https://github.com/aws/s2n-tls.git --branch $(aws_s2n_tls_tag) $(aws_s2n_tls_src)
echo timestamp > $(aws_s2n_tls_src)-stamp

aws_s2n_tls-configure-stamp: $(aws_s2n_tls_src)-stamp
mkdir -p $(aws_s2n_tls_src)/build
(cd $(aws_s2n_tls_src)/build \
&& cmake .. -B . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(prefix)/deps)
echo timestamp > aws_s2n_tls-configure-stamp

aws_s2n_tls-compile-stamp: aws_s2n_tls-configure-stamp
(cd $(aws_s2n_tls_src)/build && cmake --build . --config=Debug --parallel)
echo timestamp > aws_s2n_tls-compile-stamp

aws_s2n_tls-install-stamp: aws_s2n_tls-compile-stamp
(cd $(aws_s2n_tls_src)/build && cmake --install . --config=Debug)
echo timestamp > aws_s2n_tls-install-stamp

aws_s2n_tls-clean:
-rm aws_s2n_tls-*-stamp
-(cd $(aws_s2n_tls_src)/build && cmake --build . --target clean)

aws_s2n_tls-really-clean: aws_s2n_tls-clean
-rm $(src)/$(aws_s2n_tls)-*-stamp
-rm -rf $(aws_s2n_tls_src)

.PHONY: aws_s2n_tls
aws_s2n_tls: aws_s2n_tls-install-stamp

# JPEG
jpeg_src=$(src)/$(jpeg)
jpeg_prefix=$(prefix)/deps
Expand Down
Loading