X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qt0-f169.google.com (mail-qt0-f169.google.com [209.85.216.169]) by lists.alpinelinux.org (Postfix) with ESMTP id E308B5C5320 for ; Wed, 12 Apr 2017 01:00:31 +0000 (GMT) Received: by mail-qt0-f169.google.com with SMTP id v3so11411815qtd.3 for ; Tue, 11 Apr 2017 18:00:31 -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=DAz4rcz6cN8Fd6LWSIlyY0H1yVjehntZzSADHxAlnHc=; b=ZJpQXgAZCAVyu/2+hicmZTNDA60eYvrLxEZW3p0kDKVSpmCf8qQGkAhROYTVMjZvRL eZK16jKfdOCgCqcTjOlEjaFxxSifl2PjBKBmTSDzZhOJJi7Gyy0eBGyYPLLmlxSfqHiV E381h01yvRQjhSbTwc1/8TQAL+ZsS8KsP29Hg= 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=DAz4rcz6cN8Fd6LWSIlyY0H1yVjehntZzSADHxAlnHc=; b=PfapzxSQVkKGJKUR7lsqNZaEQfsPt45lUAoqR5XvUwKlyq75rNBOiKhFMGN9/xki3O TbdOWe04ET6xpARoLJupDV2Q+nRVyo7NiM0QCYofD/oMXUCH5osU+a8ChzPIrGBHAZyr kEDM7pb0N3TOjBUxWYXoknZB8IRuINBc6n/NzysLzic8p2Ep5vma6DOKXOgvizGkZtwM IsHVa78Qy5dIUjgTG3XFE7RfLjC26cDPlphDEP8L19lDocoTD5AOYj0nKCmMQUskeJZw 0/LkgbjlgZfqBC20qbOedTPvz27rPPh8Da7FJh7cu3uQVSiKHEmUWAlf7/HFnlEM4mCF eTXQ== X-Gm-Message-State: AN3rC/4GAgZf9AQyENFZv97v/mFuy6WqR6C4QPzxMl9oy+xsGnCC/V6DtVxQkZgeSJckSA== X-Received: by 10.237.37.24 with SMTP id v24mr8436797qtc.290.1491958831314; Tue, 11 Apr 2017 18:00:31 -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 h23sm12273239qtc.49.2017.04.11.18.00.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Apr 2017 18:00:30 -0700 (PDT) From: "Tuan M. Hoang" To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH 3/6] main/cmocka: __WORDSIZE definition on s390x Date: Tue, 11 Apr 2017 21:00:09 -0400 Message-Id: <1491958809-24470-1-git-send-email-tmhoang@flatglobe.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1491958776-24388-1-git-send-email-tmhoang@flatglobe.org> References: <1491958776-24388-1-git-send-email-tmhoang@flatglobe.org> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: There should be a more elegant solution for this but it would work fine --- main/cmocka/APKBUILD | 2 ++ main/cmocka/s390x_wordsize.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 main/cmocka/s390x_wordsize.patch diff --git a/main/cmocka/APKBUILD b/main/cmocka/APKBUILD index bfe3b55c86..6d15fff284 100644 --- a/main/cmocka/APKBUILD +++ b/main/cmocka/APKBUILD @@ -11,6 +11,7 @@ depends="" makedepends="cmake" subpackages="$pkgname-dev" source="https://cmocka.org/files/${pkgver%.*}/$pkgname-$pkgver.tar.xz + s390x_wordsize.patch musl_uintptr.patch" builddir="$srcdir/$pkgname-$pkgver" @@ -46,4 +47,5 @@ package() { } sha512sums="b45b6c6bf6c1a0e12cbbfa203afc0172aa53215e0bd43a21b30db04c0490609a7a262f1b4d87be9df0c5c486c4f4891d3432e0e053418d373d9750a6cf5adf70 cmocka-1.1.0.tar.xz +f7db110909662dc1a185d09d1f00aef967eee99753f6929b1f0794422c1ca38f4a3643f39960813355b7da155f96325a30dfbe66ac6f19e55967a241a0e923de s390x_wordsize.patch b20b5c0d172a9df756ec093a3df4bf5bdf2a0c06a3d3ad39ec001248ccb86e6fd3dcedfc9ce42e8309cc01ea34fadffd4ebcc0fb3af9f5e795e7fe40c461ac60 musl_uintptr.patch" diff --git a/main/cmocka/s390x_wordsize.patch b/main/cmocka/s390x_wordsize.patch new file mode 100644 index 0000000000..135fd65195 --- /dev/null +++ b/main/cmocka/s390x_wordsize.patch @@ -0,0 +1,13 @@ +diff --git a/include/cmocka.h b/include/cmocka.h +index bfcdd3f..60467b9 100644 +--- a/include/cmocka.h ++++ b/include/cmocka.h +@@ -56,7 +56,7 @@ int __stdcall IsDebuggerPresent(); + + /* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */ + #ifndef __WORDSIZE +-# if defined(__x86_64__) && !defined(__ILP32__) ++# if ( defined(__x86_64__) && !defined(__ILP32__) ) || defined(__s390x__) + # define __WORDSIZE 64 + # else + # define __WORDSIZE 32 -- 2.12.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---