rpms/kBuild/EL-5 kBuild-0.1.5-revert2027.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kBuild.spec, 1.1, 1.2 sources, 1.2, 1.3
Lubomir Rintel
lkundrak at fedoraproject.org
Tue Dec 30 20:48:46 UTC 2008
- Previous message (by thread): rpms/kBuild/devel kBuild-0.1.5-revert2027.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kBuild.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/kBuild/F-10 kBuild-0.1.5-revert2027.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kBuild.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/kBuild/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32118/EL-5
Modified Files:
.cvsignore kBuild.spec sources
Added Files:
kBuild-0.1.5-revert2027.patch
Log Message:
Merge to branches
kBuild-0.1.5-revert2027.patch:
--- NEW FILE kBuild-0.1.5-revert2027.patch ---
This reverts commit 2027 which breaks the build.
Index: src/kmk/commands.c
===================================================================
--- src/kmk/commands.c (revision 2027)
+++ src/kmk/commands.c (revision 2026)
@@ -656,9 +656,6 @@
if (file->precious || file->phony)
return;
-#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
- assert (!file->multi_maybe);
-#endif
#ifndef NO_ARCHIVES
if (ar_name (file->name))
@@ -713,19 +710,6 @@
for (d = child->file->also_make; d != 0; d = d->next)
delete_target (d->file, child->file->name);
-#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
- /* Also remove any multi target siblings, except for the 'maybe' ones (we
- handle that here) and precious ones (delete_target deals with that).
- Note that CHILD is always the multi target head (see remake.c). */
- if (child->file == child->file->multi_head)
- {
- struct file *f2;
- for (f2 = child->file->multi_next; f2; f2 = f2->multi_next)
- if (!f2->multi_maybe)
- delete_target (f2, child->file->name);
- }
-#endif
-
child->deleted = 1;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Dec 2008 14:53:59 -0000 1.2
+++ .cvsignore 30 Dec 2008 20:48:15 -0000 1.3
@@ -1 +1 @@
-kBuild-0.1.4-src.tar.gz
+kBuild.tar.gz
Index: kBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-5/kBuild.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kBuild.spec 25 Dec 2008 14:53:59 -0000 1.1
+++ kBuild.spec 30 Dec 2008 20:48:15 -0000 1.2
@@ -1,6 +1,6 @@
Name: kBuild
-Version: 0.1.4
-Release: 1%{?dist}
+Version: 0.1.5
+Release: 0.1.20081106svn%{?dist}
Summary: A cross-platform build enviroment
Group: Development/Tools
@@ -8,8 +8,16 @@
# most tools are from NetBSD, some are from FreeBSD,
# and make and sed are from GNU
URL: http://svn.netlabs.org/kbuild
-Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
+#Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz
+# Revision 2058 is of the most recent file of VirtualBox OSE-bundled kBuild
+# where the version was determinable. More recent trunk as of end of 2008 won't
+# build, and latest stable can't build VirtualBox OSE
+# svn export -r2058 http://svn.netlabs.org/repos/kbuild@2058 kBuild
+# tar czf kBuild.tar.gz kBuild
+Source0: %{name}.tar.gz
Patch0: kBuild-0.1.3-escape.patch
+# Revert it, or add <assert.h> include? -- that is the question.
+Patch1: kBuild-0.1.5-revert2027.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: byacc libacl-devel flex
@@ -23,8 +31,9 @@
%prep
-%setup -q
+%setup -q -n %{name}
%patch0 -p1 -b .escape
+%patch1 -p0 -b .revert2027
# Remove prebuilt stuff
rm -rf kBuild/bin/*
@@ -64,6 +73,9 @@
%changelog
+* Tue Dec 30 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.5-0.1.20081106svn
+- Update to build VirtualBox OSE 2.1.0
+
* Fri Sep 19 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.1.4-1
- New upstream release
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kBuild/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Dec 2008 14:53:59 -0000 1.2
+++ sources 30 Dec 2008 20:48:15 -0000 1.3
@@ -1 +1 @@
-4d35dbe6177c934838a893712759a89b kBuild-0.1.4-src.tar.gz
+54ec45538cc644a3a2843a0e0618eaf1 kBuild.tar.gz
- Previous message (by thread): rpms/kBuild/devel kBuild-0.1.5-revert2027.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kBuild.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/kBuild/F-10 kBuild-0.1.5-revert2027.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kBuild.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list