Fixed cross-distcc issue, bug #131316.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

3 files changed, 251 insertions, 2 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index f3415bac3a4a..b6d570afab14 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.206 2008/11/20 21:56:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.207 2008/11/21 00:14:05 matsuu Exp $
+
+*busybox-1.12.2-r1 (21 Nov 2008)
+
+  21 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> +busybox-1.12.2-r1.ebuild:
+  Fixed cross-distcc issue, bug #131316.
 
   20 Nov 2008; Jeroen Roovers <jer@gentoo.org> busybox-1.11.1.ebuild,
   busybox-1.11.3.ebuild, busybox-1.12.0.ebuild, busybox-1.12.1.ebuild,
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index c753cc7eb47b..719a5c91e08e 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -18,6 +18,7 @@ EBUILD busybox-1.11.1.ebuild 7312 RMD160 b924ef0d00d2ec9b9f42cd10136834c777046e0
 EBUILD busybox-1.11.3.ebuild 7270 RMD160 86fe13b419e68e4c9e2c9fa769b118600d107b27 SHA1 07101e8c26066bdcf15987f1c4a34e8b7506d51d SHA256 338e34fa3ce6c1c2f47382681169e3635f7e89134eb7333e9546c8d50075a12b
 EBUILD busybox-1.12.0.ebuild 7270 RMD160 364726e02c3b6847e983f11a0d2205b15d02ed61 SHA1 4207919c0116ad69c0bf2f5cf786f9b3b9c065ed SHA256 a185c1386756fc5f7eff8de00ca2a02e9ad17176226a8da6cb2254d7bbdc9d73
 EBUILD busybox-1.12.1.ebuild 7315 RMD160 e079459231a544b2307e0f4b40639f8a03e945be SHA1 94b911c9e02aa37b588f2f634d5a06f92ecaccad SHA256 02d4d20a8164f58892ce38ec710241d04642a69f24ce967429f1a384b18888e0
+EBUILD busybox-1.12.2-r1.ebuild 7350 RMD160 e66af9f712c6a9a59cf5f29295995a92e67b2925 SHA1 215ebe39bf1683ccb03aca4d3520779a14f73974 SHA256 02ce2a30ade1f37c3409c5905e725c4eb346c4543ad7a1f5ab3aab6bab77743d
 EBUILD busybox-1.12.2.ebuild 7314 RMD160 696bc4ad6399aa222edbe27ce7e40521a5e52a09 SHA1 520a3821c8852d2aca8d8f9c375b1363e44cd464 SHA256 35d0d084d4465fa7b04c65216e83fffb0ba3d5c7fb51943e28045ae3624d9c5d
-MISC ChangeLog 30893 RMD160 2f9f6d868c717ed9f633763658b91f0424f4a961 SHA1 07ab40995c3dbb99970f2101bbf79c310ea07e43 SHA256 417728b817c20db14f751e3ee2a62c262dac5f5139de4a149c635ceab9092e18
+MISC ChangeLog 31048 RMD160 5b59e67edf25c4726cea1603abae0070aca1bcc8 SHA1 26f50e30eb814af2307a4e8e9526ef6c18f331a7 SHA256 aac8d300b47c0deecdf222f57b78415caef3b67518cc2e73eef09057826acd83
 MISC metadata.xml 261 RMD160 3a3402cbd18d14e4f10e1bb0a4d94a0c3b29b44d SHA1 7bc1c61bf44ae90dfce0f668ea0dcfe0460afe77 SHA256 d45ec36c64c958afd2de0777e77292c4e2908e32c5417c952dd63d920f82990a
