[Libreoffice-commits] .: 2 commits - solenv/gbuild soltools/mkdepend

[François Tigeot]

 solenv/gbuild/platform/dragonfly.mk |    2 ++
 soltools/mkdepend/imakemdep.h       |   14 +-------------
 soltools/mkdepend/main.c            |    2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 6502588f35a9ac04f5a0aba23746a194568a0b3c
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Fri Apr 22 20:04:02 2011 +0200

    Remove Sequent support

diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h
index abb3635..c9d8a7f 100644
--- a/soltools/mkdepend/imakemdep.h
+++ b/soltools/mkdepend/imakemdep.h
@@ -130,14 +130,6 @@ in this Software without prior written authorization from the X Consortium.
 #define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS"
 #endif
 
-#ifdef sequent
-#define imake_ccflags "-DX_NOT_STDC_ENV -DX_NOT_POSIX"
-#endif
-
-#ifdef _SEQUENT_
-#define imake_ccflags "-DSYSV -DUSG"
-#endif
-
 #if defined(SX) || defined(PC_UX)
 #define imake_ccflags "-DSYSV"
 #endif
@@ -167,7 +159,7 @@ in this Software without prior written authorization from the X Consortium.
  *     descriptor onto another, define such a mechanism here (if you don't
  *     already fall under the existing category(ies).
  */
-#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_)
+#if defined(SYSV) && !defined(_CRAY) && !defined(Mips)
 #define	dup2(fd1,fd2)	((fd1 == fd2) ? fd1 : (close(fd2), \
                            fcntl(fd1, F_DUPFD, fd2)))
 #endif
@@ -655,10 +647,6 @@ struct pair	predefs[] = {
 #ifdef __sxg__
     {"__sxg__", "1", NULL},
 #endif
-#ifdef _SEQUENT_
-    {"_SEQUENT_", "1", NULL},
-    {"__STDC__", "1", NULL},
-#endif
 #ifdef __bsdi__
     {"__bsdi__", "1", NULL},
 #endif
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index c226031..f4ad218 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -719,7 +719,7 @@ void redirect(line, makefile)
         }
     }
     fflush(fdout);
-#if defined(USGISH) || defined(_SEQUENT_) || defined(USE_CHMOD)
+#if defined(USGISH) || defined(USE_CHMOD)
     chmod(makefile, st.st_mode);
 #else
     fchmod(fileno(fdout), st.st_mode);
commit f57e5e7a0a5e0b813a7aa0b64f0ef10912cfe3d2
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sat Apr 16 19:06:03 2011 +0200

    Temporary fix for a LD_LIBRARY_PATH not propagated issue.

diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
index 77e6540..3aa047a 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -40,4 +40,6 @@ gb_COMPILERDEFAULTOPTFLAGS := -O -g
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
+
 # vim: set noet sw=4: