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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbuild?expand=0&rev=7

Browse Source
This commit is contained in:
OBS User unknown 2009-02-11 15:09:12 +00:00 committed by Git OBS Bridge
parent 0dac648acb
commit 19ce5b7a14
6 changed files with 99 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kbuild-0.1.3svn1785.tar.bz2
View File

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

3
kbuild-0.1.5svn2270.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18a614aa03dfd7a2273c7afba585f6e6170d7e27d5e28912eadffc8058c4781a
size 2007158

35
kbuild-func_missing_args.diff Normal file
View File

@ -0,0 +1,35 @@
Index: src/kmk/kmkbuiltin/kDepObj.c
===================================================================
--- src/kmk/kmkbuiltin/kDepObj.c.orig
+++ src/kmk/kmkbuiltin/kDepObj.c
@@ -363,7 +363,7 @@ int kDepObjCOFFParseCV8SymbolSection(con
case K_CV8_STRING_TABLE:
dprintf(("%06" KX32_PRI " %06" KX32_PRI ": String table\n", off, cbData));
if (pchStrTab)
- fprintf(stderr, "%s: warning: Found yet another string table!\n");
+ fprintf(stderr, "%s: warning: Found yet another string table!\n", argv0);
pchStrTab = uData.pch;
cbStrTab = cbData;
/*dump(uData.pb, cbData, 0);*/
@@ -372,7 +372,7 @@ int kDepObjCOFFParseCV8SymbolSection(con
case K_CV8_SOURCE_FILES:
dprintf(("%06" KX32_PRI " %06" KX32_PRI ": Source files\n", off, cbData));
if (uSrcFiles.pb)
- fprintf(stderr, "%s: warning: Found yet another source files table!\n");
+ fprintf(stderr, "%s: warning: Found yet another source files table!\n", argv0);
uSrcFiles = uData;
cbSrcFiles = cbData;
/*dump(uData.pb, cbData, 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

27
kbuild.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Wed Feb 11 14:18:04 CET 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 19:29:10 CET 2009 - suse-tux@gmx.de
- create SvnInfo.kmk before the build starts
-------------------------------------------------------------------
Thu Jan 29 17:14:24 CET 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 20:03:52 CET 2008 - suse-tux@gmx.de
- updated to 0.1.4svn2112
- added kbuild-buildfix.diff
-------------------------------------------------------------------
Tue Oct 14 18:28:33 CEST 2008 - meissner@suse.de

44
kbuild.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kbuild (Version 0.1.3svn1785)
# spec file for package kbuild (Version 0.1.5svn2270)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 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
@ -24,12 +24,14 @@ 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.3svn1785
Release: 2
Version: 0.1.5svn2270
Release: 1
%define _svnrev 2270
Source0: %{name}-%{version}.tar.bz2
Patch0: kbuild-man.diff
Patch1: warnings.diff
Patch2: kbuild-dummy_noreturn.diff
Patch3: kbuild-func_missing_args.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -61,28 +63,50 @@ Authors:
%patch0
%patch1
%patch2
%patch3
%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 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
install -m 644 -D kmk.1 %buildroot/%_mandir/man1/kmk.1
chmod a-x %buildroot/usr/share/kBuild/*/*kmk
%__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.98
%clean
rm -rf $RPM_BUILD_ROOT
%__rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%{_prefix}/bin/*
%doc kBuild/doc/QuickReference-kmk.*
%{_bindir}/*
%{_mandir}/*/*
%{_datadir}/kBuild
%changelog
* 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
@ -91,10 +115,10 @@ rm -rf $RPM_BUILD_ROOT
- 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
* Sat Sep 13 2008 suse-tux@gmx.de
- update to 0.1.3svn1775
- removed kbuild-r1599_KBUILD_SVN_INFO_KMK-fix.diff
* Wed May 07 2008 dmueller@suse.de
* 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

20
warnings.diff
View File

@ -1,23 +1,3 @@
--- src/kmk/kmkbuiltin/kDepIDB.c
+++ src/kmk/kmkbuiltin/kDepIDB.c
@@ -433,7 +433,7 @@ static void *Pdb70AllocAndReadStream(PPDB70HDR pHdr, PPDB70ROOT pRoot, unsigned
if ( iStream >= pRoot->cStreams
|| cbStream == ~(uint32_t)0)
{
- fprintf(stderr, "%s: error: Invalid stream %d\n", iStream);
+ fprintf(stderr, "%s: error: Invalid stream %d\n", argv0, iStream);
return NULL;
}
@@ -695,7 +695,7 @@ static void *Pdb20AllocAndReadStream(PPDB20HDR pHdr, PPDB20ROOT pRoot, unsigned
if ( iStream >= pRoot->cStreams
|| cbStream == ~(uint32_t)0)
{
- fprintf(stderr, "%s: error: Invalid stream %d\n", iStream);
+ fprintf(stderr, "%s: error: Invalid stream %d\n", argv0, iStream);
return NULL;
}
--- 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 $");