On 2017/05/05 14:33, Jonathan Gray wrote:
> On Mon, May 01, 2017 at 11:23:22PM +1000, Jonathan Gray wrote:
> > On Mon, May 01, 2017 at 01:58:05PM +0100, Stuart Henderson wrote:
> > > On 2017/05/01 22:26, Jonathan Gray wrote:
> > > > Update dtb to linux 4.11.
> > > >
> > > > This also switches from the gcc4 module to clang. Base gcc can't be
> > > > used as gcc 4.2 cpp can't handle whitespace between '#' and 'include'.
> > >
> > > Whitespace between # and include is ok, that's very common (usually for
> > > nested ifdefs). The problem here is that the # isn't in the first column.
> >
> > Ah right, was a while ago now.
> >
> > >
> > > Changing to the clang module doesn't work, ecpp is called directly in
> > > do-build.
> > >
> >
> > Oops. gcc and clang modules don't do cpp links so here is an updated
> > diff with ecpp -> clang-cpp, though that is going to prefer a base
> > clang-cpp over ports clang-cpp. Should clang.port.mk be changed to
> > create a cpp link instead?
>
> This will use base clang-cpp on arm64 and ports clang-cpp
> elsewhere.
>
> CLANG_ARCHS (from ports/infrastructure/mk/arch-defines.mk) being the
> list of archs where cc is CLANG differing from CLANG_ARCH
> (src/share/mk/bsd.own.mk), the list of archs where clang is built.
OK.
Though as far as ports compilers go, gcc4 is a lighter dependency
(and works on more arches) than clang so I might have a think about
how else this can be done after it's in..
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/dtb/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile 20 Feb 2017 07:03:42 -0000 1.6
> +++ Makefile 5 May 2017 04:16:35 -0000
> @@ -1,7 +1,9 @@
> # $OpenBSD: Makefile,v 1.6 2017/02/20 07:03:42 jsg Exp $
>
> +ONLY_FOR_ARCHS= ${GCC4_ARCHS} ${CLANG_ARCHS}
> +
> COMMENT= Device Tree Blobs
> -DISTNAME= linux-4.10
> +DISTNAME= linux-4.11
> PKGNAME= ${DISTNAME:S/linux/dtb/}
> CATEGORIES= sysutils
> HOMEPAGE= http://www.devicetree.org
> @@ -14,8 +16,8 @@ MASTER_SITES= https://cdn.kernel.org/pub
> EXTRACT_SUFX= .tar.xz
> PKG_ARCH= *
>
> -MODULES= gcc4
> -MODGCC4_ARCHS= *
> +MODULES= lang/clang
> +MODCLANG_ARCHS= ${GCC4_ARCHS}
> BUILD_DEPENDS= devel/dtc
> NO_TEST= Yes
>
> @@ -27,7 +29,7 @@ do-build:
> for vendor in `find . -type d ! -name include` ; do \
> cd ${WRKSRC}/arch/${ARCH}/boot/dts/$$vendor ; \
> for dts in `ls *.dts` ; do \
> - ecpp -nostdinc -I . -I include -I${WRKSRC}/include \
> + clang-cpp -nostdinc -I . -I include -I${WRKSRC}/include \
> -undef -D__DTS__ -x assembler-with-cpp $$dts \
> | dtc -I dts -O dtb -o `echo "$$dts" \
> | sed -e 's/\.dts$$/\.dtb/'` - ; \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/dtb/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 20 Feb 2017 07:03:42 -0000 1.5
> +++ distinfo 1 May 2017 11:46:57 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (linux-4.10.tar.xz) = PJXZ8Em9CF5cNG0sd/BjuEJfGRRg/NOun+fpTgR33Es=
> -SIZE (linux-4.10.tar.xz) = 94231404
> +SHA256 (linux-4.11.tar.xz) = tn7K/QpCszg79NgvCFDL/5Kn5yohWm0C9C3br89Cp9Y=
> +SIZE (linux-4.11.tar.xz) = 95447768
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/dtb/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 20 Feb 2017 07:03:42 -0000 1.5
> +++ pkg/PLIST 1 May 2017 11:50:32 -0000
> @@ -9,7 +9,9 @@ share/dtb/arm/am335x-baltos-ir3220.dtb
> share/dtb/arm/am335x-baltos-ir5221.dtb
> share/dtb/arm/am335x-base0033.dtb
> share/dtb/arm/am335x-bone.dtb
> +share/dtb/arm/am335x-boneblack-wireless.dtb
> share/dtb/arm/am335x-boneblack.dtb
> +share/dtb/arm/am335x-bonegreen-wireless.dtb
> share/dtb/arm/am335x-bonegreen.dtb
> share/dtb/arm/am335x-chiliboard.dtb
> share/dtb/arm/am335x-cm-t335.dtb
> @@ -19,6 +21,7 @@ share/dtb/arm/am335x-icev2.dtb
> share/dtb/arm/am335x-lxm.dtb
> share/dtb/arm/am335x-nano.dtb
> share/dtb/arm/am335x-pepper.dtb
> +share/dtb/arm/am335x-phycore-rdk.dtb
> share/dtb/arm/am335x-sbc-t335.dtb
> share/dtb/arm/am335x-shc.dtb
> share/dtb/arm/am335x-sl50.dtb
> @@ -67,6 +70,8 @@ share/dtb/arm/armada-385-db-ap.dtb
> share/dtb/arm/armada-385-linksys-caiman.dtb
> share/dtb/arm/armada-385-linksys-cobra.dtb
> share/dtb/arm/armada-385-turris-omnia.dtb
> +share/dtb/arm/armada-388-clearfog-base.dtb
> +share/dtb/arm/armada-388-clearfog-pro.dtb
> share/dtb/arm/armada-388-clearfog.dtb
> share/dtb/arm/armada-388-db.dtb
> share/dtb/arm/armada-388-gp.dtb
> @@ -75,6 +80,8 @@ share/dtb/arm/armada-390-db.dtb
> share/dtb/arm/armada-395-gp.dtb
> share/dtb/arm/armada-398-db.dtb
> share/dtb/arm/armada-xp-axpwifiap.dtb
> +share/dtb/arm/armada-xp-db-dxbc2.dtb
> +share/dtb/arm/armada-xp-db-xc3-24g4xg.dtb
> share/dtb/arm/armada-xp-db.dtb
> share/dtb/arm/armada-xp-gp.dtb
> share/dtb/arm/armada-xp-lenovo-ix4-300d.dtb
> @@ -86,6 +93,7 @@ share/dtb/arm/armada-xp-synology-ds414.d
> share/dtb/arm/artpec6-devboard.dtb
> share/dtb/arm/aspeed-ast2500-evb.dtb
> share/dtb/arm/aspeed-bmc-opp-palmetto.dtb
> +share/dtb/arm/aspeed-bmc-opp-romulus.dtb
> share/dtb/arm/at91-ariag25.dtb
> share/dtb/arm/at91-ariettag25.dtb
> share/dtb/arm/at91-cosino_mega2560.dtb
> @@ -100,6 +108,7 @@ share/dtb/arm/at91-sama5d3_xplained.dtb
> share/dtb/arm/at91-sama5d4_ma5d4evk.dtb
> share/dtb/arm/at91-sama5d4_xplained.dtb
> share/dtb/arm/at91-sama5d4ek.dtb
> +share/dtb/arm/at91-tse850-3.dtb
> share/dtb/arm/at91-vinco.dtb
> share/dtb/arm/at91rm9200ek.dtb
> share/dtb/arm/at91sam9260ek.dtb
> @@ -139,6 +148,8 @@ share/dtb/arm/bcm4708-smartrg-sr400ac.dt
> share/dtb/arm/bcm47081-asus-rt-n18u.dtb
> share/dtb/arm/bcm47081-buffalo-wzr-600dhp2.dtb
> share/dtb/arm/bcm47081-buffalo-wzr-900dhp.dtb
> +share/dtb/arm/bcm47081-luxul-xap-1410.dtb
> +share/dtb/arm/bcm47081-luxul-xwr-1200.dtb
> share/dtb/arm/bcm4709-asus-rt-ac87u.dtb
> share/dtb/arm/bcm4709-buffalo-wxr-1900dhp.dtb
> share/dtb/arm/bcm4709-netgear-r7000.dtb
> @@ -174,6 +185,7 @@ share/dtb/arm/cx92755_equinox.dtb
> share/dtb/arm/da850-enbw-cmc.dtb
> share/dtb/arm/da850-evm.dtb
> share/dtb/arm/da850-lcdk.dtb
> +share/dtb/arm/da850-lego-ev3.dtb
> share/dtb/arm/dm8148-evm.dtb
> share/dtb/arm/dm8148-t410.dtb
> share/dtb/arm/dm8168-evm.dtb
> @@ -305,6 +317,7 @@ share/dtb/arm/imx6dl-gw551x.dtb
> share/dtb/arm/imx6dl-gw552x.dtb
> share/dtb/arm/imx6dl-gw553x.dtb
> share/dtb/arm/imx6dl-hummingboard.dtb
> +share/dtb/arm/imx6dl-icore-rqs.dtb
> share/dtb/arm/imx6dl-icore.dtb
> share/dtb/arm/imx6dl-nit6xlite.dtb
> share/dtb/arm/imx6dl-nitrogen6x.dtb
> @@ -314,6 +327,7 @@ share/dtb/arm/imx6dl-riotboard.dtb
> share/dtb/arm/imx6dl-sabreauto.dtb
> share/dtb/arm/imx6dl-sabrelite.dtb
> share/dtb/arm/imx6dl-sabresd.dtb
> +share/dtb/arm/imx6dl-savageboard.dtb
> share/dtb/arm/imx6dl-ts4900.dtb
> share/dtb/arm/imx6dl-tx6dl-comtft.dtb
> share/dtb/arm/imx6dl-tx6s-8034.dtb
> @@ -350,6 +364,7 @@ share/dtb/arm/imx6q-hummingboard.dtb
> share/dtb/arm/imx6q-icore-rqs.dtb
> share/dtb/arm/imx6q-icore.dtb
> share/dtb/arm/imx6q-marsboard.dtb
> +share/dtb/arm/imx6q-mccmon6.dtb
> share/dtb/arm/imx6q-nitrogen6_max.dtb
> share/dtb/arm/imx6q-nitrogen6_som2.dtb
> share/dtb/arm/imx6q-nitrogen6x.dtb
> @@ -359,6 +374,7 @@ share/dtb/arm/imx6q-rex-pro.dtb
> share/dtb/arm/imx6q-sabreauto.dtb
> share/dtb/arm/imx6q-sabrelite.dtb
> share/dtb/arm/imx6q-sabresd.dtb
> +share/dtb/arm/imx6q-savageboard.dtb
> share/dtb/arm/imx6q-sbc6x.dtb
> share/dtb/arm/imx6q-tbs2910.dtb
> share/dtb/arm/imx6q-ts4900.dtb
> @@ -388,7 +404,10 @@ share/dtb/arm/imx6sx-udoo-neo-extended.d
> share/dtb/arm/imx6sx-udoo-neo-full.dtb
> share/dtb/arm/imx6ul-14x14-evk.dtb
> share/dtb/arm/imx6ul-geam-kit.dtb
> +share/dtb/arm/imx6ul-isiot-emmc.dtb
> +share/dtb/arm/imx6ul-isiot-nand.dtb
> share/dtb/arm/imx6ul-liteboard.dtb
> +share/dtb/arm/imx6ul-opos6uldev.dtb
> share/dtb/arm/imx6ul-pico-hobbit.dtb
> share/dtb/arm/imx6ul-tx6ul-0010.dtb
> share/dtb/arm/imx6ul-tx6ul-0011.dtb
> @@ -670,7 +689,9 @@ share/dtb/arm/sama5d33ek.dtb
> share/dtb/arm/sama5d34ek.dtb
> share/dtb/arm/sama5d35ek.dtb
> share/dtb/arm/sama5d36ek.dtb
> +share/dtb/arm/sama5d36ek_cmp.dtb
> share/dtb/arm/sh73a0-kzm9g.dtb
> +share/dtb/arm/socfpga_arria10_socdk_nand.dtb
> share/dtb/arm/socfpga_arria10_socdk_qspi.dtb
> share/dtb/arm/socfpga_arria10_socdk_sdmmc.dtb
> share/dtb/arm/socfpga_arria5_socdk.dtb
> @@ -739,6 +760,7 @@ share/dtb/arm/sun5i-a13-empire-electroni
> share/dtb/arm/sun5i-a13-empire-electronix-m712.dtb
> share/dtb/arm/sun5i-a13-hsg-h702.dtb
> share/dtb/arm/sun5i-a13-inet-98v-rev2.dtb
> +share/dtb/arm/sun5i-a13-licheepi-one.dtb
> share/dtb/arm/sun5i-a13-olinuxino-micro.dtb
> share/dtb/arm/sun5i-a13-olinuxino.dtb
> share/dtb/arm/sun5i-a13-q8-tablet.dtb
> @@ -799,7 +821,9 @@ share/dtb/arm/sun8i-a33-q8-tablet.dtb
> share/dtb/arm/sun8i-a33-sinlinx-sina33.dtb
> share/dtb/arm/sun8i-a83t-allwinner-h8homlet-v2.dtb
> share/dtb/arm/sun8i-a83t-cubietruck-plus.dtb
> +share/dtb/arm/sun8i-h2-plus-orangepi-zero.dtb
> share/dtb/arm/sun8i-h3-bananapi-m2-plus.dtb
> +share/dtb/arm/sun8i-h3-beelink-x2.dtb
> share/dtb/arm/sun8i-h3-nanopi-m1.dtb
> share/dtb/arm/sun8i-h3-nanopi-neo.dtb
> share/dtb/arm/sun8i-h3-orangepi-2.dtb
> @@ -810,6 +834,7 @@ share/dtb/arm/sun8i-h3-orangepi-pc.dtb
> share/dtb/arm/sun8i-h3-orangepi-plus.dtb
> share/dtb/arm/sun8i-h3-orangepi-plus2e.dtb
> share/dtb/arm/sun8i-r16-parrot.dtb
> +share/dtb/arm/sun8i-v3s-licheepi-zero.dtb
> share/dtb/arm/sun9i-a80-cubieboard4.dtb
> share/dtb/arm/sun9i-a80-optimus.dtb
> share/dtb/arm/tango4-vantage-1172.dtb
> @@ -863,6 +888,7 @@ share/dtb/arm/vf610-colibri-eval-v3.dtb
> share/dtb/arm/vf610-cosmic.dtb
> share/dtb/arm/vf610-twr.dtb
> share/dtb/arm/vf610-zii-dev-rev-b.dtb
> +share/dtb/arm/vf610-zii-dev-rev-c.dtb
> share/dtb/arm/vf610m4-colibri.dtb
> share/dtb/arm/vf610m4-cosmic.dtb
> share/dtb/arm/vt8500-bv07.dtb
> @@ -883,6 +909,7 @@ share/dtb/arm64/
> share/dtb/arm64/al/
> share/dtb/arm64/al/alpine-v2-evp.dtb
> share/dtb/arm64/allwinner/
> +share/dtb/arm64/allwinner/sun50i-a64-bananapi-m64.dtb
> share/dtb/arm64/allwinner/sun50i-a64-pine64-plus.dtb
> share/dtb/arm64/allwinner/sun50i-a64-pine64.dtb
> share/dtb/arm64/altera/
> @@ -900,13 +927,15 @@ share/dtb/arm64/amlogic/meson-gxbb-p201.
> share/dtb/arm64/amlogic/meson-gxbb-vega-s95-meta.dtb
> share/dtb/arm64/amlogic/meson-gxbb-vega-s95-pro.dtb
> share/dtb/arm64/amlogic/meson-gxbb-vega-s95-telos.dtb
> -share/dtb/arm64/amlogic/meson-gxl-nexbox-a95x.dtb
> +share/dtb/arm64/amlogic/meson-gxbb-wetek-hub.dtb
> +share/dtb/arm64/amlogic/meson-gxbb-wetek-play2.dtb
> share/dtb/arm64/amlogic/meson-gxl-s905d-p230.dtb
> share/dtb/arm64/amlogic/meson-gxl-s905d-p231.dtb
> +share/dtb/arm64/amlogic/meson-gxl-s905x-nexbox-a95x.dtb
> share/dtb/arm64/amlogic/meson-gxl-s905x-p212.dtb
> share/dtb/arm64/amlogic/meson-gxm-nexbox-a1.dtb
> -share/dtb/arm64/amlogic/meson-gxm-s912-q200.dtb
> -share/dtb/arm64/amlogic/meson-gxm-s912-q201.dtb
> +share/dtb/arm64/amlogic/meson-gxm-q200.dtb
> +share/dtb/arm64/amlogic/meson-gxm-q201.dtb
> share/dtb/arm64/apm/
> share/dtb/arm64/apm/apm-merlin.dtb
> share/dtb/arm64/apm/apm-mustang.dtb
> @@ -921,6 +950,7 @@ share/dtb/arm64/arm/vexpress-v2f-1xv7-ca
> share/dtb/arm64/broadcom/
> share/dtb/arm64/broadcom/bcm2837-rpi-3-b.dtb
> share/dtb/arm64/broadcom/ns2-svk.dtb
> +share/dtb/arm64/broadcom/ns2-xmc.dtb
> share/dtb/arm64/broadcom/vulcan-eval.dtb
> share/dtb/arm64/cavium/
> share/dtb/arm64/cavium/thunder-88xx.dtb
> @@ -929,6 +959,9 @@ share/dtb/arm64/exynos/exynos5433-tm2.dt
> share/dtb/arm64/exynos/exynos5433-tm2e.dtb
> share/dtb/arm64/exynos/exynos7-espresso.dtb
> share/dtb/arm64/freescale/
> +share/dtb/arm64/freescale/fsl-ls1012a-frdm.dtb
> +share/dtb/arm64/freescale/fsl-ls1012a-qds.dtb
> +share/dtb/arm64/freescale/fsl-ls1012a-rdb.dtb
> share/dtb/arm64/freescale/fsl-ls1043a-qds.dtb
> share/dtb/arm64/freescale/fsl-ls1043a-rdb.dtb
> share/dtb/arm64/freescale/fsl-ls1046a-qds.dtb
> @@ -937,6 +970,7 @@ share/dtb/arm64/freescale/fsl-ls2080a-qd
> share/dtb/arm64/freescale/fsl-ls2080a-rdb.dtb
> share/dtb/arm64/freescale/fsl-ls2080a-simu.dtb
> share/dtb/arm64/hisilicon/
> +share/dtb/arm64/hisilicon/hi3660-hikey960.dtb
> share/dtb/arm64/hisilicon/hi6220-hikey.dtb
> share/dtb/arm64/hisilicon/hip05-d02.dtb
> share/dtb/arm64/hisilicon/hip06-d03.dtb
> @@ -949,6 +983,7 @@ share/dtb/arm64/marvell/armada-3720-db.d
> share/dtb/arm64/marvell/armada-3720-espressobin.dtb
> share/dtb/arm64/marvell/armada-7040-db.dtb
> share/dtb/arm64/marvell/armada-8040-db.dtb
> +share/dtb/arm64/marvell/armada-8040-mcbin.dtb
> share/dtb/arm64/marvell/berlin4ct-dmp.dtb
> share/dtb/arm64/marvell/berlin4ct-stb.dtb
> share/dtb/arm64/mediatek/
> @@ -1014,6 +1049,8 @@ share/dtb/mips/cavium-octeon/dlink_dsr-5
> share/dtb/mips/cavium-octeon/octeon_3xxx.dtb
> share/dtb/mips/cavium-octeon/octeon_68xx.dtb
> share/dtb/mips/cavium-octeon/ubnt_e100.dtb
> +share/dtb/mips/img/
> +share/dtb/mips/img/pistachio_marduk.dtb
> share/dtb/mips/ingenic/
> share/dtb/mips/ingenic/ci20.dtb
> share/dtb/mips/ingenic/qi_lb60.dtb
> @@ -1078,6 +1115,7 @@ share/dtb/powerpc/fsl/ge_imp3a.dtb
> share/dtb/powerpc/fsl/gef_ppc9a.dtb
> share/dtb/powerpc/fsl/gef_sbc310.dtb
> share/dtb/powerpc/fsl/gef_sbc610.dtb
> +share/dtb/powerpc/fsl/kmcent2.dtb
> share/dtb/powerpc/fsl/kmcoge4.dtb
> share/dtb/powerpc/fsl/mpc8536ds.dtb
> share/dtb/powerpc/fsl/mpc8536ds_36b.dtb
>