texlive[50609] Build/source/libs/luajit: for openbsd,

[commits+karl at tug.org]

Revision: 50609
          http://tug.org/svn/texlive?view=revision&revision=50609
Author:   karl
Date:     2019-03-26 23:20:41 +0100 (Tue, 26 Mar 2019)
Log Message:
-----------
for openbsd, LIBLUAJIT_LDEXTRA='-lc++abi -lpthread'

Modified Paths:
--------------
    trunk/Build/source/libs/luajit/ChangeLog
    trunk/Build/source/libs/luajit/configure
    trunk/Build/source/libs/luajit/configure.ac

Modified: trunk/Build/source/libs/luajit/ChangeLog
===================================================================
--- trunk/Build/source/libs/luajit/ChangeLog	2019-03-26 21:01:21 UTC (rev 50608)
+++ trunk/Build/source/libs/luajit/ChangeLog	2019-03-26 22:20:41 UTC (rev 50609)
@@ -1,3 +1,8 @@
+2019-03-26  Karl Berry  <karl at freefriends.org>
+
+	* configure.ac (LIBLUAJIT_LDEXTRA): -lc++abi -lpthread for
+	openbsd:*:clang, from Luigi.
+
 2018-09-09  Karl Berry  <karl at 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.
-

Modified: trunk/Build/source/libs/luajit/configure
===================================================================
--- trunk/Build/source/libs/luajit/configure	2019-03-26 21:01:21 UTC (rev 50608)
+++ trunk/Build/source/libs/luajit/configure	2019-03-26 22:20:41 UTC (rev 50609)
@@ -14372,6 +14372,14 @@
   *) :
      ;;
 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

Modified: trunk/Build/source/libs/luajit/configure.ac
===================================================================
--- trunk/Build/source/libs/luajit/configure.ac	2019-03-26 21:01:21 UTC (rev 50608)
+++ trunk/Build/source/libs/luajit/configure.ac	2019-03-26 22:20:41 UTC (rev 50609)
@@ -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 at tug.org>
+dnl   Copyright 2016-2019 Karl Berry <tex-live at tug.org>
+dnl   Copyright 2014-2015 Peter Breitenlohner <tex-live at 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([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])