From owner-svn-ports-head@freebsd.org  Sat Jul  7 16:15:31 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E7E81030A19;
 Sat,  7 Jul 2018 16:15:31 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 958C77F26A;
 Sat,  7 Jul 2018 16:15:30 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75C3D19AF3;
 Sat,  7 Jul 2018 16:15:30 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w67GFUp8015475;
 Sat, 7 Jul 2018 16:15:30 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w67GFUco015474;
 Sat, 7 Jul 2018 16:15:30 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201807071615.w67GFUco015474@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Sat, 7 Jul 2018 16:15:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r474105 - head/multimedia/kodi-devel/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: head/multimedia/kodi-devel/files
X-SVN-Commit-Revision: 474105
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jul 2018 16:15:31 -0000

Author: tobik
Date: Sat Jul  7 16:15:30 2018
New Revision: 474105
URL: https://svnweb.freebsd.org/changeset/ports/474105

Log:
  multimedia/kodi-devel: Unbreak when objdump is missing
  
  Use readelf to find library sonames instead which are used to fill in the
  blanks in xbmc/DllPaths_generated.h.in.

Added:
  head/multimedia/kodi-devel/files/patch-cmake_scripts_freebsd_Macros.cmake   (contents, props changed)

Added: head/multimedia/kodi-devel/files/patch-cmake_scripts_freebsd_Macros.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi-devel/files/patch-cmake_scripts_freebsd_Macros.cmake	Sat Jul  7 16:15:30 2018	(r474105)
@@ -0,0 +1,25 @@
+objdump might not be available everywhere; use readelf instead.
+
+find_soname() is used to fill in the blanks in xbmc/DllPaths_generated.h.in
+
+--- cmake/scripts/freebsd/Macros.cmake.orig	2018-06-30 06:25:00 UTC
++++ cmake/scripts/freebsd/Macros.cmake
+@@ -78,15 +78,11 @@ function(find_soname lib)
+     string(REGEX MATCH ".*lib${liblow}.so" ${lib}_FILENAME ${_TMP_FILENAME})
+   endif()
+   if(${lib}_FILENAME)
+-    execute_process(COMMAND ${CMAKE_OBJDUMP} -p ${${lib}_FILENAME}
+-                    COMMAND grep SONAME.*${liblow}
++    execute_process(COMMAND readelf -d ${${lib}_FILENAME}
++                    COMMAND awk "$2 == \"SONAME\" { printf \"%s\", substr($NF, 2, length($NF) - 2) }"
+                     ERROR_QUIET
+                     OUTPUT_VARIABLE ${lib}_SONAME)
+-    string(REPLACE "SONAME " "" ${lib}_SONAME ${${lib}_SONAME})
+-    string(STRIP ${${lib}_SONAME} ${lib}_SONAME)
+-    if(VERBOSE)
+-      message(STATUS "${lib} soname: ${${lib}_SONAME}")
+-    endif()
++    message(STATUS "${lib} soname: ${${lib}_SONAME}")
+     set(${lib}_SONAME ${${lib}_SONAME} PARENT_SCOPE)
+   endif()
+   if(arg_REQUIRED AND NOT ${lib}_SONAME)