[packages/kBuild] - updated to r3598

baggins baggins at pld-linux.org
Wed Sep 6 16:56:02 CEST 2023


commit 98c384d2305982ba77b6e08ea30f5e58d70c9c19
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Sep 6 16:18:28 2023 +0200

    - updated to r3598

 kBuild.spec      |  7 +++++--
 quote-defs.patch | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/kBuild.spec b/kBuild.spec
index 2634fd1..947fda3 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -4,7 +4,7 @@
 %bcond_without	verbose		# disable verbose build
 
 %define		ver	0.1.9998
-%define		svnrev	3127
+%define		svnrev	3598
 Summary:	A cross-platform build environment
 Summary(pl.UTF-8):	Wieloplatformowe środowisko budowania
 Name:		kBuild
@@ -14,12 +14,13 @@ Group:		Development/Tools
 # Most tools are from NetBSD, some are from FreeBSD, and make and sed are from GNU
 License:	BSD and GPL v2+
 Source0:	%{name}-r%{svnrev}.tar.bz2
-# Source0-md5:	a4b4d66b7714f74cabfc54a57a88ef6f
+# Source0-md5:	902991c327b2cc93cc6da642e70a08e2
 Source1:	get-source.sh
 Patch0:		%{name}-0.1.3-escape.patch
 Patch1:		%{name}-0.1.5-pthread.patch
 Patch2:		x32.patch
 Patch3:		%{name}-bison.patch
+Patch4:		quote-defs.patch
 URL:		http://svn.netlabs.org/kbuild
 BuildRequires:	acl-devel
 BuildRequires:	bison
@@ -79,6 +80,7 @@ mv %{name} .tmp; mv .tmp/* .
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 cat > SvnInfo.kmk << EOF
 KBUILD_SVN_REV := %{svnrev}
@@ -146,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog
 %doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference*
+%attr(755,root,root) %{_bindir}/bld_signames
 %attr(755,root,root) %{_bindir}/kDepIDB
 %attr(755,root,root) %{_bindir}/kDepObj
 %attr(755,root,root) %{_bindir}/kDepPre
diff --git a/quote-defs.patch b/quote-defs.patch
new file mode 100644
index 0000000..9a7c537
--- /dev/null
+++ b/quote-defs.patch
@@ -0,0 +1,34 @@
+--- kBuild-0.1.9998.3598/src/kmk/Makefile.am~	2023-09-06 15:56:55.000000000 +0200
++++ kBuild-0.1.9998.3598/src/kmk/Makefile.am	2023-09-06 16:05:22.530998311 +0200
+@@ -175,10 +175,10 @@
+ 	-DCONFIG_WITH_RDONLY_VARIABLE_VALUE \
+ 	-DCONFIG_WITH_LAZY_DEPS_VARS \
+ 	\
+-	-DKBUILD_TYPE=\"$(KBUILD_TYPE)\" \
+-	-DKBUILD_HOST=\"$(KBUILD_TARGET)\" \
+-	-DKBUILD_HOST_ARCH=\"$(KBUILD_TARGET_ARCH)\" \
+-	-DKBUILD_HOST_CPU=\"$(KBUILD_TARGET_CPU)\" \
++	-DKBUILD_TYPE="\\"$(KBUILD_TYPE)\\"" \
++	-DKBUILD_HOST="\\"$(KBUILD_TARGET)\\"" \
++	-DKBUILD_HOST_ARCH="\\"$(KBUILD_TARGET_ARCH)\\"" \
++	-DKBUILD_HOST_CPU="\\"$(KBUILD_TARGET_CPU)\\"" \
+ 	\
+ 	-DKBUILD_SVN_REV=1 \
+ 	-DKBUILD_VERSION_MAJOR=0 \
+--- kBuild-0.1.9998.3598/Config.kmk~	2023-09-06 16:08:07.000000000 +0200
++++ kBuild-0.1.9998.3598/Config.kmk	2023-09-06 16:11:55.533986583 +0200
+@@ -123,13 +123,7 @@
+ if1of ($(KBUILD_TARGET), openbsd)
+  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
++TMP_QUOTE_SLASH := \"
+ 
+ #
+ # The OS and Architecture indicators.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kBuild.git/commitdiff/98c384d2305982ba77b6e08ea30f5e58d70c9c19



More information about the pld-cvs-commit mailing list