Date: Sun, 5 Aug 2012 06:19:09 +0200 (CEST)
From: Gerald Pfeifer <gerald@pfeifer.com>
To: gnome@FreeBSD.org
Subject: PATCH: fontconfig: don't run ${LDCONFIG} as user, or at least don't abort
Message-ID: <alpine.LNX.2.00.1208050601400.3055@gerinyyl.fvgr>
next in thread | raw e-mail | index | archive | help
In a test environment of mine I am installing packages as ordinary
user, with INSTALL_AS_USER=1.
Now, I actually would have thought that the ports/Mk infrastructure
takes care of running ${LDCONFIG} at the right point in time, but in
any case, the two patches below both fix the failure in post-install.
The second is more in line with what Mk/bsd.port.mk does for the
plist -- @exec ${LDCONFIG} -m ${USE_LDCONFIG} || ${TRUE} -- and is
the one I'd recommend.
Okay?
Gerald
Index: fontconfig/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-fonts/fontconfig/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- fontconfig/Makefile 20 May 2012 17:40:21 -0000 1.80
+++ fontconfig/Makefile 5 Aug 2012 04:01:01 -0000
@@ -61,9 +61,10 @@
s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
> ${PKGINSTALL}
.if !defined(PACKAGE_BUILDING)
+. if !defined(INSTALL_AS_USER)
@${LDCONFIG} -m ${PREFIX}/lib
+. endif
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
.endif
.include <bsd.port.post.mk>
Index: fontconfig/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-fonts/fontconfig/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- fontconfig/Makefile 20 May 2012 17:40:21 -0000 1.80
+++ fontconfig/Makefile 5 Aug 2012 04:16:09 -0000
@@ -61,7 +61,7 @@
s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
> ${PKGINSTALL}
.if !defined(PACKAGE_BUILDING)
- @${LDCONFIG} -m ${PREFIX}/lib
+ -@${LDCONFIG} -m ${PREFIX}/lib
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.LNX.2.00.1208050601400.3055>