public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit
@ 2010-10-08 15:33 Diego Petteno (flameeyes)
  0 siblings, 0 replies; 7+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-10-08 15:33 UTC (permalink / raw
  To: gentoo-commits

flameeyes    10/10/08 15:33:13

  Modified:             pkg_preinst.eblit
  Log:
  QA: avoid using $D when testing the just-built loader, as it might cause trouble when it contains colon characters; the fix is trivial.
  
  (Portage version: 2.2_rc91/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.2&r2=1.3

Index: pkg_preinst.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pkg_preinst.eblit	19 Dec 2009 23:44:54 -0000	1.2
+++ pkg_preinst.eblit	8 Oct 2010 15:33:13 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.2 2009/12/19 23:44:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.3 2010/10/08 15:33:13 flameeyes Exp $
 
 fix_lib64_symlinks() {
 	# the original Gentoo/AMD64 devs decided that since 64bit is the native
@@ -75,9 +75,16 @@
 		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null)
 		[[ -z ${striptest} ]] && continue
 		[[ ${striptest} == *"statically linked"* ]] && continue
-		"${D}"/$(get_libdir)/ld-*.so \
-			--library-path "${D}"/$(get_libdir) \
-			${x} > /dev/null \
+		# we enter ${D} so to avoid trouble if the path contains
+		# special characters; for instance if the path contains the
+		# colon character (:), then the linker will try to split it
+		# and look for the libraries in an unexpected place. This can
+		# lead to unsafe code execution if the generated prefix is
+		# within a world-writable directory
+		# (e.g. /var/tmp/portage:${HOSTNAME})
+		pushd "${D}"/$(get_libdir) 2>/dev/null
+		./ld-*.so --library-path . ${x} > /dev/null \
 			|| die "simple run test (${x}) failed"
+		popd 2>/dev/null
 	done
 }






^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit
@ 2012-10-02  4:58 Mike Frysinger (vapier)
  0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2012-10-02  4:58 UTC (permalink / raw
  To: gentoo-commits

vapier      12/10/02 04:58:30

  Modified:             pkg_preinst.eblit
  Log:
  Drop old /lib64 symlink migration as this has not been an issue for years.
  
  (Portage version: 2.2.0_alpha131/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.4&r2=1.5

Index: pkg_preinst.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pkg_preinst.eblit	16 Nov 2011 16:07:46 -0000	1.4
+++ pkg_preinst.eblit	2 Oct 2012 04:58:30 -0000	1.5
@@ -1,57 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.4 2011/11/16 16:07:46 vapier Exp $
-
-fix_lib64_symlinks() {
-	# the original Gentoo/AMD64 devs decided that since 64bit is the native
-	# bitdepth for AMD64, lib should be used for 64bit libraries. however,
-	# this ignores the FHS and breaks multilib horribly... especially
-	# since it wont even work without a lib64 symlink anyways. *rolls eyes*
-	# see bug 59710 for more information.
-	# Travis Tilley <lv@gentoo.org> (08 Aug 2004)
-	if [ -L ${ROOT}/lib64 ] ; then
-		ewarn "removing /lib64 symlink and moving lib to lib64..."
-		ewarn "dont hit ctrl-c until this is done"
-		rm ${ROOT}/lib64
-		# now that lib64 is gone, nothing will run without calling ld.so
-		# directly. luckily the window of brokenness is almost non-existant
-		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
-		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
-		# all better :)
-		ldconfig
-		ln -s lib64 ${ROOT}/lib
-		einfo "done! :-)"
-		einfo "fixed broken lib64/lib symlink in ${ROOT}"
-	fi
-	if [ -L ${ROOT}/usr/lib64 ] ; then
-		rm ${ROOT}/usr/lib64
-		mv ${ROOT}/usr/lib ${ROOT}/usr/lib64
-		ln -s lib64 ${ROOT}/usr/lib
-		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr"
-	fi
-	if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then
-		rm ${ROOT}/usr/X11R6/lib64
-		mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64
-		ln -s lib64 ${ROOT}/usr/X11R6/lib
-		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6"
-	fi
-}
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.5 2012/10/02 04:58:30 vapier Exp $
 
 eblit-glibc-pkg_preinst() {
 	# nothing to do if just installing headers
 	just_headers && return
 
-	# PPC64+others may want to eventually be added to this logic if they
-	# decide to be multilib compatible and FHS compliant. note that this
-	# chunk of FHS compliance only applies to 64bit archs where 32bit
-	# compatibility is a major concern (not IA64, for example).
-
-	# amd64's 2005.0 is the first amd64 profile to not need this code.
-	# 2005.0 is setup properly, and this is executed as part of the
-	# 2004.3 -> 2005.0 upgrade script.
-	# It can be removed after 2004.3 has been purged from portage.
-	{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
-
 	# prepare /etc/ld.so.conf.d/ for files
 	mkdir -p "${ROOT}"/etc/ld.so.conf.d
 





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit
@ 2012-10-02  7:12 Mike Frysinger (vapier)
  0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2012-10-02  7:12 UTC (permalink / raw
  To: gentoo-commits

vapier      12/10/02 07:12:17

  Modified:             pkg_preinst.eblit
  Log:
  Default host.conf:multi to on when /etc/hosts is small #436530 by Eray Aslan.
  
  (Portage version: 2.2.0_alpha131/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.5&r2=1.6

Index: pkg_preinst.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pkg_preinst.eblit	2 Oct 2012 04:58:30 -0000	1.5
+++ pkg_preinst.eblit	2 Oct 2012 07:12:17 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.5 2012/10/02 04:58:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.6 2012/10/02 07:12:17 vapier Exp $
 
 eblit-glibc-pkg_preinst() {
 	# nothing to do if just installing headers
@@ -9,6 +9,12 @@
 	# prepare /etc/ld.so.conf.d/ for files
 	mkdir -p "${ROOT}"/etc/ld.so.conf.d
 
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${ROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${D}"/etc/host.conf
+		elog "Defaulting /etc/host.conf:multi to on"
+	fi
+
 	# simple test to make sure our new glibc isnt completely broken.
 	# make sure we don't test with statically built binaries since
 	# they will fail.  also, skip if this glibc is a cross compiler.





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit
@ 2013-01-25  3:12 Mike Frysinger (vapier)
  0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2013-01-25  3:12 UTC (permalink / raw
  To: gentoo-commits

vapier      13/01/25 03:12:18

  Modified:             pkg_preinst.eblit
  Log:
  Refactor sanity checks a bit and include gcc in the search path #453760 by William Throwe.
  
  (Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.7                  sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.6&r2=1.7

Index: pkg_preinst.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pkg_preinst.eblit	2 Oct 2012 07:12:17 -0000	1.6
+++ pkg_preinst.eblit	25 Jan 2013 03:12:18 -0000	1.7
@@ -1,6 +1,37 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.6 2012/10/02 07:12:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.7 2013/01/25 03:12:18 vapier Exp $
+
+# Simple test to make sure our new glibc isnt completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We also might have to search the gcc dir for things like libgcc_s.so #453760
+	local gccdir=$(ls -1rd /usr/lib/gcc/${CHOST}/*/ | head -1)
+
+	# We enter ${D} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${D}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in date env ls true uname ; do
+		x=$(type -p ${x})
+		[[ -z ${x} ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		[[ ${striptest} == *"statically linked"* ]] && continue
+		./ld-*.so --library-path ".:${gccdir}" ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
 
 eblit-glibc-pkg_preinst() {
 	# nothing to do if just installing headers
@@ -15,29 +46,7 @@
 		elog "Defaulting /etc/host.conf:multi to on"
 	fi
 
-	# simple test to make sure our new glibc isnt completely broken.
-	# make sure we don't test with statically built binaries since
-	# they will fail.  also, skip if this glibc is a cross compiler.
 	[[ ${ROOT} != "/" ]] && return 0
 	[[ -d ${D}/$(get_libdir) ]] || return 0
-	cd / #228809
-	local x striptest
-	for x in date env ls true uname ; do
-		x=$(type -p ${x})
-		[[ -z ${x} ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null)
-		[[ -z ${striptest} ]] && continue
-		[[ ${striptest} == *"statically linked"* ]] && continue
-		# we enter ${D} so to avoid trouble if the path contains
-		# special characters; for instance if the path contains the
-		# colon character (:), then the linker will try to split it
-		# and look for the libraries in an unexpected place. This can
-		# lead to unsafe code execution if the generated prefix is
-		# within a world-writable directory
-		# (e.g. /var/tmp/portage:${HOSTNAME})
-		pushd "${D}"/$(get_libdir) 2>/dev/null
-		./ld-*.so --library-path . ${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-		popd 2>/dev/null
-	done
+	glibc_sanity_check
 }





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit
@ 2013-02-09  5:39 Mike Frysinger (vapier)
  0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2013-02-09  5:39 UTC (permalink / raw
  To: gentoo-commits

vapier      13/02/09 05:39:21

  Modified:             pkg_preinst.eblit
  Log:
  Revert manual gcc dir search #453760 since that the real bug is broken ld.so.cache searching #454200.
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.8                  sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.7&r2=1.8

Index: pkg_preinst.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pkg_preinst.eblit	25 Jan 2013 03:12:18 -0000	1.7
+++ pkg_preinst.eblit	9 Feb 2013 05:39:21 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.7 2013/01/25 03:12:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.8 2013/02/09 05:39:21 vapier Exp $
 
 # Simple test to make sure our new glibc isnt completely broken.
 # Make sure we don't test with statically built binaries since
@@ -8,9 +8,6 @@
 glibc_sanity_check() {
 	cd / #228809
 
-	# We also might have to search the gcc dir for things like libgcc_s.so #453760
-	local gccdir=$(ls -1rd /usr/lib/gcc/${CHOST}/*/ | head -1)
-
 	# We enter ${D} so to avoid trouble if the path contains
 	# special characters; for instance if the path contains the
 	# colon character (:), then the linker will try to split it
@@ -26,7 +23,7 @@
 		[[ -z ${x} ]] && continue
 		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
 		[[ ${striptest} == *"statically linked"* ]] && continue
-		./ld-*.so --library-path ".:${gccdir}" ${x} > /dev/null \
+		./ld-*.so --library-path . ${x} > /dev/null \
 			|| die "simple run test (${x}) failed"
 	done
 





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit
@ 2014-06-14 23:29 Mike Frysinger (vapier)
  0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2014-06-14 23:29 UTC (permalink / raw
  To: gentoo-commits

vapier      14/06/14 23:29:04

  Modified:             pkg_preinst.eblit
  Log:
  Do not die when the devpts check fails and we are on an old kernel #489520 by William Throwe.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.12                 sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.11&r2=1.12

Index: pkg_preinst.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pkg_preinst.eblit	29 Jun 2013 03:22:32 -0000	1.11
+++ pkg_preinst.eblit	14 Jun 2014 23:29:04 -0000	1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.11 2013/06/29 03:22:32 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.12 2014/06/14 23:29:04 vapier Exp $
 
 # Simple test to make sure our new glibc isnt completely broken.
 # Make sure we don't test with statically built binaries since
@@ -54,7 +54,10 @@
 			eerror "you have devpts mounted at /dev/pts with the gid=5 option."
 			eerror "Openrc should do this for you, so you should check /etc/fstab"
 			eerror "and make sure you do not have any invalid settings there."
-			die "mount & fix your /dev/pts settings"
+			# Do not die on older kernels as devpts did not export these settings #489520.
+			if version_is_at_least 2.6.25 $(uname -r) ; then
+				die "mount & fix your /dev/pts settings"
+			fi
 		fi
 	fi
 }





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit
@ 2014-08-10  3:35 Mike Frysinger (vapier)
  0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger (vapier) @ 2014-08-10  3:35 UTC (permalink / raw
  To: gentoo-commits

vapier      14/08/10 03:35:57

  Modified:             pkg_preinst.eblit
  Log:
  Detect & skip shell scripts (e.g. coreutils built w/USE=multicall), and add a few more programs (non-coreutils) to the test list #519478 by nzqr.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.13                 sys-libs/glibc/files/eblits/pkg_preinst.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.12&r2=1.13

Index: pkg_preinst.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pkg_preinst.eblit	14 Jun 2014 23:29:04 -0000	1.12
+++ pkg_preinst.eblit	10 Aug 2014 03:35:56 -0000	1.13
@@ -1,10 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.12 2014/06/14 23:29:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.13 2014/08/10 03:35:56 vapier Exp $
 
 # Simple test to make sure our new glibc isnt completely broken.
 # Make sure we don't test with statically built binaries since
 # they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
 glibc_sanity_check() {
 	cd / #228809
 
@@ -18,11 +21,14 @@
 	pushd "${ED}"/$(get_libdir) >/dev/null
 
 	local x striptest
-	for x in date env ls true uname ; do
+	for x in cal date env free ls true uname uptime ; do
 		x=$(type -p ${x})
 		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
 		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
-		[[ ${striptest} == *"statically linked"* ]] && continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
 		./ld-*.so --library-path . ${x} > /dev/null \
 			|| die "simple run test (${x}) failed"
 	done





^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-08-11 20:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-25  3:12 [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: pkg_preinst.eblit Mike Frysinger (vapier)
  -- strict thread matches above, loose matches on Subject: below --
2014-08-10  3:35 Mike Frysinger (vapier)
2014-06-14 23:29 Mike Frysinger (vapier)
2013-02-09  5:39 Mike Frysinger (vapier)
2012-10-02  7:12 Mike Frysinger (vapier)
2012-10-02  4:58 Mike Frysinger (vapier)
2010-10-08 15:33 Diego Petteno (flameeyes)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox