Date: Tue, 23 Apr 2019 12:18:00 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Tobias Kortkamp <tobik@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r499736 - in head/devel/libepoll-shim: . files Message-ID: <1s1t-vxd3-wny@FreeBSD.org> In-Reply-To: <201904230901.x3N91Yhg034559@repo.freebsd.org> (Tobias Kortkamp's message of "Tue, 23 Apr 2019 09:01:34 %2B0000 (UTC)") References: <201904230901.x3N91Yhg034559@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Tobias Kortkamp <tobik@FreeBSD.org> writes:
> Added: head/devel/libepoll-shim/files/patch-Makefile
> ==============================================================================
>
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/devel/libepoll-shim/files/patch-Makefile Tue Apr 23 09:01:33 2019 (r499736)
> @@ -0,0 +1,11 @@
> +--- Makefile.orig 2019-04-23 08:57:50 UTC
> ++++ Makefile
> +@@ -15,7 +15,7 @@ CFLAGS+= -I${.CURDIR}/include -pthread -Wall -Wextra -
> + LDFLAGS+= -pthread -lrt
> +
> + src/epoll-shim.pc: src/epoll-shim.pc.in
> +- sed -e 's,@CMAKE_INSTALL_PREFIX@,/usr/local,' \
> ++ sed -e 's,@CMAKE_INSTALL_PREFIX@,${PREFIX},' \
PREFIX isn't defined in vendor Makefile itself, so substitution could've
been done via post-patch.
diff --git devel/libepoll-shim/Makefile devel/libepoll-shim/Makefile
index 2f960a5e2ef8..d93c08012b18 100644
--- devel/libepoll-shim/Makefile
+++ devel/libepoll-shim/Makefile
@@ -18,14 +18,12 @@ GH_TAGNAME= 1d1135384395dbf38eea00680ca28ead04f8dce2
USE_LDCONFIG= yes
USES= compiler uidfix
-MAKE_ARGS= INCSDIR=${PREFIX}/include/libepoll-shim/sys \
- LIBDATADIR=${PREFIX}/libdata \
- LIBDIR=${PREFIX}/lib \
- WITHOUT_PROFILE=yes
+MAKE_ARGS= WITHOUT_PROFILE=yes
.include <bsd.port.pre.mk>
post-patch:
+ @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
.if "${CHOSEN_COMPILER_TYPE}" == "gcc"
@${REINPLACE_CMD} -e 's|Wno-missing-variable-declarations|Wno-missing-declarations|' \
-e 's|-Wno-thread-safety-analysis||' ${WRKSRC}/Makefile
diff --git devel/libepoll-shim/files/patch-Makefile devel/libepoll-shim/files/patch-Makefile
deleted file mode 100644
index fe49881723c7..000000000000
--- devel/libepoll-shim/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig 2019-04-23 08:57:50 UTC
-+++ Makefile
-@@ -15,7 +15,7 @@ CFLAGS+= -I${.CURDIR}/include -pthread -Wall -Wextra -
- LDFLAGS+= -pthread -lrt
-
- src/epoll-shim.pc: src/epoll-shim.pc.in
-- sed -e 's,@CMAKE_INSTALL_PREFIX@,/usr/local,' \
-+ sed -e 's,@CMAKE_INSTALL_PREFIX@,${PREFIX},' \
- -e 's,@PROJECT_VERSION@,,' \
- $> >$@
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1s1t-vxd3-wny>