Tue Jun 7 17:54:59 2016 UTC ()
Repeat after me: -Wl,--enable-new-dtags considered harmful. Bump
revision.


(joerg)
diff -r1.4 -r1.5 pkgsrc/devel/extra-cmake-modules/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/extra-cmake-modules/distinfo
diff -r0 -r1.1 pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake
cvs diff -r1.4 -r1.5 pkgsrc/devel/extra-cmake-modules/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/Makefile 2016/04/26 09:20:41 1.4
+++ pkgsrc/devel/extra-cmake-modules/Makefile 2016/06/07 17:54:59 1.5
@@ -1,28 +1,30 @@ @@ -1,28 +1,30 @@
1# $NetBSD: Makefile,v 1.4 2016/04/26 09:20:41 markd Exp $ 1# $NetBSD: Makefile,v 1.5 2016/06/07 17:54:59 joerg Exp $
2 2
3DISTNAME= extra-cmake-modules-5.21.0 3DISTNAME= extra-cmake-modules-5.21.0
 4PKGREVISION= 2
4CATEGORIES= devel kde 5CATEGORIES= devel kde
5MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/5.21/} 6MASTER_SITES= ${MASTER_SITE_KDE:=frameworks/5.21/}
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
9HOMEPAGE= https://community.kde.org/Frameworks 10HOMEPAGE= https://community.kde.org/Frameworks
10COMMENT= Extra modules and scripts for CMake 11COMMENT= Extra modules and scripts for CMake
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13#BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2:../../textproc/py-sphinx 14#BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2:../../textproc/py-sphinx
14 15
15USE_CMAKE= yes 16USE_CMAKE= yes
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
17CMAKE_ARG_PATH= .. 18CMAKE_ARG_PATH= ..
18CONFIGURE_DIRS= _KDE_build 19CONFIGURE_DIRS= _KDE_build
19 20
20CMAKE_ARGS+= -DBUILD_TESTING=OFF 21CMAKE_ARGS+= -DBUILD_TESTING=OFF
21CMAKE_ARGS+= -DBUILD_HTML_DOCS=OFF 22CMAKE_ARGS+= -DBUILD_HTML_DOCS=OFF
22CMAKE_ARGS+= -DBUILD_MAN_DOCS=OFF 23CMAKE_ARGS+= -DBUILD_MAN_DOCS=OFF
23 24
24pre-configure: 25pre-configure:
25 ${MKDIR} ${WRKSRC}/_KDE_build 26 ${MKDIR} ${WRKSRC}/_KDE_build
 27 ${FIND} ${WRKSRC} -name \*.orig -exec rm {} \;
26 28
27#.include "../../lang/python/pyversion.mk" 29#.include "../../lang/python/pyversion.mk"
28.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/extra-cmake-modules/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/extra-cmake-modules/distinfo 2016/04/26 09:20:41 1.3
+++ pkgsrc/devel/extra-cmake-modules/distinfo 2016/06/07 17:54:59 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.3 2016/04/26 09:20:41 markd Exp $ 1$NetBSD: distinfo,v 1.4 2016/06/07 17:54:59 joerg Exp $
2 2
3SHA1 (extra-cmake-modules-5.21.0.tar.xz) = a8f2752452c00f5ff4e71efe83cab74a2e72637a 3SHA1 (extra-cmake-modules-5.21.0.tar.xz) = a8f2752452c00f5ff4e71efe83cab74a2e72637a
4RMD160 (extra-cmake-modules-5.21.0.tar.xz) = a5edc9a90db743bb9f4fe5d8351bd06b5d2d5717 4RMD160 (extra-cmake-modules-5.21.0.tar.xz) = a5edc9a90db743bb9f4fe5d8351bd06b5d2d5717
5SHA512 (extra-cmake-modules-5.21.0.tar.xz) = d0309f16d567acd3a8838509b06e84e909b7f6895922e5670c5bc5752ba15fb89800592badd6bc6ff60678444bc2bcb2ce1d70fa89943e0595228d4dc215f753 5SHA512 (extra-cmake-modules-5.21.0.tar.xz) = d0309f16d567acd3a8838509b06e84e909b7f6895922e5670c5bc5752ba15fb89800592badd6bc6ff60678444bc2bcb2ce1d70fa89943e0595228d4dc215f753
6Size (extra-cmake-modules-5.21.0.tar.xz) = 285024 bytes 6Size (extra-cmake-modules-5.21.0.tar.xz) = 285024 bytes
 7SHA1 (patch-kde-modules_KDECompilerSettings.cmake) = 18ece25450c12a63c05b4604f27e9f90d71163a9
File Added: pkgsrc/devel/extra-cmake-modules/patches/patch-kde-modules_KDECompilerSettings.cmake
$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?