devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-30 09:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2075 from mcalierno/fix/apple-silicon-homebrew

Browse Source 
Update compiler flags for homebrew packages on Apple silicon
This commit is contained in:
Michael Vetter
2025-12-03 12:06:06 +01:00
committed by GitHub
parent b17716570b 5ac6ab71a2
commit e8e9c29e4f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -39,7 +39,11 @@ AC_DEFINE_UNQUOTED([PACKAGE_STATUS], ["$PACKAGE_STATUS"], [Status of this build]
AS_IF([test "x$PLATFORM" = xcygwin], AS_IF([test "x$PLATFORM" = xcygwin],
[AC_DEFINE([PLATFORM_CYGWIN], [1], [Cygwin])]) [AC_DEFINE([PLATFORM_CYGWIN], [1], [Cygwin])])
AS_IF([test "x$PLATFORM" = xosx], AS_IF([test "x$PLATFORM" = xosx],
[AC_DEFINE([PLATFORM_OSX], [1], [OSx])]) [AC_DEFINE([PLATFORM_OSX], [1], [OSx])
# Apple silicon homebrew flags
AC_CHECK_FILE([/opt/homebrew/include],
[AM_CFLAGS="$AM_CFLAGS -I/opt/homebrew/include"
AM_LDFLAGS="$AM_LDFLAGS -L/opt/homebrew/lib"])])
## Environment variables ## Environment variables
AC_ARG_VAR([PYTHON_FRAMEWORK], [Set base directory for Python Framework]) AC_ARG_VAR([PYTHON_FRAMEWORK], [Set base directory for Python Framework])
@@ -345,9 +349,9 @@ AM_CONDITIONAL([BUILD_OMEMO], [false])
if test "x$enable_omemo" != xno; then if test "x$enable_omemo" != xno; then
OMEMO_LIBS="" OMEMO_LIBS=""
PKG_CHECK_MODULES([libsignal], [libsignal-protocol-c >= 2.3.2], PKG_CHECK_MODULES([libsignal], [libsignal-protocol-c >= 2.3.2],
[OMEMO_LIBS="-lsignal-protocol-c" [OMEMO_LIBS="$libsignal_LIBS"
AC_CHECK_LIB([gcrypt], [gcry_md_extract], PKG_CHECK_MODULES([gcrypt], [libgcrypt >= 1.7.0],
[OMEMO_LIBS="-lgcrypt $OMEMO_LIBS" [OMEMO_LIBS="$gcrypt_LIBS $OMEMO_LIBS"
AM_CONDITIONAL([BUILD_OMEMO], [true])], AM_CONDITIONAL([BUILD_OMEMO], [true])],
[AC_MSG_NOTICE([gcrypt >= 1.7.0 not found, OMEMO support not enabled])])], [AC_MSG_NOTICE([gcrypt >= 1.7.0 not found, OMEMO support not enabled])])],
[AC_MSG_NOTICE([libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled])]) [AC_MSG_NOTICE([libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled])])