Accepting request 535804 from home:lwfinger:branches:devel:tools:building

- Update to version 0.1.9998svn3110. VirtualBox 5.2.0 needs this one to build.
  Changes detailed in upstream url from svn 2815 to 3110.
- Rebased patches
- Removed test for openSUSE 12.3 from spec file.

OBS-URL: https://build.opensuse.org/request/show/535804
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/kbuild?expand=0&rev=34
This commit is contained in:
Martin Pluskal
2017-10-24 15:07:10 +00:00
committed by Git OBS Bridge
parent c451fbfefa
commit c3b73455b9
11 changed files with 112 additions and 110 deletions

View File

@@ -4,13 +4,13 @@
src/lib/k/kDefs.h | 16 ++++++++++------
3 files changed, 16 insertions(+), 9 deletions(-)
Index: kbuild-0.1.9998svn2784/kBuild/env.sh
Index: kbuild-0.1.9998svn3110/kBuild/env.sh
===================================================================
--- kbuild-0.1.9998svn2784.orig/kBuild/env.sh
+++ kbuild-0.1.9998svn2784/kBuild/env.sh
@@ -347,6 +347,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
ppc64|powerpc64)
KBUILD_HOST_ARCH='ppc64'
--- kbuild-0.1.9998svn3110.orig/kBuild/env.sh
+++ kbuild-0.1.9998svn3110/kBuild/env.sh
@@ -368,6 +368,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
m68k)
KBUILD_HOST_ARCH='m68k'
;;
+ ppc64le|powerpc64le)
+ KBUILD_HOST_ARCH='ppc64le'
@@ -18,22 +18,22 @@ Index: kbuild-0.1.9998svn2784/kBuild/env.sh
mips32|mips)
KBUILD_HOST_ARCH='mips32'
;;
Index: kbuild-0.1.9998svn2784/kBuild/header.kmk
Index: kbuild-0.1.9998svn3110/kBuild/header.kmk
===================================================================
--- kbuild-0.1.9998svn2784.orig/kBuild/header.kmk
+++ kbuild-0.1.9998svn2784/kBuild/header.kmk
@@ -189,8 +189,8 @@ KBUILD_BLD_TYPES := release profile debu
--- kbuild-0.1.9998svn3110.orig/kBuild/header.kmk
+++ kbuild-0.1.9998svn3110/kBuild/header.kmk
@@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
# build types. (PORTME)
#
KBUILD_OSES := darwin dos dragonfly freebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
-KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch
-KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha
+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch
+KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha
KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm
KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
-KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64
-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64
+KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k ppc64le mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64
+KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 ppc64le mips64 ppc64 s390x sh64 sparc64
KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32
@@ -481,7 +481,7 @@ endif
@@ -515,7 +515,7 @@ endif
KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
@@ -42,35 +42,39 @@ Index: kbuild-0.1.9998svn2784/kBuild/header.kmk
ifeq ($(KBUILD_TARGET_ARCH),amd64)
KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86
else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
Index: kbuild-0.1.9998svn2784/src/lib/k/kDefs.h
Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h
===================================================================
--- kbuild-0.1.9998svn2784.orig/src/lib/k/kDefs.h
+++ kbuild-0.1.9998svn2784/src/lib/k/kDefs.h
@@ -158,16 +158,18 @@
#define K_ARCH_POWERPC_32 (13 | K_ARCH_BIT_32 | K_ARCH_END_BI)
--- kbuild-0.1.9998svn3110.orig/src/lib/kStuff/include/k/kDefs.h
+++ kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h
@@ -172,20 +172,22 @@
#define K_ARCH_POWERPC_32 ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 64-bit PowerPC. */
#define K_ARCH_POWERPC_64 (14 | K_ARCH_BIT_64 | K_ARCH_END_BI)
#define K_ARCH_POWERPC_64 ( 9 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+/** 64-bit PowerPC. */
+#define K_ARCH_POWERPC_64LE (15 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE)
/** 32(31)-bit S390. */
-#define K_ARCH_S390_32 (15 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
-#define K_ARCH_S390_32 (10 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
+#define K_ARCH_S390_32 (16 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
/** 64-bit S390. */
-#define K_ARCH_S390_64 (16 | K_ARCH_BIT_64 | K_ARCH_END_BIG)
-#define K_ARCH_S390_64 (10 | K_ARCH_BIT_64 | K_ARCH_END_BIG)
+#define K_ARCH_S390_64 (17 | K_ARCH_BIT_64 | K_ARCH_END_BIG)
/** 32-bit SuperH. */
#define K_ARCH_SH_32 (11 | K_ARCH_BIT_32 | K_ARCH_END_BI)
/** 64-bit SuperH. */
#define K_ARCH_SH_64 (11 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** 32-bit SPARC. */
-#define K_ARCH_SPARC_32 (17 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
-#define K_ARCH_SPARC_32 (12 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
+#define K_ARCH_SPARC_32 (18 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
/** 64-bit SPARC. */
-#define K_ARCH_SPARC_64 (18 | K_ARCH_BIT_64 | K_ARCH_END_BI)
-#define K_ARCH_SPARC_64 (12 | K_ARCH_BIT_64 | K_ARCH_END_BI)
+#define K_ARCH_SPARC_64 (19 | K_ARCH_BIT_64 | K_ARCH_END_BI)
/** The end of the valid architecture values (exclusive). */
-#define K_ARCH_MAX (19)
-#define K_ARCH_MAX (12+1)
+#define K_ARCH_MAX (20)
/** @} */
@@ -194,8 +196,10 @@
@@ -216,8 +218,10 @@
# define K_ARCH K_ARCH_MIPS_64
# elif defined(__mips__)
# define K_ARCH K_ARCH_MIPS_32