build: support arm64

Change-Id: I77ac99c455f4f903bb9c48b02eacdbedc5faf066

configure.ac

@@ -145,6 +145,11 @@ AM_CONDITIONAL(HAVE_WIN64,   test "${HAVE_WIN64}" = "1")
 AM_CONDITIONAL(HAVE_OSX,     test "${HAVE_OSX}" = "1")
 AM_CONDITIONAL(HAVE_IOS,     test "${HAVE_IOS}" = "1")
 
+AS_IF([test "${HAVE_OSX}" = "1"],
+  [DAEMONCFLAGS+=" -arch $ARCH"
+   DAEMONCXXFLAGS+=" -arch $ARCH"]
+  [])
+
 AC_DEFINE([MSGPACK_DISABLE_LEGACY_NIL], [1], [msgpack])
 
 dnl FIXME this should be deduced automatically
@@ -664,6 +669,9 @@ AC_CONFIG_FILES([Makefile \
 
 dnl Transfer the Automake variables set here to Makefile.in.
 echo DAEMONCPPFLAGS=$DAEMONCPPFLAGS
+CXXFLAGS="$DAEMONCXXFLAGS"
+OBJCXX="$CXX $DAEMONCXXFLAGS"
+OBJCXXFLAG="$CXX $DAEMONCXXFLAGS"
 AC_SUBST([AM_CPPFLAGS], [$DAEMONCPPFLAGS])
 AC_SUBST([AM_CFLAGS],   [$DAEMONCFLAGS])
 AC_SUBST([AM_CXXFLAGS], [$DAEMONCXXFLAGS])

contrib/src/ffmpeg/rules.mak

@@ -281,6 +281,9 @@ FFMPEGCONF += \
 	--enable-encoder=h264_videotoolbox \
 	--enable-encoder=hevc_videotoolbox \
 	--disable-securetransport
+ifdef HAVE_CROSS_COMPILE
+FFMPEGCONF += --enable-cross-compile
+endif
 endif
 
 ifdef HAVE_IOS
@@ -299,11 +302,13 @@ endif
 
 ifndef HAVE_IOS
 ifndef HAVE_ANDROID
+ifndef HAVE_MACOSX
 ifdef HAVE_CROSS_COMPILE
 FFMPEGCONF += --cross-prefix=$(HOST)-
 endif
 endif
 endif
+endif
 
 # x86 stuff
 ifeq ($(ARCH),i386)

contrib/src/main.mak

@@ -141,9 +141,9 @@ AR=xcrun ar
 LD=xcrun ld
 STRIP=xcrun strip
 RANLIB=xcrun ranlib
-EXTRA_COMMON := -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
-EXTRA_CXXFLAGS += -stdlib=libc++
-EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK)
+EXTRA_COMMON := -arch $(ARCH) -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
+EXTRA_CXXFLAGS += -arch $(ARCH) -stdlib=libc++
+EXTRA_LDFLAGS += -arch $(ARCH) -Wl,-syslibroot,$(MACOSX_SDK)
 EXTRA_COMMON += -m64
 XCODE_FLAGS = -sdk macosx$(OSX_VERSION) -arch $(ARCH)
 endif
@@ -308,6 +308,10 @@ ifdef HAVE_IOS
 HOSTCONF += --enable-static --disable-shared
 endif
 
+ifdef HAVE_MACOSX
+HOSTCONF += --enable-static --disable-shared
+endif
+
 ifdef HAVE_WIN32
 HOSTCONF += --enable-static --disable-shared --without-pic
 PIC :=

contrib/src/pjproject/rules.mak

@@ -59,6 +59,8 @@ endif
 .pjproject: pjproject
 ifdef HAVE_IOS
 	cd $< && ARCH="-arch $(ARCH)" IPHONESDK=$(IOS_SDK) $(HOSTVARS) EXCLUDE_APP=1 ./configure-iphone $(HOSTCONF) $(PJPROJECT_OPTIONS)
+else ifdef HAVE_MACOSX
+	cd $< && ARCH="-arch $(ARCH)" $(HOSTVARS) EXCLUDE_APP=1 ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS)
 else
 	cd $< && $(HOSTVARS) EXCLUDE_APP=1 ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS)
 endif

contrib/src/secp256k1/rules.mak

@@ -21,8 +21,16 @@ secp256k1: secp256k1-$(SECP256K1_VERSION).tar.gz
 ifdef HAVE_IOS
 SECP256K1_CFLAGS := -USECP256K1_BUILD $(CFLAGS)
 else
+ifdef HAVE_MACOSX
+ifeq ($(ARCH),arm64)
+SECP256K1_CFLAGS := -USECP256K1_BUILD $(CFLAGS)
+else
+SECP256K1_CFLAGS := -USECP256K1_BUILD
+endif
+else
 SECP256K1_CFLAGS := -USECP256K1_BUILD
 endif
+endif
 
 .secp256k1: secp256k1 .sum-secp256k1
 	$(RECONF)

contrib/src/x264/rules.mak

@@ -22,11 +22,13 @@ X264CONF += --enable-win32thread
 endif
 ifndef HAVE_IOS
 ifndef HAVE_ANDROID
+ifndef HAVE_MACOSX
 ifdef HAVE_CROSS_COMPILE
 X264CONF += --cross-prefix="$(CROSS_COMPILE)"
 endif
 endif
 endif
+endif
 
 # android x86_64 has reloc errors related to assembly optimizations
 ifdef HAVE_ANDROID

src/Makefile.am

 include $(top_srcdir)/globals.mk
 
-if HAVE_OSX
-AM_OBJCXXFLAGS=-std=c++17
-endif
-
 noinst_LTLIBRARIES=
 noinst_HEADERS=
 nobase_include_HEADERS=
@@ -47,6 +43,7 @@ libjami_la_LIBADD += \
 	$(LIBSSL_LIBS) \
 	$(LIBCRYPTO_LIBS) \
 	$(ARCHIVE_LIBS) \
+        $(ARCHIVE_LIBS) \
 	$(ZLIB_LIBS)
 
 if ENABLE_PLUGIN

src/media/audio/coreaudio/Makefile.am

@@ -20,6 +20,4 @@ libcoreaudiolayer_la_CXXFLAGS = \
 	-I$(top_srcdir)/src \
 	$(AM_CXXFLAGS)
 
-libcoreaudiolayer_la_OBJCXXFLAGS = -std=c++17
-
 libaudio_la_LIBADD += libcoreaudiolayer.la