From b75fc9fe59fee0b6038c88853482aabf3111ec4e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 29 Apr 2023 07:14:13 +0200
Subject: [PATCH] libtool, disable static library, remove libtool file (#8520)

keep all in one package
---
 sys-devel/libtool/libtool-2.4.6.recipe | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/sys-devel/libtool/libtool-2.4.6.recipe b/sys-devel/libtool/libtool-2.4.6.recipe
index e89db7e68..5e27ba65f 100644
--- a/sys-devel/libtool/libtool-2.4.6.recipe
+++ b/sys-devel/libtool/libtool-2.4.6.recipe
@@ -4,7 +4,7 @@ UNIX architectures to build shared libraries in a generic fashion."
 HOMEPAGE="http://www.gnu.org/software/libtool"
 COPYRIGHT="2004-2010 Free Software Foundation, Inc."
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://ftp.gnu.org/gnu/libtool/libtool-$portVersion.tar.gz"
 CHECKSUM_SHA256="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"
 PATCHES="libtool-$portVersion.patchset"
@@ -12,11 +12,14 @@ PATCHES="libtool-$portVersion.patchset"
 ARCHITECTURES="all ?arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="7.3.1"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libtool$secondaryArchSuffix = $portVersion compat >= 2.4
 	cmd:libtool$secondaryArchSuffix = $portVersion compat >= 2.4
 	cmd:libtoolize$secondaryArchSuffix = $portVersion compat >= 2.4
-	devel:libltdl$secondaryArchSuffix = 7.3.1 compat >= 7
+	devel:libltdl$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -32,7 +35,7 @@ REQUIRES="
 SUMMARY_libltdl="The libtool libltdl library"
 PROVIDES_libltdl="
 	libtool${secondaryArchSuffix}_libltdl = $portVersion compat >= 2.4
-	lib:libltdl$secondaryArchSuffix = 7.3.1 compat >= 7
+	lib:libltdl$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_libltdl="
 	haiku$secondaryArchSuffix
@@ -70,7 +73,8 @@ BUILD()
 		# But we must run it, because libtool is shipped with old aclocal-1.15
 		# files and we have only a newer aclocal. So just restore the file.
 	SED='sed' NM='nm' LD=ld runConfigure ./configure \
-		--with-gnu-ld
+		--with-gnu-ld \
+		--disable-static
 	make $jobArgs
 	# Desperate move to remove the absolute paths from libtool. For some reason
 	# only for the C++ compiler those are set (not for the C compiler). In
@@ -89,14 +93,15 @@ BUILD()
 INSTALL()
 {
 	make install
-	prepareInstalledDevelLibs libltdl
+
+	# remove libtool file
+	rm -f $libDir/libltdl.la
+
+	prepareInstalledDevelLib libltdl
 
 	# libltdl package
 	packageEntries libltdl \
-		$libDir/libltdl*
-
-	# main package
-	rmdir $libDir
+		$libDir
 }
 
 TEST()