From d0791d4a1276a4f789775ef74f20a6461407a8b9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 16 Oct 2018 16:10:35 +0000 Subject: [PATCH] dev-util/boost-build: Move back to portage-stable --- .../dev-util/boost-build/Manifest | 1 - .../boost-build/boost-build-1.65.0.ebuild | 140 ------------------ ...st-build-1.48.0-disable_python_rpath.patch | 11 -- ...build-1.49.0-darwin-gentoo-toolchain.patch | 26 ---- ...oost-build-1.50.0-respect-c_ld-flags.patch | 53 ------- ...ld-1.52.0-darwin-no-python-framework.patch | 17 --- .../files/boost-build-1.54.0-fix-test.patch | 11 -- ....54.0-support_dots_in_python-buildid.patch | 19 --- .../files/boost-build-1.55.0-ppc-aix.patch | 13 -- .../boost-build/files/site-config.jam | 11 -- .../dev-util/boost-build/metadata.xml | 11 -- .../md5-cache/dev-util/boost-build-1.65.0 | 15 -- 12 files changed, 328 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/boost-build-1.65.0.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/site-config.jam delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/boost-build-1.65.0 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/Manifest deleted file mode 100644 index c067889f88..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/boost-build-1.65.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/boost-build-1.65.0.ebuild deleted file mode 100644 index 1ef8c4e0b6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/boost-build-1.65.0.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator - -MY_PV="$(replace_all_version_separators _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="http://www.boost.org/doc/tools/build/index.html" -SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples python test" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - !/dev/null || die - eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch" - popd >/dev/null || die - - # Remove stripping option - # Fix python components build on multilib systems, bug #496446 - cd "${S}/engine" || die - sed -i \ - -e 's|-s\b||' \ - -e "/libpython/s/lib ]/$(get_libdir) ]/" \ - build.jam || die "sed failed" - - # Force regeneration - rm jambase.c || die - - # This patch allows us to fully control optimization - # and stripping flags when bjam is used as build-system - # We simply extend the optimization and debug-symbols feature - # with empty dummies called 'none' - cd "${S}" || die - sed -i \ - -e 's/\(off speed space\)/\1 none/' \ - -e 's/\(debug-symbols : on off\)/\1 none/' \ - tools/builtin.jam || die "sed failed" -} - -src_configure() { - if use python; then - # replace versions by user-selected one (TODO: fix this when slot-op - # deps are available to always match the best version available) - sed -i \ - -e "s|27 26 25 24 23 22|${EPYTHON#python}|" \ - engine/build.jam || die "sed failed" - fi -} - -src_compile() { - cd engine || die - - local toolset - - if [[ ${CHOST} == *-darwin* ]]; then - toolset=darwin - else - # Using boost's generic toolset here, which respects CC and CFLAGS - toolset=cc - fi - - tc-is-cross-compiler && sed -i -e 's/BOOST_JAM_CC=\$CC$/BOOST_JAM_CC=cc/' build.sh - CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed" -} - -src_install() { - dobin engine/bin.*/{bjam,b2} - - insinto /usr/share/boost-build - doins -r "${FILESDIR}/site-config.jam" \ - ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ - build kernel options tools util - - if ! use python; then - find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed" - fi - - dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt - - if use examples; then - docinto examples - dodoc -r ../example/. - docompress -x /usr/share/doc/${PF}/examples - fi -} - -src_test() { - cd ../test || die - - export TMP="${T}" - - DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py - - if [[ -s test_results.txt ]]; then - eerror "At least one test failed: $($(set-PYTHONPATH) -- $(libraries) $(dll-path) python.lib -+ $(libraries) python.lib - ; - } - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch deleted file mode 100644 index 032feaf962..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch +++ /dev/null @@ -1,26 +0,0 @@ -Avoid adding all kinds of things to the toolchain's flags that within -Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target, -arch, etc. - ---- a/tools/darwin.jam -+++ b/tools/darwin.jam -@@ -227,6 +227,9 @@ - } - } - -+ # leave compiler flags etc. up to the toolchain -+ return $(version-feature) ; -+ - if $(version-feature) - { - if $(.debug-configuration) -@@ -387,7 +390,8 @@ - support-ppc64 = ; - } - } -- switch $(arch) -+ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either -+ switch $(donotaddarchpleaseXXXarch) - { - case combined : - { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch deleted file mode 100644 index 8775583cbc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/engine/build.jam -+++ b/engine/build.jam -@@ -3,7 +3,7 @@ - #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - # Clean env vars of any "extra" empty values. --for local v in ARGV CC CFLAGS LIBS -+for local v in ARGV CC CFLAGS LDFLAGS LIBS - { - local values ; - for local x in $($(v)) -@@ -179,10 +179,10 @@ - if ! $(CC) { CC = cc ; } - toolset cc $(CC) : "-o " : -D - : $(CFLAGS) -- [ opt --release : -s -O ] -+ [ opt --release : ] - [ opt --debug : -g ] - -I$(--python-include) -I$(--extra-include) -- : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; -+ : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; - ## Comeau C/C++ 4.x - toolset como como : "-o " : -D - : --c -@@ -201,11 +201,11 @@ - ## MacOSX Darwin, using GCC 2.9.x, 3.x - toolset darwin cc : "-o " : -D - : -- [ opt --release : -Wl,-x -O3 -finline-functions ] -+ [ opt --release : -Wl,-x -finline-functions ] - [ opt --debug : -g -O0 -fno-inline -pg ] - [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ] - -I$(--python-include) -I$(--extra-include) -- : -L$(--python-lib[1]) -l$(--python-lib[2]) ; -+ : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; - ## GCC 2.x, 3.x, 4.x - toolset gcc gcc : "-o " : -D - : -pedantic -fno-strict-aliasing ---- a/engine/build.sh -+++ b/engine/build.sh -@@ -224,9 +224,9 @@ - cc) - if test -z "$CC" ; then CC=cc ; fi - BOOST_JAM_CC=$CC -- BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS" -- BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS" -- BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS" -+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS" -+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS" -+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS" - ;; - - qcc) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch deleted file mode 100644 index cacbe00a7e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch +++ /dev/null @@ -1,17 +0,0 @@ -Don't look for the framework path, we build Python the UNIX way for -Gentoo Prefix - ---- a/engine/build.jam -+++ b/engine/build.jam -@@ -82,11 +82,6 @@ - } - --python-lib = $(--python-lib[1]) ; - } -- else if $(OS) = MACOSX -- { -- --python-include = [ .path $(python-location) Headers ] ; -- --python-lib = $(python-location) Python ; -- } - else - { - --python-include = ; diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch deleted file mode 100644 index 3f8b177c71..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test/startup_v2.py -+++ b/test/startup_v2.py -@@ -50,7 +50,7 @@ - return re.match(expected, actual, re.DOTALL) != None - - --t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0) -+t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0) - t.set_tree("startup") - check_for_existing_boost_build_jam(t) - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch deleted file mode 100644 index a04aa0b7aa..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tools/common.jam -+++ b/tools/common.jam -@@ -763,7 +763,15 @@ - switch $(f:G) - { - case : -- result += $(name:B) ; -+ local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ; -+ if $(matched) = boost_python || $(matched) = boost_mpi_python -+ { -+ result += $(name) ; -+ } -+ else -+ { -+ result += $(name:B) ; -+ } - - case : - result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch deleted file mode 100644 index d8b6a5af1e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/10122 - ---- a/engine/mem.h -+++ b/engine/mem.h -@@ -8,6 +8,8 @@ - #ifndef BJAM_MEM_H - #define BJAM_MEM_H - -+#include "jam.h" -+ - #ifdef OPT_BOEHM_GC - - /* Use Boehm GC memory allocator. */ diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/site-config.jam b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/site-config.jam deleted file mode 100644 index 6afe52684c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/files/site-config.jam +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -# Define two new variants to be used when building boost (or separate boost-libs) -# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols -# values "none" which are not part of the official boost distribution. -# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS! -variant gentoorelease : release : none none shared ; -variant gentoodebug : debug : none on shared ; - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/metadata.xml deleted file mode 100644 index ef3f9148d5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/boost-build/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - cpp@gentoo.org - Gentoo C++ Project - - - boost - - diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/boost-build-1.65.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/boost-build-1.65.0 deleted file mode 100644 index 76accf7680..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/boost-build-1.65.0 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -DESCRIPTION=A system for large project software construction, simple to use and powerful -EAPI=6 -HOMEPAGE=http://www.boost.org/doc/tools/build/index.html -IUSE=examples python test python_targets_python2_7 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=Boost-1.0 -RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !