diff options
| -rwxr-xr-x | configure.in | 2 | ||||
| -rwxr-xr-x | dmake/configure | 2 | ||||
| -rwxr-xr-x | dmake/configure.in | 2 | ||||
| -rwxr-xr-x | post_download.in | 3 | ||||
| -rwxr-xr-x | set_soenv.in | 46 | ||||
| -rw-r--r-- | solenv/bin/mapgen.pl | 3 | ||||
| -rwxr-xr-x | solenv/bin/modules/osarch.pm | 2 | ||||
| -rw-r--r-- | solenv/inc/unx.mk | 4 | ||||
| -rw-r--r-- | soltools/checkdll/makefile.mk | 2 | ||||
| -rw-r--r-- | soltools/mkdepend/imakemdep.h | 2 |
10 files changed, 58 insertions, 10 deletions
diff --git a/configure.in b/configure.in index a2bb2e85f53a..0d2affdc4cf5 100755 --- a/configure.in +++ b/configure.in @@ -3722,7 +3722,7 @@ if test "$enable_epm" = "yes"; then AIX) PKGFORMAT=rpm ;; - OpenBSD) + OpenBSD|DragonFly) PKGFORMAT=portable ;; *BSD) diff --git a/dmake/configure b/dmake/configure index f8a1bd822914..4445b201fcde 100755 --- a/dmake/configure +++ b/dmake/configure @@ -4084,7 +4084,7 @@ case "$_os" in "AIX") OS_VERSION=sysvr4 ;; - "OpenBSD") + "OpenBSD"|DragonFly) OS_VERSION=linux ;; *) diff --git a/dmake/configure.in b/dmake/configure.in index 498c7b2372de..1ec0b3e2cf4c 100755 --- a/dmake/configure.in +++ b/dmake/configure.in @@ -111,7 +111,7 @@ case "$_os" in "AIX") OS_VERSION=sysvr4 ;; - "OpenBSD") + "OpenBSD"|DragonFly) OS_VERSION=linux ;; *) diff --git a/post_download.in b/post_download.in index 9902ea09b1b2..12b03d99fee7 100755 --- a/post_download.in +++ b/post_download.in @@ -45,6 +45,9 @@ case "$build_os" in openbsd*) _os=OpenBSD ;; + dragonfly*) + _os=DragonFly + ;; *) AC_MSG_ERROR([$_os operating system is not suitable to build LibreOffice!]) ;; diff --git a/set_soenv.in b/set_soenv.in index 71f557ad5700..9a43629151a6 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -807,6 +807,44 @@ elsif ( $platform =~ m/darwin/ ) $PATH_SEPERATOR = $ps; # GUIBASE is set below; may be "aqua" or "unx". } +elsif ( $platform =~ m/dragonfly/ ) +{ + if ($platform =~ m/^i386/) + { print "Setting DragonFly i386 specific values... "; + $outfile = "DragonFlyX86Env.Set.sh"; + $CPU = "I"; + $CPUNAME = "INTEL"; + $OUTPATH = "unxdflyi"; + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; + } + elsif ($platform =~ m/^x86_64/) + { print "Setting DragonFly x86-64 specific values... "; + $outfile = "DragonFlyX86-64Env.Set.sh"; + $CPU = "X"; + $CPUNAME = "X86_64"; + $OUTPATH = "unxdflyx"; + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; + } + else + { print "Unsupported DragonFly architecture: $platform \n"; + exit 1; + } + # General DragonFly settings: + $CVER = "C341"; + $OUTPATH = $OUTPATH."3"; + $BIG_SVX = "TRUE"; + $COM = "GCC"; + $COMPATH = '@COMPATH@'; + $GUI = "UNX"; + $GUIBASE = "unx"; + $GVER = "VCL"; + $INPATH = $OUTPATH.$PROEXT; + $OS = "DRAGONFLY"; + $PATH_SEPERATOR = $ps; +} elsif ( $platform =~ m/aix/ ) { print "Setting AIX PPC specific values... "; @@ -1051,7 +1089,7 @@ if ($platform =~ m/solaris/) $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB; } -elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix|openbsd/) +elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix|openbsd|dragonfly/) { $SOLAREXTRALIB = $L.$par_dir.$LIB64; } @@ -1114,7 +1152,7 @@ if ($platform =~ m/cygwin|os2/) } # The general environment path. -if ($platform =~ m/linux|netbsd|osf1|freebsd|aix|solaris|openbsd/) +if ($platform =~ m/linux|netbsd|osf1|freebsd|aix|solaris|openbsd|dragonfly/) { $PATH = $cur_dir. # $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. @@ -1337,7 +1375,7 @@ if ($platform =~ m/solaris/) $L.$JRETHREADDIR. $L.$XLIB; } -elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd/) +elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd|dragonfly/) { $SOLARLIB = $L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. @@ -1435,7 +1473,7 @@ if ($platform =~ m/solaris/) $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$INCLUDE; } #The tail, if needed - if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd/) + if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd|dragonfly/) { $SOLARINC .= $I.$XINC; } elsif ($platform =~ m/osf1/) diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl index aa61043cebbf..8a8677f12c7b 100644 --- a/solenv/bin/mapgen.pl +++ b/solenv/bin/mapgen.pl @@ -137,7 +137,8 @@ sub filter_symbols { $env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD')); $env_section = '1' and next if ((/^# NETBSD #$/) && ($ENV{OS} eq 'NETBSD')); $env_section = '1' and next if ((/^# OPENBSD #$/) && ($ENV{OS} eq 'OPENBSD')); - last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/) || (/^# NETBSD #$/) || (/^# OPENBSD #$/))); + $env_section = '1' and next if ((/^# DRAGONFLY #$/) && ($ENV{OS} eq 'DRAGONFLY')); + last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/) || (/^# NETBSD #$/) || (/^# OPENBSD #$/) (/^# DRAGONFLY #$/))); next if (!$_ || /^#/); push(@filters, $_); }; diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm index 3298b27c65f3..c9d9ec30d15d 100755 --- a/solenv/bin/modules/osarch.pm +++ b/solenv/bin/modules/osarch.pm @@ -23,6 +23,7 @@ chop( $m_str, $s_str ); "FreeBSD", "freebsd", "NetBSD", "netbsd", "OpenBSD", "openbsd", + "DragonFly", "dragonfly" "OSF1", "decunix", "SCO_SV", "scoosr5", # "SCO_SV", "scouw21", @@ -38,6 +39,7 @@ chop( $m_str, $s_str ); "FreeBSD", "-DFREEBSD", "NetBSD", "-DNETBSD", "OpenBSD", "-DOPENBSD", + "DragonFly", "-DDRAGONFLY", "OSF1", "-DSYSV -DDECUNIX", "SCO_SV", "-DSYSV -DSCO -DSCO_OSR5", # "SCO_SV", "-DSYSV -DSCO -DSCO_UW21", diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 311b6d15d6d4..f47115f4b5c5 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -159,6 +159,10 @@ .INCLUDE : unxobsd.mk .ENDIF +.IF "$(COM)$(OS)" == "GCCDRAGONFLY" +.INCLUDE : unxdfly.mk +.ENDIF + .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" .INCLUDE : unxmacxp.mk .ENDIF diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk index b5b386a63cf6..865d5a8ee008 100644 --- a/soltools/checkdll/makefile.mk +++ b/soltools/checkdll/makefile.mk @@ -46,7 +46,7 @@ APP1TARGET = checkdll APP1OBJS = $(OBJ)$/checkdll.obj DEPOBJFILES = $(APP1OBJS) .IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" \ - && "$(OS)"!="OPENBSD" + && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" STDLIB += -ldl .ENDIF .IF "$(OS)"=="NETBSD" diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h index 0d82f4221eae..494e26177013 100644 --- a/soltools/mkdepend/imakemdep.h +++ b/soltools/mkdepend/imakemdep.h @@ -236,7 +236,7 @@ in this Software without prior written authorization from the X Consortium. #ifdef _CRAY #define DEFAULT_CPP "/lib/pcpp" #endif -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #define DEFAULT_CPP "/usr/libexec/cpp" #endif #ifdef MACH |