On Fri, Oct 07, 2016 at 09:02:38PM +0200, Martin Natano wrote: > Generate the pkg-config files at build time, otherwise we might run into > permission issues with noperm release builds. While there properly clean > up glw.pc. Ok? >
Hi
I would prefer to swith them to use the bsd.xorg.mk support for
pkg-config files like that:
Index: lib/libGLw/Makefile
===================================================================
RCS file: /cvs/OpenBSD/xenocara/lib/libGLw/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- lib/libGLw/Makefile 17 Aug 2012 15:16:44 -0000 1.15
+++ lib/libGLw/Makefile 8 Oct 2016 14:15:07 -0000
@@ -35,15 +35,12 @@
beforeinstall: includes
-afterinstall: glw.pc
- $(INSTALL) -c -m 644 -o root -g wheel glw.pc \
- ${DESTDIR}${LIBDIR}/pkgconfig
-
-glw.pc: glw.pc.in
- sed -e 's,@INSTALL_DIR@,$(X11BASE),' \
- -e 's,@LIB_DIR@,lib,' \
- -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
- < ${.CURDIR}/glw.pc.in > glw.pc
+PKGCONFIG= glw.pc
+PACKAGE_VERSION=
+EXTRA_PKGCONFIG_SUBST= \
+ -e 's,@INSTALL_DIR@,$(X11BASE),' \
+ -e 's,@LIB_DIR@,lib,' \
+ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
NOPROFILE=
Index: lib/libepoxy/Makefile
===================================================================
RCS file: /cvs/OpenBSD/xenocara/lib/libepoxy/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- lib/libepoxy/Makefile 1 Sep 2016 10:37:40 -0000 1.4
+++ lib/libepoxy/Makefile 8 Oct 2016 14:15:07 -0000
@@ -52,25 +52,15 @@
NOPROFILE=
+PKGCONFIG= epoxy.pc
+PACKAGE_VERSION= $(EPOXY_MAJOR).$(EPOXY_MINOR)
+EXTRA_PKGCONFIG_SUBST= '-e s,@DLOPEN_LIBS@,,'
+
obj: _xenocara_obj
.include <bsd.lib.mk>
.include <bsd.xorg.mk>
-epoxy.pc: ${EPOXY}/epoxy.pc.in Makefile
- sed -e 's,@prefix@,$(X11BASE),' \
- -e 's,@exec_prefix@,$(X11BASE),' \
- -e 's,@libdir@,${LIBDIR},' \
- -e 's,@includedir@,${INCSDIR},' \
- -e 's,@DLOPEN_LIBS@,,' \
- -e 's,@PACKAGE_VERSION@,$(EPOXY_MAJOR).$(EPOXY_MINOR),' \
- < ${EPOXY}/epoxy.pc.in > epoxy.pc
-
-afterinstall: epoxy.pc
- $(INSTALL) -c -m 644 -o root -g wheel epoxy.pc \
- ${DESTDIR}${LIBDIR}/pkgconfig
-
-CLEANFILES+= epoxy.pc
-
+.PATH: ${EPOXY}
.PATH: ${EPOXY}/src
.PATH: ${.CURDIR}/generated/src
--
Matthieu Herrb
signature.asc
Description: PGP signature
