Mon Sep 18 23:07:49 2017 UTC ()
u-boot: fix build on macos


(jmcneill)
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-Kconfig
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-tools_Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/distinfo 2017/09/09 23:21:29 1.4
+++ pkgsrc/sysutils/u-boot/distinfo 2017/09/18 23:07:49 1.5
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.4 2017/09/09 23:21:29 jmcneill Exp $ 1$NetBSD: distinfo,v 1.5 2017/09/18 23:07:49 jmcneill Exp $
2 2
3SHA1 (u-boot-2017.07.tar.bz2) = 517c33f41e2969f3b5b88e9ae3c042acfe1bde05 3SHA1 (u-boot-2017.07.tar.bz2) = 517c33f41e2969f3b5b88e9ae3c042acfe1bde05
4RMD160 (u-boot-2017.07.tar.bz2) = b0d83a55b6daabdec28d85fdfb814a529c8d5eb9 4RMD160 (u-boot-2017.07.tar.bz2) = b0d83a55b6daabdec28d85fdfb814a529c8d5eb9
5SHA512 (u-boot-2017.07.tar.bz2) = 821175dd414e1fd0e5b6d9293a5766cbc8ae63a2361e82309f67e92c02b881263a7832dba0bcfc820b036a582981ddc20a8f484f2995d110f3240907a3ff7a95 5SHA512 (u-boot-2017.07.tar.bz2) = 821175dd414e1fd0e5b6d9293a5766cbc8ae63a2361e82309f67e92c02b881263a7832dba0bcfc820b036a582981ddc20a8f484f2995d110f3240907a3ff7a95
6Size (u-boot-2017.07.tar.bz2) = 11282262 bytes 6Size (u-boot-2017.07.tar.bz2) = 11282262 bytes
 7SHA1 (patch-Kconfig) = 7e572929f220af5af6e709fc9493d0aa17bfbea1
7SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9 8SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
8SHA1 (patch-drivers_video_sunxi_sunxi__de2.c) = 0e1ff9965703ef18c5e6a54a858217ad99617ea6 9SHA1 (patch-drivers_video_sunxi_sunxi__de2.c) = 0e1ff9965703ef18c5e6a54a858217ad99617ea6
9SHA1 (patch-include_configs_sunxi-common.h) = b71c28480cc084860d63e95af33bc7eead8ac6ac 10SHA1 (patch-include_configs_sunxi-common.h) = b71c28480cc084860d63e95af33bc7eead8ac6ac
10SHA1 (patch-lib_bch.c) = e346680a94696713f6d0e71e965283b9bdfbbdbf 11SHA1 (patch-lib_bch.c) = 2e20f6d65a736b474859ef3ee840aae05452c6f4
 12SHA1 (patch-tools_Makefile) = adc5082d369363113135d5c892822b57ee80ff19
File Added: pkgsrc/sysutils/u-boot/patches/Attic/patch-Kconfig
$NetBSD: patch-Kconfig,v 1.1 2017/09/18 23:07:49 jmcneill Exp $

--- Kconfig.orig	2017-07-10 17:07:38.000000000 +0000
+++ Kconfig
@@ -367,5 +367,3 @@ source "fs/Kconfig"
 source "lib/Kconfig"
 
 source "test/Kconfig"
-
-source "scripts/Kconfig"
File Added: pkgsrc/sysutils/u-boot/patches/Attic/patch-tools_Makefile
$NetBSD: patch-tools_Makefile,v 1.1 2017/09/18 23:07:49 jmcneill Exp $

--- tools/Makefile.orig	2017-07-10 17:07:38.000000000 +0000
+++ tools/Makefile
@@ -69,7 +69,7 @@ LIBFDT_CSRCS := fdt.c fdt_ro.c fdt_wip.c
 # Fatal error: can't create build/temp.linux-x86_64-2.7/../lib/libfdt/fdt.o:
 #    No such file or directory
 # To fix this, use an absolute path.
-libfdt_tree := $(shell readlink -f $(srctree)/lib/libfdt)
+libfdt_tree := $(realpath $(srctree)/lib/libfdt)
 
 LIBFDT_SRCS := $(addprefix $(libfdt_tree)/, $(LIBFDT_CSRCS))
 LIBFDT_SWIG := $(addprefix $(libfdt_tree)/, pylibfdt/libfdt.i)
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c 2017/08/12 16:44:33 1.1
+++ pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c 2017/09/18 23:07:49 1.2
@@ -1,13 +1,37 @@ @@ -1,13 +1,37 @@
1$NetBSD: patch-lib_bch.c,v 1.1 2017/08/12 16:44:33 jmcneill Exp $ 1$NetBSD: patch-lib_bch.c,v 1.2 2017/09/18 23:07:49 jmcneill Exp $
2 2
3--- lib/bch.c.orig 2017-07-10 17:07:38.000000000 +0000 3--- lib/bch.c.orig 2017-07-10 17:07:38.000000000 +0000
4+++ lib/bch.c 4+++ lib/bch.c
5@@ -61,7 +61,7 @@ 5@@ -61,8 +61,10 @@
6 #include <linux/bitops.h> 6 #include <linux/bitops.h>
7 #else 7 #else
8 #include <errno.h> 8 #include <errno.h>
9-#if defined(__FreeBSD__) 9-#if defined(__FreeBSD__)
10+#if defined(__FreeBSD__) || defined(__NetBSD__) 10+#if defined(__FreeBSD__) || defined(__NetBSD__)
11 #include <sys/endian.h> 11 #include <sys/endian.h>
 12+#elif defined(__APPLE__)
 13+#include <machine/endian.h>
12 #else 14 #else
13 #include <endian.h> 15 #include <endian.h>
 16 #endif
 17@@ -71,7 +73,11 @@
 18 #include <string.h>
 19
 20 #undef cpu_to_be32
 21+#if defined(__APPLE__)
 22+#define cpu_to_be32 htonl
 23+#else
 24 #define cpu_to_be32 htobe32
 25+#endif
 26 #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
 27 #define kmalloc(size, flags) malloc(size)
 28 #define kzalloc(size, flags) calloc(1, size)
 29@@ -117,7 +123,7 @@ struct gf_poly_deg1 {
 30 };
 31
 32 #ifdef USE_HOSTCC
 33-#ifndef __BSD_VISIBLE
 34+#if !defined(__BSD_VISIBLE) && !defined(__APPLE__)
 35 static int fls(int x)
 36 {
 37 int r = 32;