Date: Sat, 11 Jan 2020 19:17:38 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522707 - in head/graphics/openexr: . files Message-ID: <202001111917.00BJHcPY056378@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sat Jan 11 19:17:37 2020 New Revision: 522707 URL: https://svnweb.freebsd.org/changeset/ports/522707 Log: Port ilmbase build fixes including WITH_DEBUG=yes builds. - under WITH_DEBUG=yes builds, avoid renaming the libraries with _d suffix. (else it breaks packaging, and we don't want separate lib names) [1] - while here, avoid creating symlinks from cmake, this causes staging violations due to cmake bug #17340, (poudriere testport) see https://gitlab.kitware.com/cmake/cmake/issues/17340 - while here, fix "make test" target - it is a left over from 2.3's gmake build. Use ctest instead. Removes TEST_TARGET. No PORTREVISION bump necessary because each and every fixed bug would cause a broken build and no install. PR: 243274 [1] Reported by: Marcin Cieslak [1] against graphics/ilmbase Added: head/graphics/openexr/files/patch-config_LibraryDefine.cmake (contents, props changed) head/graphics/openexr/files/patch-config_OpenEXRSetup.cmake (contents, props changed) Modified: head/graphics/openexr/Makefile Modified: head/graphics/openexr/Makefile ============================================================================== --- head/graphics/openexr/Makefile Sat Jan 11 19:09:58 2020 (r522706) +++ head/graphics/openexr/Makefile Sat Jan 11 19:17:37 2020 (r522707) @@ -17,7 +17,6 @@ LIB_DEPENDS= libImath-2_4.so.24:graphics/ilmbase USES= cmake compiler:c++14-lang libtool pathfix pkgconfig USE_LDCONFIG= yes -TEST_TARGET= check USE_GITHUB= yes GH_TUPLE= AcademySoftwareFoundation:openexr:v2.4.0 @@ -93,7 +92,7 @@ post-install-DOCS-on: post-install-DOCS-off: @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || : -regression-test check: +regression-test check test: cd ${BUILD_WRKSRC} && ctest -j ${MAKE_JOBS_NUMBER} .include <bsd.port.post.mk> Added: head/graphics/openexr/files/patch-config_LibraryDefine.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openexr/files/patch-config_LibraryDefine.cmake Sat Jan 11 19:17:37 2020 (r522707) @@ -0,0 +1,11 @@ +--- config/LibraryDefine.cmake.orig 2019-09-18 01:02:06 UTC ++++ config/LibraryDefine.cmake +@@ -94,8 +94,6 @@ function(OPENEXR_DEFINE_LIBRARY libname) + if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") + set(verlibname) + set(baselibname) + endif() Added: head/graphics/openexr/files/patch-config_OpenEXRSetup.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openexr/files/patch-config_OpenEXRSetup.cmake Sat Jan 11 19:17:37 2020 (r522707) @@ -0,0 +1,13 @@ +--- config/OpenEXRSetup.cmake.orig 2019-09-18 01:02:06 UTC ++++ config/OpenEXRSetup.cmake +@@ -42,10 +42,6 @@ set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destin + # but is pretty harmless to set globally + set(CMAKE_INCLUDE_CURRENT_DIR ON) + +-# Suffix for debug configuration libraries +-# (if you should choose to install those) +-set(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Suffix for debug builds") +- + # Usual cmake option to build shared libraries or not + option(BUILD_SHARED_LIBS "Build shared library" ON) + # This allows a "double library" setup, where we compile both
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001111917.00BJHcPY056378>