diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff index af3c270..4c2abd0 100644 --- a/kbuild-dummy_noreturn.diff +++ b/kbuild-dummy_noreturn.diff @@ -1,8 +1,8 @@ Index: src/kmk/kmkbuiltin/expr.c -================================================================================ ---- src/kmk/kmkbuiltin/expr.c +=================================================================== +--- src/kmk/kmkbuiltin/expr.c.orig +++ src/kmk/kmkbuiltin/expr.c -@@ -304,6 +304,8 @@ +@@ -308,6 +308,8 @@ eval6(void) return v; } else { error(); @@ -11,10 +11,12 @@ Index: src/kmk/kmkbuiltin/expr.c } /* NOTREACHED */ } ---- src/kmk/kmkbuiltin/kbuild_protection.c +Index: src/kmk/kmkbuiltin/kbuild_protection.c +=================================================================== +--- src/kmk/kmkbuiltin/kbuild_protection.c.orig +++ src/kmk/kmkbuiltin/kbuild_protection.c -@@ -30,6 +30,7 @@ - *******************************************************************************/ +@@ -29,6 +29,7 @@ + #include "config.h" #include #include +#include diff --git a/kbuild.changes b/kbuild.changes index 8b151a6..4d2a552 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:22 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Sun May 31 17:04:35 CEST 2009 - dmueller@suse.de diff --git a/kbuild.spec b/kbuild.spec index 1d2f27a..9a1e913 100644 --- a/kbuild.spec +++ b/kbuild.spec @@ -25,7 +25,7 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: framework for writing simple makefiles for complex tasks Version: 0.1.5svn2336 -Release: 2 +Release: 3 %define _svnrev 2336 Source0: %{name}-%{version}.tar.bz2 Patch0: kbuild-man.diff @@ -94,64 +94,3 @@ kBuild/env.sh kmk NIX_INSTALL_DIR=/usr BUILD_TYPE=release PATH_INS=%{buildroot} %{_datadir}/kBuild %changelog -* Sun May 31 2009 dmueller@suse.de -- fix build against glibc 2.10 -* Mon Apr 20 2009 mseben@suse.cz -- updated to 0.1.5svn2336 - - updated Maintenance.kmk with a patch variable. - - backported 2320: qt3.kmk: Fixed PATH_SDK_QT3_LIB detection - - backported 2318: footer.kmk: No need to apply defpath to 2_OBJS - wholesale fashion, the handler(s) will do this - - backported 2316: *WATCOM*: Fixed RC commands. - - backported 2283: incdep.c: If we find LD_PRELOAD on linux, assume - the worst and disable threading - - backported 2277: kmk: Testcase for the $(if-expr 1==2,) crash. - - backported 2276: kmk: Do not crash if is missing the 3rd - argument, it is supposed to be optional... - - backported 2275: TAR.kmk,TARGZ.kmk,TARBZ2.kmk: Fixes and - additions (BZ2). - - backported 2274: footer.kmk,header.kmk: Enhanced tools inhertiance - - backported 2273: VCC80X86: TOOL_VCC80X86_LINK_LIBRARY_OUTPUT_OUTPUT - -> TOOL_VCC80X86_LINK_LIBRARY_OUTPUT_MAYBE. oops - - backported 2272: qt4.kmk: Look for the QT4 tools in the - alternative tools tree (x86) when present (amd64). - - backported 2271: header.kmk: KBUILD_DEVTOOLS, KBUILD_DEVTOOLS_TRG, - KBUILD_DEVTOOLS_HST, KBUILD_DEVTOOLS_TRG_ALT and KBUILD_DEVTOOLS_HST_ALT. -- updated func_missing_args.diff -* Wed Feb 11 2009 dmueller@suse.de -- merge with openSUSE Factory: - * remove macro from Version line again. Although it is nice, - it causes other problems -* Thu Jan 29 2009 suse-tux@gmx.de -- create SvnInfo.kmk before the build starts -* Thu Jan 29 2009 suse-tux@gmx.de -- updated to 0.1.5svn2270 -- use macros inside the spec -- updated Patch1 (warnings.diff) - some parts are already fixed upstream -- removed Patch3 (kbuild-buildfix.diff) because it isn't needed anymore -- added Patch3 (kbuild-func_missing_args.diff) to prevent some compiler warnings -* Thu Dec 25 2008 suse-tux@gmx.de -- updated to 0.1.4svn2112 -- added kbuild-buildfix.diff -* Tue Oct 14 2008 meissner@suse.de -- fixed an implicit getcwd() -* Thu Sep 25 2008 mkudlvasr@suse.cz -- merge into openSUSE Factory -* Thu Sep 18 2008 suse-tux@gmx.de -- added Patch2 (kbuild-dummy_noreturn.diff) in order to make the build checks happy -* Sun Sep 14 2008 suse-tux@gmx.de -- update to 0.1.3svn1785 -* Sun Sep 14 2008 suse-tux@gmx.de -- update to 0.1.3svn1775 -- removed kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff -* Tue May 06 2008 dmueller@suse.de -- fix uninit return values -* Sun May 04 2008 suse-tux@gmx.de -- update to svn1599 in order to build virtualbox-ose 1.6.0 -- added kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff -- start the bootstrap with kBuild/env.sh --full because this sets all required - variables automagically -* Mon Apr 07 2008 dmueller@suse.de -- fix crash on x86_64 -* Wed Apr 02 2008 dmueller@suse.de -- Initial package (0.1.2svn1480)