diff --git a/glibc-2.10.diff b/glibc-2.10.diff new file mode 100644 index 0000000..8b8bb8e --- /dev/null +++ b/glibc-2.10.diff @@ -0,0 +1,62 @@ +--- src/ash/output.c ++++ src/ash/output.c +@@ -230,6 +230,7 @@ out1fmt(const char *fmt, ...) + va_end(ap); + } + ++#if 0 + void + dprintf(const char *fmt, ...) + { +@@ -240,6 +241,7 @@ dprintf(const char *fmt, ...) + va_end(ap); + flushout(out2); + } ++#endif + + void + fmtstr(char *outbuf, size_t length, const char *fmt, ...) +--- src/ash/output.h ++++ src/ash/output.h +@@ -65,8 +65,10 @@ void outfmt(struct output *, const char *, ...) + __attribute__((__format__(__printf__,2,3))); + void out1fmt(const char *, ...) + __attribute__((__format__(__printf__,1,2))); ++ /* + void dprintf(const char *, ...) + __attribute__((__format__(__printf__,1,2))); ++ */ + void fmtstr(char *, size_t, const char *, ...) + __attribute__((__format__(__printf__,3,4))); + void doformat(struct output *, const char *, va_list); +--- src/kash/output.c ++++ src/kash/output.c +@@ -226,6 +226,7 @@ out1fmt(shinstance *psh, const char *fmt, ...) + va_end(ap); + } + ++#if 0 + void + dprintf(shinstance *psh, const char *fmt, ...) + { +@@ -236,6 +237,7 @@ dprintf(shinstance *psh, const char *fmt, ...) + va_end(ap); + flushout(psh->out2); + } ++#endif + + void + fmtstr(char *outbuf, size_t length, const char *fmt, ...) +--- src/kash/output.h ++++ src/kash/output.h +@@ -69,8 +69,10 @@ void outfmt(struct output *, const char *, ...) + __attribute__((__format__(__printf__,2,3))); + void out1fmt(struct shinstance *, const char *, ...) + __attribute__((__format__(__printf__,2,3))); ++ /* + void dprintf(struct shinstance *, const char *, ...) + __attribute__((__format__(__printf__,2,3))); ++ */ + void fmtstr(char *, size_t, const char *, ...) + __attribute__((__format__(__printf__,3,4))); + void doformat(struct output *, const char *, va_list); diff --git a/kbuild.changes b/kbuild.changes index 65c1e2b..8b151a6 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 31 17:04:35 CEST 2009 - dmueller@suse.de + +- fix build against glibc 2.10 + ------------------------------------------------------------------- Mon Apr 20 11:30:46 CEST 2009 - mseben@suse.cz diff --git a/kbuild.spec b/kbuild.spec index 8fdd8e8..1d2f27a 100644 --- a/kbuild.spec +++ b/kbuild.spec @@ -25,13 +25,14 @@ License: GPL v2 or later Group: Development/Tools/Building Summary: framework for writing simple makefiles for complex tasks Version: 0.1.5svn2336 -Release: 1 +Release: 2 %define _svnrev 2336 Source0: %{name}-%{version}.tar.bz2 Patch0: kbuild-man.diff Patch1: warnings.diff Patch2: kbuild-dummy_noreturn.diff Patch3: kbuild-func_missing_args.diff +Patch4: glibc-2.10.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -64,6 +65,7 @@ Authors: %patch1 %patch2 %patch3 +%patch4 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -92,6 +94,8 @@ 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.