From 0dd7c323d5ec950602e94a0d6a0a3de21bbfa15f092510d340696230da965e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 4 Dec 2013 20:50:26 +0000 Subject: [PATCH] Accepting request 209421 from openSUSE:Factory:PowerLE fix ppc64le build, please forward to factory OBS-URL: https://build.opensuse.org/request/show/209421 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/kbuild?expand=0&rev=19 --- kbuild.changes | 7 +++++++ kbuild.spec | 2 ++ ppc64le.patch | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 ppc64le.patch diff --git a/kbuild.changes b/kbuild.changes index 80e4c80..2241d35 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 2 19:44:57 UTC 2013 - dvaleev@suse.com + +- added patches: + * ppc64le.patch +- Make ppc64le architecture known + ------------------------------------------------------------------- Fri Apr 26 08:17:17 UTC 2013 - mmeister@suse.com diff --git a/kbuild.spec b/kbuild.spec index e577fbb..37317ac 100644 --- a/kbuild.spec +++ b/kbuild.spec @@ -42,6 +42,7 @@ Patch5: kbuild-pthread.diff Patch6: kbuild-timestamps.diff Patch7: kbuild-armv7l.diff Patch8: kbuild-wrong-memset.patch +Patch9: ppc64le.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,6 +72,7 @@ Authors: %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" diff --git a/ppc64le.patch b/ppc64le.patch new file mode 100644 index 0000000..c5e7248 --- /dev/null +++ b/ppc64le.patch @@ -0,0 +1,51 @@ +Index: kbuild-0.1.9998svn2577/kBuild/env.sh +=================================================================== +--- kbuild-0.1.9998svn2577.orig/kBuild/env.sh ++++ kbuild-0.1.9998svn2577/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.9998svn2577/kBuild/header.kmk +=================================================================== +--- kbuild-0.1.9998svn2577.orig/kBuild/header.kmk ++++ kbuild-0.1.9998svn2577/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 + + +@@ -475,7 +475,7 @@ KBUILD_DEVTOOLS = $(if $(PATH_DEVTO + 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 = $(PATH_DEVTOOLS)/$(KBUILD_TARGET).x86 + else ifeq ($(KBUILD_TARGET_ARCH),hppa64) +Index: kbuild-0.1.9998svn2577/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 @@ + # define K_ARCH K_ARCH_MIPS_32 + # elif defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) + # define K_ARCH K_ARCH_POWERPC_64 ++# elif defined(__powerpc64le__) || defined(__ppc64le__) || defined(__PPC64LE__) ++# 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)