diff options
32 files changed, 43 insertions, 307 deletions
diff --git a/tools/osx/ios-depends/Makefile b/tools/osx/ios-depends/Makefile index f3ab19ce94..f981a52a69 100644 --- a/tools/osx/ios-depends/Makefile +++ b/tools/osx/ios-depends/Makefile @@ -4,11 +4,11 @@ SUBDIRS = \ Backrow \ gas-preprocessor help2man autoconf automake pkg-config tar dpkg \ pcre expat gettext readline sqlite3 \ - liblzo liblzo2 freetype2 fontconfig \ + liblzo2 freetype2 fontconfig \ openssl libssh2 curl \ jpeg tiff libpng libogg \ libvorbis libflac libmad fribidi libwavpack libmpeg2 \ - faad2 libass libcdio libsamplerate librtmp \ + libass libcdio libsamplerate librtmp \ libmicrohttpd libmodplug libbluray \ samba python26 mysqlclient boost diff --git a/tools/osx/ios-depends/afpfs-ng/Makefile b/tools/osx/ios-depends/afpfs-ng/Makefile index 8549ecd774..693c40df49 100644 --- a/tools/osx/ios-depends/afpfs-ng/Makefile +++ b/tools/osx/ios-depends/afpfs-ng/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ --disable-fuse ac_cv_func_malloc_0_nonnull=yes @@ -52,7 +49,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/boost/Makefile b/tools/osx/ios-depends/boost/Makefile index b3bba2343f..176bc7d470 100644 --- a/tools/osx/ios-depends/boost/Makefile +++ b/tools/osx/ios-depends/boost/Makefile @@ -21,7 +21,7 @@ ARCHIVE_TOOL_FLAGS=xf SDK_VERSION:=$(shell xcodebuild -showsdks | grep iphoneos | sort | tail -n 1 | awk '{ print $$2}') -LIBDYLIB=$(PREFIX)/lib/libboost_thread.dylib +LIBDYLIB=$(PREFIX)/lib/libboost_thread.a all: $(LIBDYLIB) diff --git a/tools/osx/ios-depends/curl/Makefile b/tools/osx/ios-depends/curl/Makefile index 5859396fe4..9d1807cd0b 100644 --- a/tools/osx/ios-depends/curl/Makefile +++ b/tools/osx/ios-depends/curl/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes ac_cv_file___dev_urandom_=yes LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib @@ -49,7 +46,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/expat/Makefile b/tools/osx/ios-depends/expat/Makefile index a350906751..83b51dc8cb 100644 --- a/tools/osx/ios-depends/expat/Makefile +++ b/tools/osx/ios-depends/expat/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib @@ -49,7 +46,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/faad2/Makefile b/tools/osx/ios-depends/faad2/Makefile deleted file mode 100644 index 630f9840aa..0000000000 --- a/tools/osx/ios-depends/faad2/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=faad2 -VERSION=2.7 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/libfaad/.libs/libfaad.2.dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/fontconfig/Makefile b/tools/osx/ios-depends/fontconfig/Makefile index 9a422765e7..298079fbcb 100644 --- a/tools/osx/ios-depends/fontconfig/Makefile +++ b/tools/osx/ios-depends/fontconfig/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -Wl,-undefined,dynamic_lookup CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --with-arch=arm --disable-libxml2 --disable-docs --with-freetype-config=$(PREFIX)/bin/freetype-config LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib @@ -51,7 +48,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/freetype2/Makefile b/tools/osx/ios-depends/freetype2/Makefile index ded4543f5b..c38bd7530a 100644 --- a/tools/osx/ios-depends/freetype2/Makefile +++ b/tools/osx/ios-depends/freetype2/Makefile @@ -20,8 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup export LDFLAGS+=-Wl,-read_only_relocs,suppress # force using internal libtool export LIBTOOL=builds/unix/libtool @@ -52,7 +50,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/fribidi/Makefile b/tools/osx/ios-depends/fribidi/Makefile index 58d5b95626..e62795138d 100644 --- a/tools/osx/ios-depends/fribidi/Makefile +++ b/tools/osx/ios-depends/fribidi/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-docs LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib @@ -49,7 +46,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/gettext/02-gettext-tools-stpncpy.patch b/tools/osx/ios-depends/gettext/02-gettext-tools-stpncpy.patch deleted file mode 100644 index cc01d2f0d4..0000000000 --- a/tools/osx/ios-depends/gettext/02-gettext-tools-stpncpy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gettext-0.17.orig/gettext-tools/gnulib-lib/stpncpy.c gettext-0.17/gettext-tools/gnulib-lib/stpncpy.c ---- gettext-0.17.orig/gettext-tools/gnulib-lib/stpncpy.c 2007-10-07 23:29:35.000000000 +0300 -+++ gettext-0.17/gettext-tools/gnulib-lib/stpncpy.c 2011-03-11 23:34:40.000000000 +0200 -@@ -24,7 +24,7 @@ - #include <string.h> - - #ifndef weak_alias --# define __stpncpy stpncpy -+//# define __stpncpy stpncpy - #endif - - /* Copy no more than N bytes of SRC to DST, returning a pointer past the diff --git a/tools/osx/ios-depends/gettext/Makefile b/tools/osx/ios-depends/gettext/Makefile index d00b6a6007..61f6f1364c 100644 --- a/tools/osx/ios-depends/gettext/Makefile +++ b/tools/osx/ios-depends/gettext/Makefile @@ -20,10 +20,10 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -Wl,-undefined,dynamic_lookup -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared --disable-csharp --disable-native-java --without-emacs --disable-java --disable-libasprintf --disable-csharp --disable-openmp --without-emacs --with-included-gettext --without-git --without-cvs ac_cv_func___fsetlocking=no +CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ + --disable-csharp --disable-native-java --without-emacs --disable-java \ + --disable-libasprintf --disable-csharp --disable-openmp --with-included-gettext \ + --without-git --without-cvs LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib @@ -39,7 +39,6 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore cd $(SOURCE); patch -p0 <../01-gettext-tools-Makefile.in.patch - cd $(SOURCE); patch -p1 <../02-gettext-tools-stpncpy.patch cd $(SOURCE); $(CONFIGURE) $(LIBDYLIB): $(SOURCE) @@ -51,7 +50,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/jpeg/Makefile b/tools/osx/ios-depends/jpeg/Makefile index 5efa09e722..5a84eb45cb 100644 --- a/tools/osx/ios-depends/jpeg/Makefile +++ b/tools/osx/ios-depends/jpeg/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib @@ -49,7 +46,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libcdio/Makefile b/tools/osx/ios-depends/libcdio/Makefile index a2d002ae88..bae02e4c18 100644 --- a/tools/osx/ios-depends/libcdio/Makefile +++ b/tools/osx/ios-depends/libcdio/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ --without-cd-drive --without-cd-info --without-cd-read --without-cd-paranoia --without-cdda-player --without-iso-info --without-iso-read @@ -52,7 +49,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libgcrypt/Makefile b/tools/osx/ios-depends/libgcrypt/Makefile index b6508a89cc..a42f775e8d 100644 --- a/tools/osx/ios-depends/libgcrypt/Makefile +++ b/tools/osx/ios-depends/libgcrypt/Makefile @@ -20,11 +20,8 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -fgnu89-inline -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - ac_cv_func_gethrtime=no +export CFLAGS+=-fgnu89-inline +CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/.libs/libgcrypt.dylib @@ -51,7 +48,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libgpg-error/Makefile b/tools/osx/ios-depends/libgpg-error/Makefile index c075c3730e..cb07b96927 100644 --- a/tools/osx/ios-depends/libgpg-error/Makefile +++ b/tools/osx/ios-depends/libgpg-error/Makefile @@ -20,10 +20,7 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes +CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --with-libintl-prefix=$(PREFIX)/lib LIBDYLIB=$(SOURCE)/.libs/libgpg-error.dylib @@ -49,7 +46,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/liblzo/01-liblzo-only-build-lib.patch b/tools/osx/ios-depends/liblzo/01-liblzo-only-build-lib.patch deleted file mode 100644 index 5df71ee48a..0000000000 --- a/tools/osx/ios-depends/liblzo/01-liblzo-only-build-lib.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN lzo-1.08.org/Makefile.am lzo-1.08/Makefile.am ---- lzo-1.08.org/Makefile.am 2002-07-12 21:31:52.000000000 -0400 -+++ lzo-1.08/Makefile.am 2010-10-29 12:13:48.000000000 -0400 -@@ -5,7 +5,7 @@ - - AUTOMAKE_OPTIONS = 1.6 gnu - --SUBDIRS = include src ltest examples tests minilzo -+SUBDIRS = include src - - EXTRA_DIST = BUGS - -diff -ruN lzo-1.08.org/Makefile.in lzo-1.08/Makefile.in ---- lzo-1.08.org/Makefile.in 2002-07-12 21:31:52.000000000 -0400 -+++ lzo-1.08/Makefile.in 2010-10-29 12:17:18.000000000 -0400 -@@ -108,7 +108,7 @@ - - AUTOMAKE_OPTIONS = 1.6 gnu - --SUBDIRS = include src ltest examples tests minilzo -+SUBDIRS = include src - - EXTRA_DIST = BUGS - - diff --git a/tools/osx/ios-depends/liblzo/Makefile b/tools/osx/ios-depends/liblzo/Makefile deleted file mode 100644 index b944e80d05..0000000000 --- a/tools/osx/ios-depends/liblzo/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# A quick and dirty Makefile to download/build and install -# -# Usage: -# make -# sudo make install - -include ../config.mk - -# lib name, version -LIBNAME=lzo -VERSION=1.08 -SOURCE=$(LIBNAME)-$(VERSION) -# download location and format -BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -ARCHIVE=$(SOURCE).tar.gz -TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs -RETRIEVE_TOOL=/usr/bin/curl -RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE) -ARCHIVE_TOOL=tar -ARCHIVE_TOOL_FLAGS=xf - -# configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes - -LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME).dylib - -CLEAN_FILES=$(ARCHIVE) $(SOURCE) - -all: $(LIBDYLIB) .installed - -$(TARBALLS_LOCATION)/$(ARCHIVE): - $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) - -$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) - -rm -rf $(SOURCE) - $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - echo $(SOURCE) > .gitignore - cd $(SOURCE); patch -p1 < ../01-liblzo-only-build-lib.patch - cd $(SOURCE); $(CONFIGURE) - -$(LIBDYLIB): $(SOURCE) - make -C $(SOURCE) - -.installed: - make -C $(SOURCE) install - touch $@ - -clean: - make -C $(SOURCE) clean - rm .installed - -distclean:: - rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/liblzo2/Makefile b/tools/osx/ios-depends/liblzo2/Makefile index df6e9671e1..bf7409a9cf 100644 --- a/tools/osx/ios-depends/liblzo2/Makefile +++ b/tools/osx/ios-depends/liblzo2/Makefile @@ -20,8 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME)2.dylib @@ -49,7 +47,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libmad/Makefile b/tools/osx/ios-depends/libmad/Makefile index ea1b23b080..af53ce84f8 100644 --- a/tools/osx/ios-depends/libmad/Makefile +++ b/tools/osx/ios-depends/libmad/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --enable-fpm=default LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib @@ -51,7 +48,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libmpeg2/Makefile b/tools/osx/ios-depends/libmpeg2/Makefile index 7bfa2f8997..ad32e720cf 100644 --- a/tools/osx/ios-depends/libmpeg2/Makefile +++ b/tools/osx/ios-depends/libmpeg2/Makefile @@ -20,8 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-sdl @@ -52,7 +50,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libogg/Makefile b/tools/osx/ios-depends/libogg/Makefile index 87d49c987b..4dde47cde7 100644 --- a/tools/osx/ios-depends/libogg/Makefile +++ b/tools/osx/ios-depends/libogg/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib @@ -49,7 +46,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libpng/Makefile b/tools/osx/ios-depends/libpng/Makefile index e7519a4acc..6dc9fc53e3 100644 --- a/tools/osx/ios-depends/libpng/Makefile +++ b/tools/osx/ios-depends/libpng/Makefile @@ -21,9 +21,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib @@ -50,7 +47,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libsamplerate/Makefile b/tools/osx/ios-depends/libsamplerate/Makefile index 76c11df72e..363449fe00 100644 --- a/tools/osx/ios-depends/libsamplerate/Makefile +++ b/tools/osx/ios-depends/libsamplerate/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-sndfile --disable-fftw LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib @@ -50,7 +47,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libssh2/Makefile b/tools/osx/ios-depends/libssh2/Makefile index 6c76464838..84df92fcd2 100644 --- a/tools/osx/ios-depends/libssh2/Makefile +++ b/tools/osx/ios-depends/libssh2/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ --with-openssl --without-libgcrypt ac_cv_func_EVP_aes_128_ctr=no @@ -53,7 +50,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libvorbis/Makefile b/tools/osx/ios-depends/libvorbis/Makefile index 3431336174..bf3e1ca7c0 100644 --- a/tools/osx/ios-depends/libvorbis/Makefile +++ b/tools/osx/ios-depends/libvorbis/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -Wl,-undefined,dynamic_lookup CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes --disable-oggtest --disable-docs --disable-examples LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib @@ -51,7 +48,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/libwavpack/Makefile b/tools/osx/ios-depends/libwavpack/Makefile index e591a739ea..23ae90e6f0 100644 --- a/tools/osx/ios-depends/libwavpack/Makefile +++ b/tools/osx/ios-depends/libwavpack/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib @@ -49,7 +46,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/openssl/Makefile b/tools/osx/ios-depends/openssl/Makefile index 9f6576ba89..5318288cf4 100644 --- a/tools/osx/ios-depends/openssl/Makefile +++ b/tools/osx/ios-depends/openssl/Makefile @@ -20,8 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./Configure darwin-i386-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX) LIBDYLIB=$(SOURCE)/src/.libs/lib$(LIBNAME).dylib diff --git a/tools/osx/ios-depends/pcre/Makefile b/tools/osx/ios-depends/pcre/Makefile index 632bdcb141..e81744313f 100644 --- a/tools/osx/ios-depends/pcre/Makefile +++ b/tools/osx/ios-depends/pcre/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ --disable-stack-for-recursion @@ -50,7 +47,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/readline/Makefile b/tools/osx/ios-depends/readline/Makefile index 2ad7f80f15..d11f34a695 100644 --- a/tools/osx/ios-depends/readline/Makefile +++ b/tools/osx/ios-depends/readline/Makefile @@ -20,10 +20,8 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes ac_cv_header_termcap_h=no ac_cv_func_strcoll_works=yes bash_cv_func_sigsetjmp=present bash_cv_func_ctype_nonascii=no bash_cv_must_reinstall_sighandlers=no bash_cv_func_strcoll_broken=yes +CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ + ac_cv_header_termcap_h=no LIBDYLIB=$(SOURCE)/shlib/(LIBNAME).dylib @@ -50,7 +48,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed diff --git a/tools/osx/ios-depends/samba/Makefile b/tools/osx/ios-depends/samba/Makefile index 6509428ce3..1e9de256f2 100644 --- a/tools/osx/ios-depends/samba/Makefile +++ b/tools/osx/ios-depends/samba/Makefile @@ -12,7 +12,6 @@ VERSION=3.5.6 SOURCE=$(LIBNAME)-$(VERSION) # download location and format BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -#BASE_URL=http://www.samba.org/samba/ftp/stable ARCHIVE=$(SOURCE).tar.gz TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs RETRIEVE_TOOL=/usr/bin/curl @@ -21,64 +20,17 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress -Wl,-unexported_symbol,_MD5* -lc +export LDFLAGS+=-Wl,-unexported_symbol,_MD5* -lc # believe it or not, this is how you setup samba for cross-compile CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ --without-cluster-support --disable-swat --without-ldap --with-fhs \ - samba_cv_CC_NEGATIVE_ENUM_VALUES=yes samba_cv_HAVE_OFF64_T=no \ - samba_cv_HAVE_LINUX_READAHEAD=no \ - samba_cv_HAVE_STRUCT_FLOCK64=no \ - samba_cv_HAVE_LINUX_SPLICE=no \ - samba_cv_SIZEOF_DEV_T=no \ - samba_cv_SIZEOF_INO_T=yes \ - samba_cv_SIZEOF_OFF_T=yes \ - samba_cv_SIZEOF_TIME_T=no \ - samba_cv_have_longlong=yes \ - samba_cv_have_setresgid=no \ - samba_cv_have_setresuid=no \ + ac_cv_header_libunwind_h=no \ + ac_cv_header_execinfo_h=no \ ac_cv_header_rpcsvc_ypclnt_h=no \ - ac_cv_func_creat64=no \ - ac_cv_func_fseek64=no \ - ac_cv_func_fseeko64=no \ - ac_cv_func_ftell64=no \ - ac_cv_func_ftello64=no \ - ac_cv_func_open64=no \ - ac_cv_func_fopen64=no \ - ac_cv_func_opendir64=no \ - ac_cv_func_readdir64=no \ - ac_cv_func_seekdir64=no \ - ac_cv_func_telldir64=no \ - ac_cv_func_rewinddir64=no \ - ac_cv_func_closedir64=no \ - ac_cv_func_getpwanam=no \ - ac_cv_func_getprpwnam=no \ - ac_cv_func_getpwent_r=no \ - ac_cv_func_getpassphrase=no \ - ac_cv_func_llistxattr=no \ - ac_cv_func_lremovexattr=no \ - ac_cv_func_lsetxattr=no \ - ac_cv_func_lgetxattr=no \ - ac_cv_func_extattr_delete_fd=no \ - ac_cv_func_extattr_delete_file=no \ - ac_cv_func_extattr_delete_link=no \ - ac_cv_func_extattr_get_fd=no \ - ac_cv_func_extattr_get_file=no \ - ac_cv_func_extattr_get_link=no \ - ac_cv_func_extattr_list_fd=no \ - ac_cv_func_extattr_list_file=no \ - ac_cv_func_extattr_list_link=no \ - ac_cv_func_extattr_set_fd=no \ - ac_cv_func_extattr_set_file=no \ - ac_cv_func_extattr_set_link=no \ - ac_cv_func_strndup=no \ - ac_cv_func_strnlen=no \ - ac_cv_have_splice_decl=no \ - ac_cv_func_yp_get_default_domain=no \ - fu_cv_sys_stat_statvfs64=no \ - libreplace_cv_HAVE_C99_VSNPRINTF=yes - + libreplace_cv_HAVE_C99_VSNPRINTF=yes \ + samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no \ + samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ + LIBDYLIB=$(SOURCE)/source3/bin/libsmbclient.dylib CLEAN_FILES=$(ARCHIVE) $(SOURCE) diff --git a/tools/osx/ios-depends/sqlite3/Makefile b/tools/osx/ios-depends/sqlite3/Makefile index 481dfee52d..25e0fe442b 100644 --- a/tools/osx/ios-depends/sqlite3/Makefile +++ b/tools/osx/ios-depends/sqlite3/Makefile @@ -12,7 +12,6 @@ VERSION=3.6.11 SOURCE=$(LIBNAME)-$(VERSION) # download location and format BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs -#BASE_URL=http://www.sqlite.org ARCHIVE=$(SOURCE).tar.gz TARBALLS_LOCATION=/Users/Shared/xbmc-depends/tarballs RETRIEVE_TOOL=/usr/bin/curl @@ -21,9 +20,7 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -DSQLITE_ENABLE_COLUMN_METADATA=1 -export LDFLAGS+=-Wl,-read_only_relocs,suppress +export CXXFLAGS+=-DSQLITE_ENABLE_COLUMN_METADATA=1 export TCLLIBDIR=/dev/null CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ --enable-threadsafe --disable-tcl \ diff --git a/tools/osx/ios-depends/tiff/Makefile b/tools/osx/ios-depends/tiff/Makefile index 3294aea95f..018feea1de 100644 --- a/tools/osx/ios-depends/tiff/Makefile +++ b/tools/osx/ios-depends/tiff/Makefile @@ -20,9 +20,6 @@ ARCHIVE_TOOL=tar ARCHIVE_TOOL_FLAGS=xf # configuration settings -export CFLAGS+=-undefined dynamic_lookup -export CXXFLAGS+=-undefined dynamic_lookup -export LDFLAGS+=-Wl,-read_only_relocs,suppress CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared LIBDYLIB=$(SOURCE)/libtiff/.libs/lib$(LIBNAME).dylib @@ -49,7 +46,7 @@ $(LIBDYLIB): $(SOURCE) clean: make -C $(SOURCE) clean - rm .installed + rm -f .installed distclean:: rm -rf $(SOURCE) .installed |