[packages/waili] - more optflags and libdir fixes

[qboosh]

commit 33130cbb2367c7c326e353ac9fded64bb620d506
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 4 21:34:30 2024 +0100

    - more optflags and libdir fixes

 waili-libdir.patch   | 31 +++++++++++++++++++++++++++++++
 waili-optflags.patch |  4 ++--
 waili.spec           |  8 +++++++-
 3 files changed, 40 insertions(+), 3 deletions(-)
---
diff --git a/waili.spec b/waili.spec
index cead1bb..b3e02b0 100644
--- a/waili.spec
+++ b/waili.spec
@@ -19,6 +19,7 @@ Patch6:		%{name}-reproducible_build.patch
 # PLD
 Patch10:	%{name}-libtool_tag_cxx.patch
 Patch11:	%{name}-optflags.patch
+Patch12:	%{name}-libdir.patch
 URL:		https://nalag.cs.kuleuven.be/research/software/wavelets/
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
@@ -76,15 +77,19 @@ Statyczna biblioteka WAILI.
 %patch5 -p1
 %patch6 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 %{__make} -C config \
 	CXX="%{__cxx}" \
+	LIBDIR=%{_libdir} \
 	OPTCPPFLAGS="%{rpmcppflags}" \
 	OPTCXXFLAGS="%{rpmcxxflags}" \
 	OPTLDFLAGS="%{rpmldflags}"
 %{__make} \
 	CXX="%{__cxx}" \
+	LIBDIR=%{_libdir} \
 	OPTCPPFLAGS="%{rpmcppflags}" \
 	OPTCXXFLAGS="%{rpmcxxflags}" \
 	OPTLDFLAGS="%{rpmldflags}"
@@ -93,7 +98,8 @@ Statyczna biblioteka WAILI.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/waili-libdir.patch b/waili-libdir.patch
new file mode 100644
index 0000000..f4ce908
--- /dev/null
+++ b/waili-libdir.patch
@@ -0,0 +1,31 @@
+--- waili-gpl-19990723/lib/Makefile.orig	2024-02-04 16:58:40.211665174 +0100
++++ waili-gpl-19990723/lib/Makefile	2024-02-04 17:56:42.562159540 +0100
+@@ -38,7 +38,7 @@ All: $(LIB)  $(LIB:.la=.a)
+ 
+ $(LIB)  :	$(LIBOBJS:.o=.d) $(LIBOBJS:.o=.lo) $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link --tag=CXX $(CXX) $(CFLAGS)  $(TIFFLIB) -o $(LIB) \
+-		-rpath /usr/lib \
++		-rpath $(LIBDIR) \
+ 		-version-info "$(LIBVERSION)" \
+ 		$(LIBOBJS:.o=.lo)
+ 
+@@ -73,7 +73,7 @@ include ../Rules.make
+ # added for Debian GNU/Linux.
+ 
+ install:   $(LIB)
+-	$(INSTALL) -d $(DESTDIR)$(PREFIX)/lib
+-	$(LIBTOOLINSTALL)  $(INSTALL) $(LIB) $(DESTDIR)$(PREFIX)/lib
++	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
++	$(LIBTOOLINSTALL)  $(INSTALL) $(LIB) $(DESTDIR)$(LIBDIR)
+ 
+ 
+--- waili-gpl-19990723/config/Configure.orig	2024-02-04 18:35:58.349341534 +0100
++++ waili-gpl-19990723/config/Configure	2024-02-04 20:18:11.245183685 +0100
+@@ -68,6 +68,7 @@ EOF
+ echo '#new Debian configuration' >> ../Rules.config
+ #prefix for installation
+ echo 'PREFIX=/usr' >> ../Rules.config
++echo 'LIBDIR=$(PREFIX)/lib' >> ../Rules.config
+ echo 'PACKAGE=libwaili' >> ../Rules.config
+ #libtool support, if available
+ if which libtool >/dev/null ; then
diff --git a/waili-optflags.patch b/waili-optflags.patch
index b7a43cf..e94bf4d 100644
--- a/waili-optflags.patch
+++ b/waili-optflags.patch
@@ -1,5 +1,5 @@
---- ../BUILD/waili-gpl-19990723/config/Rules.Linux.g++.orig	2024-02-03 18:11:46.090701833 +0100
-+++ ../BUILD/waili-gpl-19990723/config/Rules.Linux.g++	2024-02-03 18:36:59.059172047 +0100
+--- waili-gpl-19990723/config/Rules.Linux.g++.orig	2024-02-03 18:11:46.090701833 +0100
++++ waili-gpl-19990723/config/Rules.Linux.g++	2024-02-03 18:36:59.059172047 +0100
 @@ -47,7 +47,6 @@ RANLIB =	ranlib
  DEPLIBS =	$(LIBWAILI)
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/waili.git/commitdiff/33130cbb2367c7c326e353ac9fded64bb620d506