diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-power/iasl/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'sys-power/iasl/files')
-rw-r--r-- | sys-power/iasl/files/iasl-20200214-Makefile.patch | 105 | ||||
-rw-r--r-- | sys-power/iasl/files/iasl-20200326-Makefile.patch | 106 |
2 files changed, 211 insertions, 0 deletions
diff --git a/sys-power/iasl/files/iasl-20200214-Makefile.patch b/sys-power/iasl/files/iasl-20200214-Makefile.patch new file mode 100644 index 000000000000..e5fb563cf922 --- /dev/null +++ b/sys-power/iasl/files/iasl-20200214-Makefile.patch @@ -0,0 +1,105 @@ +--- a/generate/unix/acpiexec/Makefile ++++ b/generate/unix/acpiexec/Makefile +@@ -256,12 +256,12 @@ + endif + + ifneq ($(ACPI_HOST),_QNX) +-LDFLAGS += -lpthread ++LIBS += -lpthread + endif + + ifneq ($(ACPI_HOST),_APPLE) + ifneq ($(ACPI_HOST),_QNX) +-LDFLAGS += -lrt ++LIBS += -lrt + endif + endif + +--- a/generate/unix/Makefile.config ++++ b/generate/unix/Makefile.config +@@ -35,15 +35,14 @@ + .SUFFIXES : + PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl + ACPI_HOST ?= _CYGWIN +-CC ?= gcc + + # + # Common defines + # + OBJDIR = obj + BINDIR = bin +-COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $< +-LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS) ++COMPILEOBJ = $(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPT_CFLAGS) -o $@ $< ++LINKPROG = $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS) + PREFIX ?= /usr + INSTALLDIR = $(PREFIX)/bin + UNAME_S := $(shell uname -s) +@@ -76,7 +75,7 @@ + INSTALLFLAGS ?= -f + else + INSTALL = install +-INSTALLFLAGS ?= -m 555 -s ++INSTALLFLAGS ?= -m 555 + endif + + INSTALLPROG = \ +@@ -153,26 +152,18 @@ + # + ifeq ($(M32),TRUE) + CFLAGS +=-m32 +-LDFLAGS +=-m32 ++LIBS +=-m32 + endif + + # + # Optionally disable optimizations. Optimization causes problems on + # some compilers such as gcc 4.4 + # +-ifneq ($(NOOPT),TRUE) +-OPT_CFLAGS += -O2 +-else +-OPT_CFLAGS += -O0 +-endif + + # + # Optionally disable fortify source. This option can cause + # compile errors in toolchains where it is already defined. + # +-ifneq ($(NOFORTIFY),TRUE) +-OPT_CFLAGS += -D_FORTIFY_SOURCE=2 +-endif + + CFLAGS += \ + -D$(HOST)\ +@@ -264,11 +255,11 @@ + #YACC= byacc + #YFLAGS += + # +-YACC= bison ++YACC= LC_ALL=C bison + YFLAGS += -y + + MACROPROC= m4 + MFLAGS= -P -I$(ASL_COMPILER) + +-LEX= flex ++LEX= LC_ALL=C flex + LFLAGS += -i -s +--- a/generate/unix/Makefile.rules ++++ b/generate/unix/Makefile.rules +@@ -12,12 +12,12 @@ + + $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS) + @echo "- Link" $(PROG) +- @$(LINKPROG) ++ $(LINKPROG) + $(RENAMEPROG) + + $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) + @echo $(PROG) $< +- @$(COMPILEOBJ) ++ $(COMPILEOBJ) + + clean : + @rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC) diff --git a/sys-power/iasl/files/iasl-20200326-Makefile.patch b/sys-power/iasl/files/iasl-20200326-Makefile.patch new file mode 100644 index 000000000000..4848c80ec663 --- /dev/null +++ b/sys-power/iasl/files/iasl-20200326-Makefile.patch @@ -0,0 +1,106 @@ +--- a/generate/unix/acpiexec/Makefile ++++ b/generate/unix/acpiexec/Makefile +@@ -256,12 +256,12 @@ + endif + + ifneq ($(ACPI_HOST),_QNX) +-LDFLAGS += -lpthread ++LIBS += -lpthread + endif + + ifneq ($(ACPI_HOST),_APPLE) + ifneq ($(ACPI_HOST),_QNX) +-LDFLAGS += -lrt ++LIBS += -lrt + endif + endif + +--- a/generate/unix/Makefile.config ++++ b/generate/unix/Makefile.config +@@ -35,15 +35,14 @@ + .SUFFIXES : + PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl + ACPI_HOST ?= _CYGWIN +-CC ?= gcc + + # + # Common defines + # + OBJDIR = obj + BINDIR = bin +-COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $< +-LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS) ++COMPILEOBJ = $(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPT_CFLAGS) -o $@ $< ++LINKPROG = $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS) + PREFIX ?= /usr + INSTALLDIR = $(PREFIX)/bin + UNAME_S := $(shell uname -s) +@@ -76,7 +75,7 @@ + INSTALLFLAGS ?= -f + else + INSTALL = install +-INSTALLFLAGS ?= -m 555 -s ++INSTALLFLAGS ?= -m 555 + endif + + INSTALLPROG = \ +@@ -161,26 +160,18 @@ + # + ifeq ($(M32),TRUE) + CFLAGS +=-m32 +-LDFLAGS +=-m32 ++LIBS +=-m32 + endif + + # + # Optionally disable optimizations. Optimization causes problems on + # some compilers such as gcc 4.4 + # +-ifneq ($(NOOPT),TRUE) +-OPT_CFLAGS += -O2 +-else +-OPT_CFLAGS += -O0 +-endif + + # + # Optionally disable fortify source. This option can cause + # compile errors in toolchains where it is already defined. + # +-ifneq ($(NOFORTIFY),TRUE) +-OPT_CFLAGS += -D_FORTIFY_SOURCE=2 +-endif + + CFLAGS += \ + -D$(ACPI_HOST)\ +@@ -272,12 +263,12 @@ + #YACC= byacc + #YFLAGS += + # +-YACC= bison ++YACC= LC_ALL=C bison + YFLAGS += -y + + MACROPROC= m4 + MFLAGS= -P -I$(ASL_COMPILER) + +-LEX= flex ++LEX= LC_ALL=C flex + LFLAGS += -i -s + DLFLAGS += -i +--- a/generate/unix/Makefile.rules ++++ b/generate/unix/Makefile.rules +@@ -12,12 +12,12 @@ + + $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS) + @echo "- Link" $(PROG) +- @$(LINKPROG) ++ $(LINKPROG) + $(RENAMEPROG) + + $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) + @echo $(PROG) $< +- @$(COMPILEOBJ) ++ $(COMPILEOBJ) + + clean : + @rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC) |