From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 786F4138330 for ; Sat, 13 Jan 2018 01:48:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A211AE0A98; Sat, 13 Jan 2018 01:48:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C2AEE0A98 for ; Sat, 13 Jan 2018 01:48:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E747F335C4A for ; Sat, 13 Jan 2018 01:48:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8008E19F for ; Sat, 13 Jan 2018 01:48:04 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1515808076.52b51f73609113386a4fceb5310262e1e96932d0.axs@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild X-VCS-Directories: dev-lang/spidermonkey/files/ dev-lang/spidermonkey/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 52b51f73609113386a4fceb5310262e1e96932d0 X-VCS-Branch: master Date: Sat, 13 Jan 2018 01:48:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4f9d2913-4c7d-4690-a014-85ba91cb5084 X-Archives-Hash: 1852ff5fa65e06f7ce292edf3c4881bc commit: 52b51f73609113386a4fceb5310262e1e96932d0 Author: Ian Stakenvicius gentoo org> AuthorDate: Sat Jan 13 01:47:27 2018 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Sat Jan 13 01:47:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b51f73 dev-lang/spidermonkey:38 - don't hardcode libc soname This patch attempts to fix issues linking to libc on platforms whos libc is not libc.so.6 (ie, ia64 and others). Bug: http://bugs.gentoo.org/631574 Package-Manager: Portage-2.3.13, Repoman-2.3.3 .../files/moz38-dont-hardcode-libc-soname.patch | 15 +++++++++++++++ dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch b/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch new file mode 100644 index 00000000000..708c7496975 --- /dev/null +++ b/dev-lang/spidermonkey/files/moz38-dont-hardcode-libc-soname.patch @@ -0,0 +1,15 @@ +--- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2018-01-12 12:21:16.764318254 -0500 ++++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2018-01-12 12:22:23.392069398 -0500 +@@ -93,10 +93,11 @@ + + if info['os'] == 'linux': + import ctypes ++ import ctypes.util + import errno + PR_SET_SECCOMP = 22 + SECCOMP_MODE_FILTER = 2 +- ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0) ++ ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0) + info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT + else: + info['has_sandbox'] = True diff --git a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild index 476c5c40b78..6b3861a9c18 100644 --- a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild @@ -42,7 +42,8 @@ src_prepare() { "${WORKDIR}"/sm38/mozjs38-fix-tracelogger.patch \ "${WORKDIR}"/sm38/mozjs38-copy-headers.patch \ "${WORKDIR}"/sm38/mozjs38-pkg-config-version.patch \ - "${WORKDIR}"/sm38/mozilla_configure_regexp_esr38.patch + "${WORKDIR}"/sm38/mozilla_configure_regexp_esr38.patch \ + "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch eapply_user