Add use of %__global_ldflags. Closes BZ#1126134.

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2014-10-01 13:31:13 -06:00
parent 1c109dbf8c
commit af93ebf6ad
2 changed files with 38 additions and 1 deletions

34
OPT_LDFLAGS.patch Normal file
View File

@ -0,0 +1,34 @@
diff -Naur acpica-unix2-20140926/generate/unix/Makefile.config acpica-unix2-20140926-patch/generate/unix/Makefile.config
--- acpica-unix2-20140926/generate/unix/Makefile.config 2014-09-26 12:02:29.000000000 -0600
+++ acpica-unix2-20140926-patch/generate/unix/Makefile.config 2014-10-01 12:53:53.510530248 -0600
@@ -23,6 +23,9 @@
# OPT_CFLAGS can be overridden on the make command line by
# adding OPT_CFLAGS="..." to the invocation.
#
+# OPT_LDFLAGS can be overridden on the make command line by
+# adding OPT_LDFLAGS="..." to the invocation.
+#
# Notes:
# gcc should be version 4 or greater, otherwise some of the options
# used will not be recognized.
@@ -43,7 +46,7 @@
OBJDIR = obj
BINDIR = bin
COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $<
-LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS)
+LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS)
PREFIX ?= /usr
INSTALLDIR = $(PREFIX)/bin
UNAME_S := $(shell uname -s)
@@ -136,6 +139,11 @@
OPT_CFLAGS ?= $(CWARNINGFLAGS)
#
+# Common linker flags
+#
+OPT_LDFLAGS ?=
+
+#
# Optionally disable optimizations. Optimization causes problems on
# some compilers such as gcc 4.4
#

View File

@ -31,6 +31,7 @@ Patch4: asllookup-miscompare.patch
Patch5: aapits-makefile.patch Patch5: aapits-makefile.patch
Patch6: re-enable-big-endian.patch Patch6: re-enable-big-endian.patch
Patch7: aslts-always-reports.patch Patch7: aslts-always-reports.patch
Patch8: OPT_LDFLAGS.patch
BuildRequires: bison patchutils flex BuildRequires: bison patchutils flex
@ -89,6 +90,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch5 -p1 -b .aapits-makefile %patch5 -p1 -b .aapits-makefile
%patch6 -p1 -b .re-enable-big-endian %patch6 -p1 -b .re-enable-big-endian
%patch7 -p1 -b .aslts-always-reports %patch7 -p1 -b .aslts-always-reports
%patch8 -p1 -b .OPT_LDFLAGS
cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1 cp -p %{SOURCE3} iasl.1
@ -111,7 +113,7 @@ chmod a-x source/compiler/new_table.txt
%build %build
make OPT_CFLAGS="%{optflags}" make OPT_CFLAGS="%{optflags}" OPT_LDFLAGS="%{__global_ldflags}"
%install %install
@ -198,6 +200,7 @@ fi
- Refresh patches - Refresh patches
- Add patch to ensure ASLTS always reports when an error occurs, instead - Add patch to ensure ASLTS always reports when an error occurs, instead
of glossing over it. of glossing over it.
- Add use of %__global_ldflags. Closes BZ#1126134.
* Fri Aug 29 2014 Al Stone <ahs3@redhat.com> - 20140828-1 * Fri Aug 29 2014 Al Stone <ahs3@redhat.com> - 20140828-1
- Update to latest upstream. Closes BZ#1135352. - Update to latest upstream. Closes BZ#1135352.