From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: Trying to get alsa-driver to build on a 2.6.x kernel. Date: Fri, 30 Jan 2004 12:05:30 +0100 Sender: alsa-devel-admin@lists.sourceforge.net Message-ID: References: <401963AC.8080603@superbug.demon.co.uk> Mime-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: multipart/mixed; boundary="Multipart_Fri_Jan_30_12:05:30_2004-1" Return-path: In-Reply-To: <401963AC.8080603@superbug.demon.co.uk> Errors-To: alsa-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , List-Archive: To: James Courtier-Dutton Cc: alsa-devel List-Id: alsa-devel@alsa-project.org --Multipart_Fri_Jan_30_12:05:30_2004-1 Content-Type: text/plain; charset=US-ASCII At Thu, 29 Jan 2004 19:49:00 +0000, James Courtier-Dutton wrote: > > [1 ] > I have been told that one should be able to build alsa-driver on a 2.6.x > kernel, but it fails here. > > I attach config.log for your information. > I also attach the console output from running > ./configure --with-cards=emu10k1,intel8x0,usb-audio > > Can anyone help? how about the patch below? Takashi --Multipart_Fri_Jan_30_12:05:30_2004-1 Content-Type: application/octet-stream Content-Disposition: attachment; filename="build-2.6-fix.dif" Content-Transfer-Encoding: 7bit Index: alsa-driver/Makefile.conf.in =================================================================== RCS file: /suse/tiwai/cvs/alsa/alsa-driver/Makefile.conf.in,v retrieving revision 1.39 diff -u -r1.39 Makefile.conf.in --- alsa-driver/Makefile.conf.in 29 Jan 2004 10:49:23 -0000 1.39 +++ alsa-driver/Makefile.conf.in 30 Jan 2004 11:00:26 -0000 @@ -79,7 +79,7 @@ CONFIG_VIDEO_DEV = @CONFIG_VIDEO_DEV@ ifndef NEW_KBUILD -INCLUDE = -I$(TOPDIR)/include @EXTRA_INCLUDES@ -I$(CONFIG_SND_KERNELDIR)/include +INCLUDE = -I$(TOPDIR)/include @EXTRA_INCLUDES@ @KERNEL_INC@ CFLAGS = $(MODFLAGS) $(INCLUDE) $(c_opts) -Wall -Wstrict-prototypes \ -fomit-frame-pointer -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common \ -pipe -DALSA_BUILD -nostdinc -iwithprefix include Index: alsa-driver/configure.in =================================================================== RCS file: /suse/tiwai/cvs/alsa/alsa-driver/configure.in,v retrieving revision 1.156 diff -u -r1.156 configure.in --- alsa-driver/configure.in 29 Jan 2004 10:49:23 -0000 1.156 +++ alsa-driver/configure.in 30 Jan 2004 11:02:11 -0000 @@ -86,8 +86,9 @@ EOF exit 1 fi +KERNEL_INC="-I$CONFIG_SND_KERNELDIR/include" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS $KERNEL_INC" AC_CACHE_VAL(kaversion, [AC_TRY_RUN([ #include @@ -153,7 +154,7 @@ dnl Check for GCC version... AC_MSG_CHECKING(for GCC version) ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS $KERNEL_INC" AC_CACHE_VAL(kernel_gcc, [AC_TRY_RUN([ #include @@ -341,7 +342,7 @@ boolvar="$1" AC_MSG_CHECKING(for $2) ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" + CFLAGS="$CFLAGS $KERNEL_INC" boolchk="" AC_TRY_RUN([ #include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h" @@ -367,7 +368,7 @@ boolvar1="$1_MODULE" AC_MSG_CHECKING(for $2) ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" + CFLAGS="$CFLAGS $KERNEL_INC" boolchk="" AC_TRY_RUN([ #include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h" @@ -571,7 +572,7 @@ processor="" rm -f processor.id ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS $KERNEL_INC" AC_TRY_RUN([ #include #include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h" @@ -886,7 +887,7 @@ machine=`cat machine.id`;AC_MSG_RESULT($machine)) CFLAGS="$ac_save_CFLAGS" rm -f machine.id - c_opts="$c_opts -I\$(CONFIG_SND_KERNELDIR)/include/asm-i386/mach-$machine" + KERNEL_INC="$KERNEL_INC -I\$(CONFIG_SND_KERNELDIR)/include/asm-i386/mach-$machine" fi ;; esac @@ -997,7 +998,7 @@ AC_MSG_CHECKING(for strlcpy) strlcpy="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="-Wall -Werror $CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="-Wall -Werror $CFLAGS $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1022,7 +1023,7 @@ AC_MSG_CHECKING(for snprintf) snprintf="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="-Wall -Werror $CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="-Wall -Werror $CFLAGS $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1046,7 +1047,7 @@ AC_MSG_CHECKING(for vmalloc_to_page) vmalloc_to_page="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1071,7 +1072,7 @@ AC_MSG_CHECKING(for old kmod) old_kmod="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS -Wall $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1094,7 +1095,7 @@ AC_MSG_CHECKING(for PDE) pde_defined="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS -Wall $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1119,7 +1120,7 @@ AC_MSG_CHECKING(for pci_set_consistent_dma_mask) pci_consistent_defined="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS -Wall $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1142,7 +1143,7 @@ AC_MSG_CHECKING(for tty->count is the atomic type) tty_count_atomic="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS -Wall $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1168,7 +1169,7 @@ AC_MSG_CHECKING(for old kill_fasync) oldkfasync="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1196,7 +1197,7 @@ AC_MSG_CHECKING(for dma_addr_t) dma_addr_t="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1219,7 +1220,7 @@ AC_MSG_CHECKING(for MUTEX macros) have_mutex_macros="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS $KERNEL_INC" AC_TRY_COMPILE([ #define __KERNEL__ #include "$CONFIG_SND_KERNELDIR/include/linux/config.h" @@ -1323,7 +1324,7 @@ AC_MSG_CHECKING(for RTC callback support in kernel) rtcsup="0" ac_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include" +CFLAGS="$CFLAGS $KERNEL_INC" AC_TRY_RUN([ #include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h" #if defined(__alpha__) || (!defined(CONFIG_RTC) && !defined(CONFIG_RTC_MODULE)) @@ -1411,6 +1412,7 @@ AC_SUBST(m_opts) AC_SUBST(GENKSYMS) AC_SUBST(EXTRA_INCLUDES) +AC_SUBST(KERNEL_INC) dnl Output files... AC_OUTPUT(version Makefile.conf snddevices \ @@ -1424,6 +1426,7 @@ if test "$CONFIG_SND_MODULE" = y; then echo "Hacking autoconf.h..." rm -f include/linux/autoconf.h + mkdir -p include/linux grep -v CONFIG_SND_ $CONFIG_SND_KERNELDIR/include/linux/autoconf.h > include/linux/autoconf.h cat include/autoconf-extra.h >> include/linux/autoconf.h cat include/config1.h >> include/linux/autoconf.h --Multipart_Fri_Jan_30_12:05:30_2004-1-- ------------------------------------------------------- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn