Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Jun 2024 09:11:43 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 89f3224efd9d - main - databases/sqlitestudio: Disable PLUGIN_DB_SQLITE_WX on non-Intel architectures
Message-ID:  <202406140911.45E9BhT3054854@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=89f3224efd9db551c4678184c9edb43155227ebd

commit 89f3224efd9db551c4678184c9edb43155227ebd
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-06-14 05:26:37 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-06-14 09:11:32 +0000

    databases/sqlitestudio: Disable PLUGIN_DB_SQLITE_WX on non-Intel architectures
    
    This plugin uses SSE SIMD unconditionally.
    
    Reported by:    fallout
---
 databases/sqlitestudio/Makefile                             |  6 ++++++
 .../files/patch-Plugins_DbSqliteWx_DbSqliteWx.pro           | 13 -------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile
index 23ae394fafdf..2bfee7345d63 100644
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@@ -48,6 +48,12 @@ PLUGIN_SCRIPTING_PYTHON_BROKEN=			https://github.com/pawelsalawa/sqlitestudio/is
 PLUGIN_SCRIPTING_TCL_USES=			tcl:87
 PLUGIN_SCRIPTING_TCL_CXXFLAGS=			-I${TCL_INCLUDEDIR}
 
+# workaround for https://github.com/pawelsalawa/sqlitestudio/issues/4999
+ARCH!=						uname -p
+.if ${ARCH} != "amd64" && ${ARCH} != "i386"
+PLUGIN_DB_SQLITE_WX_BROKEN=			Impossible to build on ${ARCH}: it uses SSE SIMD
+.endif
+
 .for opt in ${OPTIONS_GROUP_PLUGINS}
 .  if "${${opt}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${opt}
diff --git a/databases/sqlitestudio/files/patch-Plugins_DbSqliteWx_DbSqliteWx.pro b/databases/sqlitestudio/files/patch-Plugins_DbSqliteWx_DbSqliteWx.pro
deleted file mode 100644
index 9c82bd5c532c..000000000000
--- a/databases/sqlitestudio/files/patch-Plugins_DbSqliteWx_DbSqliteWx.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-- workaround for https://github.com/pawelsalawa/sqlitestudio/issues/4999
-
---- ../Plugins/DbSqliteWx/DbSqliteWx.pro.orig	2024-06-12 16:33:52 UTC
-+++ ../Plugins/DbSqliteWx/DbSqliteWx.pro
-@@ -66,7 +66,7 @@ DEFINES += SQLITE_HAS_CODEC SQLITE_ALLOW_XTHREAD_CONNE
-     SQLITE_ENABLE_RTREE=1 \
-     SQLITE_ENABLE_MATH_FUNCTIONS=1
- 
--QMAKE_CFLAGS += -msse4.1 -msse4.2 -maes
-+#QMAKE_CFLAGS += -msse4.1 -msse4.2 -maes
- QMAKE_CFLAGS_WARN_ON = -Wall -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-but-set-variable \
-     -Wno-parentheses -Wno-unused-variable -Wno-unknown-pragmas
- 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406140911.45E9BhT3054854>