SHA256
1
0
forked from pool/kbuild

Accepting request 311921 from devel:tools:building

1

OBS-URL: https://build.opensuse.org/request/show/311921
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbuild?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2015-06-16 12:10:58 +00:00 committed by Git OBS Bridge
commit 483b43f78a
3 changed files with 46 additions and 13 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 12 09:45:46 UTC 2015 - dvaleev@suse.com
- Rework ppc64le patch. Previous one was totally wrong.
- Modified patch ppc64le.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 17 08:27:50 UTC 2014 - speilicke@suse.com Fri Jan 17 08:27:50 UTC 2014 - speilicke@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package kbuild # spec file for package kbuild
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

View File

@ -1,7 +1,7 @@
Index: kbuild-0.1.9998svn2577/kBuild/env.sh Index: kbuild-0.1.9998svn2720/kBuild/env.sh
=================================================================== ===================================================================
--- kbuild-0.1.9998svn2577.orig/kBuild/env.sh --- kbuild-0.1.9998svn2720.orig/kBuild/env.sh
+++ kbuild-0.1.9998svn2577/kBuild/env.sh +++ kbuild-0.1.9998svn2720/kBuild/env.sh
@@ -347,6 +347,9 @@ if test -z "$KBUILD_HOST_ARCH"; then @@ -347,6 +347,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
ppc64|powerpc64) ppc64|powerpc64)
KBUILD_HOST_ARCH='ppc64' KBUILD_HOST_ARCH='ppc64'
@ -12,10 +12,10 @@ Index: kbuild-0.1.9998svn2577/kBuild/env.sh
mips32|mips) mips32|mips)
KBUILD_HOST_ARCH='mips32' KBUILD_HOST_ARCH='mips32'
;; ;;
Index: kbuild-0.1.9998svn2577/kBuild/header.kmk Index: kbuild-0.1.9998svn2720/kBuild/header.kmk
=================================================================== ===================================================================
--- kbuild-0.1.9998svn2577.orig/kBuild/header.kmk --- kbuild-0.1.9998svn2720.orig/kBuild/header.kmk
+++ kbuild-0.1.9998svn2577/kBuild/header.kmk +++ kbuild-0.1.9998svn2720/kBuild/header.kmk
@@ -189,8 +189,8 @@ KBUILD_BLD_TYPES := release profile debu @@ -189,8 +189,8 @@ KBUILD_BLD_TYPES := release profile debu
# build types. (PORTME) # build types. (PORTME)
# #
@ -36,15 +36,42 @@ Index: kbuild-0.1.9998svn2577/kBuild/header.kmk
ifeq ($(KBUILD_TARGET_ARCH),amd64) ifeq ($(KBUILD_TARGET_ARCH),amd64)
KBUILD_DEVTOOLS_TRG_ALT = $(PATH_DEVTOOLS)/$(KBUILD_TARGET).x86 KBUILD_DEVTOOLS_TRG_ALT = $(PATH_DEVTOOLS)/$(KBUILD_TARGET).x86
else ifeq ($(KBUILD_TARGET_ARCH),hppa64) else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
Index: kbuild-0.1.9998svn2577/src/lib/k/kDefs.h Index: kbuild-0.1.9998svn2720/src/lib/k/kDefs.h
=================================================================== ===================================================================
--- kbuild-0.1.9998svn2577.orig/src/lib/k/kDefs.h --- kbuild-0.1.9998svn2720.orig/src/lib/k/kDefs.h
+++ kbuild-0.1.9998svn2577/src/lib/k/kDefs.h +++ kbuild-0.1.9998svn2720/src/lib/k/kDefs.h
@@ -196,6 +196,8 @@ @@ -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 # define K_ARCH K_ARCH_MIPS_32
# elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) -# elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__)
+# elif (defined(__powerpc64__) && defined(__BIG_ENDIAN__))|| defined(__ppc64__) || defined(__PPC64__)
# define K_ARCH K_ARCH_POWERPC_64 # define K_ARCH K_ARCH_POWERPC_64
+# elif defined(__powerpc64le__) || defined(__ppc64le__) || defined(__PPC64LE__) +# elif (defined(__powerpc64__) && defined(__LITTLE_ENDIAN__))
+# define K_ARCH K_ARCH_POWERPC_64LE +# define K_ARCH K_ARCH_POWERPC_64LE
# elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)
# define K_ARCH K_ARCH_POWERPC_32 # define K_ARCH K_ARCH_POWERPC_32