X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by lists.alpinelinux.org (Postfix) with ESMTP id 69F0B5C5121 for ; Fri, 17 Mar 2017 11:03:01 +0000 (GMT) Received: by mail-qk0-f194.google.com with SMTP id v127so9283535qkb.1 for ; Fri, 17 Mar 2017 04:03:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flatglobe.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=+GZou86LlqP7eaNrCErOeUAMP/vMbGVWm8ADF5D00z8=; b=AhlpozXK0/qbHCCHErR46c9ynB2UPd4PRUQ67+T0mXwJiuBIKI8PlZ/ryaV66+Q3SE y5nDJlOcPqdjcOeqLpoSWpwAcmNkPmqhG3Muefqx8+sakdAX2cJOGY6/WBlAiea9YV/J 2WcmtaH21VBpuUIb1seJo0Ay9LGzf5H/49nBk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+GZou86LlqP7eaNrCErOeUAMP/vMbGVWm8ADF5D00z8=; b=dvmZmdWmkR6ew4a+t2IeVVs8H8E22APblFW7CWYZ/3ZPaA8YuKk7iqvDz7JIcrccWA 7bf3nQ1fz+henlHoOpJTWXbkA07isXj/tyPMfdCZLq7w36PsGAXmIo5lQiecgwcdB7I5 QVNew7cxzuJpYqpqIekWUI7qChLxgXvk888hUB2sJf8k5DQRrj9b8nr6gSoIqGDz41mj q4YqXIVelyQsxDLA8qRll3AEo7Lr8DnsrtvIkgnjvrflpgce+pNz0k0OVIMJfqkt03kB 7E0mHmk90epoO2aacS+65jh1Dz70x04TqJM+5bnFJsGSBV7TaxsZlCzTJz7bkr/Jqexv nEPQ== X-Gm-Message-State: AFeK/H3TX/54qGPK7M7YDKS3uqAPGUz8m7sZXiNoB060J0P1hirQ/FHb1GFMs9qzJ3Q45A== X-Received: by 10.55.169.71 with SMTP id s68mr11318082qke.137.1489748580759; Fri, 17 Mar 2017 04:03:00 -0700 (PDT) Received: from localhost.localdomain (cpe-204-210-151-44.hvc.res.rr.com. [204.210.151.44]) by smtp.gmail.com with ESMTPSA id o16sm5632080qkl.67.2017.03.17.04.02.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Mar 2017 04:03:00 -0700 (PDT) From: "Tuan M. Hoang" To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH 4/7] main/boost: add s390x support Date: Fri, 17 Mar 2017 07:02:50 -0400 Message-Id: <20170317110250.22782-1-tmhoang@flatglobe.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170317110046.22642-1-tmhoang@flatglobe.org> References: <20170317110046.22642-1-tmhoang@flatglobe.org> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Reorder a little bit. Update mismatch sha512 sum. --- main/boost/APKBUILD | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD index 474399a3b4..a0df10b020 100644 --- a/main/boost/APKBUILD +++ b/main/boost/APKBUILD @@ -62,6 +62,17 @@ prepare() { __EOF__ } +case "$CARCH" in + armhf|aarch64) _boostarch=arm ;; + ppc64*) _boostarch=ppc ;; + s390x) _boostarch=s390 ;; + *) _boostarch=$CARCH ;; +esac +_enginedir=tools/build/src/engine +_bjam="${builddir}/$_enginedir/bin.linux${_boostarch}/bjam" +[ "$_boostarch" = "s390" ] && _bjam="${builddir}/$_enginedir/bin.linux390/bjam" && \ + _options_s390="--without-context --without-coroutine --without-coroutine2" + _options="--user-config=\"$builddir/user-config.jam\" --prefix=\"$pkgdir/usr\" release @@ -76,22 +87,15 @@ _options="--user-config=\"$builddir/user-config.jam\" --layout=tagged -q -j${JOBS:-2} + ${_options_s390} " -case "$CARCH" in - armhf|aarch64) _boostarch=arm ;; - ppc64*) _boostarch=ppc ;; - *) _boostarch=$CARCH ;; -esac -_enginedir=tools/build/src/engine - build() { export BOOST_ROOT="$builddir" msg "Building bjam" cd "$builddir"/$_enginedir CC= ./build.sh cc || return 1 - local _bjam="$PWD/bin.linux$_boostarch/bjam" msg "Building bcp" cd "$builddir"/tools/bcp @@ -106,7 +110,7 @@ package() { export BOOST_ROOT="$builddir" cd "$builddir" - install -Dm755 $_enginedir/bin.linux${_boostarch}/bjam \ + install -Dm755 $_bjam \ "$pkgdir"/usr/bin/bjam || return 1 install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp || return 1 @@ -138,7 +142,7 @@ _pyversion() { $1 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))' } -sha512sums="26f9bd25133e459e2e583cec7e0cbaf805de920a411dd1aa4e2b88091f6a6a9ea3642545da38fa3e7b8f44c336b8b909a4ce76db5502f7140fd62a1505e18e7c boost_1_62_0.tar.bz2 +sha512sums="5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be boost_1_62_0.tar.bz2 5804c344b5e5ece17811e744f1965c58840b6695a084dd09c23c9db380f3cbfbca201d6c595b5379bc12ff6f285794509799d28864df6037db6212c63adb2207 libressl.patch d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch 132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch -- 2.11.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---