Fri Aug 14 08:00:57 2020 UTC ()
Extend gcc version range for -no-pie, since gcc 10 is here.


(hauke)
diff -r1.8 -r1.9 pkgsrc/editors/xemacs/hacks.mk
diff -r1.4 -r1.5 pkgsrc/editors/xemacs-current/hacks.mk
cvs diff -r1.8 -r1.9 pkgsrc/editors/xemacs/hacks.mk (expand / switch to unified diff)

--- pkgsrc/editors/xemacs/hacks.mk 2020/06/24 16:10:31 1.8
+++ pkgsrc/editors/xemacs/hacks.mk 2020/08/14 08:00:57 1.9
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: hacks.mk,v 1.8 2020/06/24 16:10:31 hauke Exp $ 1# $NetBSD: hacks.mk,v 1.9 2020/08/14 08:00:57 hauke Exp $
2 2
3.if !defined(XEMACS_HACKS_MK) 3.if !defined(XEMACS_HACKS_MK)
4XEMACS_HACKS_MK= defined 4XEMACS_HACKS_MK= defined
5 5
6.include "../../mk/compiler.mk" 6.include "../../mk/compiler.mk"
7 7
8### Position-independent code does not rhyme well with dumped emacsen. 8### Position-independent code does not rhyme well with dumped emacsen.
9### 9###
10.if !empty(CC_VERSION:Mgcc-[6789].*) 10.if !empty(CC_VERSION:Mgcc-[6789].*) || !empty(CC_VERSION:Mgcc-[1-9][0-9].*)
11PKG_HACKS+= disable-gcc-pie 11PKG_HACKS+= disable-gcc-pie
12CFLAGS+= -no-pie 12CFLAGS+= -no-pie
13.endif 13.endif
14 14
15.if !empty(CC_VERSION:Mclang-*) 15.if !empty(CC_VERSION:Mclang-*)
16PKG_HACKS+= disable-clang-pie 16PKG_HACKS+= disable-clang-pie
17CFLAGS+= -fno-pie 17CFLAGS+= -fno-pie
18.endif 18.endif
19 19
20.endif # XEMACS_HACKS_MK 20.endif # XEMACS_HACKS_MK
cvs diff -r1.4 -r1.5 pkgsrc/editors/xemacs-current/hacks.mk (expand / switch to unified diff)

--- pkgsrc/editors/xemacs-current/hacks.mk 2020/06/24 16:10:31 1.4
+++ pkgsrc/editors/xemacs-current/hacks.mk 2020/08/14 08:00:57 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: hacks.mk,v 1.4 2020/06/24 16:10:31 hauke Exp $ 1# $NetBSD: hacks.mk,v 1.5 2020/08/14 08:00:57 hauke Exp $
2 2
3.if !defined(XEMACS_CURRENT_HACKS_MK) 3.if !defined(XEMACS_CURRENT_HACKS_MK)
4XEMACS_CURRENT_HACKS_MK= defined 4XEMACS_CURRENT_HACKS_MK= defined
5 5
6.include "../../mk/compiler.mk" 6.include "../../mk/compiler.mk"
7 7
8### Position-independent code does not rhyme well with dumped emacsen. 8### Position-independent code does not rhyme well with dumped emacsen.
9### 9###
10.if !empty(CC_VERSION:Mgcc-[6789].*) 10.if !empty(CC_VERSION:Mgcc-[6789].*) || !empty(CC_VERSION:Mgcc-[1-9][0-9].*)
11PKG_HACKS+= disable-gcc-pie 11PKG_HACKS+= disable-gcc-pie
12CFLAGS+= -no-pie 12CFLAGS+= -no-pie
13.endif 13.endif
14 14
15.if !empty(CC_VERSION:Mclang-*) 15.if !empty(CC_VERSION:Mclang-*)
16PKG_HACKS+= disable-clang-pie 16PKG_HACKS+= disable-clang-pie
17CFLAGS+= -fno-pie 17CFLAGS+= -fno-pie
18.endif 18.endif
19 19
20.endif # XEMACS_CURRENT_HACKS_MK 20.endif # XEMACS_CURRENT_HACKS_MK