Control: tag -1 patch

> Then those two changes can be turned into a patch that can be
> installed at debian/patches/140-arm64.dpatch

Perhaps they can, but I can't now see how to do it. I don't understand
the package's patch management system.

However, the changes described above belong quite logically together
with the other changes in
debian/patches/304-update-Imake-config-files.dpatch so the easy thing
to do is to modify that file, as done by the attached patch.
--- cernlib-20061220+dfsg3.orig/debian/patches/304-update-Imake-config-files.dpatch
+++ cernlib-20061220+dfsg3/debian/patches/304-update-Imake-config-files.dpatch
@@ -941,7 +941,7 @@
  #endif /* DGUX */
  
  #ifdef __convex__
-@@ -366,101 +735,446 @@
+@@ -366,101 +735,452 @@
  # define ConvexArchitecture
  #endif /* _convex_ */
  
@@ -1272,6 +1272,12 @@
 +#   define AMD64Architecture
 +#  endif
 +# endif
++# if defined(__aarch64__)
++#  undef __aarch64__
++#  ifndef ARM64Architecture
++#   define ARM64Architecture
++#  endif
++# endif
 +#endif /* linux || __GLIBC__ */
 +
 +#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
@@ -1495,7 +1501,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -97,38 +97,308 @@
+@@ -97,38 +97,320 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1800,6 +1806,18 @@
 +# define CERNLIB_QMLXIA64
 +#endif /* AMD64Architecture */
 +
++#ifdef ARM64Architecture
++# ifndef OptimizationLevel
++#  define OptimizationLevel	-O3
++# endif
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags  OptimizationLevel
++# endif
++# define LinuxMachineDefines    -D__aarch64__
++# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
++# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* ARM64Architecture */
++
 +#ifndef StandardDefines
 +# define StandardDefines        -Dlinux LinuxMachineDefines LinuxSourceDefines
 +#endif

Reply via email to