Module Name: src
Committed By: riz
Date: Fri Feb 24 17:18:58 UTC 2012
Modified Files:
src/external/bsd/acpica/bin/iasl [netbsd-6]: Makefile
src/sys/external/bsd/acpica/dist/include [netbsd-6]: acapps.h
Log Message:
Pull up following revision(s) (requested by go in ticket #48):
external/bsd/acpica/bin/iasl/Makefile: revision 1.5
sys/external/bsd/acpica/dist/include/acapps.h: revision 1.2
Fix MKREPRO = yes
XXX: pullup to 6
Fix for MKREPRO = yes
XXX: pullup to 6
Use the release date as suggested.
XXX: I bet this is going to be broken in the next import because nobody
will remember to fix it.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 src/external/bsd/acpica/bin/iasl/Makefile
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.16.1 \
src/sys/external/bsd/acpica/dist/include/acapps.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.4 src/external/bsd/acpica/bin/iasl/Makefile:1.4.4.1
--- src/external/bsd/acpica/bin/iasl/Makefile:1.4 Tue Jun 28 09:11:33 2011
+++ src/external/bsd/acpica/bin/iasl/Makefile Fri Feb 24 17:18:58 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/28 09:11:33 jruoho Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2012/02/24 17:18:58 riz Exp $
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
PROG= iasl
@@ -13,6 +13,9 @@ TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd
CPPFLAGS+= -I${TOPDIR}/../include -I${TOPDIR} -I.
CPPFLAGS+= -D__NetBSD__ -DACPI_ASL_COMPILER -DACPI_USE_ALTERNATE_TIMEOUT
CPPFLAGS+= -D_USE_BERKELEY_YACC
+.if ${MKREPRO:Uno} == "yes"
+CPPFLAGS+= -DACPI_REPRO
+.endif
LDADD+= -ll -ly -lrt -lpthread
DPADD+= ${LIBL} ${LIBY} ${LIBRT} ${LIBPTHREAD}
Index: src/sys/external/bsd/acpica/dist/include/acapps.h
diff -u src/sys/external/bsd/acpica/dist/include/acapps.h:1.1.1.2 src/sys/external/bsd/acpica/dist/include/acapps.h:1.1.1.2.16.1
--- src/sys/external/bsd/acpica/dist/include/acapps.h:1.1.1.2 Thu Feb 17 10:01:18 2011
+++ src/sys/external/bsd/acpica/dist/include/acapps.h Fri Feb 24 17:18:58 2012
@@ -67,17 +67,22 @@
#endif
/* Macros for signons and file headers */
+#ifdef ACPI_REPRO
+#define ACPI_DATE "23 Jun 2011"
+#else
+#define ACPI_DATE __DATE__
+#endif
#define ACPI_COMMON_SIGNON(UtilityName) \
"\n%s\n%s version %8.8X%s [%s]\n%s\n\n", \
ACPICA_NAME, \
- UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+ UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, ACPI_DATE, \
ACPICA_COPYRIGHT
#define ACPI_COMMON_HEADER(UtilityName, Prefix) \
"%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \
Prefix, ACPICA_NAME, \
- Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+ Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, ACPI_DATE, \
Prefix, ACPICA_COPYRIGHT, \
Prefix
