Prepare emacs for PIE. emacs2* currently use gmalloc, which is incompatible
with PIE. We should be using the system malloc anyway for security reasons. Unfortunately, there are yet more problems with PIE in emacs proper, so disable it for now until a solution is found. ok naddy@ sthen@ (on a previous version)
This commit is contained in:
pascal
parent
e1e0321344
commit
8fa00e5163
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.59 2012/06/21 13:56:57 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.60 2012/08/11 22:55:39 pascal Exp $
|
||||
|
||||
COMMENT-main= GNU editor: extensible, customizable, self documenting
|
||||
COMMENT-el= elisp sources for those who want to read/modify them
|
||||
@ -11,16 +11,14 @@ FULLPKGNAME-el= emacs-el-${VERSION}
|
||||
FULLPKGPATH-el= editors/emacs21,-el
|
||||
FULLPKGNAME-leim= emacs-leim-${VERSION}
|
||||
FULLPKGPATH-leim= editors/emacs21,-leim
|
||||
REVISION-main= 18
|
||||
REVISION-el= 5
|
||||
REVISION-leim= 5
|
||||
REVISION-main= 19
|
||||
REVISION-el= 6
|
||||
REVISION-leim= 6
|
||||
|
||||
CATEGORIES= editors
|
||||
|
||||
HOMEPAGE= http://www.gnu.org/software/emacs/
|
||||
|
||||
MAINTAINER= Rich Cannings <cannings@openbsd.org>
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
@ -41,11 +39,12 @@ GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
||||
MODGNU_EMACS_YOURE_WEIRD = Oh yes
|
||||
|
||||
CONFIGURE_STYLE= gnu dest
|
||||
CONFIGURE_ARGS= ${GCCARCH} --with-pop
|
||||
CONFIGURE_ARGS= ${GCCARCH} --with-pop --with-system-malloc
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
|
||||
-I${LOCALBASE}/include/libpng" \
|
||||
LDFLAGS="${ELF_TOOLCHAIN:L:S/yes/-Z/:S/no//} \
|
||||
-L${LOCALBASE}/lib"
|
||||
-L${LOCALBASE}/lib -fno-pie"
|
||||
CFLAGS += -fno-pie
|
||||
|
||||
MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRIPT}"
|
||||
|
||||
@ -68,4 +67,6 @@ RUN_DEPENDS-main=
|
||||
|
||||
PKG_ARCH-el= *
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.27 2012/06/21 13:56:57 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.28 2012/08/11 22:55:39 pascal Exp $
|
||||
|
||||
COMMENT-main= GNU editor: extensible, customizable, self-documenting
|
||||
COMMENT-el= elisp sources for those who want to read/modify them
|
||||
@ -8,7 +8,7 @@ DISTNAME= emacs-${VERSION}
|
||||
PKGNAME-main= emacs-${VERSION}
|
||||
FULLPKGNAME-el= emacs-el-${VERSION}
|
||||
FULLPKGPATH-el= editors/emacs22,-el
|
||||
REVISION-main= 13
|
||||
REVISION-main= 14
|
||||
REVISION-el= 4
|
||||
|
||||
CATEGORIES= editors
|
||||
@ -37,11 +37,12 @@ GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
||||
|
||||
AUTOCONF_VERSION= 2.61
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ARGS= ${GCCARCH} --with-pop
|
||||
CONFIGURE_ARGS= ${GCCARCH} --with-pop --with-system-malloc
|
||||
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
|
||||
-I${LOCALBASE}/include/libpng" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
LDFLAGS="-L${LOCALBASE}/lib -fno-pie"
|
||||
CFLAGS += -fno-pie
|
||||
|
||||
MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRIPT}" \
|
||||
LOGNAME="${SHAREOWN}"
|
||||
@ -83,6 +84,8 @@ WANTLIB-main+= jpeg png tiff ungif
|
||||
RUN_DEPENDS-el= emacs-${VERSION}:${PKGPATH}
|
||||
PKG_ARCH-el= *
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64"
|
||||
post-extract:
|
||||
touch ${WRKSRC}/leim/quail/tsang-b5.el
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2012/06/21 13:56:57 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2012/08/11 22:55:39 pascal Exp $
|
||||
|
||||
COMMENT-main = GNU editor: extensible, customizable, self-documenting
|
||||
COMMENT-el = elisp sources for those who want to read/modify them
|
||||
@ -10,7 +10,7 @@ PKGNAME-main = emacs-${VERSION}
|
||||
FULLPKGNAME-el = emacs-el-${VERSION}
|
||||
FULLPKGPATH-el = editors/emacs23,-el
|
||||
|
||||
REVISION = 1
|
||||
REVISION = 2
|
||||
|
||||
CATEGORIES = editors
|
||||
|
||||
@ -35,11 +35,12 @@ GCCARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
||||
|
||||
AUTOCONF_VERSION = 2.67
|
||||
CONFIGURE_STYLE = autoconf
|
||||
CONFIGURE_ARGS = ${GCCARCH}
|
||||
CONFIGURE_ARGS = ${GCCARCH} --with-system-malloc
|
||||
|
||||
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include \
|
||||
-I${LOCALBASE}/include/libpng" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
LDFLAGS="-L${LOCALBASE}/lib -fno-pie"
|
||||
CFLAGS += -fno-pie
|
||||
|
||||
MAKE_ENV = INSTALL_EMACS="${INSTALL_SCRIPT}" \
|
||||
LOGNAME="${SHAREOWN}"
|
||||
@ -84,6 +85,8 @@ WANTLIB-main += GL ICE SM X11 Xdmcp Xext Xft Xpm Xrender \
|
||||
RUN_DEPENDS-el = emacs-${VERSION}:${PKGPATH}
|
||||
PKG_ARCH-el = *
|
||||
|
||||
NO_REGRESS = Yes
|
||||
|
||||
post-install:
|
||||
chmod -t ${PREFIX}/bin/emacs
|
||||
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.24 2012/06/21 13:56:57 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.25 2012/08/11 22:55:39 pascal Exp $
|
||||
|
||||
BRANCH= 21.4
|
||||
VERSION= 22
|
||||
@ -6,6 +6,8 @@ REVISION = 6
|
||||
|
||||
WANTLIB= c m ncurses util
|
||||
|
||||
CFLAGS += -fno-pie
|
||||
#CONFIGURE_ENV = LDFLAGS="-fno-pie"
|
||||
CONFIGURE_ARGS+=--infodir='$${DESTDIR}${PREFIX}/info/${DISTNAME}' \
|
||||
--infopath='${LOCALBASE}/info/${DISTNAME}:${LOCALBASE}/info:/usr/share/info' \
|
||||
--site-prefixes='${LOCALBASE}:/usr' \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user