pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/libreoffice Fix build on NetBSD-current with PaX ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2241360d9596
branches:  trunk
changeset: 348154:2241360d9596
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 08 14:38:21 2016 +0000

description:
Fix build on NetBSD-current with PaX MPROTECT on.
Mark main binary with paxctl.
Bump PKGREVISION.

diffstat:

 misc/libreoffice/Makefile |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 8bd80168b609 -r 2241360d9596 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Wed Jun 08 14:17:29 2016 +0000
+++ b/misc/libreoffice/Makefile Wed Jun 08 14:38:21 2016 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.81 2016/05/22 18:20:47 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2016/06/08 14:38:21 wiz Exp $
 
 VERREL=                5.1.3
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -20,6 +20,11 @@
 BUILDLINK_TRANSFORM+=  opt:-O2:-O
 .endif
 
+.if !empty(MACHINE_PLATFORM:MNetBSD*)
+pre-build:
+       cd ${WRKSRC} && ${BUILD_MAKE_CMD} Executable_gengal && paxctl +m instdir/program/gengal.bin
+.endif
+
 GCC_REQD+=     4.6
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
@@ -27,6 +32,8 @@
 # configure will be regenerated.
 CHECK_PORTABILITY_SKIP=configure
 
+NOT_PAX_MPROTECT_SAFE+=        ${PKGNAME_NOREV}/lib/libreoffice/program/soffice.bin
+
 DIST_SUBDIR=   libreoffice
 
 LO_BOOTSTRAP=  ${DISTNAME}



Home | Main Index | Thread Index | Old Index