From 03b15ce76e7ec78cea41516f0a8249d7326bce50 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 25 Dec 2008 14:44:04 +0000 Subject: [PATCH 01/97] Add kbuild --- .cvsignore | 1 + kBuild-0.1.3-escape.patch | 17 ++++++++ kBuild.spec | 88 +++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 107 insertions(+) create mode 100644 kBuild-0.1.3-escape.patch create mode 100644 kBuild.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3312dd8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +kBuild-0.1.4-src.tar.gz diff --git a/kBuild-0.1.3-escape.patch b/kBuild-0.1.3-escape.patch new file mode 100644 index 0000000..5a708aa --- /dev/null +++ b/kBuild-0.1.3-escape.patch @@ -0,0 +1,17 @@ +This is so that we can pass the command argument with spaces. +Note that this is not really portable, $@ is a bashism, and +traditional shell does not have a suitable replacement. + +Lubomir Rintel + +--- kBuild-0.1.3/kBuild/env.sh.escape 2008-08-17 21:13:20.000000000 +0200 ++++ kBuild-0.1.3/kBuild/env.sh 2008-08-17 21:13:23.000000000 +0200 +@@ -568,7 +568,7 @@ + MY_RC=$? + else + test -z "${QUIET_OPT}" && echo "$0: info: Executing command: $*" 1>&${ERR_REDIR} +- $* ++ "$@" + MY_RC=$? + test -z "${QUIET_OPT}" -a "$MY_RC" -ne 0 && echo "$0: info: rc=$MY_RC: $*" 1>&${ERR_REDIR} + fi diff --git a/kBuild.spec b/kBuild.spec new file mode 100644 index 0000000..e2df164 --- /dev/null +++ b/kBuild.spec @@ -0,0 +1,88 @@ +Name: kBuild +Version: 0.1.4 +Release: 1%{?dist} +Summary: A cross-platform build enviroment + +Group: Development/Tools +License: BSD and GPLv2+ +# 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 +Patch0: kBuild-0.1.3-escape.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: byacc libacl-devel flex +BuildRequires: autoconf automake gettext-devel + + +%description +This is a GNU make fork that with a set of scripts to simplify +complex tasks and portable versions of various UNIX tools to +ensure cross-platform portability. + + +%prep +%setup -q +%patch0 -p1 -b .escape + +# Remove prebuilt stuff +rm -rf kBuild/bin/* + + +%build +# Unset hardcoded optimizations +%define mflags CFLAGS="%{optflags}" %{_smp_mflags} + +# This is so that we see what's being done, +# i.e. if the compiler flags are in effect +export KBUILD_VERBOSE=2 + +# The bootstrap would probably not be needed if we depended on ourselves, +# yet it is not guarranteed that new versions are compilable with older +# kmk versions, so with this we are on a safer side +kBuild/env.sh --full make -f bootstrap.gmk %{mflags} + +kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release %{mflags} rebuild + + +%install +rm -rf $RPM_BUILD_ROOT +kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release PATH_INS=$RPM_BUILD_ROOT %{mflags} install +cp -a kBuild/units $RPM_BUILD_ROOT/%{_datadir}/kBuild + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(0644,root,root,0755) +%doc COPYING ChangeLog +%attr(0755,root,root) %{_bindir}/* +%{_datadir}/* + + +%changelog +* Fri Sep 19 2008 Lubomir Rintel - 0.1.4-1 +- New upstream release + +* Thu Aug 28 2008 Lubomir Rintel - 0.1.3-2 +- Add gettext-devel to BRs for autopoint + +* Sun Aug 17 2008 Lubomir Rintel - 0.1.3-1 +- New upstream version +- Install into FHS hierarchy +- Honour optflags +- No need to be arch specific + +* Tue Oct 30 2007 Till Maas - 0.1.0-0.3.20070627svn +- add support for x86_64 +- add BR: autoconf, automake + +* Wed Jun 27 2007 Till Maas - 0.1.0-0.2.20070627svn +- Update to a new version +- just copy the bin files to %%{_libexecdir}, kmk install does not work + +* Sun Feb 18 2007 Till Maas - 0.1.0-0.1.20070218svn +- Initial spec for fedora extras diff --git a/sources b/sources index e69de29..5d00453 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +4d35dbe6177c934838a893712759a89b kBuild-0.1.4-src.tar.gz From c0f9042c948c81b2150e708a13f1fd0c684e58b7 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 30 Dec 2008 20:16:09 +0000 Subject: [PATCH 02/97] - Update to build VirtualBox OSE 2.1.0 --- .cvsignore | 2 +- kBuild-0.1.5-revert2027.patch | 36 +++++++++++++++++++++++++++++++++++ kBuild.spec | 20 +++++++++++++++---- sources | 2 +- 4 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 kBuild-0.1.5-revert2027.patch diff --git a/.cvsignore b/.cvsignore index 3312dd8..fba4a99 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kBuild-0.1.4-src.tar.gz +kBuild.tar.gz diff --git a/kBuild-0.1.5-revert2027.patch b/kBuild-0.1.5-revert2027.patch new file mode 100644 index 0000000..491f10f --- /dev/null +++ b/kBuild-0.1.5-revert2027.patch @@ -0,0 +1,36 @@ +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; + } + diff --git a/kBuild.spec b/kBuild.spec index e2df164..8caeeb7 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -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 @@ License: BSD and GPLv2+ # 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 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 @@ ensure cross-platform portability. %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 30 2008 Lubomir Rintel - 0.1.5-0.1.20081106svn +- Update to build VirtualBox OSE 2.1.0 + * Fri Sep 19 2008 Lubomir Rintel - 0.1.4-1 - New upstream release diff --git a/sources b/sources index 5d00453..3517285 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d35dbe6177c934838a893712759a89b kBuild-0.1.4-src.tar.gz +54ec45538cc644a3a2843a0e0618eaf1 kBuild.tar.gz From 83ec0c6b7a1085bc6aeef80d5e3cbc62beeb26ad Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 24 Jan 2009 13:25:22 +0000 Subject: [PATCH 03/97] - Update to new upstream release --- .cvsignore | 2 +- kBuild.spec | 51 +++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.cvsignore b/.cvsignore index fba4a99..b4e4eae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kBuild.tar.gz +kBuild-0.1.5-src.tar.gz diff --git a/kBuild.spec b/kBuild.spec index 8caeeb7..18d3080 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,6 +1,6 @@ Name: kBuild Version: 0.1.5 -Release: 0.1.20081106svn%{?dist} +Release: 1%{?dist} Summary: A cross-platform build enviroment Group: Development/Tools @@ -8,16 +8,8 @@ License: BSD and GPLv2+ # 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 -# 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 +Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz Patch0: kBuild-0.1.3-escape.patch -# Revert it, or add 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 @@ -29,36 +21,43 @@ This is a GNU make fork that with a set of scripts to simplify complex tasks and portable versions of various UNIX tools to ensure cross-platform portability. +It is used mainly to build VirtualBox OSE packages for RPM Fusion +repository. + %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 -b .escape -%patch1 -p0 -b .revert2027 # Remove prebuilt stuff rm -rf kBuild/bin/* %build -# Unset hardcoded optimizations -%define mflags CFLAGS="%{optflags}" %{_smp_mflags} +%define bootstrap_mflags %{_smp_mflags} \\\ + CFLAGS="%{optflags}" \\\ + KBUILD_VERBOSE=2 -# This is so that we see what's being done, -# i.e. if the compiler flags are in effect -export KBUILD_VERBOSE=2 +%define mflags %{bootstrap_mflags} \\\ + NIX_INSTALL_DIR=%{_prefix} \\\ + BUILD_TYPE=release \\\ + MY_INST_MODE=0644 \\\ + MY_INST_BIN_MODE=0755 # The bootstrap would probably not be needed if we depended on ourselves, # yet it is not guarranteed that new versions are compilable with older # kmk versions, so with this we are on a safer side -kBuild/env.sh --full make -f bootstrap.gmk %{mflags} +kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags} -kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release %{mflags} rebuild +kBuild/env.sh kmk %{mflags} rebuild %install rm -rf $RPM_BUILD_ROOT -kBuild/env.sh kmk NIX_INSTALL_DIR=%{_prefix} BUILD_TYPE=release PATH_INS=$RPM_BUILD_ROOT %{mflags} install -cp -a kBuild/units $RPM_BUILD_ROOT/%{_datadir}/kBuild +export KBUILD_VERBOSE=2 +kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install +# These are included later in files section +rm -r $RPM_BUILD_ROOT%{_docdir} %clean @@ -66,13 +65,17 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(0644,root,root,0755) -%doc COPYING ChangeLog -%attr(0755,root,root) %{_bindir}/* +%defattr(-,root,root,-) +%{_bindir}/* %{_datadir}/* +%doc COPYING ChangeLog +%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference* %changelog +* Sat Jan 24 2009 Lubomir Rintel - 0.1.5-1 +- Update to new upstream release + * Tue Dec 30 2008 Lubomir Rintel - 0.1.5-0.1.20081106svn - Update to build VirtualBox OSE 2.1.0 diff --git a/sources b/sources index 3517285..da54911 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54ec45538cc644a3a2843a0e0618eaf1 kBuild.tar.gz +df7e0905232e67728643f97d63cbf3f3 kBuild-0.1.5-src.tar.gz From 69c045e658dc90eb13986be8278747bd4b7642a0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 10:04:21 +0000 Subject: [PATCH 04/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 18d3080..ea28e69 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,6 +1,6 @@ Name: kBuild Version: 0.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A cross-platform build enviroment Group: Development/Tools @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Jan 24 2009 Lubomir Rintel - 0.1.5-1 - Update to new upstream release From fcd49a05c8a86323ed5c7b49bd7b3e4a4bbc6280 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 1 Mar 2009 11:11:30 +0000 Subject: [PATCH 05/97] - Fix up BRs --- kBuild.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kBuild.spec b/kBuild.spec index ea28e69..361c48b 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,6 +1,6 @@ Name: kBuild Version: 0.1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A cross-platform build enviroment Group: Development/Tools @@ -13,7 +13,7 @@ Patch0: kBuild-0.1.3-escape.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc libacl-devel flex -BuildRequires: autoconf automake gettext-devel +BuildRequires: autoconf automake gettext-devel cvs %description @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Mar 1 2009 Lubomir Rintel - 0.1.5-3 +- Fix up BRs + * Wed Feb 25 2009 Fedora Release Engineering - 0.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From c02008138686e52b1861cea4d0aa9f67b9fef921 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 12 Apr 2009 22:18:06 +0000 Subject: [PATCH 06/97] - Fix typoes (Robert P. J. Day, #495393) --- kBuild.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kBuild.spec b/kBuild.spec index 361c48b..9c98d6c 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,7 +1,7 @@ Name: kBuild Version: 0.1.5 -Release: 3%{?dist} -Summary: A cross-platform build enviroment +Release: 4%{?dist} +Summary: A cross-platform build environment Group: Development/Tools License: BSD and GPLv2+ @@ -17,7 +17,7 @@ BuildRequires: autoconf automake gettext-devel cvs %description -This is a GNU make fork that with a set of scripts to simplify +This is a GNU make fork with a set of scripts to simplify complex tasks and portable versions of various UNIX tools to ensure cross-platform portability. @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 13 2009 Lubomir Rintel - 0.1.5-4 +- Fix typoes (Robert P. J. Day, #495393) + * Sun Mar 1 2009 Lubomir Rintel - 0.1.5-3 - Fix up BRs From a1676c566f6c061ea36da515a67d019ed4f11893 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 12 Apr 2009 23:33:49 +0000 Subject: [PATCH 07/97] - Fix typoes (Robert P. J. Day, #495393) - Comment out the colliding dprintf --- kBuild-0.1.5-dprintf.patch | 38 ++++++++++++++++++++++++++++++++++++++ kBuild.spec | 3 +++ 2 files changed, 41 insertions(+) create mode 100644 kBuild-0.1.5-dprintf.patch diff --git a/kBuild-0.1.5-dprintf.patch b/kBuild-0.1.5-dprintf.patch new file mode 100644 index 0000000..58887f4 --- /dev/null +++ b/kBuild-0.1.5-dprintf.patch @@ -0,0 +1,38 @@ +This dprintf() collides with POSIX.1-2008 dprintf() and is not used at all +anyways. (Whoa! what a stupid name! standardized before invention of grep!) + +Lubomir Rintel + +diff -up kBuild-0.1.5/src/ash/output.c.gcc44 kBuild-0.1.5/src/ash/output.c +--- kBuild-0.1.5/src/ash/output.c.gcc44 2009-04-13 01:20:33.857017054 +0200 ++++ kBuild-0.1.5/src/ash/output.c 2009-04-13 01:20:57.570033297 +0200 +@@ -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, ...) +diff -up kBuild-0.1.5/src/ash/output.h.gcc44 kBuild-0.1.5/src/ash/output.h +--- kBuild-0.1.5/src/ash/output.h.gcc44 2009-04-13 01:20:37.724140366 +0200 ++++ kBuild-0.1.5/src/ash/output.h 2009-04-13 01:20:47.933142098 +0200 +@@ -65,8 +65,10 @@ void outfmt(struct output *, const char + __attribute__((__format__(__printf__,2,3))); + void out1fmt(const char *, ...) + __attribute__((__format__(__printf__,1,2))); ++#if 0 + void dprintf(const char *, ...) + __attribute__((__format__(__printf__,1,2))); ++#endif + void fmtstr(char *, size_t, const char *, ...) + __attribute__((__format__(__printf__,3,4))); + void doformat(struct output *, const char *, va_list); diff --git a/kBuild.spec b/kBuild.spec index 9c98d6c..5d84034 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -10,6 +10,7 @@ License: BSD and GPLv2+ URL: http://svn.netlabs.org/kbuild Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz Patch0: kBuild-0.1.3-escape.patch +Patch1: kBuild-0.1.5-dprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc libacl-devel flex @@ -28,6 +29,7 @@ repository. %prep %setup -q %patch0 -p1 -b .escape +%patch1 -p1 -b .dprintf # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -75,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Apr 13 2009 Lubomir Rintel - 0.1.5-4 - Fix typoes (Robert P. J. Day, #495393) +- Comment out the colliding dprintf * Sun Mar 1 2009 Lubomir Rintel - 0.1.5-3 - Fix up BRs From 1dd7227e60d420f7cb97821acfa65eca45fd0684 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 25 Apr 2009 06:11:34 +0000 Subject: [PATCH 08/97] - Update to later patchlevel to support VirtualBox 2.2.0 --- .cvsignore | 2 +- kBuild-0.1.5-revert2027.patch | 36 ----------------------------------- kBuild.spec | 11 ++++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 41 deletions(-) delete mode 100644 kBuild-0.1.5-revert2027.patch diff --git a/.cvsignore b/.cvsignore index b4e4eae..572f794 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kBuild-0.1.5-src.tar.gz +kBuild-0.1.5-p1-src.tar.gz diff --git a/kBuild-0.1.5-revert2027.patch b/kBuild-0.1.5-revert2027.patch deleted file mode 100644 index 491f10f..0000000 --- a/kBuild-0.1.5-revert2027.patch +++ /dev/null @@ -1,36 +0,0 @@ -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; - } - diff --git a/kBuild.spec b/kBuild.spec index 5d84034..f6035b4 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,6 +1,8 @@ +%global patchlevel p1 + Name: kBuild Version: 0.1.5 -Release: 4%{?dist} +Release: 5%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -8,7 +10,7 @@ License: BSD and GPLv2+ # 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}%{?patchlevel:-%{patchlevel}}-src.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +29,7 @@ repository. %prep -%setup -q +%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %patch0 -p1 -b .escape %patch1 -p1 -b .dprintf @@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 25 2009 Lubomir Rintel - 0.1.5-5.p1 +- Update to later patchlevel to support VirtualBox 2.2.0 + * Mon Apr 13 2009 Lubomir Rintel - 0.1.5-4 - Fix typoes (Robert P. J. Day, #495393) - Comment out the colliding dprintf diff --git a/sources b/sources index da54911..a075fc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df7e0905232e67728643f97d63cbf3f3 kBuild-0.1.5-src.tar.gz +148f821c0f9e729a1f65bc91e69f6e7a kBuild-0.1.5-p1-src.tar.gz From 1939616f9e9bb5edcee251b764311bb926f7d818 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 04:16:05 +0000 Subject: [PATCH 09/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index f6035b4..6e2edd7 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.5 -Release: 5%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 6%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.1.5-6.p1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sat Apr 25 2009 Lubomir Rintel - 0.1.5-5.p1 - Update to later patchlevel to support VirtualBox 2.2.0 From f358468406ec6e9dc7f57c8bb0dd8c90a268d6b8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:15 +0000 Subject: [PATCH 10/97] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8c8870e..e463081 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: kBuild -# $Id$ +# $Id: Makefile,v 1.1 2008/12/25 00:36:01 kevin Exp $ NAME := kBuild SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6fa2c45034ad5bc60d872e7ad255908af2bc26b7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:20:25 +0000 Subject: [PATCH 11/97] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8c8870e..e463081 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: kBuild -# $Id$ +# $Id: Makefile,v 1.1 2008/12/25 00:36:01 kevin Exp $ NAME := kBuild SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d065c9fab49fedc94a4f39412ea3d3306acc1d13 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 18 Feb 2010 07:51:45 +0000 Subject: [PATCH 12/97] - Fix build - Update to later patch level --- .cvsignore | 2 +- kBuild-0.1.5-pthread.patch | 12 ++++++++++++ kBuild.spec | 9 ++++++++- sources | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 kBuild-0.1.5-pthread.patch diff --git a/.cvsignore b/.cvsignore index 572f794..7ca5660 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kBuild-0.1.5-p1-src.tar.gz +kBuild-0.1.5-p2-src.tar.gz diff --git a/kBuild-0.1.5-pthread.patch b/kBuild-0.1.5-pthread.patch new file mode 100644 index 0000000..01d6602 --- /dev/null +++ b/kBuild-0.1.5-pthread.patch @@ -0,0 +1,12 @@ +diff -up kBuild-0.1.5-p1/Config.kmk.pthreads kBuild-0.1.5-p1/Config.kmk +--- kBuild-0.1.5-p1/Config.kmk.pthreads 2010-02-18 08:27:24.287688965 +0100 ++++ kBuild-0.1.5-p1/Config.kmk 2010-02-18 08:28:07.505493345 +0100 +@@ -282,6 +282,8 @@ ifndef TEMPLATE_BIN_TOOL + endif + ifeq ($(KBUILD_TARGET),linux) + TEMPLATE_BIN_LIBS += rt ++ TEMPLATE_BIN_LIBS += pthread ++ TEMPLATE_BIN_LDFLAGS += -Wl,--as-needed + endif + TEMPLATE_BIN_CFLAGS.x86 += -m32 + TEMPLATE_BIN_CFLAGS.sparc32 += -m32 diff --git a/kBuild.spec b/kBuild.spec index 6e2edd7..2b607de 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,4 +1,4 @@ -%global patchlevel p1 +%global patchlevel p2 Name: kBuild Version: 0.1.5 @@ -13,6 +13,7 @@ URL: http://svn.netlabs.org/kbuild Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch +Patch2: kBuild-0.1.5-pthread.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc libacl-devel flex @@ -32,6 +33,7 @@ repository. %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %patch0 -p1 -b .escape %patch1 -p1 -b .dprintf +%patch2 -p1 -b .pthreads # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -51,6 +53,7 @@ rm -rf kBuild/bin/* # The bootstrap would probably not be needed if we depended on ourselves, # yet it is not guarranteed that new versions are compilable with older # kmk versions, so with this we are on a safer side +find -name config.log -delete kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags} kBuild/env.sh kmk %{mflags} rebuild @@ -77,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 17 2010 Lubomir Rintel - 0.1.5-6.p2 +- Fix build +- Update to later patch level + * Fri Jul 24 2009 Fedora Release Engineering - 0.1.5-6.p1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index a075fc1..7e06b26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -148f821c0f9e729a1f65bc91e69f6e7a kBuild-0.1.5-p1-src.tar.gz +5e4e2193aa6cb3f095af2f99bf90d01d kBuild-0.1.5-p2-src.tar.gz From b156e15e03ab4034095b43557380a5b74fe53052 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:55:09 +0000 Subject: [PATCH 13/97] Initialize branch EL-6 for kBuild --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 1f8d398b35c4cbf8f56ca78ef8630b180182c5f5 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 8 Jul 2010 20:45:26 +0000 Subject: [PATCH 14/97] Pull from devel --- .cvsignore | 2 +- import.log | 1 + kBuild-0.1.5-pthread.patch | 12 ++++++++++++ kBuild.spec | 9 ++++++++- sources | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 import.log create mode 100644 kBuild-0.1.5-pthread.patch diff --git a/.cvsignore b/.cvsignore index 572f794..7ca5660 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kBuild-0.1.5-p1-src.tar.gz +kBuild-0.1.5-p2-src.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..2f9d52b --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +kBuild-0_1_5-6_p2_fc14:EL-6:kBuild-0.1.5-6.p2.fc14.src.rpm:1278621903 diff --git a/kBuild-0.1.5-pthread.patch b/kBuild-0.1.5-pthread.patch new file mode 100644 index 0000000..01d6602 --- /dev/null +++ b/kBuild-0.1.5-pthread.patch @@ -0,0 +1,12 @@ +diff -up kBuild-0.1.5-p1/Config.kmk.pthreads kBuild-0.1.5-p1/Config.kmk +--- kBuild-0.1.5-p1/Config.kmk.pthreads 2010-02-18 08:27:24.287688965 +0100 ++++ kBuild-0.1.5-p1/Config.kmk 2010-02-18 08:28:07.505493345 +0100 +@@ -282,6 +282,8 @@ ifndef TEMPLATE_BIN_TOOL + endif + ifeq ($(KBUILD_TARGET),linux) + TEMPLATE_BIN_LIBS += rt ++ TEMPLATE_BIN_LIBS += pthread ++ TEMPLATE_BIN_LDFLAGS += -Wl,--as-needed + endif + TEMPLATE_BIN_CFLAGS.x86 += -m32 + TEMPLATE_BIN_CFLAGS.sparc32 += -m32 diff --git a/kBuild.spec b/kBuild.spec index 6e2edd7..2b607de 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,4 +1,4 @@ -%global patchlevel p1 +%global patchlevel p2 Name: kBuild Version: 0.1.5 @@ -13,6 +13,7 @@ URL: http://svn.netlabs.org/kbuild Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch +Patch2: kBuild-0.1.5-pthread.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: byacc libacl-devel flex @@ -32,6 +33,7 @@ repository. %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %patch0 -p1 -b .escape %patch1 -p1 -b .dprintf +%patch2 -p1 -b .pthreads # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -51,6 +53,7 @@ rm -rf kBuild/bin/* # The bootstrap would probably not be needed if we depended on ourselves, # yet it is not guarranteed that new versions are compilable with older # kmk versions, so with this we are on a safer side +find -name config.log -delete kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags} kBuild/env.sh kmk %{mflags} rebuild @@ -77,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 17 2010 Lubomir Rintel - 0.1.5-6.p2 +- Fix build +- Update to later patch level + * Fri Jul 24 2009 Fedora Release Engineering - 0.1.5-6.p1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index a075fc1..7e06b26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -148f821c0f9e729a1f65bc91e69f6e7a kBuild-0.1.5-p1-src.tar.gz +5e4e2193aa6cb3f095af2f99bf90d01d kBuild-0.1.5-p2-src.tar.gz From 530fcb1effbb643b6440dcea8df44b7514e053e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:57:35 +0000 Subject: [PATCH 15/97] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e463081..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: kBuild -# $Id: Makefile,v 1.1 2008/12/25 00:36:01 kevin Exp $ -NAME := kBuild -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 22edd0022ba612fd815f7d19c90ab179ebcde346 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:57:36 +0000 Subject: [PATCH 16/97] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e463081..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: kBuild -# $Id: Makefile,v 1.1 2008/12/25 00:36:01 kevin Exp $ -NAME := kBuild -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 2f9d52b..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -kBuild-0_1_5-6_p2_fc14:EL-6:kBuild-0.1.5-6.p2.fc14.src.rpm:1278621903 From ebf9c455b571428f4eb8f4fdf5c306822f9a5494 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:31:00 -0600 Subject: [PATCH 17/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 2b607de..2e5341b 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.5 -Release: 6%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 7%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.1.5-7.p2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Feb 17 2010 Lubomir Rintel - 0.1.5-6.p2 - Fix build - Update to later patch level From c1956cd327f451191833cfe425c2aa47509999a2 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 22 Sep 2011 11:57:48 +0200 Subject: [PATCH 18/97] Update to a later snapshot --- .gitignore | 1 + kBuild.spec | 20 ++++++++++++++------ sources | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7ca5660..49a82c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ kBuild-0.1.5-p2-src.tar.gz +/kBuild-r2537.tar.gz diff --git a/kBuild.spec b/kBuild.spec index 2e5341b..2c8ca6b 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,8 @@ -%global patchlevel p2 +%global patchlevel r1 Name: kBuild -Version: 0.1.5 -Release: 7%{?patchlevel:.%{patchlevel}}%{?dist} +Version: 0.1.98 +Release: 1%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -10,7 +10,10 @@ License: BSD and GPLv2+ # 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}%{?patchlevel:-%{patchlevel}}-src.tar.gz +#Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz +# svn co -e2537 http://svn.netlabs.org/repos/kbuild/trunk@2537 kBuild +# tar czf kBuild-r2537.tar.gz --exclude .svn kBuild +Source0: kBuild-r2537.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch Patch2: kBuild-0.1.5-pthread.patch @@ -30,7 +33,8 @@ repository. %prep -%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} +#%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} +%setup -q -n %{name} %patch0 -p1 -b .escape %patch1 -p1 -b .dprintf %patch2 -p1 -b .pthreads @@ -42,7 +46,8 @@ rm -rf kBuild/bin/* %build %define bootstrap_mflags %{_smp_mflags} \\\ CFLAGS="%{optflags}" \\\ - KBUILD_VERBOSE=2 + KBUILD_VERBOSE=2 \\\ + KBUILD_VERSION_PATCH=999 %define mflags %{bootstrap_mflags} \\\ NIX_INSTALL_DIR=%{_prefix} \\\ @@ -80,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 20 2011 Lubomir Rintel - 0.1.98-1.r1 +- Later patchset + * Mon Feb 07 2011 Fedora Release Engineering - 0.1.5-7.p2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 7e06b26..1c7950b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e4e2193aa6cb3f095af2f99bf90d01d kBuild-0.1.5-p2-src.tar.gz +4890acabce44bb9c94f1211eca1c135c kBuild-r2537.tar.gz From 8762eb6be9952c96e29e95de6a2fb61fce47c4eb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:31:00 -0600 Subject: [PATCH 19/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 2b607de..2e5341b 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.5 -Release: 6%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 7%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.1.5-7.p2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Feb 17 2010 Lubomir Rintel - 0.1.5-6.p2 - Fix build - Update to later patch level From f39daf36a5ff036315c86d4b0799ecb01528efdd Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 22 Sep 2011 11:57:48 +0200 Subject: [PATCH 20/97] Update to a later snapshot --- .gitignore | 1 + kBuild.spec | 20 ++++++++++++++------ sources | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7ca5660..49a82c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ kBuild-0.1.5-p2-src.tar.gz +/kBuild-r2537.tar.gz diff --git a/kBuild.spec b/kBuild.spec index 2e5341b..2c8ca6b 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,8 @@ -%global patchlevel p2 +%global patchlevel r1 Name: kBuild -Version: 0.1.5 -Release: 7%{?patchlevel:.%{patchlevel}}%{?dist} +Version: 0.1.98 +Release: 1%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -10,7 +10,10 @@ License: BSD and GPLv2+ # 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}%{?patchlevel:-%{patchlevel}}-src.tar.gz +#Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz +# svn co -e2537 http://svn.netlabs.org/repos/kbuild/trunk@2537 kBuild +# tar czf kBuild-r2537.tar.gz --exclude .svn kBuild +Source0: kBuild-r2537.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch Patch2: kBuild-0.1.5-pthread.patch @@ -30,7 +33,8 @@ repository. %prep -%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} +#%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} +%setup -q -n %{name} %patch0 -p1 -b .escape %patch1 -p1 -b .dprintf %patch2 -p1 -b .pthreads @@ -42,7 +46,8 @@ rm -rf kBuild/bin/* %build %define bootstrap_mflags %{_smp_mflags} \\\ CFLAGS="%{optflags}" \\\ - KBUILD_VERBOSE=2 + KBUILD_VERBOSE=2 \\\ + KBUILD_VERSION_PATCH=999 %define mflags %{bootstrap_mflags} \\\ NIX_INSTALL_DIR=%{_prefix} \\\ @@ -80,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 20 2011 Lubomir Rintel - 0.1.98-1.r1 +- Later patchset + * Mon Feb 07 2011 Fedora Release Engineering - 0.1.5-7.p2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 7e06b26..1c7950b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e4e2193aa6cb3f095af2f99bf90d01d kBuild-0.1.5-p2-src.tar.gz +4890acabce44bb9c94f1211eca1c135c kBuild-r2537.tar.gz From 6c9eff00118dd47f6aa21e7f77c42bc8c890644d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 00:39:02 -0600 Subject: [PATCH 21/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 2c8ca6b..59533a0 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.98 -Release: 1%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 2%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.1.98-2.r1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Sep 20 2011 Lubomir Rintel - 0.1.98-1.r1 - Later patchset From a12eab098175ee3c614d608be04e21572d6dd3c5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 11:56:20 -0500 Subject: [PATCH 22/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 59533a0..74244c2 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.98 -Release: 2%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 3%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.1.98-3.r1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.1.98-2.r1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From a5a7fbcf26bf6ac0f267b6c2cee666cc49674516 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 21:07:19 -0600 Subject: [PATCH 23/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 74244c2..268738f 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.98 -Release: 3%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 4%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.1.98-4.r1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 0.1.98-3.r1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 4d6e4b5aab2634cd77ca22bea508eca71c5a9725 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 16:57:14 -0500 Subject: [PATCH 24/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 268738f..81efaa2 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.98 -Release: 4%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 5%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.1.98-5.r1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 0.1.98-4.r1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 3a0f58c46c2b48c9e68f6ecaaaa11079f560d359 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 24 Oct 2013 11:39:53 +0200 Subject: [PATCH 25/97] Attempt at saner SPEC file formatting I'm doing this semi-automatically across all packages I maintain, since some are several years old and since then several have suffered bit-rot and such. I'm fixing up the following: - Old RPM relics (such as %defattr, BuildRoot or %clean sections) - Whitespace errors (such as trailing spaces) - Consistent use of %{buildroot} - Dropping useless %{name} expansions that harm legibility - Consistent spacing between RPM sections - Bad days in %changelogs --- kBuild.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/kBuild.spec b/kBuild.spec index 81efaa2..eb40a8a 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.98 -Release: 5%{?patchlevel:.%{patchlevel}}%{?dist} +Release: 6%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -17,9 +17,8 @@ Source0: kBuild-r2537.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch Patch2: kBuild-0.1.5-pthread.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: byacc libacl-devel flex +BuildRequires: byacc libacl-devel flex BuildRequires: autoconf automake gettext-devel cvs @@ -65,19 +64,13 @@ kBuild/env.sh kmk %{mflags} rebuild %install -rm -rf $RPM_BUILD_ROOT export KBUILD_VERBOSE=2 -kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install +kBuild/env.sh kmk %{mflags} PATH_INS=%{buildroot} install # These are included later in files section -rm -r $RPM_BUILD_ROOT%{_docdir} - - -%clean -rm -rf $RPM_BUILD_ROOT +rm -r %{buildroot}%{_docdir} %files -%defattr(-,root,root,-) %{_bindir}/* %{_datadir}/* %doc COPYING ChangeLog @@ -85,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 24 2013 Lubomir Rintel - 0.1.98-6.r1 +- Bulk sad and useless attempt at consistent SPEC file formatting + * Sat Aug 03 2013 Fedora Release Engineering - 0.1.98-5.r1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From b855ca0c74593aa131ea3e141c37429cf478f8d4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 24 Oct 2013 13:36:33 +0200 Subject: [PATCH 26/97] Fix ARM build --- kBuild-0.1.98-arm.patch | 27 +++++++++++++++++++++++++++ kBuild.spec | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 kBuild-0.1.98-arm.patch diff --git a/kBuild-0.1.98-arm.patch b/kBuild-0.1.98-arm.patch new file mode 100644 index 0000000..a96d912 --- /dev/null +++ b/kBuild-0.1.98-arm.patch @@ -0,0 +1,27 @@ +From 832a3cb827f74f8d5a0d37d240a9dae291212f01 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Thu, 24 Oct 2013 13:18:06 +0200 +Subject: [PATCH] Recognize more ARM architectures + +Gotten via rpm --eval %arm. +Not reported upstream, since it's not clear how should one submit a patch... +--- + kBuild/env.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kBuild/env.sh b/kBuild/env.sh +index fa3f7be..0ea9ddb 100755 +--- a/kBuild/env.sh ++++ b/kBuild/env.sh +@@ -358,7 +358,7 @@ if test -z "$KBUILD_HOST_ARCH"; then + hppa64|parisc64) + KBUILD_HOST_ARCH='hppa64' + ;; +- arm|armv4l|armv5tel|armv5tejl) ++ armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl) + KBUILD_HOST_ARCH='arm' + ;; + alpha) +-- +1.8.3.1 + diff --git a/kBuild.spec b/kBuild.spec index eb40a8a..b877372 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -17,6 +17,7 @@ Source0: kBuild-r2537.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch Patch2: kBuild-0.1.5-pthread.patch +Patch3: kBuild-0.1.98-arm.patch BuildRequires: byacc libacl-devel flex BuildRequires: autoconf automake gettext-devel cvs @@ -37,6 +38,7 @@ repository. %patch0 -p1 -b .escape %patch1 -p1 -b .dprintf %patch2 -p1 -b .pthreads +%patch3 -p1 -b .arm # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -80,6 +82,7 @@ rm -r %{buildroot}%{_docdir} %changelog * Thu Oct 24 2013 Lubomir Rintel - 0.1.98-6.r1 - Bulk sad and useless attempt at consistent SPEC file formatting +- Fix ARM build * Sat Aug 03 2013 Fedora Release Engineering - 0.1.98-5.r1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 1e160e70ede74cf9560c6d95444a337e0c30360c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Sun, 18 May 2014 17:09:11 +0100 Subject: [PATCH 27/97] Update to trunk HEAD version, have a fix for gcc >= 4.7 (http://trac.netlabs.org/kbuild/ticket/112) - Drop kBuild-0.1.5-dprintf.patch patch, upstream source also have a fix in their own way. - add kBuild-0.1.9998-gl_.patch to fix a regression on compiling in Linux (http://trac.netlabs.org/kbuild/ticket/117), partially reverses changeset 2702 . --- .gitignore | 1 + kBuild-0.1.9998-gl_.patch | 11 +++++++++++ kBuild.spec | 21 +++++++++++++++------ sources | 2 +- 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 kBuild-0.1.9998-gl_.patch diff --git a/.gitignore b/.gitignore index 49a82c0..b179be6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r2537.tar.gz +/kBuild-r2730.tar.gz diff --git a/kBuild-0.1.9998-gl_.patch b/kBuild-0.1.9998-gl_.patch new file mode 100644 index 0000000..14f9f99 --- /dev/null +++ b/kBuild-0.1.9998-gl_.patch @@ -0,0 +1,11 @@ +--- ./src/kmk/dir.c.orig 2014-05-18 13:59:01.671557581 +0100 ++++ ./src/kmk/dir.c 2014-05-18 14:02:49.611887247 +0100 +@@ -1445,7 +1445,7 @@ dir_setup_glob (glob_t *gl) + #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */ + gl->gl_lstat = local_stat; + #endif +-#ifdef KMK ++#if defined(WINDOWS32) && defined(KMK) + gl->gl_exists = file_exists_p; + gl->gl_isdir = dir_exists_p; + #endif diff --git a/kBuild.spec b/kBuild.spec index b877372..5512d57 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,8 @@ -%global patchlevel r1 +%global svn_revision r2730 Name: kBuild -Version: 0.1.98 -Release: 6%{?patchlevel:.%{patchlevel}}%{?dist} +Version: 0.1.9998 +Release: 1%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -13,11 +13,12 @@ URL: http://svn.netlabs.org/kbuild #Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz # svn co -e2537 http://svn.netlabs.org/repos/kbuild/trunk@2537 kBuild # tar czf kBuild-r2537.tar.gz --exclude .svn kBuild -Source0: kBuild-r2537.tar.gz +Source0: kBuild-%{svn_revision}.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch Patch2: kBuild-0.1.5-pthread.patch Patch3: kBuild-0.1.98-arm.patch +Patch4: kBuild-0.1.9998-gl_.patch BuildRequires: byacc libacl-devel flex BuildRequires: autoconf automake gettext-devel cvs @@ -36,9 +37,11 @@ repository. #%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %setup -q -n %{name} %patch0 -p1 -b .escape -%patch1 -p1 -b .dprintf +#patch1 -p1 -b .dprintf %patch2 -p1 -b .pthreads %patch3 -p1 -b .arm +#revert Changeset 2702 for trunk/src/kmk/dir.c +%patch4 -p1 -b .gl_ # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -48,7 +51,7 @@ rm -rf kBuild/bin/* %define bootstrap_mflags %{_smp_mflags} \\\ CFLAGS="%{optflags}" \\\ KBUILD_VERBOSE=2 \\\ - KBUILD_VERSION_PATCH=999 + KBUILD_VERSION_PATCH=9998 %define mflags %{bootstrap_mflags} \\\ NIX_INSTALL_DIR=%{_prefix} \\\ @@ -80,6 +83,12 @@ rm -r %{buildroot}%{_docdir} %changelog +* Sun May 18 2014 Sérgio Basto - 0.1.9998-1.r2730 +- Update to trunk HEAD version, have a fix for gcc >= 4.7 (http://trac.netlabs.org/kbuild/ticket/112) +- Drop kBuild-0.1.5-dprintf.patch patch, upstream source also have a fix in their own way. +- add kBuild-0.1.9998-gl_.patch to fix a regression on compiling in Linux + (http://trac.netlabs.org/kbuild/ticket/117), partially reverses changeset 2702 . + * Thu Oct 24 2013 Lubomir Rintel - 0.1.98-6.r1 - Bulk sad and useless attempt at consistent SPEC file formatting - Fix ARM build diff --git a/sources b/sources index 1c7950b..93bbc62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4890acabce44bb9c94f1211eca1c135c kBuild-r2537.tar.gz +367a7156f98d0cc6cd0da5213e2fa679 kBuild-r2730.tar.gz From 05ea5ee7afb09b58c374e805030344d60e12f51e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 20:25:55 -0500 Subject: [PATCH 28/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 5512d57..496bd36 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 1%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 2%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -83,6 +83,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.1.9998-2.r2730 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun May 18 2014 Sérgio Basto - 0.1.9998-1.r2730 - Update to trunk HEAD version, have a fix for gcc >= 4.7 (http://trac.netlabs.org/kbuild/ticket/112) - Drop kBuild-0.1.5-dprintf.patch patch, upstream source also have a fix in their own way. From 7d75069617993d04cf11b8cdb7c06bfda0cc3019 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 22:42:44 +0000 Subject: [PATCH 29/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 496bd36..6819226 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 2%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 3%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -83,6 +83,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.1.9998-3.r2730 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 0.1.9998-2.r2730 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 2b0728b90350d4defb8592f93a68b75b9376e033 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 12:44:39 +0000 Subject: [PATCH 30/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 6819226..4277d16 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 3%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 4%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -83,6 +83,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.1.9998-4.r2730 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Aug 16 2014 Fedora Release Engineering - 0.1.9998-3.r2730 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 0df46dbcf294cf6d03a99a41ff095db771c9b063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 22 Jun 2015 05:13:03 +0100 Subject: [PATCH 31/97] Update to trunk HEAD version. - Rework patch for glob issue. - Add kBuild-0.1.9998-ppc64le.patch to add support for ppc64le. - Add kbuild-wrong-memset.patch, fix one warning. - Fix License macro. --- .gitignore | 1 + kBuild-0.1.5-dprintf.patch | 38 -------------- kBuild-0.1.9998-gl_.patch | 11 ---- kBuild-0.1.9998-glob.patch | 21 ++++++++ kBuild-0.1.9998-ppc64le.patch | 94 +++++++++++++++++++++++++++++++++++ kBuild.spec | 27 ++++++---- kbuild-wrong-memset.patch | 13 +++++ sources | 2 +- 8 files changed, 148 insertions(+), 59 deletions(-) delete mode 100644 kBuild-0.1.5-dprintf.patch delete mode 100644 kBuild-0.1.9998-gl_.patch create mode 100644 kBuild-0.1.9998-glob.patch create mode 100644 kBuild-0.1.9998-ppc64le.patch create mode 100644 kbuild-wrong-memset.patch diff --git a/.gitignore b/.gitignore index b179be6..352418f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r2537.tar.gz /kBuild-r2730.tar.gz +/kBuild-r2784.tar.gz diff --git a/kBuild-0.1.5-dprintf.patch b/kBuild-0.1.5-dprintf.patch deleted file mode 100644 index 58887f4..0000000 --- a/kBuild-0.1.5-dprintf.patch +++ /dev/null @@ -1,38 +0,0 @@ -This dprintf() collides with POSIX.1-2008 dprintf() and is not used at all -anyways. (Whoa! what a stupid name! standardized before invention of grep!) - -Lubomir Rintel - -diff -up kBuild-0.1.5/src/ash/output.c.gcc44 kBuild-0.1.5/src/ash/output.c ---- kBuild-0.1.5/src/ash/output.c.gcc44 2009-04-13 01:20:33.857017054 +0200 -+++ kBuild-0.1.5/src/ash/output.c 2009-04-13 01:20:57.570033297 +0200 -@@ -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, ...) -diff -up kBuild-0.1.5/src/ash/output.h.gcc44 kBuild-0.1.5/src/ash/output.h ---- kBuild-0.1.5/src/ash/output.h.gcc44 2009-04-13 01:20:37.724140366 +0200 -+++ kBuild-0.1.5/src/ash/output.h 2009-04-13 01:20:47.933142098 +0200 -@@ -65,8 +65,10 @@ void outfmt(struct output *, const char - __attribute__((__format__(__printf__,2,3))); - void out1fmt(const char *, ...) - __attribute__((__format__(__printf__,1,2))); -+#if 0 - void dprintf(const char *, ...) - __attribute__((__format__(__printf__,1,2))); -+#endif - void fmtstr(char *, size_t, const char *, ...) - __attribute__((__format__(__printf__,3,4))); - void doformat(struct output *, const char *, va_list); diff --git a/kBuild-0.1.9998-gl_.patch b/kBuild-0.1.9998-gl_.patch deleted file mode 100644 index 14f9f99..0000000 --- a/kBuild-0.1.9998-gl_.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/kmk/dir.c.orig 2014-05-18 13:59:01.671557581 +0100 -+++ ./src/kmk/dir.c 2014-05-18 14:02:49.611887247 +0100 -@@ -1445,7 +1445,7 @@ dir_setup_glob (glob_t *gl) - #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */ - gl->gl_lstat = local_stat; - #endif --#ifdef KMK -+#if defined(WINDOWS32) && defined(KMK) - gl->gl_exists = file_exists_p; - gl->gl_isdir = dir_exists_p; - #endif diff --git a/kBuild-0.1.9998-glob.patch b/kBuild-0.1.9998-glob.patch new file mode 100644 index 0000000..e3bbaa3 --- /dev/null +++ b/kBuild-0.1.9998-glob.patch @@ -0,0 +1,21 @@ +#Bug: http://trac.netlabs.org/kbuild/ticket/117 +--- ./src/kmk/dir.c.orig 2015-06-22 00:19:25.132189626 +0100 ++++ ./src/kmk/dir.c 2015-06-22 00:21:27.247583054 +0100 +@@ -1310,7 +1310,7 @@ print_dir_data_base (void) + + /* Hooks for globbing. */ + +-#if defined(KMK) && !defined(__OS2__) ++#if defined(KMK) && !defined(__GLIBC__) + # include "glob/glob.h" + #else + #include +@@ -1449,7 +1449,7 @@ dir_setup_glob (glob_t *gl) + #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */ + gl->gl_lstat = local_stat; + #endif +-#if defined(KMK) && !defined(__OS2__) ++#if defined(KMK) && !defined(__GLIBC__) + gl->gl_exists = file_exists_p; + gl->gl_isdir = dir_exists_p; + #endif diff --git a/kBuild-0.1.9998-ppc64le.patch b/kBuild-0.1.9998-ppc64le.patch new file mode 100644 index 0000000..3343c30 --- /dev/null +++ b/kBuild-0.1.9998-ppc64le.patch @@ -0,0 +1,94 @@ +From: Michel Normand +Subject: kBuild 0.1.9998 ppc64le +Date: Mon, 18 May 2015 08:46:41 -0400 + +kBuild 0.1.9998 ppc64le +patch retrieved from opensuse url below and refresh to match fedora source tree. +but seems never uploaded upstream. +https://build.opensuse.org/package/view_file/devel:tools:building/kbuild/ppc64le.patch?expand=1 + +Signed-off-by: Michel Normand +--- + kBuild/env.sh | 3 +++ + kBuild/header.kmk | 6 +++--- + src/lib/k/kDefs.h | 2 ++ + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: kBuild/kBuild/env.sh +=================================================================== +--- kBuild.orig/kBuild/env.sh ++++ kBuild/kBuild/env.sh +@@ -347,6 +347,9 @@ if test -z "$KBUILD_HOST_ARCH"; then + ppc64|powerpc64) + KBUILD_HOST_ARCH='ppc64' + ;; ++ ppc64le|powerpc64le) ++ KBUILD_HOST_ARCH='ppc64le' ++ ;; + mips32|mips) + KBUILD_HOST_ARCH='mips32' + ;; +Index: kBuild/kBuild/header.kmk +=================================================================== +--- kBuild.orig/kBuild/header.kmk ++++ kBuild/kBuild/header.kmk +@@ -189,8 +189,8 @@ KBUILD_BLD_TYPES := release profile debu + # build types. (PORTME) + # + KBUILD_OSES := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic +-KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha +-KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha ++KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha ++KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha + KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm + + +@@ -481,7 +481,7 @@ endif + KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) + KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH) + +-if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 s390x sparc64) ++if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 ppc64le s390x sparc64) + ifeq ($(KBUILD_TARGET_ARCH),amd64) + KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86 + else ifeq ($(KBUILD_TARGET_ARCH),hppa64) +Index: kbuild-0.1.9998svn2720/src/lib/k/kDefs.h +=================================================================== +--- kbuild-0.1.9998svn2720.orig/src/lib/k/kDefs.h ++++ kbuild-0.1.9998svn2720/src/lib/k/kDefs.h +@@ -158,16 +158,18 @@ + #define K_ARCH_POWERPC_32 (13 | K_ARCH_BIT_32 | K_ARCH_END_BI) + /** 64-bit PowerPC. */ + #define K_ARCH_POWERPC_64 (14 | K_ARCH_BIT_64 | K_ARCH_END_BI) ++/** 64-bit PowerPC. */ ++#define K_ARCH_POWERPC_64LE (15 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) + /** 32(31)-bit S390. */ +-#define K_ARCH_S390_32 (15 | K_ARCH_BIT_32 | K_ARCH_END_BIG) ++#define K_ARCH_S390_32 (16 | K_ARCH_BIT_32 | K_ARCH_END_BIG) + /** 64-bit S390. */ +-#define K_ARCH_S390_64 (16 | K_ARCH_BIT_64 | K_ARCH_END_BIG) ++#define K_ARCH_S390_64 (17 | K_ARCH_BIT_64 | K_ARCH_END_BIG) + /** 32-bit SPARC. */ +-#define K_ARCH_SPARC_32 (17 | K_ARCH_BIT_32 | K_ARCH_END_BIG) ++#define K_ARCH_SPARC_32 (18 | K_ARCH_BIT_32 | K_ARCH_END_BIG) + /** 64-bit SPARC. */ +-#define K_ARCH_SPARC_64 (18 | K_ARCH_BIT_64 | K_ARCH_END_BI) ++#define K_ARCH_SPARC_64 (19 | K_ARCH_BIT_64 | K_ARCH_END_BI) + /** The end of the valid architecture values (exclusive). */ +-#define K_ARCH_MAX (19) ++#define K_ARCH_MAX (20) + /** @} */ + + +@@ -194,8 +196,10 @@ + # define K_ARCH K_ARCH_MIPS_64 + # elif defined(__mips__) + # define K_ARCH K_ARCH_MIPS_32 +-# elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) ++# elif (defined(__powerpc64__) && defined(__BIG_ENDIAN__))|| defined(__ppc64__) || defined(__PPC64__) + # define K_ARCH K_ARCH_POWERPC_64 ++# elif (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) ++# define K_ARCH K_ARCH_POWERPC_64LE + # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) + # define K_ARCH K_ARCH_POWERPC_32 + # elif defined(__sparcv9__) || defined(__sparcv9) diff --git a/kBuild.spec b/kBuild.spec index 4277d16..7909667 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,8 @@ -%global svn_revision r2730 +%global svn_revision r2784 Name: kBuild Version: 0.1.9998 -Release: 4%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 5%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -15,10 +15,12 @@ URL: http://svn.netlabs.org/kbuild # tar czf kBuild-r2537.tar.gz --exclude .svn kBuild Source0: kBuild-%{svn_revision}.tar.gz Patch0: kBuild-0.1.3-escape.patch -Patch1: kBuild-0.1.5-dprintf.patch Patch2: kBuild-0.1.5-pthread.patch Patch3: kBuild-0.1.98-arm.patch -Patch4: kBuild-0.1.9998-gl_.patch +#Bug: http://svn.netlabs.org/kbuild/ticket/117 +Patch4: kBuild-0.1.9998-glob.patch +Patch5: kbuild-wrong-memset.patch +Patch6: kBuild-0.1.9998-ppc64le.patch BuildRequires: byacc libacl-devel flex BuildRequires: autoconf automake gettext-devel cvs @@ -37,11 +39,11 @@ repository. #%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %setup -q -n %{name} %patch0 -p1 -b .escape -#patch1 -p1 -b .dprintf %patch2 -p1 -b .pthreads %patch3 -p1 -b .arm -#revert Changeset 2702 for trunk/src/kmk/dir.c -%patch4 -p1 -b .gl_ +%patch4 -p1 -b .glob +%patch5 -p1 -b .memset +%patch6 -p1 -b .ppc64le # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -78,11 +80,18 @@ rm -r %{buildroot}%{_docdir} %files %{_bindir}/* %{_datadir}/* -%doc COPYING ChangeLog -%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference* +%doc ChangeLog kBuild/doc/QuickReference* +%license COPYING kBuild/doc/COPYING-FDL-1.3 %changelog +* Mon Jun 22 2015 Sérgio Basto - 0.1.9998-5.r2784 +- Update to trunk HEAD version. +- Rework patch for glob issue. +- Add kBuild-0.1.9998-ppc64le.patch to add support for ppc64le. +- Add kbuild-wrong-memset.patch, fix one warning. +- Fix License macro. + * Wed Jun 17 2015 Fedora Release Engineering - 0.1.9998-4.r2730 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/kbuild-wrong-memset.patch b/kbuild-wrong-memset.patch new file mode 100644 index 0000000..eebe7e6 --- /dev/null +++ b/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 */ + } + + diff --git a/sources b/sources index 93bbc62..7041089 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -367a7156f98d0cc6cd0da5213e2fa679 kBuild-r2730.tar.gz +273c9c8f8cdedc89981e73793bc2a9e7 kBuild-r2784.tar.gz From dd4eb399de4b91fae6eaf6c9e15f8b1c179311d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 22 Dec 2015 14:59:56 +0000 Subject: [PATCH 32/97] Add support for aarch64 (#1291091). --- kBuild-0.1.9998-aarch64.patch | 38 +++++++++++++++++++++++++++++++++++ kBuild-snapshot.sh | 21 +++++++++++++++++++ kBuild.spec | 11 ++++++---- 3 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 kBuild-0.1.9998-aarch64.patch create mode 100755 kBuild-snapshot.sh diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch new file mode 100644 index 0000000..1459d7f --- /dev/null +++ b/kBuild-0.1.9998-aarch64.patch @@ -0,0 +1,38 @@ +Based on Debian 12_arm64.diff + +--- a/kBuild/env.sh ++++ b/kBuild/env.sh +@@ -368,6 +368,9 @@ + armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl) + KBUILD_HOST_ARCH='arm' + ;; ++ aarch64) ++ KBUILD_HOST_ARCH='arm64' ++ ;; + alpha) + KBUILD_HOST_ARCH='alpha' + ;; +--- a/kBuild/header.kmk ++++ b/kBuild/header.kmk +@@ -189,8 +189,8 @@ + # build types. (PORTME) + # + KBUILD_OSES := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic +-KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha +-KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha ++KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm arm64 alpha ++KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 arm64 alpha + KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm + + +--- a/src/lib/k/kDefs.h ++++ b/src/lib/k/kDefs.h +@@ -188,6 +188,8 @@ + # define K_ARCH K_ARCH_ALPHA + # elif defined(__arm__) || defined(__arm32__) + # define K_ARCH K_ARCH_ARM_32 ++# elif defined(__aarch64__) ++# define K_ARCH K_ARCH_ARM_64 + # elif defined(__hppa__) && defined(__LP64__) + # define K_ARCH K_ARCH_PARISC_64 + # elif defined(__hppa__) diff --git a/kBuild-snapshot.sh b/kBuild-snapshot.sh new file mode 100755 index 0000000..926a453 --- /dev/null +++ b/kBuild-snapshot.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e + +tmp=$(mktemp -d) + +trap cleanup EXIT +cleanup() { + set +e + [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" +} + +unset CDPATH +pwd=$(pwd) +svn=$(date +%Y%m%d) + +#cd "$tmp" +svn co http://svn.netlabs.org/repos/kbuild/trunk/ kBuild +revision=$(svnversion kBuild) +tar zcf kBuild-r$revision\.tar.gz kBuild --exclude=.svn +#cd - >/dev/null diff --git a/kBuild.spec b/kBuild.spec index 7909667..34d215f 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 5%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 6%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -10,9 +10,7 @@ License: BSD and GPLv2+ # 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}%{?patchlevel:-%{patchlevel}}-src.tar.gz -# svn co -e2537 http://svn.netlabs.org/repos/kbuild/trunk@2537 kBuild -# tar czf kBuild-r2537.tar.gz --exclude .svn kBuild +#Generated with kBuild-snapshot.sh Source0: kBuild-%{svn_revision}.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch2: kBuild-0.1.5-pthread.patch @@ -21,6 +19,7 @@ Patch3: kBuild-0.1.98-arm.patch Patch4: kBuild-0.1.9998-glob.patch Patch5: kbuild-wrong-memset.patch Patch6: kBuild-0.1.9998-ppc64le.patch +Patch7: kBuild-0.1.9998-aarch64.patch BuildRequires: byacc libacl-devel flex BuildRequires: autoconf automake gettext-devel cvs @@ -44,6 +43,7 @@ repository. %patch4 -p1 -b .glob %patch5 -p1 -b .memset %patch6 -p1 -b .ppc64le +%patch7 -p1 -b .aarch64 # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -85,6 +85,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Mon Dec 21 2015 Yaakov Selkowitz - 0.1.9998-6.r2784 +- Add support for aarch64 (#1291091). + * Mon Jun 22 2015 Sérgio Basto - 0.1.9998-5.r2784 - Update to trunk HEAD version. - Rework patch for glob issue. From edcaa2d6940b9d110f96285c2cb7bff9bf385162 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 01:34:28 +0000 Subject: [PATCH 33/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 34d215f..156d272 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 6%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 7%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -85,6 +85,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.1.9998-7.r2784 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Dec 21 2015 Yaakov Selkowitz - 0.1.9998-6.r2784 - Add support for aarch64 (#1291091). From f8eebdc1ffa646d1e382b7702f01bca4b283f22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 29 Apr 2016 08:32:56 +0100 Subject: [PATCH 34/97] Update kBuild to svn rev 2814 --- kBuild-0.1.9998-aarch64.patch | 4 ++-- kBuild-0.1.9998-ppc64le.patch | 4 ++-- kBuild.spec | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch index 1459d7f..9aa3d53 100644 --- a/kBuild-0.1.9998-aarch64.patch +++ b/kBuild-0.1.9998-aarch64.patch @@ -18,9 +18,9 @@ Based on Debian 12_arm64.diff # build types. (PORTME) # KBUILD_OSES := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic --KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha +-KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch -KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha -+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm arm64 alpha ++KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm arm64 alpha noarch +KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 arm64 alpha KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm diff --git a/kBuild-0.1.9998-ppc64le.patch b/kBuild-0.1.9998-ppc64le.patch index 3343c30..5e44da3 100644 --- a/kBuild-0.1.9998-ppc64le.patch +++ b/kBuild-0.1.9998-ppc64le.patch @@ -36,9 +36,9 @@ Index: kBuild/kBuild/header.kmk # build types. (PORTME) # KBUILD_OSES := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic --KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha +-KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch -KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha -+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha ++KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch +KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm diff --git a/kBuild.spec b/kBuild.spec index 156d272..77ac425 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,8 @@ -%global svn_revision r2784 +%global svn_revision r2814 Name: kBuild Version: 0.1.9998 -Release: 7%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 8%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -85,6 +85,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Fri Apr 29 2016 Sérgio Basto - 0.1.9998-8.r2814 +- Update kBuild to svn rev 2814 + * Thu Feb 04 2016 Fedora Release Engineering - 0.1.9998-7.r2784 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 368ed883fdbade1e896519bcedb59832e02866df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 29 Apr 2016 08:36:39 +0100 Subject: [PATCH 35/97] kBuild-r2814.tar.gz uploaded --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 352418f..aed890a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r2537.tar.gz /kBuild-r2730.tar.gz /kBuild-r2784.tar.gz +/kBuild-r2814.tar.gz diff --git a/sources b/sources index 7041089..f4039a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -273c9c8f8cdedc89981e73793bc2a9e7 kBuild-r2784.tar.gz +8ef34a1246f11e3675bba9f41f6848f0 kBuild-r2814.tar.gz From ae6ae67c6bfbb1fafb25cc317eebc3b97abd9f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 26 Jul 2016 22:04:45 +0100 Subject: [PATCH 36/97] add BR:bison --- kBuild.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 77ac425..76960d1 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 8%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 9%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -22,6 +22,7 @@ Patch6: kBuild-0.1.9998-ppc64le.patch Patch7: kBuild-0.1.9998-aarch64.patch BuildRequires: byacc libacl-devel flex +BuildRequires: bison BuildRequires: autoconf automake gettext-devel cvs @@ -85,6 +86,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Tue Jul 26 2016 Sérgio Basto - 0.1.9998-9.r2814 +- add BR:bison + * Fri Apr 29 2016 Sérgio Basto - 0.1.9998-8.r2814 - Update kBuild to svn rev 2814 From 1e70ef8b6e2fcccf547f11ee0bfca8a6271b911a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 6 Sep 2016 01:05:38 +0100 Subject: [PATCH 37/97] Fix el6 build --- kBuild.spec | 7 ++++++- kbuild-PKMKCCEVALPROG.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 kbuild-PKMKCCEVALPROG.patch diff --git a/kBuild.spec b/kBuild.spec index 76960d1..7c9d7a3 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 9%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 10%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -20,6 +20,7 @@ Patch4: kBuild-0.1.9998-glob.patch Patch5: kbuild-wrong-memset.patch Patch6: kBuild-0.1.9998-ppc64le.patch Patch7: kBuild-0.1.9998-aarch64.patch +Patch8: kbuild-PKMKCCEVALPROG.patch BuildRequires: byacc libacl-devel flex BuildRequires: bison @@ -45,6 +46,7 @@ repository. %patch5 -p1 -b .memset %patch6 -p1 -b .ppc64le %patch7 -p1 -b .aarch64 +%patch8 -p1 -b .el6 # Remove prebuilt stuff rm -rf kBuild/bin/* @@ -86,6 +88,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Tue Sep 06 2016 Sérgio Basto - 0.1.9998-10.r2814 +- Fix el6 build + * Tue Jul 26 2016 Sérgio Basto - 0.1.9998-9.r2814 - add BR:bison diff --git a/kbuild-PKMKCCEVALPROG.patch b/kbuild-PKMKCCEVALPROG.patch new file mode 100644 index 0000000..38eb13d --- /dev/null +++ b/kbuild-PKMKCCEVALPROG.patch @@ -0,0 +1,11 @@ +--- kBuild/src/kmk/kmk_cc_exec.c.orig 2016-09-06 00:36:01.532744692 +0100 ++++ kBuild/src/kmk/kmk_cc_exec.c 2016-09-06 00:59:20.422121237 +0100 +@@ -960,7 +960,7 @@ typedef struct kmk_cc_evalprog + /** Reference count. */ + uint32_t volatile cRefs; + } KMKCCEVALPROG; +-typedef KMKCCEVALPROG *PKMKCCEVALPROG; ++//typedef KMKCCEVALPROG *PKMKCCEVALPROG; + + /** @} */ + From 80346c8410077be143887d71fe7254249f8985d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 6 Sep 2016 03:01:41 +0100 Subject: [PATCH 38/97] Fix description now is called just VirtualBox --- kBuild.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 7c9d7a3..3b4eb31 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -32,7 +32,7 @@ This is a GNU make fork with a set of scripts to simplify complex tasks and portable versions of various UNIX tools to ensure cross-platform portability. -It is used mainly to build VirtualBox OSE packages for RPM Fusion +It is used mainly to build VirtualBox packages for RPM Fusion repository. From 4ef25c2a42b5e2d1f2f123548939260eb6716baa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 17:33:28 +0000 Subject: [PATCH 39/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 3b4eb31..61dd516 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 10%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 11%{?svn_revision:.%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -88,6 +88,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.1.9998-11.r2814 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Sep 06 2016 Sérgio Basto - 0.1.9998-10.r2814 - Fix el6 build From 15a28d23cbe40b7edfee833159ff09d13da28f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 14 Jun 2017 04:15:44 +0100 Subject: [PATCH 40/97] Update kBuild to revison 3025 Upstream already fixed these 2: deleted: kBuild-0.1.9998-glob.patch deleted: kbuild-PKMKCCEVALPROG.patch Rebased: modified: kBuild-0.1.98-arm.patch modified: kBuild-0.1.9998-aarch64.patch modified: kBuild-0.1.9998-ppc64le.patch --- .gitignore | 1 + kBuild-0.1.98-arm.patch | 2 +- kBuild-0.1.9998-aarch64.patch | 8 +++--- kBuild-0.1.9998-glob.patch | 21 --------------- kBuild-0.1.9998-ppc64le.patch | 4 +-- kBuild-snapshot.sh | 2 +- kBuild.spec | 48 ++++++++++++++++++++--------------- kbuild-PKMKCCEVALPROG.patch | 11 -------- sources | 2 +- 9 files changed, 37 insertions(+), 62 deletions(-) delete mode 100644 kBuild-0.1.9998-glob.patch delete mode 100644 kbuild-PKMKCCEVALPROG.patch diff --git a/.gitignore b/.gitignore index aed890a..af56a76 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r2730.tar.gz /kBuild-r2784.tar.gz /kBuild-r2814.tar.gz +/kBuild-r3050.tar.gz diff --git a/kBuild-0.1.98-arm.patch b/kBuild-0.1.98-arm.patch index a96d912..df79e26 100644 --- a/kBuild-0.1.98-arm.patch +++ b/kBuild-0.1.98-arm.patch @@ -18,7 +18,7 @@ index fa3f7be..0ea9ddb 100755 KBUILD_HOST_ARCH='hppa64' ;; - arm|armv4l|armv5tel|armv5tejl) -+ armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl) ++ armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl) KBUILD_HOST_ARCH='arm' ;; alpha) diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch index 9aa3d53..9f678f6 100644 --- a/kBuild-0.1.9998-aarch64.patch +++ b/kBuild-0.1.9998-aarch64.patch @@ -2,8 +2,8 @@ Based on Debian 12_arm64.diff --- a/kBuild/env.sh +++ b/kBuild/env.sh -@@ -368,6 +368,9 @@ - armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl) +@@ -368,6 +368,9 @@ if test -z "$KBUILD_HOST_ARCH"; then + armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl) KBUILD_HOST_ARCH='arm' ;; + aarch64) @@ -25,8 +25,8 @@ Based on Debian 12_arm64.diff KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm ---- a/src/lib/k/kDefs.h -+++ b/src/lib/k/kDefs.h +--- a/src/lib/kStuff/include/k/kDefs.h ++++ b/src/lib/kStuff/include/k/kDefs.h @@ -188,6 +188,8 @@ # define K_ARCH K_ARCH_ALPHA # elif defined(__arm__) || defined(__arm32__) diff --git a/kBuild-0.1.9998-glob.patch b/kBuild-0.1.9998-glob.patch deleted file mode 100644 index e3bbaa3..0000000 --- a/kBuild-0.1.9998-glob.patch +++ /dev/null @@ -1,21 +0,0 @@ -#Bug: http://trac.netlabs.org/kbuild/ticket/117 ---- ./src/kmk/dir.c.orig 2015-06-22 00:19:25.132189626 +0100 -+++ ./src/kmk/dir.c 2015-06-22 00:21:27.247583054 +0100 -@@ -1310,7 +1310,7 @@ print_dir_data_base (void) - - /* Hooks for globbing. */ - --#if defined(KMK) && !defined(__OS2__) -+#if defined(KMK) && !defined(__GLIBC__) - # include "glob/glob.h" - #else - #include -@@ -1449,7 +1449,7 @@ dir_setup_glob (glob_t *gl) - #ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */ - gl->gl_lstat = local_stat; - #endif --#if defined(KMK) && !defined(__OS2__) -+#if defined(KMK) && !defined(__GLIBC__) - gl->gl_exists = file_exists_p; - gl->gl_isdir = dir_exists_p; - #endif diff --git a/kBuild-0.1.9998-ppc64le.patch b/kBuild-0.1.9998-ppc64le.patch index 5e44da3..479c06d 100644 --- a/kBuild-0.1.9998-ppc64le.patch +++ b/kBuild-0.1.9998-ppc64le.patch @@ -54,8 +54,8 @@ Index: kBuild/kBuild/header.kmk else ifeq ($(KBUILD_TARGET_ARCH),hppa64) Index: kbuild-0.1.9998svn2720/src/lib/k/kDefs.h =================================================================== ---- kbuild-0.1.9998svn2720.orig/src/lib/k/kDefs.h -+++ kbuild-0.1.9998svn2720/src/lib/k/kDefs.h +--- kbuild-0.1.9998svn2720.orig/src/lib/kStuff/include/k/kDefs.h ++++ kbuild-0.1.9998svn2720/src/lib/kStuff/include/k/kDefs.h @@ -158,16 +158,18 @@ #define K_ARCH_POWERPC_32 (13 | K_ARCH_BIT_32 | K_ARCH_END_BI) /** 64-bit PowerPC. */ diff --git a/kBuild-snapshot.sh b/kBuild-snapshot.sh index 926a453..1cdc4f2 100755 --- a/kBuild-snapshot.sh +++ b/kBuild-snapshot.sh @@ -17,5 +17,5 @@ svn=$(date +%Y%m%d) #cd "$tmp" svn co http://svn.netlabs.org/repos/kbuild/trunk/ kBuild revision=$(svnversion kBuild) -tar zcf kBuild-r$revision\.tar.gz kBuild --exclude=.svn +tar zcf kBuild-r$revision\.tar.gz --exclude=kBuild/bin --exclude=.svn kBuild #cd - >/dev/null diff --git a/kBuild.spec b/kBuild.spec index 61dd516..32fd2db 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,8 @@ -%global svn_revision r2814 +%global svn_revision 3050 Name: kBuild Version: 0.1.9998 -Release: 11%{?svn_revision:.%{svn_revision}}%{?dist} +Release: 12%{?svn_revision:.r%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -11,20 +11,17 @@ License: BSD and GPLv2+ # and make and sed are from GNU URL: http://svn.netlabs.org/kbuild #Generated with kBuild-snapshot.sh -Source0: kBuild-%{svn_revision}.tar.gz +Source0: kBuild-r%{svn_revision}.tar.gz Patch0: kBuild-0.1.3-escape.patch -Patch2: kBuild-0.1.5-pthread.patch +Patch1: kBuild-0.1.5-pthread.patch +Patch2: kbuild-wrong-memset.patch Patch3: kBuild-0.1.98-arm.patch -#Bug: http://svn.netlabs.org/kbuild/ticket/117 -Patch4: kBuild-0.1.9998-glob.patch -Patch5: kbuild-wrong-memset.patch -Patch6: kBuild-0.1.9998-ppc64le.patch -Patch7: kBuild-0.1.9998-aarch64.patch -Patch8: kbuild-PKMKCCEVALPROG.patch +Patch4: kBuild-0.1.9998-ppc64le.patch +Patch5: kBuild-0.1.9998-aarch64.patch BuildRequires: byacc libacl-devel flex BuildRequires: bison -BuildRequires: autoconf automake gettext-devel cvs +BuildRequires: autoconf automake gettext-devel %description @@ -40,19 +37,17 @@ repository. #%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %setup -q -n %{name} %patch0 -p1 -b .escape -%patch2 -p1 -b .pthreads +%patch1 -p1 -b .pthreads +%patch2 -p1 -b .memset %patch3 -p1 -b .arm -%patch4 -p1 -b .glob -%patch5 -p1 -b .memset -%patch6 -p1 -b .ppc64le -%patch7 -p1 -b .aarch64 -%patch8 -p1 -b .el6 - -# Remove prebuilt stuff -rm -rf kBuild/bin/* +%patch4 -p1 -b .ppc64le +%patch5 -p1 -b .aarch64 %build +echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk > SvnInfo.kmk +echo KBUILD_SVN_REV := %{svn_revision} >> SvnInfo.kmk + %define bootstrap_mflags %{_smp_mflags} \\\ CFLAGS="%{optflags}" \\\ KBUILD_VERBOSE=2 \\\ @@ -69,8 +64,9 @@ rm -rf kBuild/bin/* # kmk versions, so with this we are on a safer side find -name config.log -delete kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags} - kBuild/env.sh kmk %{mflags} rebuild +#pod2man -c 'kBuild for Debian GNU/Linux' \ +# -r kBuild-$(DEB_UPSTREAM_VERSION) debian/kmk.pod > debian/kmk.1 %install @@ -88,6 +84,16 @@ rm -r %{buildroot}%{_docdir} %changelog +* Wed Jun 14 2017 Sérgio Basto - 0.1.9998-12.r3025 +- Update kBuild to revison 3025 +- Upstream already fixed these 2: + deleted: kBuild-0.1.9998-glob.patch + deleted: kbuild-PKMKCCEVALPROG.patch +- Rebased: + modified: kBuild-0.1.98-arm.patch + modified: kBuild-0.1.9998-aarch64.patch + modified: kBuild-0.1.9998-ppc64le.patch + * Fri Feb 10 2017 Fedora Release Engineering - 0.1.9998-11.r2814 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/kbuild-PKMKCCEVALPROG.patch b/kbuild-PKMKCCEVALPROG.patch deleted file mode 100644 index 38eb13d..0000000 --- a/kbuild-PKMKCCEVALPROG.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kBuild/src/kmk/kmk_cc_exec.c.orig 2016-09-06 00:36:01.532744692 +0100 -+++ kBuild/src/kmk/kmk_cc_exec.c 2016-09-06 00:59:20.422121237 +0100 -@@ -960,7 +960,7 @@ typedef struct kmk_cc_evalprog - /** Reference count. */ - uint32_t volatile cRefs; - } KMKCCEVALPROG; --typedef KMKCCEVALPROG *PKMKCCEVALPROG; -+//typedef KMKCCEVALPROG *PKMKCCEVALPROG; - - /** @} */ - diff --git a/sources b/sources index f4039a6..ff30acd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ef34a1246f11e3675bba9f41f6848f0 kBuild-r2814.tar.gz +SHA512 (kBuild-r3050.tar.gz) = b020875391484d0dc3ffc163ba5aaff421256b26edd1d188504a24edcbdcaa1056b975e4ee2997f49e6f085c33d546d3c043a0a20d94ff0f9e25896942bf7134 From e3ebb956e66eca4d0678c39436c5091d54351754 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 14:50:46 +0000 Subject: [PATCH 41/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 32fd2db..17aee67 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 12%{?svn_revision:.r%{svn_revision}}%{?dist} +Release: 13%{?svn_revision:.r%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -84,6 +84,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.1.9998-13.r3050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jun 14 2017 Sérgio Basto - 0.1.9998-12.r3025 - Update kBuild to revison 3025 - Upstream already fixed these 2: From 9756a526611bb0ba1055f2ba30f0e8b7c111f0d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 00:06:14 +0000 Subject: [PATCH 42/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 17aee67..cf8b7d9 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 13%{?svn_revision:.r%{svn_revision}}%{?dist} +Release: 14%{?svn_revision:.r%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -84,6 +84,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.1.9998-14.r3050 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.1.9998-13.r3050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bd02294987de4adc203a75a28aeea159602a86ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Dec 2017 23:35:11 +0000 Subject: [PATCH 43/97] Update kBuild to svn rev 3127 arm and kbuild-wrong-memset patches fixed in upstream way deleted: kBuild-0.1.98-arm.patch deleted: kbuild-wrong-memset.patch Rebased aarch64 not sure if needed, ppc64le much more simple modified: kBuild-0.1.9998-aarch64.patch modified: kBuild-0.1.9998-ppc64le.patch modified: kBuild-pthread.patch --- kBuild-0.1.5-pthread.patch | 12 ----- kBuild-0.1.98-arm.patch | 27 ----------- kBuild-0.1.9998-aarch64.patch | 64 +++++++++++++++---------- kBuild-0.1.9998-ppc64le.patch | 90 +++++++---------------------------- kBuild-pthread.patch | 14 ++++++ kBuild.spec | 26 +++++++--- kbuild-wrong-memset.patch | 13 ----- 7 files changed, 90 insertions(+), 156 deletions(-) delete mode 100644 kBuild-0.1.5-pthread.patch delete mode 100644 kBuild-0.1.98-arm.patch create mode 100644 kBuild-pthread.patch delete mode 100644 kbuild-wrong-memset.patch diff --git a/kBuild-0.1.5-pthread.patch b/kBuild-0.1.5-pthread.patch deleted file mode 100644 index 01d6602..0000000 --- a/kBuild-0.1.5-pthread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kBuild-0.1.5-p1/Config.kmk.pthreads kBuild-0.1.5-p1/Config.kmk ---- kBuild-0.1.5-p1/Config.kmk.pthreads 2010-02-18 08:27:24.287688965 +0100 -+++ kBuild-0.1.5-p1/Config.kmk 2010-02-18 08:28:07.505493345 +0100 -@@ -282,6 +282,8 @@ ifndef TEMPLATE_BIN_TOOL - endif - ifeq ($(KBUILD_TARGET),linux) - TEMPLATE_BIN_LIBS += rt -+ TEMPLATE_BIN_LIBS += pthread -+ TEMPLATE_BIN_LDFLAGS += -Wl,--as-needed - endif - TEMPLATE_BIN_CFLAGS.x86 += -m32 - TEMPLATE_BIN_CFLAGS.sparc32 += -m32 diff --git a/kBuild-0.1.98-arm.patch b/kBuild-0.1.98-arm.patch deleted file mode 100644 index df79e26..0000000 --- a/kBuild-0.1.98-arm.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 832a3cb827f74f8d5a0d37d240a9dae291212f01 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Thu, 24 Oct 2013 13:18:06 +0200 -Subject: [PATCH] Recognize more ARM architectures - -Gotten via rpm --eval %arm. -Not reported upstream, since it's not clear how should one submit a patch... ---- - kBuild/env.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kBuild/env.sh b/kBuild/env.sh -index fa3f7be..0ea9ddb 100755 ---- a/kBuild/env.sh -+++ b/kBuild/env.sh -@@ -358,7 +358,7 @@ if test -z "$KBUILD_HOST_ARCH"; then - hppa64|parisc64) - KBUILD_HOST_ARCH='hppa64' - ;; -- arm|armv4l|armv5tel|armv5tejl) -+ armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl) - KBUILD_HOST_ARCH='arm' - ;; - alpha) --- -1.8.3.1 - diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch index 9f678f6..7b3885e 100644 --- a/kBuild-0.1.9998-aarch64.patch +++ b/kBuild-0.1.9998-aarch64.patch @@ -1,38 +1,54 @@ -Based on Debian 12_arm64.diff - ---- a/kBuild/env.sh -+++ b/kBuild/env.sh -@@ -368,6 +368,9 @@ if test -z "$KBUILD_HOST_ARCH"; then - armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl) - KBUILD_HOST_ARCH='arm' +Index: kbuild-0.1.9998svn3110/kBuild/env.sh +=================================================================== +--- kbuild-0.1.9998svn3110.orig/kBuild/env.sh ++++ kbuild-0.1.9998svn3110/kBuild/env.sh +@@ -395,6 +395,9 @@ if test -z "$KBUILD_HOST_ARCH"; then + sparc64|sparcv9) + KBUILD_HOST_ARCH='sparc64' ;; + aarch64) -+ KBUILD_HOST_ARCH='arm64' ++ KBUILD_HOST_ARCH='aarch64' + ;; - alpha) - KBUILD_HOST_ARCH='alpha' - ;; ---- a/kBuild/header.kmk -+++ b/kBuild/header.kmk -@@ -189,8 +189,8 @@ + + *) echo "$0: unknown cpu/arch - $KBUILD_HOST_ARCH" 1>&${ERR_REDIR} + sleep 1 +Index: kbuild-0.1.9998svn3110/kBuild/header.kmk +=================================================================== +--- kbuild-0.1.9998svn3110.orig/kBuild/header.kmk ++++ kbuild-0.1.9998svn3110/kBuild/header.kmk +@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu # build types. (PORTME) # - KBUILD_OSES := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic --KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch --KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha -+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm arm64 alpha noarch -+KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 arm64 alpha - KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm + KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic +-KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 +-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 ++KBUILD_ARCHES := x86 amd64 aarch64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 ++KBUILD_ARCHES_64 := amd64 aarch64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 + KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 ---- a/src/lib/kStuff/include/k/kDefs.h -+++ b/src/lib/kStuff/include/k/kDefs.h -@@ -188,6 +188,8 @@ +Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h +=================================================================== +--- kbuild-0.1.9998svn3110.orig/src/lib/kStuff/include/k/kDefs.h ++++ kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h +@@ -160,6 +160,8 @@ + #define K_ARCH_ARM_64 ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI) + /** Motorola 68000 (32-bit). */ + #define K_ARCH_M68K ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG) ++/** 64-bit AARCH. */ ++#define K_ARCH_AARCH_64 ( 8 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) + /** 32-bit MIPS. */ + #define K_ARCH_MIPS_32 ( 7 | K_ARCH_BIT_32 | K_ARCH_END_BI) + /** 64-bit MIPS. */ +@@ -206,8 +208,10 @@ # define K_ARCH K_ARCH_ALPHA # elif defined(__arm__) || defined(__arm32__) # define K_ARCH K_ARCH_ARM_32 +-# elif defined(__aarch64__) || defined(__arm64__) ++# elif defined(__arm64__) + # define K_ARCH K_ARCH_ARM_64 +# elif defined(__aarch64__) -+# define K_ARCH K_ARCH_ARM_64 ++# define K_ARCH K_ARCH_AARCH_64 # elif defined(__hppa__) && defined(__LP64__) # define K_ARCH K_ARCH_PARISC_64 # elif defined(__hppa__) diff --git a/kBuild-0.1.9998-ppc64le.patch b/kBuild-0.1.9998-ppc64le.patch index 479c06d..5d7f731 100644 --- a/kBuild-0.1.9998-ppc64le.patch +++ b/kBuild-0.1.9998-ppc64le.patch @@ -1,26 +1,10 @@ -From: Michel Normand -Subject: kBuild 0.1.9998 ppc64le -Date: Mon, 18 May 2015 08:46:41 -0400 - -kBuild 0.1.9998 ppc64le -patch retrieved from opensuse url below and refresh to match fedora source tree. -but seems never uploaded upstream. -https://build.opensuse.org/package/view_file/devel:tools:building/kbuild/ppc64le.patch?expand=1 - -Signed-off-by: Michel Normand ---- - kBuild/env.sh | 3 +++ - kBuild/header.kmk | 6 +++--- - src/lib/k/kDefs.h | 2 ++ - 3 files changed, 8 insertions(+), 3 deletions(-) - -Index: kBuild/kBuild/env.sh +Index: kBuild/env.sh =================================================================== ---- kBuild.orig/kBuild/env.sh -+++ kBuild/kBuild/env.sh -@@ -347,6 +347,9 @@ if test -z "$KBUILD_HOST_ARCH"; then - ppc64|powerpc64) - KBUILD_HOST_ARCH='ppc64' +--- ./kBuild/env.sh (revision 3127) ++++ ./kBuild/env.sh (working copy) +@@ -386,6 +386,9 @@ + m68k) + KBUILD_HOST_ARCH='m68k' ;; + ppc64le|powerpc64le) + KBUILD_HOST_ARCH='ppc64le' @@ -28,22 +12,22 @@ Index: kBuild/kBuild/env.sh mips32|mips) KBUILD_HOST_ARCH='mips32' ;; -Index: kBuild/kBuild/header.kmk +Index: kBuild/header.kmk =================================================================== ---- kBuild.orig/kBuild/header.kmk -+++ kBuild/kBuild/header.kmk -@@ -189,8 +189,8 @@ KBUILD_BLD_TYPES := release profile debu +--- ./kBuild/header.kmk (revision 3127) ++++ ./kBuild/header.kmk (working copy) +@@ -197,8 +197,8 @@ # build types. (PORTME) # - KBUILD_OSES := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic --KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch --KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha -+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch -+KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha - KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm + KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic +-KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 x32 +-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64 x32 ++KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 ++KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 + KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 -@@ -481,7 +481,7 @@ endif +@@ -515,7 +515,7 @@ KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH) @@ -52,43 +36,3 @@ Index: kBuild/kBuild/header.kmk ifeq ($(KBUILD_TARGET_ARCH),amd64) KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86 else ifeq ($(KBUILD_TARGET_ARCH),hppa64) -Index: kbuild-0.1.9998svn2720/src/lib/k/kDefs.h -=================================================================== ---- kbuild-0.1.9998svn2720.orig/src/lib/kStuff/include/k/kDefs.h -+++ kbuild-0.1.9998svn2720/src/lib/kStuff/include/k/kDefs.h -@@ -158,16 +158,18 @@ - #define K_ARCH_POWERPC_32 (13 | K_ARCH_BIT_32 | K_ARCH_END_BI) - /** 64-bit PowerPC. */ - #define K_ARCH_POWERPC_64 (14 | K_ARCH_BIT_64 | K_ARCH_END_BI) -+/** 64-bit PowerPC. */ -+#define K_ARCH_POWERPC_64LE (15 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) - /** 32(31)-bit S390. */ --#define K_ARCH_S390_32 (15 | K_ARCH_BIT_32 | K_ARCH_END_BIG) -+#define K_ARCH_S390_32 (16 | K_ARCH_BIT_32 | K_ARCH_END_BIG) - /** 64-bit S390. */ --#define K_ARCH_S390_64 (16 | K_ARCH_BIT_64 | K_ARCH_END_BIG) -+#define K_ARCH_S390_64 (17 | K_ARCH_BIT_64 | K_ARCH_END_BIG) - /** 32-bit SPARC. */ --#define K_ARCH_SPARC_32 (17 | K_ARCH_BIT_32 | K_ARCH_END_BIG) -+#define K_ARCH_SPARC_32 (18 | K_ARCH_BIT_32 | K_ARCH_END_BIG) - /** 64-bit SPARC. */ --#define K_ARCH_SPARC_64 (18 | K_ARCH_BIT_64 | K_ARCH_END_BI) -+#define K_ARCH_SPARC_64 (19 | K_ARCH_BIT_64 | K_ARCH_END_BI) - /** The end of the valid architecture values (exclusive). */ --#define K_ARCH_MAX (19) -+#define K_ARCH_MAX (20) - /** @} */ - - -@@ -194,8 +196,10 @@ - # define K_ARCH K_ARCH_MIPS_64 - # elif defined(__mips__) - # define K_ARCH K_ARCH_MIPS_32 --# elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) -+# elif (defined(__powerpc64__) && defined(__BIG_ENDIAN__))|| defined(__ppc64__) || defined(__PPC64__) - # define K_ARCH K_ARCH_POWERPC_64 -+# elif (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) -+# define K_ARCH K_ARCH_POWERPC_64LE - # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) - # define K_ARCH K_ARCH_POWERPC_32 - # elif defined(__sparcv9__) || defined(__sparcv9) diff --git a/kBuild-pthread.patch b/kBuild-pthread.patch new file mode 100644 index 0000000..253cd6e --- /dev/null +++ b/kBuild-pthread.patch @@ -0,0 +1,14 @@ +Index: Config.kmk +=================================================================== +--- ./Config.kmk (revision 3127) ++++ ./Config.kmk (working copy) +@@ -340,7 +340,8 @@ + TEMPLATE_BIN_INCS += $(PATH_GNUMAKE_SRC)/glob /usr/local/include + endif + ifeq ($(KBUILD_TARGET),linux) +- TEMPLATE_BIN_LIBS += rt ++ TEMPLATE_BIN_LIBS += rt pthread ++ TEMPLATE_BIN_LDFLAGS += -Wl,--as-needed + endif + endif + diff --git a/kBuild.spec b/kBuild.spec index cf8b7d9..a6a96dc 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,8 @@ -%global svn_revision 3050 +%global svn_revision 3127 Name: kBuild Version: 0.1.9998 -Release: 14%{?svn_revision:.r%{svn_revision}}%{?dist} +Release: 15%{?svn_revision:.r%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -13,11 +13,11 @@ URL: http://svn.netlabs.org/kbuild #Generated with kBuild-snapshot.sh Source0: kBuild-r%{svn_revision}.tar.gz Patch0: kBuild-0.1.3-escape.patch -Patch1: kBuild-0.1.5-pthread.patch -Patch2: kbuild-wrong-memset.patch -Patch3: kBuild-0.1.98-arm.patch +Patch1: kBuild-pthread.patch Patch4: kBuild-0.1.9998-ppc64le.patch Patch5: kBuild-0.1.9998-aarch64.patch +Patch6: kbuild-dummy_noreturn.diff +Patch7: kbuild-glob.patch BuildRequires: byacc libacl-devel flex BuildRequires: bison @@ -38,10 +38,12 @@ repository. %setup -q -n %{name} %patch0 -p1 -b .escape %patch1 -p1 -b .pthreads -%patch2 -p1 -b .memset -%patch3 -p1 -b .arm %patch4 -p1 -b .ppc64le %patch5 -p1 -b .aarch64 +%patch6 -p1 -b .dummy_noreturn +%if 0%{?fedora} > 27 +%patch7 -p1 -b .kbuild-glob.patch +%endif %build @@ -84,6 +86,16 @@ rm -r %{buildroot}%{_docdir} %changelog +* Sat Dec 02 2017 Sérgio Basto - 0.1.9998-15.r3127 +- Update kBuild to svn rev 3127 +- arm and kbuild-wrong-memset patches fixed in upstream way + deleted: kBuild-0.1.98-arm.patch + deleted: kbuild-wrong-memset.patch +- Rebased aarch64 not sure if needed, ppc64le much more simple + modified: kBuild-0.1.9998-aarch64.patch + modified: kBuild-0.1.9998-ppc64le.patch + modified: kBuild-pthread.patch + * Thu Aug 03 2017 Fedora Release Engineering - 0.1.9998-14.r3050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/kbuild-wrong-memset.patch b/kbuild-wrong-memset.patch deleted file mode 100644 index eebe7e6..0000000 --- a/kbuild-wrong-memset.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 */ - } - - From 021094f614b5cf4869ed6caaa71a5f423ed6b7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Dec 2017 23:37:23 +0000 Subject: [PATCH 44/97] kbuild-glob.patch fixes build in rawhide (F28) --- kBuild.spec | 1 + kbuild-glob.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 kbuild-glob.patch diff --git a/kBuild.spec b/kBuild.spec index a6a96dc..4baa88b 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -95,6 +95,7 @@ rm -r %{buildroot}%{_docdir} modified: kBuild-0.1.9998-aarch64.patch modified: kBuild-0.1.9998-ppc64le.patch modified: kBuild-pthread.patch +- kbuild-glob.patch fixes build in rawhide (F28) * Thu Aug 03 2017 Fedora Release Engineering - 0.1.9998-14.r3050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/kbuild-glob.patch b/kbuild-glob.patch new file mode 100644 index 0000000..1d3e3f2 --- /dev/null +++ b/kbuild-glob.patch @@ -0,0 +1,11 @@ +--- ./src/kmk/glob/glob.c (revision 3127) ++++ ./src/kmk/glob/glob.c (working copy) +@@ -209,7 +209,7 @@ + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + + +-#if !defined __alloca && !defined __GNU_LIBRARY__ ++#if !defined __alloca + + # ifdef __GNUC__ + # undef alloca From 62e58d6033a6310c2a799783148232ea0aa6b6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 3 Dec 2017 02:36:43 +0000 Subject: [PATCH 45/97] Many fixes on aarch64 and ppc64le I was working with wrong snapshot and http://trac.netlabs.org/kbuild/changeset/3062 have changed many things again --- .gitignore | 1 + kBuild-0.1.9998-aarch64.patch | 50 ++++++++++++++--------------- kBuild-0.1.9998-ppc64le.patch | 59 ++++++++++++++++++++++++++--------- kBuild-snapshot.sh | 4 +-- kbuild-dummy_noreturn.diff | 25 +++++++++++++++ sources | 2 +- 6 files changed, 98 insertions(+), 43 deletions(-) create mode 100644 kbuild-dummy_noreturn.diff diff --git a/.gitignore b/.gitignore index af56a76..0a02fc7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r2784.tar.gz /kBuild-r2814.tar.gz /kBuild-r3050.tar.gz +/kBuild-r3127.tar.gz diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch index 7b3885e..0ae6859 100644 --- a/kBuild-0.1.9998-aarch64.patch +++ b/kBuild-0.1.9998-aarch64.patch @@ -1,46 +1,44 @@ -Index: kbuild-0.1.9998svn3110/kBuild/env.sh -=================================================================== ---- kbuild-0.1.9998svn3110.orig/kBuild/env.sh -+++ kbuild-0.1.9998svn3110/kBuild/env.sh -@@ -395,6 +395,9 @@ if test -z "$KBUILD_HOST_ARCH"; then - sparc64|sparcv9) - KBUILD_HOST_ARCH='sparc64' +--- ./kBuild/env.sh.aarch64 2017-12-03 01:09:31.241398236 +0000 ++++ ./kBuild/env.sh 2017-12-03 01:55:15.577568931 +0000 +@@ -365,9 +365,12 @@ if test -z "$KBUILD_HOST_ARCH"; then + aarch32|arm|arm1|arm2|arm3|arm6|armv1|armv2|armv3*|armv4*|armv5*|armv6*|armv7*) + KBUILD_HOST_ARCH='arm32' + ;; +- aarch64*) ++ arm64) + KBUILD_HOST_ARCH='arm64' ;; + aarch64) + KBUILD_HOST_ARCH='aarch64' + ;; - - *) echo "$0: unknown cpu/arch - $KBUILD_HOST_ARCH" 1>&${ERR_REDIR} - sleep 1 -Index: kbuild-0.1.9998svn3110/kBuild/header.kmk -=================================================================== ---- kbuild-0.1.9998svn3110.orig/kBuild/header.kmk -+++ kbuild-0.1.9998svn3110/kBuild/header.kmk + hppa32|parisc32|parisc) + KBUILD_HOST_ARCH='hppa32' + ;; +--- ./kBuild/header.kmk.aarch64 2017-12-03 01:05:13.825744817 +0000 ++++ ./kBuild/header.kmk 2017-12-03 01:07:53.989395771 +0000 @@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu # build types. (PORTME) # KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic -KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 -KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 -+KBUILD_ARCHES := x86 amd64 aarch64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 -+KBUILD_ARCHES_64 := amd64 aarch64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 ++KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 aarch64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 ++KBUILD_ARCHES_64 := amd64 alpha arm64 aarch64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 -Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h -=================================================================== ---- kbuild-0.1.9998svn3110.orig/src/lib/kStuff/include/k/kDefs.h -+++ kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h -@@ -160,6 +160,8 @@ +--- ./src/lib/kStuff/include/k/kDefs.h.aarch64 2017-12-03 02:06:43.570680524 +0000 ++++ ./src/lib/kStuff/include/k/kDefs.h 2017-12-03 02:19:50.895923683 +0000 +@@ -162,6 +162,8 @@ + #define K_ARCH_ARM_32 ( 5 | K_ARCH_BIT_32 | K_ARCH_END_BI) + /** 64-bit ARM. */ #define K_ARCH_ARM_64 ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI) ++/** 64-bit AARCH. */ ++#define K_ARCH_AARCH_64 ( 5 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) /** Motorola 68000 (32-bit). */ #define K_ARCH_M68K ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG) -+/** 64-bit AARCH. */ -+#define K_ARCH_AARCH_64 ( 8 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) /** 32-bit MIPS. */ - #define K_ARCH_MIPS_32 ( 7 | K_ARCH_BIT_32 | K_ARCH_END_BI) - /** 64-bit MIPS. */ -@@ -206,8 +208,10 @@ +@@ -210,8 +212,10 @@ # define K_ARCH K_ARCH_ALPHA # elif defined(__arm__) || defined(__arm32__) # define K_ARCH K_ARCH_ARM_32 diff --git a/kBuild-0.1.9998-ppc64le.patch b/kBuild-0.1.9998-ppc64le.patch index 5d7f731..a349272 100644 --- a/kBuild-0.1.9998-ppc64le.patch +++ b/kBuild-0.1.9998-ppc64le.patch @@ -1,22 +1,30 @@ -Index: kBuild/env.sh -=================================================================== ---- ./kBuild/env.sh (revision 3127) -+++ ./kBuild/env.sh (working copy) -@@ -386,6 +386,9 @@ - m68k) - KBUILD_HOST_ARCH='m68k' +--- + kBuild/env.sh | 3 +++ + kBuild/header.kmk | 6 +++--- + src/lib/k/kDefs.h | 16 ++++++++++------ + 3 files changed, 16 insertions(+), 9 deletions(-) + +--- ./kBuild/env.sh.ppc64le 2017-12-03 01:09:31.236398185 +0000 ++++ ./kBuild/env.sh 2017-12-03 02:00:09.001601147 +0000 +@@ -380,9 +383,12 @@ if test -z "$KBUILD_HOST_ARCH"; then + ppc32|ppc|powerpc) + KBUILD_HOST_ARCH='ppc32' + ;; +- ppc64|ppc64le|powerpc64|powerpc64le) ++ ppc64|powerpc64) + KBUILD_HOST_ARCH='ppc64' ;; + ppc64le|powerpc64le) + KBUILD_HOST_ARCH='ppc64le' + ;; - mips32|mips) - KBUILD_HOST_ARCH='mips32' + m68k) + KBUILD_HOST_ARCH='m68k' ;; -Index: kBuild/header.kmk +Index: kbuild-0.1.9998svn3110/kBuild/header.kmk =================================================================== ---- ./kBuild/header.kmk (revision 3127) -+++ ./kBuild/header.kmk (working copy) -@@ -197,8 +197,8 @@ +--- ./kBuild/header.kmk.ppc64le 2017-12-02 19:34:43.000000000 +0000 ++++ ./kBuild/header.kmk 2017-12-03 01:00:48.850013468 +0000 +@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu # build types. (PORTME) # KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic @@ -27,7 +35,7 @@ Index: kBuild/header.kmk KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 -@@ -515,7 +515,7 @@ +@@ -515,7 +515,7 @@ endif KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH) @@ -36,3 +44,26 @@ Index: kBuild/header.kmk ifeq ($(KBUILD_TARGET_ARCH),amd64) KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86 else ifeq ($(KBUILD_TARGET_ARCH),hppa64) +--- ./src/lib/kStuff/include/k/kDefs.h.ppc64le 2017-12-02 19:34:47.000000000 +0000 ++++ ./src/lib/kStuff/include/k/kDefs.h 2017-12-03 02:29:08.217738931 +0000 +@@ -176,6 +178,8 @@ + #define K_ARCH_POWERPC_32 ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI) + /** 64-bit PowerPC. */ + #define K_ARCH_POWERPC_64 ( 9 | K_ARCH_BIT_64 | K_ARCH_END_BI) ++/** 64-bit PowerPC. */ ++#define K_ARCH_POWERPC_64LE ( 9 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) + /** 32(31)-bit S390. */ + #define K_ARCH_S390_32 (10 | K_ARCH_BIT_32 | K_ARCH_END_BIG) + /** 64-bit S390. */ +@@ -220,8 +226,10 @@ + # define K_ARCH K_ARCH_MIPS_64 + # elif defined(__mips__) + # define K_ARCH K_ARCH_MIPS_32 +-# elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) ++# elif (defined(__powerpc64__) && defined(__BIG_ENDIAN__))|| defined(__ppc64__) || defined(__PPC64__) + # define K_ARCH K_ARCH_POWERPC_64 ++# elif (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) ++# define K_ARCH K_ARCH_POWERPC_64LE + # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) + # define K_ARCH K_ARCH_POWERPC_32 + # elif defined(__sparcv9__) || defined(__sparcv9) diff --git a/kBuild-snapshot.sh b/kBuild-snapshot.sh index 1cdc4f2..28c2e34 100755 --- a/kBuild-snapshot.sh +++ b/kBuild-snapshot.sh @@ -14,8 +14,8 @@ unset CDPATH pwd=$(pwd) svn=$(date +%Y%m%d) -#cd "$tmp" +cd "$tmp" svn co http://svn.netlabs.org/repos/kbuild/trunk/ kBuild revision=$(svnversion kBuild) tar zcf kBuild-r$revision\.tar.gz --exclude=kBuild/bin --exclude=.svn kBuild -#cd - >/dev/null +cd - >/dev/null diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff new file mode 100644 index 0000000..c48477b --- /dev/null +++ b/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 +@@ -311,6 +311,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 + #include ++#include + #include + #include + #include diff --git a/sources b/sources index ff30acd..71bc2b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3050.tar.gz) = b020875391484d0dc3ffc163ba5aaff421256b26edd1d188504a24edcbdcaa1056b975e4ee2997f49e6f085c33d546d3c043a0a20d94ff0f9e25896942bf7134 +SHA512 (kBuild-r3127.tar.gz) = 01e3042bf897d4cd1c9fc846ab7bdfcf4ed2daf94203e6b60bd92ab9ec003a27536f7a85416e139f18699759bd019bc69b60c333c5fbe6f99bce48021dbbbe07 From c6ed4dcef2cdd27c38d5fb0189231a731f57ef45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 3 Dec 2017 03:27:48 +0000 Subject: [PATCH 46/97] Fix one implicit-function-declaration --- kBuild.spec | 5 ++++- kbuild-dummy_noreturn.diff | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 4baa88b..ed4ccbd 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -2,7 +2,7 @@ Name: kBuild Version: 0.1.9998 -Release: 15%{?svn_revision:.r%{svn_revision}}%{?dist} +Release: 16%{?svn_revision:.r%{svn_revision}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -86,6 +86,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Sun Dec 03 2017 Sérgio Basto - 0.1.9998-16.r3127 +- Fix one implicit-function-declaration + * Sat Dec 02 2017 Sérgio Basto - 0.1.9998-15.r3127 - Update kBuild to svn rev 3127 - arm and kbuild-wrong-memset patches fixed in upstream way diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff index c48477b..6933ee9 100644 --- a/kbuild-dummy_noreturn.diff +++ b/kbuild-dummy_noreturn.diff @@ -23,3 +23,15 @@ Index: src/kmk/kmkbuiltin/kbuild_protection.c #include #include #include +Index: src/sed/lib/utils.c +=================================================================== +--- ./src/sed/lib/utils.c (revision 3127) ++++ ./src/sed/lib/utils.c (working copy) +@@ -19,6 +19,7 @@ + #include "config.h" + + #include ++#include + + #include + #ifndef errno From dc6ee6c6b9c32d9c2dfed71164222257775a39f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 16 Jan 2018 03:24:52 +0000 Subject: [PATCH 47/97] Fix and improve kBuild-snapshot.sh --- kBuild-snapshot.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kBuild-snapshot.sh b/kBuild-snapshot.sh index 28c2e34..027f099 100755 --- a/kBuild-snapshot.sh +++ b/kBuild-snapshot.sh @@ -11,11 +11,12 @@ cleanup() { } unset CDPATH -pwd=$(pwd) -svn=$(date +%Y%m%d) +curdir=$(pwd) cd "$tmp" svn co http://svn.netlabs.org/repos/kbuild/trunk/ kBuild -revision=$(svnversion kBuild) -tar zcf kBuild-r$revision\.tar.gz --exclude=kBuild/bin --exclude=.svn kBuild +svndate=$(svnlastchange -l kBuild | sed -n 2p | sed -r 's/.* ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) .*/\1/') +revision=$(svnlastchange -R kBuild) +tar zcf $curdir/kBuild-r$revision\.tar.gz --exclude=kBuild/bin --exclude=.svn kBuild +echo $svndate cd - >/dev/null From c29ac72bc1d058dd7c851aadcde80eca10606ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 16 Jan 2018 03:40:24 +0000 Subject: [PATCH 48/97] Update kBuild to svn rev 3129 New versioning, we need define svn version that we may need --- .gitignore | 1 + kBuild.spec | 10 +++++++--- kbuild-dummy_noreturn.diff | 1 + kbuild-glob.patch | 1 + sources | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0a02fc7..494748d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r2814.tar.gz /kBuild-r3050.tar.gz /kBuild-r3127.tar.gz +/kBuild-r3129.tar.gz diff --git a/kBuild.spec b/kBuild.spec index ed4ccbd..6303667 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,8 @@ -%global svn_revision 3127 +%global svn_revision 3129 Name: kBuild -Version: 0.1.9998 -Release: 16%{?svn_revision:.r%{svn_revision}}%{?dist} +Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} +Release: 1%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -86,6 +86,10 @@ rm -r %{buildroot}%{_docdir} %changelog +* Tue Jan 16 2018 Sérgio Basto - 0.1.9998.r3129-1 +- Update kBuild to svn rev 3129 +- New versioning, we need define svn version that we may need + * Sun Dec 03 2017 Sérgio Basto - 0.1.9998-16.r3127 - Fix one implicit-function-declaration diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff index 6933ee9..d521fa9 100644 --- a/kbuild-dummy_noreturn.diff +++ b/kbuild-dummy_noreturn.diff @@ -23,6 +23,7 @@ Index: src/kmk/kmkbuiltin/kbuild_protection.c #include #include #include +# Fix one implicit-function-declaration Index: src/sed/lib/utils.c =================================================================== --- ./src/sed/lib/utils.c (revision 3127) diff --git a/kbuild-glob.patch b/kbuild-glob.patch index 1d3e3f2..74c8c4f 100644 --- a/kbuild-glob.patch +++ b/kbuild-glob.patch @@ -1,3 +1,4 @@ +glibc for F28 remove definition of __alloca --- ./src/kmk/glob/glob.c (revision 3127) +++ ./src/kmk/glob/glob.c (working copy) @@ -209,7 +209,7 @@ diff --git a/sources b/sources index 71bc2b4..49bf6b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3127.tar.gz) = 01e3042bf897d4cd1c9fc846ab7bdfcf4ed2daf94203e6b60bd92ab9ec003a27536f7a85416e139f18699759bd019bc69b60c333c5fbe6f99bce48021dbbbe07 +SHA512 (kBuild-r3129.tar.gz) = 2c90d6094b6e5e08eb5af8199456fa48526d8d39e49c833b769ed185745f5e86a6fd40154d6ed1c3e354e1a02c4263d825c5898c187f0819c492074372e2ae0c From a038f21f77ee60c5e9cbffd5e3ca07685fd13894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 16 Jan 2018 04:05:08 +0000 Subject: [PATCH 49/97] Improves in kBuild-snapshot.sh --- kBuild-snapshot.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kBuild-snapshot.sh b/kBuild-snapshot.sh index 027f099..96ca19b 100755 --- a/kBuild-snapshot.sh +++ b/kBuild-snapshot.sh @@ -15,8 +15,9 @@ curdir=$(pwd) cd "$tmp" svn co http://svn.netlabs.org/repos/kbuild/trunk/ kBuild -svndate=$(svnlastchange -l kBuild | sed -n 2p | sed -r 's/.* ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) .*/\1/') revision=$(svnlastchange -R kBuild) -tar zcf $curdir/kBuild-r$revision\.tar.gz --exclude=kBuild/bin --exclude=.svn kBuild -echo $svndate +svndate=$(svnlastchange -l kBuild | sed -n 2p | sed -r 's/.* ([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2}) .*/\1\2\3/') +tar zcf $curdir/kBuild-r$revision.$svndate.tar.gz --exclude=kBuild/bin --exclude=.svn kBuild +echo %global svn_revision $revision +echo %global svn_date $svndate cd - >/dev/null From 053bfa96e2721c2e48fab31d8daa4fbbb0a09e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 16 Jan 2018 04:02:54 +0000 Subject: [PATCH 50/97] Redefining package versioning --- kBuild.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kBuild.spec b/kBuild.spec index 6303667..150ec9e 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,8 +1,9 @@ %global svn_revision 3129 +%global svn_date 20180106 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -86,7 +87,7 @@ rm -r %{buildroot}%{_docdir} %changelog -* Tue Jan 16 2018 Sérgio Basto - 0.1.9998.r3129-1 +* Tue Jan 16 2018 Sérgio Basto - 0.1.9998.r3129-1.20180106 - Update kBuild to svn rev 3129 - New versioning, we need define svn version that we may need From 2594213c91d0e43bc36ca3532fc48727ffefe10a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 19:27:12 +0000 Subject: [PATCH 51/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 150ec9e..117b718 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 2%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -87,6 +87,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.1.9998.r3129-2.20180106 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 16 2018 Sérgio Basto - 0.1.9998.r3129-1.20180106 - Update kBuild to svn rev 3129 - New versioning, we need define svn version that we may need From 0c99ebc9525ac4bbd0a338b66d65909ec9073232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 12 May 2018 04:42:37 +0100 Subject: [PATCH 52/97] Fix build on el6 --- kBuild-0.1.9998-portme.patch | 26 ++++++++++++++++++++++++++ kBuild.spec | 16 ++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 kBuild-0.1.9998-portme.patch diff --git a/kBuild-0.1.9998-portme.patch b/kBuild-0.1.9998-portme.patch new file mode 100644 index 0000000..53b6462 --- /dev/null +++ b/kBuild-0.1.9998-portme.patch @@ -0,0 +1,26 @@ +--- kBuild/src/lib/kStuff/include/k/kDefs.h.orig 2018-05-12 03:35:13.703342877 +0100 ++++ kBuild/src/lib/kStuff/include/k/kDefs.h 2018-05-12 04:24:52.034917011 +0100 +@@ -336,16 +336,19 @@ + /* use K_ARCH if possible. */ + # if K_ARCH_ENDIAN != K_ENDIAN_BI + # define K_ENDIAN K_ARCH_ENDIAN +-# elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_BIG_ENDIAN__) +-# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++# elif defined(__BYTE_ORDER__) ++# if defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + # define K_ENDIAN K_ARCH_LITTLE +-# elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++# elif defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + # define K_ENDIAN K_ARCH_BIG + # else + # error "Port Me or define K_ENDIAN." + # endif + # else +-# error "Port Me or define K_ENDIAN." ++ /* __BYTE_ORDER__ is only available since GCC 4.6 */ ++ /* el6 have GCC 4.4 + or - */ ++ /* use same value that was set in previous versions of kBuild */ ++# define K_ENDIAN K_ARCH_ENDIAN + # endif + #else + /* validate the user defined value. */ diff --git a/kBuild.spec b/kBuild.spec index 117b718..c0bdcc4 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 2%{?svn_date:.%{svn_date}}%{?dist} +Release: 3%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -19,12 +19,12 @@ Patch4: kBuild-0.1.9998-ppc64le.patch Patch5: kBuild-0.1.9998-aarch64.patch Patch6: kbuild-dummy_noreturn.diff Patch7: kbuild-glob.patch +Patch8: kBuild-0.1.9998-portme.patch BuildRequires: byacc libacl-devel flex BuildRequires: bison BuildRequires: autoconf automake gettext-devel - %description This is a GNU make fork with a set of scripts to simplify complex tasks and portable versions of various UNIX tools to @@ -45,6 +45,15 @@ repository. %if 0%{?fedora} > 27 %patch7 -p1 -b .kbuild-glob.patch %endif +%ifarch ppc64 +%if 0%{?rhel} && 0%{?rhel} < 7 +# Found the reason why compile fails in detection of powerpc64 in centos 6 +# kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN." +# hack for gcc < 4.6 and ppc64 only +# https://stackoverflow.com/a/40675229/778517 +%patch8 -p1 -b .portme +%endif +%endif %build @@ -87,6 +96,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Sat May 12 2018 Sérgio Basto - 0.1.9998.r3129-3.20180106 +- Fix build on el6 + * Wed Feb 07 2018 Fedora Release Engineering - 0.1.9998.r3129-2.20180106 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 84424c517d1b98587f854d8aaccbc0797ef70349 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:46 +0200 Subject: [PATCH 53/97] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- kBuild.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kBuild.spec b/kBuild.spec index c0bdcc4..e4402c3 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -21,6 +21,7 @@ Patch6: kbuild-dummy_noreturn.diff Patch7: kbuild-glob.patch Patch8: kBuild-0.1.9998-portme.patch +BuildRequires: gcc BuildRequires: byacc libacl-devel flex BuildRequires: bison BuildRequires: autoconf automake gettext-devel From 04d75eccccfaefeff2c47d350541eac4796b3897 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 06:47:28 +0000 Subject: [PATCH 54/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index e4402c3..ff8357b 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 3%{?svn_date:.%{svn_date}}%{?dist} +Release: 4%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -97,6 +97,9 @@ rm -r %{buildroot}%{_docdir} %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.1.9998.r3129-4.20180106 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat May 12 2018 Sérgio Basto - 0.1.9998.r3129-3.20180106 - Fix build on el6 From 3f66b9ab1859b678f1eee7b9d942c6328bae320a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 8 Jan 2019 03:38:04 +0000 Subject: [PATCH 55/97] Update to 0.1.9998.r3290-1.20190106 Add manpage (copied from Debian IIRC) --- .gitignore | 1 + kBuild.spec | 37 +++++++++++++++++++++++-------------- kbuild-dummy_noreturn.diff | 4 ++-- kbuild-glob.patch | 12 ------------ sources | 2 +- 5 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 kbuild-glob.patch diff --git a/.gitignore b/.gitignore index 494748d..03b3e57 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r3050.tar.gz /kBuild-r3127.tar.gz /kBuild-r3129.tar.gz +/kBuild-r3290.20190106.tar.gz diff --git a/kBuild.spec b/kBuild.spec index ff8357b..5e69394 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,10 +1,12 @@ -%global svn_revision 3129 -%global svn_date 20180106 +%global svn_revision 3290 +%global svn_date 20190106 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 4%{?svn_date:.%{svn_date}}%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment +#Building problems on s390x +ExcludeArch: s390x Group: Development/Tools License: BSD and GPLv2+ @@ -12,19 +14,23 @@ License: BSD and GPLv2+ # and make and sed are from GNU URL: http://svn.netlabs.org/kbuild #Generated with kBuild-snapshot.sh -Source0: kBuild-r%{svn_revision}.tar.gz +Source0: kBuild-r%{svn_revision}.%{svn_date}.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-pthread.patch Patch4: kBuild-0.1.9998-ppc64le.patch Patch5: kBuild-0.1.9998-aarch64.patch Patch6: kbuild-dummy_noreturn.diff -Patch7: kbuild-glob.patch Patch8: kBuild-0.1.9998-portme.patch BuildRequires: gcc -BuildRequires: byacc libacl-devel flex +BuildRequires: automake BuildRequires: bison -BuildRequires: autoconf automake gettext-devel +BuildRequires: gettext-devel +BuildRequires: libtool +BuildRequires: flex +BuildRequires: libacl-devel +BuildRequires: texinfo +BuildRequires: byacc %description This is a GNU make fork with a set of scripts to simplify @@ -43,9 +49,6 @@ repository. %patch4 -p1 -b .ppc64le %patch5 -p1 -b .aarch64 %patch6 -p1 -b .dummy_noreturn -%if 0%{?fedora} > 27 -%patch7 -p1 -b .kbuild-glob.patch -%endif %ifarch ppc64 %if 0%{?rhel} && 0%{?rhel} < 7 # Found the reason why compile fails in detection of powerpc64 in centos 6 @@ -78,8 +81,6 @@ echo KBUILD_SVN_REV := %{svn_revision} >> SvnInfo.kmk find -name config.log -delete kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags} kBuild/env.sh kmk %{mflags} rebuild -#pod2man -c 'kBuild for Debian GNU/Linux' \ -# -r kBuild-$(DEB_UPSTREAM_VERSION) debian/kmk.pod > debian/kmk.1 %install @@ -87,16 +88,24 @@ export KBUILD_VERBOSE=2 kBuild/env.sh kmk %{mflags} PATH_INS=%{buildroot} install # These are included later in files section rm -r %{buildroot}%{_docdir} +mkdir -p %{buildroot}/%{_mandir}/man1 +pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ + -r kBuild-%{version} ./dist/debian/kmk.pod > %{buildroot}/%{_mandir}/man1/kmk.1 %files -%{_bindir}/* -%{_datadir}/* %doc ChangeLog kBuild/doc/QuickReference* %license COPYING kBuild/doc/COPYING-FDL-1.3 +%{_bindir}/* +%{_datadir}/kBuild +%{_mandir}/man1/* %changelog +* Mon Jan 07 2019 Sérgio Basto - 0.1.9998.r3290-1.20190106 +- Update to 0.1.9998.r3290-1.20190106 +- Add manpage (copied from Debian IIRC) + * Fri Jul 13 2018 Fedora Release Engineering - 0.1.9998.r3129-4.20180106 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff index d521fa9..929dc08 100644 --- a/kbuild-dummy_noreturn.diff +++ b/kbuild-dummy_noreturn.diff @@ -2,10 +2,10 @@ Index: src/kmk/kmkbuiltin/expr.c =================================================================== --- ./src/kmk/kmkbuiltin/expr.c.orig +++ ./src/kmk/kmkbuiltin/expr.c -@@ -311,6 +311,8 @@ eval6(void) +@@ -317,6 +317,8 @@ eval6(PEXPRINSTANCE pThis) return v; } else { - error(); + error(pThis); + /* dummy return in order to make the build checks happy (this will never be reached) */ + return NULL; } diff --git a/kbuild-glob.patch b/kbuild-glob.patch deleted file mode 100644 index 74c8c4f..0000000 --- a/kbuild-glob.patch +++ /dev/null @@ -1,12 +0,0 @@ -glibc for F28 remove definition of __alloca ---- ./src/kmk/glob/glob.c (revision 3127) -+++ ./src/kmk/glob/glob.c (working copy) -@@ -209,7 +209,7 @@ - #endif /* __GNU_LIBRARY__ || __DJGPP__ */ - - --#if !defined __alloca && !defined __GNU_LIBRARY__ -+#if !defined __alloca - - # ifdef __GNUC__ - # undef alloca diff --git a/sources b/sources index 49bf6b2..07f7a8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3129.tar.gz) = 2c90d6094b6e5e08eb5af8199456fa48526d8d39e49c833b769ed185745f5e86a6fd40154d6ed1c3e354e1a02c4263d825c5898c187f0819c492074372e2ae0c +SHA512 (kBuild-r3290.20190106.tar.gz) = f8d8b6f7442ce1e0bde6856430f594bed1cada0abb69771d4c4a297dd5b3560101d5217d81eb45b930104cd6b1eb4660f95f729e8969466b4b813e9085daa7f0 From e33aae3d149aff458b045dffda4929df230a3a97 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:50 +0100 Subject: [PATCH 56/97] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- kBuild.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 5e69394..e6b77d5 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -8,7 +8,6 @@ Summary: A cross-platform build environment #Building problems on s390x ExcludeArch: s390x -Group: Development/Tools License: BSD and GPLv2+ # most tools are from NetBSD, some are from FreeBSD, # and make and sed are from GNU From c92f0b2ce54d2a761691ffbd9ba0da031c160360 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 04:57:42 +0000 Subject: [PATCH 57/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index e6b77d5..e02bfbc 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 2%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment #Building problems on s390x ExcludeArch: s390x @@ -101,6 +101,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.1.9998.r3290-2.20190106 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 07 2019 Sérgio Basto - 0.1.9998.r3290-1.20190106 - Update to 0.1.9998.r3290-1.20190106 - Add manpage (copied from Debian IIRC) From f7746fcc2b1eb431946df9cef9d7fafc0ec228dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 12 Feb 2019 04:38:16 +0000 Subject: [PATCH 58/97] Update to 0.1.9998.r3296-1.20190122 --- .gitignore | 1 + kBuild-0.1.9998-aarch64.patch | 2 +- kBuild.spec | 11 ++++++----- sources | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 03b3e57..ec64730 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r3127.tar.gz /kBuild-r3129.tar.gz /kBuild-r3290.20190106.tar.gz +/kBuild-r3296.20190122.tar.gz diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch index 0ae6859..bf2c1d7 100644 --- a/kBuild-0.1.9998-aarch64.patch +++ b/kBuild-0.1.9998-aarch64.patch @@ -1,7 +1,7 @@ --- ./kBuild/env.sh.aarch64 2017-12-03 01:09:31.241398236 +0000 +++ ./kBuild/env.sh 2017-12-03 01:55:15.577568931 +0000 @@ -365,9 +365,12 @@ if test -z "$KBUILD_HOST_ARCH"; then - aarch32|arm|arm1|arm2|arm3|arm6|armv1|armv2|armv3*|armv4*|armv5*|armv6*|armv7*) + aarch32|arm|arm1|arm2|arm3|arm6|armv1|armv2|armv3*|armv4*|armv5*|armv6*|armv7*|armv8*) KBUILD_HOST_ARCH='arm32' ;; - aarch64*) diff --git a/kBuild.spec b/kBuild.spec index e02bfbc..8cc047a 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,12 +1,10 @@ -%global svn_revision 3290 -%global svn_date 20190106 +%global svn_revision 3296 +%global svn_date 20190122 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 2%{?svn_date:.%{svn_date}}%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment -#Building problems on s390x -ExcludeArch: s390x License: BSD and GPLv2+ # most tools are from NetBSD, some are from FreeBSD, @@ -101,6 +99,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Mon Feb 11 2019 Sérgio Basto - 0.1.9998.r3296-1.20190122 +- Update to 0.1.9998.r3296-1.20190122 + * Fri Feb 01 2019 Fedora Release Engineering - 0.1.9998.r3290-2.20190106 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 07f7a8d..a86a0d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3290.20190106.tar.gz) = f8d8b6f7442ce1e0bde6856430f594bed1cada0abb69771d4c4a297dd5b3560101d5217d81eb45b930104cd6b1eb4660f95f729e8969466b4b813e9085daa7f0 +SHA512 (kBuild-r3296.20190122.tar.gz) = 5c61edb916876de8ad356491cfe6ebc452dfb05a0eec14896fb6b53ca3b9a6e057848cc0132b36a23615fd8d859602a74bcdd1b34750eeced2f95d26b67899bd From 349ade1acbf8e71cf9ea692cd71c59aebec15571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 12 Feb 2019 05:19:52 +0000 Subject: [PATCH 59/97] Trust in the upstream that has the correct support for aarch64 and ppc64le --- kBuild-0.1.9998-aarch64.patch | 52 -------------------------- kBuild-0.1.9998-ppc64le.patch | 69 ----------------------------------- kBuild.spec | 9 ++--- 3 files changed, 4 insertions(+), 126 deletions(-) delete mode 100644 kBuild-0.1.9998-aarch64.patch delete mode 100644 kBuild-0.1.9998-ppc64le.patch diff --git a/kBuild-0.1.9998-aarch64.patch b/kBuild-0.1.9998-aarch64.patch deleted file mode 100644 index bf2c1d7..0000000 --- a/kBuild-0.1.9998-aarch64.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- ./kBuild/env.sh.aarch64 2017-12-03 01:09:31.241398236 +0000 -+++ ./kBuild/env.sh 2017-12-03 01:55:15.577568931 +0000 -@@ -365,9 +365,12 @@ if test -z "$KBUILD_HOST_ARCH"; then - aarch32|arm|arm1|arm2|arm3|arm6|armv1|armv2|armv3*|armv4*|armv5*|armv6*|armv7*|armv8*) - KBUILD_HOST_ARCH='arm32' - ;; -- aarch64*) -+ arm64) - KBUILD_HOST_ARCH='arm64' - ;; -+ aarch64) -+ KBUILD_HOST_ARCH='aarch64' -+ ;; - hppa32|parisc32|parisc) - KBUILD_HOST_ARCH='hppa32' - ;; ---- ./kBuild/header.kmk.aarch64 2017-12-03 01:05:13.825744817 +0000 -+++ ./kBuild/header.kmk 2017-12-03 01:07:53.989395771 +0000 -@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu - # build types. (PORTME) - # - KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic --KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 --KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 -+KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 aarch64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 -+KBUILD_ARCHES_64 := amd64 alpha arm64 aarch64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 - KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 - - ---- ./src/lib/kStuff/include/k/kDefs.h.aarch64 2017-12-03 02:06:43.570680524 +0000 -+++ ./src/lib/kStuff/include/k/kDefs.h 2017-12-03 02:19:50.895923683 +0000 -@@ -162,6 +162,8 @@ - #define K_ARCH_ARM_32 ( 5 | K_ARCH_BIT_32 | K_ARCH_END_BI) - /** 64-bit ARM. */ - #define K_ARCH_ARM_64 ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI) -+/** 64-bit AARCH. */ -+#define K_ARCH_AARCH_64 ( 5 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) - /** Motorola 68000 (32-bit). */ - #define K_ARCH_M68K ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG) - /** 32-bit MIPS. */ -@@ -210,8 +212,10 @@ - # define K_ARCH K_ARCH_ALPHA - # elif defined(__arm__) || defined(__arm32__) - # define K_ARCH K_ARCH_ARM_32 --# elif defined(__aarch64__) || defined(__arm64__) -+# elif defined(__arm64__) - # define K_ARCH K_ARCH_ARM_64 -+# elif defined(__aarch64__) -+# define K_ARCH K_ARCH_AARCH_64 - # elif defined(__hppa__) && defined(__LP64__) - # define K_ARCH K_ARCH_PARISC_64 - # elif defined(__hppa__) diff --git a/kBuild-0.1.9998-ppc64le.patch b/kBuild-0.1.9998-ppc64le.patch deleted file mode 100644 index a349272..0000000 --- a/kBuild-0.1.9998-ppc64le.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- - kBuild/env.sh | 3 +++ - kBuild/header.kmk | 6 +++--- - src/lib/k/kDefs.h | 16 ++++++++++------ - 3 files changed, 16 insertions(+), 9 deletions(-) - ---- ./kBuild/env.sh.ppc64le 2017-12-03 01:09:31.236398185 +0000 -+++ ./kBuild/env.sh 2017-12-03 02:00:09.001601147 +0000 -@@ -380,9 +383,12 @@ if test -z "$KBUILD_HOST_ARCH"; then - ppc32|ppc|powerpc) - KBUILD_HOST_ARCH='ppc32' - ;; -- ppc64|ppc64le|powerpc64|powerpc64le) -+ ppc64|powerpc64) - KBUILD_HOST_ARCH='ppc64' - ;; -+ ppc64le|powerpc64le) -+ KBUILD_HOST_ARCH='ppc64le' -+ ;; - m68k) - KBUILD_HOST_ARCH='m68k' - ;; -Index: kbuild-0.1.9998svn3110/kBuild/header.kmk -=================================================================== ---- ./kBuild/header.kmk.ppc64le 2017-12-02 19:34:43.000000000 +0000 -+++ ./kBuild/header.kmk 2017-12-03 01:00:48.850013468 +0000 -@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu - # build types. (PORTME) - # - KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic --KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 x32 --KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64 x32 -+KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32 -+KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32 - KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 - - -@@ -515,7 +515,7 @@ endif - KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) - KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH) - --if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 s390x sparc64) -+if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 ppc64le s390x sparc64) - ifeq ($(KBUILD_TARGET_ARCH),amd64) - KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86 - else ifeq ($(KBUILD_TARGET_ARCH),hppa64) ---- ./src/lib/kStuff/include/k/kDefs.h.ppc64le 2017-12-02 19:34:47.000000000 +0000 -+++ ./src/lib/kStuff/include/k/kDefs.h 2017-12-03 02:29:08.217738931 +0000 -@@ -176,6 +178,8 @@ - #define K_ARCH_POWERPC_32 ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI) - /** 64-bit PowerPC. */ - #define K_ARCH_POWERPC_64 ( 9 | K_ARCH_BIT_64 | K_ARCH_END_BI) -+/** 64-bit PowerPC. */ -+#define K_ARCH_POWERPC_64LE ( 9 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) - /** 32(31)-bit S390. */ - #define K_ARCH_S390_32 (10 | K_ARCH_BIT_32 | K_ARCH_END_BIG) - /** 64-bit S390. */ -@@ -220,8 +226,10 @@ - # define K_ARCH K_ARCH_MIPS_64 - # elif defined(__mips__) - # define K_ARCH K_ARCH_MIPS_32 --# elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) -+# elif (defined(__powerpc64__) && defined(__BIG_ENDIAN__))|| defined(__ppc64__) || defined(__PPC64__) - # define K_ARCH K_ARCH_POWERPC_64 -+# elif (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)) -+# define K_ARCH K_ARCH_POWERPC_64LE - # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) - # define K_ARCH K_ARCH_POWERPC_32 - # elif defined(__sparcv9__) || defined(__sparcv9) diff --git a/kBuild.spec b/kBuild.spec index 8cc047a..fae9b3f 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 2%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -14,8 +14,6 @@ URL: http://svn.netlabs.org/kbuild Source0: kBuild-r%{svn_revision}.%{svn_date}.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-pthread.patch -Patch4: kBuild-0.1.9998-ppc64le.patch -Patch5: kBuild-0.1.9998-aarch64.patch Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch @@ -43,8 +41,6 @@ repository. %setup -q -n %{name} %patch0 -p1 -b .escape %patch1 -p1 -b .pthreads -%patch4 -p1 -b .ppc64le -%patch5 -p1 -b .aarch64 %patch6 -p1 -b .dummy_noreturn %ifarch ppc64 %if 0%{?rhel} && 0%{?rhel} < 7 @@ -99,6 +95,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Tue Feb 12 2019 Sérgio Basto - 0.1.9998.r3296-2.20190122 +- Trust in the upstream that has the correct support for aarch64 and ppc64le + * Mon Feb 11 2019 Sérgio Basto - 0.1.9998.r3296-1.20190122 - Update to 0.1.9998.r3296-1.20190122 From 087891c07d1ba760e40466c307aec692369b59bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 11:00:30 +0000 Subject: [PATCH 60/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index fae9b3f..883065f 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 2%{?svn_date:.%{svn_date}}%{?dist} +Release: 3%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -95,6 +95,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.1.9998.r3296-3.20190122 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 12 2019 Sérgio Basto - 0.1.9998.r3296-2.20190122 - Trust in the upstream that has the correct support for aarch64 and ppc64le From 71f92878e3c2f1988562cf40212a9451b927d849 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 06:35:00 +0000 Subject: [PATCH 61/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 883065f..334ceb3 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 3%{?svn_date:.%{svn_date}}%{?dist} +Release: 4%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -95,6 +95,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.1.9998.r3296-4.20190122 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.1.9998.r3296-3.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 06478756980b00ab8ff85d23647be915b672004e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 26 May 2020 15:47:21 -0500 Subject: [PATCH 62/97] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 8c63e8e693376d1701fc180d89e623122c319d5c Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Thu, 23 Jul 2020 20:38:15 -0600 Subject: [PATCH 63/97] - Use strsignal, not sys_siglist --- kBuild-strsignal.patch | 15 +++++++++++++++ kBuild.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 kBuild-strsignal.patch diff --git a/kBuild-strsignal.patch b/kBuild-strsignal.patch new file mode 100644 index 0000000..e757f77 --- /dev/null +++ b/kBuild-strsignal.patch @@ -0,0 +1,15 @@ +diff --git a/src/kash/jobs.c b/src/kash/jobs.c +index 13a758d..2f9a156 100644 +--- a/src/kash/jobs.c ++++ b/src/kash/jobs.c +@@ -396,8 +396,8 @@ showjob(shinstance *psh, struct output *out, struct job *jp, int mode) + #endif + st = WTERMSIG(ps->status); + st &= 0x7f; +- if (st < NSIG && sys_siglist[st]) +- scopyn(sys_siglist[st], s + col, 32); ++ if (st < NSIG) ++ scopyn(strsignal(st), s + col, 32); + else + fmtstr(s + col, 16, "Signal %d", st); + if (WCOREDUMP(ps->status)) { diff --git a/kBuild.spec b/kBuild.spec index 334ceb3..ed7f927 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 4%{?svn_date:.%{svn_date}}%{?dist} +Release: 5%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -16,6 +16,7 @@ Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-pthread.patch Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch +Patch9: kBuild-strsignal.patch BuildRequires: gcc BuildRequires: automake @@ -51,6 +52,7 @@ repository. %patch8 -p1 -b .portme %endif %endif +%patch9 -p1 -b .strsignal %build @@ -95,6 +97,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jul 23 2020 Jeff Law - 0.1.9998.r3296-5.20190122 +- Use strsignal, not sys_siglist + * Wed Jan 29 2020 Fedora Release Engineering - 0.1.9998.r3296-4.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From a298ebff0505add59d9f7db8c6052197f00a216e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:40:01 +0000 Subject: [PATCH 64/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index ed7f927..bfc9661 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 5%{?svn_date:.%{svn_date}}%{?dist} +Release: 6%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -97,6 +97,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.1.9998.r3296-6.20190122 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 23 2020 Jeff Law - 0.1.9998.r3296-5.20190122 - Use strsignal, not sys_siglist From c68789eaffdeb25ec3de697db55362e680e4f2b9 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:06:33 +0000 Subject: [PATCH 65/97] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 66251e3c374517c97d60eae4094744166cb7068c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 13 Jan 2021 02:37:05 +0000 Subject: [PATCH 66/97] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- kBuild.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kBuild.spec b/kBuild.spec index bfc9661..ced572d 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -18,6 +18,7 @@ Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch Patch9: kBuild-strsignal.patch +BuildRequires: make BuildRequires: gcc BuildRequires: automake BuildRequires: bison From 258abd6cd57da6c02a220a8c72d380a22531ad40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:08:21 +0000 Subject: [PATCH 67/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index ced572d..b14604f 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 6%{?svn_date:.%{svn_date}}%{?dist} +Release: 7%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.1.9998.r3296-7.20190122 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.1.9998.r3296-6.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 707a553fcd88469c43520fb5210541c023f97b9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:23:00 +0000 Subject: [PATCH 68/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index b14604f..4c75d96 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 7%{?svn_date:.%{svn_date}}%{?dist} +Release: 8%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.1.9998.r3296-8.20190122 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.1.9998.r3296-7.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 49f428f25ffd4dec4db2660b1b067593598c72ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:05:23 +0000 Subject: [PATCH 69/97] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 4c75d96..583266a 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 8%{?svn_date:.%{svn_date}}%{?dist} +Release: 9%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.1.9998.r3296-9.20190122 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.1.9998.r3296-8.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b9cee838c10a3bfc036eebeb5cb472d4bfc43ca6 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 26 May 2020 15:47:21 -0500 Subject: [PATCH 70/97] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 4d39bd5724d937273c13b087f037870e154c3c2f Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:06:33 +0000 Subject: [PATCH 71/97] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 8159fd144ba0220b289f4e782ccfa6b22c8d1390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 19 Aug 2021 10:58:27 +0100 Subject: [PATCH 72/97] Update to kBuild-r3499.20210510 --- kBuild-strsignal.patch | 15 --------------- kBuild.spec | 15 ++++++++------- 2 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 kBuild-strsignal.patch diff --git a/kBuild-strsignal.patch b/kBuild-strsignal.patch deleted file mode 100644 index e757f77..0000000 --- a/kBuild-strsignal.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/kash/jobs.c b/src/kash/jobs.c -index 13a758d..2f9a156 100644 ---- a/src/kash/jobs.c -+++ b/src/kash/jobs.c -@@ -396,8 +396,8 @@ showjob(shinstance *psh, struct output *out, struct job *jp, int mode) - #endif - st = WTERMSIG(ps->status); - st &= 0x7f; -- if (st < NSIG && sys_siglist[st]) -- scopyn(sys_siglist[st], s + col, 32); -+ if (st < NSIG) -+ scopyn(strsignal(st), s + col, 32); - else - fmtstr(s + col, 16, "Signal %d", st); - if (WCOREDUMP(ps->status)) { diff --git a/kBuild.spec b/kBuild.spec index 4c75d96..cc61847 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,9 +1,9 @@ -%global svn_revision 3296 -%global svn_date 20190122 +%global svn_revision 3541 +%global svn_date 20211221 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 8%{?svn_date:.%{svn_date}}%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -16,9 +16,8 @@ Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-pthread.patch Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch -Patch9: kBuild-strsignal.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: automake BuildRequires: bison @@ -53,7 +52,6 @@ repository. %patch8 -p1 -b .portme %endif %endif -%patch9 -p1 -b .strsignal %build @@ -98,9 +96,12 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Sat Jan 22 2022 Sérgio Basto - 0.1.9998.r3541-1.20211221 +- Update to kBuild-r3499.20211221 +- Patch strsignal already applied + * Thu Jul 22 2021 Fedora Release Engineering - 0.1.9998.r3296-8.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Tue Jan 26 2021 Fedora Release Engineering - 0.1.9998.r3296-7.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7c2c5b1ebe742a3b6a3e950200754039046c162d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 26 May 2020 15:47:21 -0500 Subject: [PATCH 73/97] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 0e93f1d77a159d1a968de2cb15d83c40cc5e2d9b Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:06:33 +0000 Subject: [PATCH 74/97] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From e6429c26a7fb8aa3395b00b255f98998f23042ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 25 Jan 2022 11:57:07 +0000 Subject: [PATCH 75/97] Revert "Update to kBuild-r3499.20210510" was pushed by mistake This reverts commit 8159fd144ba0220b289f4e782ccfa6b22c8d1390. --- kBuild-strsignal.patch | 15 +++++++++++++++ kBuild.spec | 15 +++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 kBuild-strsignal.patch diff --git a/kBuild-strsignal.patch b/kBuild-strsignal.patch new file mode 100644 index 0000000..e757f77 --- /dev/null +++ b/kBuild-strsignal.patch @@ -0,0 +1,15 @@ +diff --git a/src/kash/jobs.c b/src/kash/jobs.c +index 13a758d..2f9a156 100644 +--- a/src/kash/jobs.c ++++ b/src/kash/jobs.c +@@ -396,8 +396,8 @@ showjob(shinstance *psh, struct output *out, struct job *jp, int mode) + #endif + st = WTERMSIG(ps->status); + st &= 0x7f; +- if (st < NSIG && sys_siglist[st]) +- scopyn(sys_siglist[st], s + col, 32); ++ if (st < NSIG) ++ scopyn(strsignal(st), s + col, 32); + else + fmtstr(s + col, 16, "Signal %d", st); + if (WCOREDUMP(ps->status)) { diff --git a/kBuild.spec b/kBuild.spec index cc61847..4c75d96 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,9 +1,9 @@ -%global svn_revision 3541 -%global svn_date 20211221 +%global svn_revision 3296 +%global svn_date 20190122 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 8%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -16,8 +16,9 @@ Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-pthread.patch Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch +Patch9: kBuild-strsignal.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: automake BuildRequires: bison @@ -52,6 +53,7 @@ repository. %patch8 -p1 -b .portme %endif %endif +%patch9 -p1 -b .strsignal %build @@ -96,12 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog -* Sat Jan 22 2022 Sérgio Basto - 0.1.9998.r3541-1.20211221 -- Update to kBuild-r3499.20211221 -- Patch strsignal already applied - * Thu Jul 22 2021 Fedora Release Engineering - 0.1.9998.r3296-8.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.1.9998.r3296-7.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bb6107af2dbed0399bb825a7381e6dcf878fcf66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 9 Apr 2022 00:35:00 +0100 Subject: [PATCH 76/97] Update kBuild to r3564.20220308 --- .gitignore | 1 + kBuild-0.1.9998-breakpoint_portme.patch | 11 +++++++++++ kBuild-strsignal.patch | 15 --------------- kBuild.spec | 13 ++++++++----- sources | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 kBuild-0.1.9998-breakpoint_portme.patch delete mode 100644 kBuild-strsignal.patch diff --git a/.gitignore b/.gitignore index ec64730..8725149 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r3129.tar.gz /kBuild-r3290.20190106.tar.gz /kBuild-r3296.20190122.tar.gz +/kBuild-r3564.20220308.tar.gz diff --git a/kBuild-0.1.9998-breakpoint_portme.patch b/kBuild-0.1.9998-breakpoint_portme.patch new file mode 100644 index 0000000..2f74d4d --- /dev/null +++ b/kBuild-0.1.9998-breakpoint_portme.patch @@ -0,0 +1,11 @@ +--- ./src/lib/kStuff/include/k/kHlpAssert.h.orig 2022-04-09 00:15:35.491852286 +0100 ++++ ./src/lib/kStuff/include/k/kHlpAssert.h 2022-04-09 00:17:27.465457543 +0100 +@@ -51,7 +51,7 @@ extern "C" { + # define kHlpAssertBreakpoint() do { __debugbreak(); } while (0) + #elif defined(__GNUC__) && K_OS == K_OS_SOLARIS && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32) + # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("int $3"); } while (0) +-#elif defined(__GNUC__) && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32 || K_ARCH == K_ARCH_X86_16) ++#elif defined(__GNUC__) && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32 || K_ARCH == K_ARCH_X86_16 || K_ARCH == K_ARCH_POWERPC_64 || K_ARCH == K_ARCH_S390_64 ) + # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("int3"); } while (0) + #elif defined(__GNUC__) && (K_ARCH == K_ARCH_ARM_64 || K_ARCH == K_ARCH_ARM_32) /* probably not supported by older ARM CPUs */ + # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("brk #0x1"); } while (0) diff --git a/kBuild-strsignal.patch b/kBuild-strsignal.patch deleted file mode 100644 index e757f77..0000000 --- a/kBuild-strsignal.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/kash/jobs.c b/src/kash/jobs.c -index 13a758d..2f9a156 100644 ---- a/src/kash/jobs.c -+++ b/src/kash/jobs.c -@@ -396,8 +396,8 @@ showjob(shinstance *psh, struct output *out, struct job *jp, int mode) - #endif - st = WTERMSIG(ps->status); - st &= 0x7f; -- if (st < NSIG && sys_siglist[st]) -- scopyn(sys_siglist[st], s + col, 32); -+ if (st < NSIG) -+ scopyn(strsignal(st), s + col, 32); - else - fmtstr(s + col, 16, "Signal %d", st); - if (WCOREDUMP(ps->status)) { diff --git a/kBuild.spec b/kBuild.spec index 583266a..3f5ce00 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,9 +1,9 @@ -%global svn_revision 3296 -%global svn_date 20190122 +%global svn_revision 3564 +%global svn_date 20220308 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 9%{?svn_date:.%{svn_date}}%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -16,7 +16,7 @@ Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-pthread.patch Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch -Patch9: kBuild-strsignal.patch +Patch9: kBuild-0.1.9998-breakpoint_portme.patch BuildRequires: make BuildRequires: gcc @@ -53,7 +53,7 @@ repository. %patch8 -p1 -b .portme %endif %endif -%patch9 -p1 -b .strsignal +%patch9 -p1 -b .portme2 %build @@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Fri Apr 08 2022 Sérgio Basto - 0.1.9998.r3564-1.20220308 +- Update kBuild to r3564.20220308 + * Thu Jan 20 2022 Fedora Release Engineering - 0.1.9998.r3296-9.20190122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index a86a0d3..ffa505e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3296.20190122.tar.gz) = 5c61edb916876de8ad356491cfe6ebc452dfb05a0eec14896fb6b53ca3b9a6e057848cc0132b36a23615fd8d859602a74bcdd1b34750eeced2f95d26b67899bd +SHA512 (kBuild-r3564.20220308.tar.gz) = 22da7f6ac4ecaa7712240b021205158412add998f870786d0b22ccbe85559e5f3a0c2a29ef2cfd7d44cf6bc84f21322c32a8535d8b9dfd7cb4a102892d8060f4 From 434b76661a7e2f02c2861ccb258ecb5affbaf2c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:31:43 +0000 Subject: [PATCH 77/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 3f5ce00..09b36ee 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 2%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.1.9998.r3564-2.20220308 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Apr 08 2022 Sérgio Basto - 0.1.9998.r3564-1.20220308 - Update kBuild to r3564.20220308 From 6cfc7c36fccab774cd96d32841c52879e10ab41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 26 Oct 2022 10:12:35 +0100 Subject: [PATCH 78/97] Update to r3572.20221024 --- .gitignore | 1 + kBuild-0.1.9998-breakpoint_portme.patch | 11 ----------- kBuild.spec | 15 +++++++++------ sources | 2 +- 4 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 kBuild-0.1.9998-breakpoint_portme.patch diff --git a/.gitignore b/.gitignore index 8725149..6fee010 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r3290.20190106.tar.gz /kBuild-r3296.20190122.tar.gz /kBuild-r3564.20220308.tar.gz +/kBuild-r3572.20221024.tar.gz diff --git a/kBuild-0.1.9998-breakpoint_portme.patch b/kBuild-0.1.9998-breakpoint_portme.patch deleted file mode 100644 index 2f74d4d..0000000 --- a/kBuild-0.1.9998-breakpoint_portme.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/lib/kStuff/include/k/kHlpAssert.h.orig 2022-04-09 00:15:35.491852286 +0100 -+++ ./src/lib/kStuff/include/k/kHlpAssert.h 2022-04-09 00:17:27.465457543 +0100 -@@ -51,7 +51,7 @@ extern "C" { - # define kHlpAssertBreakpoint() do { __debugbreak(); } while (0) - #elif defined(__GNUC__) && K_OS == K_OS_SOLARIS && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32) - # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("int $3"); } while (0) --#elif defined(__GNUC__) && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32 || K_ARCH == K_ARCH_X86_16) -+#elif defined(__GNUC__) && (K_ARCH == K_ARCH_AMD64 || K_ARCH == K_ARCH_X86_32 || K_ARCH == K_ARCH_X86_16 || K_ARCH == K_ARCH_POWERPC_64 || K_ARCH == K_ARCH_S390_64 ) - # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("int3"); } while (0) - #elif defined(__GNUC__) && (K_ARCH == K_ARCH_ARM_64 || K_ARCH == K_ARCH_ARM_32) /* probably not supported by older ARM CPUs */ - # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("brk #0x1"); } while (0) diff --git a/kBuild.spec b/kBuild.spec index 09b36ee..f6dce7a 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,9 +1,9 @@ -%global svn_revision 3564 -%global svn_date 20220308 +%global svn_revision 3572 +%global svn_date 20221024 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 2%{?svn_date:.%{svn_date}}%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -16,9 +16,9 @@ Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-pthread.patch Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch -Patch9: kBuild-0.1.9998-breakpoint_portme.patch +Patch10: assert.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: automake BuildRequires: bison @@ -53,7 +53,7 @@ repository. %patch8 -p1 -b .portme %endif %endif -%patch9 -p1 -b .portme2 +%patch10 -p1 -b .portme3 %build @@ -98,6 +98,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Mon Oct 24 2022 Sérgio Basto - 0.1.9998.r3572-2.20221024 +- Update to r3572.20221024 + * Thu Jul 21 2022 Fedora Release Engineering - 0.1.9998.r3564-2.20220308 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index ffa505e..5a4c893 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3564.20220308.tar.gz) = 22da7f6ac4ecaa7712240b021205158412add998f870786d0b22ccbe85559e5f3a0c2a29ef2cfd7d44cf6bc84f21322c32a8535d8b9dfd7cb4a102892d8060f4 +SHA512 (kBuild-r3572.20221024.tar.gz) = 65f1c7f79c8daa5d4f6f7430f05e05081407ef03009fa8d20f794a450bb4b8ab7ad52a449f3700f2a3effde962a04a8fde6ee6c21db26ce9bdf5640c389ebc57 From fc8e871dde73128e1c260637b8e8194c2c5998a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 26 Oct 2022 10:56:33 +0100 Subject: [PATCH 79/97] add missing patch --- assert.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 assert.patch diff --git a/assert.patch b/assert.patch new file mode 100644 index 0000000..9376b6d --- /dev/null +++ b/assert.patch @@ -0,0 +1,18 @@ +Description: Use assert ehen kHlpAssertBreakpoint is not available +Author: Gianfranco Costamagna +Last-Update: 2020-11-10 + +Index: kbuild/src/lib/kStuff/include/k/kHlpAssert.h +=================================================================== +--- kbuild.orig/src/lib/kStuff/include/k/kHlpAssert.h ++++ kbuild/src/lib/kStuff/include/k/kHlpAssert.h +@@ -60,7 +60,8 @@ + #elif defined(__GNUC__) && (K_ARCH == K_ARCH_SPARC_64) + # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("illtrap 0"); } while (0) /*??*/ + #else +-# error "Port Me" ++#include ++# define kHlpAssertBreakpoint(cond) assert(cond) + #endif + + /** @def K_FUNCTION From 8c4d0d9aa80672573098bdfac720fcf136f3d274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 30 Oct 2022 19:46:40 +0000 Subject: [PATCH 80/97] Allow build with automake 1.13.4 on epel7 --- kBuild.spec | 5 +++++ relax_automake_version.patch | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 relax_automake_version.patch diff --git a/kBuild.spec b/kBuild.spec index f6dce7a..db31d20 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -17,6 +17,7 @@ Patch1: kBuild-pthread.patch Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch Patch10: assert.patch +Patch11: relax_automake_version.patch BuildRequires: make BuildRequires: gcc @@ -54,6 +55,9 @@ repository. %endif %endif %patch10 -p1 -b .portme3 +%if 0%{?rhel} && 0%{?rhel} <= 7 +%patch11 -p1 +%endif %build @@ -100,6 +104,7 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog * Mon Oct 24 2022 Sérgio Basto - 0.1.9998.r3572-2.20221024 - Update to r3572.20221024 +- Allow build with automake 1.13.4 on epel7 * Thu Jul 21 2022 Fedora Release Engineering - 0.1.9998.r3564-2.20220308 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/relax_automake_version.patch b/relax_automake_version.patch new file mode 100644 index 0000000..82b7e46 --- /dev/null +++ b/relax_automake_version.patch @@ -0,0 +1,11 @@ +--- kBuild/src/kmk/configure.ac.orig 2022-10-30 19:36:49.966336934 +0000 ++++ kBuild/src/kmk/configure.ac 2022-10-30 19:37:07.936270597 +0000 +@@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h]) + # We cannot enable -Werror because gettext 0.18.1 has invalid content + # When we update gettext to 0.18.3 or better we can add it again. + # bird: Added subdir-objects +-AM_INIT_AUTOMAKE([1.15 foreign -Werror -Wall subdir-objects]) ++AM_INIT_AUTOMAKE([1.13.4 foreign -Werror -Wall subdir-objects]) + + # Checks for programs. + AC_USE_SYSTEM_EXTENSIONS From 651c77ba796c294d73e26393a34a439d90c90e62 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sat, 17 Dec 2022 17:44:14 +0100 Subject: [PATCH 81/97] C99 compatibility fixes (#2154544) Related to: --- kBuild-c99.patch | 151 +++++++++++++++++++++++++++++++++++++ kBuild-configure-c99.patch | 48 ++++++++++++ kBuild.spec | 10 ++- 3 files changed, 207 insertions(+), 2 deletions(-) create mode 100644 kBuild-c99.patch create mode 100644 kBuild-configure-c99.patch diff --git a/kBuild-c99.patch b/kBuild-c99.patch new file mode 100644 index 0000000..73dbb11 --- /dev/null +++ b/kBuild-c99.patch @@ -0,0 +1,151 @@ +Do not treat as an umbrella header for +The two are distinct on GNU/Linux. + +Also add missing #include in some files. + +diff --git a/src/sed/lib/getline.c b/src/sed/lib/getline.c +index 4cb9d45b..f39c363f 100644 +--- a/src/sed/lib/getline.c ++++ b/src/sed/lib/getline.c +@@ -9,10 +9,10 @@ + #include + #undef getline /* bird */ + ++#include ++ + #ifdef HAVE_STRINGS_H + # include +-#else +-# include + #endif /* HAVE_STRINGS_H */ + + #ifdef HAVE_STDLIB_H +diff --git a/src/sed/lib/mkstemp.c b/src/sed/lib/mkstemp.c +index 5b00205c..f36f7ca4 100644 +--- a/src/sed/lib/mkstemp.c ++++ b/src/sed/lib/mkstemp.c +@@ -2,10 +2,10 @@ + #include "config.h" + #endif + ++#include ++ + #ifdef HAVE_STRINGS_H + # include +-#else +-# include + #endif /* HAVE_STRINGS_H */ + + #ifdef HAVE_STDLIB_H +diff --git a/src/sed/lib/utils.c b/src/sed/lib/utils.c +index 41c61aaf..48a8b57f 100644 +--- a/src/sed/lib/utils.c ++++ b/src/sed/lib/utils.c +@@ -25,10 +25,10 @@ + extern int errno; + #endif + ++#include ++ + #ifdef HAVE_STRINGS_H + # include +-#else +-# include + #endif /* HAVE_STRINGS_H */ + + #ifdef HAVE_STDLIB_H +diff --git a/src/sed/sed/compile.c b/src/sed/sed/compile.c +index 0ecc2fe2..064bb350 100644 +--- a/src/sed/sed/compile.c ++++ b/src/sed/sed/compile.c +@@ -22,14 +22,13 @@ + #include "strverscmp.h" + #include + #include ++#include + + #ifdef HAVE_STRINGS_H + # include + # ifdef HAVE_MEMORY_H + # include + # endif +-#else +-# include + #endif /* HAVE_STRINGS_H */ + + #ifdef HAVE_STDLIB_H +diff --git a/src/sed/sed/execute.c b/src/sed/sed/execute.c +index c9038f4f..09080b5b 100644 +--- a/src/sed/sed/execute.c ++++ b/src/sed/sed/execute.c +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + #include + #ifndef errno +@@ -46,8 +47,6 @@ extern int errno; + + #ifdef HAVE_STRINGS_H + # include +-#else +-# include + #endif /*HAVE_STRINGS_H*/ + #ifdef HAVE_MEMORY_H + # include +diff --git a/src/sed/sed/fmt.c b/src/sed/sed/fmt.c +index 64600a06..4374070e 100644 +--- a/src/sed/sed/fmt.c ++++ b/src/sed/sed/fmt.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #if HAVE_LIMITS_H + # include +diff --git a/src/sed/sed/mbcs.c b/src/sed/sed/mbcs.c +index 37565472..79e3f843 100644 +--- a/src/sed/sed/mbcs.c ++++ b/src/sed/sed/mbcs.c +@@ -17,6 +17,7 @@ + + #include "sed.h" + #include ++#include + + int mb_cur_max; + +diff --git a/src/sed/sed/regexp.c b/src/sed/sed/regexp.c +index d4e7437c..a007494d 100644 +--- a/src/sed/sed/regexp.c ++++ b/src/sed/sed/regexp.c +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #ifdef HAVE_STDLIB_H + # include + #endif +diff --git a/src/sed/sed/sed.c b/src/sed/sed/sed.c +index b3bc2ea2..3829e2c6 100644 +--- a/src/sed/sed/sed.c ++++ b/src/sed/sed/sed.c +@@ -22,12 +22,10 @@ + + #include "sed.h" + +- + #include ++#include + #ifdef HAVE_STRINGS_H + # include +-#else +-# include + #endif /*HAVE_STRINGS_H*/ + #ifdef HAVE_MEMORY_H + # include diff --git a/kBuild-configure-c99.patch b/kBuild-configure-c99.patch new file mode 100644 index 0000000..6749949 --- /dev/null +++ b/kBuild-configure-c99.patch @@ -0,0 +1,48 @@ +Fix some typical C99 compatibility issues in old configure scripts. + +diff --git a/src/sed/config/getline.m4 b/src/sed/config/getline.m4 +index ff8b5f4b..52d2e3e7 100644 +--- a/src/sed/config/getline.m4 ++++ b/src/sed/config/getline.m4 +@@ -27,7 +27,7 @@ AC_DEFUN([AM_FUNC_GETLINE], + if (!in) + return 1; + len = getline (&line, &siz, in); +- exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1); ++ return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1; + } + ], am_cv_func_working_getline=yes dnl The library version works. + , am_cv_func_working_getline=no dnl The library version does NOT work. +diff --git a/src/sed/configure b/src/sed/configure +index 0b01618f..b1172113 100755 +--- a/src/sed/configure ++++ b/src/sed/configure +@@ -2593,7 +2593,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ +- '' \ ++ '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ +@@ -3378,8 +3378,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +@@ -5747,7 +5747,7 @@ cat >>conftest.$ac_ext <<_ACEOF + if (!in) + return 1; + len = getline (&line, &siz, in); +- exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1); ++ return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1; + } + + _ACEOF diff --git a/kBuild.spec b/kBuild.spec index db31d20..5a871ed 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 2%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -18,6 +18,8 @@ Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch Patch10: assert.patch Patch11: relax_automake_version.patch +Patch12: kBuild-configure-c99.patch +Patch13: kBuild-c99.patch BuildRequires: make BuildRequires: gcc @@ -58,7 +60,8 @@ repository. %if 0%{?rhel} && 0%{?rhel} <= 7 %patch11 -p1 %endif - +%patch12 -p1 +%patch13 -p1 %build echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk > SvnInfo.kmk @@ -102,6 +105,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Sat Dec 17 2022 Florian Weimer - 0.1.9998.r3572-2.20221024 +- C99 compatibility fixes (#2154544) + * Mon Oct 24 2022 Sérgio Basto - 0.1.9998.r3572-2.20221024 - Update to r3572.20221024 - Allow build with automake 1.13.4 on epel7 From 30cd678bd5f876f291d1b916f2fa9f310f75bd20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:01:07 +0000 Subject: [PATCH 82/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 5a871ed..4bdb40a 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 2%{?svn_date:.%{svn_date}}%{?dist} +Release: 3%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -105,6 +105,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.1.9998.r3572-3.20221024 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 17 2022 Florian Weimer - 0.1.9998.r3572-2.20221024 - C99 compatibility fixes (#2154544) From 2dff0c2f5ee368bc5caca3f503dc24222ddebfb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 9 Mar 2023 01:18:30 +0000 Subject: [PATCH 83/97] new version revert changeset 3572 and 3566 to build VBox 6 on el7 --- .gitignore | 1 + changeset_3572.diff | 47 +++ changeset_trunk_3566.diff | 761 ++++++++++++++++++++++++++++++++++++++ kBuild.spec | 19 +- sources | 2 +- 5 files changed, 825 insertions(+), 5 deletions(-) create mode 100644 changeset_3572.diff create mode 100644 changeset_trunk_3566.diff diff --git a/.gitignore b/.gitignore index 6fee010..098da8a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r3296.20190122.tar.gz /kBuild-r3564.20220308.tar.gz /kBuild-r3572.20221024.tar.gz +/kBuild-r3589.20230220.tar.gz diff --git a/changeset_3572.diff b/changeset_3572.diff new file mode 100644 index 0000000..2abf95f --- /dev/null +++ b/changeset_3572.diff @@ -0,0 +1,47 @@ +Index: trunk/Config.kmk +=================================================================== +--- trunk/Config.kmk (revision 3571) ++++ trunk/Config.kmk (revision 3572) +@@ -124,4 +124,11 @@ + TOOL_FLEX_LEX = gflex + endif ++# Not all compiler tools currently do the same quoting of DEFS, so here's a ++# temporary workaround. ++ifn1of ($(KBUILD_TARGET), win) ++ TMP_QUOTE_SLASH := ++else ++ TMP_QUOTE_SLASH := \$(NO_SUCH_VARIABLE) ++endif + + # +@@ -183,6 +190,6 @@ + + DEFS += \ +- KBUILD_PATH=\"/$(patsubst %/,%,$(MY_INST_DATA))\" \ +- KBUILD_BIN_PATH=\"/$(patsubst %/,%,$(MY_INST_BIN))\" ++ KBUILD_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_DATA))$(TMP_QUOTE_SLASH)" \ ++ KBUILD_BIN_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_BIN))$(TMP_QUOTE_SLASH)" + endif + +Index: trunk/src/kmk/Makefile.kmk +=================================================================== +--- trunk/src/kmk/Makefile.kmk (revision 3571) ++++ trunk/src/kmk/Makefile.kmk (revision 3572) +@@ -39,5 +39,5 @@ + $(TEMPLATE_BIN_DEFS) \ + KBUILD_SVN_REV=$(KBUILD_SVN_REV) \ +- KBUILD_TYPE=\"$(KBUILD_TYPE)\" ++ KBUILD_TYPE=$(TMP_QUOTE_SLASH)"$(KBUILD_TYPE)$(TMP_QUOTE_SLASH)" + TEMPLATE_BIN-KMK_DEPS = \ + $(kmk_0_OUTDIR)/config.h \ +@@ -235,7 +235,7 @@ + CONFIG_WITH_MEMORY_OPTIMIZATIONS \ + \ +- KBUILD_HOST=\"$(KBUILD_TARGET)\" \ +- KBUILD_HOST_ARCH=\"$(KBUILD_TARGET_ARCH)\" \ +- KBUILD_HOST_CPU=\"$(KBUILD_TARGET_CPU)\" ++ KBUILD_HOST=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET)$(TMP_QUOTE_SLASH)" \ ++ KBUILD_HOST_ARCH=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_ARCH)$(TMP_QUOTE_SLASH)" \ ++ KBUILD_HOST_CPU=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_CPU)$(TMP_QUOTE_SLASH)" + # kmk_DEFS += CONFIG_WITH_COMPILER # experimental, doesn't work 101% right it seems. + kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS diff --git a/changeset_trunk_3566.diff b/changeset_trunk_3566.diff new file mode 100644 index 0000000..d225862 --- /dev/null +++ b/changeset_trunk_3566.diff @@ -0,0 +1,761 @@ +Index: trunk/kBuild/header.kmk +=================================================================== +--- trunk/kBuild/header.kmk (revision 3565) ++++ trunk/kBuild/header.kmk (revision 3566) +@@ -1714,5 +1714,5 @@ + ## + # An internal define used by subheader.kmk, subfooter.kmk, and +-# KB_FN_PASS_0_ON_TARGET. ++# KB_FN_DO_PASS0_ON_TARGET. + # + # @param target The target to process. +Index: trunk/kBuild/tools/GCC.kmk +=================================================================== +--- trunk/kBuild/tools/GCC.kmk (revision 3565) ++++ trunk/kBuild/tools/GCC.kmk (revision 3566) +@@ -106,5 +106,5 @@ + define TOOL_GCC_COMPILE_C_CMDS + $(QUIET)$(TOOL_GCC_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ + -o $(obj)\ +@@ -132,5 +132,5 @@ + define TOOL_GCC_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GCC_CXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ + -o $(obj)\ +@@ -158,5 +158,5 @@ + define TOOL_GCC_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GCC_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ + -o $(obj)\ +Index: trunk/kBuild/tools/GCC3.kmk +=================================================================== +--- trunk/kBuild/tools/GCC3.kmk (revision 3565) ++++ trunk/kBuild/tools/GCC3.kmk (revision 3566) +@@ -138,5 +138,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GCC3_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -152,5 +152,5 @@ + define TOOL_GCC3_COMPILE_C_CMDS + $(QUIET)$(TOOL_GCC3_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -182,5 +182,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC3_CXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -196,5 +196,5 @@ + define TOOL_GCC3_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GCC3_CXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -223,5 +223,5 @@ + define TOOL_GCC3_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GCC3_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GCC32.kmk +=================================================================== +--- trunk/kBuild/tools/GCC32.kmk (revision 3565) ++++ trunk/kBuild/tools/GCC32.kmk (revision 3566) +@@ -138,5 +138,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GCC32_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -152,5 +152,5 @@ + define TOOL_GCC32_COMPILE_C_CMDS + $(QUIET)$(TOOL_GCC32_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -182,5 +182,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC32_CXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -197,5 +197,5 @@ + define TOOL_GCC32_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GCC32_CXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -224,5 +224,5 @@ + define TOOL_GCC32_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GCC32_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GCC3OMF.kmk +=================================================================== +--- trunk/kBuild/tools/GCC3OMF.kmk (revision 3565) ++++ trunk/kBuild/tools/GCC3OMF.kmk (revision 3566) +@@ -122,5 +122,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GCC3OMF_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -136,5 +136,5 @@ + define TOOL_GCC3OMF_COMPILE_C_CMDS + $(QUIET)$(TOOL_GCC3OMF_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \ + -o $(obj)\ +@@ -167,5 +167,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC3OMF_CXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -181,5 +181,5 @@ + define TOOL_GCC3OMF_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GCC3OMF_CXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \ + -o $(obj)\ +@@ -208,5 +208,5 @@ + define TOOL_GCC3OMF_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GCC3OMF_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GCC3PLAIN.kmk +=================================================================== +--- trunk/kBuild/tools/GCC3PLAIN.kmk (revision 3565) ++++ trunk/kBuild/tools/GCC3PLAIN.kmk (revision 3566) +@@ -123,5 +123,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GCC3PLAIN_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -137,5 +137,5 @@ + define TOOL_GCC3PLAIN_COMPILE_C_CMDS + $(QUIET)$(TOOL_GCC3PLAIN_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -167,5 +167,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC3PLAIN_CXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -181,5 +181,5 @@ + define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GCC3PLAIN_CXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -208,5 +208,5 @@ + define TOOL_GCC3PLAIN_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GCC3PLAIN_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GCC42MACHO.kmk +=================================================================== +--- trunk/kBuild/tools/GCC42MACHO.kmk (revision 3565) ++++ trunk/kBuild/tools/GCC42MACHO.kmk (revision 3566) +@@ -165,5 +165,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GCC42MACHO_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -179,5 +179,5 @@ + define TOOL_GCC42MACHO_COMPILE_C_CMDS + $(QUIET)$(TOOL_GCC42MACHO_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -209,5 +209,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC42MACHO_CXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -223,5 +223,5 @@ + define TOOL_GCC42MACHO_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GCC42MACHO_CXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -253,5 +253,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC42MACHO_OBJC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -267,5 +267,5 @@ + define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS + $(QUIET)$(TOOL_GCC42MACHO_OBJC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -297,5 +297,5 @@ + --kObjCache-cpp $(outbase).mii\ + $(TOOL_GCC42MACHO_OBJCXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -311,5 +311,5 @@ + define TOOL_GCC42MACHO_COMPILE_OBJCXX_CMDS + $(QUIET)$(TOOL_GCC42MACHO_OBJCXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -338,5 +338,5 @@ + define TOOL_GCC42MACHO_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GCC42MACHO_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GCC4MACHO.kmk +=================================================================== +--- trunk/kBuild/tools/GCC4MACHO.kmk (revision 3565) ++++ trunk/kBuild/tools/GCC4MACHO.kmk (revision 3566) +@@ -165,5 +165,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GCC4MACHO_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -179,5 +179,5 @@ + define TOOL_GCC4MACHO_COMPILE_C_CMDS + $(QUIET)$(TOOL_GCC4MACHO_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -209,5 +209,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC4MACHO_CXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -223,5 +223,5 @@ + define TOOL_GCC4MACHO_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GCC4MACHO_CXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -253,5 +253,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC4MACHO_OBJC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -267,5 +267,5 @@ + define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS + $(QUIET)$(TOOL_GCC4MACHO_OBJC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -297,5 +297,5 @@ + --kObjCache-cpp $(outbase).mii\ + $(TOOL_GCC4MACHO_OBJCXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -311,5 +311,5 @@ + define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMDS + $(QUIET)$(TOOL_GCC4MACHO_OBJCXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -338,5 +338,5 @@ + define TOOL_GCC4MACHO_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GCC4MACHO_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GCC64.kmk +=================================================================== +--- trunk/kBuild/tools/GCC64.kmk (revision 3565) ++++ trunk/kBuild/tools/GCC64.kmk (revision 3566) +@@ -137,5 +137,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GCC64_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -151,5 +151,5 @@ + define TOOL_GCC64_COMPILE_C_CMDS + $(QUIET)$(TOOL_GCC64_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -181,5 +181,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GCC64_CXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -195,5 +195,5 @@ + define TOOL_GCC64_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GCC64_CXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -222,5 +222,5 @@ + define TOOL_GCC64_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GCC64_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GXX.kmk +=================================================================== +--- trunk/kBuild/tools/GXX.kmk (revision 3565) ++++ trunk/kBuild/tools/GXX.kmk (revision 3566) +@@ -121,5 +121,5 @@ + define TOOL_GXX_COMPILE_C_CMDS + $(QUIET)$(TOOL_GXX_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ + -o $(obj)\ +@@ -147,5 +147,5 @@ + define TOOL_GXX_COMPILE_CXX_CMDS + $(QUIET)$(TOOL_GXX_CXX) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ +@@ -173,5 +173,5 @@ + define TOOL_GXX_COMPILE_PCH_CMDS + $(QUIET)$(TOOL_GXX_PCH) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -200,5 +200,5 @@ + define TOOL_GXX_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GXX_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ + -o $(obj)\ +Index: trunk/kBuild/tools/GXX3.kmk +=================================================================== +--- trunk/kBuild/tools/GXX3.kmk (revision 3565) ++++ trunk/kBuild/tools/GXX3.kmk (revision 3566) +@@ -148,5 +148,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GXX3_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -158,5 +158,5 @@ + else + $(QUIET)$(TOOL_GXX3_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -189,5 +189,5 @@ + $(TOOL_GXX3_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ + ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -199,5 +199,5 @@ + else + $(QUIET)$(TOOL_GXX3_CXX) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ +@@ -226,5 +226,5 @@ + define TOOL_GXX3_COMPILE_PCH_CMDS + $(QUIET)$(TOOL_GXX3_PCH) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -253,5 +253,5 @@ + define TOOL_GXX3_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GXX3_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GXX32.kmk +=================================================================== +--- trunk/kBuild/tools/GXX32.kmk (revision 3565) ++++ trunk/kBuild/tools/GXX32.kmk (revision 3566) +@@ -145,5 +145,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GXX32_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -155,5 +155,5 @@ + else + $(QUIET)$(TOOL_GXX32_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -186,5 +186,5 @@ + $(TOOL_GXX32_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ + ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -196,5 +196,5 @@ + else + $(QUIET)$(TOOL_GXX32_CXX) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ +@@ -223,5 +223,5 @@ + define TOOL_GXX32_COMPILE_PCH_CMDS + $(QUIET)$(TOOL_GXX32_PCH) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -250,5 +250,5 @@ + define TOOL_GXX32_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GXX32_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GXX3OMF.kmk +=================================================================== +--- trunk/kBuild/tools/GXX3OMF.kmk (revision 3565) ++++ trunk/kBuild/tools/GXX3OMF.kmk (revision 3566) +@@ -134,5 +134,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GXX3OMF_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -144,5 +144,5 @@ + else + $(QUIET)$(TOOL_GXX3OMF_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -175,5 +175,5 @@ + $(TOOL_GXX3OMF_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ + ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -185,5 +185,5 @@ + else + $(QUIET)$(TOOL_GXX3OMF_CXX) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ +@@ -212,5 +212,5 @@ + define TOOL_GXX3OMF_COMPILE_PCH_CMDS + $(QUIET)$(TOOL_GXX3OMF_PCH) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -239,5 +239,5 @@ + define TOOL_GXX3OMF_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GXX3OMF_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GXX3PLAIN.kmk +=================================================================== +--- trunk/kBuild/tools/GXX3PLAIN.kmk (revision 3565) ++++ trunk/kBuild/tools/GXX3PLAIN.kmk (revision 3566) +@@ -131,5 +131,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GXX3PLAIN_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -141,5 +141,5 @@ + else + $(QUIET)$(TOOL_GXX3PLAIN_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -172,5 +172,5 @@ + $(TOOL_GXX3PLAIN_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ + ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -182,5 +182,5 @@ + else + $(QUIET)$(TOOL_GXX3PLAIN_CXX) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ +@@ -209,5 +209,5 @@ + define TOOL_GXX3PLAIN_COMPILE_PCH_CMDS + $(QUIET)$(TOOL_GXX3PLAIN_PCH) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -236,5 +236,5 @@ + define TOOL_GXX3PLAIN_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GXX3PLAIN_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GXX42MACHO.kmk +=================================================================== +--- trunk/kBuild/tools/GXX42MACHO.kmk (revision 3565) ++++ trunk/kBuild/tools/GXX42MACHO.kmk (revision 3566) +@@ -174,5 +174,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GXX42MACHO_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -184,5 +184,5 @@ + else + $(QUIET)$(TOOL_GXX42MACHO_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -215,5 +215,5 @@ + $(TOOL_GXX42MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ + ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -225,5 +225,5 @@ + else + $(QUIET)$(TOOL_GXX42MACHO_CXX) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ +@@ -252,5 +252,5 @@ + define TOOL_GXX42MACHO_COMPILE_PCH_CMDS + $(QUIET)$(TOOL_GXX42MACHO_PCH) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -282,5 +282,5 @@ + --kObjCache-cpp $(outbase).ii\ + $(TOOL_GXX42MACHO_OBJC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -296,5 +296,5 @@ + define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS + $(QUIET)$(TOOL_GXX42MACHO_OBJC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -326,5 +326,5 @@ + --kObjCache-cpp $(outbase).mii\ + $(TOOL_GXX42MACHO_OBJCXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -340,5 +340,5 @@ + define TOOL_GXX42MACHO_COMPILE_OBJCXX_CMDS + $(QUIET)$(TOOL_GXX42MACHO_OBJCXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -367,5 +367,5 @@ + define TOOL_GXX42MACHO_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GXX42MACHO_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GXX4MACHO.kmk +=================================================================== +--- trunk/kBuild/tools/GXX4MACHO.kmk (revision 3565) ++++ trunk/kBuild/tools/GXX4MACHO.kmk (revision 3566) +@@ -174,5 +174,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GXX4MACHO_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -184,5 +184,5 @@ + else + $(QUIET)$(TOOL_GXX4MACHO_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -215,5 +215,5 @@ + $(TOOL_GXX4MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ + ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -225,5 +225,5 @@ + else + $(QUIET)$(TOOL_GXX4MACHO_CXX) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ +@@ -252,5 +252,5 @@ + define TOOL_GXX4MACHO_COMPILE_PCH_CMDS + $(QUIET)$(TOOL_GXX4MACHO_PCH) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -282,5 +282,5 @@ + --kObjCache-cpp $(outbase).mii\ + $(TOOL_GXX4MACHO_OBJCXX) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -296,5 +296,5 @@ + define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMDS + $(QUIET)$(TOOL_GXX4MACHO_OBJCXX) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -323,5 +323,5 @@ + define TOOL_GXX4MACHO_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GXX4MACHO_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +Index: trunk/kBuild/tools/GXX64.kmk +=================================================================== +--- trunk/kBuild/tools/GXX64.kmk (revision 3565) ++++ trunk/kBuild/tools/GXX64.kmk (revision 3566) +@@ -145,5 +145,5 @@ + --kObjCache-cpp $(outbase).i\ + $(TOOL_GXX64_CC) -E -o -\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -155,5 +155,5 @@ + else + $(QUIET)$(TOOL_GXX64_CC) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -186,5 +186,5 @@ + $(TOOL_GXX64_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ + ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + $(abspath $(source))\ +@@ -196,5 +196,5 @@ + else + $(QUIET)$(TOOL_GXX64_CXX) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ +@@ -223,5 +223,5 @@ + define TOOL_GXX64_COMPILE_PCH_CMDS + $(QUIET)$(TOOL_GXX64_PCH) -c\ +- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ +@@ -250,5 +250,5 @@ + define TOOL_GXX64_COMPILE_AS_CMDS + $(QUIET)$(TOOL_GXX64_AS) -c\ +- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ ++ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ + -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ + -o $(obj)\ diff --git a/kBuild.spec b/kBuild.spec index 4bdb40a..4ab65f1 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,9 +1,9 @@ -%global svn_revision 3572 -%global svn_date 20221024 +%global svn_revision 3589 +%global svn_date 20230220 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 3%{?svn_date:.%{svn_date}}%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -20,6 +20,8 @@ Patch10: assert.patch Patch11: relax_automake_version.patch Patch12: kBuild-configure-c99.patch Patch13: kBuild-c99.patch +Patch14: changeset_3572.diff +Patch15: changeset_trunk_3566.diff BuildRequires: make BuildRequires: gcc @@ -62,6 +64,11 @@ repository. %endif %patch12 -p1 %patch13 -p1 +%if 0%{?rhel} && 0%{?rhel} <= 7 +# we need revert this 2 commits to build VBox 6 on el7 +%patch14 -p1 -R -b .revert +%patch15 -p1 -R -b .revert2 +%endif %build echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk > SvnInfo.kmk @@ -105,13 +112,17 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Mar 09 2023 Sérgio Basto - 0.1.9998.r3589-1.20230220 +- new version +- revert changeset 3572 and 3566 to build VBox 6 on el7 + * Thu Jan 19 2023 Fedora Release Engineering - 0.1.9998.r3572-3.20221024 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Sat Dec 17 2022 Florian Weimer - 0.1.9998.r3572-2.20221024 - C99 compatibility fixes (#2154544) -* Mon Oct 24 2022 Sérgio Basto - 0.1.9998.r3572-2.20221024 +* Mon Oct 24 2022 Sérgio Basto - 0.1.9998.r3572-1.20221024 - Update to r3572.20221024 - Allow build with automake 1.13.4 on epel7 diff --git a/sources b/sources index 5a4c893..2c766e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3572.20221024.tar.gz) = 65f1c7f79c8daa5d4f6f7430f05e05081407ef03009fa8d20f794a450bb4b8ab7ad52a449f3700f2a3effde962a04a8fde6ee6c21db26ce9bdf5640c389ebc57 +SHA512 (kBuild-r3589.20230220.tar.gz) = f9703785c0322b0a27074b68dc2e4155d44f10db9af89f50d6d3e3d1ef5431e28b8c8260da9521b147a9dc43dab0c6fe3fa1078f4e8ea4697bcaa20d2aca811d From 8ed62d21f89dafa536fc7c241c8220cdb007727a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:19:30 +0000 Subject: [PATCH 84/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 4ab65f1..73e5772 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 2%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -112,6 +112,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.1.9998.r3589-2.20230220 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Mar 09 2023 Sérgio Basto - 0.1.9998.r3589-1.20230220 - new version - revert changeset 3572 and 3566 to build VBox 6 on el7 From 8f7fd123fb8352ffa555a6b3d2d8777c0c031a74 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 20 Dec 2023 13:46:46 +0100 Subject: [PATCH 85/97] Fix another C compatibility issue (#2154544) --- kBuild-c99-2.patch | 16 ++++++++++++++++ kBuild.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 kBuild-c99-2.patch diff --git a/kBuild-c99-2.patch b/kBuild-c99-2.patch new file mode 100644 index 0000000..62fa544 --- /dev/null +++ b/kBuild-c99-2.patch @@ -0,0 +1,16 @@ +The eval_buffer function expects the end of the string as the +(optional) last argument, not its length. + +Index: src/kmk/loadapi.c +=================================================================== +--- src/kmk/loadapi.c (revision 3600) ++++ src/kmk/loadapi.c (working copy) +@@ -59,7 +59,7 @@ + install_variable_buffer (&pbuf, &plen); + + s = xstrdup (buffer); +- eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */)); ++ eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (s + strlen (s) /** @todo suboptimal */)); + free (s); + + restore_variable_buffer (pbuf, plen); diff --git a/kBuild.spec b/kBuild.spec index 73e5772..4e46a68 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 2%{?svn_date:.%{svn_date}}%{?dist} +Release: 3%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -22,6 +22,7 @@ Patch12: kBuild-configure-c99.patch Patch13: kBuild-c99.patch Patch14: changeset_3572.diff Patch15: changeset_trunk_3566.diff +Patch16: kBuild-c99-2.patch BuildRequires: make BuildRequires: gcc @@ -69,6 +70,7 @@ repository. %patch14 -p1 -R -b .revert %patch15 -p1 -R -b .revert2 %endif +%patch16 -p0 %build echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk > SvnInfo.kmk @@ -112,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Wed Dec 20 2023 Florian Weimer - 0.1.9998.r3589-3.20230220 +- Fix another C compatibility issue (#2154544) + * Thu Jul 20 2023 Fedora Release Engineering - 0.1.9998.r3589-2.20230220 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4f8555aa2265f5348b49d75889fece99fcdb72b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:54:25 +0000 Subject: [PATCH 86/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 4e46a68..820add7 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 3%{?svn_date:.%{svn_date}}%{?dist} +Release: 4%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -114,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 0.1.9998.r3589-4.20230220 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Dec 20 2023 Florian Weimer - 0.1.9998.r3589-3.20230220 - Fix another C compatibility issue (#2154544) From d0dc1d34aaea8afcbaf08f2068312c597a7f8534 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:34:37 +0000 Subject: [PATCH 87/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 820add7..d505f42 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 4%{?svn_date:.%{svn_date}}%{?dist} +Release: 5%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -114,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0.1.9998.r3589-5.20230220 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 0.1.9998.r3589-4.20230220 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a20f882eb375a80e6aa82920567ebaacdd4ee791 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 88/97] Eliminate use of obsolete %patchN syntax (#2283636) --- kBuild.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/kBuild.spec b/kBuild.spec index d505f42..fce74e8 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -47,30 +47,30 @@ repository. %prep #%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %setup -q -n %{name} -%patch0 -p1 -b .escape -%patch1 -p1 -b .pthreads -%patch6 -p1 -b .dummy_noreturn +%patch -P0 -p1 -b .escape +%patch -P1 -p1 -b .pthreads +%patch -P6 -p1 -b .dummy_noreturn %ifarch ppc64 %if 0%{?rhel} && 0%{?rhel} < 7 # Found the reason why compile fails in detection of powerpc64 in centos 6 # kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN." # hack for gcc < 4.6 and ppc64 only # https://stackoverflow.com/a/40675229/778517 -%patch8 -p1 -b .portme +%patch -P8 -p1 -b .portme %endif %endif -%patch10 -p1 -b .portme3 +%patch -P10 -p1 -b .portme3 %if 0%{?rhel} && 0%{?rhel} <= 7 -%patch11 -p1 +%patch -P11 -p1 %endif -%patch12 -p1 -%patch13 -p1 +%patch -P12 -p1 +%patch -P13 -p1 %if 0%{?rhel} && 0%{?rhel} <= 7 # we need revert this 2 commits to build VBox 6 on el7 -%patch14 -p1 -R -b .revert -%patch15 -p1 -R -b .revert2 +%patch -P14 -p1 -R -b .revert +%patch -P15 -p1 -R -b .revert2 %endif -%patch16 -p0 +%patch -P16 -p0 %build echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk > SvnInfo.kmk From b350990a6850b605d2bba9f58c4dfe37e0ce4ea2 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Fri, 31 May 2024 14:25:44 +0200 Subject: [PATCH 89/97] Fix improperly commented out macros in %prep Since RPM 4.20, %prep is no longer implemented as a special "hack" [1] but is now a regular build scriptlet, meaning that %setup or %patch are now treated as regular macros and thus will be expanded even in comments (as documented in [2]). Our spec has these so fix them up to unbreak the build on F41. [1] https://github.com/rpm-software-management/rpm/issues/2205 [2] https://rpm-software-management.github.io/rpm/manual/spec.html --- kBuild.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index fce74e8..d61c715 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -45,7 +45,7 @@ repository. %prep -#%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} +%dnl %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %setup -q -n %{name} %patch -P0 -p1 -b .escape %patch -P1 -p1 -b .pthreads From 93099b6453afd9e8e0d13b416186c4cce2ce496e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 5 Jun 2024 00:42:59 +0100 Subject: [PATCH 90/97] Update to Revision 3605 --- .gitignore | 1 + kBuild-0.1.9998-portme.patch | 6 ++++++ kBuild.spec | 9 ++++++--- kbuild-dummy_noreturn.diff | 25 ------------------------- relax_automake_version.patch | 1 + sources | 2 +- 6 files changed, 15 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 098da8a..63db71b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r3564.20220308.tar.gz /kBuild-r3572.20221024.tar.gz /kBuild-r3589.20230220.tar.gz +/kBuild-r3605.20240424.tar.gz diff --git a/kBuild-0.1.9998-portme.patch b/kBuild-0.1.9998-portme.patch index 53b6462..9e490e3 100644 --- a/kBuild-0.1.9998-portme.patch +++ b/kBuild-0.1.9998-portme.patch @@ -1,3 +1,9 @@ +# Only used on el6 +# Found the reason why compile fails in detection of powerpc64 in centos 6 +# kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN." +# hack for gcc < 4.6 and ppc64 only +# https://stackoverflow.com/a/40675229/778517 + --- kBuild/src/lib/kStuff/include/k/kDefs.h.orig 2018-05-12 03:35:13.703342877 +0100 +++ kBuild/src/lib/kStuff/include/k/kDefs.h 2018-05-12 04:24:52.034917011 +0100 @@ -336,16 +336,19 @@ diff --git a/kBuild.spec b/kBuild.spec index d61c715..f73503d 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,9 +1,9 @@ -%global svn_revision 3589 -%global svn_date 20230220 +%global svn_revision 3605 +%global svn_date 20240424 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 5%{?svn_date:.%{svn_date}}%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -114,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Tue Jun 04 2024 Sérgio Basto - 0.1.9998.r3605-1.20240424 +- Update to Revision 3605 + * Wed Jan 24 2024 Fedora Release Engineering - 0.1.9998.r3589-5.20230220 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff index 929dc08..bf03e86 100644 --- a/kbuild-dummy_noreturn.diff +++ b/kbuild-dummy_noreturn.diff @@ -11,28 +11,3 @@ Index: src/kmk/kmkbuiltin/expr.c } /* 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 - #include -+#include - #include - #include - #include -# Fix one implicit-function-declaration -Index: src/sed/lib/utils.c -=================================================================== ---- ./src/sed/lib/utils.c (revision 3127) -+++ ./src/sed/lib/utils.c (working copy) -@@ -19,6 +19,7 @@ - #include "config.h" - - #include -+#include - - #include - #ifndef errno diff --git a/relax_automake_version.patch b/relax_automake_version.patch index 82b7e46..8e6fc2f 100644 --- a/relax_automake_version.patch +++ b/relax_automake_version.patch @@ -1,3 +1,4 @@ +# Only for epel <= 7 --- kBuild/src/kmk/configure.ac.orig 2022-10-30 19:36:49.966336934 +0000 +++ kBuild/src/kmk/configure.ac 2022-10-30 19:37:07.936270597 +0000 @@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h]) diff --git a/sources b/sources index 2c766e2..84a6290 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3589.20230220.tar.gz) = f9703785c0322b0a27074b68dc2e4155d44f10db9af89f50d6d3e3d1ef5431e28b8c8260da9521b147a9dc43dab0c6fe3fa1078f4e8ea4697bcaa20d2aca811d +SHA512 (kBuild-r3605.20240424.tar.gz) = 54cee210840ae05819f8b80f4786d6196d55fb2d8237173c57c95905e224ed312daa3d32903bb858d08e6a8fabdd20bea7a1330104efeedbf5e31397f879c9c5 From 4ca0182e62018c81581d2819b6bdecc421610561 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:16:24 +0000 Subject: [PATCH 91/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index f73503d..452fcb8 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 2%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment License: BSD and GPLv2+ @@ -114,6 +114,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.1.9998.r3605-2.20240424 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 04 2024 Sérgio Basto - 0.1.9998.r3605-1.20240424 - Update to Revision 3605 From 4707d205537f0eebcc56a2d1e48796687af3bc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 09:11:13 +0200 Subject: [PATCH 92/97] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- kBuild.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kBuild.spec b/kBuild.spec index 452fcb8..50058c7 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,10 +3,11 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 2%{?svn_date:.%{svn_date}}%{?dist} +Release: 3%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment -License: BSD and GPLv2+ +# Automatically converted from old format: BSD and GPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-BSD AND GPL-2.0-or-later # most tools are from NetBSD, some are from FreeBSD, # and make and sed are from GNU URL: http://svn.netlabs.org/kbuild @@ -114,6 +115,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Mon Sep 02 2024 Miroslav Suchý - 0.1.9998.r3605-3.20240424 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 0.1.9998.r3605-2.20240424 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5bfbab5a3d0c65a534096c9d5fbfe2ab7de4fc13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:10:55 +0000 Subject: [PATCH 93/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 50058c7..37fec5d 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 3%{?svn_date:.%{svn_date}}%{?dist} +Release: 4%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment # Automatically converted from old format: BSD and GPLv2+ - review is highly recommended. @@ -115,6 +115,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.1.9998.r3605-4.20240424 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 0.1.9998.r3605-3.20240424 - convert license to SPDX From de96d41a620a4decb4c0f3b9a95c580bfa14594a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 25 Apr 2025 22:05:42 +0100 Subject: [PATCH 94/97] Update to Revision 3674 --- kBuild-c99-2.patch | 16 ---- kBuild-c99.patch | 151 ------------------------------------- kBuild-configure-c99.patch | 48 ------------ kBuild.spec | 15 ++-- 4 files changed, 6 insertions(+), 224 deletions(-) delete mode 100644 kBuild-c99-2.patch delete mode 100644 kBuild-c99.patch delete mode 100644 kBuild-configure-c99.patch diff --git a/kBuild-c99-2.patch b/kBuild-c99-2.patch deleted file mode 100644 index 62fa544..0000000 --- a/kBuild-c99-2.patch +++ /dev/null @@ -1,16 +0,0 @@ -The eval_buffer function expects the end of the string as the -(optional) last argument, not its length. - -Index: src/kmk/loadapi.c -=================================================================== ---- src/kmk/loadapi.c (revision 3600) -+++ src/kmk/loadapi.c (working copy) -@@ -59,7 +59,7 @@ - install_variable_buffer (&pbuf, &plen); - - s = xstrdup (buffer); -- eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */)); -+ eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (s + strlen (s) /** @todo suboptimal */)); - free (s); - - restore_variable_buffer (pbuf, plen); diff --git a/kBuild-c99.patch b/kBuild-c99.patch deleted file mode 100644 index 73dbb11..0000000 --- a/kBuild-c99.patch +++ /dev/null @@ -1,151 +0,0 @@ -Do not treat as an umbrella header for -The two are distinct on GNU/Linux. - -Also add missing #include in some files. - -diff --git a/src/sed/lib/getline.c b/src/sed/lib/getline.c -index 4cb9d45b..f39c363f 100644 ---- a/src/sed/lib/getline.c -+++ b/src/sed/lib/getline.c -@@ -9,10 +9,10 @@ - #include - #undef getline /* bird */ - -+#include -+ - #ifdef HAVE_STRINGS_H - # include --#else --# include - #endif /* HAVE_STRINGS_H */ - - #ifdef HAVE_STDLIB_H -diff --git a/src/sed/lib/mkstemp.c b/src/sed/lib/mkstemp.c -index 5b00205c..f36f7ca4 100644 ---- a/src/sed/lib/mkstemp.c -+++ b/src/sed/lib/mkstemp.c -@@ -2,10 +2,10 @@ - #include "config.h" - #endif - -+#include -+ - #ifdef HAVE_STRINGS_H - # include --#else --# include - #endif /* HAVE_STRINGS_H */ - - #ifdef HAVE_STDLIB_H -diff --git a/src/sed/lib/utils.c b/src/sed/lib/utils.c -index 41c61aaf..48a8b57f 100644 ---- a/src/sed/lib/utils.c -+++ b/src/sed/lib/utils.c -@@ -25,10 +25,10 @@ - extern int errno; - #endif - -+#include -+ - #ifdef HAVE_STRINGS_H - # include --#else --# include - #endif /* HAVE_STRINGS_H */ - - #ifdef HAVE_STDLIB_H -diff --git a/src/sed/sed/compile.c b/src/sed/sed/compile.c -index 0ecc2fe2..064bb350 100644 ---- a/src/sed/sed/compile.c -+++ b/src/sed/sed/compile.c -@@ -22,14 +22,13 @@ - #include "strverscmp.h" - #include - #include -+#include - - #ifdef HAVE_STRINGS_H - # include - # ifdef HAVE_MEMORY_H - # include - # endif --#else --# include - #endif /* HAVE_STRINGS_H */ - - #ifdef HAVE_STDLIB_H -diff --git a/src/sed/sed/execute.c b/src/sed/sed/execute.c -index c9038f4f..09080b5b 100644 ---- a/src/sed/sed/execute.c -+++ b/src/sed/sed/execute.c -@@ -24,6 +24,7 @@ - - #include - #include -+#include - - #include - #ifndef errno -@@ -46,8 +47,6 @@ extern int errno; - - #ifdef HAVE_STRINGS_H - # include --#else --# include - #endif /*HAVE_STRINGS_H*/ - #ifdef HAVE_MEMORY_H - # include -diff --git a/src/sed/sed/fmt.c b/src/sed/sed/fmt.c -index 64600a06..4374070e 100644 ---- a/src/sed/sed/fmt.c -+++ b/src/sed/sed/fmt.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #if HAVE_LIMITS_H - # include -diff --git a/src/sed/sed/mbcs.c b/src/sed/sed/mbcs.c -index 37565472..79e3f843 100644 ---- a/src/sed/sed/mbcs.c -+++ b/src/sed/sed/mbcs.c -@@ -17,6 +17,7 @@ - - #include "sed.h" - #include -+#include - - int mb_cur_max; - -diff --git a/src/sed/sed/regexp.c b/src/sed/sed/regexp.c -index d4e7437c..a007494d 100644 ---- a/src/sed/sed/regexp.c -+++ b/src/sed/sed/regexp.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #ifdef HAVE_STDLIB_H - # include - #endif -diff --git a/src/sed/sed/sed.c b/src/sed/sed/sed.c -index b3bc2ea2..3829e2c6 100644 ---- a/src/sed/sed/sed.c -+++ b/src/sed/sed/sed.c -@@ -22,12 +22,10 @@ - - #include "sed.h" - -- - #include -+#include - #ifdef HAVE_STRINGS_H - # include --#else --# include - #endif /*HAVE_STRINGS_H*/ - #ifdef HAVE_MEMORY_H - # include diff --git a/kBuild-configure-c99.patch b/kBuild-configure-c99.patch deleted file mode 100644 index 6749949..0000000 --- a/kBuild-configure-c99.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix some typical C99 compatibility issues in old configure scripts. - -diff --git a/src/sed/config/getline.m4 b/src/sed/config/getline.m4 -index ff8b5f4b..52d2e3e7 100644 ---- a/src/sed/config/getline.m4 -+++ b/src/sed/config/getline.m4 -@@ -27,7 +27,7 @@ AC_DEFUN([AM_FUNC_GETLINE], - if (!in) - return 1; - len = getline (&line, &siz, in); -- exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1); -+ return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1; - } - ], am_cv_func_working_getline=yes dnl The library version works. - , am_cv_func_working_getline=no dnl The library version does NOT work. -diff --git a/src/sed/configure b/src/sed/configure -index 0b01618f..b1172113 100755 ---- a/src/sed/configure -+++ b/src/sed/configure -@@ -2593,7 +2593,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ -- '' \ -+ '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -3378,8 +3378,8 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext -@@ -5747,7 +5747,7 @@ cat >>conftest.$ac_ext <<_ACEOF - if (!in) - return 1; - len = getline (&line, &siz, in); -- exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1); -+ return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1; - } - - _ACEOF diff --git a/kBuild.spec b/kBuild.spec index 37fec5d..72b2053 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,9 +1,9 @@ -%global svn_revision 3605 -%global svn_date 20240424 +%global svn_revision 3674 +%global svn_date 20250422 Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 4%{?svn_date:.%{svn_date}}%{?dist} +Release: 1%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment # Automatically converted from old format: BSD and GPLv2+ - review is highly recommended. @@ -19,11 +19,8 @@ Patch6: kbuild-dummy_noreturn.diff Patch8: kBuild-0.1.9998-portme.patch Patch10: assert.patch Patch11: relax_automake_version.patch -Patch12: kBuild-configure-c99.patch -Patch13: kBuild-c99.patch Patch14: changeset_3572.diff Patch15: changeset_trunk_3566.diff -Patch16: kBuild-c99-2.patch BuildRequires: make BuildRequires: gcc @@ -64,14 +61,11 @@ repository. %if 0%{?rhel} && 0%{?rhel} <= 7 %patch -P11 -p1 %endif -%patch -P12 -p1 -%patch -P13 -p1 %if 0%{?rhel} && 0%{?rhel} <= 7 # we need revert this 2 commits to build VBox 6 on el7 %patch -P14 -p1 -R -b .revert %patch -P15 -p1 -R -b .revert2 %endif -%patch -P16 -p0 %build echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk > SvnInfo.kmk @@ -115,6 +109,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Fri Apr 25 2025 Sérgio Basto - 0.1.9998.r3674-1.20250422 +- Update to Revision 3674 + * Fri Jan 17 2025 Fedora Release Engineering - 0.1.9998.r3605-4.20240424 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 827d0b102b60d08dfef32f0520152cfc82dc7ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 25 Apr 2025 23:34:19 +0100 Subject: [PATCH 95/97] (rhbz#2340684) Fix FTBFS --- kBuild-c23.patch | 14 ++++++++++++++ kBuild.spec | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 kBuild-c23.patch diff --git a/kBuild-c23.patch b/kBuild-c23.patch new file mode 100644 index 0000000..fde7a93 --- /dev/null +++ b/kBuild-c23.patch @@ -0,0 +1,14 @@ +diff -Nurp kBuild.orig/src/kmk/glob/fnmatch.c kBuild/src/kmk/glob/fnmatch.c +--- kBuild.orig/src/kmk/glob/fnmatch.c 2025-04-25 21:54:33.000000000 +0100 ++++ kBuild/src/kmk/glob/fnmatch.c 2025-04-25 23:20:55.477680324 +0100 +@@ -120,10 +120,6 @@ USA. */ + /* Avoid depending on library functions or files + whose names are inconsistent. */ + +-# if !defined _LIBC && !defined getenv && !defined _MSC_VER +-extern char *getenv (); +-# endif +- + # ifndef errno + extern int errno; + # endif diff --git a/kBuild.spec b/kBuild.spec index 72b2053..79b4621 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -21,6 +21,7 @@ Patch10: assert.patch Patch11: relax_automake_version.patch Patch14: changeset_3572.diff Patch15: changeset_trunk_3566.diff +Patch16: kBuild-c23.patch BuildRequires: make BuildRequires: gcc @@ -66,6 +67,7 @@ repository. %patch -P14 -p1 -R -b .revert %patch -P15 -p1 -R -b .revert2 %endif +%patch -P16 -p1 %build echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk > SvnInfo.kmk @@ -111,6 +113,7 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog * Fri Apr 25 2025 Sérgio Basto - 0.1.9998.r3674-1.20250422 - Update to Revision 3674 +- (rhbz#2340684) Fix FTBFS * Fri Jan 17 2025 Fedora Release Engineering - 0.1.9998.r3605-4.20240424 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b7e1b28dbd19c5cede855fffbef430a575c3df61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 25 Apr 2025 23:48:35 +0100 Subject: [PATCH 96/97] Upload the new sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 63db71b..b15196c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ kBuild-0.1.5-p2-src.tar.gz /kBuild-r3572.20221024.tar.gz /kBuild-r3589.20230220.tar.gz /kBuild-r3605.20240424.tar.gz +/kBuild-r3674.20250422.tar.gz diff --git a/sources b/sources index 84a6290..7b1bdf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kBuild-r3605.20240424.tar.gz) = 54cee210840ae05819f8b80f4786d6196d55fb2d8237173c57c95905e224ed312daa3d32903bb858d08e6a8fabdd20bea7a1330104efeedbf5e31397f879c9c5 +SHA512 (kBuild-r3674.20250422.tar.gz) = dfb52548f896281ac7473a2ebed93e939ae65e6b22101f16a27d36367a90304a3b0aa67f5470d50af1a37333865f570cc447ac7537250fc0fe57746d6c6ba219 From b6d275a31ad828df179ec4e6ebe7fa5bdcb3779d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:10:08 +0000 Subject: [PATCH 97/97] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- kBuild.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kBuild.spec b/kBuild.spec index 79b4621..b8c234f 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -3,7 +3,7 @@ Name: kBuild Version: 0.1.9998%{?svn_revision:.r%{svn_revision}} -Release: 1%{?svn_date:.%{svn_date}}%{?dist} +Release: 2%{?svn_date:.%{svn_date}}%{?dist} Summary: A cross-platform build environment # Automatically converted from old format: BSD and GPLv2+ - review is highly recommended. @@ -111,6 +111,9 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \ %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.1.9998.r3674-2.20250422 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Apr 25 2025 Sérgio Basto - 0.1.9998.r3674-1.20250422 - Update to Revision 3674 - (rhbz#2340684) Fix FTBFS