[Libreoffice-commits] .: 3 commits - solenv/bin solenv/inc soltools/cpp
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 16 11:53:34 PST 2011
solenv/bin/modules/osarch.pm | 200 -------------------------------
solenv/bin/update_module_ignore_lists.pl | 2
solenv/inc/_tg_lib.mk | 60 ---------
solenv/inc/tg_lib.mk | 6
solenv/inc/unx.mk | 12 -
solenv/inc/unxhpgr.mk | 133 --------------------
solenv/inc/unxhpxr.mk | 131 --------------------
solenv/inc/unxscoi.mk | 140 ---------------------
soltools/cpp/_include.c | 4
soltools/cpp/_macro.c | 3
10 files changed, 691 deletions(-)
New commits:
commit 982e03e45749416ae519228445944ec3d35bdeb5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 20:45:35 2011 +0100
Remove usused osarch.pm
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
deleted file mode 100755
index 414c958..0000000
--- a/solenv/bin/modules/osarch.pm
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/perl -w
-
-# ***********************************************************************
-# Description:
-# Filename: osarch.pm
-# Autor: EG
-# Date: 28.10.96
-# $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/solenv/bin/modules/osarch.pm,v 1.3 2008-08-18 13:11:04 vg Exp $
-# Copyright: STAR DIVISION
-# **********************************************************************/
-
-package osarch;
-
-$m_str = `uname -m`;
-$s_str = `uname -s`;
-chop( $m_str, $s_str );
-
-%osTable = ("SunOS", "solaris",
- "AIX", "aix",
- "OS/390", "s390",
- "Linux", "linux",
- "FreeBSD", "freebsd",
- "NetBSD", "netbsd",
- "OpenBSD", "openbsd",
- "DragonFly", "dragonfly"
- "OSF1", "decunix",
- "Darwin", "macosxp",
- "Mac OS", "macosxp",
- "SINIX-N", "sinix"
- );
-
-%osDefTable = ("SunOS", "-DSYSV -DSOLARIS",
- "AIX", "-DSYSV -DAIX",
- "Linux", "-DLINUX",
- "FreeBSD", "-DFREEBSD",
- "NetBSD", "-DNETBSD",
- "OpenBSD", "-DOPENBSD",
- "DragonFly", "-DDRAGONFLY",
- "OSF1", "-DSYSV -DDECUNIX",
- "Darwin", "-DBSD -DMACOSX",
- "Mac OS", "-DBSD -DMACOSX",
- "SINIX-N", "-DSYSV -DSINIX"
- );
-
-%osDosTable = ("SunOS", "sol",
- "AIX", "aix",
- "OS/390", "mvs",
- "Linux", "lng",
- "FreeBSD", "fbsd",
- "NetBSD", "bsd",
- "OpenBSD", "obsd",
- "Darwin", "macx",
- "Mac OS", "macx",
- "SINIX-N", "sni"
- );
-
-%archTable = ("sun4c", "sparc",
- "sun4m", "sparc",
- "sun4u", "sparc",
- "9000/712", "hp9000",
- "9000/715", "hp9000",
- "9000/778", "hp9000",
- "000029484600", "rs6000", # salsa
- "000328144600", "rs6000", # lambada
- "00245D29E000", "rs6000", # segv
- "00245C46E000", "rs6000", # bus
- "002012974600", "rs6000", # tango
- "0006404C4C00", "rs6000", # jive
- "2003", "g3", # ezopen4
- "i86pc", "x86", # blauwal
- "i386", "x86", # NetBSD, FreeBSD
- "i486", "x86", # tiger
- "i586", "x86", # blauwal
- "i686", "x86",
- "prep", "ppc", # hooge
- "ppc", "ppc", # ppc-linux
- "alpha", "alpha",
- "RM400", "rm400", # garbo
- "IP22", "mips", # voyager
- "IP32", "mips", # giotto
- "Power Macintosh", "ppc", # NetBSD/arm32
- "arm32", "arm32" # NetBSD/arm32
- );
-
-%archDefTable=("sun4c", "-DSPARC -DSUN -DSUN4", # hawai
- "sun4m", "-DSPARC -DSUN -DSUN4", # broccoli
- "sun4u", "-DSPARC -DSUN -DSUN4", # broccoli
- "9000/712", "-DHP9000", # tuborg
- "9000/715", "-DHP9000", # koepi
- "9000/778", "-DHP9000", # jever, flens
- "000029484600", "-DRS6000", # salsa
- "000328144600", "-DRS6000", # lambada
- "00245D29E000", "-DRS6000", # segv
- "00245C46E000", "-DRS6000", # segv
- "002012974600", "-DRS6000", # tango
- "0006404C4C00", "-DRS6000", # jive
- "2003", "-DG3", # ezopen4
- "i86pc", "-DX86 -DINTEL",# gepard
- "i386", "-DX86", # NetBSD, FreeBSD
- "i486", "-DX86", # tiger
- "i586", "-DX86", # blauwal
- "i686", "-DX86", #
- "prep", "-DPPC", # hooge
- "ppc", "-DPPC", # ppc-linux
- "alpha", "-DALPHA", # mars
- "RM400", "-DMIPS -DRM400", # ekberg, garbo
- "IP22", "-DMIPS", # voyager
- "IP32", "-DMIPS", # giotto
- "Power Macintosh", "-DPPC", # NetBSD/arm32
- "arm32", "-DARM32" # NetBSD/arm32
- );
-
-%archDosTable=("sun4c", "s", # hawai
- "sun4m", "s", # broccoli
- "sun4u", "s", # broccoli
- "9000/712", "r", # tuborg
- "9000/715", "r", # koepi
- "9000/778", "r", # jever, flens
- "000029484600", "p", # salsa
- "000328144600", "p", # lambada
- "00245D29E000", "p", # segv
- "00245C46E000", "p", # segv
- "002012974600", "p", # tango
- "0006404C4C00", "p", # jive
- "2003", "g", # ezopen4
- "i86pc", "i", # gepard
- "i386", "i", # NetBSD, FreeBSD
- "i486", "i", # tiger
- "i586", "i", # blauwal
- "i686", "i",
- "prep", "p", # hooge
- "ppc", "p", # ppc-linux
- "alpha", "a", # mars
- "RM400", "m", # ekberg, garbo
- "IP22", "m", # voyager
- "IP32", "m", # giotto
- "Power Macintosh", "p", # NetBSD/arm32
- "arm32", "a" # NetBSD/arm32
- );
-
-$main::solarDef = $osDefTable{ $s_str }.' '.$archDefTable{ $m_str };
-
-$main::solarOS = $osTable{ $s_str };
-$main::solarMT = $archTable{ $m_str };
-
-$main::solarArch = $main::solarOS.$main::solarMT;
-$main::solarOldArch = $main::solarArch; # for compatibility
-
-$main::solarDOS = 'unx'.$osDosTable{ $s_str }. $archDosTable{ $m_str };
-
-sub main::osarch
-{
- local ( $flag ) = @_;
-
- $perlFlag = $flag eq 'perl';
- $defFlag = $flag eq 'def';
- $oldFlag = $flag eq 'old';
- $dirFlag = $flag eq 'dir';
- $dosFlag = $flag eq 'dos';
-
- local( $result ) = ( '' );
-
- if ( $perlFlag )
- {
- $result .= '$solarDef = '."'$main::solarDef';\n";
- $result .= '$solarArch = '."'$main::solarArch';\n";
- $result .= '$solarOldArch = '."'$main::solarOldArch';\n";
- $result .= '$solarOS = '."'$main::solarOS';\n";
- $result .= '$solarMT = '."'$main::solarMT';\n";
- $result .= '$solarDOS = '."'$main::solarDOS';";
- }
- elsif ( $defFlag )
- {
- $result = $main::solarDef;
- }
- elsif ( $dirFlag )
- {
- $result = "$main::solarOS-$main::solarMT";
- }
- elsif ( $dosFlag )
- {
- $result = $main::solarDOS;
- }
- else
- {
- $result = $oldFlag ? $main::solarOldArch : $main::solarArch;
- }
-
- return $result;
-}
-
-1;
commit 5f108b097e54e2b6f1cbc9f0693c30a513242f2c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 20:32:55 2011 +0100
Remove SCO support
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 1368ff9..414c958 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -24,8 +24,6 @@ chop( $m_str, $s_str );
"OpenBSD", "openbsd",
"DragonFly", "dragonfly"
"OSF1", "decunix",
- "SCO_SV", "scoosr5",
-# "SCO_SV", "scouw21",
"Darwin", "macosxp",
"Mac OS", "macosxp",
"SINIX-N", "sinix"
@@ -39,8 +37,6 @@ chop( $m_str, $s_str );
"OpenBSD", "-DOPENBSD",
"DragonFly", "-DDRAGONFLY",
"OSF1", "-DSYSV -DDECUNIX",
- "SCO_SV", "-DSYSV -DSCO -DSCO_OSR5",
-# "SCO_SV", "-DSYSV -DSCO -DSCO_UW21",
"Darwin", "-DBSD -DMACOSX",
"Mac OS", "-DBSD -DMACOSX",
"SINIX-N", "-DSYSV -DSINIX"
@@ -53,7 +49,6 @@ chop( $m_str, $s_str );
"FreeBSD", "fbsd",
"NetBSD", "bsd",
"OpenBSD", "obsd",
- "SCO_SV", "sco",
"Darwin", "macx",
"Mac OS", "macx",
"SINIX-N", "sni"
@@ -73,7 +68,7 @@ chop( $m_str, $s_str );
"0006404C4C00", "rs6000", # jive
"2003", "g3", # ezopen4
"i86pc", "x86", # blauwal
- "i386", "x86", # SCO_SV, NetBSD, FreeBSD
+ "i386", "x86", # NetBSD, FreeBSD
"i486", "x86", # tiger
"i586", "x86", # blauwal
"i686", "x86",
@@ -101,7 +96,7 @@ chop( $m_str, $s_str );
"0006404C4C00", "-DRS6000", # jive
"2003", "-DG3", # ezopen4
"i86pc", "-DX86 -DINTEL",# gepard
- "i386", "-DX86", # SCO_SV, NetBSD, FreeBSD
+ "i386", "-DX86", # NetBSD, FreeBSD
"i486", "-DX86", # tiger
"i586", "-DX86", # blauwal
"i686", "-DX86", #
@@ -129,7 +124,7 @@ chop( $m_str, $s_str );
"0006404C4C00", "p", # jive
"2003", "g", # ezopen4
"i86pc", "i", # gepard
- "i386", "i", # SCO_SV, NetBSD, FreeBSD
+ "i386", "i", # NetBSD, FreeBSD
"i486", "i", # tiger
"i586", "i", # blauwal
"i686", "i",
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 7830860..5733e02 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -75,10 +75,6 @@
.INCLUDE : unxsogi.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCSCOI"
-.INCLUDE : unxscoi.mk
-.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXS"
.INCLUDE : unxlngs.mk
.ENDIF
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk
deleted file mode 100644
index 901fe7b..0000000
--- a/solenv/inc/unxscoi.mk
+++ /dev/null
@@ -1,140 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# mak file fuer wnticci
-ASM=
-AFLAGS=
-
-CDEFS+=-D_PTHREADS -D_REENTRANT
-CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DX86 -DNEW_SOLAR
-# kann c++ was c braucht??
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=-mpentium
-
-CXX*=/nw386/dev/s/solenv/unxscoi/bin/g++
-CC*=/nw386/dev/s/solenv/unxscoi/bin/gcc
-CFLAGS=-c
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSEXCEPTIONS=-fexceptions
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-CFLAGSCXX=-fguiding-decls -frtti $(ARCH_FLAGS)
-PICSWITCH:=-fPIC
-CFLAGSOBJGUIMT=$(PICSWITCH)
-CFLAGSOBJCUIMT=$(PICSWITCH)
-CFLAGSSLOGUIMT=$(PICSWITCH)
-CFLAGSSLOCUIMT=$(PICSWITCH)
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-O2
-CFLAGSNOOPT=-O
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-CFLAGSWERRCC=-Werror
-
-STATIC = -Wl,-Bstatic
-DYNAMIC = -Wl,-Bdynamic
-
-THREADLIB=
-LINK=/nw386/dev/s/solenv/unxscoi/bin/gcc
-LINKFLAGS=
-# SCO hat grosse Probleme mit fork/exec und einigen shared libraries
-# rsc2 muss daher statisch gelinkt werden
-.IF "$(PRJNAME)"=="rsc"
-LINKFLAGSAPPGUI=-L/nw386/dev/s/solenv/unxscoi/lib $(STATIC) -lpthread_init $(DYNAMIC)
-LINKFLAGSAPPCUI=-L/nw386/dev/s/solenv/unxscoi/lib $(STATIC) -lpthread_init $(DYNAMIC)
-.ELSE
-LINKFLAGSAPPGUI=-L/nw386/dev/s/solenv/unxscoi/lib -lpthread_init
-LINKFLAGSAPPCUI=-L/nw386/dev/s/solenv/unxscoi/lib -lpthread_init
-.ENDIF
-LINKFLAGSSHLGUI=-G -W,l,-Bsymbolic
-LINKFLAGSSHLCUI=-G -W,l,-Bsymbolic
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# standard C++ Library
-#
-# das statische dazulinken der libstdc++ macht jede shared library um 50k
-# (ungestrippt) oder so groesser, auch wenn sie ueberhaupt nicht gebraucht
-# wird. Da muessen wir uns was besseres ueberlegen.
-STDLIBCPP=-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-.IF "$(PRJNAME)"=="rsc"
-STDLIBGUIMT=-lXext -lX11 $(STATIC) -lpthread $(DYNAMIC) -ldl -lsocket -lm
-STDLIBCUIMT=$(STATIC) -lpthread $(DYNAMIC) -ldl -lsocket -lm
-.ELSE
-STDLIBGUIMT=-lXext -lX11 -lpthread -ldl -lsocket -lm
-STDLIBCUIMT=-lpthread -ldl -lsocket -lm
-.ENDIF
-#STDSHLGUIMT=-lXext -lX11 -lpthread -ldl -lsocket -lm
-#STDSHLCUIMT=-lpthread -ldl -lsocket -lm
-
-STDLIBCPP= -lstdc++
-SHLLINKARCONLY=yes
-
-LIBMGR=ar
-LIBFLAGS=-r
-# LIBEXT=.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=ci
-DLLPRE=lib
-DLLPOST=.so
-
-LDUMP=cppfilt /b /n /o /p
-
-.IF "$(WORK_STAMP)"!="MIX364"
-DLLPOSTFIX=ci
-.ELSE
-DLLPOSTFIX=
-.ENDIF
commit fa60b188331e54fec55b8b8727984d79514dcee3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 20:30:38 2011 +0100
Remove HPUX support
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 40ebe83..1368ff9 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -16,7 +16,6 @@ $s_str = `uname -s`;
chop( $m_str, $s_str );
%osTable = ("SunOS", "solaris",
- "HP-UX", "hpux",
"AIX", "aix",
"OS/390", "s390",
"Linux", "linux",
@@ -33,7 +32,6 @@ chop( $m_str, $s_str );
);
%osDefTable = ("SunOS", "-DSYSV -DSOLARIS",
- "HP-UX", "-DSYSV -DHPUX",
"AIX", "-DSYSV -DAIX",
"Linux", "-DLINUX",
"FreeBSD", "-DFREEBSD",
@@ -49,7 +47,6 @@ chop( $m_str, $s_str );
);
%osDosTable = ("SunOS", "sol",
- "HP-UX", "hpx",
"AIX", "aix",
"OS/390", "mvs",
"Linux", "lng",
diff --git a/solenv/bin/update_module_ignore_lists.pl b/solenv/bin/update_module_ignore_lists.pl
index e858a3d..4996d60 100644
--- a/solenv/bin/update_module_ignore_lists.pl
+++ b/solenv/bin/update_module_ignore_lists.pl
@@ -57,8 +57,6 @@ my @platforms = (
"unxfbsdi",
"unxfbsd",
"unxfbsdx",
- "unxhpgr",
- "unxhpxr",
"unxirgm",
"unxirxm3",
"unxirxm",
diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk
index 378c323..35af207 100644
--- a/solenv/inc/_tg_lib.mk
+++ b/solenv/inc/_tg_lib.mk
@@ -8,12 +8,6 @@ $(LIB1ARCHIV) : $(LIB1TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
@@ -110,12 +104,6 @@ $(LIB2ARCHIV) : $(LIB2TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
@@ -212,12 +200,6 @@ $(LIB3ARCHIV) : $(LIB3TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
@@ -314,12 +296,6 @@ $(LIB4ARCHIV) : $(LIB4TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
@@ -416,12 +392,6 @@ $(LIB5ARCHIV) : $(LIB5TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
@@ -518,12 +488,6 @@ $(LIB6ARCHIV) : $(LIB6TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
@@ -620,12 +584,6 @@ $(LIB7ARCHIV) : $(LIB7TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
@@ -722,12 +680,6 @@ $(LIB8ARCHIV) : $(LIB8TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
@@ -824,12 +776,6 @@ $(LIB9ARCHIV) : $(LIB9TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
@@ -926,12 +872,6 @@ $(LIB10ARCHIV) : $(LIB10TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index 0890915..121455d 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -37,12 +37,6 @@ $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
@-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.IF "$(OS)" =="HPUX_FRAG_HR"
- @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
- @echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
- @cat $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
- @+source $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd
-.ENDIF
@echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index f47115f..7830860 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -119,14 +119,6 @@
.INCLUDE : unxlnga.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "ACCHPUXR"
-.INCLUDE : unxhpxr.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCHPUXR"
-.INCLUDE : unxhpgr.mk
-.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDA"
.INCLUDE : unxbsda.mk
.ENDIF
diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk
deleted file mode 100644
index fa5c4a5..0000000
--- a/solenv/inc/unxhpgr.mk
+++ /dev/null
@@ -1,133 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# mak file fuer unxhpxr
-ASM=
-AFLAGS=
-
-CDEFS+=-D_PTHREADS -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-CDEFS+=-DSYSV -D_POSIX_PTHREAD_SEMANTICS -D_HPUX_SOURCE -DRWSTD_MULTI_THREAD -D_REENTRANT -D__HPACC_NOEH -D__STL_NO_EXCEPTIONS
- #CDEFS+= -D__hppa__
-
-# obernervige Warnungen abschalten
-# 67 = invalid pragma name
-# 251 = An object cannot be deleted using a pointer of type 'void *' since the
-# type of the object allocated is unknown.
-# 370 = The friend declaration is not in the correct form for either a function or a class.
-# (future error)
-# 600 = Type specifier is omitted; "int" is no longer assumed.
-DISWARN=+W67,251,370,600
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-#CXX=/opt/aCC/bin/aCC
-#CC=/opt/ansic/bin/cc
-CXX=g++
-CC=gcc
-CFLAGSWALL=-Wall
-CFLAGS=-nostdinc -c
-CFLAGSCC=-pipe -fguiding-decls $(ARCH_FLAGS)
-CFLAGSCXX=-pipe -fguiding-decls $(ARCH_FLAGS)
-PICSWITCH:=-fPIC
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=$(PICSWITCH)
-CFLAGSSLOCUIMT=$(PICSWITCH)
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-O2
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-
- #THREADLIB=-L/opt/dce/lib -ldce
-# use native aCC to build or link with shared libs, for the sake of
-# global class-instances
-
-STATIC = -Bstatic
-DYNAMIC = -Bdynamic
-
-#LINK=$(SOLARENV)/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.90.29/ld
-LINK=ld
-LINKFLAGS=-L/nw386/dev/s/solenv/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.91.57/threads -L/nw386/dev/s/solenv/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.91.57
-LINKFLAGSAPPGUI= /usr/lib/crt0.o
-LINKFLAGSSHLGUI= -b -Bsymbolic -G $(THREADLIB)
-LINKFLAGSAPPCUI= /usr/lib/crt0.o
-LINKFLAGSSHLCUI= -b -warn-once -Bsymbolic -G
-LINKFLAGSTACK=
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-APP_LINKTYPE=
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-#STDLIBGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
-STDLIBGUIMT= -lX11 -lXext -ldce
-STDLIBCUIMT= -lc_r -lgcc -ldce
-#STDSHLGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r
-STDSHLGUIMT= -lcma -lsec -ldld -lc_r
-STDSHLCUIMT=
-# -L/opt/dce/lib -ldce -lsec -lcxx
-
-LIBMGR=ar
-LIBFLAGS=-r
-# LIBEXT=.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=
-RCFLAGS=
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=hg
-DLLPRE=lib
-DLLPOST=.sl
-
-LDUMP=c++filt
-
-.IF "$(PRJNAME)"=="uno" || "$(PRJNAME)"=="vos"
-#CFLAGS += -D_PTHREADS -U_REENTRANT -U_POSIX_PTHREAD_SEMANTICS
-#CFLAGSSLO += -instances=extern -template=wholeclass -ptr$(SLO)
-#CFLAGSOBJ += -instances=global -template=wholeclass -ptr$(SLO)
-#LINKFLAGS+= -temp=/tmp -PIC -instances=extern -ptr$(SLO)
-.ENDIF
-
-#SHLLINKARCONLY=yes
-
diff --git a/solenv/inc/unxhpxr.mk b/solenv/inc/unxhpxr.mk
deleted file mode 100644
index 174d61f..0000000
--- a/solenv/inc/unxhpxr.mk
+++ /dev/null
@@ -1,131 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mak file fuer unxhpxr
-ASM=
-AFLAGS=
-
-CDEFS+=-D_PTHREADS -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DSYSV -D_POSIX_PTHREAD_SEMANTICS -D_HPUX_SOURCE -DRWSTD_MULTI_THREAD -D_REENTRANT -D__HPACC_NOEH -D__STL_NO_EXCEPTIONS
-
-# kann c++ was c braucht??
-
-# obernervige Warnungen abschalten
-# 67 = invalid pragma name
-# 251 = An object cannot be deleted using a pointer of type 'void *' since the
-# type of the object allocated is unknown.
-# 370 = The friend declaration is not in the correct form for either a function or a class.
-# (future error)
-# 600 = Type specifier is omitted; "int" is no longer assumed.
-DISWARN=+W67,251,370,600
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-#CXX=/opt/aCC/bin/aCC
-#CC=/opt/ansic/bin/cc
-CXX=aCC
-CC=cc
-CFLAGS= -c
-CFLAGSCC= -Aa +e +Z $(ARCH_FLAGS)
-CFLAGSCXX=$(DISWARN) +Z $(ARCH_FLAGS)
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=
-CFLAGSSLOCUIMT=
-CFLAGSPROF=
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=-O
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=-o
-
-
-THREADLIB=-L/opt/dce/lib -ldce
-# use native aCC to build or link with shared libs, for the sake of
-# global class-instances
-LINK=/opt/aCC/bin/aCC
-LINKFLAGS=
-LINKFLAGSAPPGUI=-Wl,+s
-LINKFLAGSSHLGUI=-b -L/usr/solar/lib -L/usr/contrib/X11R6/lib
-LINKFLAGSAPPCUI=-Wl,+s
-LINKFLAGSSHLCUI=-b -L/usr/contrib/X11R6/lib
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-
-# reihenfolge der libs NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-#STDLIBGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
-STDLIBGUIMT= -lX11 -lXext -lpthread
-STDLIBCUIMT= -lcma
-#STDSHLGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r
-STDSHLCUIMT=
-# -L/opt/dce/lib -ldce -lsec -lcxx
-
-LIBMGR=ar
-LIBFLAGS=-r
-# LIBEXT=.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=
-RCFLAGS=
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=hr
-DLLPRE=lib
-DLLPOST=.sl
-
-LDUMP=c++filt
-
-.IF "$(WORK_STAMP)"!="MIX364"
-DLLPOSTFIX=ss
-.ELSE
-DLLPOSTFIX=
-.ENDIF
-
-
-.IF "$(PRJNAME)"=="uno" || "$(PRJNAME)"=="vos"
-#CFLAGS += -D_PTHREADS -U_REENTRANT -U_POSIX_PTHREAD_SEMANTICS
-#CFLAGSSLO += -instances=extern -template=wholeclass -ptr$(SLO)
-#CFLAGSOBJ += -instances=global -template=wholeclass -ptr$(SLO)
-#LINKFLAGS+= -temp=/tmp -PIC -instances=extern -ptr$(SLO)
-.ENDIF
-
-#SHLLINKARCONLY=yes
-
diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c
index b179bd1..104f977 100644
--- a/soltools/cpp/_include.c
+++ b/soltools/cpp/_include.c
@@ -13,10 +13,6 @@
#include <string.h>
#include <fcntl.h>
-
-#ifdef __hpux
-# define _HPUX_SOURCE
-#endif
#if defined(__IBMC__) || defined(__EMX__)
# include <fcntl.h>
# define PATH_MAX _MAX_PATH
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index 984a608..4263a8f 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -5,9 +5,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef __hpux
-# define _HPUX_SOURCE
-#endif
#if defined(__IBMC__) || defined(__EMX__)
# define PATH_MAX _MAX_PATH
#endif
More information about the Libreoffice-commits
mailing list