haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust libtool a bit more to our needs.

Browse Source 
* add /boot/common/develop/lib to link-time library search path
* configure libtool to not hardcode run-time paths into libraries
This commit is contained in:
Oliver Tappe
2013-04-27 21:32:59 +02:00
parent 5a72314502
commit 8167741595
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-devel/libtool/libtool-2.4.recipe
View File

@@ -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="

19
sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch
View File

@@ -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*)