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 C44901382C5 for ; Sat, 9 Jan 2021 13:53:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD598E081B; Sat, 9 Jan 2021 13:53:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C73FCE081B for ; Sat, 9 Jan 2021 13:53:16 +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 65269340F12 for ; Sat, 9 Jan 2021 13:53:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8B0C492 for ; Sat, 9 Jan 2021 13:53:09 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1610200387.70a6c877b9763fb19eb292bd0b15243d5fd534d4.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/socat/files/, net-misc/socat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch net-misc/socat/socat-1.7.4.0.ebuild X-VCS-Directories: net-misc/socat/files/ net-misc/socat/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 70a6c877b9763fb19eb292bd0b15243d5fd534d4 X-VCS-Branch: master Date: Sat, 9 Jan 2021 13:53:09 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dbbafd2f-18a5-4deb-bec1-4b36954f7d95 X-Archives-Hash: d431316042d1a2ec5a633d73ec28747a commit: 70a6c877b9763fb19eb292bd0b15243d5fd534d4 Author: Lars Wendler gentoo org> AuthorDate: Sat Jan 9 13:52:42 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Jan 9 13:53:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a6c877 net-misc/socat: Fixed build on 32bit arches with kind permission from Sam Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> .../files/socat-1.7.4.0-32bit_build_fix.patch | 42 ++++++++++++++++++++++ net-misc/socat/socat-1.7.4.0.ebuild | 4 +++ 2 files changed, 46 insertions(+) diff --git a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch new file mode 100644 index 00000000000..0b391ed8929 --- /dev/null +++ b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch @@ -0,0 +1,42 @@ +2021-01-08: Quick fix to a compilation failure especially on 32 bit systems + +--- socat-1.7.4.0/compat.h ++++ socat-1.7.4.0/compat.h +@@ -134,6 +134,8 @@ + # define F_uint64_t "%u" + # elif HAVE_BASIC_UINT64_T==6 + # define F_uint64_t "%lu" ++# elif HAVE_BASIC_UINT64_T==8 ++# define F_uint64_t "%llu" + # else + # error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T + # endif +@@ -147,7 +149,7 @@ + # elif HAVE_BASIC_INT16_T==3 + # define F_int16_t "%d" + # elif HAVE_BASIC_INT16_T==5 +-# define F_int16_t "%l" ++# define F_int16_t "%ld" + # else + # error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T + # endif +@@ -161,7 +163,7 @@ + # elif HAVE_BASIC_INT32_T==3 + # define F_int32_t "%d" + # elif HAVE_BASIC_INT32_T==5 +-# define F_int32_t "%l" ++# define F_int32_t "%ld" + # else + # error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T + # endif +@@ -175,7 +177,9 @@ + # elif HAVE_BASIC_INT64_T==3 + # define F_int64_t "%d" + # elif HAVE_BASIC_INT64_T==5 +-# define F_int64_t "%l" ++# define F_int64_t "%ld" ++# elif HAVE_BASIC_INT64_T==7 ++# define F_int64_t "%lld" + # else + # error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T + # endif diff --git a/net-misc/socat/socat-1.7.4.0.ebuild b/net-misc/socat/socat-1.7.4.0.ebuild index 1db0f86eaaf..4b62fa74485 100644 --- a/net-misc/socat/socat-1.7.4.0.ebuild +++ b/net-misc/socat/socat-1.7.4.0.ebuild @@ -35,6 +35,10 @@ RESTRICT=" DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) +PATCHES=( + "${FILESDIR}/${P}-32bit_build_fix.patch" +) + pkg_setup() { # bug #587740 if use readline && use ssl; then