- the __uClibc_start_main is becoming a problem for users thus we need to check the bins before allowing them to have uclibc-compat disabled

Package-Manager: portage-2.0.53_rc7

3 files changed, 32 insertions, 11 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index 3f74577cc334..05250d661daa 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/uclibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.13 2005/11/13 23:52:11 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.14 2005/11/25 22:20:41 solar Exp $
+
+  25 Nov 2005; <solar@gentoo.org> uclibc-0.9.28.ebuild:
+  - the __uClibc_start_main is becoming a problem for users thus we need to
+  check the bins before allowing them to have uclibc-compat disabled
 
   13 Nov 2005; <solar@gentoo.org> uclibc-0.9.28.ebuild:
   - moredefs..
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index cf6bc94ab07d..5855ebcbf992 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 98593b73a38e03d2bc137170b9760678 ChangeLog 9728
+MD5 bce3bfbe67f2845926f95b3f385001ae ChangeLog 9930
 MD5 e6443710aea7fb2e9056b67be27b68d1 files/digest-uclibc-0.9.27 229
 MD5 9a39fb9a2446443aa355070e819107a0 files/digest-uclibc-0.9.27-r1 298
 MD5 851ff3547906842b0d94c848a876be2c files/digest-uclibc-0.9.28 213
@@ -9,11 +9,13 @@ MD5 684def72ebc0da73cb8b6d1c53e7e8fb files/getent 1112
 MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999
 MD5 8a028ea0b10d685a727217115e064d5e uclibc-0.9.27-r1.ebuild 12127
 MD5 81cee933f6981c689db448c06576ec3c uclibc-0.9.27.ebuild 10387
-MD5 51c0b93443372c137ce89a259c59cfe2 uclibc-0.9.28.ebuild 12402
+MD5 7093e6433cbe7672f2551286c869d2ff uclibc-0.9.28.ebuild 13083
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDfU54gIKl8Uu19MoRApkyAJ4+xaOJiM5yOn907Xcv97pthcsfoQCeKZUo
-CE8x6xHrhZXyrvUsJSl0+g4=
-=+XRP
+iQCVAwUBQ4eOR54WFLgrx1GWAQKGQAP/WmuZ7jq2O3flCrg5kLjPAf2cbbf+GvRd
+ScpwNmmd6Ggux7O0qv53yluCHbRmZjx8n2mowzaSslCelRTGikp/B6/Z70UUdlE7
+KN7l0fqjYOzahKpuDszk8+9HdlojTmIUI14wvAj4brwcz5KZq50kujnerK3N0WNQ
+Ixptbx4x3ho=
+=2oLq
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc/uclibc-0.9.28.ebuild b/sys-libs/uclibc/uclibc-0.9.28.ebuild
index eb281eedb420..a39c37b1f806 100644
--- a/sys-libs/uclibc/uclibc-0.9.28.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.12 2005/11/18 03:44:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v 1.13 2005/11/25 22:20:41 solar Exp $
 
 #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
 #inherit subversion
@@ -41,7 +41,7 @@ KEYWORDS="-* ~arm ~m68k ~mips ~ppc sh ~sparc ~x86"
 IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen userlocales wordexp"
 RESTRICT="nostrip"
 
-DEPEND="virtual/os-headers"
+DEPEND="virtual/os-headers app-misc/pax-utils"
 RDEPEND=""
 [[ ${CTARGET} == ${CHOST} ]] && PROVIDE="virtual/libc"
 
@@ -211,8 +211,23 @@ src_unpack() {
 		echo 'HAS_FPU=n' >> .config
 	fi
 
-	local moredefs=""
-	use uclibc-compat && moredefs="DL_FINI_CRT_COMPAT"
+	local moredefs="DL_FINI_CRT_COMPAT"
+	# We need todo this for a few months. .28 is a major upgrade.
+	if ! use uclibc-compat && [[ "$UCLIBC_SCANED_COMPAT" == "" ]]; then
+		local fnames=""
+		einfo "Doing a scanelf in paths for bins containing the __uClibc_start_main symbol"
+		fnames="$(scanelf -pyqs__uClibc_start_main -F%F#s)"
+		if [ "$fnames" == ""  ]; then
+			einfo "This system is clean."
+			einfo "To prevent the scanning of files again in the future you can export UCLIBC_SCANED_COMPAT=1"
+			moredefs=""
+		else
+			ewarn "You need to remerge the packages that contain the following files before you can remerge ${P} without USE=uclibc-compat enabled."
+			ewarn "qfile ${fnames}"
+			echo
+			ewarn "Leaving on ${moredefs}"
+		fi
+	fi
 	for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
 		sed -i -e "s:# ${def} is not set:${def}=y:" .config
 	done