diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2004-10-11 08:29:39 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-10-11 08:29:39 +0000 |
| commit | fcbb27d7c03cecd835cda47be429d2e55cb2df41 (patch) | |
| tree | c1aebc4b0b5fb0c2d2b33bb1ca66f0d6e6bd0fb8 /x11-base | |
| parent | Add uclibc support by making build a little more minimal with USE=uclibc, tha... (diff) | |
| download | historical-fcbb27d7c03cecd835cda47be429d2e55cb2df41.tar.gz historical-fcbb27d7c03cecd835cda47be429d2e55cb2df41.tar.bz2 historical-fcbb27d7c03cecd835cda47be429d2e55cb2df41.zip | |
Allow FEATURES=nostrip to prevent stripping, and add ${CHOST}-strip support from solar (#66531).
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild | 14 |
3 files changed, 18 insertions, 7 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 85d8bfecc1b4..49bdbab5d4a9 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.143 2004/10/11 08:27:13 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.144 2004/10/11 08:29:39 spyderous Exp $ + + 11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.0-r2.ebuild: + Allow FEATURES=nostrip to prevent stripping, and add ${CHOST}-strip support + from solar (#66531). 11 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.0-r2.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index fac155506689..441b9bfd036c 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,8 +1,8 @@ -MD5 3f707d87858ada19668c5e721bd30d0b ChangeLog 31592 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230 -MD5 4a59e66a638708494ac906f539646062 xorg-x11-6.8.0-r2.ebuild 42714 +MD5 ab973307566a7f2160a0cda7c68d03fc xorg-x11-6.8.0-r2.ebuild 42877 MD5 c32f9bc44ffd10b49297b4898097096b xorg-x11-6.7.0-r2.ebuild 38142 MD5 42742dfe0e821f4d1978040a96be850c xorg-x11-6.8.0-r1.ebuild 41437 +MD5 c0e13ef8f521db251af0293fd0748c67 ChangeLog 31777 MD5 a3ef47fa1d11b9b29589eea734a6c6d2 files/digest-xorg-x11-6.8.0-r2 906 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 MD5 a3ef47fa1d11b9b29589eea734a6c6d2 files/digest-xorg-x11-6.8.0-r1 906 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild index 0c711d57c553..53eab8f48945 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild @@ -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/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.5 2004/10/11 08:27:13 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.6 2004/10/11 08:29:39 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -818,11 +818,17 @@ setup_dynamic_libgl() { } strip_execs() { - if use debug + if use debug || has nostrip ${FEATURES} then ewarn "Debug build turned on by USE=debug" ewarn "NOT stripping binaries and libraries" else + local STRIP + if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then + STRIP=${CHOST}-strip + else + STRIP=strip + fi einfo "Stripping binaries and libraries..." # This bit I got from Redhat ... strip binaries and drivers .. # NOTE: We do NOT want to strip the drivers, modules or DRI modules! @@ -836,7 +842,7 @@ strip_execs() { if [ "${x/\/usr\/X11R6\/$(get_libdir)\/modules}" = "${x}" ] then echo "`echo ${x} | sed -e "s|${D}||"`" - strip ${x} || : + ${STRIP} ${x} || : fi fi done @@ -847,7 +853,7 @@ strip_execs() { if [ -f ${x} ] then echo "`echo ${x} | sed -e "s|${D}||"`" - strip --strip-debug ${x} || : + ${STRIP} --strip-debug ${x} || : fi done fi |