From 45a0b486cb739adc01c5f0f34c7edd2b34566155 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 9 Oct 2013 12:57:17 -0600 Subject: [PATCH] Update to latest upstream. Signed-off-by: Al Stone --- acpica-tools.spec | 10 +- makefile-config.patch | 219 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 makefile-config.patch diff --git a/acpica-tools.spec b/acpica-tools.spec index f441104..27a0b12 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools -Version: 20130823 -Release: 5%{?dist} +Version: 20130927 +Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables Group: Development/Languages @@ -27,6 +27,7 @@ Patch0: debian-big_endian.patch Patch1: debian-unaligned.patch Patch2: name-miscompare.patch Patch3: aapits-linux.patch +Patch4: makefile-config.patch BuildRequires: bison patchutils flex @@ -81,6 +82,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch1 -p1 -b .debian-unaligned %patch2 -p1 -b .name-miscompare %patch3 -p1 -b .aapits-linux +%patch4 -p1 -b .makefile-config cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -185,6 +187,10 @@ fi %changelog +* Wed Oct 09 2013 Al Stone - 20130927-1 +- Update to latest upstream. Closes BZ#1013090. +- Add temporary patch to include Makefile.config being missing from tarball. + * Fri Sep 13 2013 Michael Schwendt - 20130823-5 - correct iasl obs_ver diff --git a/makefile-config.patch b/makefile-config.patch new file mode 100644 index 0000000..1f443db --- /dev/null +++ b/makefile-config.patch @@ -0,0 +1,219 @@ +diff -urN acpica-unix2-20130927/generate/unix/Makefile.config acpica-unix2-20130927-patch/generate/unix/Makefile.config +--- acpica-unix2-20130927/generate/unix/Makefile.config 1969-12-31 17:00:00.000000000 -0700 ++++ acpica-unix2-20130927-patch/generate/unix/Makefile.config 2013-10-09 12:27:41.138512023 -0600 +@@ -0,0 +1,215 @@ ++# ++# Makefile.config ++# ++# Common configuration and setup file to generate the ACPICA tools and ++# utilities: the iASL compiler, acpiexec, acpihelp, acpinames, acpisrc, ++# acpixtract, acpibin. ++# ++# This file is included by the individual makefiles for each tool. ++# ++ ++# ++# Note: This makefile is intended to be used from within the native ++# ACPICA directory structure, from under generate/unix. It specifically ++# places all object files in a generate/unix subdirectory, not within ++# the various ACPICA source directories. This prevents collisions ++# between different compilations of the same source file with different ++# compile options, and prevents pollution of the source code. ++# ++ ++# ++# Configuration ++# ++# OPT_CFLAGS can be overridden on the make command line by ++# adding OPT_CFLAGS="..." to the invocation. ++# ++# Notes: ++# gcc should be version 4 or greater, otherwise some of the options ++# used will not be recognized. ++# Optional: Set HOST to an appropriate value (_LINUX, _FreeBSD, _APPLE, _CYGWIN, etc.) ++# See include/platform/acenv.h for supported values. ++# Note: HOST is not nearly as important for applications as it ++# is for the kernel-resident version of ACPICA, and it may ++# not be necessary to change it. ++# ++.SUFFIXES : ++PROGS = acpibin acpidump acpiexec acpihelp acpinames acpisrc acpixtract iasl ++HOST ?= _CYGWIN ++CC = gcc ++ ++# ++# Common defines ++# ++OBJDIR = obj ++BINDIR = bin ++COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $< ++LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) ++PREFIX ?= /usr ++INSTALLDIR = $(PREFIX)/bin ++ ++ifeq ($(HOST), _APPLE) ++INSTALL = cp ++INSTALLFLAGS ?= -f ++else ++INSTALL = install ++INSTALLFLAGS ?= -m 555 -s ++endif ++ ++INSTALLPROG = \ ++ mkdir -p $(DESTDIR)$(INSTALLDIR); \ ++ $(INSTALL) $(INSTALLFLAGS) ../$(BINDIR)/$(PROG) $(DESTDIR)$(INSTALLDIR)/$(PROG) ++ ++# ++# Rename a .exe file if necessary ++# ++RENAMEPROG = \ ++ @if [ -e "$(PROG).exe" ] ; then \ ++ mv $(PROG).exe $(PROG); \ ++ echo "Renamed $(PROG).exe to $(PROG)"; \ ++ fi; ++ ++# ++# Copy the final executable to the local bin directory ++# ++COPYPROG = \ ++ @mkdir -p ../$(BINDIR); \ ++ cp -f $(PROG) ../$(BINDIR); \ ++ echo "Copied $(PROG) to $(FINAL_PROG)"; ++ ++# ++# Main ACPICA source directories ++# ++ACPICA_SRC = ../../../source ++ACPICA_COMMON = $(ACPICA_SRC)/common ++ACPICA_TOOLS = $(ACPICA_SRC)/tools ++ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers ++ACPICA_CORE = $(ACPICA_SRC)/components ++ACPICA_INCLUDE = $(ACPICA_SRC)/include ++ACPICA_DEBUGGER = $(ACPICA_CORE)/debugger ++ACPICA_DISASSEMBLER = $(ACPICA_CORE)/disassembler ++ACPICA_DISPATCHER = $(ACPICA_CORE)/dispatcher ++ACPICA_EVENTS = $(ACPICA_CORE)/events ++ACPICA_EXECUTER = $(ACPICA_CORE)/executer ++ACPICA_HARDWARE = $(ACPICA_CORE)/hardware ++ACPICA_NAMESPACE = $(ACPICA_CORE)/namespace ++ACPICA_PARSER = $(ACPICA_CORE)/parser ++ACPICA_RESOURCES = $(ACPICA_CORE)/resources ++ACPICA_TABLES = $(ACPICA_CORE)/tables ++ACPICA_UTILITIES = $(ACPICA_CORE)/utilities ++ ++# ++# ACPICA tool and utility source directories ++# ++ACPIBIN = $(ACPICA_TOOLS)/acpibin ++ACPIDUMP = $(ACPICA_TOOLS)/acpidump ++ACPIEXEC = $(ACPICA_TOOLS)/acpiexec ++ACPIHELP = $(ACPICA_TOOLS)/acpihelp ++ACPINAMES = $(ACPICA_TOOLS)/acpinames ++ACPISRC = $(ACPICA_TOOLS)/acpisrc ++ACPIXTRACT = $(ACPICA_TOOLS)/acpixtract ++ASL_COMPILER = $(ACPICA_SRC)/compiler ++ ++# ++# Common ACPICA header files ++# ++ACPICA_HEADERS = \ ++ $(wildcard $(ACPICA_INCLUDE)/*.h) \ ++ $(wildcard $(ACPICA_INCLUDE)/platform/*.h) ++ ++# ++# Common compiler flags ++# ++# Flags/option notes: ++# Global optimization flags (such as -O2, -Os) are not used, ++# since they cause issues on some compilers (such as gcc 4.4) ++# The _GNU_SOURCE symbol is required for many hosts. ++# ++OPT_CFLAGS ?= \ ++ -D_FORTIFY_SOURCE=2\ ++ $(CWARNINGFLAGS) ++ ++CFLAGS += \ ++ -D$(HOST)\ ++ -D_GNU_SOURCE\ ++ -I$(ACPICA_INCLUDE) ++ ++# ++# Common compiler warning flags. The warning flags in addition ++# to -Wall are not automatically included in -Wall. ++# ++CWARNINGFLAGS = \ ++ -ansi\ ++ -Wall\ ++ -Wbad-function-cast\ ++ -Wdeclaration-after-statement\ ++ -Werror\ ++ -Wformat=2\ ++ -Wmissing-declarations\ ++ -Wmissing-prototypes\ ++ -Wstrict-aliasing=0\ ++ -Wstrict-prototypes\ ++ -Wswitch-default\ ++ -Wpointer-arith\ ++ -Wundef ++ ++# ++# Common gcc 4+ warning flags ++# ++CWARNINGFLAGS += \ ++ -Waddress\ ++ -Waggregate-return\ ++ -Wchar-subscripts\ ++ -Wmissing-declarations\ ++ -Wmissing-field-initializers\ ++ -Wnested-externs\ ++ -Wold-style-definition\ ++ -Wno-format-nonliteral\ ++ -Wredundant-decls ++ ++# ++# Per-host flags and exclusions ++# ++ifneq ($(HOST), _FreeBSD) ++ CWARNINGFLAGS += \ ++ -Wempty-body ++ ++ ifneq ($(HOST), _APPLE) ++ CWARNINGFLAGS += \ ++ -Wlogical-op\ ++ -Wmissing-parameter-type\ ++ -Wold-style-declaration\ ++ -Wtype-limits ++ endif ++endif ++ ++# ++# Extra warning flags (for possible future use) ++# ++#CWARNINGFLAGS += \ ++# -Wcast-qual\ ++# -Wconversion\ ++# -Wshadow\ ++ ++# ++# Bison/Flex configuration ++# ++# -y: act like yacc ++# ++# -i: generate case insensitive scanner ++# -s: suppress default rule, abort on unknown input ++# ++# Optional for Bison/yacc: ++# -v: verbose, produces a .output file ++# -d: produces the defines header file ++# ++# Berkeley yacc configuration ++# ++#YACC= byacc ++#YFLAGS += ++# ++YACC= bison ++YFLAGS += -y ++ ++LEX= flex ++LFLAGS += -i -s ++