CVS commit: pkgsrc/editors

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Aug 14 08:00:57 UTC 2020

Modified Files:
        pkgsrc/editors/xemacs: hacks.mk
        pkgsrc/editors/xemacs-current: hacks.mk

Log Message:
Extend gcc version range for -no-pie, since gcc 10 is here.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/xemacs/hacks.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/xemacs-current/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xemacs/hacks.mk
diff -u pkgsrc/editors/xemacs/hacks.mk:1.8 pkgsrc/editors/xemacs/hacks.mk:1.9
--- pkgsrc/editors/xemacs/hacks.mk:1.8  Wed Jun 24 16:10:31 2020
+++ pkgsrc/editors/xemacs/hacks.mk      Fri Aug 14 08:00:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.8 2020/06/24 16:10:31 hauke Exp $
+# $NetBSD: hacks.mk,v 1.9 2020/08/14 08:00:57 hauke Exp $
 
 .if !defined(XEMACS_HACKS_MK)
 XEMACS_HACKS_MK=       defined
@@ -7,7 +7,7 @@ XEMACS_HACKS_MK=        defined
 
 ### Position-independent code does not rhyme well with dumped emacsen.
 ###
-.if !empty(CC_VERSION:Mgcc-[6789].*)
+.if !empty(CC_VERSION:Mgcc-[6789].*) || !empty(CC_VERSION:Mgcc-[1-9][0-9].*)
 PKG_HACKS+=            disable-gcc-pie
 CFLAGS+=               -no-pie
 .endif

Index: pkgsrc/editors/xemacs-current/hacks.mk
diff -u pkgsrc/editors/xemacs-current/hacks.mk:1.4 pkgsrc/editors/xemacs-current/hacks.mk:1.5
--- pkgsrc/editors/xemacs-current/hacks.mk:1.4  Wed Jun 24 16:10:31 2020
+++ pkgsrc/editors/xemacs-current/hacks.mk      Fri Aug 14 08:00:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2020/06/24 16:10:31 hauke Exp $
+# $NetBSD: hacks.mk,v 1.5 2020/08/14 08:00:57 hauke Exp $
 
 .if !defined(XEMACS_CURRENT_HACKS_MK)
 XEMACS_CURRENT_HACKS_MK=       defined
@@ -7,7 +7,7 @@ XEMACS_CURRENT_HACKS_MK=        defined
 
 ### Position-independent code does not rhyme well with dumped emacsen.
 ###
-.if !empty(CC_VERSION:Mgcc-[6789].*)
+.if !empty(CC_VERSION:Mgcc-[6789].*) || !empty(CC_VERSION:Mgcc-[1-9][0-9].*)
 PKG_HACKS+=            disable-gcc-pie
 CFLAGS+=               -no-pie
 .endif