applied_patches/0067-buildfix-x86-64-visibility-workaround.diff

   1 --- configure.in.old    2009-04-06 16:41:41.000000000 +0000
   2 +++ configure.in        2009-04-06 16:41:41.000000000 +0000
   3 @@ -2442,6 +2442,7 @@ fi
   4  dnl ===================================================================
   5  dnl system stl sanity tests
   6  dnl ===================================================================
   7 +HAVE_GCC_VISIBILITY_BROKEN=
   8  if test "$USE_SYSTEM_STL" = "YES"; then
   9     AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
  10     AC_LANG_PUSH([C++])
  11 @@ -2481,9 +2482,9 @@ using namespace std;
  12        gccvisok=no)
  13        AC_MSG_RESULT([$gccvisok])
  14        if test "$gccvisok" = "no"; then
  15 -         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility])
  16 -         echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn
  17 -         unset HAVE_GCC_VISIBILITY_FEATURE
  18 +         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe, disabling that.])
  19 +         echo "Your gcc is not -fvisibility-inlines-hidden safe, disabling that." >> warn
  20 +         HAVE_GCC_VISIBILITY_BROKEN="TRUE"
  21        fi
  22
  23        LDFLAGS=$sharedlink_ldflags_save
  24 @@ -2523,6 +2524,7 @@ _ACEOF
  25  fi
  26
  27  AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
  28 +AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
  29
  30  dnl ===================================================================
  31  dnl allocator
  32 --- set_soenv.in.old    2009-04-06 16:41:41.000000000 +0000
  33 +++ set_soenv.in        2009-04-06 16:41:41.000000000 +0000
  34 @@ -1874,6 +1874,8 @@ ToFile( "JAVAHOME",          $JAVAHOME,
  35  ToFile( "CC",                $CC,                "e" );
  36  ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
  37                 "@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
  38 +ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
  39 +               "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
  40  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
  41  ToFile( "CXX",               $CXX,               "e" );
  42  ToFile( "MINGWCXX",          "@MINGWCXX@",       "e" );
  43 Index: unxlng.mk
  44 ===================================================================
  45 --- solenv/inc/unxlng.mk        (Revision 276754)
  46 +++ solenv/inc/unxlng.mk        (Arbeitskopie)
  47 @@ -92,7 +92,7 @@
  48
  49  # -fpermissive should be removed as soon as possible
  50  CFLAGSCXX= -pipe $(ARCH_FLAGS)
  51 -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
  52 +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE"
  53  CFLAGSCXX += -fvisibility-inlines-hidden
  54  .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
  55