diff --git a/.github/workflows/.build-osx.yml b/.github/workflows/.build-osx.yml index ccb2004..6b9b317 100644 --- a/.github/workflows/.build-osx.yml +++ b/.github/workflows/.build-osx.yml @@ -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 @@ -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 }}" diff --git a/.travis.yml b/.travis.yml index c02a811..41a1032 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/Makefile b/Makefile index f2d57b9..75c0b04 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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