ooo-build r11883 - in trunk: . patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Wed Mar 12 14:04:13 2008
New Revision: 11883
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11883&view=rev

Log:
2008-03-12  Jan Holesovsky  <kendy suse cz>
        
        * patches/src680/buildfix-x86-64-visibility-workaround.diff,
          patches/src680/apply: Disable just -fvisibility-inlines-hidden (in
          case it is broken), not the entire visibility.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Mar 12 14:04:13 2008
@@ -316,8 +316,9 @@
 [ CWSBackports ]
 cws-ia64port01.diff, i#84999
 cws-s390port01.diff, i#86425
-# not for upstreaming: hack to work even on gcc's with broken -fvisibility-inlines-hidden
-#buildfix-x86-64-visibility-workaround.diff
+# not for upstreaming: don't disable the entire visibility, just
+# the -fvisibility-inlines-hidden
+buildfix-x86-64-visibility-workaround.diff
 
 # fix build with neon 0.28
 cws-cmcfixes42-ucb.diff, i#86123

Modified: trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff
==============================================================================
--- trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff	(original)
+++ trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff	Wed Mar 12 14:04:13 2008
@@ -10,18 +10,25 @@
  if test "$USE_SYSTEM_STL" = "YES"; then
     AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
     AC_LANG_PUSH([C++])
-@@ -2405,13 +2406,14 @@ using namespace std;
- 
+@@ -2405,18 +2406,19 @@ using namespace std;
+       gccvisok=no)
        AC_MSG_RESULT([$gccvisok])
        if test "$gccvisok" = "no"; then
--         AC_MSG_ERROR([Your gcc is not -fvisibility-inlines-hidden safe. Try with --with-stlport])
+-         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility])
+-         echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn
+-         unset HAVE_GCC_VISIBILITY_FEATURE
++         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe, disabling that.])
++         echo "Your gcc is not -fvisibility-inlines-hidden safe, disabling that." >> warn
 +         HAVE_GCC_VISIBILITY_BROKEN="TRUE"
        fi
  
+       LDFLAGS=$sharedlink_ldflags_save
     fi
  
     AC_LANG_POP([C++])
  fi
+
+ AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
 +AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
  
  dnl ===================================================================