fc2349f6b4
- Update to version 0.1.9998svn2784: many changes detailed in upstream url from svn 2720 to 2784. http://trac.netlabs.org/kbuild/timeline?from=2015-06-26&daysback=365 http://trac.netlabs.org/kbuild/changeset?old_path=%2F&old=2784&new_path=%2F&new=2720 - Dropped patches: kbuild-kmk-makefile-am.patch - Rebased patches: kbuild-glob.patch ppc64le.patch kbuild-timestamps.diff kbuild-pthread.diff - All above changes allow to build package for ppc64/ppc64le archs OBS-URL: https://build.opensuse.org/request/show/313853 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/kbuild?expand=0&rev=26
85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
---
|
|
kBuild/env.sh | 3 +++
|
|
kBuild/header.kmk | 6 +++---
|
|
src/lib/k/kDefs.h | 16 ++++++++++------
|
|
3 files changed, 16 insertions(+), 9 deletions(-)
|
|
|
|
Index: kbuild-0.1.9998svn2784/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'
|
|
;;
|
|
+ ppc64le|powerpc64le)
|
|
+ KBUILD_HOST_ARCH='ppc64le'
|
|
+ ;;
|
|
mips32|mips)
|
|
KBUILD_HOST_ARCH='mips32'
|
|
;;
|
|
Index: kbuild-0.1.9998svn2784/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
|
|
# 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
|
|
-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
|
|
+KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha
|
|
KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm
|
|
|
|
|
|
@@ -481,7 +481,7 @@ endif
|
|
KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
|
|
KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
|
|
|
|
-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.9998svn2784/src/lib/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)
|
|
/** 64-bit PowerPC. */
|
|
#define K_ARCH_POWERPC_64 (14 | 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 (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 (17 | K_ARCH_BIT_64 | K_ARCH_END_BIG)
|
|
/** 32-bit SPARC. */
|
|
-#define K_ARCH_SPARC_32 (17 | 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 (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 (20)
|
|
/** @} */
|
|
|
|
|
|
@@ -194,8 +196,10 @@
|
|
# define K_ARCH K_ARCH_MIPS_64
|
|
# elif defined(__mips__)
|
|
# define K_ARCH K_ARCH_MIPS_32
|
|
-# elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__)
|
|
+# elif (defined(__powerpc64__) && defined(__BIG_ENDIAN__))|| defined(__ppc64__) || defined(__PPC64__)
|
|
# define K_ARCH K_ARCH_POWERPC_64
|
|
+# elif (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__))
|
|
+# define K_ARCH K_ARCH_POWERPC_64LE
|
|
# elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)
|
|
# define K_ARCH K_ARCH_POWERPC_32
|
|
# elif defined(__sparcv9__) || defined(__sparcv9)
|