Accepting request 314330 from devel:tools:building

1 OBS-URL: https://build.opensuse.org/request/show/314330 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbuild?expand=0&rev=31
2015-06-30 08:14:38 +00:00 · 2015-06-30 08:14:38 +00:00 · d547b9c4f3
commit d547b9c4f3
parent 483b43f78a fc2349f6b4
9 changed files with 77 additions and 50 deletions
--- a/kbuild-0.1.9998svn2720.tar.bz2
+++ b/kbuild-0.1.9998svn2720.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0383513e176f2b443078bb2fa26cab59025e9978cfc576a7918bed50310c2dec
-size 13658584
--- a/kbuild-0.1.9998svn2784.tar.bz2
+++ b/kbuild-0.1.9998svn2784.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70f255589d5ba3a7b55b6da8b3385778a9cf7b1da8110c3a8d93ec5aeed2a944
+size 14118611
--- a/kbuild-glob.patch
+++ b/kbuild-glob.patch
@ -1,14 +1,26 @@
--- a/src/kmk/dir.c	2013-12-06 18:40:31.882478000 +0100
-+++ b/src/kmk/dir.c	2014-01-17 10:09:40.546258127 +0100
-@@ -1310,7 +1310,11 @@
+---
+ src/kmk/dir.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: kbuild-0.1.9998svn2784/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)
 
 /* Hooks for globbing.  */
 
-+#ifdef KMK
-+#include "glob/glob.h"
-+#else
+-#if defined(KMK) && !defined(__OS2__)
+#if defined(KMK) && !defined(__GLIBC__)
+ # include "glob/glob.h"
+ #else
 #include <glob.h>
-+#endif
- 
- /* Structure describing state of iterating through a directory hash table.  */
- 
+@@ -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
--- a/kbuild-kmk-makefile-am.patch
+++ b/kbuild-kmk-makefile-am.patch
@ -1,11 +0,0 @@
--- a/src/kmk/Makefile.am	2012-06-17 22:45:31.397098000 +0200
-+++ b/src/kmk/Makefile.am	2014-01-17 10:05:13.697343002 +0100
-@@ -52,7 +52,7 @@
- 		strcache2.c \
- 		alloccache.c \
- 		kbuild.c \
-		kbuild-read.c \
-+		kbuild-object.c \
- 		electric.c \
- 		../lib/md5.c \
- 		../lib/kDep.c \
--- a/kbuild-pthread.diff
+++ b/kbuild-pthread.diff
@ -1,8 +1,12 @@
-Index: kbuild-0.1.9998svn2720/Config.kmk
+---
+ Config.kmk |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: kbuild-0.1.9998svn2784/Config.kmk
 ===================================================================
--- kbuild-0.1.9998svn2720.orig/Config.kmk
-+++ kbuild-0.1.9998svn2720/Config.kmk
-@@ -314,7 +314,7 @@ ifndef TEMPLATE_BIN_TOOL
+--- 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
  endif
  ifeq ($(KBUILD_TARGET),linux)
--- a/kbuild-timestamps.diff
+++ b/kbuild-timestamps.diff
@ -1,8 +1,12 @@
-Index: kbuild-0.1.9998svn2720/src/kmk/main.c
+---
+ src/kmk/main.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: kbuild-0.1.9998svn2784/src/kmk/main.c
 ===================================================================
--- kbuild-0.1.9998svn2720.orig/src/kmk/main.c
-+++ kbuild-0.1.9998svn2720/src/kmk/main.c
-@@ -3086,10 +3086,10 @@ print_usage (int bad)
+--- kbuild-0.1.9998svn2784.orig/src/kmk/main.c
+++ kbuild-0.1.9998svn2784/src/kmk/main.c
+@@ -3098,10 +3098,10 @@ print_usage (int bad)
 
 #ifdef KMK
   if (!remote_description || *remote_description == '\0')
@ -15,7 +19,7 @@ Index: kbuild-0.1.9998svn2720/src/kmk/main.c
              KBUILD_HOST, KBUILD_HOST_ARCH, KBUILD_HOST_CPU, remote_description);
 #else  /* !KMK */
   if (!remote_description || *remote_description == '\0')
-@@ -3771,10 +3771,10 @@ print_version (void)
+@@ -3783,10 +3783,10 @@ print_version (void)
 # endif /* !KBUILD_PATH */
 
   if (!remote_description || *remote_description == '\0')
