From 8167741595a518a2aa916de430da8a56e7be3481 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 21:32:59 +0200 Subject: [PATCH] Adjust libtool a bit more to our needs. * add /boot/common/develop/lib to link-time library search path * configure libtool to not hardcode run-time paths into libraries --- sys-devel/libtool/libtool-2.4.recipe | 2 +- .../2.4/adjust_config_for_packaging.patch | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 3cd499b72..19406dfdf 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PATCHES=" diff --git a/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch b/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch index e8a419a7f..53cdd3033 100644 --- a/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch +++ b/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch @@ -1,18 +1,17 @@ Adjust haiku configuration of upstream libtool for packaging. -diff -ur libtool-2.4/libltdl/m4/libtool.m4 libtool-2.4/libltdl/m4/libtool.m4 ---- libtool-2.4/libltdl/m4/libtool.m4 2010-09-22 08:41:19.064749568 +0000 -+++ libtool-2.4/libltdl/m4/libtool.m4 2011-07-24 16:58:02.885260288 +0000 -@@ -2472,8 +2472,10 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +diff -ruwN 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 10:41:19.021233664 +0200 ++++ libtool-2.4_haiku/libltdl/m4/libtool.m4 2013-04-27 21:00:11.784859136 +0200 +@@ -2473,8 +2473,9 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH -- shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' -+ shlibpath_overrides_runpath=no -+ # TODO: The /boot/common search path should also develop/lib! -+ sys_lib_search_path_spec='/boot/common/non-packaged/lib /boot/common/lib /boot/system/develop/lib' +- hardcode_into_libs=yes ++ sys_lib_search_path_spec='/boot/common/non-packaged/lib /boot/common/develop/lib /boot/common/lib /boot/system/develop/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/common/non-packaged/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes ++ hardcode_into_libs=no ;; + hpux9* | hpux10* | hpux11*)