From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RwOap-00013Y-A6 for garchives@archives.gentoo.org; Sun, 12 Feb 2012 01:51:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3868E0618; Sun, 12 Feb 2012 01:50:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5EBCBE0618 for ; Sun, 12 Feb 2012 01:50:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A2BF1B400B for ; Sun, 12 Feb 2012 01:50:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5CAEAE53FF for ; Sun, 12 Feb 2012 01:50:56 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_compile.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: bd693b8db3aca7bf2771f34a007ecf4e042ca8ff Date: Sun, 12 Feb 2012 01:50:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ded31825-14bb-43da-921c-7c35e859682e X-Archives-Hash: dfd08674a61edd82d8212d56839b0402 commit: bd693b8db3aca7bf2771f34a007ecf4e042ca8ff Author: Robin H. Johnson gentoo org> AuthorDate: Sun Feb 12 01:50:42 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Feb 12 01:50:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Dbd693b8d Bug #265005: ensure CROSS_COMPILE is set for cross-compile strip calls to= work. --- ChangeLog | 4 ++++ gen_compile.sh | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17cc4bd..06916d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ =20 + 12 Feb 2012; Robin H. Johnson gen_compile.sh: + Bug #265005: ensure CROSS_COMPILE is set for cross-compile strip calls= to + work. + 12 Feb 2012; Robin H. Johnson +patches/dmraid/dmraid-1.0.0_rc16-as-needed2.patch, +patches/dmraid/dmraid-1.0.0_rc16-return-all-sets.patch, diff --git a/gen_compile.sh b/gen_compile.sh index aa0f04c..8a53c74 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -80,6 +80,10 @@ export_utils_args() then export AS=3D"${UTILS_AS}" fi + if [ "${UTILS_CROSS_COMPILE}" !=3D '' ] + then + export CROSS_COMPILE=3D"${UTILS_CROSS_COMPILE}" + fi } =20 unset_utils_args() @@ -100,6 +104,10 @@ unset_utils_args() then unset AS fi + if [ "${UTILS_CROSS_COMPILE}" !=3D '' ] + then + unset CROSS_COMPILE + fi reset_args } =20 @@ -411,7 +419,7 @@ compile_busybox() { print_info 1 'busybox: >> Copying to cache...' [ -f "${TEMP}/${BUSYBOX_DIR}/busybox" ] || gen_die 'Busybox executable does not exist!' - strip "${TEMP}/${BUSYBOX_DIR}/busybox" || + ${UTILS_CROSS_COMPILE}strip "${TEMP}/${BUSYBOX_DIR}/busybox" || gen_die 'Could not strip busybox binary!' tar -cj -C "${TEMP}/${BUSYBOX_DIR}" -f "${BUSYBOX_BINCACHE}" busybox .= config .config.gk_orig || gen_die 'Could not create the busybox bincache!' @@ -449,7 +457,7 @@ compile_lvm() { =20 cd "${TEMP}/lvm" print_info 1 ' >> Copying to bincache...' - strip "sbin/lvm.static" || + ${UTILS_CROSS_COMPILE}strip "sbin/lvm.static" || gen_die 'Could not strip lvm.static!' # See bug 382555 strip "sbin/dmsetup.static" || @@ -576,7 +584,7 @@ compile_e2fsprogs() { print_info 1 'blkid: >> Copying to cache...' [ -f "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ] || gen_die 'Blkid executable does not exist!' - strip "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" || + ${UTILS_CROSS_COMPILE}strip "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" || gen_die 'Could not strip blkid binary!' bzip2 "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" || gen_die 'bzip2 compression of blkid failed!' @@ -610,7 +618,7 @@ compile_fuse() { # print_info 1 'libfuse: >> Copying to cache...' # [ -f "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" ] || # gen_die 'libfuse.so does not exist!' -# strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so" || +# ${UTILS_CROSS_COMPILE}strip "${TEMP}/${FUSE_DIR}/lib/.libs/libfuse.so= " || # gen_die 'Could not strip libfuse.so!' # cd "${TEMP}/${FUSE_DIR}/lib/.libs" # tar -cjf "${FUSE_BINCACHE}" libfuse*so* || @@ -644,7 +652,7 @@ compile_unionfs_fuse() { print_info 1 'unionfs-fuse: >> Copying to cache...' [ -f "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ] || gen_die 'unionfs binary does not exist!' - strip "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" || + ${UTILS_CROSS_COMPILE}strip "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" = || gen_die 'Could not strip unionfs binary!' bzip2 "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" || gen_die 'bzip2 compression of unionfs binary failed!'