From 16b1fb6f579845c00ddc1157988e37a01987e60c Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 19 Feb 2015 12:12:35 +0000 Subject: libs/luajit: Build fix for PPC OS X git-svn-id: svn://tug.org/texlive/trunk@36323 c570f23f-e606-0410-a88d-b1316a301751 --- .../libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog | 5 +++++ .../LuaJIT-2.0.3-PATCHES/patch-06-ppc-darwin | 24 ++++++++++++++++++++++ .../libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c | 2 +- .../source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h | 2 +- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-06-ppc-darwin (limited to 'Build/source/libs/luajit') diff --git a/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog b/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog index 0fa9944f9df..30aa570e493 100644 --- a/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog +++ b/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2015-01-19 Peter Breitenlohner + + * patch-06-ppc-darwin (new): Build fix for PPC OS X. + From http://permalink.gmane.org/gmane.comp.lang.lua.luajit/5936. + 2014-06-01 Peter Breitenlohner * patch-05-LuaJITTeX (lj_str_new): Replace '6' by LUAI_HASHLIMIT diff --git a/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-06-ppc-darwin b/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-06-ppc-darwin new file mode 100644 index 00000000000..7ab68cfa137 --- /dev/null +++ b/Build/source/libs/luajit/LuaJIT-2.0.3-PATCHES/patch-06-ppc-darwin @@ -0,0 +1,24 @@ +diff -ur -x lbitlib.c LuaJIT-2.0.3.orig/src/host/buildvm.c LuaJIT-2.0.3/src/host/buildvm.c +--- LuaJIT-2.0.3.orig/src/host/buildvm.c 2014-03-12 13:10:00.000000000 +0100 ++++ LuaJIT-2.0.3/src/host/buildvm.c 2015-02-19 13:01:47.000000000 +0100 +@@ -113,7 +113,7 @@ + name[0] = '@'; + else + *p = '\0'; +-#elif (LJ_TARGET_PPC || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE ++#elif ((LJ_TARGET_PPC && !LJ_TARGET_OSX) || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE + /* Keep @plt. */ + #else + *p = '\0'; +diff -ur -x lbitlib.c LuaJIT-2.0.3.orig/src/lj_arch.h LuaJIT-2.0.3/src/lj_arch.h +--- LuaJIT-2.0.3.orig/src/lj_arch.h 2014-03-12 13:10:00.000000000 +0100 ++++ LuaJIT-2.0.3/src/lj_arch.h 2015-02-19 13:04:58.000000000 +0100 +@@ -293,7 +293,7 @@ + #if __GNUC__ < 4 + #error "Need at least GCC 4.0 or newer" + #endif +-#elif LJ_TARGET_ARM ++#elif LJ_TARGET_ARM || LJ_TARGET_PPC + #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2) + #error "Need at least GCC 4.2 or newer" + #endif diff --git a/Build/source/libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c b/Build/source/libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c index 7687ad7ad0b..95d89e9b062 100644 --- a/Build/source/libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c +++ b/Build/source/libs/luajit/LuaJIT-2.0.3/src/host/buildvm.c @@ -113,7 +113,7 @@ static const char *sym_decorate(BuildCtx *ctx, name[0] = '@'; else *p = '\0'; -#elif (LJ_TARGET_PPC || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE +#elif ((LJ_TARGET_PPC && !LJ_TARGET_OSX) || LJ_TARGET_PPCSPE) && !LJ_TARGET_CONSOLE /* Keep @plt. */ #else *p = '\0'; diff --git a/Build/source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h b/Build/source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h index 0196eedc0ca..0b0720951c0 100644 --- a/Build/source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h +++ b/Build/source/libs/luajit/LuaJIT-2.0.3/src/lj_arch.h @@ -293,7 +293,7 @@ #if __GNUC__ < 4 #error "Need at least GCC 4.0 or newer" #endif -#elif LJ_TARGET_ARM +#elif LJ_TARGET_ARM || LJ_TARGET_PPC #if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 2) #error "Need at least GCC 4.2 or newer" #endif -- cgit v1.2.3