X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from relay.mailchannels.net (si-002-i26.relay.mailchannels.net [184.154.112.191]) by mail.alpinelinux.org (Postfix) with ESMTP id 43E74DC0999 for ; Wed, 16 Apr 2014 00:00:15 +0000 (UTC) X-Sender-Id: thewebhostserver|x-authuser|developer%40it-offshore.co.uk Received: from apollo.thewebhostserver.com (ip-10-227-128-69.us-west-2.compute.internal [10.227.128.69]) by relay.mailchannels.net (Postfix) with ESMTPA id 10CA060AEC for ; Wed, 16 Apr 2014 00:00:12 +0000 (UTC) X-Sender-Id: thewebhostserver|x-authuser|developer%40it-offshore.co.uk Received: from apollo.thewebhostserver.com ([UNAVAILABLE]. [10.248.1.153]) (using TLSv1 with cipher DHE-RSA-AES256-SHA) by 0.0.0.0:2500 (trex/5.0.19); Wed, 16 Apr 2014 00:00:13 GMT X-MC-Relay: Neutral X-MailChannels-SenderId: thewebhostserver%7Cx-authuser%7Cdeveloper%2540it-offshore.co.uk X-MailChannels-Auth-Id: thewebhostserver Received: from a81-84-17-65.cpe.netcabo.pt ([81.84.17.65]:53729 helo=uclibc.localdomain) by apollo.thewebhostserver.com with esmtpsa (UNKNOWN:AES128-SHA256:128) (Exim 4.82) (envelope-from ) id 1WaDGq-000UqW-Bs; Wed, 16 Apr 2014 01:00:08 +0100 From: Stuart Cardall To: alpine-devel@lists.alpinelinux.org Cc: Stuart Cardall Subject: [alpine-devel] [PATCH] /main/gcc - make libatomic a subpackage Date: Tue, 15 Apr 2014 23:59:47 +0000 Message-Id: <1397606387-5675-1-git-send-email-developer@it-offshore.co.uk> X-Mailer: git-send-email 1.9.1 X-AuthUser: developer@it-offshore.co.uk X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: This patch makes libatomic a subpackage of gcc which stops openvswitch installing gcc & all of it's dependencies. Closes https://bugs.alpinelinux.org/issues/2844 --- main/gcc/APKBUILD | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index cba7184..568a1d1 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -105,6 +105,8 @@ x86 | x86_64) LIBQUADMATH=$LANG_FORTRAN ;; *) LIBQUADMATH=false ;; esac +# libatomic is a dependency for openvswitch +$LIBATOMIC && subpackages="$subpackages libatomic" $LIBGCC && subpackages="$subpackages libgcc" $LIBQUADMATH && subpackages="$subpackages libquadmath" if $LIBGOMP; then @@ -427,6 +429,17 @@ package() { fi } +libatomic() { + pkgdesc="GCC Atomic library" + depends= + CARCH="$CTARGET_ARCH" + + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libatomic.so.* "$subpkgdir"/usr/lib/ || \ + cp -a "$pkgdir"/usr/$CTARGET/lib/libatomic.so.* "$subpkgdir"/usr/lib/ || \ + return 1 +} + libcxx() { pkgdesc="GNU C++ standard runtime library" depends= -- 1.9.1 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---