svn commit: r522706 - in head/graphics/ilmbase: . files

[Matthias Andree]

Author: mandree
Date: Sat Jan 11 19:09:58 2020
New Revision: 522706
URL: https://svnweb.freebsd.org/changeset/ports/522706

Log:
  Minor build fixes, includes WITH_DEBUG 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.
  
  No PORTREVISION bump necessary because each and every fixed bug would
  cause a broken build and no install.
  
  PR:		243274 [1]
  Reported by:	Marcin Cieślak [1]

Added:
  head/graphics/ilmbase/files/patch-config_CMakeLists.txt
     - copied unchanged from r522705, head/graphics/ilmbase/files/patch-CMakeLists.txt
  head/graphics/ilmbase/files/patch-config_IlmBaseSetup.cmake   (contents, props changed)
  head/graphics/ilmbase/files/patch-config_LibraryDefine.cmake   (contents, props changed)
Deleted:
  head/graphics/ilmbase/files/patch-CMakeLists.txt
Modified:
  head/graphics/ilmbase/Makefile

Modified: head/graphics/ilmbase/Makefile
==============================================================================
--- head/graphics/ilmbase/Makefile	Sat Jan 11 19:08:38 2020	(r522705)
+++ head/graphics/ilmbase/Makefile	Sat Jan 11 19:09:58 2020	(r522706)
@@ -22,11 +22,6 @@ USE_GITHUB=	yes
 GH_TUPLE=	AcademySoftwareFoundation:openexr:v2.4.0
 WRKSRC_SUBDIR=	IlmBase
 
-# libtool links C++ libraries with -nostdlib, which prevents -pthread from
-# having an effect (at least with clang). Make sure we also pass -lpthread so
-# we do link against libthr.so.
-TEST_TARGET=	check
-
 PORTDOCS=	README.md
 OPTIONS_DEFINE=		DOCS LARGE_STACK
 LARGE_STACK_DESC=	Enable sys-dependent large stack optimizations
@@ -46,7 +41,7 @@ PLIST_SUB+=	VER=${VER}
 
 HALF_BIN=	eLut toFloat
 
-regression-test regression check::
+test regression-test regression check::
 	cd ${BUILD_WRKSRC} && ctest
 
 post-install:

Copied: head/graphics/ilmbase/files/patch-config_CMakeLists.txt (from r522705, head/graphics/ilmbase/files/patch-CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-config_CMakeLists.txt	Sat Jan 11 19:09:58 2020	(r522706, copy of r522705, head/graphics/ilmbase/files/patch-CMakeLists.txt)
@@ -0,0 +1,24 @@
+From fe2fccde18bc35db11895718d0b77d3f23d427b5 Mon Sep 17 00:00:00 2001
+From: Kimball Thurston <kdt3rd at gmail.com>
+Date: Tue, 5 Nov 2019 21:42:45 +1300
+Subject: [PATCH] Fix #595 and others, issue with pkgconfig generation under
+ cmake
+
+autoconf seems to automatically insert the ${prefix} variable reference
+when emitting the pkg-config file. Make cmake rules conform to that
+pattern.
+--- config/CMakeLists.txt.orig	2019-09-18 01:02:06 UTC
++++ config/CMakeLists.txt
+@@ -71,9 +71,9 @@ if(ILMBASE_INSTALL_PKG_CONFIG)
+   # use a helper function to avoid variable pollution, but pretty simple
+   function(ilmbase_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+-    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(exec_prefix "\${prefix}")
++    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
++    set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+     set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions

Added: head/graphics/ilmbase/files/patch-config_IlmBaseSetup.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-config_IlmBaseSetup.cmake	Sat Jan 11 19:09:58 2020	(r522706)
@@ -0,0 +1,13 @@
+--- config/IlmBaseSetup.cmake.orig	2019-09-18 01:02:06 UTC
++++ config/IlmBaseSetup.cmake
+@@ -48,10 +48,6 @@ set(ILMBASE_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

Added: head/graphics/ilmbase/files/patch-config_LibraryDefine.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ilmbase/files/patch-config_LibraryDefine.cmake	Sat Jan 11 19:09:58 2020	(r522706)
@@ -0,0 +1,11 @@
+--- config/LibraryDefine.cmake.orig	2019-09-18 01:02:06 UTC
++++ config/LibraryDefine.cmake
+@@ -100,8 +100,6 @@ function(ILMBASE_DEFINE_LIBRARY libname)
+   if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL ""))
+     set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_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()