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

Collapse All | Expand All

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

Return to bug 233888