tech-x11 archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: Optimization for xorg/lib/Makefile



It turned out that this was a nice idea, but unfortunally not all
dependencies were added to the libraries, so this needs a different
patch. So we are still at 6 .WAITs :(

Joerg gave me the hint on using -Wl,-z,defs which I added as
'LDFLAGS += -Wl,-z,defs' to /etc/mk.conf to check if all libraries
had all there needed libraries recorded and gave up on fixing the
following directories:
 dri (i just skipped this part)
 libX11 (no way to get this build done with that check)
 libGLU (_Unwind_Resume undefined)
 libXaw7 (xawPrintShellWidgetClass undefined)

If someone ask: I checked that I modified external/mit/xorg/lib/Makefile
by sorting the old version and the new one and made a diff. So all libraries
are part of the new Makefile.

Bernd

On Sat, Nov 01, 2008 at 11:35:28PM +0100, Bernd Ernesti wrote:
> Hi,
> 
> the Makefile should be changed to make it a little easier for finding a
> directory and more important to remove one .WAIT from that list.
> 
> Also adding more directories before using the first .WAIT (27 instead of
> only 9). Both changes should make it a little bit faster for a parallel
> build.
> 
> libXft unfortunally needs 5 levels of waits:
>  libexpat, libfreetype, libXdmcp & libXau (which have no other dependencies) 
> ->
>  libX11 (depends on libXdmcp & libXau), libfontconfig (depends on libexpat & 
> libfreetype) ->
>  libXext (depends on libXdmcp, libXau & libX11) ->
>  libXrender (depends on libXdmcp, libXau, libX11 & libXext) ->
>  libXrandr (depends on libXdmcp, libXau, libX11, libXext & libXrender)
> 
> (Leaving out libz and libc which are not a concern here)
> 
> So we need at least 5 .WAIT.
> 
> I did move each .WAIT to its own line to make it easier to find them, but
> wouldn't mind to have them at the end of the line.
> 
> cube pointed out that my last change for src/external/mit/xorg/Makefile
> didn't make much sense because that targets aren't in use so I attached
> another patch for that Makefile to remove these targets.
> 
> Bernd

Index: Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/Makefile,v
retrieving revision 1.5
diff -b -u -r1.5 Makefile
--- Makefile    1 Nov 2008 18:42:51 -0000       1.5
+++ Makefile    4 Nov 2008 22:02:28 -0000
@@ -2,16 +2,23 @@
 
 # build libraries for xorg
 
-SUBDIR=        libFS libICE libXau libXdmcp libdrm freetype libfontenc expat \
-       libOSMesa .WAIT \
-       fontconfig libSM libX11 .WAIT \
-       libXext .WAIT \
-       libXfixes libxkbfile libXt libXScrnSaver libXevie libXi libXinerama \
-       libXp libXrender libXres libXtst libXv libXxf86dga libXxf86misc \
-       libXxf86vm libXfontcache xkbdata liblbxutil .WAIT \
-       libXcomposite libXdamage libXcursor libXrandr libXTrap libXmu \
-       libXmuu libXpm pixman \
-       libXprintUtil libXprintAppUtil libXfont libXvMC libxkbui .WAIT \
-       libXft libXaw6 libXaw7 libXaw libGL .WAIT dri libGLU libGLw
+SUBDIR=        dri expat libfontenc freetype libFS libICE libOSMesa \
+       libXau libXdmcp libdrm pixman xkbdata \
+       .WAIT \
+       fontconfig libSM libX11 liblbxutil \
+       .WAIT \
+       libXcomposite libXdamage libXext libXfixes libXi libXt \
+       libxkbfile \
+       .WAIT \
+       libXp libXxf86vm \
+       .WAIT \
+       libGL libXScrnSaver libXTrap libXevie libXfont libXfontcache \
+       libXinerama libXmu libXmuu libXpm libXprintUtil libXrender \
+       libXres libXtst libXvMC libXv libXxf86dga libXxf86misc libxkbui \
+       .WAIT \
+       libGLU libGLw libXaw6 libXaw7 libXaw libXcursor libXprintAppUtil \
+       libXrandr \
+       .WAIT \
+       libXft
 
 .include <bsd.subdir.mk>
Index: libOSMesa/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libOSMesa/Makefile,v
retrieving revision 1.2
diff -b -u -r1.2 Makefile
--- libOSMesa/Makefile  26 Sep 2008 07:15:53 -0000      1.2
+++ libOSMesa/Makefile  4 Nov 2008 22:02:28 -0000
@@ -125,5 +125,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.MesaLib}/src/mesa/${_path_}
 .endfor
 
