Attachment #211714 for bug #244189

Lines 3-10 Link Here

(-)graphics/openshadinglanguage/Makefile (-8 / +12 lines)
3		3
4	PORTNAME= openshadinglanguage	4	PORTNAME= openshadinglanguage
5	DISTVERSIONPREFIX= Release-	5	DISTVERSIONPREFIX= Release-
6	DISTVERSION= 1.10.7	6	DISTVERSION= 1.10.9
7	PORTREVISION= 2
8	CATEGORIES= graphics devel	7	CATEGORIES= graphics devel
9		8
10	MAINTAINER= FreeBSD@Shaneware.biz	9	MAINTAINER= FreeBSD@Shaneware.biz
Lines 14-20 Link Here
14		13
15	BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}	14	BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
16	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \	15	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
17	libtinfo.so:devel/ncurses \
18	libImath.so:graphics/ilmbase \	16	libImath.so:graphics/ilmbase \
19	libIlmImf.so:graphics/openexr \	17	libIlmImf.so:graphics/openexr \
20	libOpenImageIO.so:graphics/openimageio \	18	libOpenImageIO.so:graphics/openimageio \
Lines 28-39 Link Here
28	GH_ACCOUNT= imageworks	26	GH_ACCOUNT= imageworks
29	GH_PROJECT= OpenShadingLanguage	27	GH_PROJECT= OpenShadingLanguage
30		28
31	LLVM_VER= 80	29	# Use LLVM linker where available
		30	.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
		31	LDFLAGS+= -fuse-ld=lld
		32	.endif
		33
		34	LLVM_VER= 90
32	CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS	35	CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS
33	CMAKE_OFF= USE_BOOST_WAVE	36	CMAKE_OFF= USE_BOOST_WAVE
34	CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \	37	CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
35	-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \	38	-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
36	-DUSE_CPP:STRING=11	39	# This flag fixes linking with clang 9.0 ??
		40	CXXFLAGS+= -DNDEBUG
37		41
38	OPTIONS_DEFINE= OSLTOY	42	OPTIONS_DEFINE= OSLTOY
39	OPTIONS_SUB= yes	43	OPTIONS_SUB= yes
Lines 44-50 Link Here
44		48
45	CXXFLAGS+= -I${STAGEDIR}/include	49	CXXFLAGS+= -I${STAGEDIR}/include
46		50
47	PLIST_SUB+= LIBVERS=${PORTVERSION}	51	PLIST_SUB+= LIBVERS=${DISTVERSION}
48		52
49	post-patch:	53	post-patch:
50	@${REINPLACE_CMD} -e 's,bash,sh,' \	54	@${REINPLACE_CMD} -e 's,bash,sh,' \

Lines 1-3 Link Here

(-)graphics/openshadinglanguage/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1570088164	1	TIMESTAMP = 1581909751
2	SHA256 (imageworks-OpenShadingLanguage-Release-1.10.7_GH0.tar.gz) = 0c4cce505e2803baa55db11744adb72fad854c2a4cc4f02592f79324ac5bfda1	2	SHA256 (imageworks-OpenShadingLanguage-Release-1.10.9_GH0.tar.gz) = 3f061831e3541068ce080fa96fa682df3ee93aa2505bad00dc34522b11af20f9
3	SIZE (imageworks-OpenShadingLanguage-Release-1.10.7_GH0.tar.gz) = 13542717	3	SIZE (imageworks-OpenShadingLanguage-Release-1.10.9_GH0.tar.gz) = 13547288




--- src/cmake/modules/FindLLVM.cmake.orig	2018-03-28 12:34:16 UTC
+++ src/cmake/modules/FindLLVM.cmake
@@ -94,11 +94,12 @@ if ((LLVM_LIBRARY OR LLVM_LIBRARIES OR L
     # if static LLVM libraries were requested, use llvm-config to generate
     # the list of what libraries we need, and substitute that in the right
     # way for LLVM_LIBRARY.
-    execute_process (COMMAND ${LLVM_CONFIG} --libfiles
+    execute_process (COMMAND ${LLVM_CONFIG} --libfiles --link-static
                      OUTPUT_VARIABLE LLVM_LIBRARIES
                      OUTPUT_STRIP_TRAILING_WHITESPACE)
     string (REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES}")
     set (LLVM_LIBRARY "")
+    set(LLVM_SYSTEM_LIBRARIES "-lz -lexecinfo -lncurses")
   else ()
     set (LLVM_LIBRARIES "${LLVM_LIBRARY}")
   endif ()

Lines 42-49 Link Here

(-)graphics/openshadinglanguage/pkg-plist (-2 lines)
42	lib/libtestshade.so.1.10	42	lib/libtestshade.so.1.10
43	lib/libtestshade.so.%%LIBVERS%%	43	lib/libtestshade.so.%%LIBVERS%%
44	lib/osl.imageio.so	44	lib/osl.imageio.so
45	lib/osl.imageio.so.1.10
46	lib/osl.imageio.so.%%LIBVERS%%
47	%%DATADIR%%/shaders/MaterialX/mx_absval_color.osl	45	%%DATADIR%%/shaders/MaterialX/mx_absval_color.osl
48	%%DATADIR%%/shaders/MaterialX/mx_absval_color.oso	46	%%DATADIR%%/shaders/MaterialX/mx_absval_color.oso
49	%%DATADIR%%/shaders/MaterialX/mx_absval_color2.osl	47	%%DATADIR%%/shaders/MaterialX/mx_absval_color2.osl

Return to bug 244189

Lines 1-16 Link Here

(-)graphics/openshadinglanguage/files/patch-src_cmake_modules_FindLLVM.cmake (-16 lines)
1	--- src/cmake/modules/FindLLVM.cmake.orig 2018-03-28 12:34:16 UTC
2	+++ src/cmake/modules/FindLLVM.cmake
3	@@ -94,11 +94,12 @@ if ((LLVM_LIBRARY OR LLVM_LIBRARIES OR L
4	# if static LLVM libraries were requested, use llvm-config to generate
5	# the list of what libraries we need, and substitute that in the right
6	# way for LLVM_LIBRARY.
7	- execute_process (COMMAND ${LLVM_CONFIG} --libfiles
8	+ execute_process (COMMAND ${LLVM_CONFIG} --libfiles --link-static
9	OUTPUT_VARIABLE LLVM_LIBRARIES
10	OUTPUT_STRIP_TRAILING_WHITESPACE)
11	string (REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES}")
12	set (LLVM_LIBRARY "")
13	+ set(LLVM_SYSTEM_LIBRARIES "-lz -lexecinfo -lncurses")
14	else ()
15	set (LLVM_LIBRARIES "${LLVM_LIBRARY}")
16	endif ()