From b0c0e8bd7a79e8510fb88c5c7a6131426a148e7e Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Wed, 24 Apr 2024 20:48:27 +0200
Subject: [PATCH] makefiles: change condition

Old system do not work well with -l% in findstring,
so use a different strategy to recognize whether -lreadline needs
another library (-ltinfo, -lncourses...)
(So we don't need to solve this via 'configure')

Also for now comment out -Wl,-z,pack-relative-relocs and leave it
for the package maintainer whether they want to use.
Possibly add some 'configure' autodetection for usable switch,
as it's relatively new feature..
---
 libdm/make.tmpl.in | 10 ++++++----
 make.tmpl.in       | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index 14e7ee873..ee923f83b 100644
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -241,12 +241,14 @@ endif
 ifeq (,$(findstring -z$(comma)now,$(LDFLAGS)))
   LDFLAGS += -Wl,-z,now
 endif
-ifeq (,$(findstring -z$(comma)pack-relative-relocs,$(LDFLAGS)))
-  LDFLAGS += -Wl,-z,pack-relative-relocs
-endif
+# TODO: think about configure option for this flag
+# for now leave decision on distro maitainer
+#ifeq (,$(findstring -z$(comma)pack-relative-relocs,$(LDFLAGS)))
+#  LDFLAGS += -Wl,-z,pack-relative-relocs
+#endif
 # For systems with old readline library that requires extra libs to link with
 # we stick to default --no-as-needed and we avoid adding --as-needed flag
-ifneq (2,$(words $(findstring -l%,$(READLINE_LIBS))))
+ifneq (-l,$(findstring -l,$(filter-out %readline,$(READLINE_LIBS))))
 ifeq (,$(findstring --as-needed,$(LDFLAGS)))
   LDFLAGS += -Wl,--as-needed
 endif
diff --git a/make.tmpl.in b/make.tmpl.in
index c1014145d..3d3e8c553 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -278,12 +278,14 @@ endif
 ifeq (,$(findstring -z$(comma)now,$(LDFLAGS)))
   LDFLAGS += -Wl,-z,now
 endif
-ifeq (,$(findstring -z$(comma)pack-relative-relocs,$(LDFLAGS)))
-  LDFLAGS += -Wl,-z,pack-relative-relocs
-endif
+# TODO: think about configure option for this flag
+# for now leave decision on distro maitainer
+#ifeq (,$(findstring -z$(comma)pack-relative-relocs,$(LDFLAGS)))
+#  LDFLAGS += -Wl,-z,pack-relative-relocs
+#endif
 # For systems with old readline library that requires extra libs to link with
 # we stick to default --no-as-needed and we avoid adding --as-needed flag
-ifneq (2,$(words $(findstring -l%,$(READLINE_LIBS))))
+ifneq (-l,$(findstring -l,$(filter-out %readline,$(READLINE_LIBS))))
 ifeq (,$(findstring --as-needed,$(LDFLAGS)))
   LDFLAGS += -Wl,--as-needed
 endif