+LDADD+=                -lm 
+DPADD+=                ${LIBM}
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
Index: libXScrnSaver/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXScrnSaver/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- libXScrnSaver/Makefile      5 Oct 2008 03:15:20 -0000       1.3
+++ libXScrnSaver/Makefile      4 Nov 2008 22:02:28 -0000
@@ -10,7 +10,8 @@
 CPPFLAGS+=     ${X11FLAGS.THREADLIB}
 #CPPFLAGS+=    -I${DESTDIR}${X11INCDIR}
 
-LIBDPLIBS=     X11     ${.CURDIR}/../libX11/dynamic
+LIBDPLIBS=     X11     ${.CURDIR}/../libX11/dynamic \
+               Xext    ${.CURDIR}/../libXext
 
 MAN=   Xss.3
 MLINKS=        Xss.3 XScreenSaverAllocInfo.3 \
Index: libXcomposite/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXcomposite/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- libXcomposite/Makefile      5 Oct 2008 02:28:01 -0000       1.3
+++ libXcomposite/Makefile      4 Nov 2008 22:02:28 -0000
@@ -13,6 +13,8 @@
 INCS=  Xcomposite.h
 INCSDIR=${X11INCDIR}/X11/extensions
 
+LIBDPLIBS=     X11     ${.CURDIR}/../libX11/dynamic
+
 MAN=   Xcomposite.3
 MLINKS=        Xcomposite.3 XCompositeCreateRegionFromBorderClip.3 \
        Xcomposite.3 XCompositeGetOverlayWindow.3 \
Index: libXdamage/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXdamage/Makefile,v
retrieving revision 1.2
diff -b -u -r1.2 Makefile
--- libXdamage/Makefile 13 Sep 2008 04:32:30 -0000      1.2
+++ libXdamage/Makefile 4 Nov 2008 22:02:28 -0000
@@ -14,6 +14,8 @@
 INCS=  Xdamage.h
 INCSDIR=${X11INCDIR}/X11/extensions
 
+LIBDPLIBS=     X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXevie/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXevie/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- libXevie/Makefile   5 Oct 2008 02:05:39 -0000       1.3
+++ libXevie/Makefile   4 Nov 2008 22:02:28 -0000
@@ -20,6 +20,9 @@
        Xevie.3 XevieSendEvent.3 \
        Xevie.3 XevieEnd.3
 
+LIBDPLIBS=     X11     ${.CURDIR}/../libX11/dynamic \
+               Xext    ${.CURDIR}/../libXext
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXfixes/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXfixes/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- libXfixes/Makefile  5 Oct 2008 00:53:12 -0000       1.3
+++ libXfixes/Makefile  4 Nov 2008 22:02:28 -0000
@@ -17,6 +17,8 @@
 
 MAN=   Xfixes.3
 
+LIBDPLIBS=     X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXfont/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXfont/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- libXfont/Makefile   13 Sep 2008 04:32:30 -0000      1.3
+++ libXfont/Makefile   4 Nov 2008 22:02:28 -0000
@@ -57,7 +57,11 @@
        SM      ${.CURDIR}/../libSM \
        ICE     ${.CURDIR}/../libICE \
        Xext    ${.CURDIR}/../libXext \
