Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Dec 2021 00:26:41 GMT
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8e6ae6036714 - main - devel/e2fsprogs-libss: use local compile_et,
Message-ID:  <202112150026.1BF0QfuB011276@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8e6ae6036714dc541ce5b31aad23bf568e422710

commit 8e6ae6036714dc541ce5b31aad23bf568e422710
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2021-12-14 23:03:20 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2021-12-15 00:26:28 +0000

    devel/e2fsprogs-libss: use local compile_et,
    
    in order to avoid build failures when Kerberos support is missing.
    
    PR:             254751
    Reported by:    Felix Palmen
    Approved by:    maintainer timeout (kaduk-fbsd@mit.edu, 6 months)
---
 devel/e2fsprogs-libss/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/devel/e2fsprogs-libss/Makefile b/devel/e2fsprogs-libss/Makefile
index e0a610d8bfbd..12d7d2a268bc 100644
--- a/devel/e2fsprogs-libss/Makefile
+++ b/devel/e2fsprogs-libss/Makefile
@@ -1,6 +1,6 @@
 # Created by: Ben Kaduk <kaduk@mit.edu>
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-libss
 
@@ -22,7 +22,12 @@ FILESDIR=	${.CURDIR}/files
 PKGDIR=		${.CURDIR}
 
 pre-build:
-	(cd ${WRKSRC}/lib/ss && compile_et ss_err.et && \
+	(cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et )
+	(cd ${WRKSRC}/lib/ss && _ET_DIR_OVERRIDE=../et ../et/compile_et ss_err.et && \
 	${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h)
 
+do-test:
+	(cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} all check )
+	(cd ${WRKSRC}/lib/ss && ${DO_MAKE_BUILD} check )
+
 .include "${MASTERDIR}/Makefile"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112150026.1BF0QfuB011276>