diff --git a/aarch64.patch b/aarch64.patch index 60835f0..1f85ae9 100644 --- a/aarch64.patch +++ b/aarch64.patch @@ -1,8 +1,10 @@ ---- a/kBuild/env.sh -+++ b/kBuild/env.sh -@@ -371,6 +371,9 @@ - alpha) - KBUILD_HOST_ARCH='alpha' +Index: kbuild-0.1.9998svn3110/kBuild/env.sh +=================================================================== +--- kbuild-0.1.9998svn3110.orig/kBuild/env.sh ++++ kbuild-0.1.9998svn3110/kBuild/env.sh +@@ -395,6 +395,9 @@ if test -z "$KBUILD_HOST_ARCH"; then + sparc64|sparcv9) + KBUILD_HOST_ARCH='sparc64' ;; + aarch64) + KBUILD_HOST_ARCH='aarch64' @@ -10,34 +12,41 @@ *) echo "$0: unknown cpu/arch - $KBUILD_HOST_ARCH" 1>&${ERR_REDIR} sleep 1 ---- a/kBuild/header.kmk -+++ b/kBuild/header.kmk -@@ -189,8 +189,8 @@ +Index: kbuild-0.1.9998svn3110/kBuild/header.kmk +=================================================================== +--- kbuild-0.1.9998svn3110.orig/kBuild/header.kmk ++++ kbuild-0.1.9998svn3110/kBuild/header.kmk +@@ -197,8 +197,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 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm alpha noarch --KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha -+KBUILD_ARCHES := x86 amd64 sparc32 sparc64 s390 s390x ppc32 ppc64 ppc64le mips32 mips64 ia64 hppa32 hppa64 arm aarch64 alpha noarch -+KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 aarch64 alpha - KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm + KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic +-KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k ppc64le mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 +-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 ppc64le mips64 ppc64 s390x sh64 sparc64 ++KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k ppc64le mips32 mips64 ppc32 ppc64 s390 s390x aarch64 sh32 sh64 sparc32 sparc64 ++KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 ppc64le mips64 ppc64 s390x aarch64 sh64 sparc64 + KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 ---- a/src/lib/k/kDefs.h -+++ b/src/lib/k/kDefs.h -@@ -146,6 +146,8 @@ - #define K_ARCH_ARM_32 ( 7 | K_ARCH_BIT_32 | K_ARCH_END_BI) - /** 64-bit ARM. */ - #define K_ARCH_ARM_64 ( 8 | K_ARCH_BIT_64 | K_ARCH_END_BI) +Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h +=================================================================== +--- kbuild-0.1.9998svn3110.orig/src/lib/kStuff/include/k/kDefs.h ++++ kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h +@@ -160,6 +160,8 @@ + #define K_ARCH_ARM_64 ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI) + /** Motorola 68000 (32-bit). */ + #define K_ARCH_M68K ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG) +/** 64-bit AARCH. */ +#define K_ARCH_AARCH_64 ( 8 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE) /** 32-bit MIPS. */ - #define K_ARCH_MIPS_32 ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI) + #define K_ARCH_MIPS_32 ( 7 | K_ARCH_BIT_32 | K_ARCH_END_BI) /** 64-bit MIPS. */ -@@ -188,6 +190,8 @@ +@@ -206,8 +208,10 @@ # define K_ARCH K_ARCH_ALPHA # elif defined(__arm__) || defined(__arm32__) # define K_ARCH K_ARCH_ARM_32 +-# elif defined(__aarch64__) || defined(__arm64__) ++# elif defined(__arm64__) + # define K_ARCH K_ARCH_ARM_64 +# elif defined(__aarch64__) +# define K_ARCH K_ARCH_AARCH_64 # elif defined(__hppa__) && defined(__LP64__) diff --git a/kbuild-0.1.9998svn2814.tar.bz2 b/kbuild-0.1.9998svn2814.tar.bz2 deleted file mode 100644 index 53fa5cd..0000000 --- a/kbuild-0.1.9998svn2814.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd7dbb8f922c77b289a63e491e7255d9c93b97ea912b7104e3813b50ac1ca3a2 -size 14085128 diff --git a/kbuild-0.1.9998svn3110.tar.bz2 b/kbuild-0.1.9998svn3110.tar.bz2 new file mode 100644 index 0000000..3f5d462 --- /dev/null +++ b/kbuild-0.1.9998svn3110.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dda4308a1c5b2f65ccf949d3877ef5249c3b3e184feb5427def8f4b6ee74e807 +size 33183482 diff --git a/kbuild-armv7l.diff b/kbuild-armv7l.diff index b393065..c94945f 100644 --- a/kbuild-armv7l.diff +++ b/kbuild-armv7l.diff @@ -1,13 +1,13 @@ -Index: kbuild-0.1.9998svn2720/kBuild/env.sh +Index: kbuild-0.1.9998svn3110/kBuild/env.sh =================================================================== ---- kbuild-0.1.9998svn2720.orig/kBuild/env.sh -+++ kbuild-0.1.9998svn2720/kBuild/env.sh -@@ -362,7 +362,7 @@ if test -z "$KBUILD_HOST_ARCH"; then +--- kbuild-0.1.9998svn3110.orig/kBuild/env.sh ++++ kbuild-0.1.9998svn3110/kBuild/env.sh +@@ -356,7 +356,7 @@ if test -z "$KBUILD_HOST_ARCH"; then hppa64|parisc64) KBUILD_HOST_ARCH='hppa64' ;; -- arm|armv4l|armv5tel|armv5tejl) -+ arm|armv4l|armv5tel|armv5tejl|armv7l) - KBUILD_HOST_ARCH='arm' +- ia64) ++ ia64|armv7l) + KBUILD_HOST_ARCH='ia64' ;; - alpha) + ppc32|ppc|powerpc) diff --git a/kbuild-gcc7.patch b/kbuild-gcc7.patch index 5cada96..473a0f4 100644 --- a/kbuild-gcc7.patch +++ b/kbuild-gcc7.patch @@ -1,14 +0,0 @@ -Index: kbuild-0.1.9998svn2814/src/kash/mystring.h -=================================================================== ---- kbuild-0.1.9998svn2814.orig/src/kash/mystring.h -+++ kbuild-0.1.9998svn2814/src/kash/mystring.h -@@ -44,9 +44,7 @@ void scopyn(const char *, char *, ssize_ - int prefix(const char *, const char *); - int number(struct shinstance *, const char *); - int is_number(const char *); --#ifdef _MSC_VER - size_t strlcpy(char *dst, const char *src, size_t siz); --#endif - - #define equal(s1, s2) (strcmp(s1, s2) == 0) - #define scopy(s1, s2) ((void)strcpy(s2, s1)) diff --git a/kbuild-glob.patch b/kbuild-glob.patch index c0beb8a..b0454d8 100644 --- a/kbuild-glob.patch +++ b/kbuild-glob.patch @@ -1,26 +1,23 @@ +--- + --- src/kmk/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: kbuild-0.1.9998svn2784/src/kmk/dir.c +Index: kbuild-0.1.9998svn3110/src/kmk/dir.c =================================================================== ---- kbuild-0.1.9998svn2784.orig/src/kmk/dir.c -+++ kbuild-0.1.9998svn2784/src/kmk/dir.c -@@ -1310,7 +1310,7 @@ print_dir_data_base (void) +--- kbuild-0.1.9998svn3110.orig/src/kmk/dir.c ++++ kbuild-0.1.9998svn3110/src/kmk/dir.c +@@ -1340,8 +1340,11 @@ void print_dir_stats (void) /* Hooks for globbing. */ --#if defined(KMK) && !defined(__OS2__) +#if defined(KMK) && !defined(__GLIBC__) - # include "glob/glob.h" - #else ++# include "glob/glob.h" ++#else #include -@@ -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(KMK) && !defined(__GLIBC__) - gl->gl_exists = file_exists_p; - gl->gl_isdir = dir_exists_p; - #endif +- ++#endif + /* Structure describing state of iterating through a directory hash table. */ + + struct dirstream diff --git a/kbuild-pthread.diff b/kbuild-pthread.diff index ef3d3dd..b240674 100644 --- a/kbuild-pthread.diff +++ b/kbuild-pthread.diff @@ -2,16 +2,16 @@ Config.kmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: kbuild-0.1.9998svn2784/Config.kmk +Index: kbuild-0.1.9998svn3110/Config.kmk =================================================================== ---- kbuild-0.1.9998svn2784.orig/Config.kmk -+++ kbuild-0.1.9998svn2784/Config.kmk -@@ -330,7 +330,7 @@ ifndef TEMPLATE_BIN_TOOL - TEMPLATE_BIN_INCS += $(PATH_GNUMAKE_SRC)/glob /usr/local/include +--- kbuild-0.1.9998svn3110.orig/Config.kmk ++++ kbuild-0.1.9998svn3110/Config.kmk +@@ -340,7 +340,7 @@ else # !os2, !win, !nt + TEMPLATE_BIN_INCS += $(PATH_GNUMAKE_SRC)/glob /usr/local/include + endif + ifeq ($(KBUILD_TARGET),linux) +- TEMPLATE_BIN_LIBS += rt ++ TEMPLATE_BIN_LIBS += rt pthread + endif endif - ifeq ($(KBUILD_TARGET),linux) -- TEMPLATE_BIN_LIBS += rt -+ TEMPLATE_BIN_LIBS += rt pthread - endif - TEMPLATE_BIN_CFLAGS.x86 += -m32 - TEMPLATE_BIN_CFLAGS.sparc32 += -m32 + diff --git a/kbuild-wrong-memset.patch b/kbuild-wrong-memset.patch index eb34a9d..7661991 100644 --- a/kbuild-wrong-memset.patch +++ b/kbuild-wrong-memset.patch @@ -1,12 +1,12 @@ -Index: kbuild-0.1.9998svn2543/src/lib/md5.c +Index: kbuild-0.1.9998svn3110/src/lib/md5.c =================================================================== ---- kbuild-0.1.9998svn2543.orig/src/lib/md5.c -+++ kbuild-0.1.9998svn2543/src/lib/md5.c +--- kbuild-0.1.9998svn3110.orig/src/lib/md5.c ++++ kbuild-0.1.9998svn3110/src/lib/md5.c @@ -144,7 +144,7 @@ void MD5Final(unsigned char digest[16], MD5Transform(ctx->buf, (uint32 *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memcpy(digest, ctx->buf, 16); -- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ +- memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(struct MD5Context)); /* In case it's sensitive */ } diff --git a/kbuild.changes b/kbuild.changes index bafa4a6..def044e 100644 --- a/kbuild.changes +++ b/kbuild.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Oct 22 00:43:39 UTC 2017 - Larry.Finger@lwfinger.net + +- Update to version 0.1.9998svn3110. VirtualBox 5.2.0 needs this one to build. + Changes detailed in upstream url from svn 2815 to 3110. +- Rebased patches +- Removed test for openSUSE 12.3 from spec file. + ------------------------------------------------------------------- Wed May 17 16:38:25 UTC 2017 - dimstar@opensuse.org diff --git a/kbuild.spec b/kbuild.spec index 7340ed7..be13e85 100644 --- a/kbuild.spec +++ b/kbuild.spec @@ -23,13 +23,11 @@ BuildRequires: automake BuildRequires: bison BuildRequires: flex BuildRequires: libacl-devel -%if %suse_version >= 1230 BuildRequires: makeinfo -%endif Summary: Framework for writing simple makefiles for complex tasks License: GPL-2.0+ Group: Development/Tools/Building -%define _svnrev 2814 +%define _svnrev 3110 Version: 0.1.9998svn%{_svnrev} Release: 0 Source0: %{name}-%{version}.tar.bz2 diff --git a/ppc64le.patch b/ppc64le.patch index 4828550..74a2655 100644 --- a/ppc64le.patch +++ b/ppc64le.patch @@ -4,13 +4,13 @@ src/lib/k/kDefs.h | 16 ++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) -Index: kbuild-0.1.9998svn2784/kBuild/env.sh +Index: kbuild-0.1.9998svn3110/kBuild/env.sh =================================================================== ---- kbuild-0.1.9998svn2784.orig/kBuild/env.sh -+++ kbuild-0.1.9998svn2784/kBuild/env.sh -@@ -347,6 +347,9 @@ if test -z "$KBUILD_HOST_ARCH"; then - ppc64|powerpc64) - KBUILD_HOST_ARCH='ppc64' +--- kbuild-0.1.9998svn3110.orig/kBuild/env.sh ++++ kbuild-0.1.9998svn3110/kBuild/env.sh +@@ -368,6 +368,9 @@ if test -z "$KBUILD_HOST_ARCH"; then + m68k) + KBUILD_HOST_ARCH='m68k' ;; + ppc64le|powerpc64le) + KBUILD_HOST_ARCH='ppc64le' @@ -18,22 +18,22 @@ Index: kbuild-0.1.9998svn2784/kBuild/env.sh mips32|mips) KBUILD_HOST_ARCH='mips32' ;; -Index: kbuild-0.1.9998svn2784/kBuild/header.kmk +Index: kbuild-0.1.9998svn3110/kBuild/header.kmk =================================================================== ---- kbuild-0.1.9998svn2784.orig/kBuild/header.kmk -+++ kbuild-0.1.9998svn2784/kBuild/header.kmk -@@ -189,8 +189,8 @@ KBUILD_BLD_TYPES := release profile debu +--- kbuild-0.1.9998svn3110.orig/kBuild/header.kmk ++++ kbuild-0.1.9998svn3110/kBuild/header.kmk +@@ -197,8 +197,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 noarch --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 noarch -+KBUILD_ARCHES_64 := amd64 sparc64 s390x ppc64 ppc64le mips64 ia64 hppa64 alpha - KBUILD_ARCHES_32 := x86 sparc32 s390 ppc32 mips32 hppa32 arm + KBUILD_OSES := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic +-KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 +-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64 ++KBUILD_ARCHES := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k ppc64le mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 ++KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 ppc64le mips64 ppc64 s390x sh64 sparc64 + KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32 -@@ -481,7 +481,7 @@ endif +@@ -515,7 +515,7 @@ endif KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH) @@ -42,35 +42,39 @@ Index: kbuild-0.1.9998svn2784/kBuild/header.kmk ifeq ($(KBUILD_TARGET_ARCH),amd64) KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86 else ifeq ($(KBUILD_TARGET_ARCH),hppa64) -Index: kbuild-0.1.9998svn2784/src/lib/k/kDefs.h +Index: kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h =================================================================== ---- kbuild-0.1.9998svn2784.orig/src/lib/k/kDefs.h -+++ kbuild-0.1.9998svn2784/src/lib/k/kDefs.h -@@ -158,16 +158,18 @@ - #define K_ARCH_POWERPC_32 (13 | K_ARCH_BIT_32 | K_ARCH_END_BI) +--- kbuild-0.1.9998svn3110.orig/src/lib/kStuff/include/k/kDefs.h ++++ kbuild-0.1.9998svn3110/src/lib/kStuff/include/k/kDefs.h +@@ -172,20 +172,22 @@ + #define K_ARCH_POWERPC_32 ( 9 | 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) + #define K_ARCH_POWERPC_64 ( 9 | 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 (10 | 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 (10 | K_ARCH_BIT_64 | K_ARCH_END_BIG) +#define K_ARCH_S390_64 (17 | K_ARCH_BIT_64 | K_ARCH_END_BIG) + /** 32-bit SuperH. */ + #define K_ARCH_SH_32 (11 | K_ARCH_BIT_32 | K_ARCH_END_BI) + /** 64-bit SuperH. */ + #define K_ARCH_SH_64 (11 | K_ARCH_BIT_64 | K_ARCH_END_BI) /** 32-bit SPARC. */ --#define K_ARCH_SPARC_32 (17 | K_ARCH_BIT_32 | K_ARCH_END_BIG) +-#define K_ARCH_SPARC_32 (12 | 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 (12 | 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 (12+1) +#define K_ARCH_MAX (20) /** @} */ -@@ -194,8 +196,10 @@ +@@ -216,8 +218,10 @@ # define K_ARCH K_ARCH_MIPS_64 # elif defined(__mips__) # define K_ARCH K_ARCH_MIPS_32