diff options
author | 2016-03-30 20:21:23 +0900 | |
---|---|---|
committer | 2016-03-30 20:21:23 +0900 | |
commit | cd1427ce926d11812a5315341f7d6da67dcb40c8 (patch) | |
tree | 544d6f6292f3a4428e77caac01d1f7b6a6096f07 /scripts | |
parent | sys-freebsd/freebsd-{lib,libexec}: Fixed bug 573358. (diff) | |
download | gentoo-bsd-cd1427ce926d11812a5315341f7d6da67dcb40c8.tar.gz gentoo-bsd-cd1427ce926d11812a5315341f7d6da67dcb40c8.tar.bz2 gentoo-bsd-cd1427ce926d11812a5315341f7d6da67dcb40c8.zip |
Ready to 10.3
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/automatic_bugfix.sh | 26 | ||||
-rwxr-xr-x | scripts/automatic_updater.sh | 30 |
2 files changed, 37 insertions, 19 deletions
diff --git a/scripts/automatic_bugfix.sh b/scripts/automatic_bugfix.sh index 85abef9..c9fff49 100755 --- a/scripts/automatic_bugfix.sh +++ b/scripts/automatic_bugfix.sh @@ -3,7 +3,8 @@ # sys-apps/portage: bug 493126, 574626 # app-shells/bash: bug 574426 # sys-devel/gettext: bug 564168 -# sys-apps/findutils: bug 577714 +# sys-libs/db: bug 578506 +# sys-devel/llvm PORTDIR="${PORTDIR:-/usr/portage}" TMPDIR="${TMPDIR:-/tmp/autofix}" @@ -15,7 +16,7 @@ fi latest_ebuild(){ local pkg="$1" - echo "$(emerge -qp ${pkg} 2>/dev/null | awk '{print $4}' | grep ${pkg} | awk -F/ '{print $2}').ebuild" + echo $(emerge -qp --color=n ${pkg} 2>/dev/null | grep ${pkg} | gsed "s:.*${pkg}:${pkg}:g" | awk '{print $1}' | awk -F/ '{print $2}').ebuild } fix_portage() { @@ -50,12 +51,23 @@ fix_gettext() { echo "dev-libs/libintl-0.19.7" >> ${PORTDIR}/profiles/default/bsd/fbsd/package.provided } -fix_findutils() { - # Fix bug 577714 - local pkg="sys-apps/findutils" +fix_db(){ + echo "sys-libs/db cxx" >> "${PORTDIR}/profiles/arch/amd64-fbsd/clang/package.use.mask" +} + +fix_llvm_ninja(){ + # Traceback (most recent call last): + # File "configure.py", line 435, in <module> + # if has_re2c(): + # File "configure.py", line 432, in has_re2c + # return int(proc.communicate()[0], 10) >= 1103 + # ValueError: invalid literal for int() with base 10: '' + # * ERROR: dev-util/ninja-1.6.0::gentoo failed (compile phase): + + local pkg="sys-devel/llvm" local ebuild="$(latest_ebuild ${pkg})" - gsed -i '/<sys\/sysmacros.h>/d' "${PORTDIR}/${pkg}/${ebuild}" + gsed -i 's/CMAKE_MAKEFILE_GENERATOR:=ninja/CMAKE_MAKEFILE_GENERATOR:=emake/g' "${PORTDIR}"/${pkg}/*.ebuild ebuild "${PORTDIR}/${pkg}/${ebuild}" manifest } @@ -198,7 +210,7 @@ mk_patches() { EOF } -for func in mk_patches fix_portage fix_bash fix_gettext fix_findutils +for func in mk_patches fix_portage fix_bash fix_gettext fix_db fix_llvm_ninja do echo "${func}" ${func} diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh index c2d2507..1e20f93 100755 --- a/scripts/automatic_updater.sh +++ b/scripts/automatic_updater.sh @@ -30,18 +30,21 @@ move_makeconf(){ } update_portage(){ - local dl_portage_ver="2.2.27" + local dl_portage_ver="2.2.20.1" cd /tmp wget http://dev.gentoo.org/~dolsen/releases/portage/portage-${dl_portage_ver}.tar.bz2 tar xjf portage-${dl_portage_ver}.tar.bz2 PYTHON_TARGETS="python2_7" "portage-${dl_portage_ver}"/bin/emerge --nodeps dev-lang/python-exec eselect python set 1 - PYTHON_TARGETS="python2_7" "portage-${dl_portage_ver}"/bin/emerge --nodeps sys-apps/portage + "portage-${dl_portage_ver}"/bin/emerge sys-apps/portage --exclude sys-freebsd/* + emerge dev-lang/python-exec --exclude sys-freebsd/* + emerge app-admin/eselect --exclude sys-freebsd/* + eselect python set 1 } update_minimal(){ emerge --nodeps sys-freebsd/freebsd-mk-defs - emerge -u sys-apps/findutils --exclude sys-freebsd/* + emerge -u '<sys-apps/findutils-4.6' --exclude sys-freebsd/* emerge sys-devel/libtool --exclude sys-freebsd/* 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/* @@ -65,16 +68,15 @@ update_toolchain(){ fi emerge -u sys-devel/binutils --exclude sys-freebsd/* emerge -u sys-devel/gcc-config --exclude sys-freebsd/* - emerge -u sys-devel/gcc --exclude sys-freebsd/* -# gcc-config $(gcc-config -l | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) - emerge -C \<$(emerge -pq --nodeps sys-devel/gcc --exclude sys-freebsd/* | grep ebuild | awk '{print $4}') && : + emerge -u '<sys-devel/gcc-5.0' --exclude sys-freebsd/* + gcc-config $(gcc-config -l | grep "${TARGETVER}" | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) +# emerge -C \<$(emerge -pq --nodeps sys-devel/gcc --exclude sys-freebsd/* | grep ebuild | awk '{print $4}') && : env-update source /etc/profile emerge sys-devel/libtool --exclude sys-freebsd/* emerge sys-devel/binutils --exclude sys-freebsd/* if type -P clang > /dev/null ; then - CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" emerge -u sys-devel/clang --exclude sys-freebsd/* - emerge sys-devel/llvm sys-devel/clang --exclude sys-freebsd/* + emerge -u '<sys-devel/clang-3.7' --exclude sys-freebsd/* fi } @@ -97,9 +99,10 @@ update_freebsd_userland(){ CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" 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 - CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin + CC=gcc CXX=g++ CXXFLAGS="-O2 -pipe" emerge freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin if [[ -e /usr/lib/libc++.so ]] ; then - emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + emerge sys-libs/libcxx sys-libs/libcxxrt --exclude sys-freebsd/* + emerge -u sys-devel/llvm sys-devel/clang fi emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin } @@ -121,8 +124,11 @@ emerge_world(){ emerge -C dev-lang/python:3.2 && : emerge dev-libs/libxml2 emerge dev-libs/libxslt app-arch/libarchive dev-libs/glib - emerge -e @world --exclude sys-apps/portage - emerge sys-apps/portage + emerge -u sys-devel/gcc + emerge -C \<$(emerge -pq --nodeps sys-devel/gcc --exclude sys-freebsd/* | grep ebuild | awk '{print $4}') && : + gcc-config $(gcc-config -l | grep "${TARGETVER}" | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1) + source /etc/profile + emerge -e @world } cleanup(){ |