svn commit: r454916 - head/sysutils/dtc

[Cy Schubert]

Cy Schubert writes:
> In message <201711261923.vAQJN7sv097904 at repo.freebsd.org>, Emmanuel Vadot 
> write
> s:
> > Author: manu (src committer)
> > Date: Sun Nov 26 19:23:07 2017
> > New Revision: 454916
> > URL: https://svnweb.freebsd.org/changeset/ports/454916
> >
> > Log:
> >   sysutils/dtc: Update to v1.4.5
> >   
> >   Update to dtc v1.4.5 as it is needed for u-boot v2017.11
> >   Do not build the python libfdt as it fails and we don't need it
> >   
> >   Reviewed by:	imp (maintainer)
> >   Approved by:	imp
> >   Differential Revision:	https://reviews.freebsd.org/D13251
> >
> > Modified:
> >   head/sysutils/dtc/Makefile
> >   head/sysutils/dtc/distinfo
> >   head/sysutils/dtc/pkg-plist
> >
> > Modified: head/sysutils/dtc/Makefile
> > ===========================================================================
> ==
> > =
> > --- head/sysutils/dtc/Makefile	Sun Nov 26 18:58:24 2017	(r45491
> > 5)
> > +++ head/sysutils/dtc/Makefile	Sun Nov 26 19:23:07 2017	(r45491
> > 6)
> > @@ -1,7 +1,7 @@
> >  # $FreeBSD$
> >  
> >  PORTNAME=	dtc
> > -PORTVERSION=	1.4.4
> > +PORTVERSION=	1.4.5
> >  DISTVERSIONPREFIX=	v
> >  CATEGORIES=	sysutils
> >  
> > @@ -18,6 +18,6 @@ USE_GITHUB=	yes
> >  GH_ACCOUNT=	dgibson
> >  GH_PROJECT=	dtc
> >  
> > -MAKE_ARGS+=	PREFIX=${PREFIX}
> > +MAKE_ARGS+=	PREFIX=${PREFIX} NO_PYTHON=yes
> >  
> >  .include <bsd.port.mk>
> >
> > Modified: head/sysutils/dtc/distinfo
> > ===========================================================================
> ==
> > =
> > --- head/sysutils/dtc/distinfo	Sun Nov 26 18:58:24 2017	(r45491
> > 5)
> > +++ head/sysutils/dtc/distinfo	Sun Nov 26 19:23:07 2017	(r45491
> > 6)
> > @@ -1,3 +1,3 @@
> > -TIMESTAMP = 1497738446
> > -SHA256 (dgibson-dtc-v1.4.4_GH0.tar.gz) = 2f2c0bf4d84763595953885bdcd2159b0
> b8
> > 5410018c8ba48cc31b3d6e443e4d8
> > -SIZE (dgibson-dtc-v1.4.4_GH0.tar.gz) = 156980
> > +TIMESTAMP = 1511715245
> > +SHA256 (dgibson-dtc-v1.4.5_GH0.tar.gz) = d13df67f5402c1905d2c24603471fe783
> 96
> > 5112ab5004025a50f7f852cd89bc8
> > +SIZE (dgibson-dtc-v1.4.5_GH0.tar.gz) = 174933
> >
> > Modified: head/sysutils/dtc/pkg-plist
> > ===========================================================================
> ==
> > =
> > --- head/sysutils/dtc/pkg-plist	Sun Nov 26 18:58:24 2017	(r45491
> > 5)
> > +++ head/sysutils/dtc/pkg-plist	Sun Nov 26 19:23:07 2017	(r45491
> > 6)
> > @@ -1,10 +1,10 @@
> >  bin/convert-dtsv0
> >  bin/dtc
> > +bin/dtdiff
> >  bin/fdtdump
> >  bin/fdtget
> >  bin/fdtput
> > -bin/dtdiff
> > -lib/libfdt-1.4.4.so
> > +lib/libfdt-1.4.5.so
> >  lib/libfdt.a
> >  lib/libfdt.so
> >  lib/libfdt.so.1
> >
>
> Hi,
>
> On -current I'm seeing the following error:
>
> 	 CC libfdt/fdt_overlay.o
> gmake[1]: *** No rule to make target 'alloca.h', needed by 'fdtoverlay.o'.  
> Stop.
> gmake[1]: *** Waiting for unfinished jobs....
> 	 CC fdtput.o
> gmake[1]: Leaving directory '/export/wrkdir/amd64/usr/ports/sysutils/dtc/wor
> k/dtc-1.4.5'
> ===> Compilation failed unexpectedly.
> Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to
> the maintainer.
> *** Error code 1
>
> Stop.
> make: stopped in /usr/ports/sysutils/dtc
>
> Does it expect cddl/compat/opensolaris/include/alloca.h?

To make a long story short:

diff --git a/sysutils/dtc/files/patch-fdtoverlay.c 
b/sysutils/dtc/files/patch-fdtoverlay.c
new file mode 100644
index 000000000000..3107a7273145
--- /dev/null
+++ b/sysutils/dtc/files/patch-fdtoverlay.c
@@ -0,0 +1,10 @@
+--- fdtoverlay.c.orig	2017-09-27 03:00:10.000000000 -0700
++++ fdtoverlay.c	2017-11-27 00:04:51.388248000 -0800
+@@ -26,7 +26,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <alloca.h>
+ #include <inttypes.h>
+ 
+ #include <libfdt.h>


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.