diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/changelog | 683 | ||||
| -rw-r--r-- | debian/control | 40 | ||||
| -rw-r--r-- | debian/copyright | 154 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 | ||||
| -rw-r--r-- | debian/kbuild.install | 1 | ||||
| -rw-r--r-- | debian/kbuild.links | 27 | ||||
| -rw-r--r-- | debian/kbuild.manpages | 1 | ||||
| -rw-r--r-- | debian/manpages/kmk.1 | 50 | ||||
| -rw-r--r-- | debian/orig-tar.sh | 23 | ||||
| -rw-r--r-- | debian/patches/07_special-chars-build-path.diff | 356 | ||||
| -rw-r--r-- | debian/patches/assert.patch | 18 | ||||
| -rw-r--r-- | debian/patches/build-fix | 22 | ||||
| -rw-r--r-- | debian/patches/do-not-build-docs.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rwxr-xr-x | debian/rules | 41 | ||||
| -rw-r--r-- | debian/source/format | 1 |
16 files changed, 1441 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..88593c9 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,683 @@ +kbuild (1:0.1.9998svn3589+dfsg-1) unstable; urgency=medium + + * New upstream version 0.1.9998svn3589+dfsg + * Update get-orig-source script + + -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 19 Apr 2023 13:37:54 +0200 + +kbuild (1:0.1.9998svn3572+dfsg-1) unstable; urgency=medium + + * New upstream version 0.1.9998svn3572+dfsg + * Drop patch revert + + -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 24 Oct 2022 12:04:52 +0200 + +kbuild (1:0.1.9998svn3571+dfsg-4) unstable; urgency=medium + + * Fixup another UPSTREAM_VERSION reference + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sun, 23 Oct 2022 10:50:51 +0200 + +kbuild (1:0.1.9998svn3571+dfsg-3) unstable; urgency=medium + + * Bump copyright years + * Bump another copyright year + * Drop as-needed flag, now default + * Drop another as-needed reference + * Drop dpkg-parsechangelog call in rules file + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 22 Oct 2022 10:33:27 +0200 + +kbuild (1:0.1.9998svn3571+dfsg-2) unstable; urgency=medium + + * Revert upstream commit 3566, makes the build FTBFS + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 22 Oct 2022 10:25:52 +0200 + +kbuild (1:0.1.9998svn3571+dfsg-1) unstable; urgency=medium + + * New upstream version 0.1.9998svn3571+dfsg + * Refresh patch + + -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 19 Oct 2022 17:44:34 +0200 + +kbuild (1:0.1.9998svn3564+dfsg-1) unstable; urgency=medium + + * New upstream version 0.1.9998svn3564+dfsg + * Patch refresh + * Update compat level to 13 + * Bump std-version to 4.6.0 + * debian/copyright: add mention of grep sources + * debian/copyright: use https for orig source URL + + -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 31 Mar 2022 07:56:03 +0200 + +kbuild (1:0.1.9998svn3489+dfsg-2) unstable; urgency=medium + + * Implement an assert fallback where new kHlpAssertBreakpoint function + is not implemented + + -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 10 Nov 2020 11:22:51 +0100 + +kbuild (1:0.1.9998svn3489+dfsg-1) unstable; urgency=medium + + * New upstream version 0.1.9998svn3489+dfsg + * Update copyright years + * Refresh patch 07_special-chars-build-path.diff + * Add patch to fix build with echo not escaping regexes during c file + generation. + + -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 30 Oct 2020 12:07:12 +0100 + +kbuild (1:0.1.9998svn3301+dfsg-1) unstable; urgency=medium + + [ Debian Janitor ] + * Trim trailing whitespace. + * Use secure copyright file specification URI. + * Use secure URI in Homepage field. + * Update standards version to 4.4.1, no changes needed. + + [ Gianfranco Costamagna ] + * New upstream version 0.1.9998svn3301+dfsg + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 14 Dec 2019 09:28:19 +0100 + +kbuild (1:0.1.9998svn3296+dfsg-1) unstable; urgency=medium + + * Upload to unstable + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sun, 07 Jul 2019 14:07:39 +0200 + +kbuild (1:0.1.9998svn3296+dfsg-1~exp1) experimental; urgency=medium + + * New upstream version 0.1.9998svn3296+dfsg + * Drop patch, now upstream + * Bump compat level to 12 + + -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 23 May 2019 09:46:09 +0200 + +kbuild (1:0.1.9998svn3293+dfsg-2) unstable; urgency=medium + + * Upload a fix for armhf + + -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 10 Jan 2019 10:52:22 +0100 + +kbuild (1:0.1.9998svn3293+dfsg-1) unstable; urgency=medium + + * New upstream version 0.1.9998svn3293+dfsg + + -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 08 Jan 2019 22:18:40 +0100 + +kbuild (1:0.1.9998svn3290+dfsg-1) unstable; urgency=medium + + * New upstream version 0.1.9998svn3290+dfsg + * Drop patch now upstream + * Patch refresh + * bump std-version to 4.3.0, no changes required + + -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 07 Jan 2019 16:11:22 +0100 + +kbuild (1:0.1.9998svn3236+dfsg-1) unstable; urgency=medium + + * Update maintainer email + * New upstream version 0.1.9998svn3236+dfsg + * Update copyright file + * bump std-version to 4.2.1, no changes required + + -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 21 Dec 2018 16:47:13 +0100 + +kbuild (1:0.1.9998svn3149+dfsg-3) unstable; urgency=high + + * Move to new maintainer address, bump std-version to 4.1.4 + + -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 18 Apr 2018 11:06:40 +0200 + +kbuild (1:0.1.9998svn3149+dfsg-2) unstable; urgency=medium + + * Update VCS fields to salsa.d.o + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sun, 15 Apr 2018 19:32:02 +0200 + +kbuild (1:0.1.9998svn3149+dfsg-1) unstable; urgency=low + + * New upstream version 0.1.9998svn3149+dfsg (Closes: #891372) + * Drop patches upstreamed, hopefully not useful anymore + - drop 09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch + * Add patch to disable doc and po builds + * Bump copyright years + * Bump std-version to 4.1.3 + * Add pkg-config dependency + + -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 15 Mar 2018 18:44:34 +0100 + +kbuild (1:0.1.9998svn3127+dfsg-2) unstable; urgency=medium + + * Add new patch from make-dfsg to fixup FTBFS with glibc 2.27 + (thanks Aurelien Jarno! Closes: #891372) + + -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 05 Mar 2018 16:31:24 +0100 + +kbuild (1:0.1.9998svn3127+dfsg-1) unstable; urgency=medium + + * New upstream version 0.1.9998svn3127+dfsg + + -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 23 Nov 2017 08:49:46 +0100 + +kbuild (1:0.1.9998svn3126+dfsg-1) unstable; urgency=medium + + * New upstream snapshot, fixing x32 build + + -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 22 Nov 2017 09:53:16 +0100 + +kbuild (1:0.1.9998svn3110+dfsg-1) unstable; urgency=medium + + * New upstream snapshot, fixing hurd, and enabling m68k + compilation support. (Closes: #699509) + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 21 Oct 2017 10:37:21 +0200 + +kbuild (1:0.1.9998svn3103+dfsg-1) unstable; urgency=medium + + * New upstream snapshot, enabling tentative build + for gnu/hurd, m68k, and with complete kFreeBSD upstream port. + + -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 20 Oct 2017 15:31:34 +0200 + +kbuild (1:0.1.9998svn3100+dfsg-1) unstable; urgency=medium + + * New upstream microrelease, with mostly complete kFreeBSD port. + + -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 20 Oct 2017 11:52:27 +0200 + +kbuild (1:0.1.9998svn3098+dfsg-1) unstable; urgency=low + + * Upload to unstable. + * Fix kFreeBSD port. + + -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 20 Oct 2017 11:05:00 +0200 + +kbuild (1:0.1.9998svn3098+dfsg-1~exp2) experimental; urgency=medium + + * Try to define kFreeBSD as normal freebsd + + -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 19 Oct 2017 23:46:27 +0200 + +kbuild (1:0.1.9998svn3098+dfsg-1~exp1) experimental; urgency=medium + + * New upstream release, update copyright. + * Drop mostly all patches, they should be upstream + * Bump std-version to 4.1.1, move to priority: optional + * Use compat level 10 + + -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 07 Sep 2016 09:55:18 +0200 + +kbuild (1:0.1.9998svn2814+dfsg-2) unstable; urgency=medium + + * Upload to unstable. + + -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 13 Jul 2016 18:32:24 +0200 + +kbuild (1:0.1.9998svn2814+dfsg-1) experimental; urgency=medium + + * New upstream snapshot, patch refresh. + * Update standard-version to 3.9.8, no changes required. + * update VCS in https mode. + + -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 28 Sep 2015 12:09:43 +0200 + +kbuild (1:0.1.9998svn2786+dfsg-1) unstable; urgency=medium + + * New upstream snapshot, patch refresh. + * Remove 08_no_o3_optimization.diff + * d/p/01_gnukfreebsd.diff + - Fix kfreebsd-* build failures, due to missing pthreads. + this patch was originally under 06_binutils-gold.diff, + but this is now a specific kfreebsd porting issue. + - Fix also a cosmetic issue. + * d/p/02_sh4.diff: fix a cosmetic issue (space) and a possible + clash in duplicated value. + * d/p/11_find-glob.patch: + - sync with Fedora patch (Thanks Sérgio Basto). + * d/p/10_ppc64el.diff: + - sync with Fedora patch, with a little tweak for el instead of le. + (Thanks again Sérgio Basto!) + * d/p/12_arm64.diff: patch refresh. + * Update my uid. + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sun, 26 Jul 2015 15:43:17 +0200 + +kbuild (1:0.1.9998svn2780+dfsg-2) unstable; urgency=low + + * Sync kbuild with Fedora patches (thanks Sérgio Basto!): + - sync 04_armv7l.diff, adding some more arm archs + - 06_binutils-gold.diff add pthread for all archs, and + -Wl,--as-needed to strip where not needed. + - simplify a lot 11_find-glob.patch + - disable 08_no_o3_optimization.diff the problem was fixed upstream. + + -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Wed, 13 May 2015 16:29:22 +0200 + +kbuild (1:0.1.9998svn2780+dfsg-1) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * New upstream snapshot, patch refresh. + + [ Ritesh Raj Sarraf ] + * Upload to Unstable + + -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Mon, 27 Apr 2015 00:42:00 +0200 + +kbuild (1:0.1.9998svn2745+dfsg-1) experimental; urgency=medium + + [ Gianfranco Costamagna ] + * New upstream snapshot, patch refresh. + * Fix get-orig-source script, to avoid the epoch bump. + * Tweak orig-tar.sh to always get the latest release, instead of the + release in d/changelog. + + [ Logan Rosen ] + * debian/patches/12_arm64.diff: Add arm64 support to fix FTBFS. + (Closes: #759457) + + -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Fri, 16 Jan 2015 10:31:12 +0100 + +kbuild (1:0.1.9998svn2734+dfsg-1) experimental; urgency=medium + + [ Gianfranco Costamagna ] + * New upstream snapshot, patch refresh. + - drop 03_dprintf-posix2008.diff code removed upstream. + * Add myself to uploaders. + * Bump Standards-Version to 3.9.6, no changes needed. + + [ Fernando Seiti Furusato ] + * Added ppc64el to build to fix ftbfs (Closes: #760605). + + -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Mon, 20 Oct 2014 09:53:59 +0200 + +kbuild (1:0.1.9998svn2695+dfsg-2) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Bump Standards-Version to 3.9.5, no changes needed. + + [ Felix Geyer ] + * Remove myself from uploaders. + + [ Ritesh Raj Sarraf ] + * [0437af2] Add cherry-picked commit from upstream as a quilt patch + + -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Mon, 14 Jul 2014 11:58:57 +0200 + +kbuild (1:0.1.9998svn2695+dfsg-1) unstable; urgency=low + + [ Ritesh Raj Sarraf ] + * [8c3dfc1] Exclude src/kmk/doc/make.texi from dfsg archive + * [00cc15e] Imported Upstream version 0.1.9998svn2695+dfsg + * [34ffb72] Add myself to Uploaders + + -- Ritesh Raj Sarraf <rrs@debian.org> Tue, 03 Dec 2013 12:06:57 +0530 + +kbuild (1:0.1.9998svn2577+dfsg-3) unstable; urgency=low + + * Add missing build-dependency on texinfo. (Closes: #712335) + + -- Felix Geyer <fgeyer@debian.org> Wed, 03 Jul 2013 11:59:45 +0200 + +kbuild (1:0.1.9998svn2577+dfsg-2) unstable; urgency=low + + * Upload to unstable. + * Use canonical URIs for Vcs-* fields. + + -- Felix Geyer <fgeyer@debian.org> Thu, 09 May 2013 11:37:23 +0200 + +kbuild (1:0.1.9998svn2577+dfsg-1) experimental; urgency=low + + * New upstream snapshot. (Closes: #697620) + * Switch to my @debian.org email address. + * Refresh patches. + * Switch to debhelper compat level v9. + * Bump Standards-Version to 3.9.4, no changes needed. + + -- Felix Geyer <fgeyer@debian.org> Wed, 06 Mar 2013 21:53:30 +0100 + +kbuild (1:0.1.9998svn2543+dfsg-1) unstable; urgency=high + + * Stop hardcoding the -O3 optimization flag as it causes kmk_sed to + miscompile. (Closes: #697892) + - Add 08_no_o3_optimization.diff + * Set urgency to high as it fixes an RC bug which blocks a virtualbox + security fix. + + -- Felix Geyer <debfx-pkg@fobos.de> Fri, 18 Jan 2013 19:00:28 +0100 + +kbuild (1:0.1.9998svn2543+dfsg-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove unused and non DFSG-compliant src/kmk/doc/make.texi from source. + (Closes: #695779) + + -- David Prévot <taffit@debian.org> Sun, 30 Dec 2012 16:27:03 -0400 + +kbuild (1:0.1.9998svn2543-2) unstable; urgency=low + + * Fix FTBFS on kfreebsd: link against pthread. (Closes: #645698) + - Update 06_binutils-gold.diff + + -- Felix Geyer <debfx-pkg@fobos.de> Wed, 30 Nov 2011 16:32:21 +0100 + +kbuild (1:0.1.9998svn2543-1) unstable; urgency=low + + * New upstream snapshot. + * Refresh patches. + * Switch to source format 3.0 (quilt). + - Add unapply-patches and abort-on-upstream-changes to local-options. + * Convert package from cdbs to dh(1). + * Bump Standards-Version to 3.9.2, no changes needed. + * Add gbp.conf and enable pristine-tar. + * Enable DM-Upload-Allowed. + + -- Felix Geyer <debfx-pkg@fobos.de> Sat, 20 Aug 2011 16:04:33 +0200 + +kbuild (1:0.1.98svn2318-8) unstable; urgency=low + + * Disable threads on 64bit kfreebsd systems. + + -- Michael Meskes <meskes@debian.org> Wed, 26 May 2010 16:53:48 +0200 + +kbuild (1:0.1.98svn2318-7) unstable; urgency=low + + [ Michael Meskes ] + * Remove hppa workaround that is no longer needed. + + [ Felix Geyer ] + * Split parts of kbuild-binutils-gold.diff into + kbuild-hppa-disable-threads.diff. + * Rename the patches so the filename starts with the patch number. + * Add 07_special-chars-build-path.diff to fix FTBFS when the build path + contains special characters. + + -- Michael Meskes <meskes@debian.org> Tue, 18 May 2010 17:41:46 +0200 + +kbuild (1:0.1.98svn2318-6) unstable; urgency=low + + [ Felix Geyer ] + * Replaced bintuils-gold patch by new one not breaking compilation on + hppa. (Closes: #577604) + + [ Michael Meskes ] + * Added source/format file. + + -- Michael Meskes <meskes@debian.org> Tue, 04 May 2010 16:16:46 +0200 + +kbuild (1:0.1.98svn2318-5) unstable; urgency=low + + * Add patch to fix build on armv7l. (LP: #535093) - thanks to + Jamie Bennett <jb@canonical.com> + * Added myself as uploader. + * Bump Standards-Version to 3.8.4 (no changes). + * Build-Depend on autopoint instead of cvs. (Closes: #572473) + * Fix FTBFS with binutils-gold. (Closes: #554937) + + -- Felix Geyer <debfx-pkg@fobos.de> Tue, 09 Mar 2010 19:50:28 +0100 + +kbuild (1:0.1.98svn2318-4) unstable; urgency=low + + [ Felix Geyer ] + * Added patch from Fedora to fix build on POSIX.1-2008 + systems (Closes: #552843) + + [ Michael Meskes ] + * Remove all files created by build process. + + -- Michael Meskes <meskes@debian.org> Sat, 31 Oct 2009 20:11:54 +0100 + +kbuild (1:0.1.98svn2318-3) unstable; urgency=low + + * Added patch to fix build on GNU/kFreeBSD. (Closes: #540665) - thanks + to Julian Andres Klode <jak@debian.org> + * Added patch to fix build on sh4. (Closes: #544974) - thanks to + Nobuhiro Iwamatsu <iwamatsu@nigauri.org> + + -- Michael Meskes <meskes@debian.org> Tue, 15 Sep 2009 15:37:35 +0200 + +kbuild (1:0.1.98svn2318-2) unstable; urgency=low + + * New maintainer (Closes: #534921). + * Removing useless whitespaces at EOL and EOF. + * Using correct rfc-2822 date formats in changelog. + * Prefixing debhelper files with package name. + * Rewriting manpage from scratch and in plain roff. + * Updating vcs fields in control. + * Updating package to debhelper 7. + * Rewriting copyright file in machine-interpretable format. + * Using tabs rather than space as separator in debhelper links file. + * Updating uploaders field. + * Updating package to standards version 3.8.3. + * Sorting and wrapping depends. + + -- Daniel Baumann <daniel@debian.org> Wed, 26 Aug 2009 17:15:33 +0200 + +kbuild (1:0.1.98svn2318-1) unstable; urgency=low + + * new upstream version (Closes: #523311) + * Bump up Standards-Version: 3.8.1 (no changes). + * Add manpage symlink for kDepObj. + + -- Torsten Werner <twerner@debian.org> Fri, 10 Apr 2009 01:51:12 +0200 + +kbuild (1:0.1.5svn2262-2) unstable; urgency=low + + * Set KMK_THREADS_DISABLED := 1 to fix build problems on hppa. + + -- Torsten Werner <twerner@debian.org> Wed, 11 Feb 2009 21:19:02 +0100 + +kbuild (1:0.1.5svn2262-1) unstable; urgency=low + + * new upstream version (Closes: #512631) + + -- Torsten Werner <twerner@debian.org> Thu, 22 Jan 2009 15:40:58 +0100 + +kbuild (1:0.1.5svn2062-1) unstable; urgency=low + + * new upstream version + * Remove patch lazy.diff that has been applied upstream. + + -- Torsten Werner <twerner@debian.org> Wed, 12 Nov 2008 21:54:38 +0100 + +kbuild (1:0.1.5svn2059-2) unstable; urgency=low + + * Create SvnInfo.kmk during build process because the upstream svn does not + ship it anymore. + + -- Torsten Werner <twerner@debian.org> Sat, 08 Nov 2008 09:17:10 +0100 + +kbuild (1:0.1.5svn2059-1) unstable; urgency=low + + * new upstream version + * Add patch lazy.diff to fix build process. + * Add more manpage symlinks. + + -- Torsten Werner <twerner@debian.org> Fri, 07 Nov 2008 23:25:40 +0100 + +kbuild (1:0.1.4svn1804-1) unstable; urgency=low + + * new upstream version + * Bump up Standards-Version: 3.8.0 (no changes). + + -- Torsten Werner <twerner@debian.org> Tue, 07 Oct 2008 20:50:48 +0200 + +kbuild (1:0.1.3svn1610-1) unstable; urgency=low + + * new upstream version (Closes: #479046, #480012) + * Remove patch cpu.diff that has been applied upstream. + + -- Torsten Werner <twerner@debian.org> Thu, 08 May 2008 20:20:07 +0200 + +kbuild (1:0.1.3svn1587-1) unstable; urgency=low + + * new upstream version + * Add support for armv5tejl. + + -- Torsten Werner <twerner@debian.org> Thu, 17 Apr 2008 22:08:34 +0200 + +kbuild (1:0.1.2svn1393-2) unstable; urgency=high + + * Add patch to fix build on parisc. + * Set urgency to high because we are fixing a FTBFS bug on 1 arch. + + -- Torsten Werner <twerner@debian.org> Thu, 10 Apr 2008 22:42:26 +0200 + +kbuild (1:0.1.2svn1393-1) unstable; urgency=low + + * new upstream release + * Remove our patch because it has been applied upstream. + + -- Torsten Werner <twerner@debian.org> Sun, 09 Mar 2008 22:29:26 +0100 + +kbuild (1:0.1.2svn1377-5) unstable; urgency=low + + * Add support for s390x. + + -- Torsten Werner <twerner@debian.org> Sun, 30 Dec 2007 23:54:18 +0100 + +kbuild (1:0.1.2svn1377-4) unstable; urgency=low + + * Add support for mips. + + -- Torsten Werner <twerner@debian.org> Sun, 30 Dec 2007 22:53:09 +0100 + +kbuild (1:0.1.2svn1377-3) unstable; urgency=low + + * Add support for armv5tel. + + -- Torsten Werner <twerner@debian.org> Fri, 28 Dec 2007 23:39:11 +0100 + +kbuild (1:0.1.2svn1377-2) unstable; urgency=low + + * Add support for PA-RISC. + + -- Torsten Werner <twerner@debian.org> Fri, 28 Dec 2007 13:20:11 +0100 + +kbuild (1:0.1.2svn1377-1) unstable; urgency=low + + * Use version number (KBUILD_VERSION) from file Config.kmk for our package. + * Always bootstrap kBuild because it is required. + * Add Build-Depends: autoconf, automake, cvs. + * Remove Build-Depends: doxygen, kbuild. + + -- Torsten Werner <twerner@debian.org> Sat, 22 Dec 2007 11:53:03 +0100 + +kbuild (1377-2) unstable; urgency=low + + * Add patch cpu.diff to support Debian's architectures. + * Set LDFLAGS to -Wl,--as-needed to avoid linking of unneeded libraries. + * Use the freshly built kmk for the installation step instead of the old one + used for the build step. Rationale: that is a very basic test that the new + kmk is really working. + + -- Torsten Werner <twerner@debian.org> Fri, 21 Dec 2007 18:06:38 +0100 + +kbuild (1377-1) unstable; urgency=low + + * new upstream version + * Add some debugging output (gcc macros). + * Update Homepage and Vcs headers in debian/control. + * Change Standards-Version: 3.7.3. + * Add manpage symlinks for kmk_redirect and kmk_test. + + -- Torsten Werner <twerner@debian.org> Fri, 21 Dec 2007 12:30:37 +0100 + +kbuild (1366-1) unstable; urgency=low + + * new upstream version + - Does not ship kBuild.Doxyfile any more. + * Remove all references to the obsoleted documentation files. + (Closes: #454038) + * Remove Depends: autoconf, automake1.9. + + -- Torsten Werner <twerner@debian.org> Mon, 03 Dec 2007 18:59:04 +0100 + +kbuild (1258-1) unstable; urgency=low + + * new upstream release + * Remove the last patch because it has been applied upstream. + + -- Torsten Werner <twerner@debian.org> Sun, 28 Oct 2007 23:05:09 +0100 + +kbuild (1173-1) unstable; urgency=low + + * new upstream release + * Fix the get-orig-source target in debian/rules. + * Removed all patches that have been applied upstream. + * Add more man page symlinks (kmk_cmp and kmk_md5sum). + + -- Torsten Werner <twerner@debian.org> Tue, 02 Oct 2007 21:59:51 +0200 + +kbuild (1096-1) unstable; urgency=low + + * new upstream version + * Add kbuild to Build-Depends. + * Fix clean target. (Closes: #442611) + * Comment the patches. + + -- Torsten Werner <twerner@debian.org> Sun, 16 Sep 2007 19:06:22 +0200 + +kbuild (1080-2) unstable; urgency=low + + * Add patch arm.diff to support armv4l too. + + -- Torsten Werner <twerner@debian.org> Sat, 21 Jul 2007 12:26:46 +0200 + +kbuild (1080-1) unstable; urgency=low + + * New upstream version + * Add a patch debug.diff that fixes debugging output. + + -- Torsten Werner <twerner@debian.org> Sat, 21 Jul 2007 08:27:12 +0200 + +kbuild (1060-1) unstable; urgency=low + + * New upstream version + * Bootstrap every architecture again because some binaries are buggy. + + -- Torsten Werner <twerner@debian.org> Sat, 09 Jun 2007 07:42:44 +0200 + +kbuild (894-5) unstable; urgency=low + + * Remove directory 'out' in clean target. (Closes: #424426) + + -- Torsten Werner <twerner@debian.org> Sat, 19 May 2007 23:25:17 +0200 + +kbuild (894-4) unstable; urgency=low + + * Add hppa, ia64, mips, mipsel, powerpc, s390 to already bootstrapped + architectures. + * Add patch unused.diff to fix a build problem on alpha. + + -- Torsten Werner <twerner@debian.org> Mon, 14 May 2007 05:30:43 +0200 + +kbuild (894-3) unstable; urgency=low + + * Add yet another fix for the missing architectures. + + -- Torsten Werner <twerner@debian.org> Sat, 12 May 2007 18:32:30 +0200 + +kbuild (894-2) unstable; urgency=low + + * Complete the last (incomplete) patch. + + -- Torsten Werner <twerner@debian.org> Sat, 12 May 2007 15:20:34 +0200 + +kbuild (894-1) unstable; urgency=low + + * New upstream revision. + * Use the revision number from debian/changelog for debian/orig-tar.sh. + * Add Build-Depends: kbuild [amd64 i386]. + * Add a patch to support all Debian architectures. + + -- Torsten Werner <twerner@debian.org> Sat, 12 May 2007 14:38:49 +0200 + +kbuild (893-1) unstable; urgency=low + + * Initial release (Closes: #422367) + + -- Torsten Werner <twerner@debian.org> Fri, 04 May 2007 20:35:40 +0200 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..f705531 --- /dev/null +++ b/debian/control @@ -0,0 +1,40 @@ +Source: kbuild +Section: devel +Priority: optional +Maintainer: Debian Virtualbox Team <team+debian-virtualbox@tracker.debian.org> +Uploaders: Ritesh Raj Sarraf <rrs@debian.org>, + Gianfranco Costamagna <locutusofborg@debian.org> +Build-Depends: debhelper-compat (= 13), + byacc, + flex, + libacl1-dev, + texinfo, + pkg-config +Standards-Version: 4.6.0 +Rules-Requires-Root: no +Homepage: https://svn.netlabs.org/kbuild +Vcs-Browser: https://salsa.debian.org/pkg-virtualbox-team/kbuild +Vcs-Git: https://salsa.debian.org/pkg-virtualbox-team/kbuild.git + +Package: kbuild +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: framework for writing simple makefiles for complex tasks + The goals of the kBuild framework: + - Similar behavior cross all supported platforms. + - Flexibility, don't create unnecessary restrictions preventing ad-hoc + solutions. + - Makefile can very simple to write and maintain. + . + There are four concepts being tried out in the current kBuild incaration: + - One configuration file for a subtree automatically included. + - Target configuration templates as the primary mechanism for makefile + simplification. + - Tools and SDKs for helping out the templates with flexibility. + - Non-recursive makefile method by using sub-makefiles. + . + kBuild does not provide any facilities for checking compiler/library/header + configurations, that's not in its scope. If this is important for your + project, check out the autoconf tool in the GNU build system. It is possible + to use kBuild together with autoconf if you like, but you might just as well + use the full GNU package. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..e73ee00 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,154 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://svn.netlabs.org/kbuild/ +Upstream-Contact: Knut St. Osmundsen <bird-kBuild-spam@anduin.net> + +Files: * +Copyright: 2004-2022 Knut St. Osmundsen <bird-kBuild-spam@anduin.net> +License: GPL-3+ + +Files: src/kash/* + src/lib/nt/fts-nt.c + src/lib/nt/fts-nt.h +Copyright: 1990-1994 The Regents of the University of California + 2016 knut st. osmundsen <bird-klibc-spam-xiv@anduin.net> +License: BSD-3-clause + +Files: src/grep/* +Copyright: 1992, 1997-2002, 2004-2012 Free Software Foundation, Inc. + 2004, Stepan Kasal <kasal@ucw.cz> + 2007, Tony Abou-Assaleh <taa@acm.org> + 2009-2012, Jim Meyering <jim@meyering.net> and Paolo Bonzini <bonzini@gnu.org> +License: GPL-3+ + +Files: src/kmk/* +Copyright: 1988-2009 Free Software Foundation, Inc. +License: GPL-3+ + +Files: src/sed/* +Copyright: 2003 Free Software Foundation, Inc. +License: GPL-2+ + +Files: src/lib/kDep.* + src/lib/kStuff/* +Copyright: 2004-2013 knut st. osmundsen <bird-kBuild-spamx@anduin.net> +License: Expat + +Files: src/lib/console.h + src/lib/is_console.c + src/lib/kbuild_version.* + src/lib/mytypes.h + src/lib/nt/kFsCache.* + src/lib/quote_argv.* + src/lib/quoted_spawn.* + src/lib/restartable-syscall-wrappers.c + src/lib/wrapper.c +Copyright: 2007-2016 knut st. osmundsen <bird-kBuild-spamx@anduin.net> +License: Expat or GPL-2+ or LGPL-2.1+ + +Files: debian/* +Copyright: + 2007-2009 Torsten Werner <twerner@debian.org> + 2009 Daniel Baumann <daniel@debian.org> + 2010-2014 Felix Geyer <fgeyer@debian.org> + 2010-2013 Michael Meskes <meskes@debian.org> + 2013-2015 Ritesh Raj Sarraf <rrs@debian.org> + 2014-2022 Gianfranco Costamagna <locutusofborg@debian.org> +License: GPL-3+ + +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-3 file. + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in `/usr/share/common-licenses/LGPL-2.1'. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/debian/kbuild.install b/debian/kbuild.install new file mode 100644 index 0000000..bde4fb5 --- /dev/null +++ b/debian/kbuild.install @@ -0,0 +1 @@ +out/*.*/release/dist/usr / diff --git a/debian/kbuild.links b/debian/kbuild.links new file mode 100644 index 0000000..daef49c --- /dev/null +++ b/debian/kbuild.links @@ -0,0 +1,27 @@ +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_append.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_ash.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_cat.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_chmod.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_cmp.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_cp.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_echo.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_expr.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_fgmake.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_mkdir.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_mv.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_install.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_ln.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_md5sum.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_printf.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_redirect.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_rm.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_rmdir.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_gmake.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_sed.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_sleep.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_test.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kmk_time.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kDepPre.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kDepIDB.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kDepObj.1.gz +/usr/share/man/man1/kmk.1.gz /usr/share/man/man1/kObjCache.1.gz diff --git a/debian/kbuild.manpages b/debian/kbuild.manpages new file mode 100644 index 0000000..2fb19fb --- /dev/null +++ b/debian/kbuild.manpages @@ -0,0 +1 @@ +debian/manpages/* diff --git a/debian/manpages/kmk.1 b/debian/manpages/kmk.1 new file mode 100644 index 0000000..b36611b --- /dev/null +++ b/debian/manpages/kmk.1 @@ -0,0 +1,50 @@ +.TH KMK 1 "2009\-04\-09" "0.1.98svn2318" "simple makefiles for complex tasks" + +.SH NAME +\fBkmk\fR \- framework for writing simple makefiles for complex tasks + +.SH SYNOPSIS +\fBkmk\fR [\fIOPTIONS\fR] + +.SH DESCRIPTION +kmk and its helper tools are an extension to GNU make to ease writing portable +Makefile. +.PP +The goals of the kBuild framework: +.PP + \- Similar behavior cross all supported platforms. +.br + \- Flexibility, don't create unnecessary restrictions preventing ad-hoc +solutions. +.br + \- Makefile can very simple to write and maintain. +.PP +There are four concepts being tried out in the current kBuild incaration: +.PP + \- One configuration file for a subtree automatically included. + \- Target configuration templates as the primary mechanism for makefile +simplification. + \- Tools and SDKs for helping out the templates with flexibility. + \- Non-recursive makefile method by using sub-makefiles. +.PP +kBuild does not provide any facilities for checking compiler/library/header +configurations, that's not in its scope. If this is important for your project, +check out the autoconf tool in the GNU build system. It is possible to use +kBuild together with autoconf if you like, but you might just as well use the +full GNU package. +.PP +On Debian systems, the kBuild binaries can be found in \fI/usr/bin\fR and its +data files in \fI/usr/share/kBuild\fR. + +.SH "SEE ALSO" +\fImake\fR(1) + +.SH HOMEPAGE +More information about kBuild project can be found at +<\fIhttp://svn.netlabs.org/kbuild/\fR>. + +.SH AUTHOR +kBuild was written by Knut St. Osmundsen <\fIbird-kBuild-spam@anduin.net\fR>. +.PP +This manual page was written by Daniel Baumann <\fIdaniel@debian.org\fR>, for +the Debian project (but may be used by others). diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100644 index 0000000..04b2904 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +SVNROOT=$1 +VERSION=$2 +REVISION=`svn info ${SVNROOT} | grep "Last Changed Rev:" | cut -d' ' -f4` + +DIR=kbuild-${REVISION} +TAR=../kbuild_${VERSION}.orig.tar.gz + +svn co -r ${REVISION} ${SVNROOT} ${DIR} +tar -c -z --exclude '*/src/kWorker/tests-gpl2/*' --exclude '*/kBuild/bin*' --exclude '*/out/*' --exclude '*/.svn*' --exclude '*/src/kmk/doc/make.texi' -f ${TAR} ${DIR} +rm -rf ${DIR} + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv ${TAR} ${origDir} + echo "moved ${TAR} to ${origDir}" +fi + +echo "Done, now you can run \ngbp import-orig ${TAR}" diff --git a/debian/patches/07_special-chars-build-path.diff b/debian/patches/07_special-chars-build-path.diff new file mode 100644 index 0000000..6838aa0 --- /dev/null +++ b/debian/patches/07_special-chars-build-path.diff @@ -0,0 +1,356 @@ +Description: kBuild and any package using it FTBFS if the build path contains special + characters (mostly anything except [a-zA-Z0-9\-]). This is fixed by using the static + linking method from GCC3PLAIN.kmk on all other profiles. +Author: Felix Geyer <debfx-pkg@fobos.de> +Bug: http://svn.netlabs.org/kbuild/ticket/94 + +Index: kbuild/kBuild/tools/GCC32.kmk +=================================================================== +--- kbuild.orig/kBuild/tools/GCC32.kmk ++++ kbuild/kBuild/tools/GCC32.kmk +@@ -54,6 +54,7 @@ + TOOL_GCC32_CXX ?= $(TOOL_GCC32_PREFIX)g++$(TOOL_GCC32_SUFFIX) -m32 + TOOL_GCC32_AS ?= $(TOOL_GCC32_PREFIX)gcc$(TOOL_GCC32_SUFFIX) -m32 + TOOL_GCC32_AR ?= $(TOOL_GCC32_PREFIX2)ar$(TOOL_GCC32_SUFFIX2) ++TOOL_GCC32_RANLIB ?= $(TOOL_GCC32_PREFIX)ranlib$(HOSTSUFF_EXE) + TOOL_GCC32_LD ?= $(TOOL_GCC32_PREFIX)gcc$(TOOL_GCC32_SUFFIX) -m32 + if1of ($(KBUILD_HOST), solaris) + TOOL_GCC32_LD_SYSMOD ?= $(TOOL_GCC32_PREFIX3)ld$(TOOL_GCC32_SUFFIX3) +@@ -235,20 +236,21 @@ + # @param $(deps) Other dependencies. + # @param $(othersrc) Unhandled sources. + # @param $(outbase) Output basename (full). Use this for list files and such. +-TOOL_GCC32_LINK_LIBRARY_OUTPUT = $(out).ar-script ++TOOL_GCC32_LINK_LIBRARY_OUTPUT = + TOOL_GCC32_LINK_LIBRARY_DEPEND = $(othersrc) + TOOL_GCC32_LINK_LIBRARY_DEPORD = + define TOOL_GCC32_LINK_LIBRARY_CMDS +- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)' +- $(QUIET)$(APPEND) -n $(out).ar-script \ +- $(foreach o,$(objs), 'ADDMOD $(o)') \ +- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)') +- $(if $(filter %.def %.imp %.dll,$(othersrc))\ +- ,$(TOOL_GCC32_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\ +- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a') +- $(QUIET)$(APPEND) $(out).ar-script 'SAVE' +- $(QUIET)$(APPEND) $(out).ar-script 'END' +- $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GCC32_AR) -M ++ $(QUIET)$(TOOL_GCC32_AR) $(flags) $(out) $(objs) ++ $(foreach lib,$(othersrc)\ ++ ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \ ++ $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \ ++ && $(TOOL_GCC32_AR) x $(abspath $(lib)) \ ++ && $(TOOL_GCC32_AR) $(flags) $(out) *) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/) ++ $(QUIET)$(TOOL_GCC32_RANLIB) $(out) + endef + + +Index: kbuild/kBuild/tools/GCC3.kmk +=================================================================== +--- kbuild.orig/kBuild/tools/GCC3.kmk ++++ kbuild/kBuild/tools/GCC3.kmk +@@ -52,6 +52,7 @@ + TOOL_GCC3_CXX ?= $(TOOL_GCC3_PREFIX)g++$(TOOL_GCC3_SUFFIX) + TOOL_GCC3_AS ?= $(TOOL_GCC3_PREFIX)gcc$(TOOL_GCC3_SUFFIX) + TOOL_GCC3_AR ?= $(TOOL_GCC3_PREFIX2)ar$(TOOL_GCC3_SUFFIX2) ++TOOL_GCC3_RANLIB ?= ranlib$(HOSTSUFF_EXE) + ifeq ($(KBUILD_TARGET),os2) + TOOL_GCC3_AR_IMP ?= $(TOOL_GCC3_PREFIX3)emximp$(TOOL_GCC3_SUFFIX3) + else +@@ -234,21 +235,21 @@ + # @param $(deps) Other dependencies. + # @param $(othersrc) Unhandled sources. + # @param $(outbase) Output basename (full). Use this for list files and such. +-TOOL_GCC3_LINK_LIBRARY_OUTPUT = $(out).ar-script +-TOOL_GCC3_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).imp.a ++TOOL_GCC3_LINK_LIBRARY_OUTPUT = + TOOL_GCC3_LINK_LIBRARY_DEPEND = $(othersrc) + TOOL_GCC3_LINK_LIBRARY_DEPORD = + define TOOL_GCC3_LINK_LIBRARY_CMDS +- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)' +- $(QUIET)$(APPEND) -n $(out).ar-script \ +- $(foreach o,$(objs), 'ADDMOD $(o)') \ +- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)') +- $(if $(filter %.def %.imp %.dll,$(othersrc))\ +- ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\ +- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a') +- $(QUIET)$(APPEND) $(out).ar-script 'SAVE' +- $(QUIET)$(APPEND) $(out).ar-script 'END' +- $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GCC3_AR) -M ++ $(QUIET)$(TOOL_GCC3_AR) $(flags) $(out) $(objs) ++ $(foreach lib,$(othersrc)\ ++ ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \ ++ $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \ ++ && $(TOOL_GCC3_AR) x $(abspath $(lib)) \ ++ && $(TOOL_GCC3_AR) $(flags) $(out) *) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/) ++ $(QUIET)$(TOOL_GCC3_RANLIB) $(out) + endef + + +Index: kbuild/kBuild/tools/GCC64.kmk +=================================================================== +--- kbuild.orig/kBuild/tools/GCC64.kmk ++++ kbuild/kBuild/tools/GCC64.kmk +@@ -53,6 +53,7 @@ + TOOL_GCC64_CXX ?= $(TOOL_GCC64_PREFIX)g++$(TOOL_GCC64_SUFFIX) -m64 + TOOL_GCC64_AS ?= $(TOOL_GCC64_PREFIX)gcc$(TOOL_GCC64_SUFFIX) -m64 + TOOL_GCC64_AR ?= $(TOOL_GCC64_PREFIX2)ar$(TOOL_GCC64_SUFFIX2) ++TOOL_GCC64_RANLIB ?= $(TOOL_GCC64_PREFIX)ranlib$(TOOL_GCC64_SUFFIX) + TOOL_GCC64_LD ?= $(TOOL_GCC64_PREFIX)gcc$(TOOL_GCC64_SUFFIX) -m64 + if1of ($(KBUILD_HOST), solaris) + TOOL_GCC64_LD_SYSMOD ?= $(TOOL_GCC64_PREFIX3)ld$(TOOL_GCC64_SUFFIX3) +@@ -233,17 +234,21 @@ + # @param $(deps) Other dependencies. + # @param $(othersrc) Unhandled sources. + # @param $(outbase) Output basename (full). Use this for list files and such. +-TOOL_GCC64_LINK_LIBRARY_OUTPUT = $(out).ar-script ++TOOL_GCC64_LINK_LIBRARY_OUTPUT = + TOOL_GCC64_LINK_LIBRARY_DEPEND = $(othersrc) + TOOL_GCC64_LINK_LIBRARY_DEPORD = + define TOOL_GCC64_LINK_LIBRARY_CMDS +- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)' +- $(QUIET)$(APPEND) -n $(out).ar-script \ +- $(foreach o,$(objs), 'ADDMOD $(o)') \ +- $(foreach o,$(othersrc), 'ADDLIB $(o)') +- $(QUIET)$(APPEND) $(out).ar-script 'SAVE' +- $(QUIET)$(APPEND) $(out).ar-script 'END' +- $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GCC64_AR) -M ++ $(QUIET)$(TOOL_GCC64_AR) $(flags) $(out) $(objs) ++ $(foreach lib,$(othersrc)\ ++ ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \ ++ $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \ ++ && $(TOOL_GCC64_AR) x $(abspath $(lib)) \ ++ && $(TOOL_GCC64_AR) $(flags) $(out) *) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/) ++ $(QUIET)$(TOOL_GCC64_RANLIB) $(out) + endef + + +Index: kbuild/kBuild/tools/GXX32.kmk +=================================================================== +--- kbuild.orig/kBuild/tools/GXX32.kmk ++++ kbuild/kBuild/tools/GXX32.kmk +@@ -54,6 +54,7 @@ + TOOL_GXX32_PCH ?= $(TOOL_GXX32_CXX) + TOOL_GXX32_AS ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32 + TOOL_GXX32_AR ?= $(TOOL_GXX32_PREFIX2)ar$(TOOL_GXX32_SUFFIX2) ++TOOL_GXX32_RANLIB ?= $(TOOL_GXX32_PREFIX)ranlib$(TOOL_GXX32_SUFFIX) + TOOL_GXX32_LD ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32 + if1of ($(KBUILD_HOST), solaris) + TOOL_GXX32_LD_SYSMOD ?= $(TOOL_GXX32_PREFIX3)ld$(TOOL_GXX32_SUFFIX3) +@@ -261,20 +262,21 @@ + # @param $(deps) Other dependencies. + # @param $(othersrc) Unhandled sources. + # @param $(outbase) Output basename (full). Use this for list files and such. +-TOOL_GXX32_LINK_LIBRARY_OUTPUT = $(out).ar-script ++TOOL_GXX32_LINK_LIBRARY_OUTPUT = + TOOL_GXX32_LINK_LIBRARY_DEPEND = $(othersrc) + TOOL_GXX32_LINK_LIBRARY_DEPORD = + define TOOL_GXX32_LINK_LIBRARY_CMDS +- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)' +- $(QUIET)$(APPEND) -n $(out).ar-script \ +- $(foreach o,$(filter-out %.h.gch,$(objs)), 'ADDMOD $(o)') \ +- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)') +- $(if $(filter %.def %.imp %.dll,$(othersrc))\ +- ,$(TOOL_GXX32_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\ +- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a') +- $(QUIET)$(APPEND) $(out).ar-script 'SAVE' +- $(QUIET)$(APPEND) $(out).ar-script 'END' +- $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GXX32_AR) -M ++ $(QUIET)$(TOOL_GXX32_AR) $(flags) $(out) $(objs) ++ $(foreach lib,$(othersrc)\ ++ ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \ ++ $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \ ++ && $(TOOL_GXX32_AR) x $(abspath $(lib)) \ ++ && $(TOOL_GXX32_AR) $(flags) $(out) *) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/) ++ $(QUIET)$(TOOL_GXX32_RANLIB) $(out) + endef + + +Index: kbuild/kBuild/tools/GXX3.kmk +=================================================================== +--- kbuild.orig/kBuild/tools/GXX3.kmk ++++ kbuild/kBuild/tools/GXX3.kmk +@@ -54,6 +54,7 @@ + TOOL_GXX3_PCH ?= $(TOOL_GXX3_CXX) + TOOL_GXX3_AS ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX) + TOOL_GXX3_AR ?= $(TOOL_GXX3_PREFIX2)ar$(TOOL_GXX3_SUFFIX2) ++TOOL_GXX3_RANLIB ?= $(TOOL_GXX3_PREFIX)ranlib$(TOOL_GXX3_SUFFIX) + ifeq ($(KBUILD_TARGET),os2) + TOOL_GXX3_AR_IMP ?= $(TOOL_GXX3_PREFIX3)emximp$(TOOL_GXX3_SUFFIX3) + else +@@ -263,21 +264,21 @@ + # @param $(deps) Other dependencies. + # @param $(othersrc) Unhandled sources. + # @param $(outbase) Output basename (full). Use this for list files and such. +-TOOL_GXX3_LINK_LIBRARY_OUTPUT = $(out).ar-script +-TOOL_GXX3_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).imp.a ++TOOL_GXX3_LINK_LIBRARY_OUTPUT = + TOOL_GXX3_LINK_LIBRARY_DEPEND = $(othersrc) + TOOL_GXX3_LINK_LIBRARY_DEPORD = + define TOOL_GXX3_LINK_LIBRARY_CMDS +- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)' +- $(QUIET)$(APPEND) -n $(out).ar-script \ +- $(foreach o,$(filter-out %.h.gch,$(objs)), 'ADDMOD $(o)') \ +- $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)') +- $(if $(filter %.def %.imp %.dll,$(othersrc))\ +- ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp %.dll,$(othersrc))\ +- $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a') +- $(QUIET)$(APPEND) $(out).ar-script 'SAVE' +- $(QUIET)$(APPEND) $(out).ar-script 'END' +- $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GXX3_AR) -M ++ $(QUIET)$(TOOL_GXX3_AR) $(flags) $(out) $(objs) ++ $(foreach lib,$(othersrc)\ ++ ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \ ++ $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \ ++ && $(TOOL_GXX3_AR) x $(abspath $(lib)) \ ++ && $(TOOL_GXX3_AR) $(flags) $(out) *) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/) ++ $(QUIET)$(TOOL_GXX3_RANLIB) $(out) + endef + + +Index: kbuild/kBuild/tools/GXX64.kmk +=================================================================== +--- kbuild.orig/kBuild/tools/GXX64.kmk ++++ kbuild/kBuild/tools/GXX64.kmk +@@ -54,6 +54,7 @@ + TOOL_GXX64_PCH ?= $(TOOL_GXX64_CXX) + TOOL_GXX64_AS ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64 + TOOL_GXX64_AR ?= $(TOOL_GXX64_PREFIX2)ar$(TOOL_GXX64_SUFFIX2) ++TOOL_GXX64_RANLIB ?= $(TOOL_GXX64_PREFIX)ranlib$(TOOL_GXX64_SUFFIX) + TOOL_GXX64_LD ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64 + if1of ($(KBUILD_HOST), solaris) + TOOL_GXX64_LD_SYSMOD ?= $(TOOL_GXX64_PREFIX3)ld$(TOOL_GXX64_SUFFIX3) +@@ -261,17 +262,21 @@ + # @param $(deps) Other dependencies. + # @param $(othersrc) Unhandled sources. + # @param $(outbase) Output basename (full). Use this for list files and such. +-TOOL_GXX64_LINK_LIBRARY_OUTPUT = $(out).ar-script ++TOOL_GXX64_LINK_LIBRARY_OUTPUT = + TOOL_GXX64_LINK_LIBRARY_DEPEND = $(othersrc) + TOOL_GXX64_LINK_LIBRARY_DEPORD = + define TOOL_GXX64_LINK_LIBRARY_CMDS +- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)' +- $(QUIET)$(APPEND) -n $(out).ar-script \ +- $(foreach o,$(filter-out %.h.gch,$(objs)), 'ADDMOD $(o)') \ +- $(foreach o,$(othersrc), 'ADDLIB $(o)') +- $(QUIET)$(APPEND) $(out).ar-script 'SAVE' +- $(QUIET)$(APPEND) $(out).ar-script 'END' +- $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GXX64_AR) -M ++ $(QUIET)$(TOOL_GXX64_AR) $(flags) $(out) $(objs) ++ $(foreach lib,$(othersrc)\ ++ ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \ ++ $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \ ++ && $(TOOL_GXX64_AR) x $(abspath $(lib)) \ ++ && $(TOOL_GXX64_AR) $(flags) $(out) *) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/) ++ $(QUIET)$(TOOL_GXX64_RANLIB) $(out) + endef + + +Index: kbuild/kBuild/tools/MINGW32.kmk +=================================================================== +--- kbuild.orig/kBuild/tools/MINGW32.kmk ++++ kbuild/kBuild/tools/MINGW32.kmk +@@ -81,6 +81,7 @@ + TOOL_MINGW32_CXX ?= $(TOOL_MINGW32_PREFIX)g++$(TOOL_MINGW32_HOSTSUFF_EXE) + TOOL_MINGW32_AS ?= $(TOOL_MINGW32_PREFIX)gcc$(TOOL_MINGW32_HOSTSUFF_EXE) + TOOL_MINGW32_AR ?= $(TOOL_MINGW32_PREFIX)ar$(TOOL_MINGW32_HOSTSUFF_EXE) ++TOOL_MINGW32_RANLIB ?= $(TOOL_MINGW32_PREFIX)ranlib$(TOOL_MINGW32_HOSTSUFF_EXE) + ifndef TOOL_MINGW32_XCOMPILE# The gentoo package doesn't have g++. + TOOL_MINGW32_LD ?= $(TOOL_MINGW32_PREFIX)g++$(TOOL_MINGW32_HOSTSUFF_EXE) + else +@@ -200,17 +201,21 @@ + # @param $(deps) Other dependencies. + # + # @param $(outbase) Output basename (full). Use this for list files and such. +-TOOL_MINGW32_LINK_LIBRARY_OUTPUT = $(out).ar-script ++TOOL_MINGW32_LINK_LIBRARY_OUTPUT = + TOOL_MINGW32_LINK_LIBRARY_DEPEND = $(othersrc) + TOOL_MINGW32_LINK_LIBRARY_DEPORD = + define TOOL_MINGW32_LINK_LIBRARY_CMDS +- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)' +- $(QUIET)$(APPEND) -n $(out).ar-script \ +- $(foreach o,$(objs), 'ADDMOD $(o)') \ +- $(foreach o,$(othersrc), 'ADDLIB $(o)') +- $(QUIET)$(APPEND) $(out).ar-script 'SAVE' +- $(QUIET)$(APPEND) $(out).ar-script 'END' +- $(QUIET)$(TOOL_MINGW32_AR) -M < $(out).ar-script ++ $(QUIET)$(TOOL_MINGW32_AR) $(flags) $(out) $(objs) ++ $(foreach lib,$(othersrc)\ ++ ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \ ++ $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \ ++ && $(TOOL_MINGW32_AR) x $(abspath $(lib)) \ ++ && $(TOOL_MINGW32_AR) $(flags) $(out) *) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/) ++ $(QUIET)$(TOOL_MINGW32_RANLIB) $(out) + endef + + +Index: kbuild/kBuild/tools/XGCCAMD64LINUX.kmk +=================================================================== +--- kbuild.orig/kBuild/tools/XGCCAMD64LINUX.kmk ++++ kbuild/kBuild/tools/XGCCAMD64LINUX.kmk +@@ -73,6 +73,7 @@ + TOOL_XGCCAMD64LINUX_CXX ?= $(TOOL_XGCCAMD64LINUX_PREFIX)g++$(TOOL_XGCCAMD64LINUX_SUFFIX) + TOOL_XGCCAMD64LINUX_AS ?= $(TOOL_XGCCAMD64LINUX_PREFIX)gcc$(TOOL_XGCCAMD64LINUX_SUFFIX) + TOOL_XGCCAMD64LINUX_AR ?= $(TOOL_XGCCAMD64LINUX_PREFIX2)ar$(TOOL_XGCCAMD64LINUX_SUFFIX2) ++TOOL_XGCCAMD64LINUX_RANLIB ?= $(TOOL_XGCCAMD64LINUX_PREFIX)ranlib$(TOOL_XGCCAMD64LINUX_SUFFIX) + TOOL_XGCCAMD64LINUX_LD ?= $(TOOL_XGCCAMD64LINUX_PREFIX)g++$(TOOL_XGCCAMD64LINUX_SUFFIX) + TOOL_XGCCAMD64LINUX_LD_SYSMOD ?= $(TOOL_XGCCAMD64LINUX_PREFIX2)ld$(TOOL_XGCCAMD64LINUX_SUFFIX2) + +@@ -194,17 +195,21 @@ + # @param $(deps) Other dependencies. + # @param $(othersrc) Unhandled sources. + # @param $(outbase) Output basename (full). Use this for list files and such. +-TOOL_XGCCAMD64LINUX_LINK_LIBRARY_OUTPUT = $(out).ar-script ++TOOL_XGCCAMD64LINUX_LINK_LIBRARY_OUTPUT = + TOOL_XGCCAMD64LINUX_LINK_LIBRARY_DEPEND = $(othersrc) + TOOL_XGCCAMD64LINUX_LINK_LIBRARY_DEPORD = + define TOOL_XGCCAMD64LINUX_LINK_LIBRARY_CMDS +- $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)' +- $(QUIET)$(APPEND) -n $(out).ar-script \ +- $(foreach o,$(objs), 'ADDMOD $(o)') \ +- $(foreach o,$(othersrc), 'ADDLIB $(o)') +- $(QUIET)$(APPEND) $(out).ar-script 'SAVE' +- $(QUIET)$(APPEND) $(out).ar-script 'END' +- $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_XGCCAMD64LINUX_AR) -M ++ $(QUIET)$(TOOL_XGCCAMD64LINUX_AR) $(flags) $(out) $(objs) ++ $(foreach lib,$(othersrc)\ ++ ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \ ++ $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \ ++ && $(TOOL_XGCCAMD64LINUX_AR) x $(abspath $(lib)) \ ++ && $(TOOL_XGCCAMD64LINUX_AR) $(flags) $(out) *) \ ++ $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \ ++ $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/) ++ $(QUIET)$(TOOL_XGCCAMD64LINUX_RANLIB) $(out) + endef + + diff --git a/debian/patches/assert.patch b/debian/patches/assert.patch new file mode 100644 index 0000000..9376b6d --- /dev/null +++ b/debian/patches/assert.patch @@ -0,0 +1,18 @@ +Description: Use assert ehen kHlpAssertBreakpoint is not available +Author: Gianfranco Costamagna <locutusofborg@debian.org> +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 <assert.h> ++# define kHlpAssertBreakpoint(cond) assert(cond) + #endif + + /** @def K_FUNCTION diff --git a/debian/patches/build-fix b/debian/patches/build-fix new file mode 100644 index 0000000..5a28bea --- /dev/null +++ b/debian/patches/build-fix @@ -0,0 +1,22 @@ +Description: fix build by using the correct echo binary, not the builtin one. + Builtin echo does not escape regexes by default, so when mknodes generates nodes.c, a line such as: + TRACE2((psh, "copyfunc: %p - %u refs\n", n->pblock, refs)); K_NOREF(refs); + + gets translated into + TRACE2((psh, "copyfunc: %p - %u refs + ", n->pblock, refs)); K_NOREF(refs); + + making the program FTBFS. + This patch fixes the build failure. +Author: Gianfranco Costamagna <locutusofborg@debian.org> +--- kbuild-0.1.9998svn3489+dfsg.orig/src/kash/mknodes.sh ++++ kbuild-0.1.9998svn3489+dfsg/src/kash/mknodes.sh +@@ -224,7 +224,7 @@ while IFS=; read -r line; do + echo " };" + echo " new->type = n->type;" + ;; +- * ) echo "$line";; ++ * ) /bin/echo "$line";; + esac + done + diff --git a/debian/patches/do-not-build-docs.patch b/debian/patches/do-not-build-docs.patch new file mode 100644 index 0000000..bd3345a --- /dev/null +++ b/debian/patches/do-not-build-docs.patch @@ -0,0 +1,18 @@ +Description: Docs are non-DFSG +Author: Gianfranco Costamagna <locutusofborg@debian.org> + +Last-Update: 2019-01-07 + +diff --git a/src/kmk/configure.ac b/src/kmk/configure.ac +index 76a38a2..69b09c8 100644 +--- a/src/kmk/configure.ac ++++ b/src/kmk/configure.ac +@@ -513,7 +513,7 @@ AS_IF([test "x$make_cv_load" = xno && test "x$user_load" = xyes], + #AC_CONFIG_FILES([Makefile glob/Makefile po/Makefile.in config/Makefile \ + # doc/Makefile w32/Makefile tests/config-flags.pm]) + AC_CONFIG_FILES([Makefile glob/Makefile config/Makefile \ +- doc/Makefile w32/Makefile tests/config-flags.pm]) ++ w32/Makefile tests/config-flags.pm]) + + # OK, do it! + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6ff8c8e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +07_special-chars-build-path.diff +do-not-build-docs.patch +build-fix +assert.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..5f84d69 --- /dev/null +++ b/debian/rules @@ -0,0 +1,41 @@ +#!/usr/bin/make -f + +include /usr/share/dpkg/pkg-info.mk + +YACC := YACC=/usr/bin/byacc +BOOTSTRAP := ASH=/bin/bash ECHO=/bin/echo MKDIR=/bin/mkdir CP=/bin/cp \ + RM=/bin/rm INSTALL=/usr/bin/install $(YACC) +SVNROOT := https://svn.netlabs.org/repos/kbuild/trunk +REVISION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e's,.*svn,,' | sed -e's,+dfsg.*,,') + +%: + dh $@ + +override_dh_auto_configure: + echo "KBUILD_SVN_URL := $(SVNROOT)" > SvnInfo.kmk + echo "KBUILD_SVN_REV := $(REVISION)" >> SvnInfo.kmk + +override_dh_auto_build: + $(info DEBUG: macros defined by gcc:) + -gcc -dM -E - < /dev/null + kBuild/env.sh --full make -f bootstrap.gmk SRCDIR=`pwd` $(BOOTSTRAP) + kBuild/env.sh kmk rebuild PATH_INS=`pwd` KBUILD_VERBOSE=2 $(YACC) + +override_dh_auto_install: + kBuild/env.sh kmk install NIX_INSTALL_DIR=/usr KBUILD_VERBOSE=2 + +override_dh_auto_clean: + -kBuild/env.sh kmk uninstall + rm -rf debian/stamp-* out kBuild/bin/*/* SvnInfo.kmk + ( cd src/kmk; rm -f aclocal.m4 config.h.in configure Makefile.in config/ar-lib ) + ( cd src/kmk/config; rm -f compile config.guess config.sub depcomp install-sh Makefile.in missing ) + rm -f src/kmk/glob/Makefile.in src/kmk/w32/Makefile.in + ( cd src/sed/config; rm -f intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes.m4 inttypes-pri.m4 isc-posix.m4 longdouble.m4 longlong.m4 mkinstalldirs nls.m4 po.m4 printf-posix.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 ) + ( cd src/sed/intl; rm -f libgnuintl.h.in localcharset.h log.c printf-args.c printf-args.h printf.c printf-parse.c printf-parse.h relocatable.c relocatable.h vasnprintf.c vasnprintf.h vasnwprintf.h wprintf-parse.h xsize.h ) + ( cd src/sed/po; rm -f Makevars.template remove-potcdate.sin ) + +get-orig-info: + svn info $(SVNROOT) | grep "Last Changed Rev:" | cut -d' ' -f4 + +get-orig-source: + sh debian/orig-tar.sh $(SVNROOT) $(DEB_VERSION_UPSTREAM) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) |