From eb38650d1bcff64af6e11953cc8feb4f11109c63 Mon Sep 17 00:00:00 2001 From: Dale Rahn Date: Mon, 31 Mar 2008 14:10:33 +0000 Subject: Enable shared libraries. Sets are 'close' but probably not 100% --- distrib/sets/lists/xbase/md.landisk | 56 +++++++++++++++++++++++++++++++++++++ share/mk/bsd.xconf.mk | 6 ++-- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk index 60622c914..cf10fa49f 100644 --- a/distrib/sets/lists/xbase/md.landisk +++ b/distrib/sets/lists/xbase/md.landisk @@ -444,11 +444,67 @@ ./usr/X11R6/include/xorg/xf86RandR12.h ./usr/X11R6/include/xorg/xf86Rename.h ./usr/X11R6/include/xorg/xkbsrv.h +./usr/X11R6/lib/libFS.so.8.0 ./usr/X11R6/lib/libGL.a +./usr/X11R6/lib/libGL.so.7.1 ./usr/X11R6/lib/libGLU.a +./usr/X11R6/lib/libGLU.so.7.0 +./usr/X11R6/lib/libGLU_pic.a +./usr/X11R6/lib/libGL_pic.a ./usr/X11R6/lib/libGLw.a +./usr/X11R6/lib/libGLw.so.5.1 +./usr/X11R6/lib/libGLw_pic.a +./usr/X11R6/lib/libICE.so.8.1 +./usr/X11R6/lib/libSM.so.8.0 +./usr/X11R6/lib/libX11.so.11.1 +./usr/X11R6/lib/libXRes.so.4.0 +./usr/X11R6/lib/libXTrap.so.10.0 +./usr/X11R6/lib/libXau.so.9.0 +./usr/X11R6/lib/libXaw.so.13.0 +./usr/X11R6/lib/libXaw7.so.12.0 +./usr/X11R6/lib/libXaw8.so.13.0 +./usr/X11R6/lib/libXcomposite.so.3.0 +./usr/X11R6/lib/libXcursor.so.4.0 +./usr/X11R6/lib/libXdamage.so.3.1 +./usr/X11R6/lib/libXdmcp.so.9.0 +./usr/X11R6/lib/libXevie.so.2.0 +./usr/X11R6/lib/libXext.so.10.0 +./usr/X11R6/lib/libXfixes.so.5.0 +./usr/X11R6/lib/libXfont.so.7.0 +./usr/X11R6/lib/libXfontcache.so.4.0 +./usr/X11R6/lib/libXft.so.7.0 +./usr/X11R6/lib/libXi.so.10.0 +./usr/X11R6/lib/libXinerama.so.5.0 +./usr/X11R6/lib/libXmu.so.10.0 +./usr/X11R6/lib/libXmuu.so.5.0 +./usr/X11R6/lib/libXp.so.10.0 +./usr/X11R6/lib/libXpm.so.8.0 +./usr/X11R6/lib/libXprintAppUtil.so.1.0 +./usr/X11R6/lib/libXprintUtil.so.1.0 +./usr/X11R6/lib/libXrandr.so.6.0 +./usr/X11R6/lib/libXrender.so.5.0 +./usr/X11R6/lib/libXss.so.5.0 +./usr/X11R6/lib/libXt.so.10.0 +./usr/X11R6/lib/libXtst.so.10.0 +./usr/X11R6/lib/libXv.so.5.0 +./usr/X11R6/lib/libXvMC.so.5.0 +./usr/X11R6/lib/libXvMCW.so.1.0 ./usr/X11R6/lib/libXxf86dga.a ./usr/X11R6/lib/libXxf86dga.la +./usr/X11R6/lib/libXxf86dga.so.5.0 +./usr/X11R6/lib/libXxf86misc.so.5.0 +./usr/X11R6/lib/libXxf86vm.so.5.0 +./usr/X11R6/lib/libdmx.so.1.0 +./usr/X11R6/lib/libdrm.so.2.3 +./usr/X11R6/lib/libfontconfig.so.5.1 +./usr/X11R6/lib/libfontenc.so.3.0 +./usr/X11R6/lib/libfreetype.so.16.0 +./usr/X11R6/lib/libfreetype_pic.a +./usr/X11R6/lib/liblbxutil.so.1.0 +./usr/X11R6/lib/liboldX.so.10.0 +./usr/X11R6/lib/libpixman-1.so.10.0 +./usr/X11R6/lib/libxkbfile.so.4.0 +./usr/X11R6/lib/libxkbui.so.4.0 ./usr/X11R6/lib/modules/dri ./usr/X11R6/lib/pkgconfig/gl.pc ./usr/X11R6/lib/pkgconfig/glu.pc diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk index 9b300ce8c..d88babde2 100644 --- a/share/mk/bsd.xconf.mk +++ b/share/mk/bsd.xconf.mk @@ -1,7 +1,7 @@ -# $OpenBSD: bsd.xconf.mk,v 1.2 2008/03/25 23:43:25 matthieu Exp $ +# $OpenBSD: bsd.xconf.mk,v 1.3 2008/03/31 14:10:32 drahn Exp $ # Shared libs? -.if ${MACHINE} == landisk || ${MACHINE} == "mvme88k" || ${MACHINE} == "vax" +.if ${MACHINE} == "mvme88k" || ${MACHINE} == "vax" XENOCARA_HAVE_SHARED_LIBS?=no .else XENOCARA_HAVE_SHARED_LIBS?=yes @@ -15,7 +15,7 @@ XENOCARA_BUILD_DRI?=no .endif # Build GL libs and apps -.if ${MACHINE} == "landisk" || ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "sgi" || ${MACHINE} == vax +.if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "sgi" || ${MACHINE} == vax XENOCARA_BUILD_GL?=no .else XENOCARA_BUILD_GL?=yes -- cgit v1.2.3