diff --git a/sys-apps/busybox/busybox-1.12.2-r1.ebuild b/sys-apps/busybox/busybox-1.12.2-r1.ebuild
new file mode 100644
index 000000000000..9c2b3b54f3a1
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.12.2-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.12.2-r1.ebuild,v 1.1 2008/11/21 00:14:05 matsuu Exp $
+
+inherit eutils flag-o-matic savedconfig toolchain-funcs
+
+################################################################################
+# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
+#
+# Busybox can be modified in many different ways. Here's a few ways to do it:
+#
+# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
+#     get erased afterwards. Add a definition like ROOT=/my/root/path to the
+#     start of the line if you're installing to somewhere else than the root
+#     directory. This command will save the default configuration to
+#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
+#     defined), and it will tell you that it has done this. Note the location
+#     where the config file was saved.
+#
+#     FEATURES=keepwork USE=savedconfig emerge busybox
+#
+# (2) Go to the work directory and change the configuration of busybox using its
+#     menuconfig feature.
+#
+#     cd /var/tmp/portage/busybox*/work/busybox-*
+#     make menuconfig
+#
+# (3) Save your configuration to the default location and copy it to the
+#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
+#
+# (4) Emerge busybox with USE=savedconfig to use the configuration file you
+#     just generated.
+#
+################################################################################
+#
+# (1) Alternatively skip the above steps and simply emerge busybox without
+#     USE=savedconfig.
+#
+# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
+#
+# (3) Remerge busybox as using USE=savedconfig.
+#
+################################################################################
+
+#SNAPSHOT=20040726
+SNAPSHOT=""
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
+if [[ -n ${SNAPSHOT} ]] ; then
+	MY_P=${PN}
+	SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug make-symlinks pam selinux static"
+RESTRICT="test"
+
+DEPEND="selinux? ( sys-libs/libselinux )
+	pam? ( sys-libs/pam )"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+	case $1 in
+		y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;
+		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
+		*) use $1 \
+		       && busybox_config_option y $2 \
+		       || busybox_config_option n $2
+		   return 0
+		   ;;
+	esac
+	einfo $(grep "CONFIG_$2[= ]" .config)
+}
+
+src_unpack() {
+	unset KBUILD_OUTPUT #88088
+
+	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+
+	# patches go here!
+	epatch "${FILESDIR}"/busybox-1.11.1-bb.patch
+	epatch "${FILESDIR}"/busybox-${PV}-*.patch
+
+	# include this upstream later..
+	epatch "${FILESDIR}"/busybox-devmem.patch
+
+	epatch "${FILESDIR}"/busybox-1.12.0-mdev-exec.patch
+
+	# work around broken ass powerpc compilers
+	use ppc64 && append-flags -mminimal-toc
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		Makefile || die
+
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 allyesconfig > /dev/null
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n NOMMU
+	busybox_config_option n MONOTONIC_SYSCALL
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y FEATURE_SH_IS_ASH
+	busybox_config_option n FEATURE_SH_IS_NONE
+
+	if use static && use pam ; then
+		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
+	fi
+	use static \
+		&& busybox_config_option n PAM \
+		|| busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option debug DEBUG
+	use debug \
+		&& busybox_config_option y NO_DEBUG_LIB \
+		&& busybox_config_option n DMALLOC \
+		&& busybox_config_option n EFENCE
+
+	busybox_config_option selinux SELINUX
+
+	# default a bunch of uncommon options to off
+	for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \
+		LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \
+		UUDECODE UUENCODE SULOGIN DC DEBUG_YANK_SUSv2 DEBUG_INIT \
+		DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET INOTIFYD
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake busybox || die "build failed"
+	if ! use static && ! use pam ; then
+		mv busybox_unstripped{,.bak}
+		emake CONFIG_STATIC=y busybox || die "static build failed"
+		mv busybox_unstripped bb
+		mv busybox_unstripped{.bak,}
+	fi
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	newbin busybox_unstripped busybox || die
+	if use static || use pam ; then
+		dosym busybox /bin/bb || die
+		dosym bb /bin/busybox.static || die
+	else
+		dobin bb || die
+	fi
+
+	insinto /$(get_libdir)/rcscripts/addons
+	doins "${FILESDIR}"/mdev-start.sh || die
+
+	# bundle up the symlink files for use later
+	emake install || die
+	rm _install/bin/busybox
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	doins busybox-links.tar || die
+	newins .config ${PF}.config || die
+
+	dodoc AUTHORS README TODO
+
+	cd docs || die
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html *.sgml
+
+	cd ../examples || die
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+
+	cd bootfloppy || die
+	docinto bootfloppy
+	dodoc $(find . -type f)
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	echo
+	einfo "This ebuild has support for user defined configs"
+	einfo "Please read this ebuild for more details and re-emerge as needed"
+	einfo "if you want to add or remove functionality for ${PN}"
+	echo
+}