Skip to content
Snippets Groups Projects
Commit fe851b1c authored by Adrien Béraud's avatar Adrien Béraud
Browse files

contrib: fix build on macOS (arm64)

Change-Id: I79219023e5cc694424a68ed9e078d94988acb9b1
parent 7a2397a5
No related branches found
No related tags found
No related merge requests found
...@@ -25,12 +25,12 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.xz: ...@@ -25,12 +25,12 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.xz:
.sum-libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz .sum-libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz
libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz .sum-libarchive
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/libarchive/0001-disable-shared-library.patch $(APPLY) $(SRC)/libarchive/0001-disable-shared-library.patch
$(MOVE) $(MOVE)
.libarchive: libarchive toolchain.cmake .sum-libarchive .libarchive: libarchive toolchain.cmake
cd $< && mkdir -p buildlib cd $< && mkdir -p buildlib
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
cd $< && cp -R contrib/android/include/* $(PREFIX)/include cd $< && cp -R contrib/android/include/* $(PREFIX)/include
......
...@@ -144,20 +144,8 @@ RANLIB=xcrun ranlib ...@@ -144,20 +144,8 @@ RANLIB=xcrun ranlib
EXTRA_COMMON := -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) EXTRA_COMMON := -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
EXTRA_CXXFLAGS += -stdlib=libc++ EXTRA_CXXFLAGS += -stdlib=libc++
EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK)
ifeq ($(ARCH),x86_64)
EXTRA_COMMON += -m64 EXTRA_COMMON += -m64
else XCODE_FLAGS = -sdk macosx$(OSX_VERSION) -arch $(ARCH)
EXTRA_COMMON += -m32
endif
XCODE_FLAGS = -sdk macosx$(OSX_VERSION)
ifeq ($(shell xcodebuild -version 2>/dev/null | tee /dev/null|head -1|cut -d\ -f2|cut -d. -f1),3)
XCODE_FLAGS += ARCHS=$(ARCH)
# XCode 3 doesn't support -arch
else
XCODE_FLAGS += -arch $(ARCH)
endif
endif endif
CCAS=$(CC) -c CCAS=$(CC) -c
...@@ -552,8 +540,8 @@ endif ...@@ -552,8 +540,8 @@ endif
ifdef HAVE_CROSS_COMPILE ifdef HAVE_CROSS_COMPILE
echo "set(_CMAKE_TOOLCHAIN_PREFIX $(CROSS_COMPILE))" >> $@ echo "set(_CMAKE_TOOLCHAIN_PREFIX $(CROSS_COMPILE))" >> $@
endif endif
echo "set(CMAKE_C_COMPILER $(CC))" >> $@ echo "set(CMAKE_C_COMPILER \"$(CC)\")" >> $@
echo "set(CMAKE_CXX_COMPILER $(CXX))" >> $@ echo "set(CMAKE_CXX_COMPILER \"$(CXX)\")" >> $@
echo "set(CMAKE_FIND_ROOT_PATH $(PREFIX))" >> $@ echo "set(CMAKE_FIND_ROOT_PATH $(PREFIX))" >> $@
echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $@ echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $@
echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $@ echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $@
......
...@@ -18,11 +18,11 @@ $(TARBALLS)/msgpack-c-$(MSGPACK_VERSION).tar.gz: ...@@ -18,11 +18,11 @@ $(TARBALLS)/msgpack-c-$(MSGPACK_VERSION).tar.gz:
.sum-msgpack: msgpack-c-$(MSGPACK_VERSION).tar.gz .sum-msgpack: msgpack-c-$(MSGPACK_VERSION).tar.gz
msgpack: msgpack-c-$(MSGPACK_VERSION).tar.gz msgpack: msgpack-c-$(MSGPACK_VERSION).tar.gz .sum-msgpack
$(UNPACK) $(UNPACK)
$(MOVE) $(MOVE)
.msgpack: msgpack toolchain.cmake .sum-msgpack .msgpack: msgpack toolchain.cmake
cd $< && $(HOSTVARS) $(CMAKE) . $(MSGPACK_CMAKECONF) cd $< && $(HOSTVARS) $(CMAKE) . $(MSGPACK_CMAKECONF)
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment