Re: [Devel] ACPICA version 20100702 released

[Thomas Renninger <trenn at suse.de>]

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

Hi,

On Friday 02 July 2010 20:36:29 Stefan Reinauer wrote:
>  On 7/2/10 6:48 PM, Moore, Robert wrote:
> > Added support for Mac OS X in the Unix OSL used for iASL and AcpiExec. Use the #define __APPLE__ to enable this support.
> Are there specific build instructions for this? I get the following
> error message on my MacBook Pro:
These seem to be general build errors introduced in the latest release.
 
> make: *** No rule to make target `../components/debugger/dbfileio.c',
> needed by `dbfileio.o'.  Stop.

Find attached a patch which fixes things for me.
These lines:
+override ...
are not needed and I used them also in previous releases.

Would be nice if this can get fixed again for the next release...

This change:
-       $(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
+       $(CC) $(OBJS) $(LDFLAGS) -o $(PROG)
is needed in our environment because we make use of a specific
linker flag (as-needed), thus the order of shared libraries added matters.
Would be nice if this could also be added mainline.

Thanks,

     Thomas

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: acpica-override-CFLAGS.diff --]
[-- Type: text/x-patch, Size: 3382 bytes --]

Make it possible to extend CFLAGS when invoking make

From: Thomas Renninger <trenn@suse.de>

---
 compiler/Makefile         |    7 ++++---
 tools/acpiexec/Makefile   |    6 +++---
 tools/acpisrc/Makefile    |    4 ++--
 tools/acpixtract/Makefile |    2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

Index: acpica-unix-20100702/compiler/Makefile
===================================================================
--- acpica-unix-20100702.orig/compiler/Makefile
+++ acpica-unix-20100702/compiler/Makefile
@@ -7,12 +7,13 @@ PROG=	iasl
 ACPICA_SRC =    ..
 ASL_COMPILER =  $(ACPICA_SRC)/compiler
 ACPICA_COMMON = $(ACPICA_SRC)/common
-ACPICA_CORE =   $(ACPICA_SRC)/components
+#ACPICA_CORE =   $(ACPICA_SRC)/components
+ACPICA_CORE =   $(ACPICA_SRC)
 ACPICA_TOOLS =  $(ACPICA_SRC)/tools
 ACPICA_OSL =    $(ACPICA_SRC)/os_specific/service_layers
 
 NOMAN=	YES
-CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include -I../compiler
+override CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include -I../compiler
 
 #
 # Bison/Flex configuration
@@ -166,7 +167,7 @@ MISC = \
 # Root rule
 #
 $(PROG) : $(INTERMEDIATES) $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
+	$(CC) $(OBJS) $(LDFLAGS) -o $(PROG)
 	$(COPYPROG)
 
 
Index: acpica-unix-20100702/tools/acpiexec/Makefile
===================================================================
--- acpica-unix-20100702.orig/tools/acpiexec/Makefile
+++ acpica-unix-20100702/tools/acpiexec/Makefile
@@ -4,14 +4,14 @@
 
 PROG = acpiexec
 
-ACPICA_SRC =    ../../../source
+ACPICA_SRC =    ../..
 ACPICA_COMMON = $(ACPICA_SRC)/common
-ACPICA_CORE =   $(ACPICA_SRC)/components
+ACPICA_CORE =   $(ACPICA_SRC)
 ACPICA_TOOLS =  $(ACPICA_SRC)/tools
 ACPICA_OSL =    $(ACPICA_SRC)/os_specific/service_layers
 
 NOMAN=	YES
-CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I$(ACPICA_SRC)/include 
+override CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I$(ACPICA_SRC)/include
 
 COMPILE = $(CC) -c $(CFLAGS) -o$@ $?
 LDFLAGS += -lpthread -lrt
Index: acpica-unix-20100702/tools/acpixtract/Makefile
===================================================================
--- acpica-unix-20100702.orig/tools/acpixtract/Makefile
+++ acpica-unix-20100702/tools/acpixtract/Makefile
@@ -3,7 +3,7 @@
 PROG=	acpixtract
 SRCS=	acpixtract.c
 
-CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include 
+override CFLAGS+= -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include
 
 
 acpixtract : $(patsubst %.c,%.o, $(SRCS))
Index: acpica-unix-20100702/tools/acpisrc/Makefile
===================================================================
--- acpica-unix-20100702.orig/tools/acpisrc/Makefile
+++ acpica-unix-20100702/tools/acpisrc/Makefile
@@ -4,11 +4,11 @@ PROG=	acpisrc
 SRCS=	ascase.c asconvrt.c asfile.c asmain.c asremove.c astable.c \
         asutils.c osunixdir.c ../../common/getopt.c
 
-CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include 
+override CFLAGS+= -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include
 
 
 aslmain : $(patsubst %.c,%.o, $(SRCS))
-	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
 
 CLEANFILES= $(PROG)