Bug#1077076: xutils-dev: Add hurd-amd64 definitions
Samuel Thibault, le jeu. 25 juil. 2024 22:54:35 +0200, a ecrit:
> gnu.cf is missing the definitions for hurd-amd64, could you apply the
> attached patch to update it?
Sorry, some part was missing, please use this patch instead.
Samuel
--- debian/patches/04_xutils-dev-debian.diff.orig 2023-08-08 13:36:41.000000000 +0200
+++ debian/patches/04_xutils-dev-debian.diff 2024-07-25 23:03:11.749759074 +0200
@@ -497,23 +501,27 @@
#define YaccCmd bison -y
#define LexCmd flex -l
#define HasFlex YES
-@@ -125,50 +469,68 @@
+@@ -125,50 +469,77 @@ XCOMM Not implemented and will always fa
#define StandardCppDefines StandardDefines
#define HasVarRun YES
+#ifndef VarDbDirectory
#define VarDbDirectory $(VARDIR)/lib
+#endif
-+
+
+-XCOMM i386Architecture
+-#define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#define GNUMachineDefines -D__i386__
+-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+-#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+-#define HasPlugin YES
+-#define VendorHasX11R6_3libXext YES
+#ifndef OSXInputDrivers
+# define OSXInputDrivers1 /**/
+# define OSXInputDrivers2 /**/
+# define OSXInputDrivers OSXInputDrivers1 OSXInputDrivers2
+#endif
-
--XCOMM i386Architecture
--#define OptimizedCDebugFlags DefaultGcc2i386Opt
--#define GNUMachineDefines -D__i386__
++
+#define HasPlugin YES
+#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
+
@@ -522,11 +530,18 @@
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+# endif
+# define GnuMachineDefines -D__i386__
- #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
- #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
--#define HasPlugin YES
--#define VendorHasX11R6_3libXext YES
++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+#endif /* i386Architecture */
++
++#ifdef AMD64Architecture
++# ifndef OptimizedCDebugFlags
++# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
++# endif
++# define GnuMachineDefines -D__amd64__
++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* AMD64Architecture */
#ifndef StandardDefines
-#define StandardDefines GNUMachineDefines GNUSourceDefines
@@ -2652,3 +2691,19 @@
# endif
#endif
+Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/Imake.cf
+===================================================================
+--- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/Imake.cf
++++ xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/Imake.cf
+@@ -1122,7 +1122,10 @@ XCOMM Keep cpp from replacing path eleme
+ #define MacroIncludeFile <gnu.cf>
+ #define MacroFile gnu.cf
+ #ifdef __i386__
+-#define i386Architecture
++# define i386Architecture
++#endif
++#if defined(__amd64__) || defined(__x86_64__)
++# define AMD64Architecture
+ #endif
+ #endif
+
Reply to: