Bug#420403: mesa: FTBFS on hurd-i386
Samuel Thibault, le Thu 28 Jun 2007 09:40:13 +0200, a écrit : After yet more discussion on irc, we found out that the attached patch is yet better. (the good thing is that this one produces -glx packages, which have glx support without swx11, unlike the previous one). Samuel
Bug#420403: mesa: FTBFS on hurd-i386
Hi,
After yet more discussion on irc, we found out that the attached patch
is yet better.
Samuel
--- mesa-6.5.3-orig/debian/scripts/choose-configs 2007-05-30
23:31:20.000354544 +
+++ mesa-6.5.3/debian/scripts/choose-configs2007-05-30 23:39:46.000866560
+
@@ -22,10 +22,14 @@
endif
# and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
- DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-indirect-$(DEB_BUILD_ARCH)
else
+ ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ else
DRI_CONFIGS := debian-dri-any
+ endif
endif
##
--- mesa-6.5.3-orig/configs/debian-indirect-hurd-i386 1970-01-01
00:00:00.0 +
+++ mesa-6.5.3/configs/debian-indirect-hurd-i3862007-05-30
23:40:35.000147363 +
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-indirect-hurd-i386
+
+# vim: ft=make
+
--- mesa-6.5.3-orig/configs/debian-indirect-default 1970-01-01
00:00:00.0 +
+++ mesa-6.5.3/configs/debian-indirect-default 2007-05-30 23:43:02.000389834
+
@@ -0,0 +1,7 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+DRI_DIRS =
--- mesa-6.5.3-orig/debian/control 2007-05-30 23:45:29.000672311 +
+++ mesa-6.5.3/debian/control 2007-05-30 23:44:16.000620397 +
@@ -153,7 +151,7 @@
Package: libgl1-mesa-dri
Section: libs
Priority: optional
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
Suggests: libglide3
Conflicts: xlibmesa-dri ( 1:7.0.0)
@@ -174,7 +172,7 @@
Package: libgl1-mesa-dri-dbg
Section: libdevel
Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: libgl1-mesa-dri (= ${binary:Version})
Description: A free implementation of the OpenGL API -- DRI modules --
debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
Bug#420403: mesa: FTBFS on hurd-i386
Hi,
Julien Cristau, le Mon 28 May 2007 23:08:36 +0200, a écrit :
I don't really understand why the software libGL is built in a target
named *-dri-*, instead of *-indirect-*, that seems wrong... I think
I've told that to Samuel, but in any case I'll discuss it with him
again.
That was to avoid modifying scripts/choose-configs, here is a better
patch.
Samuel
--- mesa-6.5.3-orig/debian/rules2007-05-30 23:31:20.000916420 +
+++ mesa-6.5.3/debian/rules 2007-05-30 23:38:09.000754926 +
@@ -112,6 +112,7 @@
dh_builddeb -i
# Build architecture-dependent files here.
+binary-arch: DH_OPTIONS += -s
binary-arch: build install
dh_testdir
dh_testroot
--- mesa-6.5.3-orig/debian/scripts/choose-configs 2007-05-30
23:31:20.000354544 +
+++ mesa-6.5.3/debian/scripts/choose-configs2007-05-30 23:39:46.000866560
+
@@ -22,10 +22,14 @@
endif
# and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
- DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-indirect-$(DEB_BUILD_ARCH)
else
+ ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ else
DRI_CONFIGS := debian-dri-any
+ endif
endif
##
--- mesa-6.5.3-orig/configs/debian-indirect-hurd-i386 1970-01-01
00:00:00.0 +
+++ mesa-6.5.3/configs/debian-indirect-hurd-i3862007-05-30
23:40:35.000147363 +
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-indirect-hurd-i386
+
+# vim: ft=make
+
--- mesa-6.5.3-orig/configs/debian-indirect-default 1970-01-01
00:00:00.0 +
+++ mesa-6.5.3/configs/debian-indirect-default 2007-05-30 23:43:02.000389834
+
@@ -0,0 +1,9 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+SRC_DIRS = glx/x11 progs
+DRIVER_DIRS =
+DRI_DIRS =
--- mesa-6.5.3-orig/debian/control 2007-05-30 23:45:29.000672311 +
+++ mesa-6.5.3/debian/control 2007-05-30 23:44:16.000620397 +
@@ -94,7 +94,7 @@
Package: libgl1-mesa-glx
Section: libs
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}
Conflicts: libgl1, libgl1-mesa-dri ( 6.4.0)
Replaces: libgl1, libgl1-mesa-dri ( 6.4.0)
@@ -113,7 +113,7 @@
Package: libgl1-mesa-glx-dbg
Section: libdevel
Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: libgl1-mesa-glx (= ${binary:Version})
Description: A free implementation of the OpenGL API -- GLX runtime --
debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -153,7 +153,7 @@
Package: libgl1-mesa-dri
Section: libs
Priority: optional
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
Suggests: libglide3
Conflicts: xlibmesa-dri ( 1:7.0.0)
@@ -174,7 +174,7 @@
Package: libgl1-mesa-dri-dbg
Section: libdevel
Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: libgl1-mesa-dri (= ${binary:Version})
Description: A free implementation of the OpenGL API -- DRI modules --
debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
Bug#420403: mesa: FTBFS on hurd-i386
Hi, On Sun, Apr 22, 2007 at 06:04:35AM +0200, Samuel Thibault wrote: mesa currently FTBFS on hurd-i386 because it is not DRI-capable. Here is a working patch. Any reason this patch didn't get applied? Michael -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#420403: mesa: FTBFS on hurd-i386
On Mon, May 28, 2007 at 19:55:05 +0200, Michael Banck wrote: Hi, On Sun, Apr 22, 2007 at 06:04:35AM +0200, Samuel Thibault wrote: mesa currently FTBFS on hurd-i386 because it is not DRI-capable. Here is a working patch. Any reason this patch didn't get applied? I don't really understand why the software libGL is built in a target named *-dri-*, instead of *-indirect-*, that seems wrong... I think I've told that to Samuel, but in any case I'll discuss it with him again. Cheers, Julien signature.asc Description: Digital signature
Bug#420403: mesa: FTBFS on hurd-i386
Package: mesa
Version: 6.5.2-4
Severity: important
Tags: patch
Usertags: hurd
Hi,
mesa currently FTBFS on hurd-i386 because it is not DRI-capable. Here is
a working patch.
Samuel
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.18-xen
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash
--
Samuel Thibault [EMAIL PROTECTED]
No manual is ever necessary.
May I politely interject here: BULLSHIT. That's the biggest Apple lie of all!
(Discussion in comp.os.linux.misc on the intuitiveness of interfaces.)
--- mesa-6.5.2/debian/rules 2007-04-21 21:31:29.0 +
+++ mesa-6.5.2/debian/rules 2007-04-21 22:39:25.0 +
@@ -112,6 +112,7 @@
dh_builddeb -i
# Build architecture-dependent files here.
+binary-arch: DH_OPTIONS += -s
binary-arch: build install
dh_testdir
dh_testroot
--- mesa-6.5.2/configs/debian-dri-hurd-i386 1970-01-01 00:00:00.0
+
+++ mesa-6.5.2/configs/debian-dri-hurd-i386 2007-04-22 00:21:01.0
+
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-dri-hurd-i386
+
+# vim: ft=make
+
--- mesa-6.5.2/configs/debian-indirect-default 1970-01-01 00:00:00.0
+
+++ mesa-6.5.2/configs/debian-indirect-default 2007-04-22 01:10:05.0
+
@@ -0,0 +1,9 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+SRC_DIRS = glx/x11 progs
+DRIVER_DIRS =
+DRI_DIRS =
--- mesa-6.5.2/debian/control 2007-04-22 03:51:00.0 +
+++ mesa-6.5.2/debian/control 2007-04-22 03:36:37.0 +
@@ -99,7 +99,7 @@
Package: libgl1-mesa-glx
Section: libs
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}
Conflicts: libgl1, libgl1-mesa-dri ( 6.4.0)
Replaces: libgl1, libgl1-mesa-dri ( 6.4.0)
@@ -118,7 +118,7 @@
Package: libgl1-mesa-glx-dbg
Section: libdevel
Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: libgl1-mesa-glx (= ${binary:Version})
Description: A free implementation of the OpenGL API -- GLX runtime --
debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -158,7 +158,7 @@
Package: libgl1-mesa-dri
Section: libs
Priority: optional
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
Suggests: libglide3
Conflicts: xlibmesa-dri ( 1:7.0.0)
@@ -179,7 +179,7 @@
Package: libgl1-mesa-dri-dbg
Section: libdevel
Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: libgl1-mesa-dri (= ${binary:Version})
Description: A free implementation of the OpenGL API -- DRI modules --
debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
