bin/distro-install-sdk | 1
external/hyphen/ExternalProject_hyphen.mk | 1
external/mythes/ExternalProject_mythes.mk | 1
odk/config/configure.pl | 40 ------------------------------
odk/config/setsdkenv_unix.sh.in | 14 ----------
odk/settings/settings.mk | 21 +++++----------
6 files changed, 8 insertions(+), 70 deletions(-)
New commits:
commit fab34eb54fffaaf1fc32a0901436d8940f6c8b43
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Dec 18 18:02:40 2013 +0100
fdo#72598: remove last uses of "C52"
Change-Id: Ibf43da89c88596589c8e81f790c9d57c2a4e9701
diff --git a/external/hyphen/ExternalProject_hyphen.mk
b/external/hyphen/ExternalProject_hyphen.mk
index 6687265..28b8323 100644
--- a/external/hyphen/ExternalProject_hyphen.mk
+++ b/external/hyphen/ExternalProject_hyphen.mk
@@ -20,7 +20,6 @@ $(call gb_ExternalProject_get_state_target,hyphen,build):
./configure --disable-shared \
$(if $(filter-out IOS,$(OS)),--with-pic) \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
gio_can_sniff=no) \
- $(if $(filter
C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS="-m64") \
&& $(MAKE) \
)
diff --git a/external/mythes/ExternalProject_mythes.mk
b/external/mythes/ExternalProject_mythes.mk
index 88e2a61..2428aa2 100644
--- a/external/mythes/ExternalProject_mythes.mk
+++ b/external/mythes/ExternalProject_mythes.mk
@@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
$(call gb_ExternalProject_run,build,\
LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared
--with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM) gio_can_sniff=no) \
- $(if $(filter C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS="-m64") \
&& $(MAKE) \
)
commit 43dcbc8a6daa0dcca6f46934ee8900d8c5655321
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Dec 18 17:58:06 2013 +0100
odk: "pltfrm" appears to be unused
Change-Id: Ia991593d53e31ad3d65881f9b6e62fede93e0266
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 3254f43..1c2c629 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -153,7 +153,6 @@ case ${sdk_platform} in
platform='Solaris x86'
fi
comid=gcc3
- pltfrm=gcc
soext=so
exampleout=SOLARISexample.out
LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
@@ -163,7 +162,6 @@ case ${sdk_platform} in
darwin*)
directoryname=macosx
comid=gcc3
- pltfrm=gcc
soext=dylib
exampleout=MACOSXexample.out
platform=MacOSX
@@ -174,7 +172,6 @@ case ${sdk_platform} in
linux-gnu)
directoryname=linux
comid=gcc3
- pltfrm=gcc
soext=so
exampleout=LINUXexample.out
platform=Linux
@@ -185,7 +182,6 @@ case ${sdk_platform} in
freebsd*)
directoryname=freebsd
comid=gcc3
- pltfrm=gcc
soext=so
exampleout=FREEBSDexample.out
platform=FreeBSD
commit 1bffa142c530b638e245e1aca58a27414d65e927
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Dec 18 17:56:20 2013 +0100
fdo#72598: odk: remove SunStudio support
No idea if the GCC stuff that's in there actually works.
Change-Id: Idd1b93edd88609f3c09d14134d00a15fa9c0b0b7
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 33554e8..4bc4edf 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -74,7 +74,6 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
-e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-e "s,@OO_SDK_SED_HOME@,/usr/bin," \
-e "s,@OO_SDK_CAT_HOME@,/usr/bin," \
- -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \
-e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-e "s,@SDK_AUTO_DEPLOYMENT@,NO," \
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 588f80b..dde3a94 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -77,12 +77,6 @@ $main::OO_SDK_SED_HOME_SUGGESTION = searchprog("sed");
$main::OO_SDK_CPP_HOME = "";
$main::cppName = "gcc";
$main::cppVersion = "4.0.1";
-if ( $main::operatingSystem =~ m/solaris/ )
-{
- $main::cppName = "CC";
- $main::cppVersion = "5.2";
-}
-$main::OO_SDK_CC_55_OR_HIGHER = "";
$main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName);
$main::OO_SDK_JAVA_HOME = "";
@@ -420,39 +414,6 @@ while ( (!$main::correctVersion) &&
$main::OO_SDK_CPP_HOME = "";
}
}
- } else
- {
- # for Solaris we have to check the version too
- open(FILE, "$OO_SDK_CPP_HOME/$main::cppName -V 2>&1 |");
- my @lines = <FILE>;
- my $testVersion = $lines[0];
- if ( $testVersion eq "")
- {
- print " The '$main::cppName' command found at
$main::OO_SDK_CPP_HOME/$main::cppName is not a ";
- print " Solaris C++ compiler.\nSet the environment
variable OO_SDK_CPP_HOME to your Solaris C++ compiler directory.\n";
- } else
- {
- if ($testVersion =~ m#((\d+\.)+\d+)# )
- {
- $testVersion = $1;
- }
- $main::correctVersion = testVersion($main::cppVersion,
$testVersion, "$main::OO_SDK_CPP_HOME/$main::cppName", 1);
- if ( !$main::correctVersion )
- {
- print " The '$main::cppName' command found at
'$main::OO_SDK_CPP_HOME' has a wrong version\n";
- if ( skipChoice("C++ compiler") == 1 )
- {
- $main::correctVersion = 1;
- }
-
- $main::OO_SDK_CPP_HOME = "";
- } else {
- $main::correctVersion = testVersion("5.5",
$testVersion, "$main::OO_SDK_CPP_HOME/$main::cppName", 2);
- if ( $main::correctVersion ) {
- $main::OO_SDK_CC_55_OR_HIGHER = $testVersion;
- }
- }
- }
}
}
} else
@@ -857,7 +818,6 @@ sub prepareScriptFile()
$_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;
$_ =~ s#\@OO_SDK_SED_HOME\@#$main::OO_SDK_SED_HOME#go;
$_ =~ s#\@OO_SDK_CPP_HOME\@#$main::OO_SDK_CPP_HOME#go;
- $_ =~ s#\@OO_SDK_CC_55_OR_HIGHER\@#$main::OO_SDK_CC_55_OR_HIGHER#go;
$_ =~ s#\@OO_SDK_JAVA_HOME\@#$main::OO_SDK_JAVA_HOME#go;
$_ =~ s#\@SDK_AUTO_DEPLOYMENT\@#$main::SDK_AUTO_DEPLOYMENT#go;
$_ =~ s#\@OO_SDK_OUTPUT_DIR\@#$main::OO_SDK_OUTPUT_DIR#go;
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index bffab3d..3254f43 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -58,9 +58,6 @@ OO_SDK_SED_HOME=@OO_SDK_SED_HOME@
# Example: OO_SDK_CPP_HOME=/usr/bin
OO_SDK_CPP_HOME=@OO_SDK_CPP_HOME@
-# Solaris only
-OO_SDK_CC_55_OR_HIGHER=@OO_SDK_CC_55_OR_HIGHER@
-
# Directory of the Java SDK.
# Example: OO_SDK_JAVA_HOME=/usr/jdk/jdk1.6.0_10
OO_SDK_JAVA_HOME=@OO_SDK_JAVA_HOME@
@@ -155,8 +152,8 @@ case ${sdk_platform} in
directoryname=solintel
platform='Solaris x86'
fi
- comid=C52
- pltfrm=sunpro
+ comid=gcc3
+ pltfrm=gcc
soext=so
exampleout=SOLARISexample.out
LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
@@ -261,11 +258,6 @@ if [ -n "${OO_SDK_CPP_HOME}" ]
then
PATH=${OO_SDK_CPP_HOME}:${PATH}
export OO_SDK_CPP_HOME
-
- if [ -n "${OO_SDK_CC_55_OR_HIGHER}" ]
- then
- export OO_SDK_CC_55_OR_HIGHER
- fi
fi
# Add directory of the Java tools to the path, if necessary.
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 21d6ceb..0e2895a 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -154,7 +154,7 @@ endif
#
###########################################################################
ifneq (,$(findstring solaris,$(PLATFORM)))
-# Settings for Solaris using Sun Workshop compiler
+# Settings for Solaris using GCC
PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)$(shell
/usr/ccs/bin/elfdump -e "$(OO_SDK_URE_HOME)/lib/libuno_sal.so.3" |
/usr/xpg4/bin/grep -q -w ELFCLASS64 && echo 64)
@@ -177,9 +177,9 @@ endif
OS=SOLARIS
PS=/
ICL=\$$
-CC=CC
-LINK=CC
-LIB=CC
+CC=g++
+LINK=g++
+LIB=g++
ECHO=@echo
MKDIR=mkdir -p
CAT=cat
@@ -213,33 +213,26 @@ PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
EMPTYSTRING=
PATH_SEPARATOR=:
+# -O is necessary for inlining (see gcc documentation)
ifeq "$(DEBUG)" "yes"
OPT_FLAGS=-g
+else
+OPT_FLAGS=-O
endif
-#CC_FLAGS_JNI=-c -KPIC $(OPT_FLAGS)
-#CC_FLAGS=-c -KPIC -xldscope=hidden $(OPT_FLAGS)
CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS)
CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS)
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include"
-I"$(OO_SDK_JAVA_HOME)/include/solaris"
# define for used compiler necessary for UNO
-# -DCPPU_ENV=sunpro5 -- sunpro cc 5.x solaris sparc/intel
-#CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=sunpro5
CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=$(CPPU_ENV) -DGCC
-#CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=sunpro5
-DHAVE_GCC_VISIBILITY_FEATURE
CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=$(CPPU_ENV)
-DHAVE_GCC_VISIBILITY_FEATURE -DGCC
CC_OUTPUT_SWITCH=-o
LIBO_SDK_LDFLAGS_STDLIBS =
-#LIBRARY_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp '-R$$ORIGIN' -z text
-norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm
LIBRARY_LINK_FLAGS=-w -mt -z combreloc -fPIC -PIC -temp=/tmp '-R$$ORIGIN' -z
text -norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm
-# means if used CC is lower then version 5.5 use option -instance=static
-ifeq ($(OO_SDK_CC_55_OR_HIGHER),)
-LIBRARY_LINK_FLAGS+=-instances=static
-endif
COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
EXE_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -Bdirect -z defs
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