-       X11     ${.CURDIR}/../libX11/dynamic
+       fontenc ${.CURDIR}/../libfontenc \
+       freetype        ${.CURDIR}/../freetype \
+       X11     ${.CURDIR}/../libX11/dynamic \
+       m       ${.CURDIR}/../../../../../lib/libm \
+       z       ${.CURDIR}/../../../../../lib/libz
 
 # XXX
 COPTS.ffcheck.c+=      -Wno-error
Index: libXft/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXft/Makefile,v
retrieving revision 1.4
diff -b -u -r1.4 Makefile
--- libXft/Makefile     24 Oct 2008 19:49:54 -0000      1.4
+++ libXft/Makefile     4 Nov 2008 22:02:28 -0000
@@ -23,7 +23,8 @@
 LIBDPLIBS=     X11             ${.CURDIR}/../libX11/dynamic \
                fontconfig      ${.CURDIR}/../fontconfig/src \
                freetype        ${.CURDIR}/../freetype \
-               Xrandr          ${.CURDIR}/../libXrandr
+               Xrandr          ${.CURDIR}/../libXrandr \
+               Xrender         ${.CURDIR}/../libXrender
 
 PKGDIST=       ${LIB}
 
Index: libXinerama/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXinerama/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- libXinerama/Makefile        4 Oct 2008 22:41:42 -0000       1.3
+++ libXinerama/Makefile        4 Nov 2008 22:02:28 -0000
@@ -16,6 +16,9 @@
        Xinerama.3 XineramaIsActive.3 \
        Xinerama.3 XineramaQueryScreens.3
 
+LIBDPLIBS=     Xext    ${.CURDIR}/../libXext \
+               X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXprintAppUtil/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXprintAppUtil/Makefile,v
retrieving revision 1.2
diff -b -u -r1.2 Makefile
--- libXprintAppUtil/Makefile   13 Sep 2008 04:32:30 -0000      1.2
+++ libXprintAppUtil/Makefile   4 Nov 2008 22:02:28 -0000
@@ -11,6 +11,10 @@
 INCS=  xpapputil.h
 INCSDIR=${X11INCDIR}/X11/XprintAppUtil
 
+LIBDPLIBS=     XprintUtil      ${.CURDIR}/../libXprintUtil \
+               Xp              ${.CURDIR}/../libXp \
+               X11             ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXprintUtil/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXprintUtil/Makefile,v
retrieving revision 1.2
diff -b -u -r1.2 Makefile
--- libXprintUtil/Makefile      13 Sep 2008 04:32:30 -0000      1.2
+++ libXprintUtil/Makefile      4 Nov 2008 22:02:28 -0000
@@ -13,6 +13,9 @@
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/XprintUtil
 
+LIBDPLIBS=     Xp      ${.CURDIR}/../libXp \
+               X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXres/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXres/Makefile,v
retrieving revision 1.6
diff -b -u -r1.6 Makefile
--- libXres/Makefile    4 Oct 2008 21:59:49 -0000       1.6
+++ libXres/Makefile    4 Nov 2008 22:02:28 -0000
@@ -20,6 +20,9 @@
        XRes.3 XResQueryClientResources.3 \
        XRes.3 XResQueryClientPixmapBytes.3
 
+LIBDPLIBS=     Xext    ${.CURDIR}/../libXext \
+               X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       Xres
 
 .include <bsd.x11.mk>
Index: libXvMC/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXvMC/Makefile,v
retrieving revision 1.2
diff -b -u -r1.2 Makefile
--- libXvMC/Makefile    13 Sep 2008 04:32:31 -0000      1.2
+++ libXvMC/Makefile    4 Nov 2008 22:02:28 -0000
@@ -13,6 +13,9 @@
 
 CPPFLAGS+=     ${X11FLAGS.THREADLIB}
 
+LIBDPLIBS=     Xext    ${.CURDIR}/../libXext \
+               X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXxf86dga/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXxf86dga/Makefile,v
retrieving revision 1.2
diff -b -u -r1.2 Makefile
--- libXxf86dga/Makefile        13 Sep 2008 04:32:31 -0000      1.2
+++ libXxf86dga/Makefile        4 Nov 2008 22:02:28 -0000
@@ -35,6 +35,9 @@
 # XXX
 CPPFLAGS.XF86DGA2.c=   -Wno-error
 
+LIBDPLIBS=     Xext    ${.CURDIR}/../libXext \
+               X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXxf86misc/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXxf86misc/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- libXxf86misc/Makefile       4 Oct 2008 18:32:25 -0000       1.3
+++ libXxf86misc/Makefile       4 Nov 2008 22:02:28 -0000
@@ -17,6 +17,9 @@
        XF86Misc.3 XF86MiscSetMouseSettings.3 \
        XF86Misc.3 XF86MiscSetSaver.3
 
+LIBDPLIBS=     Xext    ${.CURDIR}/../libXext \
+               X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: libXxf86vm/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXxf86vm/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- libXxf86vm/Makefile 13 Sep 2008 04:32:31 -0000      1.3
+++ libXxf86vm/Makefile 4 Nov 2008 22:02:28 -0000
@@ -30,6 +30,9 @@
        XF86VM.3 XF86VidModeGetGammaRampSize.3 \
        XF86VM.3 XF86VidModeGetPermissions.3
 
+LIBDPLIBS=     Xext    ${.CURDIR}/../libXext \
+               X11     ${.CURDIR}/../libX11/dynamic
+
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
Index: liblbxutil/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/liblbxutil/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- liblbxutil/Makefile 13 Sep 2008 04:32:31 -0000      1.3
+++ liblbxutil/Makefile 4 Nov 2008 22:02:29 -0000
@@ -22,7 +22,8 @@
 
 CPPFLAGS+=     ${X11FLAGS.THREADLIB} -I.
 
-LIBDPLIBS=z ${.CURDIR}/../../../../../lib/libz
+LIBDPLIBS=     z ${.CURDIR}/../../../../../lib/libz \
+               Xdmcp ${.CURDIR}/../libXdmcp
 
 PKGCONFIG=     lbxutil
 
Index: libxkbfile/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libxkbfile/Makefile,v
retrieving revision 1.2
diff -b -u -r1.2 Makefile
--- libxkbfile/Makefile 13 Sep 2008 04:32:31 -0000      1.2
+++ libxkbfile/Makefile 4 Nov 2008 22:02:29 -0000
@@ -17,6 +17,8 @@
 INCS=  XKBbells.h XKBconfig.h XKBfile.h XKBrules.h XKM.h XKMformat.h
 INCSDIR=${X11INCDIR}/X11/extensions
 
+LIBDPLIBS=     X11     ${.CURDIR}/../libX11/dynamic
+
 PKGCONFIG=     xkbfile
 
 .include <bsd.x11.mk>
Index: libxkbui/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libxkbui/Makefile,v
retrieving revision 1.2
diff -b -u -r1.2 Makefile
--- libxkbui/Makefile   13 Sep 2008 04:32:31 -0000      1.2
+++ libxkbui/Makefile   4 Nov 2008 22:02:29 -0000
@@ -13,6 +13,10 @@
 
 CPPFLAGS+=-I${DESTDIR}${X11INCDIR}/X11/extensions
 
+LIBDPLIBS=     X11     ${.CURDIR}/../libX11/dynamic \
+               xkbfile ${.CURDIR}/../libxkbfile \
+               m       ${.CURDIR}/../../../../../lib/libm
+
 PKGCONFIG=     xkbui
 
 .include <bsd.x11.mk>
Index: pixman/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/pixman/Makefile,v
retrieving revision 1.6
diff -b -u -r1.6 Makefile
--- pixman/Makefile     30 Oct 2008 08:16:20 -0000      1.6
+++ pixman/Makefile     4 Nov 2008 22:02:29 -0000
@@ -39,6 +39,8 @@
                -I${X11SRCDIR.pixman}/../combine \
                -I${X11SRCDIR.pixman}/pixman
 
+LIBDPLIBS=     m       ${.CURDIR}/../../../../../lib/libm
+
 PKGCONFIG=     pixman-1
 PKGDIST=       pixman
 


Home | Main Index | Thread Index | Old Index