[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH for 4.2.0-0pre1v1] duplicate hppa defines in linux.cf

Hi,

 I found a tiny bug in config/cf/linux.cf.
 It includes HPArchitecture related defines twice, like this:

#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
#  define OptimizedCDebugFlags  -O2
# endif
# define LinuxMachineDefines    -D__mips__
# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
#endif

#ifdef HPArchitecture
# define OptimizedCDebugFlags   -O2
# define LinuxMachineDefines    -D__hppa__
# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
#endif

#ifdef HPArchitecture
# define OptimizedCDebugFlags   -O2
# define LinuxMachineDefines    -D__hppa__
# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
#endif

#ifdef SuperHArchitecture
# ifndef SuperHArchOptFlags
#  ifdef SuperH4Architecture
(snip)


 This is caused by debian/patches/001_linux_cf.diff, perhaps last
chank of the patch is not needed.

--- xfree86-4.2.0/debian/patches/001_linux_cf.diff.orig	Wed Jul 10 15:18:20 2002
+++ xfree86-4.2.0/debian/patches/001_linux_cf.diff	Wed Jul 10 15:18:30 2002
@@ -64,17 +64,3 @@
  #endif /* Mc68020Architecture */
  
  #ifdef PpcArchitecture
-@@ -743,6 +757,13 @@
- #  define OptimizedCDebugFlags	-O2
- # endif
- # define LinuxMachineDefines	-D__mips__
-+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-+#endif
-+
-+#ifdef HPArchitecture
-+# define OptimizedCDebugFlags	-O2
-+# define LinuxMachineDefines	-D__hppa__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
- # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
- #endif

-- 
ISHIKAWA Mutsumi
 <ishikawa@linux.or.jp>, <ishikawa@debian.org>, <ishikawa@netvillage.co.jp>


-- 
To UNSUBSCRIBE, email to debian-x-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Reply to: