diff options
author | Stuart Cardall <developer@it-offshore.co.uk> | 2014-04-15 23:59:47 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-16 08:00:41 +0000 |
commit | 7b1de2968f11be226b8d34f458011bdadb3a6967 (patch) | |
tree | 9ee52543cc344ab857ee77dfc4d67e8308b5d583 | |
parent | b35c92de3e329f6648ce77668442eb535f5e6394 (diff) | |
download | alpine_aports-7b1de2968f11be226b8d34f458011bdadb3a6967.tar.bz2 alpine_aports-7b1de2968f11be226b8d34f458011bdadb3a6967.tar.xz alpine_aports-7b1de2968f11be226b8d34f458011bdadb3a6967.zip |
main/gcc: - make libatomic a subpackage
This patch makes libatomic a subpackage of gcc which stops openvswitch
installing gcc & all of it's dependencies.
fixes #2844
-rw-r--r-- | main/gcc/APKBUILD | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index cba71842c9..a835c00219 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD | |||
@@ -9,7 +9,7 @@ _cross="" | |||
9 | && _cross="-$CTARGET" | 9 | && _cross="-$CTARGET" |
10 | 10 | ||
11 | pkgname="$pkgname$_cross" | 11 | pkgname="$pkgname$_cross" |
12 | pkgrel=6 | 12 | pkgrel=7 |
13 | pkgdesc="The GNU Compiler Collection" | 13 | pkgdesc="The GNU Compiler Collection" |
14 | url="http://gcc.gnu.org" | 14 | url="http://gcc.gnu.org" |
15 | arch="all" | 15 | arch="all" |
@@ -105,6 +105,8 @@ x86 | x86_64) LIBQUADMATH=$LANG_FORTRAN ;; | |||
105 | *) LIBQUADMATH=false ;; | 105 | *) LIBQUADMATH=false ;; |
106 | esac | 106 | esac |
107 | 107 | ||
108 | # libatomic is a dependency for openvswitch | ||
109 | $LIBATOMIC && subpackages="$subpackages libatomic" | ||
108 | $LIBGCC && subpackages="$subpackages libgcc" | 110 | $LIBGCC && subpackages="$subpackages libgcc" |
109 | $LIBQUADMATH && subpackages="$subpackages libquadmath" | 111 | $LIBQUADMATH && subpackages="$subpackages libquadmath" |
110 | if $LIBGOMP; then | 112 | if $LIBGOMP; then |
@@ -427,6 +429,18 @@ package() { | |||
427 | fi | 429 | fi |
428 | } | 430 | } |
429 | 431 | ||
432 | libatomic() { | ||
433 | pkgdesc="GCC Atomic library" | ||
434 | depends= | ||
435 | replaces="gcc" | ||
436 | CARCH="$CTARGET_ARCH" | ||
437 | |||
438 | mkdir -p "$subpkgdir"/usr/lib | ||
439 | mv "$pkgdir"/usr/lib/libatomic.so.* "$subpkgdir"/usr/lib/ || \ | ||
440 | cp -a "$pkgdir"/usr/$CTARGET/lib/libatomic.so.* "$subpkgdir"/usr/lib/ || \ | ||
441 | return 1 | ||
442 | } | ||
443 | |||
430 | libcxx() { | 444 | libcxx() { |
431 | pkgdesc="GNU C++ standard runtime library" | 445 | pkgdesc="GNU C++ standard runtime library" |
432 | depends= | 446 | depends= |