[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50864] trunk/lib/darwin-9.x.universal/osl : strip out accidently space in patchname
jens verwiebe
info at jensverwiebe.de
Mon Sep 24 22:11:47 CEST 2012
Revision: 50864
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50864
Author: jensverwiebe
Date: 2012-09-24 20:11:44 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
strip out accidently space in patchname
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/osl/full_static_compile.patch
Removed Paths:
-------------
trunk/lib/darwin-9.x.universal/osl/full_static_compile .patch
Deleted: trunk/lib/darwin-9.x.universal/osl/full_static_compile .patch
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/full_static_compile .patch 2012-09-24 19:53:33 UTC (rev 50863)
+++ trunk/lib/darwin-9.x.universal/osl/full_static_compile .patch 2012-09-24 20:11:44 UTC (rev 50864)
@@ -1,356 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1d64bb5..09ba529 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -9,6 +9,60 @@ set (OSL_LIBRARY_VERSION_PATCH 0)
- set (OSO_FILE_VERSION_MAJOR 1)
- set (OSO_FILE_VERSION_MINOR 0)
-
-+set(OPENIMAGEIOHOME "${CMAKE_SOURCE_DIR}/../../openimageio")
-+set(ILMBASE_HOME "${CMAKE_SOURCE_DIR}/../../openexr")
-+set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/../../boost")
-+set(OPENEXR_HOME "${CMAKE_SOURCE_DIR}/../../openexr")
-+set(LLVM_DIRECTORY "${CMAKE_SOURCE_DIR}/../../llvm")
-+set(TBB_INCLUDES "${CMAKE_SOURCE_DIR}/../../openimageio/oiio/src/include")
-+set(LLVM_STATIC YES)
-+set(OSL_STATIC_LIBS YES)
-+set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../osl" CACHE PATH "" FORCE)
-+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE)
-+set(CMAKE_OSX_ARCHITECTURES "x86_64; i386" CACHE STRING "" FORCE)
-+
-+
-+if(OSL_STATIC_LIBS)
-+ message (STATUS "BUILD STATIC = ${OSL_STATIC_LIBS}")
-+endif()
-+
-+# extern libs that could not be linked to static oiio
-+add_library(imp_oiio STATIC IMPORTED)
-+set_property(TARGET imp_oiio PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openimageio/lib/libopenimageio.a)
-+
-+add_library(imp_boost_system STATIC IMPORTED)
-+set_property(TARGET imp_boost_system PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../boost/lib/libboost_system-mt.a)
-+
-+add_library(imp_tiff STATIC IMPORTED)
-+set_property(TARGET imp_tiff PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../tiff/lib/libtiff.a)
-+
-+add_library(imp_png STATIC IMPORTED)
-+set_property(TARGET imp_png PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../png/lib/libpng12.a)
-+
-+add_library(imp_jpeg STATIC IMPORTED)
-+set_property(TARGET imp_jpeg PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../jpeg/lib/libjpeg.a)
-+
-+add_library(imp_half STATIC IMPORTED)
-+set_property(TARGET imp_half PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openexr/lib/libHalf.a )
-+
-+add_library(imp_iex STATIC IMPORTED)
-+set_property(TARGET imp_iex PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openexr/lib/libIex.a )
-+
-+add_library(imp_imf STATIC IMPORTED)
-+set_property(TARGET imp_imf PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openexr/lib/libIlmImf.a )
-+
-+add_library(imp_thread STATIC IMPORTED)
-+set_property(TARGET imp_thread PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openexr/lib/libIlmThread.a )
-+
-+add_library(imp_math STATIC IMPORTED)
-+set_property(TARGET imp_math PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openexr/lib/libImath.a )
-+
-+add_library(imp_z STATIC IMPORTED)
-+set_property(TARGET imp_z PROPERTY IMPORTED_LOCATION /usr/lib/libz.1.dylib )
-+
-+set(OIIO_STATIC_EXTRALIBS imp_boost_system imp_tiff imp_png imp_jpeg imp_half imp_iex imp_imf imp_thread imp_math imp_z)
-+set(OPENIMAGEIO_LIBRARY -force_load imp_oiio ${OIIO_STATIC_EXTRALIBS})
-+
-
- cmake_minimum_required (VERSION 2.6)
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.4)
-diff --git a/src/liboslcomp/CMakeLists.txt b/src/liboslcomp/CMakeLists.txt
-index 31cb829..28dd8ec 100644
---- a/src/liboslcomp/CMakeLists.txt
-+++ b/src/liboslcomp/CMakeLists.txt
-@@ -5,13 +5,21 @@ FILE ( GLOB compiler_headers "*.h" )
-
- FLEX_BISON ( osllex.l oslgram.y osl liboslcomp_srcs compiler_headers )
-
--ADD_LIBRARY ( oslcomp SHARED ${liboslcomp_srcs} )
--TARGET_LINK_LIBRARIES ( oslcomp ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} )
--LINK_ILMBASE ( oslcomp )
--
-+if(OSL_STATIC_LIBS)
-+ ADD_LIBRARY ( oslcomp STATIC ${liboslcomp_srcs} )
-+ TARGET_LINK_LIBRARIES ( oslcomp ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+ LINK_ILMBASE ( oslcomp )
-+ INSTALL ( TARGETS oslcomp LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-+else()
-+ ADD_LIBRARY ( oslcomp SHARED ${liboslcomp_srcs} )
-+ TARGET_LINK_LIBRARIES ( oslcomp ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+ LINK_ILMBASE ( oslcomp )
-+ SET_TARGET_PROPERTIES(oslcomp PROPERTIES INSTALL_NAME_DIR @loader_path/../lib)
-+ INSTALL ( TARGETS oslcomp LIBRARY DESTINATION lib)
-+endif()
- IF ( USE_BOOST_WAVE )
- ADD_DEFINITIONS ( -DUSE_BOOST_WAVE )
- ENDIF ()
-
--INSTALL ( TARGETS oslcomp LIBRARY DESTINATION lib )
-+
-
-diff --git a/src/liboslcomp/oslgram.y b/src/liboslcomp/oslgram.y
-index 396138f..cc00f6d 100644
---- a/src/liboslcomp/oslgram.y
-+++ b/src/liboslcomp/oslgram.y
-@@ -60,7 +60,7 @@ using namespace OSL::pvt;
- // Forward declaration
- OSL_NAMESPACE_ENTER
- namespace pvt {
--TypeDesc lextype (int lex);
-+TypeDesc osllextype (int lex);
- };
- OSL_NAMESPACE_EXIT
-
-@@ -260,14 +260,14 @@ metadatum
- : simple_typename IDENTIFIER initializer
- {
- ASTvariable_declaration *var;
-- var = new ASTvariable_declaration (oslcompiler, lextype($1),
-+ var = new ASTvariable_declaration (oslcompiler, osllextype($1),
- ustring ($2), $3, false,
- true /* ismeta */);
- $$ = var;
- }
- | simple_typename IDENTIFIER arrayspec initializer_list
- {
-- TypeDesc simple = lextype ($1);
-+ TypeDesc simple = osllextype ($1);
- simple.arraylen = $3;
- if (simple.arraylen < 1)
- oslcompiler->error (oslcompiler->filename(),
-@@ -548,12 +548,12 @@ arrayspec
- typespec
- : simple_typename
- {
-- oslcompiler->current_typespec (TypeSpec (lextype ($1)));
-+ oslcompiler->current_typespec (TypeSpec (osllextype ($1)));
- $$ = 0;
- }
- | CLOSURE simple_typename
- {
-- oslcompiler->current_typespec (TypeSpec (lextype ($2), true));
-+ oslcompiler->current_typespec (TypeSpec (osllextype ($2), true));
- $$ = 0;
- }
- | IDENTIFIER /* struct name */
-@@ -858,7 +858,7 @@ type_constructor
- : simple_typename '(' expression_list ')'
- {
- $$ = new ASTtype_constructor (oslcompiler,
-- TypeSpec (lextype ($1)), $3);
-+ TypeSpec (osllextype ($1)), $3);
- }
- ;
-
-@@ -923,7 +923,7 @@ typecast_expression
- : '(' simple_typename ')' expression
- {
- $$ = new ASTtypecast_expression (oslcompiler,
-- TypeSpec (lextype ($2)),
-+ TypeSpec (osllextype ($2)),
- $4);
- }
- ;
-@@ -951,7 +951,7 @@ yyerror (const char *err)
-
- // Convert from the lexer's symbolic type (COLORTYPE, etc.) to a TypeDesc.
- inline TypeDesc
--OSL::pvt::lextype (int lex)
-+OSL::pvt::osllextype (int lex)
- {
- switch (lex) {
- case COLORTYPE : return TypeDesc::TypeColor;
-diff --git a/src/liboslcomp/symtab.h b/src/liboslcomp/symtab.h
-index ffebb8a..8bf2c46 100644
---- a/src/liboslcomp/symtab.h
-+++ b/src/liboslcomp/symtab.h
-@@ -32,6 +32,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <vector>
- #include <stack>
-
-+#ifdef IF
-+#undef IF
-+#endif /* IF */
-+
- #include <boost/unordered_map.hpp>
-
- #include "OpenImageIO/typedesc.h"
-diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
-index 1f7ea18..0869dde 100644
---- a/src/liboslexec/CMakeLists.txt
-+++ b/src/liboslexec/CMakeLists.txt
-@@ -95,7 +95,19 @@ else ()
- ADD_DEFINITIONS (-DOSL_LLVM_NO_BITCODE)
- SET (liboslexec_srcs ${liboslexec_srcs} llvm_ops.cpp)
- endif ()
-+if(OSL_STATIC_LIBS)
-+ADD_LIBRARY ( oslexec STATIC ${liboslexec_srcs} )
-+TARGET_LINK_LIBRARIES ( oslexec
-+ ${VISIBILITY_COMMAND} ${VISIBILITY_MAP_COMMAND}
-+ -force-load ${OPENIMAGEIO_LIBRARY}
-+ ${Boost_LIBRARIES} ${CMAKE_DL_LIBS}
-+ ${LLVM_LIBRARY} ${EXTRA_OSLEXEC_LIBRARIES})
-+ADD_DEPENDENCIES (oslexec ${CMAKE_CURRENT_SOURCE_DIR}/liboslcexec.map)
-+LINK_ILMBASE ( oslexec )
-
-+INSTALL ( TARGETS oslexec LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-+add_definitions(-DBUILD_STATIC=1)
-+else()
- ADD_LIBRARY ( oslexec SHARED ${liboslexec_srcs} )
- TARGET_LINK_LIBRARIES ( oslexec
- ${VISIBILITY_COMMAND} ${VISIBILITY_MAP_COMMAND}
-@@ -104,17 +116,18 @@ TARGET_LINK_LIBRARIES ( oslexec
- ${LLVM_LIBRARY} ${EXTRA_OSLEXEC_LIBRARIES})
- ADD_DEPENDENCIES (oslexec ${CMAKE_CURRENT_SOURCE_DIR}/liboslcexec.map)
- LINK_ILMBASE ( oslexec )
-+SET_TARGET_PROPERTIES(oslexec PROPERTIES INSTALL_NAME_DIR @loader_path/../lib)
-
- INSTALL ( TARGETS oslexec LIBRARY DESTINATION lib )
--
-+endif()
-
-
- # Unit tests
--add_executable (closure_test closure_test.cpp)
--add_executable (accum_test accum_test.cpp)
--target_link_libraries ( closure_test oslexec ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--target_link_libraries ( accum_test oslexec ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
--link_ilmbase (closure_test)
--link_ilmbase (accum_test)
--add_test (unit_closure ${CMAKE_BINARY_DIR}/liboslexec/closure_test)
--add_test (unit_accum ${CMAKE_BINARY_DIR}/liboslexec/accum_test)
-+#add_executable (closure_test closure_test.cpp)
-+#add_executable (accum_test accum_test.cpp)
-+#target_link_libraries ( closure_test oslexec ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#target_link_libraries ( accum_test oslexec ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
-+#link_ilmbase (closure_test)
-+#link_ilmbase (accum_test)
-+#add_test (unit_closure ${CMAKE_BINARY_DIR}/liboslexec/closure_test)
-+#add_test (unit_accum ${CMAKE_BINARY_DIR}/liboslexec/accum_test)
-diff --git a/src/liboslexec/llvm_instance.cpp b/src/liboslexec/llvm_instance.cpp
-index ea220c3..dd70c7e 100644
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list