[Libreoffice-commits] core.git: 2 commits - configure.ac external/lpsolve solenv/gbuild

Mon Aug 15 16:16:12 UTC 2016

configure.ac                          |    2 +-
 external/lpsolve/lp_solve_5.5.patch   |    9 ++++-----
 solenv/gbuild/platform/IOS_ARM_GCC.mk |    3 +--
 solenv/gbuild/platform/macosx.mk      |    3 +--
 4 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit d179edbf4000a75f325238f1ba49b94e49af4b79
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 15 18:25:43 2016 +0300

    Default libtool to /usr/bin/libtool
    
    We never want LIBTOOL to mean a GNU libtool (which is a totally
    different program) which might be present in $PATH before
    /usr/bin/libtool, specifically /usr/local/bin, which by default (and
    stupidly IMHO) is before /usr/bin on stock OS X.
    
    Change-Id: I633a9fd275503f77fc1a0dd3d24a6776579792ba

diff --git a/configure.ac b/configure.ac
index 07ffc08..a6ea1a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2929,7 +2929,7 @@ if test $_os = Darwin; then
         ;;
     esac
 
-    LIBTOOL=libtool
+    LIBTOOL=/usr/bin/libtool
     INSTALL_NAME_TOOL=install_name_tool
     if test -z "$save_CC"; then
         AC_MSG_CHECKING([what compiler to use])
commit 2e41d84857f902ff89ed67be637ed0dd4ec2cd8a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 15 18:03:29 2016 +0300

    Drop leftover EXTRA_CFLAGS and EXTRA_CDEFS
    
    Change-Id: I006d19498f4b5c3bd4088fd1e290c30e7022b1c9

diff --git a/external/lpsolve/lp_solve_5.5.patch b/external/lpsolve/lp_solve_5.5.patch
index 2f0f07d..2b2588a 100644
--- a/external/lpsolve/lp_solve_5.5.patch
+++ b/external/lpsolve/lp_solve_5.5.patch
@@ -56,7 +56,7 @@
  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
-@@ -1,23 +1,31 @@
+@@ -1,23 +1,30 @@
  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
@@ -67,8 +67,7 @@
 +
  def=
  so=
-+extra_cflags=$EXTRA_CFLAGS
-+extra_cdefs=$EXTRA_CDEFS
++# EXTRA_LINKFLAGS is set in the ExternalProject_lpsolve.mk
 +extra_linkflags=$EXTRA_LINKFLAGS
 +
  if [ "$PLATFORM" = "SCO_UNIX" ]
@@ -81,7 +80,7 @@
 +opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
  
 -$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $extra_cdefs $src
++$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 -libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
 +$LIBTOOL -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
  
@@ -89,7 +88,7 @@
  then
 -  $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 -  $c -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
-+  $c $extra_cflags -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $extra_cdefs $src
++  $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 +  $c $extra_linkflags -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
  fi
  
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index d648dcc..388cc5d 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -39,8 +39,7 @@ gb_OSDEFS := \
 	-DUNIX \
 	-DUNX \
 	-D_REENTRANT \
-	-DNO_PTHREAD_PRIORITY \
-	$(EXTRA_CDEFS) \
+	-DNO_PTHREAD_PRIORITY
 
 gb_CFLAGS := \
 	$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 824830f..bacd794 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -36,8 +36,7 @@ gb_OSDEFS := \
 	-DNO_PTHREAD_PRIORITY \
 	-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \
 	-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \
-	-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
-	$(EXTRA_CDEFS) \
+	-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
 
 
 gb_CFLAGS := \
