Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
fe851b1c
Commit
fe851b1c
authored
2 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
contrib: fix build on macOS (arm64)
Change-Id: I79219023e5cc694424a68ed9e078d94988acb9b1
parent
7a2397a5
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
contrib/src/libarchive/rules.mak
+2
-2
2 additions, 2 deletions
contrib/src/libarchive/rules.mak
contrib/src/main.mak
+3
-15
3 additions, 15 deletions
contrib/src/main.mak
contrib/src/msgpack/rules.mak
+2
-2
2 additions, 2 deletions
contrib/src/msgpack/rules.mak
with
7 additions
and
19 deletions
contrib/src/libarchive/rules.mak
+
2
−
2
View file @
fe851b1c
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
contrib/src/main.mak
+
3
−
15
View file @
fe851b1c
...
@@ -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)"
>>
$@
...
...
This diff is collapsed.
Click to expand it.
contrib/src/msgpack/rules.mak
+
2
−
2
View file @
fe851b1c
...
@@ -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
$@
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment