[Libreoffice-commits] .: 3 commits - berkeleydb/prj lpsolve/lp_solve_5.5.patch lpsolve/makefile.mk lpsolve/prj redland/raptor

[David Tardon]

 berkeleydb/prj/d.lst       |    2 +-
 lpsolve/lp_solve_5.5.patch |    9 +++++++--
 lpsolve/makefile.mk        |    2 +-
 lpsolve/prj/d.lst          |    1 +
 redland/raptor/makefile.mk |    8 --------
 5 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit f65ed052f124f51bd5aaf538752bfd121c6c483c
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Mar 4 11:49:35 2012 +0100

    mingw: change liblpsolve.a -> .dll.a

diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 88e8828..590da2e 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -1,6 +1,6 @@
 --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig	Sat Jun 11 21:27:18 2005
 +++ misc/build/lp_solve_5.5/lpsolve55/ccc	Sun May 22 11:20:19 2011
-@@ -1,15 +1,28 @@
+@@ -1,25 +1,40 @@
  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
@@ -19,9 +19,11 @@
 +inline=
 +if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
 +     so=dll
++     a=dll.a
 +     inline=-DINLINE=static
 +else
 +     so=so
++     a=a
 +     soprefix=lib
 +     libs="-lm"
 +     pic=-fpic
@@ -35,7 +37,10 @@
  opts='-O3'
  
  $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
-@@ -18,8 +31,8 @@
+-ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+-ranlib liblpsolve55.a
++ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++ranlib liblpsolve55.$a
  
  if [ "$so" != "" ]
  then
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 7e47591..232faad 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -65,7 +65,7 @@ lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
 BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
 .ELSE
 BUILD_ACTION=sh ccc
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a
 .ENDIF
 .ELSE
 BUILD_ACTION=cmd /c cvc6.bat
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
index 68001dc..bf8d87c 100644
--- a/lpsolve/prj/d.lst
+++ b/lpsolve/prj/d.lst
@@ -5,6 +5,7 @@ mkdir: %_DEST%\inc\lpsolve
 ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
 ..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
 ..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a
+..\%__SRC%\lib\liblpsolve55.dll.a %_DEST%\lib\liblpsolve55.dll.a
 ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
 ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
 
commit cd5bcd60266f0b99ad015c193d567c992f7e65bd
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Mar 2 10:51:48 2012 +0100

    do not change the lib name

diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst
index 1d50f61..1de53d4 100644
--- a/berkeleydb/prj/d.lst
+++ b/berkeleydb/prj/d.lst
@@ -6,7 +6,7 @@ mkdir: %_DEST%\inc\berkeleydb
 ..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib\libdb-4.7.a
 ..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib\libdb-4.7.so
 ..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib\libdb-4.7.dylib
-..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb-4.7.a
+..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb47.dll.a
 ..\%__SRC%\bin\libdb47.dll %_DEST%\bin\libdb47.dll
 
 
commit 5efc793653950ea8efcd9638a0669a62a9e662c8
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Mar 2 10:47:46 2012 +0100

    it seems this is not necessary after all
    
    Maybe it depends on the day of the week or something like that...

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 9143f99..a2a3bd3 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -97,14 +97,6 @@ BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 
-# Hack to get librdf.dll linked on mingw. I am already wearied of
-# fighting libtool's pseudo-intelligence, so I am just going to go with
-# the flow here.
-ALL : $(OUT)/lib/libraptor.la
-
-$(OUT)/lib/libraptor.la : $(MISC)/build/so_built_so_raptor
-	$(SED) "/^dlname/s@='@='../bin/@" $(MISC)/build/$(TARFILE_NAME)/src/libraptor.la > $@
-
 .ELSE
 
 # there is no wntmsci build environment in the tarball; we use custom dmakefile