From 64f0b9a7f8d96e170049990372f445d471b826ac Mon Sep 17 00:00:00 2001
From: "Boroondas Gupte (original patches by Aimee Linden)"
<hg@boroon.dasgupta.ch>
Date: Tue, 31 Aug 2010 13:48:30 +0200
Subject: [PATCH] SNOW-748 FIXED Building on OSX 10.6 fails with "warning:
-mdynamic-no-pic overrides - fpic or -fPIC"
Originally commited at http://svn.secondlife.com/trac/linden/changeset/3499/projects/2010/snowglobe and http://svn.secondlife.com/trac/linden/changeset/3501
SVN changeset 3499 partially applied with --ignore-whitespace:
Hunk #1 FAILED at 259.
Hunk #2 FAILED at 265.
2 out of 2 hunks FAILED -- saving rejects to file
indra/llcommon/CMakeLists.txt.rej
patching file indra/media_plugins/webkit/CMakeLists.txt
Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines).
patching file indra/media_plugins/base/CMakeLists.txt
patching file indra/media_plugins/gstreamer010/CMakeLists.txt
patching file indra/media_plugins/example/CMakeLists.txt
patching file indra/llplugin/CMakeLists.txt
Manually applied to indra/llcommon/CMakeLists.txt (straight forward).
SVN changeset 3501 applied with fuzz 1:
patching file indra/media_plugins/webkit/CMakeLists.txt
Hunk #1 succeeded at 33 with fuzz 1 (offset -8 lines).
Hunk #2 succeeded at 39 with fuzz 1 (offset -8 lines).
No further changes other than that.
---
indra/llcommon/CMakeLists.txt | 4 ++--
indra/llplugin/CMakeLists.txt | 14 +++++++-------
indra/media_plugins/base/CMakeLists.txt | 4 ++--
indra/media_plugins/example/CMakeLists.txt | 4 ++--
indra/media_plugins/gstreamer010/CMakeLists.txt | 4 ++--
indra/media_plugins/webkit/CMakeLists.txt | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index feb6d507994..20a6c8d7094 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -250,13 +250,13 @@ list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
if(LLCOMMON_LINK_SHARED)
add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
- if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+ if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)
- endif(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+ endif(NOT WORD_SIZE EQUAL 32)
ll_stage_sharedlib(llcommon)
else(LLCOMMON_LINK_SHARED)
add_library (llcommon ${llcommon_SOURCE_FILES})
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index d9b623d5c02..51cb0d78b45 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -48,13 +48,13 @@ set(llplugin_HEADER_FILES
set_source_files_properties(${llplugin_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
-if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
- if(WINDOWS)
- add_definitions(/FIXED:NO)
- else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
- add_definitions(-fPIC)
- endif(WINDOWS)
-endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+if(NOT WORD_SIZE EQUAL 32)
+ if(WINDOWS)
+ add_definitions(/FIXED:NO)
+ else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
+ add_definitions(-fPIC)
+ endif(WINDOWS)
+endif(NOT WORD_SIZE EQUAL 32)
list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index 16fd0241398..3ad94b0c647 100644
--- a/indra/media_plugins/base/CMakeLists.txt
+++ b/indra/media_plugins/base/CMakeLists.txt
@@ -25,13 +25,13 @@ include_directories(
### media_plugin_base
-if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)
-endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+endif(NOT WORD_SIZE EQUAL 32)
set(media_plugin_base_SOURCE_FILES
media_plugin_base.cpp
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt
index 7e4cdb0dafe..56cefde4bd0 100644
--- a/indra/media_plugins/example/CMakeLists.txt
+++ b/indra/media_plugins/example/CMakeLists.txt
@@ -29,13 +29,13 @@ include_directories(
### media_plugin_example
-if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)
-endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+endif(NOT WORD_SIZE EQUAL 32)
set(media_plugin_example_SOURCE_FILES
media_plugin_example.cpp
diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
index d6d697ba812..ba66166c552 100644
--- a/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -30,13 +30,13 @@ include_directories(
### media_plugin_gstreamer010
-if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)
-endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+endif(NOT WORD_SIZE EQUAL 32)
set(media_plugin_gstreamer010_SOURCE_FILES
media_plugin_gstreamer010.cpp
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index 2073ee00deb..673e059c348 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -29,13 +29,13 @@ include_directories(
### media_plugin_webkit
-if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS)
add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC)
endif(WINDOWS)
-endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
+endif(NOT WORD_SIZE EQUAL 32)
set(media_plugin_webkit_SOURCE_FILES
media_plugin_webkit.cpp
--
GitLab