Date: Mon, 20 Jul 2015 19:24:44 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392594 - in head/sysutils/acpica-tools: . files Message-ID: <201507201924.t6KJOipn016988@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Jul 20 19:24:44 2015 New Revision: 392594 URL: https://svnweb.freebsd.org/changeset/ports/392594 Log: Update to 20150717. Added: head/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile (contents, props changed) Modified: head/sysutils/acpica-tools/Makefile head/sysutils/acpica-tools/distinfo Modified: head/sysutils/acpica-tools/Makefile ============================================================================== --- head/sysutils/acpica-tools/Makefile Mon Jul 20 19:12:34 2015 (r392593) +++ head/sysutils/acpica-tools/Makefile Mon Jul 20 19:24:44 2015 (r392594) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= acpica -PORTVERSION= 20150619 +PORTVERSION= 20150717 CATEGORIES= sysutils devel MASTER_SITES= https://acpica.org/sites/acpica/files/ \ LOCAL/jkim @@ -14,12 +14,9 @@ COMMENT= Tools from the ACPI Component A LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual -BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 - -USES= bison gmake +USES= gmake BUILD_WRKSRC= ${WRKSRC}/generate/unix -WRKSRC= ${WRKDIR}/${PORTNAME}-unix2-20150618 ACPICA_TOOLS= acpibin acpidump acpiexec acpihelp acpinames acpisrc ACPICA_TOOLS+= acpixtract iasl @@ -27,11 +24,19 @@ ACPICA_TOOLS+= acpixtract iasl PLIST_FILES= ${ACPICA_TOOLS:S,^,bin/,} MAKE_ARGS= HOST=_FreeBSD NOOPT=TRUE PROGS="${ACPICA_TOOLS}" -MAKE_ARGS+= CC="${CC}" LEX="${FLEX}" MACROPROC="${LOCALBASE}/bin/gm4" -MAKE_ARGS+= YACC="${LOCALBASE}/bin/bison" +MAKE_ARGS+= CC="${CC}" LEX="${FLEX}" YACC="${YACC}" + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 1001506 +BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison +BUILD_DEPENDS+= gm4:${PORTSDIR}/devel/m4 +MAKE_ARGS+= MACROPROC="${LOCALBASE}/bin/gm4" +YACC= ${LOCALBASE}/bin/bison +.endif do-install: ${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \ ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/sysutils/acpica-tools/distinfo ============================================================================== --- head/sysutils/acpica-tools/distinfo Mon Jul 20 19:12:34 2015 (r392593) +++ head/sysutils/acpica-tools/distinfo Mon Jul 20 19:24:44 2015 (r392594) @@ -1,2 +1,2 @@ -SHA256 (acpica-unix2-20150619.tar.gz) = 7884f414a8f3bc58c21f3e9bc4f0094771fa665be0b24140b54bd7477764f215 -SIZE (acpica-unix2-20150619.tar.gz) = 1367646 +SHA256 (acpica-unix2-20150717.tar.gz) = dd60f846ad8393d89d2cbadf362c6547c5e53405f5ee51097c90db3636f79e0a +SIZE (acpica-unix2-20150717.tar.gz) = 1376076 Added: head/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile Mon Jul 20 19:24:44 2015 (r392594) @@ -0,0 +1,62 @@ +--- generate/unix/iasl/Makefile.orig 2015-07-17 16:04:37 UTC ++++ generate/unix/iasl/Makefile +@@ -260,10 +260,21 @@ CFLAGS += \ + include ../Makefile.rules + + # ++# Function to safely execute yacc ++# ++safe_yacc = \ ++ _d=`mktemp -d $(OBJDIR)/$$_f.XXXXXX` &&\ ++ _f=`echo $(1) | tr '[:upper:]' '[:lower:]'` &&\ ++ _t=`basename $(3)` &&\ ++ $(YACC) $(YFLAGS) -p$(1) -o$$_d/$$_f.c -d $(2) &&\ ++ mv $$_d/$$_f.$${_t\#\#*.} $(3);\ ++ test -d $$_d && rm -fr $$_d ++ ++# + # Macro processing for iASL .y files + # + $(OBJDIR)/aslcompiler.y : $(ASL_PARSER) +- $(MACROPROC) $(MFLAGS) $(ASL_COMPILER)/aslparser.y > $(OBJDIR)/aslcompiler.y ++ $(MACROPROC) $(MFLAGS) $(ASL_COMPILER)/aslparser.y > $@ + + # + # Parser and Lexer - intermediate C files +@@ -271,30 +282,20 @@ $(OBJDIR)/aslcompiler.y : $(ASL_PAR + $(OBJDIR)/aslcompilerlex.c : $(ASL_LEXER) + $(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l + +-$(OBJDIR)/aslcompiler.y.h : $(OBJDIR)/aslcompiler.y +- $(YACC) $(YFLAGS) -pAslCompiler -o/dev/null --defines=$@ $< +- +-$(OBJDIR)/aslcompilerparse.c : $(OBJDIR)/aslcompiler.y +- $(YACC) $(YFLAGS) -pAslCompiler -o$@ --defines=/dev/null $< ++$(OBJDIR)/aslcompilerparse.c $(OBJDIR)/aslcompiler.y.h : $(OBJDIR)/aslcompiler.y ++ $(call safe_yacc,AslCompiler,$<,$@) + + $(OBJDIR)/dtparserlex.c : $(ASL_COMPILER)/dtparser.l $(OBJDIR)/dtparser.y.h + $(LEX) $(LFLAGS) -PDtParser -o$@ $< + +-$(OBJDIR)/dtparser.y.h : $(ASL_COMPILER)/dtparser.y +- $(YACC) $(YFLAGS) -pDtParser -o/dev/null --defines=$@ $< +- +-$(OBJDIR)/dtparserparse.c : $(ASL_COMPILER)/dtparser.y +- $(YACC) $(YFLAGS) -pDtParser -o$@ --defines=/dev/null $< ++$(OBJDIR)/dtparserparse.c $(OBJDIR)/dtparser.y.h : $(ASL_COMPILER)/dtparser.y ++ $(call safe_yacc,DtParser,$<,$@) + + $(OBJDIR)/prparserlex.c : $(ASL_COMPILER)/prparser.l $(OBJDIR)/prparser.y.h + $(LEX) $(LFLAGS) -PPrParser -o$@ $< + +-$(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparser.y +- $(YACC) $(YFLAGS) -pPrParser -o/dev/null --defines=$@ $< +- +-$(OBJDIR)/prparserparse.c : $(ASL_COMPILER)/prparser.y +- $(YACC) $(YFLAGS) -pPrParser -o$@ --defines=/dev/null $< +- ++$(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparser.y ++ $(call safe_yacc,PrParser,$<,$@) + + # + # Parsers and Lexers - final object files
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507201924.t6KJOipn016988>