--- a/kbuild.changes
+++ b/kbuild.changes
@ -1,4 +1,19 @@
 -------------------------------------------------------------------
+Fri Jun 26 14:50:13 UTC 2015 - normand@linux.vnet.ibm.com
+
+- Update to version 0.1.9998svn2784:
+  many changes detailed in upstream url from svn 2720 to 2784.
+  http://trac.netlabs.org/kbuild/timeline?from=2015-06-26&daysback=365
+  http://trac.netlabs.org/kbuild/changeset?old_path=%2F&old=2784&new_path=%2F&new=2720
+- Dropped patches:
+  kbuild-kmk-makefile-am.patch
+- Rebased patches:
+  kbuild-glob.patch
+  ppc64le.patch
+  kbuild-timestamps.diff
+  kbuild-pthread.diff
+- All above changes allow to build package for ppc64/ppc64le archs
+-------------------------------------------------------------------
 Fri Jun 12 09:45:46 UTC 2015 - dvaleev@suse.com

 - Rework ppc64le patch. Previous one was totally wrong.
--- a/kbuild.spec
+++ b/kbuild.spec
@ -29,7 +29,7 @@ BuildRequires:  makeinfo
 Summary:        Framework for writing simple makefiles for complex tasks
 License:        GPL-2.0+
 Group:          Development/Tools/Building
-%define _svnrev 2720
+%define _svnrev 2784
 Version:        0.1.9998svn%{_svnrev}
 Release:        0
 Source0:        %{name}-%{version}.tar.bz2
@ -37,8 +37,6 @@ Patch0:         kbuild-man.diff
 # PATCH-FIX-UPSTREAM speilicke@suse.com: Import local implementation if KMK
 Patch1:         kbuild-glob.patch
 Patch2:         kbuild-dummy_noreturn.diff
-# PATCH-FIX-UPSTREAM speilicke@suse.com: Fix filelist
-Patch3:         kbuild-kmk-makefile-am.patch
 Patch5:         kbuild-pthread.diff
 Patch6:         kbuild-timestamps.diff
 Patch7:         kbuild-armv7l.diff
@ -64,7 +62,6 @@ The goals of the kBuild framework:
 %patch0
 %patch1 -p1
 %patch2
-%patch3 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
--- a/ppc64le.patch
+++ b/ppc64le.patch
@ -1,7 +1,13 @@
-Index: kbuild-0.1.9998svn2720/kBuild/env.sh
+---
+ kBuild/env.sh     |    3 +++
+ kBuild/header.kmk |    6 +++---
+ src/lib/k/kDefs.h |   16 ++++++++++------
+ 3 files changed, 16 insertions(+), 9 deletions(-)
+
+Index: kbuild-0.1.9998svn2784/kBuild/env.sh
 ===================================================================
--- kbuild-0.1.9998svn2720.orig/kBuild/env.sh
-+++ kbuild-0.1.9998svn2720/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'
@ -12,10 +18,10 @@ Index: kbuild-0.1.9998svn2720/kBuild/env.sh
         mips32|mips)
             KBUILD_HOST_ARCH='mips32'
             ;;
-Index: kbuild-0.1.9998svn2720/kBuild/header.kmk
+Index: kbuild-0.1.9998svn2784/kBuild/header.kmk
 ===================================================================
--- kbuild-0.1.9998svn2720.orig/kBuild/header.kmk
-+++ kbuild-0.1.9998svn2720/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
 # build types. (PORTME)
 #
@ -27,19 +33,19 @@ Index: kbuild-0.1.9998svn2720/kBuild/header.kmk
 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)
+@@ -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 ppc64le s390x sparc64)
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-   KBUILD_DEVTOOLS_TRG_ALT = $(PATH_DEVTOOLS)/$(KBUILD_TARGET).x86
+   KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86
  else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
-Index: kbuild-0.1.9998svn2720/src/lib/k/kDefs.h
+Index: kbuild-0.1.9998svn2784/src/lib/k/kDefs.h
 ===================================================================
--- kbuild-0.1.9998svn2720.orig/src/lib/k/kDefs.h
-+++ kbuild-0.1.9998svn2720/src/lib/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)
 /** 64-bit PowerPC. */