[Pkg-virtualbox-commits] [kbuild] 06/07: Sync ppc64el port with Fedora and find glob with the Fedora update patch, thanks Sérgio for the mail NOTE: we call it ppc64el, Fedora and the rest of the world calls it ppc64le. Tweak patch accordingly
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sat Jul 25 17:25:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository kbuild.
commit 89dd36374b1395356d59d8d81cf4e7b7cd4b9153
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Jul 25 18:03:00 2015 +0200
Sync ppc64el port with Fedora and find glob with the Fedora update patch, thanks Sérgio for the mail
NOTE: we call it ppc64el, Fedora and the rest of the world calls it ppc64le. Tweak patch accordingly
---
debian/patches/10_ppc64el.diff | 69 +++++++++++++++++++++++++++++++++++++--
debian/patches/11_find-glob.patch | 22 +++++++++----
2 files changed, 82 insertions(+), 9 deletions(-)
diff --git a/debian/patches/10_ppc64el.diff b/debian/patches/10_ppc64el.diff
index 9a73ea1..377dcfd 100644
--- a/debian/patches/10_ppc64el.diff
+++ b/debian/patches/10_ppc64el.diff
@@ -1,4 +1,17 @@
-Add patch to fix issues on ppc64el
+From: Michel Normand <normand at linux.vnet.ibm.com>
+Subject: kBuild 0.1.9998 ppc64le
+Date: Mon, 18 May 2015 08:46:41 -0400
+
+kBuild 0.1.9998 ppc64le
+patch retrieved from opensuse url below and refresh to match fedora source tree.
+but seems never uploaded upstream.
+https://build.opensuse.org/package/view_file/devel:tools:building/kbuild/ppc64le.patch?expand=1
+
+Debian NOTE:
+ we call it ppc64el, not ppc64le, so tweaking the patch accordingly (even if it should be a cosmetic issue)
+ http://linux.debian.ports.powerpc.narkive.com/8eeWSBtZ/switching-ppc64el-port-name-to-ppc64le
+
+
Index: kbuild/kBuild/env.sh
===================================================================
--- kbuild.orig/kBuild/env.sh 2014-12-05 15:57:43.546393368 +0530
@@ -7,7 +20,7 @@ Index: kbuild/kBuild/env.sh
ppc64|powerpc64)
KBUILD_HOST_ARCH='ppc64'
;;
-+ ppc64le)
++ ppc64le|powerpc64le)
+ KBUILD_HOST_ARCH='ppc64el'
+ ;;
mips32|mips)
@@ -28,3 +41,55 @@ Index: kbuild/kBuild/header.kmk
KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm sh
+@@ -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 ppc64el s390x sparc64)
+ ifeq ($(KBUILD_TARGET_ARCH),amd64)
+ KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86
+ else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
+diff --git a/src/lib/k/kDefs.h b/src/lib/k/kDefs.h
+index b67886f..47d8c58 100644
+--- a/src/lib/k/kDefs.h
++++ b/src/lib/k/kDefs.h
+@@ -162,18 +164,20 @@
+ #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_64EL (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)
+ /** 32-bit SuperH. */
+-#define K_ARCH_SH_32 (19 | K_ARCH_BIT_32 | K_ARCH_END_BI)
++#define K_ARCH_SH_32 (20 | K_ARCH_BIT_32 | K_ARCH_END_BI)
+ /** The end of the valid architecture values (exclusive). */
+-#define K_ARCH_MAX (20)
++#define K_ARCH_MAX (21)
+ /** @} */
+
+
+@@ -200,8 +202,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_64EL
+ # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)
+ # define K_ARCH K_ARCH_POWERPC_32
+ # elif defined(__sparcv9__) || defined(__sparcv9)
diff --git a/debian/patches/11_find-glob.patch b/debian/patches/11_find-glob.patch
index a07bd29..78e9f15 100644
--- a/debian/patches/11_find-glob.patch
+++ b/debian/patches/11_find-glob.patch
@@ -1,18 +1,26 @@
Description: Avoid build failures by finding the correct glob.h header
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Author: Sérgio Basto <sergio at serjux.com>
-Last-Update: <2014-11-15>
+Last-Update: <2015-06-22>
-diff --git a/src/kmk/dir.c b/src/kmk/dir.c
-index 2bef610..2c39119 100644
---- a/src/kmk/dir.c
-+++ b/src/kmk/dir.c
+#Bug: http://trac.netlabs.org/kbuild/ticket/117
+--- a/src/kmk/dir.c 2015-06-22 00:19:25.132189626 +0100
++++ b/src/kmk/dir.c 2015-06-22 00:21:27.247583054 +0100
+@@ -1310,7 +1310,7 @@ print_dir_data_base (void)
+
+ /* Hooks for globbing. */
+
+-#if defined(KMK) && !defined(__OS2__)
++#if defined(KMK) && !defined(__GLIBC__)
+ # include "glob/glob.h"
+ #else
+ #include <glob.h>
@@ -1449,7 +1449,7 @@ dir_setup_glob (glob_t *gl)
#ifdef __EMX__ /* The FreeBSD implementation actually uses gl_lstat!! */
gl->gl_lstat = local_stat;
#endif
-#if defined(KMK) && !defined(__OS2__)
-+#if defined(WINDOWS32) && defined(KMK) && !defined(__OS2__)
++#if defined(KMK) && !defined(__GLIBC__)
gl->gl_exists = file_exists_p;
gl->gl_isdir = dir_exists_p;
#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/kbuild.git
More information about the Pkg-virtualbox-commits
mailing list