From a515f25b77259a8c07bdadea7112c040a16ef7fe Mon Sep 17 00:00:00 2001
From: Vladis Dronov <vdronov@redhat.com>
Date: Wed, 30 Oct 2024 22:51:51 +0100
Subject: [PATCH] Makefiles should honor external LDFLAGS

[skip changelog]

Resolves: RHEL-46071

Signed-off-by: Vladis Dronov <vdronov@redhat.com>
---
 qat-zstd-plugin.spec |  1 +
 rh-makefile.patch    | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 rh-makefile.patch

diff --git a/qat-zstd-plugin.spec b/qat-zstd-plugin.spec
index 43d46a5..6f7d088 100644
--- a/qat-zstd-plugin.spec
+++ b/qat-zstd-plugin.spec
@@ -9,6 +9,7 @@ Source0:	%{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 Patch0:		lib-version.patch
 Patch1:		test.patch
+Patch2:		rh-makefile.patch
 
 BuildRequires:	automake
 BuildRequires:	gcc
diff --git a/rh-makefile.patch b/rh-makefile.patch
new file mode 100644
index 0000000..e5ddd6b
--- /dev/null
+++ b/rh-makefile.patch
@@ -0,0 +1,27 @@
+--- a/src/Makefile	2024-10-30 22:20:03.296178391 +0100
++++ b/src/Makefile	2024-10-30 22:21:43.915301707 +0100
+@@ -52,11 +52,11 @@ ifneq ($(ICP_ROOT), )
+ 		   	   -I$(ICP_ROOT)/quickassist/include/dc	\
+ 		       -I$(ICP_ROOT)/quickassist/lookaside/access_layer/include \
+ 			   -I$(ICP_ROOT)/quickassist/utilities/libusdm_drv
+-	LDFLAGS  = -Wl,-rpath,$(ICP_ROOT)/build -L$(ICP_ROOT)/build -lqat_s \
++	LDFLAGS += -Wl,-rpath,$(ICP_ROOT)/build -L$(ICP_ROOT)/build -lqat_s \
+ 			   -lusdm_drv_s
+ else
+ 	QATFLAGS = -DINTREE
+-	LDFLAGS  = -lqat -lusdm
++	LDFLAGS += -lqat -lusdm
+ endif
+ 
+ ifdef ZSTDLIB
+--- a/test/Makefile	2024-10-30 22:22:39.465369781 +0100
++++ b/test/Makefile	2024-10-30 22:24:02.145471097 +0100
+@@ -34,7 +34,7 @@
+ # #######################################################################
+ LIB     = ../src
+ 
+-LDFLAGS = -L$(LIB) -I$(LIB)
++LDFLAGS += -L$(LIB) -I$(LIB)
+ 
+ ifneq ($(ICP_ROOT), )
+ 	LDFLAGS += -lqat_s -lusdm_drv_s -Wl,-rpath,$(ICP_ROOT)/build -L$(ICP_ROOT)/build