From c4f6666dd66e9df89f52950c7029467e45b3de64 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 16 Jan 2022 13:09:14 +0100 Subject: [PATCH] devel/e2fsprogs-libss: build&use local libcom_err, steal maintainership The previous fix was incomplete, so let's build our local libcom_err.a in pre-build as well, it ends up in libss, which no longer references the system's libcom_err.*. -fPIC is needed so the static libcom_err.a does not cause complaints when linking the dynamic libss.so. While here, based on Ben's inactivity, and due to my maintainership of related e2fsprogs* ports, make myself steward of the port with explicit permission of Ben commiting without my prior consent or claiming the port back. PR: 254751 Reported by: Felix Palmen --- devel/e2fsprogs-libss/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/devel/e2fsprogs-libss/Makefile b/devel/e2fsprogs-libss/Makefile index 12d7d2a268bc..c2d05e03ce03 100644 --- a/devel/e2fsprogs-libss/Makefile +++ b/devel/e2fsprogs-libss/Makefile @@ -1,10 +1,10 @@ # Created by: Ben Kaduk -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMESUFFIX= -libss -MAINTAINER= kaduk-fbsd@mit.edu +MAINTAINER= mandree@FreeBSD.org # Ben Kaduk is free to make changes or take back maintainership COMMENT= Command-line interface parsing library from e2fsprogs LICENSE= MIT @@ -18,11 +18,14 @@ USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/lib/ss INSTALL_WRKSRC= ${WRKSRC}/lib/ss FILESDIR= ${.CURDIR}/files +CFLAGS+= -fPIC PKGDIR= ${.CURDIR} pre-build: - (cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et ) + (cd ${WRKSRC}/lib/et && \ + ${DO_MAKE_BUILD} libcom_err.a && \ + ${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) -- 2.34.1