d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mxe/src/luajit-1-fixes.patch

35 lines
1.3 KiB
Diff
Raw Permalink Normal View History

Copyright headers: point to LICENSE.md and shorten The following script was applied: sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE') sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \ $(git grep -l 'part of MXE.*See index.html') before='This file is part of MXE. See index.html for further information.' after='This file is part of MXE. See LICENSE.md for licensing information.' sed "s/$before/$after/" -i $(git grep -l 'part of MXE') Then git grep 'index.html for further information' revealed two other files. One of them was patched manually (patch.mk). Makefile has text "See index.html for further information" unrelated to licensing. See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-22 20:52:34 +01:00
This file is part of MXE. See LICENSE.md for licensing information.
luajit: detect if host cc accepts -malign-double (fix for clang)
2014-10-05 14:32:09 +01:00
Contains ad hoc patches for cross building.
various packages: refresh patches brings patches into common format to reduce noise in diffs
2017-11-18 08:44:18 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
luajit: detect if host cc accepts -malign-double (fix for clang)
2014-10-05 14:32:09 +01:00
Date: Mon, 6 Oct 2014 00:15:00 +1100
various packages: run `make refresh-patches` with numbering
2017-11-18 13:44:43 +00:00
Subject: [PATCH 1/1] detect if host cc accepts -malign-double
luajit: detect if host cc accepts -malign-double (fix for clang)
2014-10-05 14:32:09 +01:00
This patch has been taken from:
Secure URLs Mostly in patch headers, example code and few patch lines and regular docs. Also update/follow some non-secure URLs.
2019-05-03 18:17:52 +01:00
https://web.archive.org/web/20160730055513/www.freelists.org/post/luajit/detect-if-host-cc-accepts-maligndouble
luajit: detect if host cc accepts -malign-double (fix for clang)
2014-10-05 14:32:09 +01:00
diff --git a/src/Makefile b/src/Makefile
various packages: refresh patches brings patches into common format to reduce noise in diffs
2017-11-18 08:44:18 +00:00
index 1111111..2222222 100644
luajit: detect if host cc accepts -malign-double (fix for clang)
2014-10-05 14:32:09 +01:00
--- a/src/Makefile
+++ b/src/Makefile
various packages: refresh patches brings patches into common format to reduce noise in diffs
2017-11-18 08:44:18 +00:00
@@ -169,6 +169,7 @@ CCOPTIONS= $(CCDEBUG) $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS)
luajit: detect if host cc accepts -malign-double (fix for clang)
2014-10-05 14:32:09 +01:00
LDOPTIONS= $(CCDEBUG) $(LDFLAGS)
HOST_CC= $(CC)
+HOST_CC_MALIGN_DOUBLE= $(shell $(HOST_CC) -malign-double -v > /dev/null 2>&1 && echo -malign-double)
HOST_RM= rm -f
# If left blank, minilua is built and used. You can supply an installed
# copy of (plain) Lua 5.1 or 5.2, plus Lua BitOp. E.g. with: HOST_LUA=lua
various packages: refresh patches brings patches into common format to reduce noise in diffs
2017-11-18 08:44:18 +00:00
@@ -331,7 +332,7 @@ endif
luajit: detect if host cc accepts -malign-double (fix for clang)
2014-10-05 14:32:09 +01:00
ifneq ($(HOST_SYS),$(TARGET_SYS))
ifeq (Windows,$(TARGET_SYS))
- HOST_XCFLAGS+= -malign-double -DLUAJIT_OS=LUAJIT_OS_WINDOWS
+ HOST_XCFLAGS+= $(HOST_CC_MALIGN_DOUBLE) -DLUAJIT_OS=LUAJIT_OS_WINDOWS
else
ifeq (Linux,$(TARGET_SYS))
HOST_XCFLAGS+= -DLUAJIT_OS=LUAJIT_OS_LINUX