commit: 5cb5c82f2b6b9db1b309c9cc10b870fe8f645c1b Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx> AuthorDate: Thu Oct 26 19:07:25 2023 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> 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 <AT> cfuga.mx> Signed-off-by: Yixun Lan <dlan <AT> 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=(
