From owner-freebsd-x11@FreeBSD.ORG Sat Feb 2 15:40:20 2013 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0AE00A8A; Sat, 2 Feb 2013 15:40:20 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.lysator.liu.se (mail.lysator.liu.se [IPv6:2001:6b0:17:f0a0::3]) by mx1.freebsd.org (Postfix) with ESMTP id 8F75C885; Sat, 2 Feb 2013 15:40:19 +0000 (UTC) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id BCA4D40002; Sat, 2 Feb 2013 16:40:18 +0100 (CET) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id AF7F240003; Sat, 2 Feb 2013 16:40:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=AWL autolearn=disabled version=3.3.1 X-Spam-Score: 0.0 Received: from mx.daemonic.se (h-45-105.a163.priv.bahnhof.se [94.254.45.105]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id 620D040002; Sat, 2 Feb 2013 16:40:17 +0100 (CET) Received: from mailscanner.daemonic.se (mailscanner.daemonic.se [IPv6:2001:470:dca9:0:1::6]) by mx.daemonic.se (Postfix) with ESMTPS id 3YyzsF1Zjrz8hVn; Sat, 2 Feb 2013 16:40:17 +0100 (CET) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mx.daemonic.se ([10.1.0.3]) (using TLS with cipher CAMELLIA256-SHA) by mailscanner.daemonic.se (mailscanner.daemonic.se [10.1.0.6]) (amavisd-new, port 10025) with ESMTPS id RR6k7cfa_ZNC; Sat, 2 Feb 2013 16:40:14 +0100 (CET) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4]) by mx.daemonic.se (Postfix) with ESMTPS id 3YyzsB2VsRz8hVm; Sat, 2 Feb 2013 16:40:14 +0100 (CET) Received: from vivi.daemonic.se (vivi.daemonic.se [IPv6:2001:470:dca9:1::4]) by mail.daemonic.se (Postfix) with ESMTPSA id 3Yyzs96sCcz9Ctj; Sat, 2 Feb 2013 16:40:13 +0100 (CET) Message-ID: <510D3348.8030001@freebsd.org> Date: Sat, 02 Feb 2013 16:39:52 +0100 From: Niclas Zeising User-Agent: Mutt/1.5.21 MIME-Version: 1.0 To: Barbara Guida Subject: Re: ports/175776: patching x11-servers/xorg-server fails References: <510D0463.9030004@freebsd.org> <201302021252.AA00132@h115.65.228.10.32118.vlan.kuins.net> <510D273C.9070907@freebsd.org> <510D2FF5.9080302@gmail.com> In-Reply-To: <510D2FF5.9080302@gmail.com> X-Enigmail-Version: 1.4.6 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig5F5FA12012BCE5712C9F8A17" X-Virus-Scanned: ClamAV using ClamSMTP Cc: Tsurutani Naoki , freebsd-x11@freebsd.org, bug-followup@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 15:40:20 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig5F5FA12012BCE5712C9F8A17 Content-Type: multipart/mixed; boundary="------------030801040007010906040409" This is a multi-part message in MIME format. --------------030801040007010906040409 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 02/02/13 16:25, Barbara Guida wrote: > Niclas Zeising wrote: >> On 02/02/13 13:52, Tsurutani Naoki wrote: >>> xorg-server-1.10.6_2,1 xorg-vfbserver-1.10.6_1,1 are installed.=20 >>> All the Xorg related ports are installed after setting >>> "WITH_NEW_XORG=3D1". >>> >>> Niclas Zeising wrote: >>> >>>> On 02/02/13 13:09, Tsurutani Naoki wrote: >>>>> Thank you for your reply. >>>>> >>>>> Both files on my host are just same with that on SVN >>>>> repository you pointed. I think only >>>>> "files/extra-new-arch-i386" is used with "WITH_NEW_XORG=3D1".=20 >>>>> The file "hw/xfree86/common/compiler.h" made by "make >>>>> extract" differs from the one expeced by the patch file (see >>>>> line 1335 and 1371). Is there anything wrong on my host or on >>>>> my thought ? >>>>> >>>> >>>> Only extra-new-arch-i386 is used when compiling with >>>> WITH_NEW_XORG. Both patches fixes the same issue, but in >>>> different versions of xorg-server, the old and the new. Which >>>> version of xorg-server are getting built? Is it the correct >>>> one? As I previously said, I can't reproduce this issue, and >>>> I've been running builds for different freebsd versions of i386 >>>> both with old and new xorg during the night without problems.=20 >>>> Regards! -- Niclas Zeising >>>> >>> >=20 >> Hi! I finally managed to reproduce this, and a patch is in the >> works. Can you please try the attached patch? Remember to apply >> it with patch -E to remove empty files. Regards! >=20 >=20 > It seems that extra-arch-i386 from (1) is missing, it's not created by > the patch. >=20 > (1) @ line #13 of new patch > +EXTRA_PATCHES+=3D ${FILESDIR}/extra-arch-i386 >=20 >=20 Here is an updated patch. Apparently, by default svn does not include copied files in diffs, which caught me by surprise. Regards! --=20 Niclas Zeising --------------030801040007010906040409 Content-Type: text/x-patch; name="ports.xorg-server.clangfix.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ports.xorg-server.clangfix.diff" Index: x11-servers/xorg-server/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/Makefile (revision 311425) +++ x11-servers/xorg-server/Makefile (working copy) @@ -114,12 +114,8 @@ .endif =20 .if ${ARCH} =3D=3D i386 -.if defined(WITH_NEW_XORG) -EXTRA_PATCHES+=3D ${FILESDIR}/extra-new-arch-i386 -.else -EXTRA_PATCHES+=3D ${FILESDIR}/extra-old-arch-i386 +EXTRA_PATCHES+=3D ${FILESDIR}/extra-arch-i386 .endif -.endif =20 .if ${ARCH} =3D=3D ia64 PLIST_SUB+=3D IA64_NA=3D"@comment " Index: x11-servers/xorg-server/files/extra-arch-i386 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-arch-i386 (revision 0) +++ x11-servers/xorg-server/files/extra-arch-i386 (working copy) @@ -0,0 +1,11 @@ +--- hw/xfree86/common/compiler.h.orig 2010-05-04 02:47:58.000000000 +020= 0 ++++ hw/xfree86/common/compiler.h 2013-01-18 13:07:35.785442739 +0100 +@@ -1021,7 +1021,7 @@ +=20 + # if !defined(__SUNPRO_C) + # if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) = && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defin= ed(__m32r__) +-# ifdef GCCUSESGAS ++# if defined(GCCUSESGAS) || defined(__clang__) +=20 + /* + * If gcc uses gas rather than the native assembler, the syntax of thes= e Property changes on: x11-servers/xorg-server/files/extra-arch-i386 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-servers/xorg-server/files/extra-new-arch-i386 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-new-arch-i386 (revision 311425) +++ x11-servers/xorg-server/files/extra-new-arch-i386 (working copy) @@ -1,11 +0,0 @@ ---- hw/xfree86/common/compiler.h.orig 2012-05-17 19:09:03.000000000 +020= 0 -+++ hw/xfree86/common/compiler.h 2013-01-18 13:59:18.366436857 +0100 -@@ -1335,7 +1335,7 @@ -=20 - #if !defined(__SUNPRO_C) - #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && != defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(_= _m32r__) --#ifdef GCCUSESGAS -+#if defined(GCCUSESGAS) || defined(__clang__) -=20 - /* - * If gcc uses gas rather than the native assembler, the syntax of thes= e Index: x11-servers/xorg-server/files/extra-old-arch-i386 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- x11-servers/xorg-server/files/extra-old-arch-i386 (revision 311425) +++ x11-servers/xorg-server/files/extra-old-arch-i386 (working copy) @@ -1,11 +0,0 @@ ---- hw/xfree86/common/compiler.h.orig 2010-05-04 02:47:58.000000000 +020= 0 -+++ hw/xfree86/common/compiler.h 2013-01-18 13:07:35.785442739 +0100 -@@ -1021,7 +1021,7 @@ -=20 - # if !defined(__SUNPRO_C) - # if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) = && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defin= ed(__m32r__) --# ifdef GCCUSESGAS -+# if defined(GCCUSESGAS) || defined(__clang__) -=20 - /* - * If gcc uses gas rather than the native assembler, the syntax of thes= e --------------030801040007010906040409-- --------------enig5F5FA12012BCE5712C9F8A17 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQIcBAEBCgAGBQJRDTNdAAoJELuNS1e7i1VRyBMP/jMckh1odYAwgHFaCJs6EDdI OZX+enN1fCUSWKRo9eAICqU1rORpAeSEwAqviOLUlsCTVvMqfIUdhRh8ZnuRMHHU xgfilAC9nu4/OjQh9YinbGHj5cbLOO+64oTJaQ1Fo6DdaP1f7jbnnZMqJq/p4qU3 sgvla+YpLLMXqg72wyfNQmRaXWbDl0fWNFZdw2WjXJtZ8+CvFmxh6hBRaQlW1iy1 bjtZV8KpC3PrxGYLMO9Q17Rzsvr9lGznGpOOGSEbP1pjENGgdbpUWoDFDZivpNYz jcY0Ohb/3i9360zA/rh/537nJK26usZfT9dQfJgJMTTghVB54if6VZEuBVzm6ZA7 jMXhmAHugBglr/EYWlAXzPk1Y4jKkzD8WwFYHb1iMaYZZEhhjNXkRqaXMWs9WCho +whVT/YbzQR1pGbJ3f1iBJh0738KXIdqkbQjht+CYU5ssAQUEfe0mAlTB9e++L9C VwTRzWx8bNxdE11PB9EMrfhgL3nyosts9tg7AnCS3cWAZey1zhGXZYpjqW0EfQdN mJ2w5X6nIHdW9yhDbO21DkiGx6ZSPHlxp7FfZcQclFbQ5N6H3yxUA4zHgb37I873 z+LCWlB8V2m/ozoneNI9PAxtlJ4UuNEUR8Rjc1zlFNPg2VOwsm9Vwb9CteA9YK/A Djgc8/X+wfDI/2kRCeHd =SOxK -----END PGP SIGNATURE----- --------------enig5F5FA12012BCE5712C9F8A17--