diff options
author | jkim <jkim@FreeBSD.org> | 2016-03-30 01:47:18 +0800 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2016-03-30 01:47:18 +0800 |
commit | 8d5f48e0da8f946ad3bfc5306383b1f9abdbb654 (patch) | |
tree | 45f36cd930054ae327c3712d6a5e253a31a2ebc1 | |
parent | 7c07ad4a67c76c100f24ef5c701d7475fc0f84e4 (diff) | |
download | freebsd-ports-gnome-8d5f48e0da8f946ad3bfc5306383b1f9abdbb654.tar.gz freebsd-ports-gnome-8d5f48e0da8f946ad3bfc5306383b1f9abdbb654.tar.zst freebsd-ports-gnome-8d5f48e0da8f946ad3bfc5306383b1f9abdbb654.zip |
- Prefer devel/byacc over devel/bison to reduce build dependencies between
releases. It builds fine after r411933.
- Replace the previous patch with the upstream submitted version.
-rw-r--r-- | sysutils/acpica-tools/Makefile | 6 | ||||
-rw-r--r-- | sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile index 24b262b13851..7706630c85f5 100644 --- a/sysutils/acpica-tools/Makefile +++ b/sysutils/acpica-tools/Makefile @@ -29,10 +29,8 @@ 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 +BUILD_DEPENDS+= byacc>=20160324_1:devel/byacc +YACC= ${LOCALBASE}/bin/yacc .endif do-install: diff --git a/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile b/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile index 9970d4d8f9d7..afdc58120c00 100644 --- a/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile +++ b/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile @@ -1,6 +1,6 @@ --- generate/unix/iasl/Makefile.orig 2016-03-18 16:25:41 UTC +++ generate/unix/iasl/Makefile -@@ -274,12 +274,11 @@ include ../Makefile.rules +@@ -274,12 +274,14 @@ include ../Makefile.rules # Function to safely execute yacc # safe_yacc = \ @@ -10,11 +10,14 @@ - $(YACC) $(YFLAGS) -p$(1) -o$$_d/$$_f.c -d $(2) &&\ - mv $$_d/$$_f.$${_t\#\#*.} $(3);\ - test -d $$_d && rm -fr $$_d -+ _d=$$(mktemp -d '$(abspath $(OBJDIR))/$(1).XXXXXX') &&\ -+ cd "$$_d" &&\ -+ $(YACC) $(YFLAGS) -p$(1) -o$(1).c -d '$(abspath $(2))' &&\ -+ mv $(1)$(suffix $(3)) '$(abspath $(3))' &&\ -+ rm -fr "$$_d" ++ _d=`mktemp -d $(OBJDIR)/$(1).XXXXXX` &&\ ++ cd $$_d &&\ ++ $(YACC) $(YFLAGS) -d -p$(1) $(abspath $(2)) &&\ ++ cd - &&\ ++ mv $$_d/y.tab$(suffix $(3)) $(3);\ ++ _r=$$?;\ ++ rm -fr $$_d;\ ++ exit $$_r # # Macro processing for iASL .y files |