From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2BEB6138350 for ; Tue, 28 Jan 2020 19:47:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35D01E084A; Tue, 28 Jan 2020 19:47:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03B84E084A for ; Tue, 28 Jan 2020 19:47:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E291634E426 for ; Tue, 28 Jan 2020 19:47:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F9252A for ; Tue, 28 Jan 2020 19:47:48 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1580240847.2a586aa797edf9f3166f3d90ed30859a147559d6.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: net-misc/iperf/, dev-lang/spidermonkey/, dev-lang/go/, ... X-VCS-Repository: proj/musl X-VCS-Files: dev-lang/go-bootstrap/Manifest dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild dev-lang/go-bootstrap/metadata.xml dev-lang/go/Manifest dev-lang/go/go-1.10.3.ebuild dev-lang/go/metadata.xml dev-lang/spidermonkey/Manifest dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch dev-lang/spidermonkey/files/spidermonkey-musl.patch dev-lang/spidermonkey/files/spidermonkey-threadlocal.patch dev-lang/spidermonkey/metadata.xml dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild net-misc/iperf/Manifest net-misc/iperf/files/iperf-3.0.5-flags.patch net-misc/iperf/files/iperf-3.1.3-musl.patch net-misc/iperf/files/iperf.confd net-misc/iperf/files/iperf.initd-r1 net-misc/iperf/files/iperf3.initd net-misc/iperf/iperf-3.1.3.ebuild net-misc/iperf/metadata.xml X-VCS-Directories: dev-lang/spidermonkey/ dev-lang/spidermonkey/files/ dev-lang/go/ dev-lang/go-bootstrap/ net-misc/iperf/ net-misc/iperf/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 2a586aa797edf9f3166f3d90ed30859a147559d6 X-VCS-Branch: master Date: Tue, 28 Jan 2020 19:47:48 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ea11069-b22e-424a-ba1a-65c48fd255ea X-Archives-Hash: 4dfbdf154ff3797752d898b9cc9aabd6 commit: 2a586aa797edf9f3166f3d90ed30859a147559d6 Author: Jory Pratt gentoo org> AuthorDate: Tue Jan 28 19:47:27 2020 +0000 Commit: Jory Pratt gentoo org> CommitDate: Tue Jan 28 19:47:27 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2a586aa7 remove packages that are working in ::gentoo Signed-off-by: Jory Pratt gentoo.org> dev-lang/go-bootstrap/Manifest | 1 - dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild | 81 --------- dev-lang/go-bootstrap/metadata.xml | 13 -- dev-lang/go/Manifest | 1 - dev-lang/go/go-1.10.3.ebuild | 200 --------------------- dev-lang/go/metadata.xml | 13 -- dev-lang/spidermonkey/Manifest | 2 - .../files/moz38-dont-hardcode-libc-soname.patch | 15 -- .../spidermonkey-52.0-fix-alpha-bitness.patch | 32 ---- .../spidermonkey/files/spidermonkey-musl.patch | 13 -- .../files/spidermonkey-threadlocal.patch | 14 -- dev-lang/spidermonkey/metadata.xml | 17 -- .../spidermonkey/spidermonkey-52.9.1_pre1.ebuild | 149 --------------- net-misc/iperf/Manifest | 1 - net-misc/iperf/files/iperf-3.0.5-flags.patch | 31 ---- net-misc/iperf/files/iperf-3.1.3-musl.patch | 184 ------------------- net-misc/iperf/files/iperf.confd | 5 - net-misc/iperf/files/iperf.initd-r1 | 14 -- net-misc/iperf/files/iperf3.initd | 10 -- net-misc/iperf/iperf-3.1.3.ebuild | 41 ----- net-misc/iperf/metadata.xml | 12 -- 21 files changed, 849 deletions(-) diff --git a/dev-lang/go-bootstrap/Manifest b/dev-lang/go-bootstrap/Manifest deleted file mode 100644 index bc049a4..0000000 --- a/dev-lang/go-bootstrap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST go1.4.3.src.tar.gz 10875170 BLAKE2B a094d0ed36f9d581b003e022f10692ed929f2da7508ac2079a83c1e4e3a24bd89b33a468ba2c27b658245682acddf65e4db5f4b09b699778e093ad387a64c1f5 SHA512 12bade4bce9aa4b34e2b9495ae65a1fc6a2449b3a43bc4de85c8b87ba223c2f999b2f37c1e2fe1188d8521118b5e5357d27afb8b85c0b8ebb4503d4125d25273 diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild deleted file mode 100644 index e52034a..0000000 --- a/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -export CTARGET=${CTARGET:-${CHOST}} - -inherit eutils toolchain-funcs - -SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" -# Upstream only supports go on amd64, arm and x86 architectures. -KEYWORDS="-* amd64" - -DESCRIPTION="Version of go compiler used for bootstrapping" -HOMEPAGE="http://www.golang.org" - -LICENSE="BSD" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -# The go tools should not cause the multilib-strict check to fail. -QA_MULTILIB_PATHS="usr/lib/go1.4/pkg/tool/.*/.*" - -# The go language uses *.a files which are _NOT_ libraries and should not be -# stripped. The test data objects should also be left alone and unstripped. -STRIP_MASK="/usr/lib/go1.4/pkg/*.a - /usr/lib/go1.4/src/debug/elf/testdata/* - /usr/lib/go1.4/src/debug/dwarf/testdata/* - /usr/lib/go1.4/src/runtime/race/*.syso" - -S="${WORKDIR}"/go - -src_prepare() { - sed -i -e 's/"-Werror",//g' src/cmd/dist/build.c - eapply_user -} - -src_compile() { - export GOROOT_FINAL="${EPREFIX}"/usr/lib/go1.4 - export GOROOT="$(pwd)" - export GOBIN="${GOROOT}/bin" - export CGO_ENABLED=0 - if [[ $CTARGET = armv5* ]] - then - export GOARM=5 - fi - tc-export CC - - cd src - ./make.bash || die "build failed" -} - -src_test() { - cd src - PATH="${GOBIN}:${PATH}" \ - ./run.bash --no-rebuild --banner || die "tests failed" -} - -src_install() { - dodir /usr/lib/go1.4 - exeinto /usr/lib/go1.4/bin - doexe bin/* - insinto /usr/lib/go1.4 - doins -r lib pkg src - fperms -R +x /usr/lib/go1.4/pkg/tool -} - -pkg_postinst() { - # If the go tool sees a package file timestamped older than a dependancy it - # will rebuild that file. So, in order to stop go from rebuilding lots of - # packages for every build we need to fix the timestamps. The compiler and - # linker are also checked - so we need to fix them too. - ebegin "fixing timestamps to avoid unnecessary rebuilds" - tref="usr/lib/go1.4/pkg/*/runtime.a" - find "${EROOT}"usr/lib/go1.4 -type f \ - -exec touch -r "${EROOT}"${tref} {} \; - eend $? -} diff --git a/dev-lang/go-bootstrap/metadata.xml b/dev-lang/go-bootstrap/metadata.xml deleted file mode 100644 index a70f51b..0000000 --- a/dev-lang/go-bootstrap/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - williamh@gentoo.org - William Hubbs - - - This package is only necessary until gccgo supports go-1.4. It - will be removed as soon as stable gcc supports this. - It is here so that >=dev-lang/go 1.5 can use it to bootstrap. - - diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest deleted file mode 100644 index 4883305..0000000 --- a/dev-lang/go/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST go1.10.3.src.tar.gz 18323736 BLAKE2B f07ea774378eb25e28fc29ce6d8d7ed84227d4b93bfa93d38a071fe294da30c3cdc3a559d643e7379873df56b0e2731dbd772e385ffcb4b2e93819db3b4e33f2 SHA512 fd2bd5fcb5c6d0a5336c4b1d2cacb368edbb01359297a83bdedc53f6018642598232f00633fc60fde879050f5f26a810c828d46b5d6626cbcc0702d93ad33fbb diff --git a/dev-lang/go/go-1.10.3.ebuild b/dev-lang/go/go-1.10.3.ebuild deleted file mode 100644 index 02de3bc..0000000 --- a/dev-lang/go/go-1.10.3.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} - -MY_PV=${PV/_/} - -inherit toolchain-funcs - -case ${PV} in -*9999*) - EGIT_REPO_URI="https://github.com/golang/go.git" - inherit git-r3 - ;; -*) - SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " - S="${WORKDIR}"/go - case ${PV} in - *_beta*|*_rc*) ;; - *) - KEYWORDS="-* amd64" - #KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~x64-macos ~x64-solaris" - # The upstream tests fail under portage but pass if the build is - # run according to their documentation [1]. - # I am restricting the tests on released versions until this is - # solved. - # [1] https://golang.org/issues/18442 - RESTRICT="test" - ;; - esac -esac - -DESCRIPTION="A concurrent garbage collected and typesafe programming language" -HOMEPAGE="https://golang.org" - -LICENSE="BSD" -SLOT="0/${PV}" -IUSE="" - -DEPEND="dev-lang/go-bootstrap" -RDEPEND="! - - - - williamh@gentoo.org - William Hubbs - - - Go is a new systems programming language developped at google by - Rob Pike. It has garbage collection, coroutines, communication - channels and a clean syntax. - - diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest deleted file mode 100644 index 17a7f61..0000000 --- a/dev-lang/spidermonkey/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f -DIST spidermonkey-52.0-patches-0.tar.xz 5172 BLAKE2B 8bcf9477de47ef3b882cd3281efa7f77c16ce11fc93f44446a620917adf629fde8290af1dd69f0930a889aacfee3603bf60eb9c1e718a1dfd3e218a1013b6192 SHA512 88ad640fb0efa4972f1b7782bd0abee1751b73914ee51faade93b25c4d8eec64e7693898842a406c49fc2ab43733404efeccb138afb64d2193b9a5eb612578e3 diff --git a/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch b/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch deleted file mode 100644 index 708c749..0000000 --- a/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2018-01-12 12:21:16.764318254 -0500 -+++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2018-01-12 12:22:23.392069398 -0500 -@@ -93,10 +93,11 @@ - - if info['os'] == 'linux': - import ctypes -+ import ctypes.util - import errno - PR_SET_SECCOMP = 22 - SECCOMP_MODE_FILTER = 2 -- ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0) -+ ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0) - info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT - else: - info['has_sandbox'] = True diff --git a/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch b/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch deleted file mode 100644 index b0f8729..0000000 --- a/dev-lang/spidermonkey/files/spidermonkey-52.0-fix-alpha-bitness.patch +++ /dev/null @@ -1,32 +0,0 @@ - -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1482966103 -3600 -# Node ID 1f4d99d8dff27bcc25eff21dc6a16dae63f48595 -# Parent ce9e9f0dc752896ac7ba00bb0610b3f731e948b0 -Bug 1326496 - mozbuild: Fix bitness from 32 to 64 bits on alpha. r=glandium - - -diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py ---- a/python/mozbuild/mozbuild/configure/constants.py -+++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -35,17 +35,17 @@ Kernel = EnumString.subclass( - 'Linux', - 'NetBSD', - 'OpenBSD', - 'WINNT', - ) - - CPU_bitness = { - 'aarch64': 64, -- 'Alpha': 32, -+ 'Alpha': 64, - 'arm': 32, - 'hppa': 32, - 'ia64': 64, - 'mips32': 32, - 'mips64': 64, - 'ppc': 32, - 'ppc64': 64, - 's390': 32, - diff --git a/dev-lang/spidermonkey/files/spidermonkey-musl.patch b/dev-lang/spidermonkey/files/spidermonkey-musl.patch deleted file mode 100644 index b475637..0000000 --- a/dev-lang/spidermonkey/files/spidermonkey-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fixes "caddr_t undeclared" compile error - -diff -ur mozjs-52.9.1pre1.orig/python/psutil/psutil/_psutil_linux.c mozjs-52.9.1pre1/python/psutil/psutil/_psutil_linux.c ---- mozjs-52.9.1pre1.orig/python/psutil/psutil/_psutil_linux.c 2018-07-23 18:00:01.000000000 +0000 -+++ mozjs-52.9.1pre1/python/psutil/psutil/_psutil_linux.c 2018-11-25 20:07:15.365771007 +0000 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/dev-lang/spidermonkey/files/spidermonkey-threadlocal.patch b/dev-lang/spidermonkey/files/spidermonkey-threadlocal.patch deleted file mode 100644 index 3658c41..0000000 --- a/dev-lang/spidermonkey/files/spidermonkey-threadlocal.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fixes: - Error relocating /usr/lib/libmozjs-52.so: _ZN2js16TlsPerThreadDataE: symbol not found - ---- mozjs-52.9.1pre1/mfbt/ThreadLocal.h.orig 2018-11-28 09:48:43.746859132 +0000 -+++ mozjs-52.9.1pre1/mfbt/ThreadLocal.h 2018-11-28 09:48:45.930897382 +0000 -@@ -211,7 +211,7 @@ - } - - #ifdef MOZ_HAS_THREAD_LOCAL --#define MOZ_THREAD_LOCAL(TYPE) __thread mozilla::detail::ThreadLocal -+#define MOZ_THREAD_LOCAL(TYPE) MOZ_EXPORT __thread mozilla::detail::ThreadLocal - #else - #define MOZ_THREAD_LOCAL(TYPE) mozilla::detail::ThreadLocal - #endif diff --git a/dev-lang/spidermonkey/metadata.xml b/dev-lang/spidermonkey/metadata.xml deleted file mode 100644 index 514b7f9..0000000 --- a/dev-lang/spidermonkey/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - mozilla@gentoo.org - Gentoo Mozilla Team - - - Stand-alone JavaScript C++ library - - - Build with user-specified compiler optimizations - (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported) - Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems - Use the system-wide dev-libs/icu instead of bundled -- note, only takes effect when icu flag is enabled - - diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild deleted file mode 100644 index 2db5ba5..0000000 --- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WANT_AUTOCONF="2.1" -inherit autotools toolchain-funcs pax-utils mozcoreconf-v5 - -MY_PN="mozjs" -MY_P="${MY_PN}-${PV/_rc/.rc}" -MY_P="${MY_P/_pre/pre}" -DESCRIPTION="Stand-alone JavaScript C++ library" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -#SRC_URI="https://people.mozilla.org/~sfink/${MY_P}.tar.bz2" -SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> ${MY_P}.tar.bz2 - https://dev.gentoo.org/~axs/distfiles/${PN}-52.0-patches-0.tar.xz" - -LICENSE="NPL-1.1" -SLOT="52" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" -IUSE="debug elibc_musl minimal +system-icu test" - -RESTRICT="ia64? ( test )" - -S="${WORKDIR}/${MY_P%.rc*}" -BUILDDIR="${S}/jsobj" - -RDEPEND=">=dev-libs/nspr-4.13.1 - virtual/libffi - sys-libs/readline:0= - >=sys-libs/zlib-1.2.3 - system-icu? ( >=dev-libs/icu-58.1:= )" -DEPEND="${RDEPEND}" - -pkg_setup(){ - [[ ${MERGE_TYPE} == "binary" ]] || \ - moz_pkgsetup - - export SHELL="${EPREFIX}/bin/bash" -} - -src_prepare() { - # remove patches integrated by upstream - rm -f "${WORKDIR}"/${PN}/0002-build-Add-major-version-to-make-parallel-installable.patch \ - "${WORKDIR}"/${PN}/0005-headers-Fix-symbols-visibility.patch \ - "${WORKDIR}"/${PN}/0007-build-Remove-unnecessary-NSPR-dependency.patch \ - "${WORKDIR}"/${PN}/0008-tests-Skip-on-all-64-bit-archs.patch \ - || die - - eapply "${WORKDIR}/${PN}" - eapply "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch - eapply "${FILESDIR}"/${PN}-52.0-fix-alpha-bitness.patch - use elibc_musl && eapply "${FILESDIR}"/${PN}-musl.patch - use elibc_musl && eapply "${FILESDIR}"/${PN}-threadlocal.patch - - eapply_user - - cd "${S}"/js/src || die - eautoconf old-configure.in - eautoconf - - # there is a default config.cache that messes everything up - rm -f "${S}"/js/src/config.cache || die - - mkdir -p "${BUILDDIR}" || die -} - -src_configure() { - cd "${BUILDDIR}" || die - - ECONF_SOURCE="${S}/js/src" \ - econf \ - $(use_enable !elibc_musl jemalloc) \ - --enable-readline \ - --with-system-nspr \ - --disable-optimize \ - --with-intl-api \ - $(use_with system-icu) \ - $(use_enable debug) \ - $(use_enable test tests) \ - XARGS="/usr/bin/xargs" \ - SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ - CC="${CC}" CXX="${CXX}" LD="${LD}" AR="${AR}" RANLIB="${RANLIB}" -} - -cross_make() { - emake \ - CFLAGS="${BUILD_CFLAGS}" \ - CXXFLAGS="${BUILD_CXXFLAGS}" \ - AR="${BUILD_AR}" \ - CC="${BUILD_CC}" \ - CXX="${BUILD_CXX}" \ - RANLIB="${BUILD_RANLIB}" \ - SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ - "$@" -} -src_compile() { - cd "${BUILDDIR}" || die - if tc-is-cross-compiler; then - tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} - cross_make \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ - HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ - MOZ_PGO_OPTIMIZE_FLAGS="" \ - host_jsoplengen host_jskwgen - cross_make \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \ - -C config nsinstall - mv {,native-}host_jskwgen || die - mv {,native-}host_jsoplengen || die - mv config/{,native-}nsinstall || die - sed -i \ - -e 's@./host_jskwgen@./native-host_jskwgen@' \ - -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ - Makefile || die - sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die - rm -f config/host_nsinstall.o \ - config/host_pathsub.o \ - host_jskwgen.o \ - host_jsoplengen.o || die - fi - - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ - SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ - emake \ - MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ - HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ - MOZ_PGO_OPTIMIZE_FLAGS="" -} - -src_test() { - cd "${BUILDDIR}/js/src/jsapi-tests" || die - ./jsapi-tests || die -} - -src_install() { - cd "${BUILDDIR}" || die - SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ - emake DESTDIR="${D}" install - - if ! use minimal; then - pax-mark m "${ED}"usr/bin/js${SLOT} - else - rm -f "${ED}"usr/bin/js${SLOT} - fi - - # We can't actually disable building of static libraries - # They're used by the tests and in a few other places - find "${D}" -iname '*.a' -o -iname '*.ajs' -delete || die -} diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest deleted file mode 100644 index 6aa5e8f..0000000 --- a/net-misc/iperf/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iperf-3.1.3.tar.gz 549466 BLAKE2B 645e9614ef8f4e4f7949d9aaa99631eba604754a7744d1a729408c5549beb4baf692cee99498dddd8150e1cf06adaa13213cf70510e8ab54418274cdcf145ecd SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9 diff --git a/net-misc/iperf/files/iperf-3.0.5-flags.patch b/net-misc/iperf/files/iperf-3.0.5-flags.patch deleted file mode 100644 index 9c11c28..0000000 --- a/net-misc/iperf/files/iperf-3.0.5-flags.patch +++ /dev/null @@ -1,31 +0,0 @@ -* Do not inject -g -* Do not make a profiled build - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,6 +1,6 @@ - lib_LTLIBRARIES = libiperf.la # Build and install an iperf library - bin_PROGRAMS = iperf3 # Build and install an iperf binary --noinst_PROGRAMS = t_timer t_units t_uuid iperf3_profile # Build, but don't install the test programs and a profiled version of iperf3 -+noinst_PROGRAMS = t_timer t_units t_uuid # Build, but don't install the test programs and a profiled version of iperf3 - include_HEADERS = iperf_api.h # Defines the headers that get installed with the program - - -@@ -37,14 +37,13 @@ - - # Specify the sources and various flags for the iperf binary - iperf3_SOURCES = main.c --iperf3_CFLAGS = -g -+iperf3_CFLAGS = - iperf3_LDADD = libiperf.la --iperf3_LDFLAGS = -g -+iperf3_LDFLAGS = - - # Specify the sources and various flags for the profiled iperf binary. This - # binary recompiles all the source files to make sure they are all profiled. --iperf3_profile_SOURCES = main.c \ -- $(libiperf_la_SOURCES) -+iperf3_profile_SOURCES = main.c - - iperf3_profile_CFLAGS = -pg -g - iperf3_profile_LDADD = libiperf.la diff --git a/net-misc/iperf/files/iperf-3.1.3-musl.patch b/net-misc/iperf/files/iperf-3.1.3-musl.patch deleted file mode 100644 index 16801a0..0000000 --- a/net-misc/iperf/files/iperf-3.1.3-musl.patch +++ /dev/null @@ -1,184 +0,0 @@ -Index: iperf-3.1.3/src/iperf.h -=================================================================== ---- iperf-3.1.3.orig/src/iperf.h -+++ iperf-3.1.3/src/iperf.h -@@ -36,7 +36,13 @@ - #endif - #include - #include -+ -+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+ defined(TCP_INFO) - #include -+#elif defined(linux) -+#include -+#endif - - #if defined(HAVE_CPUSET_SETAFFINITY) - #include -@@ -66,7 +72,7 @@ struct iperf_interval_results - int cnt_error; - - int omitted; --#if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+#if (defined(__GLIBC__) || defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ - defined(TCP_INFO) - struct tcp_info tcpInfo; /* getsockopt(TCP_INFO) for Linux, {Free,Net}BSD */ - #else -Index: iperf-3.1.3/src/iperf_api.c -=================================================================== ---- iperf-3.1.3.orig/src/iperf_api.c -+++ iperf-3.1.3/src/iperf_api.c -@@ -47,7 +47,15 @@ - #ifdef HAVE_STDINT_H - #include - #endif -+ -+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+ defined(TCP_INFO) - #include -+#elif defined(linux) -+#include -+#endif -+ -+ - #include - #include - #include -Index: iperf-3.1.3/src/iperf_server_api.c -=================================================================== ---- iperf-3.1.3.orig/src/iperf_server_api.c -+++ iperf-3.1.3/src/iperf_server_api.c -@@ -44,7 +44,14 @@ - #ifdef HAVE_STDINT_H - #include - #endif -+ -+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+ defined(TCP_INFO) - #include -+#elif defined(linux) -+#include -+#endif -+ - #include - #include - #include -Index: iperf-3.1.3/src/iperf_tcp.c -=================================================================== ---- iperf-3.1.3.orig/src/iperf_tcp.c -+++ iperf-3.1.3/src/iperf_tcp.c -@@ -35,7 +35,14 @@ - #include - #include - #include -+ -+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+ defined(TCP_INFO) - #include -+#elif defined(linux) -+#include -+#endif -+ - #include - #include - -Index: iperf-3.1.3/src/iperf_sctp.c -=================================================================== ---- iperf-3.1.3.orig/src/iperf_sctp.c -+++ iperf-3.1.3/src/iperf_sctp.c -@@ -35,7 +35,14 @@ - #include - #include - #include -+ -+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+ defined(TCP_INFO) - #include -+#elif defined(linux) -+#include -+#endif -+ - #include - #include - -Index: iperf-3.1.3/src/tcp_info.c -=================================================================== ---- iperf-3.1.3.orig/src/tcp_info.c -+++ iperf-3.1.3/src/tcp_info.c -@@ -48,7 +48,14 @@ - #include - #include - #include -+ -+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+ defined(TCP_INFO) - #include -+#elif defined(linux) -+#include -+#endif -+ - #include - #include - #include -Index: iperf-3.1.3/src/units.c -=================================================================== ---- iperf-3.1.3.orig/src/units.c -+++ iperf-3.1.3/src/units.c -@@ -60,7 +60,13 @@ - #include - #include - #include -+ -+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+ defined(TCP_INFO) - #include -+#elif defined(linux) -+#include -+#endif - - - #include "iperf.h" -Index: iperf-3.1.3/src/main.c -=================================================================== ---- iperf-3.1.3.orig/src/main.c -+++ iperf-3.1.3/src/main.c -@@ -44,7 +44,13 @@ - #ifdef HAVE_STDINT_H - #include - #endif -+ -+#if (defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)) && \ -+ defined(TCP_INFO) - #include -+#elif defined(linux) -+#include -+#endif - - #include "iperf.h" - #include "iperf_api.h" -Index: iperf-3.1.3/src/timer.h -=================================================================== ---- iperf-3.1.3.orig/src/timer.h -+++ iperf-3.1.3/src/timer.h -@@ -32,6 +32,8 @@ - - #include - -+#include -+ - /* TimerClientData is an opaque value that tags along with a timer. The - ** client can use it for whatever, and it gets passed to the callback when - ** the timer triggers. -Index: iperf-3.1.3/src/t_uuid.c -=================================================================== ---- iperf-3.1.3.orig/src/t_uuid.c -+++ iperf-3.1.3/src/t_uuid.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include "iperf_util.h" - diff --git a/net-misc/iperf/files/iperf.confd b/net-misc/iperf/files/iperf.confd deleted file mode 100644 index 7d82492..0000000 --- a/net-misc/iperf/files/iperf.confd +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# extra options (run iperf -h for a list of supported options) -IPERF_OPTS="--format Mbytes" diff --git a/net-misc/iperf/files/iperf.initd-r1 b/net-misc/iperf/files/iperf.initd-r1 deleted file mode 100644 index cd17a7b..0000000 --- a/net-misc/iperf/files/iperf.initd-r1 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="IP bandwidth measurement server" -command="/usr/bin/iperf" - -command_background="yes" -pidfile="/run/${SVCNAME}.pid" -command_args="-s ${IPERF_OPTS}" - -# note: iperf has a -D/--daemon flag but we seem to hit a bug -# where it starts to eat all CPU after client disconnect, -# see bug #344875 diff --git a/net-misc/iperf/files/iperf3.initd b/net-misc/iperf/files/iperf3.initd deleted file mode 100644 index 281ebf5..0000000 --- a/net-misc/iperf/files/iperf3.initd +++ /dev/null @@ -1,10 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="IP bandwidth measurement server" -command="/usr/bin/iperf3" - -command_background="yes" -pidfile="/run/${SVCNAME}.pid" -command_args="-s ${IPERF_OPTS}" diff --git a/net-misc/iperf/iperf-3.1.3.ebuild b/net-misc/iperf/iperf-3.1.3.ebuild deleted file mode 100644 index 5825053..0000000 --- a/net-misc/iperf/iperf-3.1.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils - -DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" -HOMEPAGE="https://github.com/esnet/iperf/" -SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV/_beta/b} -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3" -KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" -IUSE="sctp static-libs" - -DEPEND="sctp? ( net-misc/lksctp-tools )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P/_beta/b} - -PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch - "${FILESDIR}/${PN}-3.1.3-musl.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - newconfd "${FILESDIR}"/iperf.confd iperf3 - newinitd "${FILESDIR}"/iperf3.initd iperf3 - prune_libtool_files -} diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml deleted file mode 100644 index c2391d4..0000000 --- a/net-misc/iperf/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - netmon@gentoo.org - Gentoo network monitoring and analysis project - - - esnet/iperf - iperf - -