Fix[buildjdk,patches]: properly add static stdc++ compilation

Author: artdeell

buildjdk.sh

@@ -126,6 +126,7 @@ bash ./configure \
     --with-freetype-lib=$FREETYPE_DIR/lib \
     --with-toolchain-type=clang \
     --with-sysroot=$TOOLCHAIN/sysroot \
+    --with-stdc++lib=static \
     --with-freetype-include=$FREETYPE_DIR/include/freetype2 \
     $AUTOCONF_x11arg $AUTOCONF_EXTRA_ARGS \
     --x-libraries=/usr/lib \

patches/jdk8u_android.diff

@@ -1407,7 +1407,7 @@ index 0e29abe8f8..856d8c7d06 100644
 +# statically link libc++.so, work with gcc but ignored by g++
 +# STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
 +
-+STATIC_STDCXX = -Wl,-Bstatic -lsupc++ -Wl,-Bdynamic
++STATIC_STDCXX = -Wl,-Bstatic -static-libstdc++ -Wl,-Bdynamic
  # While the VM needs the above line, adlc needs a separate setting:
  ADLC_STATIC_STDCXX = -static-libstdc++
 
@@ -61060,3 +61060,29 @@ index fbfdedfd..98f4f7f2 100644
  	    Java_sun_tools_attach_LinuxVirtualMachine_sendQuitTo;
              Java_sun_tools_attach_LinuxVirtualMachine_sendQuitToChildrenOf;
  	    Java_sun_tools_attach_LinuxVirtualMachine_socket;
+diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
+index 6efae578..aad2302a 100644
+--- a/common/autoconf/libraries.m4
++++ b/common/autoconf/libraries.m4
+@@ -945,7 +945,7 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
+ 
+     # Test if stdc++ can be linked statically.
+     AC_MSG_CHECKING([if static link of stdc++ is possible])
+-    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic"
++    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -static-libstdc++ -Wl,-Bdynamic"
+     AC_LANG_PUSH(C++)
+     OLD_LIBS="$LIBS"
+     OLD_CXX="$CXX"
+diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
+index ad3f7f23..30be20f4 100644
+--- a/common/autoconf/generated-configure.sh
++++ b/common/autoconf/generated-configure.sh
+@@ -50143,7 +50153,7 @@ $as_echo "$has_dynamic_libstdcxx" >&6; }
+     # Test if stdc++ can be linked statically.
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if static link of stdc++ is possible" >&5
+ $as_echo_n "checking if static link of stdc++ is possible... " >&6; }
+-    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic"
++    STATIC_STDCXX_FLAGS="-Wl,-Bstatic -static-libstdc++ -Wl,-Bdynamic"
+     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'