From 563960f64c56fad893952917f6af91f2a47ee43b Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 10 2020 00:34:06 +0000 Subject: Apply patch papi-ldflags.patch patch_name: papi-ldflags.patch present_in_specfile: true --- diff --git a/src/components/Makefile_comp_tests.target.in b/src/components/Makefile_comp_tests.target.in index 9a369ad..a4412be 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 3ee8fc2..d70debe 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 63c107c..201f3c8 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 bb51c35..fcc3373 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 718586e..8006dd8 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 a5eab43..58d438a 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 a5eab43..58d438a 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@