[Libreoffice-commits] .: Branch 'feature/mork' - 2 commits - config_host.mk.in configure.in mysqlcppconn/mysql_config.pmk solenv/gbuild solenv/inc

[Fridrich Strba]

 config_host.mk.in             |    1 -
 configure.in                  |    7 ++-----
 mysqlcppconn/mysql_config.pmk |    6 ------
 solenv/gbuild/JavaClassSet.mk |    3 ++-
 solenv/inc/settings.mk        |    2 --
 5 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit 992fa41939d6c68395f8702c6ceaa8dc0925d729
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 20 14:17:54 2012 +0200

    fdo#52275: Revert "mysqlcppconn: work around weird gcc issue"
    
    This reverts commit d3d533c9e45b6badf202a12f0ed266d0168aa636.
    
    Hard-coding -std=c++xy in one module is a bad idea.
    
    None of these gccs give any spurious error in gnu++11 mode now:
    gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2)
    gcc (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5)

diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk
index 9c9c76a..eb316e0 100644
--- a/mysqlcppconn/mysql_config.pmk
+++ b/mysqlcppconn/mysql_config.pmk
@@ -47,9 +47,3 @@ CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
 
 CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
 
-# workaround for gcc bug (4.6.1 20110908):
-# it complains about std::basic string operator= overloading ambiguity
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-std=c++98
-.ENDIF # "$(COM)"=="GCC"
-
commit 1e04b79f706d49694ab9851f83a0ecc36c3dd8e7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jul 20 14:11:53 2012 +0200

    Support for --with-java-target-version in gbuild
    
    ...had been missing.  Old dmake-based build system did not add -source/-target
    when using gcj (unless gcj really was Eclipse Java Compiler, in which case those
    -source/-target values were tunneled in via JAVAFLAGS)---hopefully all this is
    no longer necessary.
    
    (Also removed a single use of JAVA_TARGET_FLAG that was nowhere defined.)
    
    Change-Id: Ic3596691b622be45e151333981f8f236d11825b4

diff --git a/config_host.mk.in b/config_host.mk.in
index 1f78bf6..5e24730 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -238,7 +238,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
 export INTRO_BIPMAP=@INTRO_BITMAP@
-export JAVAFLAGS=@JAVAFLAGS@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
 export JAVACISGCJ=@JAVACISGCJ@
diff --git a/configure.in b/configure.in
index 081c6f0..b41fa09 100644
--- a/configure.in
+++ b/configure.in
@@ -1623,8 +1623,8 @@ AC_ARG_WITH(java,
 AC_ARG_WITH(java_target_version,
     AS_HELP_STRING([--with-java-target-version],
         [Generate class files that will work on JVMs with the specified version.
-         For example, use --with-java-target-version=1.4 to make sure that the
-         application will work with JVM 1.4 even when compiled with JDK 1.5.])
+         For example, use --with-java-target-version=1.5 to make sure that the
+         application will work with JVM 1.5 even when compiled with JDK 1.6.])
     [
                           This option is ignored when you compile with gcj/gij.
 
@@ -5336,8 +5336,6 @@ if test "$SOLAR_JAVA" != ""; then
         AC_MSG_CHECKING([re-checking JDK])
         JDK=gcj
         AC_MSG_RESULT([checked (ecj)])
-        #TODO: what's to do here? some switch to do 1.5 compiling?
-        JAVAFLAGS="-source 1.5 -target 1.5"
         _gij_longver="40200"
     fi
 fi
@@ -5823,7 +5821,6 @@ AC_SUBST(CLASSPATH)
 AC_SUBST(JAVALIB)
 AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVADOC)
-AC_SUBST(JAVAFLAGS)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVAIFLAGS)
 AC_SUBST(JAVA_HOME)
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 2338f32..7198331 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -26,7 +26,8 @@
 #
 #*************************************************************************
 
-gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS)
+gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) \
+    -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
 gb_JavaClassSet_JAVACDEBUG :=
 
 # Enforces correct dependency order for possibly generated stuff:
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 9d01c5e..36234fc 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -133,8 +133,6 @@ JAVARESPONSE=
 .ENDIF
 .ENDIF
 
-JAVAFLAGS+=$(JAVA_TARGET_FLAG)
-
 #END JAVA
 
 CDEFS=