[Pkg-virtualbox-commits] [kbuild] 01/02: Droop useless patches
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Thu Oct 19 21:47:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch experimental
in repository kbuild.
commit 4f5680fa435efbd3c2299112d192e2bdcc0d18a4
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date: Thu Oct 19 23:38:37 2017 +0200
Droop useless patches
---
debian/patches/02_sh4.diff | 53 ----------------
debian/patches/04_armv7l.diff | 15 -----
debian/patches/05_hppa-disable-threads.diff | 15 -----
debian/patches/06_binutils-gold.diff | 16 -----
debian/patches/10_ppc64el.diff | 95 -----------------------------
debian/patches/11_find-glob.patch | 26 --------
debian/patches/12_arm64.diff | 37 -----------
debian/patches/series | 9 +--
8 files changed, 1 insertion(+), 265 deletions(-)
diff --git a/debian/patches/02_sh4.diff b/debian/patches/02_sh4.diff
deleted file mode 100644
index 8177c1a..0000000
--- a/debian/patches/02_sh4.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Fix FTBFS on sh4
-Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Bug-Debian: http://bugs.debian.org/544974
-
---- a/kBuild/env.sh
-+++ b/kBuild/env.sh
-@@ -372,6 +372,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
- alpha)
- KBUILD_HOST_ARCH='alpha'
- ;;
-+ sh2|sh2a|sh3|sh3|sh4|sh4a|sh4al|sh4al-dsp|shmedia)
-+ KBUILD_HOST_ARCH='sh'
-+ ;;
-
- *) echo "$0: unknown cpu/arch - $KBUILD_HOST_ARCH" 1>&${ERR_REDIR}
- sleep 1
---- a/kBuild/header.kmk
-+++ b/kBuild/header.kmk
-@@ -189,9 +189,9 @@ KBUILD_BLD_TYPES := release profile debu
- # build types. (PORTME)
- #
- KBUILD_OSES := darwin dos dragonfly freebsd gnukfreebsd 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 noarch
-+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 mips32 mips64 ia64 hppa32 hppa64 arm alpha sh noarch
- KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha
--KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm
-+KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm sh
-
-
- #
---- a/src/lib/kStuff/include/k/kDefs.h
-+++ b/src/lib/kStuff/include/k/kDefs.h
-@@ -170,8 +170,10 @@
- #define K_ARCH_SPARC_32 (17 | 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)
-+/** 32-bit SuperH. */
-+#define K_ARCH_SH_32 (19 | K_ARCH_BIT_32 | K_ARCH_END_BI)
- /** The end of the valid architecture values (exclusive). */
--#define K_ARCH_MAX (19)
-+#define K_ARCH_MAX (20)
- /** @} */
-
-
-@@ -210,6 +212,8 @@
- # define K_ARCH K_ARCH_S390_64
- # elif defined(__s390__)
- # define K_ARCH K_ARCH_S390_32
-+# elif defined(__sh__)
-+# define K_ARCH K_ARCH_SH_32
- # else
- # error "Port Me"
- # endif
diff --git a/debian/patches/04_armv7l.diff b/debian/patches/04_armv7l.diff
deleted file mode 100644
index f5d448a..0000000
--- a/debian/patches/04_armv7l.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Enable support for armv7l to fix FTBFS
-Author: Jamie Bennett <jb at canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/535093
-
---- a/kBuild/env.sh
-+++ b/kBuild/env.sh
-@@ -366,7 +366,7 @@ if test -z "$KBUILD_HOST_ARCH"; then
- hppa64|parisc64)
- KBUILD_HOST_ARCH='hppa64'
- ;;
-- arm|armv4l|armv5tel|armv5tejl)
-+ armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl)
- KBUILD_HOST_ARCH='arm'
- ;;
- alpha)
diff --git a/debian/patches/05_hppa-disable-threads.diff b/debian/patches/05_hppa-disable-threads.diff
deleted file mode 100644
index da268e7..0000000
--- a/debian/patches/05_hppa-disable-threads.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix FTBFS on hppa by disabling threads.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-
---- a/src/kmk/Makefile.kmk
-+++ b/src/kmk/Makefile.kmk
-@@ -253,6 +253,9 @@ kmk_SOURCES = \
- kmk_SOURCES.win = \
- w32/subproc/sub_proc.c
-
-+kmk_DEFS.hppa32 = CONFIG_WITHOUT_THREADS
-+kmk_DEFS.hppa64 = CONFIG_WITHOUT_THREADS
-+
- kmk_DEFS.gnukfreebsd = CONFIG_WITHOUT_THREADS
- kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
-
diff --git a/debian/patches/06_binutils-gold.diff b/debian/patches/06_binutils-gold.diff
deleted file mode 100644
index a7aab27..0000000
--- a/debian/patches/06_binutils-gold.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix FTBFS with binutils-gold
-Author: Felix Geyer <debfx-pkg at fobos.de>
-Bug-Debian: http://bugs.debian.org/554937
-
-diff -up kBuild-0.1.5-p1/Config.kmk.pthreads kBuild-0.1.5-p1/Config.kmk
---- kBuild-0.1.5-p1/Config.kmk.pthreads 2010-02-18 08:27:24.287688965 +0100
-+++ kBuild-0.1.5-p1/Config.kmk 2010-02-18 08:28:07.505493345 +0100
-@@ -343,6 +343,8 @@ ifndef TEMPLATE_BIN_TOOL
- endif
- ifeq ($(KBUILD_TARGET),linux)
- TEMPLATE_BIN_LIBS += rt
-+ TEMPLATE_BIN_LIBS += pthread
-+ TEMPLATE_BIN_LDFLAGS += -Wl,--as-needed
- endif
- TEMPLATE_BIN_CFLAGS.x86 += -m32
- TEMPLATE_BIN_CFLAGS.sparc32 += -m32
diff --git a/debian/patches/10_ppc64el.diff b/debian/patches/10_ppc64el.diff
deleted file mode 100644
index 9eb708d..0000000
--- a/debian/patches/10_ppc64el.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-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
-+++ kbuild/kBuild/env.sh 2014-12-05 15:57:43.546393368 +0530
-@@ -351,6 +351,9 @@
- ppc64|powerpc64)
- KBUILD_HOST_ARCH='ppc64'
- ;;
-+ ppc64le|powerpc64le)
-+ KBUILD_HOST_ARCH='ppc64el'
-+ ;;
- mips32|mips)
- KBUILD_HOST_ARCH='mips32'
- ;;
-Index: kbuild/kBuild/header.kmk
-===================================================================
---- kbuild.orig/kBuild/header.kmk 2014-12-05 15:57:43.546393368 +0530
-+++ kbuild/kBuild/header.kmk 2014-12-05 15:57:43.546393368 +0530
-@@ -189,8 +189,8 @@
- # build types. (PORTME)
- #
- KBUILD_OSES := darwin dos dragonfly freebsd gnukfreebsd 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 sh noarch
--KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 mips64 ia64 hppa64 alpha
-+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64el mips32 mips64 ia64 hppa32 hppa64 arm alpha sh noarch
-+KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64el mips64 ia64 hppa64 alpha
- KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm sh
-
-
-@@ -506,7 +506,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/kStuff/include/k/kDefs.h
-+++ b/src/lib/kStuff/include/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
deleted file mode 100644
index fd70786..0000000
--- a/debian/patches/11_find-glob.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Avoid build failures by finding the correct glob.h header
-Author: Sérgio Basto <sergio at serjux.com>
-
-Last-Update: <2015-06-22>
-
-#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
-@@ -1340,7 +1340,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>
-@@ -1479,7 +1479,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(KMK) && !defined(__GLIBC__)
- gl->gl_exists = file_exists_p;
- gl->gl_isdir = dir_exists_p;
- #endif
diff --git a/debian/patches/12_arm64.diff b/debian/patches/12_arm64.diff
deleted file mode 100644
index 9e24dfc..0000000
--- a/debian/patches/12_arm64.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Add arm64 to supported architectures
---- a/kBuild/env.sh
-+++ b/kBuild/env.sh
-@@ -372,6 +372,9 @@
- armv3l|armv4b|armv4l|armv4tl|armv5tel|armv5tejl|armv6l|armv7l|armv7hl|armv7hnl)
- KBUILD_HOST_ARCH='arm'
- ;;
-+ aarch64)
-+ KBUILD_HOST_ARCH='arm64'
-+ ;;
- alpha)
- KBUILD_HOST_ARCH='alpha'
- ;;
---- a/kBuild/header.kmk
-+++ b/kBuild/header.kmk
-@@ -189,8 +189,8 @@
- # build types. (PORTME)
- #
- KBUILD_OSES := darwin dos dragonfly freebsd gnukfreebsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
--KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64el mips32 mips64 ia64 hppa32 hppa64 arm alpha sh noarch
--KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64el mips64 ia64 hppa64 alpha
-+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64el mips32 mips64 ia64 hppa32 hppa64 arm arm64 alpha sh noarch
-+KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64el mips64 ia64 hppa64 arm64 alpha
- KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm sh
-
-
---- a/src/lib/kStuff/include/k/kDefs.h
-+++ b/src/lib/kStuff/include/k/kDefs.h
-@@ -194,6 +194,8 @@
- # define K_ARCH K_ARCH_ALPHA
- # elif defined(__arm__) || defined(__arm32__)
- # define K_ARCH K_ARCH_ARM_32
-+# elif defined(__aarch64__)
-+# define K_ARCH K_ARCH_ARM_64
- # elif defined(__hppa__) && defined(__LP64__)
- # define K_ARCH K_ARCH_PARISC_64
- # elif defined(__hppa__)
diff --git a/debian/patches/series b/debian/patches/series
index 94976e0..dca2272 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,3 @@
-#01_gnukfreebsd.diff
-#02_sh4.diff
-#04_armv7l.diff
-#05_hppa-disable-threads.diff
-#06_binutils-gold.diff
+01_gnukfreebsd.diff
07_special-chars-build-path.diff
09_read.c_record_files_SV_33034_Changes_fatal_to_error.patch
-#10_ppc64el.diff
-#11_find-glob.patch
-#12_arm64.diff
--
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