[pkgsrc/trunk]: pkgsrc/devel/extra-cmake-modules Repeat after me: -Wl, --enabl...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac066ca52420
branches:  trunk
changeset: 348127:ac066ca52420
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jun 07 17:54:59 2016 +0000

description:
Repeat after me: -Wl,--enable-new-dtags considered harmful. Bump
revision.

diffstat:

 devel/extra-cmake-modules/Makefile                                            |   4 +-
 devel/extra-cmake-modules/distinfo                                            |   3 +-
 devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake |  24 ++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r d56050c53ca0 -r ac066ca52420 devel/extra-cmake-modules/Makefile
--- a/devel/extra-cmake-modules/Makefile        Tue Jun 07 13:15:46 2016 +0000
+++ b/devel/extra-cmake-modules/Makefile        Tue Jun 07 17:54:59 2016 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/04/26 09:20:41 markd Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/07 17:54:59 joerg Exp $
 
 DISTNAME=      extra-cmake-modules-5.21.0
+PKGREVISION=   2
 CATEGORIES=    devel kde
 MASTER_SITES=  ${MASTER_SITE_KDE:=frameworks/5.21/}
 EXTRACT_SUFX=  .tar.xz
@@ -23,6 +24,7 @@
 
 pre-configure:
        ${MKDIR} ${WRKSRC}/_KDE_build
+       ${FIND} ${WRKSRC} -name \*.orig -exec rm {} \;
 
 #.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d56050c53ca0 -r ac066ca52420 devel/extra-cmake-modules/distinfo
--- a/devel/extra-cmake-modules/distinfo        Tue Jun 07 13:15:46 2016 +0000
+++ b/devel/extra-cmake-modules/distinfo        Tue Jun 07 17:54:59 2016 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2016/04/26 09:20:41 markd Exp $
+$NetBSD: distinfo,v 1.4 2016/06/07 17:54:59 joerg Exp $
 
 SHA1 (extra-cmake-modules-5.21.0.tar.xz) = a8f2752452c00f5ff4e71efe83cab74a2e72637a
 RMD160 (extra-cmake-modules-5.21.0.tar.xz) = a5edc9a90db743bb9f4fe5d8351bd06b5d2d5717
 SHA512 (extra-cmake-modules-5.21.0.tar.xz) = d0309f16d567acd3a8838509b06e84e909b7f6895922e5670c5bc5752ba15fb89800592badd6bc6ff60678444bc2bcb2ce1d70fa89943e0595228d4dc215f753
 Size (extra-cmake-modules-5.21.0.tar.xz) = 285024 bytes
+SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = 18ece25450c12a63c05b4604f27e9f90d71163a9
diff -r d56050c53ca0 -r ac066ca52420 devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake     Tue Jun 07 17:54:59 2016 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-kde-modules_KDECompilerSettings.cmake,v 1.1 2016/06/07 17:54:59 joerg Exp $
+
+Do not hard-code --enable-new-dtags. It is completely broken on systems like
+NetBSD implementing the sane rpath semantic and just have a new enough binutils
+version. It is up to the system compiler to know what the correct platfor
+choice is.
+
+--- kde-modules/KDECompilerSettings.cmake.orig 2016-06-05 23:16:56.900586724 +0000
++++ kde-modules/KDECompilerSettings.cmake
+@@ -208,14 +208,6 @@ if (POLICY CMP0063)
+     cmake_policy(SET CMP0063 NEW)
+ endif()
+ 
+-if (UNIX AND NOT APPLE)
+-    # Enable adding DT_RUNPATH, which means that LD_LIBRARY_PATH takes precedence
+-    # over the built-in rPath
+-    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}")
+-    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}")
+-    set(CMAKE_EXE_LINKER_FLAGS    "-Wl,--enable-new-dtags ${CMAKE_EXE_LINKER_FLAGS}")
+-endif()
+-
+ if (CMAKE_SYSTEM_NAME STREQUAL GNU)
+     # Enable multithreading with the pthread library
+     # FIXME: Is this actually necessary to have here?