Date: Sat, 02 Feb 2013 15:48:28 +0100 From: Niclas Zeising <zeising@freebsd.org> To: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> Cc: freebsd-x11@freebsd.org, barbara.freebsd@gmail.com, bug-followup@freebsd.org Subject: Re: ports/175776: patching x11-servers/xorg-server fails Message-ID: <510D273C.9070907@freebsd.org> In-Reply-To: <201302021252.AA00132@h115.65.228.10.32118.vlan.kuins.net> References: <510D0463.9030004@freebsd.org> <201302021252.AA00132@h115.65.228.10.32118.vlan.kuins.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enigC511B675071BD8BE0ED8CD37
Content-Type: multipart/mixed;
boundary="------------050400080508010109070003"
This is a multi-part message in MIME format.
--------------050400080508010109070003
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
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.
> All the Xorg related ports are installed after setting "WITH_NEW_XORG=3D=
1".
>=20
> Niclas Zeising <zeising@freebsd.org> wrote:
>=20
>> 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 p=
ointed.
>>> I think only "files/extra-new-arch-i386" is used with "WITH_NEW_XORG=3D=
1".
>>> The file "hw/xfree86/common/compiler.h" made by "make extract" differ=
s 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 freeb=
sd
>> versions of i386 both with old and new xorg during the night without
>> problems.
>> Regards!
>> --=20
>> 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
Niclas Zeising
--------------050400080508010109070003
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-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
--------------050400080508010109070003--
--------------enigC511B675071BD8BE0ED8CD37
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)
iQIcBAEBCgAGBQJRDSdjAAoJELuNS1e7i1VRRToP/0Y1Xxi/Fw1HfeLECFActPyn
c+JOctY+gMBNy3UB2PMRORsnY5rqKsFlHsH1wS4rEdjaXcdksbwgWg0u36EKlk6x
u9L5z+FFegMpYFy1uFYJ1mNn5Dz1LiZcOLhrQ8FZ470JIv2n+zy2dbZFjUWB4dnt
iOKIJoWllsBhq7tLmzHfgJP0ad7L/wTkTSWrSN5emHX5l5zsDPw1XXHf5XYnodP+
plykyJI9KLtpvH4Jtg6HhdW/DailGq4O9yJXToWzmv5Jm3tOLF79wRAqCyUh8AWT
WWNTNh0WjSRT2SUatD3CF7DIQ07WDsyTRNMTFuuAxkoXGMUNXGVirjkgq08qCDW3
Px8jDjN9qG3JVqOCJey9p/M0HBjNyH9XgQdAv5F7O1MVBJhRGTZUwduT0ecF76Ir
Y8EskO9ng+kzkYy0yigIgKQjNbGmKF1j0r34Rdvqqkx3peJUrNbcOEbNMY5lSzLz
TcpTGPog+tLgHxeV7TH1ydaFh9W6c81dgP+XDfGzP5x/8hL/C+U84ta/4TG5bO7n
5BbBsN43NxPhB/lvmHRpUqfvIeZNeWJO8ezg7Mid8i04Wx8q1hwPkHghuTMcT9Mt
2fHbgyeKKP0gXwi+jVn+n2zDMLIAtVCKMcTbirnCLCT31QpqC8as+Z9+hRikQbL1
NyPrT7/adloN6cbOkQOx
=Q7ss
-----END PGP SIGNATURE-----
--------------enigC511B675071BD8BE0ED8CD37--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?510D273C.9070907>