Skip to content

Commit 1501095

Browse files
committed
HACK: use cmake instead of autoconf for aws-lc build
Change-Id: I090f5b201d67f51d2e42df1914a8466bcfcb6bf8
1 parent 820f38a commit 1501095

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

.github/workflows/build.yaml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -478,22 +478,33 @@ jobs:
478478
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=1 ../
479479
ninja install
480480
working-directory: aws-lc
481+
- name: debug1
482+
run: ls ${{ github.workspace }}
483+
- name: debug2
484+
run: ls ${{ github.workspace }}/aws-lc
485+
- name: list aws-lc install
486+
run: find ${{ env.AWS_LC_INSTALL }}
481487
- name: Checkout OpenVPN
482488
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
483-
- name: autoconf
484-
run: autoreconf -fvi
489+
- name: debug1
490+
run: ls ${{ github.workspace }}
491+
- name: debug2
492+
run: ls ${{ github.workspace }}/aws-lc
493+
- name: list aws-lc install
494+
run: find ${{ env.AWS_LC_INSTALL }}
485495
- name: configure with AWS-LC
486496
run: |
487-
OPENSSL_CFLAGS="-I${{ env.AWS_LC_INSTALL }}/include" \
488-
OPENSSL_LIBS="-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \
489-
LDFLAGS="-Wl,-rpath=${{ env.AWS_LC_INSTALL }}/lib" \
490-
./configure --with-crypto-library=openssl --enable-werror
497+
cmake -DOPENSSL_ROOT_DIR=${{ env.AWS_LC_INSTALL }} -DUNSUPPORTED_BUILDS=on ${{ github.workspace }}/openvpn
498+
working-directory: build
491499
- name: make all
492500
run: make -j3
501+
working-directory: build
493502
- name: show version
494-
run: ./src/openvpn/openvpn --version
503+
run: ./openvpn --version
504+
working-directory: build
495505
- name: Ensure the build uses AWS-LC
496-
run: './src/openvpn/openvpn --version | grep -q "library versions: AWS-LC"'
506+
run: './openvpn --version | grep -q "library versions: AWS-LC"'
507+
working-directory: build
497508
- name: configure checks
498509
run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc
499510
- name: make check

0 commit comments

Comments
 (0)