build luajit with -Wl,-E to avoid problems when dlopen()ing hit by tedu.

tracked down by jturner, I tweaked his diff to use more of upstream's
original src/Makefile. ok jasper@ jturner@ abieber@
This commit is contained in:
sthen 2014-02-10 17:31:46 +00:00
parent 50fe0435ce
commit f68fdeb92c
2 changed files with 11 additions and 19 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2013/11/01 12:21:04 jasper Exp $
# $OpenBSD: Makefile,v 1.11 2014/02/10 17:31:46 sthen Exp $
ONLY_FOR_ARCHS = powerpc i386 amd64
# arm needs EABI/aapcs
@ -9,6 +9,7 @@ SHARED_LIBS += luajit-${MODLUA_VERSION} 0.0 # 2.0.0
COMMENT = just-in-time compiler for Lua
V = 2.0.2
REVISION = 0
DISTNAME = LuaJIT-${V}
PKGNAME = ${DISTNAME:L}

View File

@ -1,27 +1,18 @@
$OpenBSD: patch-src_Makefile,v 1.2 2013/10/05 15:51:08 abieber Exp $
--- src/Makefile.orig Mon Jun 3 13:00:00 2013
+++ src/Makefile Sat Oct 5 09:33:07 2013
@@ -304,6 +304,11 @@ ifeq (iOS,$(TARGET_SYS))
$OpenBSD: patch-src_Makefile,v 1.3 2014/02/10 17:31:46 sthen Exp $
--- src/Makefile.orig Mon Jun 3 20:00:00 2013
+++ src/Makefile Mon Feb 10 17:12:11 2014
@@ -304,6 +304,10 @@ ifeq (iOS,$(TARGET_SYS))
TARGET_DYNXLDOPTS=
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
else
+ifeq (OpenBSD,$(TARGET_SYS))
+ TARGET_XSHLDFLAGS= -shared -fPIC
+ TARGET_XCFLAGS+= -fno-stack-protector
+ TARGET_STRIP= @:
+else
+ ifeq (OpenBSD,$(TARGET_SYS))
+ TARGET_XSHLDFLAGS= -shared -fPIC
+ TARGET_STRIP= @:
+ endif
ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs)))
TARGET_XCFLAGS+= -fno-stack-protector
endif
@@ -321,6 +326,7 @@ else
endif
endif
endif
+endif
ifneq ($(HOST_SYS),$(TARGET_SYS))
ifeq (Windows,$(TARGET_SYS))
@@ -550,10 +556,10 @@ endif
@@ -550,10 +554,10 @@ endif
endif
endif