I have made the following changes intended for : CE:Adaptation:x86-generic / kbuild
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6913 Thank You, - [This message was auto-generated] --- Request # 6913: Messages from BOSS: State: review at 2012-10-04T16:02:50 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:lbt:branches:Mer:Tools:Testing / kbuild -> CE:Adaptation:x86-generic / kbuild changes files: -------------- ++++++ new changes file: --- kbuild.changes +++ kbuild.changes @@ -0,0 +1,2 @@ +* Thu Oct 04 2012 David Greaves <[email protected]> - 0.1.9998svn2543 +- Packaged for Mer/Nemo as a build dependency for VirtualBox new: ---- glibc-2.10.diff kbuild-0.1.9998svn2543.tar.bz2 kbuild-armv7l.diff kbuild-dummy_noreturn.diff kbuild-func_missing_args.diff kbuild-man.diff kbuild-pthread.diff kbuild-timestamps.diff kbuild-wrong-memset.patch kbuild.changes kbuild.changes_suse kbuild.spec warnings.diff spec files: ----------- ++++++ new spec file: --- kbuild.spec +++ kbuild.spec @@ -0,0 +1,101 @@ +# +# spec file for package kbuild +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.nemomobile.org/ +# +Url: http://svn.netlabs.org/kbuild + +Name: kbuild +BuildRequires: automake +BuildRequires: bison +BuildRequires: flex +BuildRequires: libacl-devel +BuildRequires: gettext-devel +BuildRequires: byacc +Summary: Framework for writing simple makefiles for complex tasks +License: GPL-2.0+ +Group: Development/Tools/Building +Version: 0.1.9998svn2543 +Release: 0 +%define _svnrev 2543 +Source0: %{name}-%{version}.tar.bz2 +# Keep the suse changelog for history +Source99: kbuild.changes_suse +Patch0: kbuild-man.diff +Patch1: warnings.diff +Patch2: kbuild-dummy_noreturn.diff +Patch3: kbuild-func_missing_args.diff +Patch4: glibc-2.10.diff +Patch5: kbuild-pthread.diff +Patch6: kbuild-timestamps.diff +Patch7: kbuild-armv7l.diff +Patch8: kbuild-wrong-memset.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +The goals of the kBuild framework: - Similar behavior across all + supported platforms +- Flexibility, don't create unnecessary restrictions preventing + ad-hoc solutions +- Makefiles can be simple to write and maintain +- One configuration file for a subtree automatically included +- Target configuration templates as the primary mechanism for + makefile simplification +- Tools and SDKs for helping out the templates with flexibility +- Non-recursive makefile method by using sub-makefiles + +Authors: +-------- + Knut St. Osmundsen <[email protected]> + +%prep +%setup -q +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 + +%build +export CFLAGS="$RPM_OPT_FLAGS" +%__cat > SvnInfo.kmk << EOF +KBUILD_SVN_REV := %{_svnrev} +KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk +EOF +kBuild/env.sh --full make -f bootstrap.gmk SRCDIR=`pwd` +kBuild/env.sh kmk rebuild PATH_INS=`pwd` +pod2man -c 'kBuild for Mer/Nemo' -r kBuild-%version kmk.pod > kmk.1 + +%install +kBuild/env.sh kmk NIX_INSTALL_DIR=/usr BUILD_TYPE=release PATH_INS=%{buildroot} LDFLAGS=-Wl,--as-needed install +%__install -m 644 -D kmk.1 %buildroot/%_mandir/man1/kmk.1 +#remove execute flag, if occurs +%__chmod a-x %{buildroot}/%{_datadir}/kBuild/*/*kmk +%__rm -r %{buildroot}%{_datadir}/doc/kBuild-0.1.9998 + +%clean +%__rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root) +%doc COPYING ChangeLog +%doc kBuild/doc/COPYING-FDL-1.3 +%doc kBuild/doc/QuickReference-kmk.* +%{_mandir}/man1/kmk.1.gz +%{_bindir}/* +%{_datadir}/kBuild other changes: -------------- ++++++ glibc-2.10.diff (new) --- glibc-2.10.diff +++ 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); ++++++ kbuild-0.1.9998svn2543.tar.bz2 (new) ++++++ kbuild-armv7l.diff (new) --- kbuild-armv7l.diff +++ kbuild-armv7l.diff @@ -0,0 +1,12 @@ +diff -Naur kbuild-0.1.9998svn2543.orig/kBuild/env.sh kbuild-0.1.9998svn2543/kBuild/env.sh +--- kbuild-0.1.9998svn2543.orig/kBuild/env.sh 2011-08-25 19:09:21.000000000 +0200 ++++ kbuild-0.1.9998svn2543/kBuild/env.sh 2011-10-04 00:41:34.000000000 +0200 +@@ -358,7 +358,7 @@ + hppa64|parisc64) + KBUILD_HOST_ARCH='hppa64' + ;; +- arm|armv4l|armv5tel|armv5tejl) ++ arm|armv4l|armv5tel|armv5tejl|armv7l) + KBUILD_HOST_ARCH='arm' + ;; + alpha) ++++++ kbuild-dummy_noreturn.diff (new) --- kbuild-dummy_noreturn.diff +++ kbuild-dummy_noreturn.diff @@ -0,0 +1,25 @@ +Index: src/kmk/kmkbuiltin/expr.c +=================================================================== +--- src/kmk/kmkbuiltin/expr.c.orig ++++ src/kmk/kmkbuiltin/expr.c +@@ -308,6 +308,8 @@ eval6(void) + return v; + } else { + error(); ++ /* dummy return in order to make the build checks happy (this will never be reached) */ ++ return NULL; + } + /* NOTREACHED */ + } +Index: src/kmk/kmkbuiltin/kbuild_protection.c +=================================================================== +--- src/kmk/kmkbuiltin/kbuild_protection.c.orig ++++ src/kmk/kmkbuiltin/kbuild_protection.c +@@ -29,6 +29,7 @@ + #include "config.h" + #include <sys/types.h> + #include <stdlib.h> ++#include <unistd.h> + #include <string.h> + #include <ctype.h> + #include <assert.h> ++++++ kbuild-func_missing_args.diff (new) --- kbuild-func_missing_args.diff +++ kbuild-func_missing_args.diff @@ -0,0 +1,13 @@ +Index: src/kmk/kmkbuiltin/printf.c +=================================================================== +--- src/kmk/kmkbuiltin/printf.c.orig ++++ src/kmk/kmkbuiltin/printf.c +@@ -206,7 +206,7 @@ char *kmk_builtin_func_printf(char *o, c + + (void)funcname; + if (rc != 0) +- fatal (NILF, _("$(%s): failure rc=%d\n"), rc); ++ fatal (NILF, _("$(%s): failure rc=%d\n"), funcname, rc); + return o; + } + #endif ++++++ kbuild-man.diff (new) --- kbuild-man.diff +++ kbuild-man.diff @@ -0,0 +1,28 @@ +--- kmk.pod ++++ kmk.pod +@@ -0,0 +1,24 @@ ++=head1 NAME ++ ++kmk - framework for writing simple makefiles for complex tasks ++ ++=head1 SYNOPSIS ++ ++B<kmk> [S<I<options>>] ++ ++=head1 DESCRIPTION ++ ++kmk and its helper tools are an extension to GNU make to ease writing ++portable Makefile. There is not a lot of documentation though. A ++starting point is L<http://svn.netlabs.org/kbuild>. ++ ++On SUSE the kBuild binaries can be found in F</usr/bin> and its data ++files in F</usr/share/kBuild>. ++ ++=head1 SEE ALSO ++ ++L<make(1)> ++ ++=head1 AUTHOR ++ ++Torsten Werner <[email protected]> + ++++++ kbuild-pthread.diff (new) --- kbuild-pthread.diff +++ kbuild-pthread.diff @@ -0,0 +1,13 @@ +Index: kbuild-0.1.9998svn2538/Config.kmk +=================================================================== +--- kbuild-0.1.9998svn2538.orig/Config.kmk ++++ kbuild-0.1.9998svn2538/Config.kmk +@@ -305,7 +305,7 @@ ifndef TEMPLATE_BIN_TOOL + TEMPLATE_BIN_INCS += $(PATH_GNUMAKE_SRC)/glob /usr/local/include + endif + ifeq ($(KBUILD_TARGET),linux) +- TEMPLATE_BIN_LIBS += rt ++ TEMPLATE_BIN_LIBS += rt pthread + endif + TEMPLATE_BIN_CFLAGS.x86 += -m32 + TEMPLATE_BIN_CFLAGS.sparc32 += -m32 ++++++ kbuild-timestamps.diff (new) --- kbuild-timestamps.diff +++ kbuild-timestamps.diff @@ -0,0 +1,30 @@ +Index: kbuild-0.1.9998svn2538/src/kmk/main.c +=================================================================== +--- kbuild-0.1.9998svn2538.orig/src/kmk/main.c ++++ kbuild-0.1.9998svn2538/src/kmk/main.c +@@ -2996,10 +2996,10 @@ print_usage (int bad) + + #ifdef KMK + if (!remote_description || *remote_description == '\0') +- fprintf (usageto, _("\nThis program is built for %s/%s/%s [" __DATE__ " " __TIME__ "]\n"), ++ fprintf (usageto, _("\nThis program is built for %s/%s/%s\n"), + KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU); + else +- fprintf (usageto, _("\nThis program is built for %s/%s/%s (%s) [" __DATE__ " " __TIME__ "]\n"), ++ fprintf (usageto, _("\nThis program is built for %s/%s/%s (%s)\n"), + KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU, remote_description); + #else /* !KMK */ + if (!remote_description || *remote_description == '\0') +@@ -3666,10 +3666,10 @@ print_version (void) + # endif /* !KBUILD_PATH */ + + if (!remote_description || *remote_description == '\0') +- printf (_("%sThis program is a %s build, built for %s/%s/%s [" __DATE__ " " __TIME__ "]\n\n"), ++ printf (_("%sThis program is a %s build, built for %s/%s/%s\n\n"), + precede, KBUILD_TYPE, KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU); + else +- printf (_("%sThis program is a %s build, built for %s/%s/%s (%s) [" __DATE__ " " __TIME__ "]\n\n"), ++ printf (_("%sThis program is a %s build, built for %s/%s/%s (%s)\n\n"), + precede, KBUILD_TYPE, KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU, remote_description); + + #endif /* KMK */ ++++++ kbuild-wrong-memset.patch (new) --- kbuild-wrong-memset.patch +++ kbuild-wrong-memset.patch @@ -0,0 +1,13 @@ +Index: kbuild-0.1.9998svn2543/src/lib/md5.c +=================================================================== +--- kbuild-0.1.9998svn2543.orig/src/lib/md5.c ++++ kbuild-0.1.9998svn2543/src/lib/md5.c +@@ -144,7 +144,7 @@ void MD5Final(unsigned char digest[16], + MD5Transform(ctx->buf, (uint32 *) ctx->in); + byteReverse((unsigned char *) ctx->buf, 4); + memcpy(digest, ctx->buf, 16); +- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ++ memset(ctx, 0, sizeof(struct MD5Context)); /* In case it's sensitive */ + } + + ++++++ kbuild.changes_suse (new) --- kbuild.changes_suse +++ kbuild.changes_suse @@ -0,0 +1,132 @@ +------------------------------------------------------------------- +Tue Dec 27 15:20:13 UTC 2011 - [email protected] + +- Fix wrong size parameter in memset call + +------------------------------------------------------------------- +Fri Dec 2 15:50:58 UTC 2011 - [email protected] + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Mon Oct 3 22:56:19 UTC 2011 - [email protected] + +- Added a patch to support armv7l + +------------------------------------------------------------------- +Tue Aug 23 08:35:11 UTC 2011 - [email protected] + +- updated to 0.1.9998 (svn revision 2538) in order to build + virtualbox 4.1.2, for changes check http://svn.netlabs.org/kbuild/timeline + +------------------------------------------------------------------- +Tue Nov 3 19:09:22 UTC 2009 - [email protected] + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Sun May 31 17:04:35 CEST 2009 - [email protected] + +- fix build against glibc 2.10 + +------------------------------------------------------------------- +Mon Apr 20 11:30:46 CEST 2009 - [email protected] + +- 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 14:18:04 CET 2009 - [email protected] + +- merge with openSUSE Factory: + * remove macro from Version line again. Although it is nice, + it causes other problems + +------------------------------------------------------------------- +Thu Jan 29 19:29:10 CET 2009 - [email protected] + +- create SvnInfo.kmk before the build starts + +------------------------------------------------------------------- +Thu Jan 29 17:14:24 CET 2009 - [email protected] + +- 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 20:03:52 CET 2008 - [email protected] + +- updated to 0.1.4svn2112 +- added kbuild-buildfix.diff + +------------------------------------------------------------------- +Tue Oct 14 18:28:33 CEST 2008 - [email protected] + +- fixed an implicit getcwd() + +------------------------------------------------------------------- +Thu Sep 25 16:35:58 CEST 2008 - [email protected] + +- merge into openSUSE Factory + +------------------------------------------------------------------- +Thu Sep 18 19:53:10 CEST 2008 - [email protected] + +- added Patch2 (kbuild-dummy_noreturn.diff) in order to make the build checks happy + +------------------------------------------------------------------- +Sun Sep 14 20:13:08 CEST 2008 - [email protected] + +- update to 0.1.3svn1785 + +------------------------------------------------------------------- +Sun Sep 14 00:39:02 CEST 2008 - [email protected] + +- update to 0.1.3svn1775 +- removed kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff + +------------------------------------------------------------------- +Tue May 6 23:52:43 CEST 2008 - [email protected] + +- fix uninit return values + +------------------------------------------------------------------- +Sun May 4 14:04:34 CEST 2008 - [email protected] + +- 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 7 20:59:27 CEST 2008 - [email protected] + +- fix crash on x86_64 + +------------------------------------------------------------------- +Wed Apr 2 09:19:37 CEST 2008 - [email protected] + +- Initial package (0.1.2svn1480) + ++++++ warnings.diff (new) --- warnings.diff +++ warnings.diff @@ -0,0 +1,10 @@ +--- src/ash/miscbltin.c ++++ src/ash/miscbltin.c +@@ -69,6 +69,7 @@ __RCSID("$NetBSD: miscbltin.c,v 1.35 2005/03/19 14:22:50 dsl Exp $"); + #undef rflag + + ++extern void* setmode(const char*); + + /* + * The read builtin.
