From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5D6F3138D11 for ; Mon, 13 Jul 2015 12:38:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64455E0938; Mon, 13 Jul 2015 12:38:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1761E0938 for ; Mon, 13 Jul 2015 12:38:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52051340998 for ; Mon, 13 Jul 2015 12:38:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2515B73C for ; Mon, 13 Jul 2015 12:38:43 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1436791013.e0c4ab39a29316aa8503673f8db4bb0a9b15dbd9.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: scripts/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: scripts/automatic_updater.sh X-VCS-Directories: scripts/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: e0c4ab39a29316aa8503673f8db4bb0a9b15dbd9 X-VCS-Branch: master Date: Mon, 13 Jul 2015 12:38:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f94936a1-5b85-4bd8-bbfb-9c483cebd789 X-Archives-Hash: 1d356099bec05d80dff39ada3e145ee4 commit: e0c4ab39a29316aa8503673f8db4bb0a9b15dbd9 Author: Yuta SATOH gentoo gr jp> AuthorDate: Mon Jul 13 12:36:53 2015 +0000 Commit: Yuta SATOH gentoo gr jp> CommitDate: Mon Jul 13 12:36:53 2015 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=e0c4ab39 automatic_updater.sh: fixed perl issue, amd64/clang profile support. scripts/automatic_updater.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index 358c168..608b013 100644 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -40,7 +40,6 @@ update_portage(){ tar xjf portage-2.2.20.tar.bz2 PYTHON_TARGETS="python2_7" portage-2.2.20/bin/emerge --nodeps dev-lang/python-exec PYTHON_TARGETS="python2_7" portage-2.2.20/bin/emerge --nodeps sys-apps/portage - emerge -u sys-apps/portage --exclude sys-freebsd/* else emerge -u sys-apps/portage --exclude sys-freebsd/* fi @@ -53,7 +52,14 @@ update_minimal(){ emerge -u sys-devel/flex sys-devel/patch sys-devel/m4 net-libs/libpcap sys-devel/gettext app-arch/libarchive sys-libs/zlib dev-util/dialog --exclude sys-freebsd/* emerge sys-devel/libtool --exclude sys-freebsd/* if [[ -e /usr/lib/libc++.so ]] ; then - emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + if [[ $(uname -p) == "amd64" ]] && [[ ! -e /usr/lib32/librt.so ]] ; then + [[ ! -e /etc/portage/profile ]] && mkdir -p /etc/portage/profile + echo "sys-libs/libcxx abi_x86_32" >> /etc/portage/profile/package.use.mask + echo "sys-libs/libcxxrt abi_x86_32" >> /etc/portage/profile/package.use.mask + emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + [[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask + [[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-libs\/libcxxrt abi_x86_32/d' /etc/portage/profile/package.use.mask + fi fi } @@ -90,6 +96,9 @@ update_freebsd_userland(){ emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv sys-process/fuser-bsd && : emerge --nodeps sys-freebsd/freebsd-libexec USE=build emerge --nodeps sys-freebsd/freebsd-lib + if [[ -e /usr/lib/libc++.so ]] ; then + emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + fi USE=build emerge --nodeps sys-freebsd/freebsd-share [[ -e /etc/portage/profile/package.use.mask ]] && gsed -i '/sys-freebsd\/freebsd-libexec abi_x86_32/d' /etc/portage/profile/package.use.mask @@ -104,12 +113,14 @@ post_freebsd_userland(){ remove_perl(){ emerge -C dev-lang/perl - emerge -C perl-core/* virtual/perl* + emerge -C dev-perl/* perl-core/* virtual/perl* emerge dev-lang/perl + emerge dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth dev-perl/XML-Parser dev-perl/libintl-perl } emerge_world(){ emerge sys-devel/libtool + emerge -C dev-lang/python:3.2 && : emerge -u dev-libs/libxml2 emerge -u dev-libs/libxslt app-arch/libarchive dev-libs/glib emerge -e @world --exclude sys-apps/portage