CVS commit: pkgsrc/sysutils/u-boot

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sat Aug 12 16:44:33 UTC 2017

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo u-boot.mk
Added Files:
        pkgsrc/sysutils/u-boot/patches: patch-lib_bch.c

Log Message:
Fixes to get U-Boot building on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot/distinfo \
    pkgsrc/sysutils/u-boot/u-boot.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot/distinfo
diff -u pkgsrc/sysutils/u-boot/distinfo:1.1 pkgsrc/sysutils/u-boot/distinfo:1.2
--- pkgsrc/sysutils/u-boot/distinfo:1.1 Sat Aug 12 14:23:43 2017
+++ pkgsrc/sysutils/u-boot/distinfo     Sat Aug 12 16:44:33 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2017/08/12 14:23:43 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2017/08/12 16:44:33 jmcneill Exp $
 
 SHA1 (u-boot-2017.07.tar.bz2) = 517c33f41e2969f3b5b88e9ae3c042acfe1bde05
 RMD160 (u-boot-2017.07.tar.bz2) = b0d83a55b6daabdec28d85fdfb814a529c8d5eb9
 SHA512 (u-boot-2017.07.tar.bz2) = 821175dd414e1fd0e5b6d9293a5766cbc8ae63a2361e82309f67e92c02b881263a7832dba0bcfc820b036a582981ddc20a8f484f2995d110f3240907a3ff7a95
 Size (u-boot-2017.07.tar.bz2) = 11282262 bytes
+SHA1 (patch-lib_bch.c) = e346680a94696713f6d0e71e965283b9bdfbbdbf
Index: pkgsrc/sysutils/u-boot/u-boot.mk
diff -u pkgsrc/sysutils/u-boot/u-boot.mk:1.1 pkgsrc/sysutils/u-boot/u-boot.mk:1.2
--- pkgsrc/sysutils/u-boot/u-boot.mk:1.1        Sat Aug 12 14:23:43 2017
+++ pkgsrc/sysutils/u-boot/u-boot.mk    Sat Aug 12 16:44:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: u-boot.mk,v 1.1 2017/08/12 14:23:43 jmcneill Exp $
+# $NetBSD: u-boot.mk,v 1.2 2017/08/12 16:44:33 jmcneill Exp $
 
 UBOOT_VERSION?=        2017.07
 PKGNAME=       u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
@@ -6,17 +6,28 @@ DISTNAME?=    u-boot-${UBOOT_VERSION}
 DISTINFO_FILE?=        ${.CURDIR}/../../sysutils/u-boot/distinfo
 CATEGORIES=    sysutils
 EXTRACT_SUFX=  .tar.bz2
+PATCHDIR=      ${.CURDIR}/../../sysutils/u-boot/patches
 
 HOMEPAGE?=     https://www.denx.de/wiki/U-Boot
 MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/
 
-BUILD_DEPENDS+=        dtc>=1.4.2:../../sysutils/dtc
+TOOL_DEPENDS+= dtc>=1.4.2:../../sysutils/dtc
+TOOL_DEPENDS+= swig>=1.3:../../devel/swig
 
 COMMENT=       Das U-Boot, the Universal Boot Loader (${UBOOT_CONFIG})
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            gmake gsed pkg-config
+PYTHON_FOR_BUILD_ONLY= yes
+
+REPLACE_INTERPRETER+=  python2
+REPLACE.python2.old=   .*/usr/bin/env.*python2*
+REPLACE.python2.new=   ${PYTHONBIN}
+REPLACE_FILES.python2= scripts/fill_scrapyard.py \
+                       tools/binman/binman.py \
+                       tools/genboardscfg.py \
+                       tools/moveconfig.py
 
 MAKE_ENV+=     ${UBOOT_ENV}
 
@@ -33,4 +44,5 @@ do-install:
            ${DESTDIR}${PREFIX}/share/u-boot/${UBOOT_TARGET}
 .endfor
 
+.include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c:1.1
--- /dev/null   Sat Aug 12 16:44:33 2017
+++ pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c      Sat Aug 12 16:44:33 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_bch.c,v 1.1 2017/08/12 16:44:33 jmcneill Exp $
+
+--- lib/bch.c.orig     2017-07-10 17:07:38.000000000 +0000
++++ lib/bch.c
+@@ -61,7 +61,7 @@
+ #include <linux/bitops.h>
+ #else
+ #include <errno.h>
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/endian.h>
+ #else
+ #include <endian.h>