git: 627ec0e58630 - main - security/wpa_supplicant*: Fix EAPOL_TEST build for non-standard SSL_DEFAULT
Cy Schubert <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=627ec0e58630ef673a2adf6556cf7417af57ef76 commit 627ec0e58630ef673a2adf6556cf7417af57ef76 Author: Pascal Ernster <[email protected]> AuthorDate: 2026-08-14 18:06:58 +0000 Commit: Cy Schubert <[email protected]> CommitDate: 2026-08-18 14:25:32 +0000 security/wpa_supplicant*: Fix EAPOL_TEST build for non-standard SSL_DEFAULT The post-build target does not have the same environment variables setup as the do-build target. This results in the eapol_test binary getting compiled against the headers of the TLS library specified in SSL_DEFAULT, but getting linked against the TLS library from the base system regardless of SSL_DEFAULT, causing build failures when SSL_DEFAULT is set to a different TLS library/version than the on from the base system. Fix this by not using the post-build target to build the eapol_test binary, but instead conditionally add the eapol_test target to TARGET_ALL if the EAPOL_TEST option is enabled for the port. Signed-off-by: Pascal Ernster <[email protected]> --- security/wpa_supplicant-devel/Makefile | 8 +++++--- security/wpa_supplicant/Makefile | 8 +++++--- security/wpa_supplicant210/Makefile | 8 +++++--- security/wpa_supplicant29/Makefile | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/security/wpa_supplicant-devel/Makefile b/security/wpa_supplicant-devel/Makefile index c9497f3468a0..2ec7911bd32f 100644 --- a/security/wpa_supplicant-devel/Makefile +++ b/security/wpa_supplicant-devel/Makefile @@ -29,6 +29,7 @@ CFLAGS+= -I${OPENSSLINC} CFLAGS+= -Wno-deprecated-declarations LDFLAGS+= -L${OPENSSLLIB} -lutil MAKE_ENV= V=1 +ALL_TARGET+= all SUB_FILES= pkg-message PORTDOCS= README ChangeLog @@ -149,6 +150,10 @@ LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libdbus-1.so:devel/dbus .endif +.if ${PORT_OPTIONS:MEAPOL_TEST} +ALL_TARGET+= eapol_test +.endif + post-patch: @${CP} ${FILESDIR}/Packet32.[ch] ${FILESDIR}/ntddndis.h \ ${WRKSRC}/src/utils @@ -225,9 +230,6 @@ post-patch: @${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG} @${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG} -post-build-EAPOL_TEST-on: - cd ${BUILD_WRKSRC} && ${GMAKE} eapol_test - do-install: (cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \ wpa_passphrase ${STAGEDIR}${PREFIX}/sbin) diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile index 9454006b402d..036b0f33d5af 100644 --- a/security/wpa_supplicant/Makefile +++ b/security/wpa_supplicant/Makefile @@ -23,6 +23,7 @@ CFLAGS+= -I${OPENSSLINC} CFLAGS+= -Wno-deprecated-declarations LDFLAGS+= -L${OPENSSLLIB} -lutil MAKE_ENV= V=1 +ALL_TARGET+= all SUB_FILES= pkg-message PORTDOCS= README ChangeLog @@ -143,6 +144,10 @@ LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libdbus-1.so:devel/dbus .endif +.if ${PORT_OPTIONS:MEAPOL_TEST} +ALL_TARGET+= eapol_test +.endif + post-patch: @${CP} ${FILESDIR}/Packet32.[ch] ${FILESDIR}/ntddndis.h \ ${WRKSRC}/src/utils @@ -219,9 +224,6 @@ post-patch: @${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG} @${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG} -post-build-EAPOL_TEST-on: - cd ${BUILD_WRKSRC} && ${GMAKE} eapol_test - do-install: (cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \ wpa_passphrase ${STAGEDIR}${PREFIX}/sbin) diff --git a/security/wpa_supplicant210/Makefile b/security/wpa_supplicant210/Makefile index 75712abc633f..03421a7fc246 100644 --- a/security/wpa_supplicant210/Makefile +++ b/security/wpa_supplicant210/Makefile @@ -24,6 +24,7 @@ CFLAGS+= -I${OPENSSLINC} CFLAGS+= -Wno-deprecated-declarations LDFLAGS+= -L${OPENSSLLIB} -lutil MAKE_ENV= V=1 +ALL_TARGET+= all SUB_FILES= pkg-message PORTDOCS= README ChangeLog @@ -138,6 +139,10 @@ LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libdbus-1.so:devel/dbus .endif +.if ${PORT_OPTIONS:MEAPOL_TEST} +ALL_TARGET+= eapol_test +.endif + post-patch: @${CP} ${FILESDIR}/Packet32.[ch] ${FILESDIR}/ntddndis.h \ ${WRKSRC}/src/utils @@ -201,9 +206,6 @@ post-patch: @${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG} @${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG} -post-build-EAPOL_TEST-on: - cd ${BUILD_WRKSRC} && ${GMAKE} eapol_test - do-install: (cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \ wpa_passphrase ${STAGEDIR}${PREFIX}/sbin) diff --git a/security/wpa_supplicant29/Makefile b/security/wpa_supplicant29/Makefile index 817d345f7d82..6b8549126bba 100644 --- a/security/wpa_supplicant29/Makefile +++ b/security/wpa_supplicant29/Makefile @@ -30,6 +30,7 @@ CFLAGS+= ${CPPFLAGS} # USES=readline only augments CPPFLAGS and LDFLAGS CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} -lutil MAKE_ENV= V=1 +ALL_TARGET+= all SUB_FILES= pkg-message PORTDOCS= README ChangeLog @@ -142,6 +143,10 @@ LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libdbus-1.so:devel/dbus .endif +.if ${PORT_OPTIONS:MEAPOL_TEST} +ALL_TARGET+= eapol_test +.endif + post-patch: @${CP} ${FILESDIR}/Packet32.[ch] ${FILESDIR}/ntddndis.h \ ${WRKSRC}/src/utils @@ -204,9 +209,6 @@ post-patch: @${ECHO_CMD} CONFIG_L2_PACKET=freebsd >> ${CFG} @${ECHO_CMD} CONFIG_TLS=openssl >> ${CFG} -post-build-EAPOL_TEST-on: - cd ${BUILD_WRKSRC} && ${GMAKE} eapol_test - do-install: (cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} wpa_supplicant wpa_cli \ wpa_passphrase ${STAGEDIR}${PREFIX}/sbin)