openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-14 05:08:53 +00:00
Code Issues Projects Releases Wiki Activity

explicitly remove *.la files from old Mesa builds

Browse Source 
While we no longer install .la files for Mesa naddy@ pointed out that
using libtool to build something like libGLU could result in .la files
which reference old Mesa .la files.

Remove Mesa .la files found in DESTDIR on install as suggested by
millert@

ok millert@ matthieu@ deraadt@
This commit is contained in:
jsg
2020-08-28 16:07:18 +00:00
parent 3cf044c035
commit 0167b90cd0
9 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mesa/mk/libEGL/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:18 jsg Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@@ -59,6 +59,9 @@ LDADD+= -L${.CURDIR}/../libgbm/${__objdir} -lgbm \
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

5
lib/mesa/mk/libGL/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:18 jsg Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@@ -82,6 +82,9 @@ LDADD+= ${.CURDIR}/../libloader_dri3_helper/${__objdir}/libloader_dri3_helper.a
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

5
lib/mesa/mk/libGLESv1_CM/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:18 jsg Exp $
LIB= GLESv1_CM LIB= GLESv1_CM
@@ -15,6 +15,9 @@ LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

5
lib/mesa/mk/libGLESv2/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:19 jsg Exp $
LIB= GLESv2 LIB= GLESv2
@@ -15,6 +15,9 @@ LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

5
lib/mesa/mk/libOSMesa/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:36 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:19 jsg Exp $
LIB= OSMesa LIB= OSMesa
@@ -20,6 +20,9 @@ CPPFLAGS+= -I${MESA_SRC}/src/mesa \
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

5
lib/mesa/mk/libgbm/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:19 jsg Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@@ -29,6 +29,9 @@ LDADD+= -L${X11BASE}/lib -ldrm
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

5
lib/mesa/mk/libglapi/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:37 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:19 jsg Exp $
LIB= glapi LIB= glapi
@@ -18,6 +18,9 @@ CPPFLAGS+= -DMAPI_MODE_GLAPI \
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

7
lib/mesa/mk/libvulkan_intel/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:19 jsg Exp $
LIB= vulkan_intel LIB= vulkan_intel
@@ -30,7 +30,7 @@ VKARCH=x86_64
VKARCH=${MACHINE_ARCH} VKARCH=${MACHINE_ARCH}
.endif .endif
install: install: beforeinstall
${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
lib${LIB}.so ${DESTDIR}${X11BASE}/lib lib${LIB}.so ${DESTDIR}${X11BASE}/lib
@@ -40,6 +40,9 @@ install:
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

7
lib/mesa/mk/libvulkan_radeon/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2020/08/26 06:02:41 jsg Exp $ # $OpenBSD: Makefile,v 1.2 2020/08/28 16:07:19 jsg Exp $
LIB= vulkan_radeon LIB= vulkan_radeon
@@ -88,7 +88,7 @@ VKARCH=x86_64
VKARCH=${MACHINE_ARCH} VKARCH=${MACHINE_ARCH}
.endif .endif
install: install: beforeinstall
${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
lib${LIB}.so ${DESTDIR}${X11BASE}/lib lib${LIB}.so ${DESTDIR}${X11BASE}/lib
@@ -98,6 +98,9 @@ install:
obj: _xenocara_obj obj: _xenocara_obj
beforeinstall:
rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.la
.include <bsd.lib.mk> .include <bsd.lib.mk>
.include <bsd.xorg.mk> .include <bsd.xorg.mk>