configure.in | 14 ++++++++++---- lpsolve/lp_solve_5.5.patch | 6 +++++- lpsolve/makefile.mk | 2 +- nss/nss.patch | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 6 deletions(-)
New commits: commit f62c863f97fa2e848be0c3231596301195080694 Author: Tor Lillqvist <t...@iki.fi> Date: Sun Apr 15 15:08:14 2012 +0200 Unbreak build with clang for Mac OS X diff --git a/nss/nss.patch b/nss/nss.patch index 6930e67..fa08086 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -189,3 +189,23 @@ endif CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) +--- misc/nss-3.12.8/mozilla/security/coreconf/Darwin.mk ++++ misc/build/nss-3.12.8/mozilla/security/coreconf/Darwin.mk +@@ -64,12 +64,16 @@ + endif + + ifneq (,$(MACOS_SDK_DIR)) ++ CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[ ]*//" | awk '{ print $$1 }') + GCC_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "gcc version" | sed -e "s/^.*gcc version[ ]*//" | awk '{ print $$1 }') + GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }') + GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }') + GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR) ++ ifneq (,$(CLANG_VERSION_FULL)) ++ DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR) ++ DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR) + +- ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR))) ++ else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR))) + # GCC <= 3 + DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks + ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0)) commit 336b27890b10f346158491b0d5d8edc25fb476e4 Author: Tor Lillqvist <t...@iki.fi> Date: Sun Apr 15 14:08:10 2012 +0200 Look for the Mac OS X SDKs also where current Xcode has them diff --git a/configure.in b/configure.in index d674d34..bac6866 100644 --- a/configure.in +++ b/configure.in @@ -2317,20 +2317,20 @@ if test "$_os" = "Darwin"; then 10.4) MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.4u.sdk" if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk" + MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk" fi if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" + MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" fi macosx_sdk_value="1040" ;; 10.5) MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk" if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk" + MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk" fi if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk" + MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk" fi macosx_sdk_value="1050" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) @@ -2338,12 +2338,18 @@ if test "$_os" = "Darwin"; then ;; 10.6) MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk" + if test ! -d "$MACOSX_SDK_PATH"; then + MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk + fi macosx_sdk_value="1060" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) echo "Building with a SDK > 10.4 is experimental" >> warn ;; 10.7) MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.7.sdk" + if test ! -d "$MACOSX_SDK_PATH"; then + MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk + fi macosx_sdk_value="1070" AC_MSG_WARN([Building with SDK 10.7 is known to fail in vcl]) echo "Building with SDK 10.7 is known to fail in vcl" >> warn commit f649237f0adeb0d01e8a6a4d87ea85250be80ce9 Author: Tor Lillqvist <t...@iki.fi> Date: Sun Apr 15 14:05:09 2012 +0200 Propagate verbosity to lpsolve build diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index 43c9e07..bca62f4 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -56,11 +56,15 @@ rm *.o 2>/dev/null --- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Sun May 22 11:19:48 2011 -@@ -1,23 +1,32 @@ +@@ -1,23 +1,36 @@ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -c=cc +c=$CC ++if test -n "$verbose"; then ++ set -x ++fi ++ def= so= +extra_cflags=$EXTRA_CFLAGS diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 232faad..c91e3a0 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -74,7 +74,7 @@ OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll .ELSE .IF "$(OS)"=="MACOSX" -.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS +.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose BUILD_ACTION=sh ccc.osx OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib .ELIF "$(OS)"=="IOS" _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits