Resolve: rhbz#1573096

papi-ldflags.patch

@@ -0,0 +1,115 @@
+commit bde3da26f1f2755689e16fc9f5ab404367d1fdc8
+Author: Vince Weaver <vincent.weaver@maine.edu>
+Date:   Wed Jan 24 14:13:28 2018 -0500
+
+    build: fix various LDFLAGS/CFLAGS issues
+    
+    issues were reported by Andreas Beckmann <anbe@debian.org>
+
+diff --git a/src/components/Makefile_comp_tests.target.in b/src/components/Makefile_comp_tests.target.in
+index 9a369adb..a4412bea 100644
+--- a/src/components/Makefile_comp_tests.target.in
++++ b/src/components/Makefile_comp_tests.target.in
+@@ -9,7 +9,7 @@ INCLUDE = -I. -I@includedir@ -I$(datadir) -I$(testlibdir) -I$(validationlibdir)
+ LIBDIR  = @libdir@
+ PAPILIB = $(datadir)/@LIBRARY@
+ TESTLIB = $(testlibdir)/libtestlib.a
+-LDFLAGS = @LDL@
++LDFLAGS = @LDFLAGS@ @LDL@
+ CC	= @CC@
+ F77	= @F77@
+ CC_R	= @CC_R@
+diff --git a/src/components/perf_event_uncore/tests/Makefile b/src/components/perf_event_uncore/tests/Makefile
+index 3ee8fc2a..d70debe6 100644
+--- a/src/components/perf_event_uncore/tests/Makefile
++++ b/src/components/perf_event_uncore/tests/Makefile
+@@ -17,19 +17,19 @@ perf_event_uncore_lib.o:	perf_event_uncore_lib.c perf_event_uncore_lib.h
+ 
+ 
+ perf_event_amd_northbridge:	perf_event_amd_northbridge.o $(DOLOOPS) $(UTILOBJS) $(PAPILIB) $(DOLOOPS)
+-	$(CC) $(LFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ 
+ perf_event_uncore:	perf_event_uncore.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o
+-	$(CC) $(LFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ 
+ perf_event_uncore_attach:	perf_event_uncore_attach.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o
+-	$(CC) $(LFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ 
+ perf_event_uncore_multiple:	perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB)
+-	$(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) 
++	$(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) 
+ 
+ perf_event_uncore_cbox:	perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB)
+-	$(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ 
+ 
+ 
+diff --git a/src/ctests/Makefile.recipies b/src/ctests/Makefile.recipies
+index 63c107c0..201f3c85 100644
+--- a/src/ctests/Makefile.recipies
++++ b/src/ctests/Makefile.recipies
+@@ -350,7 +350,7 @@ code2name: code2name.c $(TESTLIB) $(PAPILIB)
+ 	$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) code2name.c $(TESTLIB) $(PAPILIB) $(LDFLAGS) -o code2name
+ 
+ attach_target: attach_target.c $(DOLOOPS)
+-	-$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB)
++	-$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB) $(LDFLAGS)
+ 
+ zero_attach: zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB)
+ 	-$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -o zero_attach
+diff --git a/src/ctests/Makefile.target.in b/src/ctests/Makefile.target.in
+index bb51c350..fcc3373b 100644
+--- a/src/ctests/Makefile.target.in
++++ b/src/ctests/Makefile.target.in
+@@ -12,7 +12,7 @@ LIBRARY=@LIBRARY@
+ SHLIB=@SHLIB@
+ PAPILIB = ../@LINKLIB@
+ TESTLIB = $(testlibdir)/libtestlib.a
+-LDFLAGS = @LDL@ @STATIC@
++LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
+ CC	= @CC@
+ MPICC	= @MPICC@
+ F77	= @F77@
+diff --git a/src/ftests/Makefile.target.in b/src/ftests/Makefile.target.in
+index 718586e5..8006dd8d 100644
+--- a/src/ftests/Makefile.target.in
++++ b/src/ftests/Makefile.target.in
+@@ -11,7 +11,7 @@ LIBRARY = @LIBRARY@
+ SHLIB=@SHLIB@
+ PAPILIB = ../@LINKLIB@
+ TESTLIB = $(testlibdir)/libtestlib.a
+-LDFLAGS = @LDL@
++LDFLAGS = @LDFLAGS@ @LDL@
+ CC	= @CC@
+ F77	= @F77@
+ CC_R	= @CC_R@
+diff --git a/src/utils/Makefile.target.in b/src/utils/Makefile.target.in
+index a5eab438..58d438a1 100644
+--- a/src/utils/Makefile.target.in
++++ b/src/utils/Makefile.target.in
+@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@
+ SHLIB=@SHLIB@
+ PAPILIB = ../@LINKLIB@
+ TESTLIB = $(testlibdir)/libtestlib.a
+-LDFLAGS = @LDL@ @STATIC@
++LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
+ CC	= @CC@
+ MPICC	= @MPICC@
+ F77	= @F77@
+diff --git a/src/validation_tests/Makefile.target.in b/src/validation_tests/Makefile.target.in
+index a5eab438..58d438a1 100644
+--- a/src/validation_tests/Makefile.target.in
++++ b/src/validation_tests/Makefile.target.in
+@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@
+ SHLIB=@SHLIB@
+ PAPILIB = ../@LINKLIB@
+ TESTLIB = $(testlibdir)/libtestlib.a
+-LDFLAGS = @LDL@ @STATIC@
++LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
+ CC	= @CC@
+ MPICC	= @MPICC@
+ F77	= @F77@

papi.spec

@@ -8,12 +8,13 @@
 Summary: Performance Application Programming Interface
 Name: papi
 Version: 5.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/System
 Requires: papi-libs = %{version}-%{release}
 URL: http://icl.cs.utk.edu/papi/
 Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
+Patch1: papi-ldflags.patch
 BuildRequires: autoconf
 BuildRequires: doxygen
 BuildRequires: ncurses-devel
@@ -75,6 +76,7 @@ the PAPI user-space libraries and interfaces.
 
 %prep
 %setup -q
+%patch1 -p1 -b .ldflags
 
 %build
 %if %{without bundled_libpfm}
@@ -157,6 +159,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
 %{_libdir}/*.a
 
 %changelog
+* Mon Apr 30 2018 William Cohen <wcohen@redhat.com> - 5.6.0-5
+- Include various LDFLAGS/CFLAGS.
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild