From owner-freebsd-x11@FreeBSD.ORG Thu Dec 12 22:02:58 2013 Return-Path: Delivered-To: x11@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E8190D0A; Thu, 12 Dec 2013 22:02:57 +0000 (UTC) Received: from mail.xcllnt.net (mail.xcllnt.net [50.0.150.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6178A1D68; Thu, 12 Dec 2013 22:02:57 +0000 (UTC) Received: from [172.29.14.118] ([66.129.239.13]) (authenticated bits=0) by mail.xcllnt.net (8.14.7/8.14.7) with ESMTP id rBCM2lPs072872 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Thu, 12 Dec 2013 14:02:49 -0800 (PST) (envelope-from marcel@xcllnt.net) From: Marcel Moolenaar Content-Type: multipart/signed; boundary="Apple-Mail=_F871B4CC-5542-468F-9C69-1AD77241BFE0"; protocol="application/pgp-signature"; micalg=pgp-sha1 Subject: [ia64] graphics/dri breaks poudriere bulk Date: Thu, 12 Dec 2013 14:02:41 -0800 Message-Id: To: x11@FreeBSD.org, kwm@freebsd.org, zeising@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 7.0 \(1822\)) X-Mailer: Apple Mail (2.1822) X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2013 22:02:58 -0000 --Apple-Mail=_F871B4CC-5542-468F-9C69-1AD77241BFE0 Content-Type: multipart/mixed; boundary="Apple-Mail=_858E3D25-D5DD-40D7-B411-169D25831A48" --Apple-Mail=_858E3D25-D5DD-40D7-B411-169D25831A48 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Guys, Attached a fix for ia64 to graphics/dri to make sure DRI_DRIVERS is set. Without it poudriere terminates prematurely. It seems all drivers compile just fine and graphics/dri now installs fine as well. This is without WITH_NEW_XORG. For the WITH_NEW_XORG case, graphics/dri fails for reasons other than simple compilation problems on ia64. In fact, it looks like a generic problem. I couldn't therefore test the patch. Please commit at your earliest convenience. -- Marcel Moolenaar marcel@xcllnt.net --Apple-Mail=_858E3D25-D5DD-40D7-B411-169D25831A48 Content-Disposition: attachment; filename=mesa.diff Content-Type: application/octet-stream; x-unix-mode=0644; name="mesa.diff" Content-Transfer-Encoding: 7bit Index: dri/Makefile =================================================================== --- dri/Makefile (revision 336277) +++ dri/Makefile (working copy) @@ -31,10 +31,6 @@ . endif .endif -.if ${ARCH} == ia64 -#BROKEN= does not install on ia64 -.endif - ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST .if !defined(WITH_NEW_XORG) @@ -45,7 +41,7 @@ PLIST_SUB+= VERSION=${MESADISTVERSION} -.if ${ARCH} == amd64 || ${ARCH} == i386 +.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 DRI_DRIVERS= ${ALL_DRI_DRIVERS} .endif @@ -62,7 +58,7 @@ CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers PLIST_SUB+= GALLIUM="@comment " . endif -. if ${ARCH} == powerpc || ${ARCH} == ia64 +. if ${ARCH} == powerpc DRI_DRIVERS= RADEON SWRAST . endif . if ${ARCH} == sparc64 Index: libGL/files/patch-configure =================================================================== --- libGL/files/patch-configure (revision 336277) +++ libGL/files/patch-configure (working copy) @@ -8,7 +8,7 @@ - DRI_DIRS="i915 i965 nouveau r200 radeon swrast" - fi + case "$host_cpu" in -+ x86_64) ++ x86_64|ia64) + # i810 is missing because there is no x86-64 system where it + # could *ever* be used. + if test "x$DRI_DIRS" = "xyes"; then Index: libGL/files-old/patch-configure =================================================================== --- libGL/files-old/patch-configure (revision 336277) +++ libGL/files-old/patch-configure (working copy) @@ -1,5 +1,14 @@ ---- configure.orig 2009-12-22 03:31:30.000000000 +0100 -+++ configure 2012-06-27 19:49:26.000000000 +0200 +--- configure.orig 2013-12-12 18:52:32.304356162 +0000 ++++ configure 2013-12-12 19:50:44.434111814 +0000 +@@ -5393,7 +5393,7 @@ + ;; + *freebsd* | dragonfly*) + case "$host_cpu" in +- i*86|x86_64|powerpc*|sparc*) default_driver="dri";; ++ i*86|x86_64|ia64|powerpc*|sparc*) default_driver="dri";; + esac + ;; + esac @@ -6946,12 +6946,35 @@ CXXFLAGS="$CXXFLAGS -ansi -pedantic" fi @@ -9,7 +18,7 @@ - if test "x$DRI_DIRS" = "xyes"; then - DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ + case "$host_cpu" in -+ x86_64) ++ x86_64|ia64) + # i810 is missing because there is no x86-64 system where it + # could *ever* be used. + if test "x$DRI_DIRS" = "xyes"; then --Apple-Mail=_858E3D25-D5DD-40D7-B411-169D25831A48 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii --Apple-Mail=_858E3D25-D5DD-40D7-B411-169D25831A48-- --Apple-Mail=_F871B4CC-5542-468F-9C69-1AD77241BFE0 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org iEYEARECAAYFAlKqMoEACgkQpgWlLWHuifa2xwCePdDg1gR0jeWdqzCt50Jf9DwF ENIAnAtvWdLlUcTiHCNWVMTBEglWAaF6 =DYW4 -----END PGP SIGNATURE----- --Apple-Mail=_F871B4CC-5542-468F-9C69-1AD77241BFE0--