6 Commits

10 changed files with 78 additions and 45 deletions

4
_scmsync.obsinfo Normal file
View File

@@ -0,0 +1,4 @@
mtime: 1755266516
commit: 26142e2c7d4be4cad477a29777a96f5955e77deb4424b433fd208e4a69ec1d29
url: https://src.opensuse.org/jengelh/kbuild
revision: master

View File

@@ -3,8 +3,9 @@
<param name="filename">kbuild</param>
<param name="scm">svn</param>
<param name="url">http://svn.netlabs.org/repos/kbuild/trunk</param>
<param name="revision">3613</param>
<param name="versionformat">0.1.9998.svn%r</param>
<param name="revision">3686</param>
<param name="versionformat">0.1.9998+svn%r</param>
<param name="exclude">kBuild/bin</param>
</service>
<service name="recompress" mode="manual">
<param name="file">*.tar</param>

View File

@@ -1,13 +1,12 @@
---
kBuild/env.sh | 3 +++
kBuild/header.kmk | 4 ++--
src/lib/kStuff/include/k/kDefs.h | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
kBuild/env.sh | 3 +++
kBuild/header.kmk | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
Index: kbuild-0.1.9998+svn3613/kBuild/env.sh
Index: kbuild-0.1.9998+svn3686/kBuild/env.sh
===================================================================
--- kbuild-0.1.9998+svn3613.orig/kBuild/env.sh
+++ kbuild-0.1.9998+svn3613/kBuild/env.sh
--- kbuild-0.1.9998+svn3686.orig/kBuild/env.sh
+++ kbuild-0.1.9998+svn3686/kBuild/env.sh
@@ -422,6 +422,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
sparc64|sparcv9)
KBUILD_HOST_ARCH='sparc64'
@@ -18,10 +17,10 @@ Index: kbuild-0.1.9998+svn3613/kBuild/env.sh
*) echo "$0: unknown cpu/arch - $KBUILD_HOST_ARCH" 1>&${ERR_REDIR}
sleep 1
Index: kbuild-0.1.9998+svn3613/kBuild/header.kmk
Index: kbuild-0.1.9998+svn3686/kBuild/header.kmk
===================================================================
--- kbuild-0.1.9998+svn3613.orig/kBuild/header.kmk
+++ kbuild-0.1.9998+svn3613/kBuild/header.kmk
--- kbuild-0.1.9998+svn3686.orig/kBuild/header.kmk
+++ kbuild-0.1.9998+svn3686/kBuild/header.kmk
@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
# build types. (PORTME)
#
@@ -33,16 +32,3 @@ Index: kbuild-0.1.9998+svn3613/kBuild/header.kmk
KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 riscv32 s390 sh32 sparc32
Index: kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
===================================================================
--- kbuild-0.1.9998+svn3613.orig/src/lib/kStuff/include/k/kDefs.h
+++ kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
@@ -219,7 +219,7 @@
# 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__) || defined(__aarch64__)
# define K_ARCH K_ARCH_ARM_64
# elif defined(__hppa__) && defined(__LP64__)
# define K_ARCH K_ARCH_PARISC_64

3
build.specials.obscpio Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88bdaf2184de883a550d737cb99e1d524f56820e5a089a85b875438de34d9a05
size 256

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:105718d323ada5d77d949b737918e3af987530cfcff7a9bbd5bdcbb94f5d8a9e
size 17614096

BIN
kbuild-0.1.9998+svn3686.tar.xz LFS Normal file

Binary file not shown.

12
kbuild-gcc15.patch Normal file
View File

@@ -0,0 +1,12 @@
--- kbuild-0.1.9998+svn3613/src/kmk/glob/fnmatch.c 2024-09-19 03:34:43.000000000 +0200
+++ kbuild-0.1.9998+svn3613/src/kmk/glob/fnmatch.c 2025-05-06 17:54:12.786646913 +0200
@@ -121,7 +121,8 @@
whose names are inconsistent. */
# if !defined _LIBC && !defined getenv && !defined _MSC_VER
-extern char *getenv ();
+/* getenv() is declared in stdlib.h */
+/* extern char *getenv (); */
# endif
# ifndef errno

View File

@@ -1,3 +1,29 @@
-------------------------------------------------------------------
Fri Aug 15 13:54:37 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to snapshot 0.1.9998+svn3686
* header.kmk,footer-pass2-compiling-targets.kmk: Added EARLY_LIBS
and LATE_LIBS properties to better control the library order
when using templates. The libraries are collected from
EARLY_LIBS first, then LIBS, and LATE_LIBS last.
* header.kmk: Added KB_FN_LOAD_TOOL and KB_FN_LOAD_SDK for
explictly loading a tool or an sdk implementation.
* kmk: Automatically ascend if no makefile found and a goal was
given on the command line. This is to eliminating the need for
Makefile.kup-files as far as compiling individual source files
from an editor is concerned.
* header.kmk: Always zap the IFS variable so it won't confuse
kmk_ash.
* kmk/job.c: Deal with escape sequences inside double quotes when
we're using kmk_ash.
* kBuild/header.kmk: drop the .noarch suffix for
KBUILD_DEVTOOLS_TRG_NOARCH and KBUILD_DEVTOOLS_HST_NOARCH.
-------------------------------------------------------------------
Tue May 6 16:14:23 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
- Add kbuild-gcc15.patch to fix gcc15 compile time error
-------------------------------------------------------------------
Fri Sep 20 19:12:07 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

View File

@@ -1,7 +1,7 @@
#
# spec file for package kbuild
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,9 @@
#
%define _svnrev 3613
%define _svnrev 3686
Name: kbuild
Version: 0.1.9998+svn3613
Version: 0.1.9998+svn3686
Release: 0
Summary: Framework for writing simple makefiles for complex tasks
License: GPL-2.0-or-later
@@ -33,6 +33,7 @@ Patch8: kbuild-wrong-memset.patch
Patch9: ppc64le.patch
Patch10: aarch64.patch
Patch13: glob-lstat.patch
Patch14: kbuild-gcc15.patch
BuildRequires: automake
BuildRequires: bison
BuildRequires: byacc

View File

@@ -5,10 +5,10 @@
src/lib/kStuff/include/k/kHlpAssert.h | 2 ++
4 files changed, 12 insertions(+), 4 deletions(-)
Index: kbuild-0.1.9998+svn3613/kBuild/env.sh
Index: kbuild-0.1.9998+svn3686/kBuild/env.sh
===================================================================
--- kbuild-0.1.9998+svn3613.orig/kBuild/env.sh
+++ kbuild-0.1.9998+svn3613/kBuild/env.sh
--- kbuild-0.1.9998+svn3686.orig/kBuild/env.sh
+++ kbuild-0.1.9998+svn3686/kBuild/env.sh
@@ -383,6 +383,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
m68k)
KBUILD_HOST_ARCH='m68k'
@@ -19,10 +19,10 @@ Index: kbuild-0.1.9998+svn3613/kBuild/env.sh
mips32|mips)
KBUILD_HOST_ARCH='mips32'
;;
Index: kbuild-0.1.9998+svn3613/kBuild/header.kmk
Index: kbuild-0.1.9998+svn3686/kBuild/header.kmk
===================================================================
--- kbuild-0.1.9998+svn3613.orig/kBuild/header.kmk
+++ kbuild-0.1.9998+svn3613/kBuild/header.kmk
--- kbuild-0.1.9998+svn3686.orig/kBuild/header.kmk
+++ kbuild-0.1.9998+svn3686/kBuild/header.kmk
@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
# build types. (PORTME)
#
@@ -35,18 +35,18 @@ Index: kbuild-0.1.9998+svn3613/kBuild/header.kmk
@@ -524,7 +524,7 @@ KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS
KBUILD_DEVTOOLS_TRG_NOARCH ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).noarch
KBUILD_DEVTOOLS_HST_NOARCH ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).noarch
KBUILD_DEVTOOLS_TRG_NOARCH ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET)
KBUILD_DEVTOOLS_HST_NOARCH ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST)
-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.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
Index: kbuild-0.1.9998+svn3686/src/lib/kStuff/include/k/kDefs.h
===================================================================
--- kbuild-0.1.9998+svn3613.orig/src/lib/kStuff/include/k/kDefs.h
+++ kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
--- kbuild-0.1.9998+svn3686.orig/src/lib/kStuff/include/k/kDefs.h
+++ kbuild-0.1.9998+svn3686/src/lib/kStuff/include/k/kDefs.h
@@ -176,6 +176,7 @@
#define K_ARCH_POWERPC_32 ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 64-bit PowerPC. */
@@ -67,10 +67,10 @@ Index: kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
# elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)
# define K_ARCH K_ARCH_POWERPC_32
# elif defined(__riscv)
Index: kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kHlpAssert.h
Index: kbuild-0.1.9998+svn3686/src/lib/kStuff/include/k/kHlpAssert.h
===================================================================
--- kbuild-0.1.9998+svn3613.orig/src/lib/kStuff/include/k/kHlpAssert.h
+++ kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kHlpAssert.h
--- kbuild-0.1.9998+svn3686.orig/src/lib/kStuff/include/k/kHlpAssert.h
+++ kbuild-0.1.9998+svn3686/src/lib/kStuff/include/k/kHlpAssert.h
@@ -59,6 +59,8 @@ extern "C" {
# define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("unimp 0"); } while (0) /*??*/
#elif defined(__GNUC__) && (K_ARCH == K_ARCH_SPARC_64)