jengelh/kbuild
SHA256
1
0
Fork 0
forked from pool/kbuild
Code Pull Requests Activity

Accepting request 214545 from devel:tools:building

Browse Source 
+ warnings.diff (obsolete)
  + kbuild-func_missing_args.diff (obsolete) (forwarded request 214544 from saschpe)

OBS-URL: https://build.opensuse.org/request/show/214545
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbuild?expand=0&rev=28
This commit is contained in:
Stephan Kulow 2014-01-22 13:06:50 +00:00 committed by Git OBS Bridge
commit 8650a941b6
14 changed files with 86 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_service Normal file
View File

@ -0,0 +1,5 @@
<services>
<service name="refresh_patches" mode="disabled">
<param name="changesgenerate">enable</param>
</service>
</services>

62
glibc-2.10.diff
View File

@ -1,62 +0,0 @@
--- 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);

3
kbuild-0.1.9998svn2577.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2abb56f2a3c4ebffceffac2d7153c882222737536279efb7ec8775c7e6c88e0e
size 2118289

3
kbuild-0.1.9998svn2720.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0383513e176f2b443078bb2fa26cab59025e9978cfc576a7918bed50310c2dec
size 13658584

9
kbuild-armv7l.diff
View File

@ -1,7 +1,8 @@
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 @@
Index: kbuild-0.1.9998svn2720/kBuild/env.sh
===================================================================
--- kbuild-0.1.9998svn2720.orig/kBuild/env.sh
+++ kbuild-0.1.9998svn2720/kBuild/env.sh
@@ -362,7 +362,7 @@ if test -z "$KBUILD_HOST_ARCH"; then
hppa64|parisc64)
KBUILD_HOST_ARCH='hppa64'
;;

2
kbuild-dummy_noreturn.diff
View File

@ -2,7 +2,7 @@ Index: src/kmk/kmkbuiltin/expr.c
===================================================================
--- src/kmk/kmkbuiltin/expr.c.orig
+++ src/kmk/kmkbuiltin/expr.c
@@ -308,6 +308,8 @@ eval6(void)
@@ -311,6 +311,8 @@ eval6(void)
return v;
} else {
error();

13
kbuild-func_missing_args.diff
View File

@ -1,13 +0,0 @@
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

14
kbuild-glob.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/src/kmk/dir.c 2013-12-06 18:40:31.882478000 +0100
+++ b/src/kmk/dir.c 2014-01-17 10:09:40.546258127 +0100
@@ -1310,7 +1310,11 @@
/* Hooks for globbing. */
+#ifdef KMK
+#include "glob/glob.h"
+#else
#include <glob.h>
+#endif
/* Structure describing state of iterating through a directory hash table. */

11
kbuild-kmk-makefile-am.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/kmk/Makefile.am 2012-06-17 22:45:31.397098000 +0200
+++ b/src/kmk/Makefile.am 2014-01-17 10:05:13.697343002 +0100
@@ -52,7 +52,7 @@
strcache2.c \
alloccache.c \
kbuild.c \
- kbuild-read.c \
+ kbuild-object.c \
electric.c \
../lib/md5.c \
../lib/kDep.c \

8
kbuild-pthread.diff
View File

@ -1,8 +1,8 @@
Index: kbuild-0.1.9998svn2538/Config.kmk
Index: kbuild-0.1.9998svn2720/Config.kmk
===================================================================
--- kbuild-0.1.9998svn2538.orig/Config.kmk
+++ kbuild-0.1.9998svn2538/Config.kmk
@@ -305,7 +305,7 @@ ifndef TEMPLATE_BIN_TOOL
--- kbuild-0.1.9998svn2720.orig/Config.kmk
+++ kbuild-0.1.9998svn2720/Config.kmk
@@ -314,7 +314,7 @@ ifndef TEMPLATE_BIN_TOOL
TEMPLATE_BIN_INCS += $(PATH_GNUMAKE_SRC)/glob /usr/local/include
endif
ifeq ($(KBUILD_TARGET),linux)

10
kbuild-timestamps.diff
View File

@ -1,8 +1,8 @@
Index: kbuild-0.1.9998svn2538/src/kmk/main.c
Index: kbuild-0.1.9998svn2720/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)
--- kbuild-0.1.9998svn2720.orig/src/kmk/main.c
+++ kbuild-0.1.9998svn2720/src/kmk/main.c
@@ -3086,10 +3086,10 @@ print_usage (int bad)
#ifdef KMK
if (!remote_description || *remote_description == '\0')
@ -15,7 +15,7 @@ Index: kbuild-0.1.9998svn2538/src/kmk/main.c
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)
@@ -3771,10 +3771,10 @@ print_version (void)
# endif /* !KBUILD_PATH */
if (!remote_description || *remote_description == '\0')

18
kbuild.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Fri Jan 17 08:27:50 UTC 2014 - speilicke@suse.com
- Update to version 0.1.9998svn2720:
+ VirtualBox-4.3.6 requires revision 2689 or later
- Dropped patches:
+ warnings.diff (obsolete)
+ glibc-2.10.diff (solved differently upstream)
+ kbuild-func_missing_args.diff (obsolete)
- Rebased patches:
+ kbuild-pthread.diff (only offset)
+ kbuild-timestamps.diff (only offset)
+ kbuild-armv7l.diff (only offset)
+ kbuild-dummy_noreturn.diff (manually)
- Add patches:
+ kbuild-glob.patch: Include local glob implementation
+ kbuild-kmk-makefile-am.patch: Fix wrong file list
-------------------------------------------------------------------
Mon Dec 2 19:44:57 UTC 2013 - dvaleev@suse.com

43
kbuild.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kbuild
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -29,15 +29,16 @@ BuildRequires: makeinfo
Summary: Framework for writing simple makefiles for complex tasks
License: GPL-2.0+
Group: Development/Tools/Building
Version: 0.1.9998svn2577
%define _svnrev 2720
Version: 0.1.9998svn%{_svnrev}
Release: 0
%define _svnrev 2577
Source0: %{name}-%{version}.tar.bz2
Patch0: kbuild-man.diff
Patch1: warnings.diff
# PATCH-FIX-UPSTREAM speilicke@suse.com: Import local implementation if KMK
Patch1: kbuild-glob.patch
Patch2: kbuild-dummy_noreturn.diff
Patch3: kbuild-func_missing_args.diff
Patch4: glibc-2.10.diff
# PATCH-FIX-UPSTREAM speilicke@suse.com: Fix filelist
Patch3: kbuild-kmk-makefile-am.patch
Patch5: kbuild-pthread.diff
Patch6: kbuild-timestamps.diff
Patch7: kbuild-armv7l.diff
@ -46,28 +47,24 @@ Patch9: ppc64le.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 <bird-kbuild-spam@anduin.net>
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
%prep
%setup -q
%patch0
%patch1
%patch1 -p1
%patch2
%patch3
%patch4
%patch3 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1

10
warnings.diff
View File

@ -1,10 +0,0 @@
--- 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.