[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Tor Lillqvist]

 patches/dev300/buildfix-x86-64-visibility-workaround.diff |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 12b74f9650bc18fd49a42fa0fe25f2f06b10fe70
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Nov 18 19:41:28 2010 +0200

    Make buildfix-x86-64-visibility-workaround.diff apply again
    
    Stuff has moved from unxlng.mk to unxgcc.mk

diff --git a/patches/dev300/buildfix-x86-64-visibility-workaround.diff b/patches/dev300/buildfix-x86-64-visibility-workaround.diff
index 3694ad0..5706f22 100644
--- a/patches/dev300/buildfix-x86-64-visibility-workaround.diff
+++ b/patches/dev300/buildfix-x86-64-visibility-workaround.diff
@@ -50,10 +50,8 @@ index 4d83375..1c67478 100644
  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
  ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
  		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
-diff --git solenv/inc/unxlng.mk solenv/inc/unxlng.mk
-index 62a96f9..d1b6e19 100644
---- solenv/inc/unxlng.mk
-+++ solenv/inc/unxlng.mk
+--- solenv/inc/unxgcc.mk
++++ solenv/inc/unxgcc.mk
 @@ -88,7 +88,7 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
  
  # -fpermissive should be removed as soon as possible
@@ -63,6 +61,4 @@ index 62a96f9..d1b6e19 100644
  CFLAGSCXX += -fvisibility-inlines-hidden
  .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
  
--- 
-1.7.0.1