[Libreoffice-commits] .: 2 commits - scp2/source solenv/bin
Robert Nagy
rnagy at kemper.freedesktop.org
Mon Nov 8 08:30:41 PST 2010
scp2/source/ooo/ure.scp | 4 ++--
solenv/bin/mapgen.pl | 3 ++-
solenv/bin/modules/installer/parameter.pm | 5 +++++
solenv/bin/modules/osarch.pm | 3 +++
4 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 8c67fcf6982e6266a1e952c477f08cf58b28f4c2
Author: Robert Nagy <robert at openbsd.org>
Date: Sat Nov 6 18:40:19 2010 +0100
add OPENBSD specific stuff
diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl
index 8cb51c3..c3effeb 100644
--- a/solenv/bin/mapgen.pl
+++ b/solenv/bin/mapgen.pl
@@ -135,7 +135,8 @@ sub filter_symbols {
$env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
$env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
$env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
- last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/)));
+ $env_section = '1' and next if ((/^# OPENBSD #$/) && ($ENV{OS} eq 'OPENBSD'));
+ last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/) || (/^# OPENBSD #$/)));
next if (!$_ || /^#/);
push(@filters, $_);
};
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index b5b20e4..a0c8ac1 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -299,6 +299,11 @@ sub setglobalvariables
}
}
+ if ( $installer::globals::compiler =~ /unxobsd/ )
+ {
+ $installer::globals::epmoutpath = "openbsd";
+ }
+
if ( $installer::globals::compiler =~ /unxfbsd/ )
{
$installer::globals::isfreebsdbuild = 1;
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 637e953..5aaa188 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -22,6 +22,7 @@ chop( $m_str, $s_str );
"Linux", "linux",
"FreeBSD", "freebsd",
"NetBSD", "netbsd",
+ "OpenBSD", "openbsd",
"OSF1", "decunix",
"SCO_SV", "scoosr5",
# "SCO_SV", "scouw21",
@@ -36,6 +37,7 @@ chop( $m_str, $s_str );
"Linux", "-DLINUX",
"FreeBSD", "-DFREEBSD",
"NetBSD", "-DNETBSD",
+ "OpenBSD", "-DOPENBSD",
"OSF1", "-DSYSV -DDECUNIX",
"SCO_SV", "-DSYSV -DSCO -DSCO_OSR5",
# "SCO_SV", "-DSYSV -DSCO -DSCO_UW21",
@@ -51,6 +53,7 @@ chop( $m_str, $s_str );
"Linux", "lng",
"FreeBSD", "fbsd",
"NetBSD", "bsd",
+ "OpenBSD", "obsd",
"SCO_SV", "sco",
"Darwin", "macx",
"Mac OS", "macx",
commit df4eb347b80225755138b5df32f2830af2bac637
Author: Robert Nagy <robert at openbsd.org>
Date: Sat Nov 6 18:35:38 2010 +0100
add OPENBSD ifdefs where needed
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index f0f294a..7fc6ef1 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1002,7 +1002,7 @@ File gid_File_Dl_Stlport
End
#endif
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
File gid_File_Dl_GccS
TXT_FILE_BODY;
@@ -1017,7 +1017,7 @@ File gid_File_Dl_GccS
End
#endif
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
File gid_File_Dl_Stdcpp
Dir = SCP2_URE_DL_DIR;
More information about the Libreoffice-commits
mailing list