diff options
| -rw-r--r-- | eclass/ELT-patches/uclibc/ltconfig-1.3.patch | 35 | ||||
| -rw-r--r-- | eclass/libtool.eclass | 20 |
2 files changed, 51 insertions, 4 deletions
diff --git a/eclass/ELT-patches/uclibc/ltconfig-1.3.patch b/eclass/ELT-patches/uclibc/ltconfig-1.3.patch new file mode 100644 index 000000000000..8eebcdf6dcb3 --- /dev/null +++ b/eclass/ELT-patches/uclibc/ltconfig-1.3.patch @@ -0,0 +1,35 @@ +--- ltconfig.uclibc 2004-01-14 22:07:42.000000000 +0100 ++++ ltconfig 2004-03-10 15:43:37.000000000 +0100 +@@ -603,6 +603,7 @@ + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. + case $host_os in + linux-gnu*) ;; ++linux-uclibc*) ;; + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` + esac + +@@ -1259,6 +1260,24 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++linux-uclibc*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ++ soname_spec='${libname}${release}.so$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ # Note: copied from linux-gnu, and may not be appropriate. ++ hardcode_into_libs=yes ++ # Assume using the uClibc dynamic linker. ++ dynamic_linker="uClibc ld.so" ++ ;; ++ + netbsd*) + need_lib_prefix=no + need_version=no diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index d153da074a7c..0a2a511fcd89 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.30 2004/09/22 18:33:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.31 2004/09/22 20:04:27 vapier Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -270,10 +270,22 @@ uclibctoolize() { einfo "Applying uClibc/libtool patches ..." for x in ${targets} ; do - if grep 'Transform linux' "${x}" >/dev/null ; then + case $(basename "${x}") in + configure) + if grep 'Transform linux' "${x}" >/dev/null ; then + ebegin " Fixing \${S}${x/${S}}" + patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null + eend $? "PLEASE CHECK ${x}" + fi + ;; + + ltconfig) + local ver="$(grep '^VERSION=' ${x})" + ver="${ver/VERSION=}" ebegin " Fixing \${S}${x/${S}}" - patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null + patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null eend $? "PLEASE CHECK ${x}" - fi + ;; + esac done } |