diff options
| author | Karl Berry <karl@freefriends.org> | 2019-03-26 22:20:41 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-03-26 22:20:41 +0000 |
| commit | fb1e0c5fe2145af58861c1d1a42b9c03d8d6a37f (patch) | |
| tree | c597437af86955eb2b16cab0ae8c8c2aa0a7a805 | |
| parent | 1bd89250219a1f2d07e579df52dce11bbcd7e994 (diff) | |
for openbsd, LIBLUAJIT_LDEXTRA='-lc++abi -lpthread'
git-svn-id: svn://tug.org/texlive/trunk@50609 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/libs/luajit/ChangeLog | 6 | ||||
| -rwxr-xr-x | Build/source/libs/luajit/configure | 8 | ||||
| -rw-r--r-- | Build/source/libs/luajit/configure.ac | 10 |
3 files changed, 22 insertions, 2 deletions
diff --git a/Build/source/libs/luajit/ChangeLog b/Build/source/libs/luajit/ChangeLog index cb4fa5b867d..a4c8f8f74a2 100644 --- a/Build/source/libs/luajit/ChangeLog +++ b/Build/source/libs/luajit/ChangeLog @@ -1,3 +1,8 @@ +2019-03-26 Karl Berry <karl@freefriends.org> + + * configure.ac (LIBLUAJIT_LDEXTRA): -lc++abi -lpthread for + openbsd:*:clang, from Luigi. + 2018-09-09 Karl Berry <karl@tug.org> * lutjiterr.test: LC_ALL=LANGUAGE=C. @@ -106,4 +111,3 @@ Import LuaJIT-2.0.2/ from http://luajit.org/download/LuaJIT-2.0.2.tar.gz. - diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure index 1c0ad48d980..78024324309 100755 --- a/Build/source/libs/luajit/configure +++ b/Build/source/libs/luajit/configure @@ -14372,6 +14372,14 @@ case $host_os:$host_cpu in #( *) : ;; esac +case $host_os:$host_cpu:$CC in #( + *openbsd*:x86_64:clang* | *openbsd*:x86_64:cc) : + LIBLUAJIT_LDEXTRA='-lc++abi -lpthread' ;; #( + *openbsd*:i386:clang* | *openbsd*:i386:cc) : + LIBLUAJIT_LDEXTRA='-lc++abi -lpthread' ;; #( + *) : + ;; +esac if test "x$enable_build" != xno; then diff --git a/Build/source/libs/luajit/configure.ac b/Build/source/libs/luajit/configure.ac index f3e20d48159..04bd5613647 100644 --- a/Build/source/libs/luajit/configure.ac +++ b/Build/source/libs/luajit/configure.ac @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2014, 2015 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright 2016-2019 Karl Berry <tex-live@tug.org> +dnl Copyright 2014-2015 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -63,8 +64,15 @@ AC_SUBST([LUAJIT_CFLAGS]) AC_SUBST([LJHOST]) AC_SUBST([LJVM_MODE]) +dnl Extra switches +dnl We support openbsd x86_64 and i386, +dnl other platforms could require different switches. +dnl AS_CASE([$host_os:$host_cpu], [*darwin*:x86_64], [LIBLUAJIT_LDEXTRA='-image_base 7fff04c4a000']) +AS_CASE([$host_os:$host_cpu:$CC], + [*openbsd*:x86_64:clang* | *openbsd*:x86_64:cc], [LIBLUAJIT_LDEXTRA='-lc++abi -lpthread'], + [*openbsd*:i386:clang* | *openbsd*:i386:cc], [LIBLUAJIT_LDEXTRA='-lc++abi -lpthread']) AC_SUBST([LIBLUAJIT_LDEXTRA]) AM_CONDITIONAL([build], [test "x$enable_build" != xno]) |