[gentoo-commits] repo/gentoo:master commit in: dev-libs/uulib/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/uulib/files/

[Sam James]

commit:     b0ff19d53846768654f33f004781072fa0f4dcfc
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Jul 15 04:05:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 04:32:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ff19d5

dev-libs/uulib: Update patch

The default value of libdir depends upon exec_prefix. In gentoo that
doesn't matter since configure uses --libdir, but the patch should be
corrected regardless.

Fixes: https://github.com/gentoo/gentoo/commit/62e58857f57d69293d98d6c8cb852acbd6414f98
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26414
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/uulib/files/uulib-0.5.20-libtool.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-libs/uulib/files/uulib-0.5.20-libtool.patch b/dev-libs/uulib/files/uulib-0.5.20-libtool.patch
index 55df73c03ac8..2840176552f3 100644
--- a/dev-libs/uulib/files/uulib-0.5.20-libtool.patch
+++ b/dev-libs/uulib/files/uulib-0.5.20-libtool.patch
@@ -23,13 +23,14 @@ index 951c731..342bf56 100644
  # the ranlib program
  #
  RANLIB =	@RANLIB@
-@@ -40,9 +44,15 @@ PATCH	=	@PATCH@
+@@ -40,9 +44,16 @@ PATCH	=	@PATCH@
  VDEF	=	-DVERSION=\"$(VERSION)\" -DPATCH=\"$(PATCH)\"
  #
  
 +top_builddir = @top_builddir@
 +
 +prefix = @prefix@
++exec_prefix = @exec_prefix@
 +libdir = @libdir@
 +includedir = @includedir@
 +
@@ -40,7 +41,7 @@ index 951c731..342bf56 100644
  
  #
  # make stuff
-@@ -51,11 +61,11 @@ UULIB_OBJ	=	${UULIB_SOURCE:.c=.o}
+@@ -51,11 +62,11 @@ UULIB_OBJ  =       ${UULIB_SOURCE:.c=.o}
  .SUFFIXES:
  .SUFFIXES: .c .o
  
@@ -54,7 +55,7 @@ index 951c731..342bf56 100644
  
  distclean:	clean
  	rm -f config.status config.cache config.log Makefile config.h
-@@ -67,22 +77,25 @@ new:		clean
+@@ -67,22 +78,25 @@ new:		clean
  	rm -f libuu.a
  	$(MAKE) all