diff options
34 files changed, 13 insertions, 175 deletions
diff --git a/tools/osx/osx-depends/afpfs-ng/Makefile b/tools/osx/osx-depends/afpfs-ng/Makefile index 8549ecd774..7e6de548be 100644 --- a/tools/osx/osx-depends/afpfs-ng/Makefile +++ b/tools/osx/osx-depends/afpfs-ng/Makefile @@ -20,11 +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 \ ---disable-fuse ac_cv_func_malloc_0_nonnull=yes +--disable-fuse LIBDYLIB=$(SOURCE)/lib/.libs/libafpclient.dylib diff --git a/tools/osx/osx-depends/curl/Makefile b/tools/osx/osx-depends/curl/Makefile index 5859396fe4..683038746b 100644 --- a/tools/osx/osx-depends/curl/Makefile +++ b/tools/osx/osx-depends/curl/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 ac_cv_file___dev_urandom_=yes +CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib diff --git a/tools/osx/osx-depends/expat/Makefile b/tools/osx/osx-depends/expat/Makefile index a350906751..21e12877fa 100644 --- a/tools/osx/osx-depends/expat/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/faad2/Makefile b/tools/osx/osx-depends/faad2/Makefile index f3b7be32cb..4e95bdc551 100644 --- a/tools/osx/osx-depends/faad2/Makefile +++ b/tools/osx/osx-depends/faad2/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)/libfaad/.libs/libfaad.2.dylib diff --git a/tools/osx/osx-depends/fontconfig/Makefile b/tools/osx/osx-depends/fontconfig/Makefile index 9a422765e7..04ccca2f32 100644 --- a/tools/osx/osx-depends/fontconfig/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/freetype2/Makefile b/tools/osx/osx-depends/freetype2/Makefile index ded4543f5b..8fe53cff52 100644 --- a/tools/osx/osx-depends/freetype2/Makefile +++ b/tools/osx/osx-depends/freetype2/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 # force using internal libtool export LIBTOOL=builds/unix/libtool CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ diff --git a/tools/osx/osx-depends/fribidi/Makefile b/tools/osx/osx-depends/fribidi/Makefile index 73b6bd684a..935c892037 100644 --- a/tools/osx/osx-depends/fribidi/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/gettext/Makefile b/tools/osx/osx-depends/gettext/Makefile index 3a81ffbd7d..2f5895e79e 100644 --- a/tools/osx/osx-depends/gettext/Makefile +++ b/tools/osx/osx-depends/gettext/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 \ --disable-csharp --disable-native-java --disable-java --without-emacs \ --disable-libasprintf --disable-openmp \ @@ -30,8 +27,7 @@ CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared \ --with-included-glib \ --with-included-libcroco \ --with-included-libxml \ - --without-git --without-cvs \ - ac_cv_func___fsetlocking=no ac_cv_func_posix_spawn=no ac_cv_func_mempcpy=no + --without-git --without-cvs LIBDYLIB=$(SOURCE)/.libs/lib$(LIBNAME).dylib diff --git a/tools/osx/osx-depends/jpeg/Makefile b/tools/osx/osx-depends/jpeg/Makefile index 5efa09e722..9c55e8837d 100644 --- a/tools/osx/osx-depends/jpeg/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/libGLEW/Makefile b/tools/osx/osx-depends/libGLEW/Makefile index e51b9f1056..69a8dad518 100644 --- a/tools/osx/osx-depends/libGLEW/Makefile +++ b/tools/osx/osx-depends/libGLEW/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 export GLEW_DEST=$(PREFIX) export CC.ARCH=/usr/bin/gcc-4.0 export CFLAGS.ARCH=$(CFLAGS) diff --git a/tools/osx/osx-depends/libcdio/Makefile b/tools/osx/osx-depends/libcdio/Makefile index 5e19c66b3f..68e6c3dc08 100644 --- a/tools/osx/osx-depends/libcdio/Makefile +++ b/tools/osx/osx-depends/libcdio/Makefile @@ -20,11 +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 -Wl,-undefined,dynamic_lookup -CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - am_cv_func_iconv=yes am_cv_func_iconv_works=yes +CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/.libs/(LIBNAME).dylib diff --git a/tools/osx/osx-depends/libgcrypt/Makefile b/tools/osx/osx-depends/libgcrypt/Makefile index 569e6d7224..41b30f30b8 100644 --- a/tools/osx/osx-depends/libgcrypt/Makefile +++ b/tools/osx/osx-depends/libgcrypt/Makefile @@ -20,11 +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 \ - ac_cv_func_gethrtime=no +CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes LIBDYLIB=$(SOURCE)/.libs/libgcrypt.dylib diff --git a/tools/osx/osx-depends/libgpg-error/Makefile b/tools/osx/osx-depends/libgpg-error/Makefile index 10cea19c8a..8dc32d197b 100644 --- a/tools/osx/osx-depends/libgpg-error/Makefile +++ b/tools/osx/osx-depends/libgpg-error/Makefile @@ -20,11 +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 \ - --with-libintl-prefix=$(PREFIX)/lib gt_cv_func_gnugettext1_libc=no + --with-libintl-prefix=$(PREFIX)/lib LIBDYLIB=$(SOURCE)/.libs/libgpg-error.dylib diff --git a/tools/osx/osx-depends/liblzo/Makefile b/tools/osx/osx-depends/liblzo/Makefile index b944e80d05..9d21c2ee18 100644 --- a/tools/osx/osx-depends/liblzo/Makefile +++ b/tools/osx/osx-depends/liblzo/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)/src/.libs/lib$(LIBNAME).dylib diff --git a/tools/osx/osx-depends/liblzo2/Makefile b/tools/osx/osx-depends/liblzo2/Makefile index df6e9671e1..c1140fa13c 100644 --- a/tools/osx/osx-depends/liblzo2/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/libmad/Makefile b/tools/osx/osx-depends/libmad/Makefile index 124c812556..f122e0f610 100644 --- a/tools/osx/osx-depends/libmad/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/libmpeg2/Makefile b/tools/osx/osx-depends/libmpeg2/Makefile index 48a7e5890f..973af2e664 100644 --- a/tools/osx/osx-depends/libmpeg2/Makefile +++ b/tools/osx/osx-depends/libmpeg2/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-sdl LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib diff --git a/tools/osx/osx-depends/libogg/Makefile b/tools/osx/osx-depends/libogg/Makefile index 87d49c987b..c167ad53ab 100644 --- a/tools/osx/osx-depends/libogg/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/libpng/Makefile b/tools/osx/osx-depends/libpng/Makefile index e7519a4acc..41d7e6dd3b 100644 --- a/tools/osx/osx-depends/libpng/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/librtmp/Makefile b/tools/osx/osx-depends/librtmp/Makefile index 2cc72fdd27..c423d00477 100644 --- a/tools/osx/osx-depends/librtmp/Makefile +++ b/tools/osx/osx-depends/librtmp/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 LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib diff --git a/tools/osx/osx-depends/libsamplerate/Makefile b/tools/osx/osx-depends/libsamplerate/Makefile index 76c11df72e..ceaf935d83 100644 --- a/tools/osx/osx-depends/libsamplerate/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/libsdl/Makefile b/tools/osx/osx-depends/libsdl/Makefile index 8ece5fea77..fac37e85f4 100644 --- a/tools/osx/osx-depends/libsdl/Makefile +++ b/tools/osx/osx-depends/libsdl/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) \ --without-x --disable-video-x11 diff --git a/tools/osx/osx-depends/libsdl_image/Makefile b/tools/osx/osx-depends/libsdl_image/Makefile index 4c72ae409d..3e0a537d08 100644 --- a/tools/osx/osx-depends/libsdl_image/Makefile +++ b/tools/osx/osx-depends/libsdl_image/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) \ --disable-jpg-shared --disable-png-shared --disable-tif-shared --disable-sdltest diff --git a/tools/osx/osx-depends/libsdl_mixer/Makefile b/tools/osx/osx-depends/libsdl_mixer/Makefile index 2acb2ecc28..da0d394c45 100644 --- a/tools/osx/osx-depends/libsdl_mixer/Makefile +++ b/tools/osx/osx-depends/libsdl_mixer/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+=-liconv -Wl,-read_only_relocs,suppress -Wl,-undefined,dynamic_lookup CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) \ --disable-music-ogg --disable-music-mp3 \ --disable-music-mod --disable-music-midi --disable-smpegtest --disable-sdltest diff --git a/tools/osx/osx-depends/libssh2/Makefile b/tools/osx/osx-depends/libssh2/Makefile index 2488b01172..f47b232f6a 100644 --- a/tools/osx/osx-depends/libssh2/Makefile +++ b/tools/osx/osx-depends/libssh2/Makefile @@ -20,11 +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 -Wl,-undefined,dynamic_lookup CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ - --with-openssl --without-libgcrypt ac_cv_func_EVP_aes_128_ctr=no + --with-openssl --without-libgcrypt SHELL := /bin/bash RM := rm -rf diff --git a/tools/osx/osx-depends/libvorbis/Makefile b/tools/osx/osx-depends/libvorbis/Makefile index bea98da31f..5670bd07ad 100644 --- a/tools/osx/osx-depends/libvorbis/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/libwavpack/Makefile b/tools/osx/osx-depends/libwavpack/Makefile index e591a739ea..6c768ea4d7 100644 --- a/tools/osx/osx-depends/libwavpack/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/mysqlclient/Makefile b/tools/osx/osx-depends/mysqlclient/Makefile index f16993aa65..6b7c1fbfc8 100644 --- a/tools/osx/osx-depends/mysqlclient/Makefile +++ b/tools/osx/osx-depends/mysqlclient/Makefile @@ -19,25 +19,9 @@ 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 \ --enable-thread-safe-client -with-extra-charsets=complex \ - --without-readline --without-server --without-bench --without-docs --without-man \ - ac_cv_func_locking=no \ - ac_cv_func_thr_setconcurrency=no \ - ac_cv_func_clock_gettime=no \ - ac_cv_func_gethrtime=no \ - ac_cv_func_printstack=no \ - ac_cv_func_backtrace=no \ - ac_cv_func_backtrace_symbols=no \ - ac_cv_func_gethostbyname_r=no \ - ac_cv_func_bfill=no \ - ac_cv_func_bmove=no \ - ac_cv_func_bsearch=no \ - ac_cv_func_bzero=no \ - ac_cv_func_fconvert=no \ + --without-readline --without-server --without-bench --without-docs --without-man LIBDYLIB=$(SOURCE)/libmysql/.libs/$(LIBNAME).dylib diff --git a/tools/osx/osx-depends/openssl/Makefile b/tools/osx/osx-depends/openssl/Makefile index b7b18d1220..2fb602756f 100644 --- a/tools/osx/osx-depends/openssl/Makefile +++ b/tools/osx/osx-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 @@ -43,7 +41,7 @@ $(LIBDYLIB): $(SOURCE) make -C $(SOURCE) .installed: - make -C $(SOURCE) install + make -C $(SOURCE) install_sw touch $@ clean: diff --git a/tools/osx/osx-depends/pcre/Makefile b/tools/osx/osx-depends/pcre/Makefile index 632bdcb141..5fca72b95b 100644 --- a/tools/osx/osx-depends/pcre/Makefile +++ b/tools/osx/osx-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 diff --git a/tools/osx/osx-depends/readline/Makefile b/tools/osx/osx-depends/readline/Makefile index 2ad7f80f15..4ccbf69602 100644 --- a/tools/osx/osx-depends/readline/Makefile +++ b/tools/osx/osx-depends/readline/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 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 LIBDYLIB=$(SOURCE)/shlib/(LIBNAME).dylib diff --git a/tools/osx/osx-depends/samba/Makefile b/tools/osx/osx-depends/samba/Makefile index 9e0098d3aa..0e74c02f63 100644 --- a/tools/osx/osx-depends/samba/Makefile +++ b/tools/osx/osx-depends/samba/Makefile @@ -20,63 +20,12 @@ 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 -# believe it or not, this is how you setup samba for cross-compile +export LDFLAGS+=-Wl,-unexported_symbol,_MD5* -lc CONFIGURE=./configure --prefix=$(PREFIX) --host=$(HOST) --enable-shared=yes \ --without-cluster-support --disable-swat --without-ldap --without-pam --without-pam_smbpass --with-fhs \ - 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_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_func_memalign=no \ - ac_cv_func_posix_memalign=no \ - ac_cv_func_posix_fallocate=no \ - ac_cv_func_posix_fallocate64=no \ ac_cv_header_libunwind_h=no \ ac_cv_header_execinfo_h=no \ + samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no LIBDYLIB=$(SOURCE)/source3/bin/libsmbclient.dylib diff --git a/tools/osx/osx-depends/sqlite3/Makefile b/tools/osx/osx-depends/sqlite3/Makefile index 0816fb62c4..fc319f67d2 100644 --- a/tools/osx/osx-depends/sqlite3/Makefile +++ b/tools/osx/osx-depends/sqlite3/Makefile @@ -21,9 +21,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/osx-depends/tiff/Makefile b/tools/osx/osx-depends/tiff/Makefile index 3294aea95f..f593b28bcd 100644 --- a/tools/osx/osx-depends/tiff/Makefile +++ b/tools/osx/osx-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 |