Accepting request 102402 from home:elvigia:branches:hardware

- Fix linking

OBS-URL: https://build.opensuse.org/request/show/102402
OBS-URL: https://build.opensuse.org/package/show/hardware/fwts?expand=0&rev=3

fwts-linking.patch

@@ -0,0 +1,52 @@
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -67,9 +67,7 @@ fwts_SOURCES = main.c \
+ 	uefi/csm/csm.c \
+ 	uefi/uefidump/uefidump.c
+ 
+-fwts_LDFLAGS = -ljson -lm
+-
+-fwts_LDADD = \
++fwts_LDADD = -ljson -lm \
+ 	-Llib/src -lfwts \
+ 	-L$(top_srcdir)/src/acpica -lfwtsacpica
+ 
+--- src/acpica/Makefile.am.orig
++++ src/acpica/Makefile.am
+@@ -34,7 +34,8 @@ BUILT_SOURCES = osunixxf_munged.c dsopco
+ CLEANFILES = osunixxf_munged.c
+ 
+ lib_LTLIBRARIES = libfwtsacpica.la
+-libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
++libfwtsacpica_la_LDFLAGS = -no-undefined -version-info 1:0:0
++libfwtsacpica_la_LIBADD = -lpthread
+ libfwtsacpica_la_SOURCES = \
+ 	fwts_acpica.c \
+ 	osunixxf_munged.c \
+--- src/acpica/source/compiler/Makefile.am.orig
++++ src/acpica/source/compiler/Makefile.am
+@@ -48,7 +48,9 @@ BUILT_SOURCES = aslcompilerparse.c aslco
+ #
+ # Just export fwts specific API so we don't clash with core ACPICA library
+ #
+-libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -lpthread -version-info 1:0:0
++libfwtsiasl_la_LDFLAGS = -no-undefined -export-symbols-regex "fwts_.*" -version-info 1:0:0
++
++libfwtsiasl_la_LIBADD = -lpthread
+ 
+ CLEANFILES = y.output y.tab.c y.tab.h aslcompiler.y.h \
+ 	aslcompilerparse.c aslcompilerlex.c \
+--- src/lib/src/Makefile.am.orig
++++ src/lib/src/Makefile.am
+@@ -5,9 +5,10 @@ AM_CPPFLAGS = \
+ 	-Wall
+ 
+ lib_LTLIBRARIES = libfwts.la
+-libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
++libfwts_la_LDFLAGS = -no-undefined -version-info 1:0:0 \
+ 	-L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl
+ 
++libfwts_la_LIBADD = -lpcre -lpthread -ljson -lfwtsiasl
+ libfwts_la_SOURCES = \
+ 	fwts_acpi.c \
+ 	fwts_acpid.c \

fwts.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb  1 17:46:43 UTC 2012 - crrodriguez@opensuse.org
+
+- Fix linking 
+
 -------------------------------------------------------------------
 Mon Dec 12 05:02:37 UTC 2011 - crrodriguez@opensuse.org
 

fwts.spec

@@ -18,6 +18,7 @@ Url:            http://kernel.ubuntu.com/git?p=cking/fwts/.git
 Group:          Development/Tools/Other
 Source:         %{name}-%{version}.tar.bz2
 Patch:         fwts-opensuse.patch
+Patch1:        fwts-linking.patch
 BuildRequires:  pciutils-devel
 BuildRequires:  pcre-devel
 BuildRequires:  libjson-devel
@@ -42,7 +43,7 @@ issues.
 %prep
 %setup -q
 %patch
-
+%patch1
 %build
 autoreconf -fiv
 export CFLAGS="%optflags -fno-strict-aliasing"