diff options
| author | hauke <hauke@pkgsrc.org> | 2018-02-14 12:51:58 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2018-02-14 12:51:58 +0000 |
| commit | 24f06570a026f520a2b56ee5d99c5d1cea0df2c9 (patch) | |
| tree | 43328a7f4392ea6b02830f9c6cec01f4f95f1983 /editors | |
| parent | 9a880d578ff8f7893a8f06ed29fbdcf85ba32588 (diff) | |
| download | pkgsrc-24f06570a026f520a2b56ee5d99c5d1cea0df2c9.tar.gz | |
GC hacks.mk -- switching to system malloc has taken care of the issue.
Unbreak package by including options.mk, which keeps configure from
looking fro X11.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/xemacs-nox11/Makefile | 7 | ||||
| -rw-r--r-- | editors/xemacs-nox11/hacks.mk | 17 |
2 files changed, 5 insertions, 19 deletions
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile index 8fb4a0339be..2be7d597207 100644 --- a/editors/xemacs-nox11/Makefile +++ b/editors/xemacs-nox11/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.26 2018/02/01 14:25:30 hauke Exp $ +# $NetBSD: Makefile,v 1.27 2018/02/14 12:51:58 hauke Exp $ PKGNAME= ${DISTNAME:S/-/-nox11-/} -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= XEmacs text editor version 21 (no x11 support) # Version information in ../../editors/xemacs/Makefile.common +.include "../../editors/xemacs/options.mk" + .include "../../editors/xemacs/Makefile.common" + .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs-nox11/hacks.mk b/editors/xemacs-nox11/hacks.mk deleted file mode 100644 index 7ff97e072fa..00000000000 --- a/editors/xemacs-nox11/hacks.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2016/12/30 23:37:40 wiz Exp $ - -.if !defined(XEMACS_HACKS_MK) -XEMACS_HACKS_MK= defined - -.include "../../mk/compiler.mk" - -### [Fri Oct 28 10:00:00 UTC 2016 : hauke] -### gcc 5 builtins collide with src/gmalloc.c's calloc(), which -### results in 'xemacs -vanilla' busy-looping during the build. -### -.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-5.[0-9]*) -PKG_HACKS+= gcc5-malloc-builtin-conflict -CFLAGS+= -fno-builtin -.endif - -.endif # XEMACS_HACKS_MK |