libtool: add recipe for version 2.4.6.

* remove unused patches. * fix inconsistent provide for subpackage ltdl.
2026-04-22 03:30:05 +02:00 · 2017-09-30 12:46:39 +02:00
parent 7948124dc7
commit 62f49c9cd3
4 changed files with 125 additions and 24 deletions
--- a/sys-devel/libtool/libtool-2.4.6.recipe
+++ b/sys-devel/libtool/libtool-2.4.6.recipe
@@ -0,0 +1,100 @@
+SUMMARY="A generic library of support scripts"
+SUMMARY_libltdl="The libtool libltdl library"
+DESCRIPTION="GNU libtool is a set of shell scripts to automatically configure \
+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="1"
+SOURCE_URI="https://ftp.gnu.org/gnu/libtool/libtool-$portVersion.tar.gz"
+CHECKSUM_SHA256="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"
+PATCHES="libtool-$portVersion.patchset"
+
+ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+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
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	libtool${secondaryArchSuffix}_libltdl == $portVersion base
+	cmd:aclocal
+	cmd:automake
+	cmd:sed
+	cmd:tar
+	cmd:find
+	cmd:xargs
+	"
+
+PROVIDES_libltdl="
+	libtool${secondaryArchSuffix}_libltdl = $portVersion compat >= 2.4
+	lib:libltdl$secondaryArchSuffix = 7.3.1 compat >= 7
+	"
+REQUIRES_libltdl="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf >= 2.62
+	cmd:autoheader >= 2.62
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:nm
+	cmd:ranlib
+	cmd:sed
+	cmd:xargs
+	"
+
+BUILD()
+{
+	export MAKEINFO=/bin/true
+	export HELP2MAN=/bin/true
+	export PATCH=/bin/true
+	export XZ=/bin/true
+	touch README-release
+
+	./bootstrap --force
+	SED='sed' NM='nm' LD=ld runConfigure ./configure \
+		--with-gnu-ld
+	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
+	# openSuse libtool doesn't have those variables set either, but building
+	# according to their libroot.spec produces a libtool that has them set as
+	# well. My guess is that one has to build libtool without a C++ compiler
+	# installed to get that result.
+	sed -i -e 's@^predep_objects=".*"$@predep_objects=""'@ \
+		-e 's@^postdep_objects=".*"$@postdep_objects=""'@ \
+		-e 's@^postdeps=".*"$@postdeps=""'@ \
+		-e 's@^compiler_lib_search_path=".*"$@compiler_lib_search_path=""'@ \
+		-e 's@^compiler_lib_search_dirs=".*"$@compiler_lib_search_dirs=""'@ \
+		libtool
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs libltdl
+
+	# libltdl package
+	packageEntries libltdl \
+		$libDir/libltdl*
+
+	# main package
+	rmdir $libDir
+}
+
+TEST()
+{
+	make check
+}
--- a/sys-devel/libtool/patches/libtool-2.4.2.patch
+++ b/sys-devel/libtool/patches/libtool-2.4.2.patch
@@ -1,12 +0,0 @@
-diff -urN libtool-2.4.2/libltdl/m4/libtool.m4 libtool-2.4.2-haiku/libltdl/m4/libtool.m4
--- libtool-2.4.2/libltdl/m4/libtool.m4	2010-09-22 01:41:19.046923776 -0700
-+++ libtool-2.4.2-haiku/libltdl/m4/libtool.m4	2011-07-26 09:06:47.362807296 -0700
-@@ -2472,7 +2472,7 @@
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-+  shlibpath_overrides_runpath=no
-   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-   hardcode_into_libs=yes
-   ;;
--- a/sys-devel/libtool/patches/libtool-2.4.6.patchset
+++ b/sys-devel/libtool/patches/libtool-2.4.6.patchset
@@ -0,0 +1,25 @@
+From f1c971cb704ffd1d012b6adb770686282011687c Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 30 Sep 2017 12:12:08 +0200
+Subject: Adjust haiku configuration of upstream libtool for packaging.
+
+
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index a3bc337..1885e22 100644
+--- a/m4/libtool.m4
+++ b/m4/libtool.m4
+@@ -2709,8 +2709,9 @@ haiku*)
+   soname_spec='$libname$release$shared_ext$major'
+   shlibpath_var=LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+-  hardcode_into_libs=yes
+  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
+  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
+  hardcode_into_libs=no
+   ;;
+ 
+ hpux9* | hpux10* | hpux11*)
+-- 
+2.13.1
+
--- a/sys-devel/libtool/patches/libtool-2.4.patch
+++ b/sys-devel/libtool/patches/libtool-2.4.patch
@@ -1,12 +0,0 @@
-diff -urN libtool-2.4/libltdl/m4/libtool.m4 libtool-2.4-haiku/libltdl/m4/libtool.m4
--- libtool-2.4/libltdl/m4/libtool.m4	2010-09-22 01:41:19.046923776 -0700
-+++ libtool-2.4-haiku/libltdl/m4/libtool.m4	2011-07-26 09:06:47.362807296 -0700
-@@ -2472,7 +2472,7 @@
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-+  shlibpath_overrides_runpath=no
-   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-   hardcode_into_libs=yes
-   ;;