diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-02-25 22:12:33 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-02-25 22:12:33 +0000 |
| commit | ffe336e37486cf87f6de9255e3d08903865151e8 (patch) | |
| tree | 57908780f934f1a4129f1f1789947b68c96b5128 /lib/mesa/mk | |
| parent | 54652c815e509ba095bf4b23c35ff0980c6e80d8 (diff) | |
put .a files in a linker group to avoid an undefined reference
to loader_dri_create_image with ld.bfd from binutils 2.17
reported and tested by visa@
Diffstat (limited to 'lib/mesa/mk')
| -rw-r--r-- | lib/mesa/mk/libGL/Makefile | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/mesa/mk/libGL/Makefile b/lib/mesa/mk/libGL/Makefile index 244811521..ffcebb809 100644 --- a/lib/mesa/mk/libGL/Makefile +++ b/lib/mesa/mk/libGL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2022/02/25 06:23:08 jsg Exp $ +# $OpenBSD: Makefile,v 1.5 2022/02/25 22:12:32 jsg Exp $ .include <bsd.xconf.mk> @@ -60,15 +60,8 @@ CPPFLAGS+= -I${MESA_SRC}/src/glx \ -I${MESA_SRC}/src/mapi/glapi \ -I${MESA_SRC}/generated/src/mapi/glapi/gen -LDADD+= -L${X11BASE}/lib -lz -lexpat -lXfixes -lX11-xcb -lxcb-glx \ - -lxcb-dri2 -lxcb-shm -lXxf86vm -lXext -lX11 -lxcb \ - -ldrm -lm -lpthread -lXau -lXdmcp - -.if ${XENOCARA_BUILD_DRI3:L} == "yes" -LDADD+= -lxcb-dri3 -lxcb-xfixes -lxcb-present -lxcb-sync -lxshmfence -.endif - LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \ + -Wl,--start-group \ ${.CURDIR}/../libglapi_static/${__objdir}/libglapi_static.a \ ${.CURDIR}/../libloader/${__objdir}/libloader.a \ ${.CURDIR}/../libxmlconfig/${__objdir}/libxmlconfig.a \ @@ -79,6 +72,16 @@ LDADD+= -L${.CURDIR}/../libglapi/${__objdir} -lglapi \ LDADD+= ${.CURDIR}/../libloader_dri3_helper/${__objdir}/libloader_dri3_helper.a .endif +LDADD+= -Wl,--end-group + +LDADD+= -L${X11BASE}/lib -lz -lexpat -lXfixes -lX11-xcb -lxcb-glx \ + -lxcb-dri2 -lxcb-shm -lXxf86vm -lXext -lX11 -lxcb \ + -ldrm -lm -lpthread -lXau -lXdmcp + +.if ${XENOCARA_BUILD_DRI3:L} == "yes" +LDADD+= -lxcb-dri3 -lxcb-xfixes -lxcb-present -lxcb-sync -lxshmfence +.endif + obj: _xenocara_obj beforeinstall: |