From de834dc22b3037ff0b639987f63558235aae6f55536521267d46c50d5d3e4529 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 26 Aug 2011 13:13:43 +0000 Subject: [PATCH] Accepting request 79865 from devel:tools:building - updated to 0.1.9998 (svn revision 2538) in order to build virtualbox 4.1.2 (forwarded request 79861 from mseben) OBS-URL: https://build.opensuse.org/request/show/79865 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbuild?expand=0&rev=16 --- kbuild-0.1.5svn2336.tar.bz2 | 3 --- kbuild-0.1.9998svn2543.tar.bz2 | 3 +++ kbuild-pthread.diff | 13 +++++++++++++ kbuild-timestamps.diff | 30 ++++++++++++++++++++++++++++++ kbuild.changes | 6 ++++++ kbuild.spec | 30 ++++++++++++++---------------- 6 files changed, 66 insertions(+), 19 deletions(-) delete mode 100644 kbuild-0.1.5svn2336.tar.bz2 create mode 100644 kbuild-0.1.9998svn2543.tar.bz2 create mode 100644 kbuild-pthread.diff create mode 100644 kbuild-timestamps.diff diff --git a/kbuild-0.1.5svn2336.tar.bz2 b/kbuild-0.1.5svn2336.tar.bz2 deleted file mode 100644 index db10caa..0000000 --- a/kbuild-0.1.5svn2336.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79fea0e5e13063bb782eda1864a2c463f0051dea70ff624b452d71453d216875 -size 1990230 diff --git a/kbuild-0.1.9998svn2543.tar.bz2 b/kbuild-0.1.9998svn2543.tar.bz2 new file mode 100644 index 0000000..75e90d9 --- /dev/null +++ b/kbuild-0.1.9998svn2543.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6292e7f586af67944c2512b221b01cf4be80484270a9d54fe6f3eac948ccab0f +size 2091999 diff --git a/kbuild-pthread.diff b/kbuild-pthread.diff new file mode 100644 index 0000000..5c38b6d --- /dev/null +++ b/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 diff --git a/kbuild-timestamps.diff b/kbuild-timestamps.diff new file mode 100644 index 0000000..843f8be --- /dev/null +++ b/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 */ diff --git a/kbuild.changes b/kbuild.changes index 4d2a552..c52279c 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 23 08:35:11 UTC 2011 - mseben@gmail.com + +- 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 - coolo@novell.com diff --git a/kbuild.spec b/kbuild.spec index 9a1e913..1a175d3 100644 --- a/kbuild.spec +++ b/kbuild.spec @@ -23,38 +23,32 @@ Name: kbuild BuildRequires: bison flex libacl-devel License: GPL v2 or later Group: Development/Tools/Building -Summary: framework for writing simple makefiles for complex tasks -Version: 0.1.5svn2336 +Summary: Framework for writing simple makefiles for complex tasks +Version: 0.1.9998svn2543 Release: 3 -%define _svnrev 2336 +%define _svnrev 2543 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 +Patch5: kbuild-pthread.diff +Patch6: kbuild-timestamps.diff 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 @@ -66,6 +60,8 @@ Authors: %patch2 %patch3 %patch4 +%patch5 -p1 +%patch6 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -78,19 +74,21 @@ kBuild/env.sh kmk rebuild PATH_INS=`pwd` pod2man -c 'kBuild for SUSE Linux' -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 +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 -%__chmod a-x %buildroot/usr/share/kBuild/*/*kmk -%__rm -r %{buildroot}%{_datadir}/doc/kBuild-0.1.5 - +#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}/* -%{_mandir}/*/* %{_datadir}/kBuild %changelog