Date: Thu, 4 Feb 2021 01:51:41 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r563986 - in branches/2021Q1/sysutils/e2fsprogs: . files Message-ID: <202102040151.1141pfrs015305@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu Feb 4 01:51:41 2021 New Revision: 563986 URL: https://svnweb.freebsd.org/changeset/ports/563986 Log: MFH: r563985 e2fsprogs: make build more robust Depending on external circumstances and options that I have not fully investigated, several build-time failures occurred that were one of: - missing symbols in liblzma (static build missed libmd) on some versions with LIBUNWIND enabled - sometimes /bin/csh being pulled up for scripting, breaking in various places, reason unclear, possibly artifact of next one: - questionable BASHTESTS handling cleaned up As these are fixes for a potentially broken build, no PORTREVISION bump necessary. Deleted: branches/2021Q1/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in Modified: branches/2021Q1/sysutils/e2fsprogs/Makefile Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/sysutils/e2fsprogs/Makefile ============================================================================== --- branches/2021Q1/sysutils/e2fsprogs/Makefile Thu Feb 4 01:50:47 2021 (r563985) +++ branches/2021Q1/sysutils/e2fsprogs/Makefile Thu Feb 4 01:51:41 2021 (r563986) @@ -215,10 +215,10 @@ _CHECK_JOBS= _checkaddargs= .if ${PORT_OPTIONS:MBASHTESTS} -_CHECK_SHELL=${SHELL} +_CHECK_SHELL=${LOCALBASE}/bin/bash _checkaddargs+=--eval SHELL:=${BASH_CMD} .else -_CHECK_SHELL=${LOCALBASE}/bin/bash +_CHECK_SHELL=${SH} .endif .if !defined(TMPDIR) @@ -234,7 +234,7 @@ _check_timeout=180 .endif .if ${PORT_OPTIONS:MLIBUNWIND} -_staticlibs+=${LOCALBASE}/lib/libunwind.a /usr/lib/liblzma.a +_staticlibs+=${LOCALBASE}/lib/libunwind.a /usr/lib/liblzma.a /usr/lib/libmd.a .endif post-build:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102040151.1141pfrs015305>