On Wed, Feb 16, 2005 at 08:29:27AM +0100, Michael Banck wrote:
> Oops, I forgot to send the MANIFEST patch along.
As well as the update for debian/xserver-xfree86.install.hurd-i386, now
that the wacom driver isn't built.
So the changes are:
* Override XInputDrivers in xc/config/cf/gnu.cf to not include the
wacom driver on hurd-i386 as the latest revision fails to build.
Update MANIFEST.hurd-i386.in and xserver-xfree86.install.hurd-i386
accordingly. Also add -D_GNU_SOURCE to the compiler flags in gnu.cf.
(Closes: #295474)
* Sync xc/config/cf/gnuLib.{tmpl,rules} with the corresponding lnxLib
files. This makes libGLU on hurd-i386 getting properly linked
against libstdc++. Also fix build issues when compiling with
GNU/Hurd pthreads.
(Closes: #295474)
I've now built the whole package successfully.
Complete patch against svn attached.
--
Michael Banck
Debian Developer
[EMAIL PROTECTED]
http://www.advogato.org/person/mbanck/diary.html
Index: xserver-xfree86.install.hurd-i386
===================================================================
--- xserver-xfree86.install.hurd-i386 (revision 2195)
+++ xserver-xfree86.install.hurd-i386 (working copy)
@@ -104,7 +104,6 @@
usr/X11R6/lib/modules/input/summa_drv.o
usr/X11R6/lib/modules/input/tek4957_drv.o
usr/X11R6/lib/modules/input/void_drv.o
-usr/X11R6/lib/modules/input/wacom_drv.o
usr/X11R6/lib/modules/libafb.a
usr/X11R6/lib/modules/libcfb.a
usr/X11R6/lib/modules/libcfb16.a
@@ -177,5 +176,4 @@
usr/X11R6/man/man4/via.4x
usr/X11R6/man/man4/vmware.4x
usr/X11R6/man/man4/void.4x
-usr/X11R6/man/man4/wacom.4x
usr/X11R6/man/man5/XF86Config-4.5x
Index: MANIFEST.hurd-i386.in
===================================================================
--- MANIFEST.hurd-i386.in (revision 2195)
+++ MANIFEST.hurd-i386.in (working copy)
@@ -440,6 +440,7 @@
usr/X11R6/bin/XFree86-debug
usr/X11R6/bin/Xmark
usr/X11R6/bin/Xnest
+usr/X11R6/bin/Xprt
usr/X11R6/bin/Xvfb
usr/X11R6/bin/appres
usr/X11R6/bin/atobm
@@ -1628,7 +1629,6 @@
usr/X11R6/lib/modules/input/summa_drv.o
usr/X11R6/lib/modules/input/tek4957_drv.o
usr/X11R6/lib/modules/input/void_drv.o
-usr/X11R6/lib/modules/input/wacom_drv.o
usr/X11R6/lib/modules/libafb.a
usr/X11R6/lib/modules/libcfb.a
usr/X11R6/lib/modules/libcfb16.a
@@ -3360,7 +3360,6 @@
usr/X11R6/man/man4/via.4x
usr/X11R6/man/man4/vmware.4x
usr/X11R6/man/man4/void.4x
-usr/X11R6/man/man4/wacom.4x
usr/X11R6/man/man5/XF86Config-4.5x
usr/X11R6/man/man7/X.7x
usr/X11R6/man/man7/X.Org.7x
Index: patches/800_gnu_config.diff
===================================================================
--- patches/800_gnu_config.diff (revision 2195)
+++ patches/800_gnu_config.diff (working copy)
@@ -1,6 +1,7 @@
$Id$
-Add Debian-specific configuration to gnu.cf (mostly derived from linux.cf).
+Add Debian-specific configuration to gnu.cf and resync it along with
+gnuLib.{tmpl,rules} (mostly derived from their Linux counterparts).
This patch by Marcus Brinkmann <[EMAIL PROTECTED]>, Robert Millan
<[EMAIL PROTECTED]>, Daniel Stone <[EMAIL PROTECTED]>,
@@ -12,9 +13,10 @@
# define HasKatmaiSupport NO
#endif
---- xc/config/cf/gnu.cf~ 2004-07-27 13:17:07.000000000 +0200
-+++ xc/config/cf/gnu.cf 2004-07-27 17:14:26.000000000 +0200
-@@ -18,6 +18,154 @@
+diff -Naur xc.orig/config/cf/gnu.cf xc/config/cf/gnu.cf
+--- xc/config/cf/gnu.cf~ 2005-02-16 01:18:29.701334208 +0100
++++ xc/config/cf/gnu.cf 2005-02-16 01:08:35.000000000 +0100
+@@ -18,9 +18,157 @@
#endif
XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@@ -168,7 +170,11 @@
+
#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
-D_POSIX_SOURCE -D_XOPEN_SOURCE \
- -D_BSD_SOURCE -D_SVID_SOURCE
+- -D_BSD_SOURCE -D_SVID_SOURCE
++ -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE
+
+ XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
+
@@ -66,6 +214,14 @@
#define HasNCurses YES
#endif
@@ -210,3 +216,160 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
#ifndef StaticLibrary
+@@ -161,6 +325,12 @@
+
+ #include <gnuLib.rules>
+
++#define XInputDrivers mouse keyboard /* acecad */ calcomp citron \
++ digitaledge dmc dynapro elographics tek4957 \
++ microtouch mutouch penmount spaceorb summa \
++ void magellan /* magictouch */ hyperpen \
++ jamstudio fpit palmax
++
+ XCOMM XXX Might need this if they are not careful with slashes.
+ XCOMM #define DirFailPrefix -
+
+diff -Naur xc.orig/config/cf/gnuLib.rules xc/config/cf/gnuLib.rules
+--- xc/config/cf/gnuLib.rules~ 2002-01-16 01:39:59.000000000 +0100
++++ xc/config/cf/gnuLib.rules 2005-02-16 01:10:34.000000000 +0100
+@@ -158,6 +158,45 @@
+
+ #endif /* SharedDepLibraryTarget */
+
++/*
++ * SharedDepCplusplusLibraryTarget - generate rules to create a shared
library.
++ */
++#ifndef SharedDepCplusplusLibraryTarget
++#ifdef UseInstalled
++#ifndef LinkBuildSonameLibrary
++#define LinkBuildSonameLibrary(lib) true
++#endif
++#else
++#ifndef LinkBuildSonameLibrary
++#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
++ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
++#endif
++#endif
++
++#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up)
@@\
++AllTarget(Concat(lib,libname.so.rev)) @@\
++ @@\
++Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
++ $(RM) [EMAIL PROTECTED]
@@\
++ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
++ (cd down; $(CXX) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
++ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
++ LinkBuildSonameLibrary($$SONAME) @@\
++ $(RM) $@ @@\
++ $(MV) [EMAIL PROTECTED] $@
@@\
++ @if $(SOSYMLINK); then (set -x; \ @@\
++ $(RM) Concat(lib,libname.so); \ @@\
++ $(LN) $@ Concat(lib,libname.so)); fi @@\
++ LinkBuildLibrary($@) @@\
++ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
++ @@\
++clean::
@@\
++ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
++ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
++ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
++#endif /* SharedDepCplusplusLibraryTarget */
++
+ #ifndef SharedDepModuleTarget
+ #define SharedDepModuleTarget(name,deps,solist)
@@\
+ AllTarget(name)
@@\
+@@ -173,6 +212,23 @@
+
+ #endif /* SharedDepModuleTarget */
+
++# ifndef SharedDriModuleTarget
++# define SharedDriModuleTarget(name,deps,solist) @@\
++AllTarget(name)
@@\
++ @@\
++name: deps @@\
++ $(RM) [EMAIL PROTECTED] [EMAIL PROTECTED]
@@\
++ @(echo 'DRI_MODULE { global: __dri*; local: *; };' > [EMAIL PROTECTED])
@@\
++ $(CC) -o [EMAIL PROTECTED] -Wl,[EMAIL PROTECTED] $(SHLIBLDFLAGS) solist
$(REQUIREDLIBS) BaseShLibReqs @@\
++ $(RM) $@ [EMAIL PROTECTED]
@@\
++ $(MV) [EMAIL PROTECTED] $@
@@\
++ @@\
++clean::
@@\
++ $(RM) name @@\
++ $(RM) name.map
++
++# endif /* SharedDriModuleTarget */
++
+ /*
+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+ */
+diff -Naur xc.orig/config/cf/gnuLib.tmpl xc/config/cf/gnuLib.tmpl
+--- xc/config/cf/gnuLib.tmpl~ 2000-11-14 19:20:31.000000000 +0100
++++ xc/config/cf/gnuLib.tmpl 2005-02-16 01:10:34.000000000 +0100
+@@ -16,15 +16,55 @@
+
+ #define CplusplusLibC
+
+-#define SharedX11Reqs
+-#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
+-#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
+-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
+-#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
+-#define SharedXiReqs $(LDPRELIB) $(XLIB)
+-#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
+-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
+-#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
+-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
++#if ThreadedX
++# ifndef SharedThreadReqs
++# define SharedThreadReqs -lpthread
++# endif
++#else
++# ifndef SharedThreadReqs
++# define SharedThreadReqs
++# endif
++#endif
++
++#define SharedX11Reqs SharedThreadReqs
++#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
++#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
SharedThreadReqs
++#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
++#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
++#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
++#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
++#define SharedXiReqs $(LDPRELIB) $(XLIB)
++#define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB)
++#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
++#define SharedXtstReqs $(LDPRELIB) $(XLIB)
++#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
++#define SharedSMReqs $(LDPRELIB) $(ICELIB)
++#define SharedGLUReqs $(LDPRELIB) $(GLXLIB)
++#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
++#define SharedXpReqs $(LDPRELIB) $(XLIB)
++#define SharedXpmReqs $(LDPRELIB) $(XONLYLIB)
++#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
++#define SharedDPSReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
++#define SharedDPSTKReqs $(LDPRELIB) $(DPSLIB) $(XLIB) MathLibrary
++#define SharedXvReqs $(LDPRELIB) $(XLIB)
++
++#if GlxUseBuiltInDRIDriver
++#define ExtraSharedGLReqs /**/
++#else
++#define ExtraSharedGLReqs -ldl
++#endif
++#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
++
++#ifndef SharedXReqs
++# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
SharedThreadReqs
++#endif
++
++#ifndef SharedXmReqs
++# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc
++#endif
++
++#ifndef SharedTtReqs
++# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) SharedThreadReqs
++#endif
++
++#define NoMessageCatalog
