View | Details | Raw Unified | Return to bug 233888 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +6 lines)
Lines 11-17 Link Here
11
11
12
LICENSE=	BSD3CLAUSE
12
LICENSE=	BSD3CLAUSE
13
13
14
USES=		alias cmake:outsource compiler:c++11-lang pkgconfig shebangfix
14
USES=		alias cmake:outsource compiler:c++11-lang localbase:ldflags pkgconfig \
15
		shebangfix
15
16
16
USE_GITHUB=	yes
17
USE_GITHUB=	yes
17
GH_ACCOUNT=	imageworks
18
GH_ACCOUNT=	imageworks
Lines 19-25 Link Here
19
20
20
CMAKE_ON=	USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML
21
CMAKE_ON=	USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML
21
CMAKE_OFF=	OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC
22
CMAKE_OFF=	OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC
22
LDFLAGS+=	-L${LOCALBASE}/lib
23
# pyglue gives an error on use of register
23
# pyglue gives an error on use of register
24
# this should only be an error using c++17
24
# this should only be an error using c++17
25
CXXFLAGS+=	-Wno-deprecated-register
25
CXXFLAGS+=	-Wno-deprecated-register
Lines 80-85 Link Here
80
EXTRA_PATCHES=	${PATCHDIR}/libs
80
EXTRA_PATCHES=	${PATCHDIR}/libs
81
.endif
81
.endif
82
82
83
.if exists(/usr/lib/libstdc++.so)
84
CXXFLAGS+=	-Wno-unused-function
85
.endif
86
83
post-patch:
87
post-patch:
84
	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
88
	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
85
		${WRKSRC}/CMakeLists.txt
89
		${WRKSRC}/CMakeLists.txt

Return to bug 233888