[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian/patches (1 file)
David B Harris
dbharris-guest@quantz.debian.org
Mon, 01 Mar 2004 01:26:14 +0100
Date: Monday, March 1, 2004 @ 01:26:14
Author: dbharris-guest
Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian/patches
Modified: 10_disable_gcc_version_check2.dpatch
Try again...
--------------------------------------+
10_disable_gcc_version_check2.dpatch | 139 ---------------------------------
1 files changed, 1 insertion(+), 138 deletions(-)
Index: debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch
diff -u debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.5 debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.6
--- debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.5 Mon Mar 1 01:23:10 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch Mon Mar 1 01:26:14 2004
@@ -26,8 +26,8 @@
@DPATCH@
diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.3/configure alsa-driver-1.0.3/configure
---- /home/dbharris/source/debian/build/alsa-driver-1.0.3/configure 2004-02-29 19:22:09.000000000 -0500
-+++ alsa-driver-1.0.3/configure 2004-02-29 19:22:48.000000000 -0500
+--- /home/dbharris/source/debian/build/alsa-driver-1.0.3/configure 2004-02-29 09:28:26.000000000 -0500
++++ alsa-driver-1.0.3/configure 2004-02-29 19:26:15.000000000 -0500
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -1394,262 +1394,3 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.3/configure.in alsa-driver-1.0.3/configure.in
---- /home/dbharris/source/debian/build/alsa-driver-1.0.3/configure.in 2004-02-29 19:22:17.000000000 -0500
-+++ alsa-driver-1.0.3/configure.in 2004-02-29 19:22:44.000000000 -0500
-@@ -152,48 +152,48 @@
- AC_SUBST(kextraversion)
- AC_MSG_RESULT($kaversion)
-
--dnl Check for GCC version...
--AC_MSG_CHECKING(for GCC version)
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
--AC_CACHE_VAL(kernel_gcc,
--[AC_TRY_RUN([
--#include <stdio.h>
--#include <ctype.h>
--#include "$CONFIG_SND_KERNELDIR/include/linux/compile.h"
--int main()
--{
-- FILE *f;
-- char compiler[128];
-- char *ptr, *dptr;
--#ifdef LINUX_COMPILER
-- f=fopen("./conftestdata","w");
-- if (f) {
-- for (ptr = LINUX_COMPILER, dptr = compiler; *ptr != '\0' && *ptr != ' ' && *ptr != '\t'; ptr++, dptr++)
-- *dptr = *ptr;
-- if (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t'))
-- ptr++;
-- if (!strncmp(ptr, "version", 7))
-- ptr += 7;
-- if (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t'))
-- ptr++;
-- *dptr++ = ' ';
-- for (; *ptr != '\0' && *ptr != '\n'; ptr++, dptr++)
-- *dptr = *ptr;
-- *dptr = '\t';
-- *dptr = '\0';
-- fprintf(f,"%s\n",compiler);
-- fclose(f);
-- }
-- exit(0);
--#else
-- exit(1);
--#endif
--}],kernel_compiler=`cat conftestdata`,
--kernel_compiler="",
--kernel_compiler="")])
--CFLAGS="$ac_save_CFLAGS"
--my_compiler=`$CROSS_COMPILE$CC --version | head -n 1`
-+dnl dnl Check for GCC version...
-+dnl AC_MSG_CHECKING(for GCC version)
-+dnl ac_save_CFLAGS="$CFLAGS"
-+dnl CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
-+dnl AC_CACHE_VAL(kernel_gcc,
-+dnl [AC_TRY_RUN([
-+dnl #include <stdio.h>
-+dnl #include <ctype.h>
-+dnl #include "$CONFIG_SND_KERNELDIR/include/linux/compile.h"
-+dnl int main()
-+dnl {
-+dnl FILE *f;
-+dnl char compiler[128];
-+dnl char *ptr, *dptr;
-+dnl #ifdef LINUX_COMPILER
-+dnl f=fopen("./conftestdata","w");
-+dnl if (f) {
-+dnl for (ptr = LINUX_COMPILER, dptr = compiler; *ptr != '\0' && *ptr != ' ' && *ptr != '\t'; ptr++, dptr++)
-+dnl *dptr = *ptr;
-+dnl if (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t'))
-+dnl ptr++;
-+dnl if (!strncmp(ptr, "version", 7))
-+dnl ptr += 7;
-+dnl if (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t'))
-+dnl ptr++;
-+dnl *dptr++ = ' ';
-+dnl for (; *ptr != '\0' && *ptr != '\n'; ptr++, dptr++)
-+dnl *dptr = *ptr;
-+dnl *dptr = '\t';
-+dnl *dptr = '\0';
-+dnl fprintf(f,"%s\n",compiler);
-+dnl fclose(f);
-+dnl }
-+dnl exit(0);
-+dnl #else
-+dnl exit(1);
-+dnl #endif
-+dnl }],kernel_compiler=`cat conftestdata`,
-+dnl kernel_compiler="",
-+dnl kernel_compiler="")])
-+dnl CFLAGS="$ac_save_CFLAGS"
-+dnl my_compiler=`$CROSS_COMPILE$CC --version | head -n 1`
- dnl
- dnl Test section, uncomment any of these double lines to verify the bellow code:
- dnl
-@@ -212,85 +212,85 @@
- dnl kernel_compiler="gcc 2.95.3 20010315 (release)"
- dnl my_compiler="2.95.3"
- dnl
--
--AC_DEFUN([CHECK_COMPILER], [
-- typevar=$2
-- versionvar=$3
-- ac_compiler_type=""
-- ac_compiler_version=""
-- for i in $1; do
-- case $i in
-- gcc-[[0-9]]*|*-gcc-[[0-9]]*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=gcc
-- fi
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version=`echo $i | sed -e 's/^.*gcc-\([0-9.]\+\).*$/\1/'`
-- fi
-- ;;
-- *gcc*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=gcc
-- fi
-- ;;
-- egcs-*)
-- ac_compiler_type=egcs
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version=`echo $i | sed -e 's/egcs-\(.\+\)$/\1/'`
-- fi
-- ;;
-- *cc*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=cc
-- fi
-- ;;
-- [[0-9]].[[0-9]]*)
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version="$i"
-- fi
-- ;;
-- esac
-- done
-- eval $typevar="$ac_compiler_type"
-- eval $versionvar="$ac_compiler_version"
--])
--
--CHECK_COMPILER($kernel_compiler, kernel_compiler_type, kernel_compiler_version)
--CHECK_COMPILER($my_compiler, my_compiler_type, my_compiler_version)
--if test -z "$my_compiler_type"; then
-- my_compiler_type="gcc"
--fi
--AC_MSG_RESULT(Kernel compiler: $kernel_compiler Used compiler: $my_compiler);
--if test -z "$kernel_compiler"; then
-- echo
-- echo "*** NO PREDEFINED KERNEL COMPILER IS DETECTED"
-- echo "*** Assuming the same compiler is used with the current system compiler."
-- echo
-- echo "*** Please make sure that the same compiler version was used for building kernel."
-- echo
--else
--if test "$my_compiler_type" != "$kernel_compiler_type"; then
-- echo "Fatal error: Compiler type does not match"
-- echo "Decoded kernel compiler: type=$kernel_compiler_type version=$kernel_compiler_version"
-- echo "Decoded used compiler: type=$my_compiler_type version=$my_compiler_version"
-- echo "Please, send ./configure output to <alsa-devel@alsa-project.org>"
-- exit 1
--fi
--if test "$my_compiler_type" = "gcc" ; then
-- kernel_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-- my_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-- if test $kernel_major -eq 2 -a $my_major -eq 3 ; then
-- echo "Fatal error: Kernel is compiled with GCC 2.x and you are trying to use GCC 3.x."
-- echo " These two version of GCC are incompatible for binary code."
-- exit 1
-- fi
-- if test $kernel_major -eq 3 -a $my_major -eq 2 ; then
-- echo "Fatal error: Kernel is compiled with GCC 3.x and you are trying to use GCC 2.x."
-- echo " These two version of GCC are incompatible for binary code."
-- exit 1
-- fi
--fi
--fi
-+dnl
-+dnl AC_DEFUN([CHECK_COMPILER], [
-+dnl typevar=$2
-+dnl versionvar=$3
-+dnl ac_compiler_type=""
-+dnl ac_compiler_version=""
-+dnl for i in $1; do
-+dnl case $i in
-+dnl gcc-[[0-9]]*|*-gcc-[[0-9]]*)
-+dnl if test -z "$ac_compiler_type"; then
-+dnl ac_compiler_type=gcc
-+dnl fi
-+dnl if test -z "$ac_compiler_version"; then
-+dnl ac_compiler_version=`echo $i | sed -e 's/^.*gcc-\([0-9.]\+\).*$/\1/'`
-+dnl fi
-+dnl ;;
-+dnl *gcc*)
-+dnl if test -z "$ac_compiler_type"; then
-+dnl ac_compiler_type=gcc
-+dnl fi
-+dnl ;;
-+dnl egcs-*)
-+dnl ac_compiler_type=egcs
-+dnl if test -z "$ac_compiler_version"; then
-+dnl ac_compiler_version=`echo $i | sed -e 's/egcs-\(.\+\)$/\1/'`
-+dnl fi
-+dnl ;;
-+dnl *cc*)
-+dnl if test -z "$ac_compiler_type"; then
-+dnl ac_compiler_type=cc
-+dnl fi
-+dnl ;;
-+dnl [[0-9]].[[0-9]]*)
-+dnl if test -z "$ac_compiler_version"; then
-+dnl ac_compiler_version="$i"
-+dnl fi
-+dnl ;;
-+dnl esac
-+dnl done
-+dnl eval $typevar="$ac_compiler_type"
-+dnl eval $versionvar="$ac_compiler_version"
-+dnl ])
-+dnl
-+dnl CHECK_COMPILER($kernel_compiler, kernel_compiler_type, kernel_compiler_version)
-+dnl CHECK_COMPILER($my_compiler, my_compiler_type, my_compiler_version)
-+dnl if test -z "$my_compiler_type"; then
-+dnl my_compiler_type="gcc"
-+dnl fi
-+dnl AC_MSG_RESULT(Kernel compiler: $kernel_compiler Used compiler: $my_compiler);
-+dnl if test -z "$kernel_compiler"; then
-+dnl echo
-+dnl echo "*** NO PREDEFINED KERNEL COMPILER IS DETECTED"
-+dnl echo "*** Assuming the same compiler is used with the current system compiler."
-+dnl echo
-+dnl echo "*** Please make sure that the same compiler version was used for building kernel."
-+dnl echo
-+dnl else
-+dnl if test "$my_compiler_type" != "$kernel_compiler_type"; then
-+dnl echo "Fatal error: Compiler type does not match"
-+dnl echo "Decoded kernel compiler: type=$kernel_compiler_type version=$kernel_compiler_version"
-+dnl echo "Decoded used compiler: type=$my_compiler_type version=$my_compiler_version"
-+dnl echo "Please, send ./configure output to <alsa-devel@alsa-project.org>"
-+dnl exit 1
-+dnl fi
-+dnl if test "$my_compiler_type" = "gcc" ; then
-+dnl kernel_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-+dnl my_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-+dnl if test $kernel_major -eq 2 -a $my_major -eq 3 ; then
-+dnl echo "Fatal error: Kernel is compiled with GCC 2.x and you are trying to use GCC 3.x."
-+dnl echo " These two version of GCC are incompatible for binary code."
-+dnl exit 1
-+dnl fi
-+dnl if test $kernel_major -eq 3 -a $my_major -eq 2 ; then
-+dnl echo "Fatal error: Kernel is compiled with GCC 3.x and you are trying to use GCC 2.x."
-+dnl echo " These two version of GCC are incompatible for binary code."
-+dnl exit 1
-+dnl fi
-+dnl fi
-+dnl fi
- dnl compiler version check
-
- AC_DEFUN([CHECK_KERNEL_HEADER], [