added uclibc patch for configure target

3 files changed, 108 insertions, 3 deletions

diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog
index 63fce4ca4862..39186dc2546c 100644
--- a/dev-libs/popt/ChangeLog
+++ b/dev-libs/popt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/popt
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.17 2003/03/28 07:07:30 seemant Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.18 2004/06/15 06:29:42 solar Exp $
+
+  15 Jun 2004; <solar@gentoo.org> popt-1.7-r1.ebuild,
+  files/popt-1.7-uclibc.patch:
+  added uclibc patch for configure target
 
 *popt-1.7-r1 (20 Mar 2003)
 
diff --git a/dev-libs/popt/files/popt-1.7-uclibc.patch b/dev-libs/popt/files/popt-1.7-uclibc.patch
new file mode 100644
index 000000000000..f4672ed8d7f1
--- /dev/null
+++ b/dev-libs/popt/files/popt-1.7-uclibc.patch
@@ -0,0 +1,96 @@
+--- popt-1.7/configure.uclibc~	2002-08-31 15:22:20.000000000 +0200
++++ popt-1.7/configure	2004-06-14 20:41:51.000000000 +0200
+@@ -4476,6 +4476,11 @@ linux-gnu*)
+   esac
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
++  
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
++  ;;
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+@@ -5329,7 +5334,7 @@ fi
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -6880,6 +6885,24 @@ linux-gnu*)
+   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*)
+   version_type=sunos
+   need_lib_prefix=no
+--- popt-1.7/aclocal.m4.uclibc~	2002-08-31 15:22:08.000000000 +0200
++++ popt-1.7/aclocal.m4	2004-06-14 20:41:51.000000000 +0200
+@@ -1758,7 +1758,7 @@ fi
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -3117,6 +3117,24 @@ linux-gnu*)
+   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*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -4306,6 +4324,11 @@ linux-gnu*)
+   esac
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
++  
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
++  ;;
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
diff --git a/dev-libs/popt/popt-1.7-r1.ebuild b/dev-libs/popt/popt-1.7-r1.ebuild
index aae02dcb3cca..fa5d79a2cc72 100644
--- a/dev-libs/popt/popt-1.7-r1.ebuild
+++ b/dev-libs/popt/popt-1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.10 2004/04/26 01:15:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.11 2004/06/15 06:29:43 solar Exp $
 
 inherit libtool gnuconfig
 
@@ -15,6 +15,11 @@ IUSE="nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-uclibc.patch
+}
+
 src_compile() {
 	gnuconfig_update
 	elibtoolize