From owner-svn-ports-all@freebsd.org Thu Feb 4 01:51:41 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D726F53353B; Thu, 4 Feb 2021 01:51:41 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DWM3d5q50z4cXg; Thu, 4 Feb 2021 01:51:41 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B86A92B5B9; Thu, 4 Feb 2021 01:51:41 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1141pfcq015306; Thu, 4 Feb 2021 01:51:41 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1141pfrs015305; Thu, 4 Feb 2021 01:51:41 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202102040151.1141pfrs015305@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 4 Feb 2021 01:51:41 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2021Q1/sysutils/e2fsprogs: . files X-SVN-Commit-Revision: 563986 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 01:51:41 -0000 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: