btrev43043 adds 1 changeset to branch 'master' old head: 5f2852400d6c63ab5d63c9a19ae3338151ebf3fb new head: a17bb71c1660d9aa9c5fc68f0c11aa497b02c2a3 ---------------------------------------------------------------------------- a17bb71: Replace outdated paths in buildtools * Replace /boot/beos/system/lib with /boot/system/lib * Performed on configure and libtool.m4 files, as well as patches [ Joseph R. Prostko <joe.prostko@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: btrev43043 Commit: a17bb71c1660d9aa9c5fc68f0c11aa497b02c2a3 URL: http://cgit.haiku-os.org/buildtools/commit/?id=a17bb71 Author: Joseph R. Prostko <joe.prostko@xxxxxxxxx> Date: Wed Oct 31 14:33:57 2012 UTC ---------------------------------------------------------------------------- 16 files changed, 19 insertions(+), 19 deletions(-) binutils/bfd/configure | 2 +- binutils/binutils/configure | 2 +- binutils/gas/configure | 2 +- binutils/gprof/configure | 2 +- binutils/ld/configure | 4 ++-- binutils/libtool.m4 | 2 +- binutils/opcodes/configure | 2 +- gcc/gcc/configure | 2 +- gcc/libgomp/configure | 2 +- gcc/libquadmath/configure | 2 +- gcc/libstdc++-v3/configure | 4 ++-- gcc/libtool.m4 | 2 +- gcc/lto-plugin/configure | 2 +- gcc/zlib/configure | 2 +- patches/libtool/libtool-1.5.26.diff | 2 +- patches/perl/perl-5.10.0.diff | 4 ++-- ---------------------------------------------------------------------------- diff --git a/binutils/bfd/configure b/binutils/bfd/configure index bc242b9..9dc2486 100755 --- a/binutils/bfd/configure +++ b/binutils/bfd/configure @@ -10608,7 +10608,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/binutils/configure b/binutils/binutils/configure index 1a4a1ef..9ed900e 100755 --- a/binutils/binutils/configure +++ b/binutils/binutils/configure @@ -10403,7 +10403,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/gas/configure b/binutils/gas/configure index b70b86e..2b55d3c 100755 --- a/binutils/gas/configure +++ b/binutils/gas/configure @@ -10391,7 +10391,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/gprof/configure b/binutils/gprof/configure index fa68ffc..aa8b067 100755 --- a/binutils/gprof/configure +++ b/binutils/gprof/configure @@ -10321,7 +10321,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/ld/configure b/binutils/ld/configure index 9e4cb57..f67b793 100755 --- a/binutils/ld/configure +++ b/binutils/ld/configure @@ -11342,7 +11342,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -15001,7 +15001,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/libtool.m4 b/binutils/libtool.m4 index 71bcee8..1fdb585 100644 --- a/binutils/libtool.m4 +++ b/binutils/libtool.m4 @@ -2329,7 +2329,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/binutils/opcodes/configure b/binutils/opcodes/configure index 746070e..65ece59 100755 --- a/binutils/opcodes/configure +++ b/binutils/opcodes/configure @@ -10338,7 +10338,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/gcc/gcc/configure b/gcc/gcc/configure index b61e577..e99b74d 100755 --- a/gcc/gcc/configure +++ b/gcc/gcc/configure @@ -20361,7 +20361,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/gcc/libgomp/configure b/gcc/libgomp/configure index 61c5488..36e33c1 100755 --- a/gcc/libgomp/configure +++ b/gcc/libgomp/configure @@ -13918,7 +13918,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/gcc/libquadmath/configure b/gcc/libquadmath/configure index 9d97933..8fbcfa7 100755 --- a/gcc/libquadmath/configure +++ b/gcc/libquadmath/configure @@ -9699,7 +9699,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/gcc/libstdc++-v3/configure b/gcc/libstdc++-v3/configure index 594ace2..19e32c1 100755 --- a/gcc/libstdc++-v3/configure +++ b/gcc/libstdc++-v3/configure @@ -10670,7 +10670,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -14353,7 +14353,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/gcc/libtool.m4 b/gcc/libtool.m4 index 7e21de3..bda1c60 100644 --- a/gcc/libtool.m4 +++ b/gcc/libtool.m4 @@ -2329,7 +2329,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/gcc/lto-plugin/configure b/gcc/lto-plugin/configure index 48b414e..923df74 100755 --- a/gcc/lto-plugin/configure +++ b/gcc/lto-plugin/configure @@ -9742,7 +9742,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/gcc/zlib/configure b/gcc/zlib/configure index f7fe2b7..0c9726c 100755 --- a/gcc/zlib/configure +++ b/gcc/zlib/configure @@ -9572,7 +9572,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/patches/libtool/libtool-1.5.26.diff b/patches/libtool/libtool-1.5.26.diff index c5ac889..a6fd25f 100644 --- a/patches/libtool/libtool-1.5.26.diff +++ b/patches/libtool/libtool-1.5.26.diff @@ -34,7 +34,7 @@ diff -ur libtool-1.5.26-orig/libtool.m4 libtool-1.5.26/libtool.m4 + 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 -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + diff --git a/patches/perl/perl-5.10.0.diff b/patches/perl/perl-5.10.0.diff index 2ee6936..48046a2 100644 --- a/patches/perl/perl-5.10.0.diff +++ b/patches/perl/perl-5.10.0.diff @@ -238,11 +238,11 @@ Index: hints/haiku.sh + +prefix="/boot/home/config" + -+libpth='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++libpth='/boot/home/config/lib /boot/common/lib /boot/system/lib' +usrinc='/boot/develop/headers/posix' +locinc='/boot/home/config/include /boot/common/include /boot/develop/headers' + -+libc='/boot/beos/system/lib/libroot.so' ++libc='/boot/system/lib/libroot.so' +libs=' ' + +#d_bcmp='define'