[packages/kBuild] updated to r3127

atler atler at pld-linux.org
Sat Nov 25 13:26:32 CET 2017


commit 43f7230eae743161ce6e026b09f2bac2246eeaf7
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Nov 25 13:25:37 2017 +0100

    updated to r3127

 kBuild-0.1.5-pthread.patch | 14 +++++++-------
 kBuild.spec                |  5 +++--
 x32.patch                  | 12 ++++++------
 3 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/kBuild.spec b/kBuild.spec
index 0be1669..2634fd1 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -4,7 +4,7 @@
 %bcond_without	verbose		# disable verbose build
 
 %define		ver	0.1.9998
-%define		svnrev	2814
+%define		svnrev	3127
 Summary:	A cross-platform build environment
 Summary(pl.UTF-8):	Wieloplatformowe środowisko budowania
 Name:		kBuild
@@ -14,7 +14,7 @@ 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:	ff69b9b96c548bb87eae37936246bce2
+# Source0-md5:	a4b4d66b7714f74cabfc54a57a88ef6f
 Source1:	get-source.sh
 Patch0:		%{name}-0.1.3-escape.patch
 Patch1:		%{name}-0.1.5-pthread.patch
@@ -173,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/kmk_sleep
 %attr(755,root,root) %{_bindir}/kmk_test
 %attr(755,root,root) %{_bindir}/kmk_time
+%attr(755,root,root) %{_bindir}/kmk_touch
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.kmk
 %dir %{_datadir}/%{name}/msgstyles
diff --git a/kBuild-0.1.5-pthread.patch b/kBuild-0.1.5-pthread.patch
index 01d6602..9a3ebe8 100644
--- a/kBuild-0.1.5-pthread.patch
+++ b/kBuild-0.1.5-pthread.patch
@@ -2,11 +2,11 @@ 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
   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/x32.patch b/x32.patch
index 332338b..ceb75e2 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,12 +1,12 @@
---- kBuild-0.1.9998.2700/kBuild/env.sh	2015-03-23 19:32:23.858751190 +0000
-+++ kBuild-0.1.9998.2780/kBuild/env.sh	2015-03-23 19:26:51.504892609 +0000
-@@ -326,6 +326,9 @@
-         x86_64|AMD64|amd64|k8|k8l|k9|k10)
-             KBUILD_HOST_ARCH='amd64'
+--- kBuild-0.1.9998.3127/kBuild/env.sh.orig	2017-11-25 12:47:06.042644251 +0100
++++ kBuild-0.1.9998.3127/kBuild/env.sh	2017-11-25 12:47:34.349002559 +0100
+@@ -356,6 +356,9 @@
+                 esac
+             fi
              ;;
 +        x32)
 +            KBUILD_HOST_ARCH='x32'
 +            ;;
-         x86|i86pc|ia32|i[3456789]86|BePC)
+         x86|i86pc|ia32|i[3456789]86|BePC|i[3456789]86-AT[3456789]86)
              KBUILD_HOST_ARCH='x86'
              ;;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kBuild.git/commitdiff/43f7230eae743161ce6e026b09f2bac2246eeaf7



More information about the pld-cvs-commit mailing list