Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src Pull up following revision(s) (requested by go in ticket ...



details:   https://anonhg.NetBSD.org/src/rev/dffdde43a02f
branches:  netbsd-6
changeset: 773823:dffdde43a02f
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Feb 24 17:18:58 2012 +0000

description:
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.

diffstat:

 external/bsd/acpica/bin/iasl/Makefile         |  5 ++++-
 sys/external/bsd/acpica/dist/include/acapps.h |  9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r a89df52faac7 -r dffdde43a02f external/bsd/acpica/bin/iasl/Makefile
--- a/external/bsd/acpica/bin/iasl/Makefile     Fri Feb 24 17:00:02 2012 +0000
+++ b/external/bsd/acpica/bin/iasl/Makefile     Fri Feb 24 17:18:58 2012 +0000
@@ -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 @@
 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}
 
diff -r a89df52faac7 -r dffdde43a02f sys/external/bsd/acpica/dist/include/acapps.h
--- a/sys/external/bsd/acpica/dist/include/acapps.h     Fri Feb 24 17:00:02 2012 +0000
+++ b/sys/external/bsd/acpica/dist/include/acapps.h     Fri Feb 24 17:18:58 2012 +0000
@@ -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
 



Home | Main Index | Thread Index | Old Index