Patch libcurl configure.ac to work with later versions of autoconf#168
Merged
4 commits merged intomainfrom Aug 22, 2024
Merged
Conversation
ghost
commented
Aug 16, 2024
Author
There was a problem hiding this comment.
Diff of "effectively modified segments".
However, we compile libcurl without openssl. So this is effectively no-op.
4,8c4,8
< if test "${with_secure_transport+set}" = set; then :
< withval=$with_secure_transport; OPT_SECURETRANSPORT=$withval
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }Secure-Transport"
---
> if test ${with_secure_transport+y}
> then :
> withval=$with_secure_transport;
> OPT_SECURETRANSPORT=$withval
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }Secure-Transport"
16,20c16,21
< if test "${with_amissl+set}" = set; then :
< withval=$with_amissl; OPT_AMISSL=$withval
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }AmiSSL"
---
> if test ${with_amissl+y}
> then :
> withval=$with_amissl;
> OPT_AMISSL=$withval
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }AmiSSL"
>
23a25
>
28,29c30,33
< if test "${with_ssl+set}" = set; then :
< withval=$with_ssl; OPT_SSL=$withval
---
> if test ${with_ssl+y}
> then :
> withval=$with_ssl;
> OPT_SSL=$withval
32,34c36,38
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }OpenSSL"
---
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL"
> fi
>
37d40
< fi
41,42c44,47
< if test "${with_openssl+set}" = set; then :
< withval=$with_openssl; OPT_OPENSSL=$withval
---
> if test ${with_openssl+y}
> then :
> withval=$with_openssl;
> OPT_OPENSSL=$withval
44,46c49,51
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }OpenSSL"
---
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL"
> fi
>
49d53
< fi
54,55c58,61
< if test "${with_gnutls+set}" = set; then :
< withval=$with_gnutls; OPT_GNUTLS=$withval
---
> if test ${with_gnutls+y}
> then :
> withval=$with_gnutls;
> OPT_GNUTLS=$withval
57,59c63,65
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }GnuTLS"
---
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }GnuTLS"
> fi
>
62d67
< fi
67,68c72,75
< if test "${with_mbedtls+set}" = set; then :
< withval=$with_mbedtls; OPT_MBEDTLS=$withval
---
> if test ${with_mbedtls+y}
> then :
> withval=$with_mbedtls;
> OPT_MBEDTLS=$withval
70,72c77,79
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }mbedTLS"
---
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }mbedTLS"
> fi
>
75d81
< fi
80,81c86,89
< if test "${with_wolfssl+set}" = set; then :
< withval=$with_wolfssl; OPT_WOLFSSL=$withval
---
> if test ${with_wolfssl+y}
> then :
> withval=$with_wolfssl;
> OPT_WOLFSSL=$withval
83,85c91,93
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }wolfSSL"
---
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL"
> fi
>
88d95
< fi
93,94c100,103
< if test "${with_bearssl+set}" = set; then :
< withval=$with_bearssl; OPT_BEARSSL=$withval
---
> if test ${with_bearssl+y}
> then :
> withval=$with_bearssl;
> OPT_BEARSSL=$withval
96,98c105,107
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }BearSSL"
---
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }BearSSL"
> fi
>
101d109
< fi
106,107c114,117
< if test "${with_rustls+set}" = set; then :
< withval=$with_rustls; OPT_RUSTLS=$withval
---
> if test ${with_rustls+y}
> then :
> withval=$with_rustls;
> OPT_RUSTLS=$withval
109,111c119,121
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }rustls"
---
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }rustls"
> fi
>
114d123
< fi
119,120c128,131
< if test "${with_nss_deprecated+set}" = set; then :
< withval=$with_nss_deprecated; if test X"$withval" != Xno; then
---
> if test ${with_nss_deprecated+y}
> then :
> withval=$with_nss_deprecated;
> if test X"$withval" != Xno; then
130,131c141,144
< if test "${with_nss+set}" = set; then :
< withval=$with_nss; OPT_NSS=$withval
---
> if test ${with_nss+y}
> then :
> withval=$with_nss;
> OPT_NSS=$withval
138,140c151
< test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE
< else
< }NSS"
---
> test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }NSS"
168c179,180
< if test "${with_darwinssl+set}" = set; then :
---
> if test ${with_darwinssl+y}
> then :
170a183
> This commit adds a patch for curl/configure.ac that replaces the inlined
flags/conditionals with scoped ones.
What's happening?
1. We have build failures in later versions of autoconf.
1. Why ? ./configure script for libcurl breaks during execution.
2. Why ? Control flow structures are not correctly closed which
results in a parse error.
3. Why ? The structures in the m4 template in ./configure.ac for the
7.83.1 release of libcurl rely on inlined scripts.
4. Why [now]? The 2.72 update on autoconf changed the behaviour of
the script generator.
What do we do to ameliorate this?
1. Corrected the config script
2. Created a patch
3. Added the patch for alpine
4. Updated alpine to 3.20 which includes the autoconf change
smirnoal
reviewed
Aug 19, 2024
scripts/patch_libcurl_config.sh
Outdated
|
|
||
| set -x | ||
|
|
||
| ( |
Contributor
There was a problem hiding this comment.
NIT: don't see a strong reason to use ()
smirnoal
approved these changes
Aug 19, 2024
ghost
commented
Aug 20, 2024
Author
ghost
left a comment
There was a problem hiding this comment.
Needs some tidying but otherwise I am satisfied with the end result.
scripts/patch_libcurl_config.sh
Outdated
| ( | ||
| cd deps | ||
| . versions | ||
| LIBCURL="curl-${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION}" |
Author
There was a problem hiding this comment.
This could be used in the tar stmts.
Author
Also builds therefore the latest commit is patched properly. Contents of the tar can be verified by running |
trivenay
approved these changes
Aug 22, 2024
ghost
pushed a commit
to aws/aws-lambda-nodejs-runtime-interface-client
that referenced
this pull request
Aug 26, 2024
This is a port of [aws-lambda-python-runtime-interface-client#168](aws/aws-lambda-python-runtime-interface-client#168). It applied a patch to the configure script of curl. The patch fixes some inlining templating issues introduced with autoconf of 2.72.
AntoniaSzecsi
pushed a commit
that referenced
this pull request
Jul 29, 2025
* Patch libcurl configure.ac to work with later versions of autoconf (#168) Added a patch for libcurl/configure.ac to fix build issues with recent versions of autoconf This commit adds a patch for curl/configure.ac that replaces the inlined flags/conditionals with scoped ones. What's happening? 1. We have build failures in later versions of autoconf. 1. Why ? ./configure script for libcurl breaks during execution. 2. Why ? Control flow structures are not correctly closed which results in a parse error. 3. Why ? The structures in the m4 template in ./configure.ac for the 7.83.1 release of libcurl rely on inlined scripts. 4. Why [now]? The 2.72 update on autoconf changed the behaviour of the script generator. What do we do to ameliorate this? 1. Corrected the config script 2. Created a patch 3. Apply the patch to the shipped curl dependency * Update version to 2.2.1 (#170) * Add python3.13. (#175) * Add python3.13. * Fix integ tests --------- Co-authored-by: Stefan Toma <stefan9283@gmail.com> * Add support for snapstart runtime hooks (#176) * Bump version to 3.0.0 (#178) * Drop support for deprecated python versions (#179) * Change warning message to JSON (#182) * Bump to version 3.0.1. (#183) * Update simplejson to 3.20.1 (#184) * Update to simplejson 3.20.1 * Bump to version 3.0.2. (#185) * Sync with aws-lambda-python-runtime-interface-client repository --------- Co-authored-by: Quinn Sinclair <52372765+m-rph@users.noreply.github.com> Co-authored-by: Stefan Toma <stefan9283@gmail.com> Co-authored-by: trivenay <trivenay@amazon.com> Co-authored-by: Daniel Torok <daniel.torok@gmail.com>
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a patch for autoconf 2.72 for alpine3.20.
Fixes: #144
Target: Custom Docker Image
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.