SPECS: mol.spec - tried to fix it on new kernel and gcc 4.1, build...

[sparky]

Author: sparky                       Date: Sun Jan 29 00:04:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- tried to fix it on new kernel and gcc 4.1, build still fails:
  mol-0.9.70/src/kmod/build/entry.S: Assembler messages:
  mol-0.9.70/src/kmod/build/entry.S:58: Error: too many positional arguments
  mol-0.9.70/src/kmod/build/splitmode.S:348: Error: too many positional arguments

---- Files affected:
SPECS:
   mol.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/mol.spec
diff -u SPECS/mol.spec:1.36 SPECS/mol.spec:1.37
--- SPECS/mol.spec:1.36	Tue Dec 13 14:58:51 2005
+++ SPECS/mol.spec	Sun Jan 29 01:04:34 2006
@@ -110,6 +110,7 @@
 chmod +w -R .
 %patch0 -p1
 sed -i 's|@KERNEL_SRC@|%{_kernelsrcdir}|g' src/kmod/Linux/Makefile.26
+sed -i '/struct menu \*current_menu/s/static//' config/kconfig/mconf.c
 
 cat << EOF | sed 's/^ *//' > config/defconfig-ppc
     CONFIG_PPC=y
@@ -150,7 +151,7 @@
 %{__autoheader}
 %{__autoconf}
 
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses"; export CFLAGS
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses -DNETLINK_TAPBASE=16"; export CFLAGS
 
 %configure \
 %if %{without minimal}
@@ -165,7 +166,6 @@
 %{__make} \
 	prefix=%{_prefix}
 
-
 cd src/kmod/build
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
@@ -175,7 +175,13 @@
 	install -d include/{linux,config}
 	ln -sf %{_kernelsrcdir}/config-$cfg .config
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
+		install -d include/asm
+		cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
+		cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
+	else
+		ln -sf %{_kernelsrcdir}/include/asm-powerpc include/asm
+	fi
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
 	touch include/config/MARKER
 
@@ -185,7 +191,7 @@
 		M=$PWD O=$PWD
 	%{__make} -C %{_kernelsrcdir} modules \
 		%{?with_verbose:V=1} \
-		M=$PWD O=$PWD obj=. src=.
+		M=$PWD O=$PWD
 	mv mol.ko mol-$cfg.ko
 done
 
@@ -340,6 +346,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/01/29 00:04:34  sparky
+- tried to fix it on new kernel and gcc 4.1, build still fails:
+  mol-0.9.70/src/kmod/build/entry.S: Assembler messages:
+  mol-0.9.70/src/kmod/build/entry.S:58: Error: too many positional arguments
+  mol-0.9.70/src/kmod/build/splitmode.S:348: Error: too many positional arguments
+
 Revision 1.36  2005/12/13 13:58:51  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mol.spec?r1=1.36&r2=1.37&f=u