Skip to content
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

Jump to bottom

Makefile.m32: major rework [ci skip] #9632

Closed
wants to merge 82 commits into from
Closed

Makefile.m32: major rework [ci skip] #9632

wants to merge 82 commits into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Oct 2, 2022 •
edited

This patch overhauls Makefile.m32 scripts, fixing a list of quirks, making its behaviour and customization envvars align better with other build systems, aiming for less code, that is easier to read, use and maintain.

Details:

  • Rename customization envvars:
    CURL_CC -> CC
    CURL_RC -> RC
    CURL_AR -> AR
    CURL_LDFLAG_EXTRAS_DLL -> CURL_LDFLAGS_LIB
    CURL_LDFLAG_EXTRAS_EXE -> CURL_LDFLAGS_BIN
  • Drop CURL_STRIP and CURL_RANLIB. These tools are no longer used.
  • Accept CFLAGS, CPPFLAGS, RCFLAGS, LDFLAGS and LIBS envvars.
  • Drop CURL_CFLAG_EXTRAS, CURL_LDFLAG_EXTRAS, CURL_RCFLAG_EXTRAS in
    favor of the above.
  • Do not automatically enable zlib with libssh2. zlib is optional
    with libssh2.
  • Omit unnecessary CPPFLAGS options when building curl.exe and
    examples.
  • Drop support for deprecated -winssl CFG option. Use -schannel
    instead.
  • Avoid late evaluation where not necessary (= -> :=).
  • Drop support for CURL_DLL_A_SUFFIX to override the implib suffix.
    Instead, use the standard naming scheme by default: libcurl.dll.a.
    The toolchain recognizes the name, and selects it automatically when
    asking for a -shared vs. -static build.
  • Stop applying strip to libcurl.a. Follow-up from
    16a58e9. There was no debug info to
    strip since then.
  • Stop setting -O3, -W, -Wall options. You can add these to
    CFLAGS as desired.
  • Always enable -DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG with OpenSSL,
    to avoid that vulnerability on Windows.
  • Add -lbrotlicommon to LIBS when using brotli.
  • Do not enable -nghttp3 without -ngtcp2.
  • -ssh2 and -rtmp options no longer try to auto-select a TLS-backend.
    You need to set the backend explicitly. This scales better and avoids
    issues with certain combinations (e.g. libssh2 + wolfssl with no
    schannel).
  • Default to OpenSSL TLS-backend with ngtcp2. Possible to override via
    NGTCP2_LIBS.
  • Old, alternate method of enabling components (e.g. SSH2=1) no longer
    supported.
  • Delete SPNEGO references. They were no-ops.
  • Drop support for Win9x environments.
  • Allow setting OPENSSL_LIBS independently from OPENSSL_LIBPATH.
  • Support autotools/CMake libssh2 builds by default.
  • Respect CURL_DLL_SUFFIX in -dyn mode when building curl.exe and
    examples.
  • Assume standard directory layout with LIBCARES_PATH. (Instead of the
    long gone embedded one.)
  • Stop static linking with c-ares by default. Add
    CPPFLAGS=-DCARES_STATICLIB to enable it.
  • Reorganize internal layout to avoid redundancy and emit clean diffs
    between src/lib and example make files.
  • Delete unused variables.
  • Code cleanups/rework.
  • Comment and indentation fixes.

Closes #9632

@vszakats
Makefile.m32: standardize tool customization envvars [ci skip]
fbbe9a1 
This patch replaces `CURL_*` envvars [1][2] with more familiar ones,
which are also used in autotools and other build tools and which have
been in fact used internally by `Makefile.m32` scripts.

`CURL_CC` is now `CC`, `CURL_RANLIB` -> `RANLIB`, `CURL_RC` -> `RC`,
`CURL_STRIP` -> `STRIP`, `CURL_AR` -> `AR`.

This aims to make configuration more straighforward.

Also fix some indentation and delete `AR` assigments from src and
examples, where the value wasn't used.

[1] 1d5b7b7
[2] 4440b6a

Closes #xxxx
@vszakats
most helper tools were unused, delete them
a071a40
@vszakats vszakats added build Windows Windows-specific tidy-up labels Oct 2, 2022
@vszakats
delete unused DYN in lib
0af0bda
@vszakats
accept CFLAGS, LDFLAGS, RCFLAGS, CPPFLAGS and LIBS from env
82c4b4b
@vszakats
do not repeat search string in findstring checks
e9d0a51
@vszakats
avoid late evaluation where we do not need it
5b07277 
No assigmnents seem to need this.
@vszakats
lib: accept DLL_LIBS again for compatibility
4fad4df
@vszakats
move PP flags from CFLAGS to CPPFLAGS
86fe159
@vszakats
split curl_LDADD for LDFLAGS and LIBS
20e575b
@vszakats
replace curl_LDADD with LDFLAGS for -L flags
0f4c7cb
@vszakats
replace curl_LDADD with LIBS for libs
7c4983d
@vszakats
replace internal INCLUDES with CPPFLAGS
549a0c5
@vszakats
stop stripping libcurl.a
88de009 
It was necessary while libcurl was unconditionally built with
debug info. This flag has been deleted earlier, so strip is no
longer necessary.

Follow-up from 16a58e9
@vszakats
isolate deprecated logic
19e2b6b
@vszakats
move -D CPPFLAGS first
fab43ed
@vszakats
there are no libssh2 headers in its win32 subdir
e362725 
At least not in the last 10 years.
@vszakats
add libssh2 lib subdir as libpath. use by non-Makefile.m32 libssh2 bu…
ec8b10b 
…ilds
@vszakats
honor CURL_DLL_A_SUFFIX/CURL_DLL_SUFFIX in DYN mode with src and exam…
526ecf9 
…ples
@vszakats
assume standard dir layout with c-ares
9a7e3d3 
Existing logic assumed the embedded layout (when c-ares was part of
curl) that is long gone.
@vszakats
stop forcing static c-ares linking
2c20dfc 
This made sense when it was part of curl, but no longer.
@vszakats
restore late evaluation for DEL
f879ca9
@vszakats
whitespace
89e044d
@jay
Copy link
Member

jay commented Oct 2, 2022

Do you know of the reason curl_LDADD was used instead of LDFLAGS? It seems like that was an intentional choice but I don't know what advantage it would have.

@vszakats
delete CPPFLAGS when building curl.exe/examples
8405367 
for curl.exe, ZLIB flags are necessary for hugehelp compression.

Oddly enough, USE_NGTCP2 is used inside lib/dynbuf.c, which is
compiled into curl.exe directly. This has been fixed in 7.86.0 [0]
so let's drop this constant.

[0] f703cf9
@vszakats
delete USE_NGTCP2 from src
f6ca3fc
@vszakats
drop CURL_DLL_A_SUFFIX
0d7ee59
@vszakats
dedupe
6fd8354
@vszakats vszakats changed the title Makefile.m32: standardize tool customization envvars [ci skip] Makefile.m32: major cleanup [ci skip] Oct 3, 2022
@vszakats
simplify CURL_WITH_MULTI_SSL logic
bada1ca
@vszakats
move tool definitions to the rules section
3a76697
@vszakats
whitespace
bbe7051
@vszakats
simplify
238f468
@vszakats
simplify logic for selecting SSL with RTMP/SSH2 if there is no TLS-ba…
bd72e53 
…ckend

Things go complex quickly when introducing built-in support for mbedtls
or wolfssl (also for the CURL_WITH_MULTI_SSL setting), but for SSL vs
SCHANNEL only, the logic can remain simple.

To scale better, probably Makefile.m32 should not be overly clever here,
but instead expect the caller to explicitly set all necessary components.
@vszakats
do not try to guess the TLS-backend for SSH2 and RTMP
5188882 
This can cause problems when we want to build with a TLS-backend
that has no built-in support in Makefile.m32, e.g. SSH2 + wolfssl
and without Schannel.

After this patch, the CFG must contain any necessary TLS backend
explicitly.
@vszakats
delete SPNEGO references
ee09708
@vszakats
merge CFG detection with config logic
6d15031
@vszakats
delete comment decorations
5376150
@vszakats
tweak intro comment
133a43b
@vszakats
whitespace
7df5a14
@vszakats vszakats changed the title Makefile.m32: major cleanup [ci skip] Makefile.m32: major rework [ci skip] Oct 3, 2022
@vszakats vszakats closed this in 10fbd8b Oct 3, 2022
@vszakats vszakats deleted the m32stdize branch February 2, 2023 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
build tidy-up Windows Windows-specific
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vszakats @jay