Merge to branches

This commit is contained in:
Lubomir Rintel 2008-12-25 14:53:59 +00:00
commit 0fdf1dcdfc
4 changed files with 107 additions and 0 deletions

View file

@ -0,0 +1 @@
kBuild-0.1.4-src.tar.gz

17
kBuild-0.1.3-escape.patch Normal file
View file

@ -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 <lkundrak@v3.sk>
--- 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

88
kBuild.spec Normal file
View file

@ -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 <lkundrak@v3.sk> - 0.1.4-1
- New upstream release
* Thu Aug 28 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.1.3-2
- Add gettext-devel to BRs for autopoint
* Sun Aug 17 2008 Lubomir Rintel <lkundrak@v3.sk> - 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 <opensource till name> - 0.1.0-0.3.20070627svn
- add support for x86_64
- add BR: autoconf, automake
* Wed Jun 27 2007 Till Maas <opensource till name> - 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 <opensource till name> - 0.1.0-0.1.20070218svn
- Initial spec for fedora extras

View file

@ -0,0 +1 @@
4d35dbe6177c934838a893712759a89b kBuild-0.1.4-src.tar.gz