Date: Sun, 24 Nov 2002 01:54:32 +0100 (CET) From: Stefan Farfeleder <e0026813@stud3.tuwien.ac.at> To: FreeBSD-gnats-submit@FreeBSD.org Cc: e0026813@stud3.tuwien.ac.at Subject: ports/45658: [PATCH] Fix graphics/dri-devel after removal of libXThrStub on -current Message-ID: <20021124005432.D8C46575@frog.fafoe>
next in thread | raw e-mail | index | archive | help
>Number: 45658 >Category: ports >Synopsis: [PATCH] Fix graphics/dri-devel after removal of libXThrStub on -current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Nov 23 17:00:02 PST 2002 >Closed-Date: >Last-Modified: >Originator: Stefan Farfeleder >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD frog.fafoe 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Fri Nov 22 17:42:48 CET 2002 freebsd@frog.fafoe:/freebsd/current/obj/freebsd/current/src/sys/FROG i386 >Description: On 2002-11-01, anholt@ disabled building of libXThrStub in x11/XFree86-4-libraries by patching config/cf/FreeBSD.cf. This patch synchronises the FreeBSD.cf in dri-devel with the one from X. Otherwise it tries to link against libXThrStub.so which isn't built anymore as shown below. >How-To-Repeat: portupgrade dri-devel: <...> making all in lib/GL/GL... rm -f libGL.so.1.2~ + cd . + cc -o ./libGL.so.1.2~ -shared -rpath /usr/X11R6/lib -Wl,-soname,libGL.so.1 ../../../lib/GL/glx/clientattrib.o ../../../lib/GL/glx/compsize.o ../../../lib/GL/glx/dispatch.o ../../../lib/GL/glx/eval.o ../../../lib/GL/glx/g_render.o ../../../lib/GL/glx/g_single.o ../../../lib/GL/glx/g_vendpriv.o ../../../lib/GL/glx/glapi.o ../../../lib/GL/glx/glapi_x86.o ../../../lib/GL/glx/glthread.o ../../../lib/GL/glx/glxcmds.o ../../../lib/GL/glx/glxext.o ../../../lib/GL/glx/indirect_init.o ../../../lib/GL/glx/pixel.o ../../../lib/GL/glx/pixelstore.o ../../../lib/GL/glx/render2.o ../../../lib/GL/glx/renderpix.o ../../../lib/GL/glx/single2.o ../../../lib/GL/glx/singlepix.o ../../../lib/GL/glx/vertarr.o ../../../lib/GL/glx/xfont.o ../../../lib/GL/dri/XF86dri.o ../../../lib/GL/dri/dri_glx.o -L../../../exports/lib -L/usr/X11R6/lib -lXThrStub /usr/bin/ld: cannot find -lXThrStub *** Error code 1 >Fix: Taken from ports/x11/XFree86-4-libraries/files/patch-d: --- dri-devel.diff begins here --- Index: files/patch-FreeBSD.cf =================================================================== RCS file: /usr/home/ncvs/ports/graphics/dri-devel/files/patch-FreeBSD.cf,v retrieving revision 1.1 diff -u -r1.1 patch-FreeBSD.cf --- files/patch-FreeBSD.cf 1 Sep 2002 18:58:12 -0000 1.1 +++ files/patch-FreeBSD.cf 23 Nov 2002 20:19:52 -0000 @@ -1,11 +1,29 @@ -Index: config/cf/FreeBSD.cf -=================================================================== -RCS file: /cvsroot/dri/xc/xc/config/cf/FreeBSD.cf,v -retrieving revision 1.15.24.1 -diff -u -r1.15.24.1 FreeBSD.cf ---- config/cf/FreeBSD.cf 15 Jul 2002 20:20:54 -0000 1.15.24.1 -+++ config/cf/FreeBSD.cf 23 Aug 2002 22:44:33 -0000 -@@ -144,6 +144,7 @@ +--- config/cf/FreeBSD.cf.orig Tue Aug 27 04:58:16 2002 ++++ config/cf/FreeBSD.cf Sat Nov 23 21:18:18 2002 +@@ -89,10 +89,18 @@ + # if HasLibPthread + # define ThreadsLibraries -lpthread + # else +-# define BuildThreadStubLibrary YES +-# define NeedUIThrStubs YES +-# define ThreadsCompileFlags -pthread +-# define ThreadsLibraries -pthread ++# if OSRelVersion >= 500043 ++# define BuildThreadStubLibrary NO ++# define NeedUIThrStubs NO ++# else ++# define BuildThreadStubLibrary YES ++# define NeedUIThrStubs YES ++# endif ++# if (OSRelVersion >= 500016) ++# define ThreadsLibraries -lc_r ++# else ++# define ThreadsLibraries -pthread ++# endif + # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) + # define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) + # endif +@@ -144,6 +152,7 @@ * * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ @@ -13,7 +31,7 @@ #if BuildThreadStubLibrary && !UseInstalled # define CcCmd $(CLIENTENVSETUP) cc # define CplusplusCmd $(CLIENTENVSETUP) c++ -@@ -151,6 +152,9 @@ +@@ -151,6 +160,9 @@ # define CcCmd cc # define CplusplusCmd c++ #endif --- dri-devel.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021124005432.D8C46575>