[pkgsrc/trunk]: pkgsrc/sysutils/u-boot Make depending on u-boot for Meson-bas...

[thorpej <thorpej%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6716d252f5b2
branches:  trunk
changeset: 333976:6716d252f5b2
user:      thorpej <thorpej%pkgsrc.org@localhost>
date:      Sat May 18 18:01:34 2019 +0000

description:
Make depending on u-boot for Meson-based boards optional, as they have
build-time dependencies not available on all platforms.

diffstat:

 sysutils/u-boot/Makefile   |  16 ++++++++++++----
 sysutils/u-boot/options.mk |  16 ++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diffs (72 lines):

diff -r bc9c7ab6b99e -r 6716d252f5b2 sysutils/u-boot/Makefile
--- a/sysutils/u-boot/Makefile  Sat May 18 17:55:32 2019 +0000
+++ b/sysutils/u-boot/Makefile  Sat May 18 18:01:34 2019 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2019/05/07 14:05:36 thorpej Exp $
+# $NetBSD: Makefile,v 1.12 2019/05/18 18:01:34 thorpej Exp $
 #
 
 .include "../../sysutils/u-boot/u-boot-version.mk"
 
 DISTNAME=      u-boot-${UBOOT_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    meta-pkgs sysutils u-boot
 MASTER_SITES=  # empty
 
@@ -12,6 +12,11 @@
 HOMEPAGE=      https://www.denx.de/wiki/U-Boot
 COMMENT=       Das U-Boot, the Universal Boot Loader (meta-package)
 
+META_PACKAGE=  yes
+
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+
 DEPENDS+=      u-boot-a10-olinuxino-lime-[0-9]*:../../sysutils/u-boot-a10-olinuxino-lime
 DEPENDS+=      u-boot-bananapi-m3-[0-9]*:../../sysutils/u-boot-bananapi-m3
 DEPENDS+=      u-boot-bananapi-[0-9]*:../../sysutils/u-boot-bananapi
@@ -29,11 +34,16 @@
 DEPENDS+=      u-boot-jetson-tk1-[0-9]*:../../sysutils/u-boot-jetson-tk1
 DEPENDS+=      u-boot-jetson-tx1-[0-9]*:../../sysutils/u-boot-jetson-tx1
 DEPENDS+=      u-boot-jetson-tx2-[0-9]*:../../sysutils/u-boot-jetson-tx2
+.if !empty(PKG_OPTIONS:Mamlogic-meson)
 DEPENDS+=      u-boot-libretech-cc-[0-9]*:../../sysutils/u-boot-libretech-cc
+.endif
 DEPENDS+=      u-boot-nanopi-m1-[0-9]*:../../sysutils/u-boot-nanopi-m1
 DEPENDS+=      u-boot-nanopi-neo-plus2-[0-9]*:../../sysutils/u-boot-nanopi-neo-plus2
 DEPENDS+=      u-boot-nanopi-neo-[0-9]*:../../sysutils/u-boot-nanopi-neo
 DEPENDS+=      u-boot-nanopi-neo2-[0-9]*:../../sysutils/u-boot-nanopi-neo2
+.if !empty(PKG_OPTIONS:Mamlogic-meson)
+DEPENDS+=      u-boot-odroid-c2-[0-9]*:../../sysutils/u-boot-odroid-c2
+.endif
 DEPENDS+=      u-boot-odroid-xu3-[0-9]*:../../sysutils/u-boot-odroid-xu3
 DEPENDS+=      u-boot-orangepi-2-[0-9]*:../../sysutils/u-boot-orangepi-2
 DEPENDS+=      u-boot-orangepi-one-[0-9]*:../../sysutils/u-boot-orangepi-one
@@ -46,6 +56,4 @@
 DEPENDS+=      u-boot-pocketchip-[0-9]*:../../sysutils/u-boot-pocketchip
 DEPENDS+=      u-boot-sopine-baseboard-[0-9]*:../../sysutils/u-boot-sopine-baseboard
 
-META_PACKAGE=  yes
-
 .include "../../mk/bsd.pkg.mk"
diff -r bc9c7ab6b99e -r 6716d252f5b2 sysutils/u-boot/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot/options.mk        Sat May 18 18:01:34 2019 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2019/05/18 18:01:34 thorpej Exp $
+
+#
+# u-boot meta-package options:
+#
+# amlogic-meson:
+# Build u-boot for boards based on Amlogic Meson SoCs.  Disabled by
+# default because these u-boot packages require amlogic-meson-fwtools
+# to build.
+#
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.u-boot
+PKG_SUPPORTED_OPTIONS= amlogic-meson
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"