From 1b8c752a055ddb65f15e38593a79137906a6330b Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Dec 03 2020 08:11:41 +0000
Subject: Apply patch rhel8_build.patch


patch_name: rhel8_build.patch
present_in_specfile: true

---

diff --git a/Makefile b/Makefile
index f95c2e6..fd5d83a 100644
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,7 @@ GDB_FLAGS=
 # TARGET_CFLAGS will be configured automatically by configure
 TARGET_CFLAGS=
 
-CRASH_CFLAGS=-g -D${TARGET} ${TARGET_CFLAGS} ${GDB_FLAGS} ${CFLAGS}
+CRASH_CFLAGS=-g -D${TARGET} ${TARGET_CFLAGS} ${GDB_FLAGS} ${CFLAGS} ${CPPFLAGS} -fPIE
 
 GPL_FILES=
 TAR_FILES=${SOURCE_FILES} Makefile ${GPL_FILES} README .rh_rpm_package crash.8 \
@@ -228,7 +228,7 @@ all: make_configure
 gdb_merge: force
 	@if [ ! -f ${GDB}/README ]; then \
 	  make --no-print-directory gdb_unzip; fi
-	@echo "${LDFLAGS} -lz -llzo2 -lsnappy -ldl -rdynamic" > ${GDB}/gdb/mergelibs
+	@echo "${LDFLAGS} -lz -llzo2 -lsnappy -ldl -rdynamic -Wl,-z,now -fpie" > ${GDB}/gdb/mergelibs
 	@echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj
 	@rm -f ${PROGRAM}
 	@if [ ! -f ${GDB}/config.status ]; then \
diff --git a/configure.c b/configure.c
index 7f6d19e..e0d109e 100644
--- a/configure.c
+++ b/configure.c
@@ -780,7 +780,8 @@ build_configure(struct supported_gdb_version *sp)
                         fprintf(fp2, "%s\n", sp->GDB);
                         sprintf(target_data.gdb_version, "%s", &sp->GDB[4]);
 		} else if (strncmp(buf, "LDFLAGS=", strlen("LDFLAGS=")) == 0) {
-                       	fprintf(fp2, "LDFLAGS=%s\n", ldflags ? ldflags : "");
+			if (ldflags)
+				fprintf(fp2, "LDFLAGS=%s\n", ldflags ? ldflags : "");
 		} else
 			fprintf(fp2, "%s", buf);