Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jul 2020 02:16:21 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r542178 - in branches/2020Q3/cad/alliance: . files
Message-ID:  <202007140216.06E2GLPd016515@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Tue Jul 14 02:16:21 2020
New Revision: 542178
URL: https://svnweb.freebsd.org/changeset/ports/542178

Log:
  MFH:	r542173
  
  Honor $YACC and fix build with recent byacc on head after r363170.
  
  PR:		247522
  
  Approved by:	ports-secteam (blanket, build fix)

Added:
  branches/2020Q3/cad/alliance/files/patch-exp_src_Makefile.am
     - copied unchanged from r542173, head/cad/alliance/files/patch-exp_src_Makefile.am
  branches/2020Q3/cad/alliance/files/patch-fvh_src_fbl__byacc.h
     - copied unchanged from r542173, head/cad/alliance/files/patch-fvh_src_fbl__byacc.h
Modified:
  branches/2020Q3/cad/alliance/Makefile
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/cad/alliance/Makefile
==============================================================================
--- branches/2020Q3/cad/alliance/Makefile	Tue Jul 14 01:58:10 2020	(r542177)
+++ branches/2020Q3/cad/alliance/Makefile	Tue Jul 14 02:16:21 2020	(r542178)
@@ -29,7 +29,7 @@ USE_TEX=	dvipsk:build latex:build
 USE_XORG=	ice sm x11 xext xt
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP}
+CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP} YACC=${YACC}
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
 		--prefix=${ALLIANCE_TOP}
 

Copied: branches/2020Q3/cad/alliance/files/patch-exp_src_Makefile.am (from r542173, head/cad/alliance/files/patch-exp_src_Makefile.am)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/cad/alliance/files/patch-exp_src_Makefile.am	Tue Jul 14 02:16:21 2020	(r542178, copy of r542173, head/cad/alliance/files/patch-exp_src_Makefile.am)
@@ -0,0 +1,11 @@
+--- exp/src/Makefile.am.orig	2014-08-02 23:38:00 UTC
++++ exp/src/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ bin_PROGRAMS = exp 
+ 
+-YACC = @YACC@ -d -v --debug
++YACC = @YACC@ -d -v -t
+ CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+ exp_LDADD =
+ 

Copied: branches/2020Q3/cad/alliance/files/patch-fvh_src_fbl__byacc.h (from r542173, head/cad/alliance/files/patch-fvh_src_fbl__byacc.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/cad/alliance/files/patch-fvh_src_fbl__byacc.h	Tue Jul 14 02:16:21 2020	(r542178, copy of r542173, head/cad/alliance/files/patch-fvh_src_fbl__byacc.h)
@@ -0,0 +1,9 @@
+--- fvh/src/fbl_byacc.h.orig	2014-08-02 23:38:00 UTC
++++ fvh/src/fbl_byacc.h
+@@ -119,5 +119,5 @@ extern void         fbl_select();
+   extern          char * fbl_stostr __P((char *str));
+ 
+   extern           void  fbl_y_error __P((char *str));
+-  extern            long  fbl_y_lex __P(());
++  extern            int  fbl_y_lex __P(());
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007140216.06E2GLPd016515>