building x11-servers/xorg-server fails, while patching; applying files/extra-new-arch-i386 fails. this file is used only for new X server, as I guess. is it right ? Fix: here is a patch to above patch file:
Responsible Changed From-To: freebsd-ports-bugs->freebsd-x11 Over to maintainer (via the GNATS Auto Assign Tool)
Hi! I cannot reproduce this. Are you sure that your ports tree is up to date? Regards! -- Niclas Zeising
Hello, I updated my ports tree yesterday using portsnap. I also compared my tree files with files browseable at http://svnweb.freebsd.org/ports/head/x11-servers/xorg-server/ , and found no difference. The file to be patched obtained from the distfile available from http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.10.6.tar.bz2 is the same as that on my host, therefore original patch is not applicable. My /etc/make.conf contains "WITH_NEW_XORG=1". Please test again. Sincerely,
This is a multi-part message in MIME format.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 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. >> All the Xorg related ports are installed after setting >> "WITH_NEW_XORG=1". >> >> Niclas Zeising <zeising@freebsd.org> 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=1". >>>> 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. >>> Regards! -- Niclas Zeising >>> >> > > 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! > It seems that extra-arch-i386 from (1) is missing, it's not created by the patch. (1) @ line #13 of new patch +EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBAgAGBQJRDS/1AAoJECfdb9Y99fdQrfQH/RZc5WaV+tM7Cvv7eWMrrF3k hEQKpw+DN8G0p5jPzRploAnSM9o8EcWZG+Uwmk4Aabty2bEx/20s4hVfL/H+FVap hTnyTSpe0lI2sewK1ZizIMmvx5HPIIWxEcCY+69tLs4HxtMPR5IyIvfzJCCfsIcV N4dJOnusEnHPhbUlDU2cLlz1xN3rN0hSJXJUbM1uf5MmM7Q0sklg3lAODDlGCcNq hKVwqBD+9CXsv8WmSotrK0lvzd2jDwh5TVZKys9npocS+A7fbEujNU1cJl64nB4t sGCozNNvI0tBcS6su2ZV4oswWmXKqbK+2xAOZd4JrDeA8/eYCJXO4UGG5npm41Q= =7aYC -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Niclas Zeising wrote: > 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. All the Xorg related ports are installed after >>>> setting "WITH_NEW_XORG=1". >>>> >>>> Niclas Zeising <zeising@freebsd.org> 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=1". 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. Regards! -- Niclas Zeising >>>>> >>>> >> >>> 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! >> >> >> It seems that extra-arch-i386 from (1) is missing, it's not >> created by the patch. >> >> (1) @ line #13 of new patch +EXTRA_PATCHES+= >> ${FILESDIR}/extra-arch-i386 >> >> > > Here is an updated patch. Apparently, by default svn does not > include copied files in diffs, which caught me by surprise. > Regards! > This one applied successfully for me! (tested with WITH_NEW_XORG=1). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBAgAGBQJRDTXUAAoJECfdb9Y99fdQ/14IANVDgK0O85h/N+CQLg0MOfU2 0ZXQTkeKWAs48kSg02/4vmkvt3byHwAZmeUhhraPdc/hBGgEtl0/ymBsgtSu8ku9 a05+XcSb4TRajoIXx+TgHGyQWFt+OofnZ1O603aFt1DZEVWHOCwS2M3BZJ0DzFUs nRl4t/pVNcXKfak1cCtmAs0IICSCku1w1g3ds4/C+n1gdvh44PspsaREYydHzV/U 7TxqpiFS7m/EKtYPjSsee3fLuv3qHnZiOpsy+QMiIk9XbXXJJ6wJRMOIpY0/sXXE K+Yslw9DGafYqGR7UqRHC/mLqcfZU+5HEFDofIfSfvcFQ90anP+tvi04lrg25ok= =oc3I -----END PGP SIGNATURE-----
Author: zeising Date: Sat Feb 2 21:45:42 2013 New Revision: 311444 URL: http://svnweb.freebsd.org/changeset/ports/311444 Log: Fix the patch used to make xorg-server build with clang on i386. Noticed by: Barbara Guida <barbara.freebsd@gmail.com> PR: ports/175776 [1] Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> [1] Approved by: kwm, miwi (mentors, implicit) Added: head/x11-servers/xorg-server/files/extra-arch-i386 - copied unchanged from r311425, head/x11-servers/xorg-server/files/extra-old-arch-i386 Deleted: head/x11-servers/xorg-server/files/extra-new-arch-i386 head/x11-servers/xorg-server/files/extra-old-arch-i386 Modified: head/x11-servers/xorg-server/Makefile Modified: head/x11-servers/xorg-server/Makefile ============================================================================== --- head/x11-servers/xorg-server/Makefile Sat Feb 2 20:35:48 2013 (r311443) +++ head/x11-servers/xorg-server/Makefile Sat Feb 2 21:45:42 2013 (r311444) @@ -114,11 +114,7 @@ CONFIGURE_ARGS+=--enable-install-setuid= .endif .if ${ARCH} == i386 -.if defined(WITH_NEW_XORG) -EXTRA_PATCHES+= ${FILESDIR}/extra-new-arch-i386 -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-old-arch-i386 -.endif +EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386 .endif .if ${ARCH} == ia64 Copied: head/x11-servers/xorg-server/files/extra-arch-i386 (from r311425, head/x11-servers/xorg-server/files/extra-old-arch-i386) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/extra-arch-i386 Sat Feb 2 21:45:42 2013 (r311444, copy of r311425, head/x11-servers/xorg-server/files/extra-old-arch-i386) @@ -0,0 +1,11 @@ +--- hw/xfree86/common/compiler.h.orig 2010-05-04 02:47:58.000000000 +0200 ++++ hw/xfree86/common/compiler.h 2013-01-18 13:07:35.785442739 +0100 +@@ -1021,7 +1021,7 @@ + + # 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__) + + /* + * If gcc uses gas rather than the native assembler, the syntax of these _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Fixed. Thank you for reporting and sorry for the breakage.