public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmaa/files/
@ 2022-06-17 23:45 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-06-17 23:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9fa0feab9df77f5fe7014cbf6f4dd9451fd2e42c
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Jun 17 23:10:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 23:44:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa0feab

dev-libs/libmaa: Fix the build with rlibtool

The configure.in lacks LT_INIT which generates libtool and allows the
build to work with rlibtool which depends on this file to determine if
it should build shared or static libraries.

Closes: https://bugs.gentoo.org/778464
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/25947
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch | 55 ++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch b/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch
new file mode 100644
index 000000000000..bbdecdd89e62
--- /dev/null
+++ b/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/778464
+
+From: orbea <orbea@riseup.net>
+Date: Fri, 17 Jun 2022 15:59:49 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -27,6 +27,7 @@ VERSION=$(MAA_MAJOR).$(MAA_MINOR).$(MAA_TEENY)
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+ 
++top_builddir=	@top_builddir@
+ srcdir=		@srcdir@
+ VPATH=		@srcdir@
+ prefix=		@prefix@
+--- a/configure.in
++++ b/configure.in
+@@ -28,6 +28,8 @@ AC_INIT
+ AC_CONFIG_SRCDIR([maa.h])
+ AC_CONFIG_HEADER(config.h)
+ 
++LT_INIT
++
+ MAA_MAJOR=1
+ MAA_MINOR=3
+ MAA_TEENY=2
+@@ -38,7 +40,7 @@ echo .
+ AC_CANONICAL_HOST
+ AC_PROG_AWK
+ AC_PROG_CC
+-#AC_PROG_LIBTOOL
++AC_PROG_LIBTOOL
+ AC_ISC_POSIX
+ 
+ if test "$CC" = gcc; then
+@@ -57,8 +59,6 @@ AC_CHECK_PROGS(DVIPS,dvips)
+ AC_CHECK_PROGS(REFBIBTEX,refbibtex)
+ AC_CHECK_PROGS(BIBTEX,bibtex)
+ 
+-AC_CHECK_PROG(LIBTOOL,libtool,libtool)
+-
+ echo .
+ echo Checking for header file support
+ 
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -22,6 +22,7 @@
+ 
+ .SUFFIXES:
+ 
++top_builddir=	@top_builddir@
+ srcdir=		@srcdir@
+ VPATH=		@srcdir@
+ prefix=		@prefix@


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmaa/files/
@ 2022-06-18 17:23 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-06-18 17:23 UTC (permalink / raw
  To: gentoo-commits

commit:     51fe359989ae8175bb5a18b24dd8565be80cc436
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sat Jun 18 16:47:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 17:23:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51fe3599

dev-libs/libmaa: Update patch

This updates the patch for correctness.

Bug: https://bugs.gentoo.org/778464
Fixes: 9fa0feab9df77f5fe7014cbf6f4dd9451fd2e42c
Fixes: https://github.com/gentoo/gentoo/pull/25947
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/25963
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch b/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch
index bbdecdd89e62..ca04f423a016 100644
--- a/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch
+++ b/dev-libs/libmaa/files/libmaa-1.3.2-libtool.patch
@@ -25,16 +25,15 @@ Subject: [PATCH] configure: Add missing LT_INIT
  MAA_MAJOR=1
  MAA_MINOR=3
  MAA_TEENY=2
-@@ -38,7 +40,7 @@ echo .
+@@ -38,7 +40,6 @@ echo .
  AC_CANONICAL_HOST
  AC_PROG_AWK
  AC_PROG_CC
 -#AC_PROG_LIBTOOL
-+AC_PROG_LIBTOOL
  AC_ISC_POSIX
  
  if test "$CC" = gcc; then
-@@ -57,8 +59,6 @@ AC_CHECK_PROGS(DVIPS,dvips)
+@@ -57,8 +58,6 @@ AC_CHECK_PROGS(DVIPS,dvips)
  AC_CHECK_PROGS(REFBIBTEX,refbibtex)
  AC_CHECK_PROGS(BIBTEX,bibtex)
  
@@ -43,6 +42,14 @@ Subject: [PATCH] configure: Add missing LT_INIT
  echo .
  echo Checking for header file support
  
+@@ -110,7 +109,6 @@ AC_SUBST(MAA_TEENY)
+ AC_SUBST(MAA_MINOR)
+ AC_SUBST(MAA_MAJOR)
+ AC_SUBST(AWK)
+-AC_SUBST(LIBTOOL)
+ 
+ AC_CONFIG_FILES([Makefile doc/Makefile arggram2c])
+ 
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
 @@ -22,6 +22,7 @@


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-06-18 17:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-18 17:23 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libmaa/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-06-17 23:45 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox