From 216e3606aca0537de0fd777b89dbb75b34a9b9e260c6981b895c0df97616f5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 13 Jun 2015 10:01:47 +0000 Subject: [PATCH] Accepting request 311783 from home:k0da:branches:devel:tools:building - Rework ppc64le patch. Previous one was totally wrong. - Modified patch ppc64le.patch OBS-URL: https://build.opensuse.org/request/show/311783 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/kbuild?expand=0&rev=24 --- kbuild.changes | 6 ++++++ kbuild.spec | 2 +- ppc64le.patch | 51 ++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/kbuild.changes b/kbuild.changes index 7a534ab..8aa284f 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -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 diff --git a/kbuild.spec b/kbuild.spec index 79cc1fb..48d1ace 100644 --- a/kbuild.spec +++ b/kbuild.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed diff --git a/ppc64le.patch b/ppc64le.patch index c5e7248..d06c9ca 100644 --- a/ppc64le.patch +++ b/ppc64le.patch @@ -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.9998svn2577/kBuild/env.sh +--- kbuild-0.1.9998svn2720.orig/kBuild/env.sh ++++ kbuild-0.1.9998svn2720/kBuild/env.sh @@ -347,6 +347,9 @@ if test -z "$KBUILD_HOST_ARCH"; then ppc64|powerpc64) KBUILD_HOST_ARCH='ppc64' @@ -12,10 +12,10 @@ Index: kbuild-0.1.9998svn2577/kBuild/env.sh mips32|mips) 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.9998svn2577/kBuild/header.kmk +--- kbuild-0.1.9998svn2720.orig/kBuild/header.kmk ++++ kbuild-0.1.9998svn2720/kBuild/header.kmk @@ -189,8 +189,8 @@ KBUILD_BLD_TYPES := release profile debu # build types. (PORTME) # @@ -36,15 +36,42 @@ Index: kbuild-0.1.9998svn2577/kBuild/header.kmk ifeq ($(KBUILD_TARGET_ARCH),amd64) KBUILD_DEVTOOLS_TRG_ALT = $(PATH_DEVTOOLS)/$(KBUILD_TARGET).x86 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.9998svn2577/src/lib/k/kDefs.h -@@ -196,6 +196,8 @@ +--- kbuild-0.1.9998svn2720.orig/src/lib/k/kDefs.h ++++ kbuild-0.1.9998svn2720/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(__ppc64__) || defined(__PPC64__) ++# elif (defined(__powerpc64__) && defined(__BIG_ENDIAN__))|| defined(__ppc64__) || defined(__PPC64__) # 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 # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) # define K_ARCH K_ARCH_POWERPC_32