diff --git a/0003-use-LDFLAGS-when-linking-the-tools.patch b/0003-use-LDFLAGS-when-linking-the-tools.patch new file mode 100644 index 0000000..287a508 --- /dev/null +++ b/0003-use-LDFLAGS-when-linking-the-tools.patch @@ -0,0 +1,29 @@ +From 57c32ddf4435155bd4f3965f4e526e39e858e2bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Thu, 24 Sep 2020 14:03:07 +0200 +Subject: [PATCH 3/3] use LDFLAGS when linking the tools + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a3ca5bd..1a26dcd 100644 +--- a/Makefile ++++ b/Makefile +@@ -49,10 +49,10 @@ libqc.so.$(VERSION): $(OBJECTS) + ln -s libqc.so.$(VERSION) libqc.so.$(VERM) + + zname: zname.c zhypinfo.h libqc.so.$(VERSION) +- $(CC) $(CFLAGS) -L. $< -o $@ libqc.so.$(VERSION) ++ $(CC) $(CFLAGS) $(LDFLAGS) -L. $< -o $@ libqc.so.$(VERSION) + + zhypinfo: zhypinfo.c zhypinfo.h libqc.so.$(VERSION) +- $(CC) $(CFLAGS) -L. $< -o $@ libqc.so.$(VERSION) ++ $(CC) $(CFLAGS) $(LDFLAGS) -L. $< -o $@ libqc.so.$(VERSION) + + qc_test: qc_test.c libqc.a + $(CC) $(CFLAGS) -static $< -L. -lqc -o $@ +-- +2.26.2 + diff --git a/qclib.spec b/qclib.spec index 040a332..6c0db14 100644 --- a/qclib.spec +++ b/qclib.spec @@ -1,12 +1,13 @@ Name: qclib Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for extraction of system information for Linux on z Systems License: BSD URL: http://www.ibm.com/developerworks/linux/linux390/qclib.html Source0: http://public.dhe.ibm.com/software/dw/linux390/ht_src/%{name}-%{version}.tgz Patch0: 0001-add-missing-check-in-Makefile.patch Patch1: 0002-introduce-MANDIR-in-Makefile.patch +Patch2: 0003-use-LDFLAGS-when-linking-the-tools.patch ExclusiveArch: s390 s390x BuildRequires: gcc BuildRequires: glibc-static @@ -82,6 +83,9 @@ make test-sh test %changelog +* Thu Sep 24 2020 Dan Horák - 2.2.0-2 +- fix linking + * Wed Sep 23 2020 Dan Horák - 2.2.0-1 - updated to 2.2.0