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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACA6515814C for ; Fri, 27 Oct 2023 05:44:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F35B52BC042; Fri, 27 Oct 2023 05:44:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC05C2BC042 for ; Fri, 27 Oct 2023 05:44:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 345B8335C34 for ; Fri, 27 Oct 2023 05:44:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC10A12D5 for ; Fri, 27 Oct 2023 05:44:08 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1698385431.5cb5c82f2b6b9db1b309c9cc10b870fe8f645c1b.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/filezilla/filezilla-3.65.0-r1.ebuild net-ftp/filezilla/filezilla-3.66.0-r1.ebuild net-ftp/filezilla/filezilla-3.66.0.ebuild X-VCS-Directories: net-ftp/filezilla/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 5cb5c82f2b6b9db1b309c9cc10b870fe8f645c1b X-VCS-Branch: master Date: Fri, 27 Oct 2023 05:44:08 +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: 51345df6-b8e6-4862-ae98-94c23fe1a7e6 X-Archives-Hash: 1cf1dfc20f9fccca9f281f080969a33b commit: 5cb5c82f2b6b9db1b309c9cc10b870fe8f645c1b Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Thu Oct 26 19:07:25 2023 +0000 Commit: Yixun Lan gentoo org> CommitDate: Fri Oct 27 05:43:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb5c82f net-ftp/filezilla: fix build for x86 without SSE2 When FileZilla is compiled with ```-march=i686``` or ```-mtune=i686``` GCC flags, also tries to compile SSE2 optimized code, but not all x86 CPUs support it. This fix uses CPU_FLAGS_X86 to switch between SSE2 optimized or software emulated code. Closes: https://bugs.gentoo.org/916119 Closes: https://github.com/gentoo/gentoo/pull/33528 Signed-off-by: Cristian Othón Martínez Vera cfuga.mx> Signed-off-by: Yixun Lan gentoo.org> .../{filezilla-3.66.0.ebuild => filezilla-3.65.0-r1.ebuild} | 9 ++++++--- .../{filezilla-3.66.0.ebuild => filezilla-3.66.0-r1.ebuild} | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/net-ftp/filezilla/filezilla-3.66.0.ebuild b/net-ftp/filezilla/filezilla-3.65.0-r1.ebuild similarity index 87% copy from net-ftp/filezilla/filezilla-3.66.0.ebuild copy to net-ftp/filezilla/filezilla-3.65.0-r1.ebuild index 489c5e4ccac5..aeb9ad850153 100644 --- a/net-ftp/filezilla/filezilla-3.66.0.ebuild +++ b/net-ftp/filezilla/filezilla-3.65.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit autotools wxwidgets xdg +inherit autotools flag-o-matic wxwidgets xdg MY_PV="${PV/_/-}" MY_P="FileZilla_${MY_PV}" @@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="dbus nls test" +IUSE="cpu_flags_x86_sse2 dbus nls test" RESTRICT="!test? ( test )" # pugixml 1.7 minimal dependency is for c++11 proper configuration @@ -26,7 +26,7 @@ RDEPEND=" >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/boost-1.76.0:= - >=dev-libs/libfilezilla-0.45.0:= + >=dev-libs/libfilezilla-0.44.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 x11-libs/wxGTK:${WX_GTK_VER}[X] @@ -53,6 +53,9 @@ src_prepare() { } src_configure() { + if use x86 && ! use cpu_flags_x86_sse2; then + append-cppflags -D_FORCE_SOFTWARE_SHA + fi setup-wxwidgets local myeconfargs=( diff --git a/net-ftp/filezilla/filezilla-3.66.0.ebuild b/net-ftp/filezilla/filezilla-3.66.0-r1.ebuild similarity index 89% rename from net-ftp/filezilla/filezilla-3.66.0.ebuild rename to net-ftp/filezilla/filezilla-3.66.0-r1.ebuild index 489c5e4ccac5..cb61885b28b4 100644 --- a/net-ftp/filezilla/filezilla-3.66.0.ebuild +++ b/net-ftp/filezilla/filezilla-3.66.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit autotools wxwidgets xdg +inherit autotools flag-o-matic wxwidgets xdg MY_PV="${PV/_/-}" MY_P="FileZilla_${MY_PV}" @@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="dbus nls test" +IUSE="cpu_flags_x86_sse2 dbus nls test" RESTRICT="!test? ( test )" # pugixml 1.7 minimal dependency is for c++11 proper configuration @@ -53,6 +53,9 @@ src_prepare() { } src_configure() { + if use x86 && ! use cpu_flags_x86_sse2; then + append-cppflags -D_FORCE_SOFTWARE_SHA + fi setup-wxwidgets local myeconfargs=(