Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[osx] - add support for Xcode 8 #10530

Merged
merged 5 commits into from Sep 23, 2016
Merged

[osx] - add support for Xcode 8 #10530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dac099d
[depends] - allow osx sdk 10.12
Memphiz Sep 20, 2016
1998799
[depends/config.site] - for osx force getentropy and get_clocktime to…
Memphiz Sep 22, 2016
82c9061
[depends/gnutls] - gnutls ignores the getentropy autoconf flag - forc…
Memphiz Sep 22, 2016
521840d
[depends/samba] - samba ignores the get_clocktime autoconf flag - for…
Memphiz Sep 22, 2016
ec005d7
[xcode8] - adapted readme for osx with working xcode 8 constellations
Memphiz Sep 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion docs/README.osx
View file
Open in desktop
Expand Up @@ -32,7 +32,8 @@ codecs that support a multitude of music and video formats.

On Mavericks (OSX 10.9.x) we recommend using Xcode 6.1.
On Yosemite (OSX 10.10.x) we recommend using Xcode 6.4.
On El Capitan (OSX 10.11.x) we recommend using Xcode 7.2.
On El Capitan (OSX 10.11.x) we recommend using Xcode 7.x or Xcode 8.x.
On Sierra (macOS 10.12.x) we recomment using Xcode 8.x.

NOTE TO NEW OS X USERS: All lines that are prefixed with the '$' character are
commands that need to be typed into a Terminal window. Note that the '$'
Expand Down Expand Up @@ -69,6 +70,8 @@ constellations of Xcode and osx versions (to be updated once we know more):
4. XCode 6.3.0 against OSX SDK 10.10 (Y)
5. Xcode 6.4.0 against OSX SDK 10.10 (Y)
6. Xcode 7.x against OSX SDK 10.11 (EC)
7. Xcode 8.0 against OSX SDK 10.12 (EC)
8. Xcode 8.0 against OSX SDK 10.12 (S)

-----------------------------------------------------------------------------
3.2 Install Kodi build depends
Expand Down
1 change: 1 addition & 0 deletions tools/depends/configure.ac
View file
Open in desktop
Expand Up @@ -250,6 +250,7 @@ case $host in
10.9);;
10.10);;
10.11);;
10.12);;
*)
AC_MSG_ERROR(error in configure of --with-sdk=$use_sdk)
esac
Expand Down
9 changes: 9 additions & 0 deletions tools/depends/native/config.site.native.in
View file
Open in desktop
Expand Up @@ -24,3 +24,12 @@ fi

LD_LIBRARY_PATH=@prefix@/@tool_dir@/lib:$LD_LIBRARY_PATH
NASM=@prefix@/@tool_dir@/bin/yasm

if test "@platform_os@" = "osx" ; then
# Xcode 8 + 10.11, clock_gettime and getentropy is present
# in 10.12 but will get wrongly detected if building on 10.11
ac_cv_search_clock_gettime=no

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

ac_cv_func_clock_gettime=no
ac_cv_func_getentropy=no
fi

9 changes: 9 additions & 0 deletions tools/depends/target/config-binaddons.site.in
View file
Open in desktop
Expand Up @@ -118,6 +118,15 @@ if test "@platform_os@" = "android"; then

fi

if test "@platform_os@" = "osx" ; then
# Xcode 8 + 10.11, clock_gettime getentropy is present
# in 10.12 but will get wrongly detected if building on 10.11
ac_cv_search_clock_gettime=no
ac_cv_func_clock_gettime=no
ac_cv_func_getentropy=no
fi


if test "@platform_os@" = "ios"; then
# tweaks for libffi (ios must use llvm-gcc-4.2)
if test "${PACKAGE_NAME}" = "libffi" ; then
Expand Down
9 changes: 9 additions & 0 deletions tools/depends/target/config.site.in
View file
Open in desktop
Expand Up @@ -140,6 +140,15 @@ if test "@platform_os@" = "android"; then

fi

if test "@platform_os@" = "osx" ; then
# Xcode 8 + 10.11, clock_gettime and getentropy is present
# in 10.12 but will get wrongly detected if building on 10.11
ac_cv_search_clock_gettime=no
ac_cv_func_clock_gettime=no
ac_cv_func_getentropy=no
fi


if test "@platform_os@" = "ios"; then
# tweaks for libffi (ios must use llvm-gcc-4.2)
if test "${PACKAGE_NAME}" = "libffi" ; then
Expand Down
3 changes: 3 additions & 0 deletions tools/depends/target/gnutls/Makefile
View file
Open in desktop
Expand Up @@ -33,6 +33,9 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); patch -p0 < ../size-max.patch
cd $(PLATFORM); $(CONFIGURE)
ifeq ($(OS),osx)
cd $(PLATFORM); sed -ie "s/HAVE_GETENTROPY/HAVE_GETENTROPY_NOPE/" config.h
endif

$(LIBDYLIB): $(PLATFORM)
$(MAKE) -C $(PLATFORM)
Expand Down
3 changes: 3 additions & 0 deletions tools/depends/target/samba-gplv3/Makefile
View file
Open in desktop
Expand Up @@ -51,6 +51,9 @@ ifeq ($(OS),android)
endif
ifeq ($(TARGET_PLATFORM),appletvos)
cd $(PLATFORM); patch -p0 < ../no_fork_and_exec.patch
endif
ifeq ($(OS),osx)
sed -ie "s|ifndef HAVE_CLOCK_GETTIME|if !defined(HAVE_CLOCK_GETTIME) \&\& !defined(CLOCK_REALTIME)|" "$(PLATFORM)/lib/replace/system/time.h"
endif
cd $(PLATFORM)/source3; $(CONFIGURE)

Expand Down