From owner-freebsd-current@FreeBSD.ORG Fri Oct 22 00:37:26 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C404516A4CE for ; Fri, 22 Oct 2004 00:37:26 +0000 (GMT) Received: from rproxy.gmail.com (rproxy.gmail.com [64.233.170.197]) by mx1.FreeBSD.org (Postfix) with ESMTP id 415BD43D31 for ; Fri, 22 Oct 2004 00:37:26 +0000 (GMT) (envelope-from amracks@gmail.com) Received: by rproxy.gmail.com with SMTP id 79so88194rnk for ; Thu, 21 Oct 2004 17:37:25 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:mime-version:content-type:content-transfer-encoding; b=kFTRtvCEa4ujAte5rOses1z5lk3o4Mjf7/8+R03pboR+bI16O5biZUhEgXWGhR3N3SNwhQwkcGzy+eJwI6bggFIDTt1nuqmgiWuaqvaaoiOYdgSKH8BpyKmaSXwQx08r2oDhJgZXsm2GtkbSTX8qgUTUFyvuKqi8iK/CG1Lkf0g= Received: by 10.38.74.76 with SMTP id w76mr58804rna; Thu, 21 Oct 2004 17:37:25 -0700 (PDT) Received: by 10.38.74.74 with HTTP; Thu, 21 Oct 2004 17:37:25 -0700 (PDT) Message-ID: <4415e9c104102117372ed41d27@mail.gmail.com> Date: Thu, 21 Oct 2004 17:37:25 -0700 From: Andrew Marks To: freebsd-current@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: xorg-clients broken patches on 5.3-RC1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Andrew Marks List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 00:37:26 -0000 root@CubeMonster# make patch ===> Patching for xorg-clients-6.7.0_4 ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/patch-FreeBSD.cf ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/patch-Imake.rules ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/patch-Imake.tmpl ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/patch-Library.tmpl ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/patch-X11.rules ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/patch-X11.tmpl ===> Applying FreeBSD patches for xorg-clients-6.7.0_4 Ignoring previously applied (or reversed) patch. 2 out of 2 hunks ignored--saving rejects to programs/dpsinfo/Imakefile.rej >> Patch patch-dpsinfo-Imakefile.org failed to apply cleanly. >> Patch(es) patch-dpsinfo-Imakefile applied cleanly. *** Error code 1 Stop in /usr/ports/x11/xorg-clients. root@CubeMonster# cat work/xc/programs/dpsinfo/Imakefile XCOMM $XFree86: xc/programs/dpsinfo/Imakefile,v 1.4tsi Exp $ XCOMM XTOOLLIB is currently needed by our version of DPSLIB DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XONLYLIB) SRCS = iwraps.psw dpsinfo.c OBJS = iwraps.o dpsinfo.o DERIVED_FILES = iwraps.h iwraps.c .SUFFIXES: .psw .h .psw.c : PsWrapDependency RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) .psw.h : PsWrapDependency RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) depend:: $(DERIVED_FILES) ComplexProgramTarget(dpsinfo) clean :: $(RM) $(DERIVED_FILES) root@CubeMonster# make patch ===> Patching for xorg-clients-6.7.0_4 ===> Applying extra patch /usr/ports/x11-servers/xorg-server/files/patch-FreeBSD.cf Ignoring previously applied (or reversed) patch. 6 out of 6 hunks ignored--saving rejects to config/cf/FreeBSD.cf.rej *** Error code 6 Stop in /usr/ports/x11/xorg-clients. root@CubeMonster# cat work/xc/config/cf/FreeBSD.cf.rej *************** *** 109,115 **** # endif # define HasPosixThreads YES # define ThreadedX YES - # define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE /* * FreeBSD has tread-safe api but no getpwnam_r yet. */ --- 109,115 ---- # endif # define HasPosixThreads YES # define ThreadedX YES + # define SystemMTDefines FreeBSDPTHREAD_CFLAGS /* * FreeBSD has tread-safe api but no getpwnam_r yet. */ *************** *** 119,127 **** # else # define MTSafeAPIDefines -DXUSE_MTSAFE_API # endif - # if HasLibPthread - # define ThreadsLibraries -lpthread - # else # if OSRelVersion >= 500043 # define BuildThreadStubLibrary NO # define NeedUIThrStubs NO --- 119,126 ---- # else # define MTSafeAPIDefines -DXUSE_MTSAFE_API # endif + # define ThreadsLibraries FreeBSDPTHREAD_LIBS + # if !HasLibPthread # if OSRelVersion >= 500043 # define BuildThreadStubLibrary NO*** 130,139 **** # define NeedUIThrStubs YES # endif # if (OSRelVersion >= 500016) - # define ThreadsLibraries -lc_r # define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc - # else - # define ThreadsLibraries -pthread # endif # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) --- 129,135 ---- # define NeedUIThrStubs YES # endif # if (OSRelVersion >= 500016) # define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc # endif # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) *************** *** 192,202 **** * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) - # define CcCmd $(CLIENTENVSETUP) cc - # define CplusplusCmd $(CLIENTENVSETUP) c++ #else - # define CcCmd cc - # define CplusplusCmd c++ #endif #define CppCmd /usr/bin/cpp --- 188,198 ---- * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) + # define CcCmd $(CLIENTENVSETUP) FreeBSDCC + # define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX #else + # define CcCmd FreeBSDCC + # define CplusplusCmd FreeBSDCXX #endif #define CppCmd /usr/bin/cpp *************** *** 359,365 **** #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat - # define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH) # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif --- 355,361 ---- #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat + # define LibraryRpathLoadFlags -Wl,-rpath $(USRLIBDIRPATH) # else # define LibraryRpathLoadFlags *** 452,469 **** #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif - /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ - #ifndef DefaultGcc2i386Opt - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) - #define DefaultGcc2i386Opt -O2 GccAliasingArgs - #endif - #endif - - #ifdef i386Architecture - # define OptimizedCDebugFlags DefaultGcc2i386Opt - #else - # define OptimizedCDebugFlags -O - #endif #ifndef PreIncDir # define PreIncDir /usr/include --- 450,457 ---- #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif + #define DefaultGcc2i386Opt + #define OptimizedCDebugFlags FreeBSDCFLAGS #ifndef PreIncDir # define PreIncDir /usr/include -R $(USRLIBDIRPATH) # endif *************** # define NeedUIThrStubs NO ***************