For discussion of Alpine Linux development and developer support

1

[alpine-devel] [PATCH] /main/gcc - make libatomic a subpackage (with pkgrel bumped)

Stuart Cardall
Details
Message ID
<1397608417-6041-1-git-send-email-developer@it-offshore.co.uk>
Sender timestamp
1397608417
DKIM signature
missing
Download raw message
Patch: +14 -1
This patch has $pkgrel correctly bumped to r7
---
 main/gcc/APKBUILD | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index cba7184..6f0478c 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -9,7 +9,7 @@ _cross=""
 	&& _cross="-$CTARGET"
 
 pkgname="$pkgname$_cross"
-pkgrel=6
+pkgrel=7
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 arch="all"
@@ -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
---
Natanael Copa
Details
Message ID
<20140416131224.3d450257@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1397608417-6041-1-git-send-email-developer@it-offshore.co.uk> (view parent)
Sender timestamp
1397646744
DKIM signature
missing
Download raw message
On Wed, 16 Apr 2014 00:33:37 +0000
Stuart Cardall <developer@it-offshore.co.uk> wrote:

> This patch has $pkgrel correctly bumped to r7

applied with fixed commit message and letting libatomic replace gcc
files.

Thanks!

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---