synced trunk with experimental r.7047

git-svn-id: https://serveur-svn.lri.fr/svn/modhel/luatex/trunk@7050 0b2b3880-5936-4365-a048-eb17d2e5a6bf

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

source/libs/luajit/configure.ac

@@ -63,8 +63,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 be require different switches .
+dnl
 AS_CASE([$host_os:$host_cpu],
-        [*darwin*:x86_64], [LIBLUAJIT_LDEXTRA='-image_base 7fff04c4a000'])
+        [*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])

source/texk/web2c/cwebboot.cin

@@ -48,7 +48,7 @@
 #endif
 
 /*:88*//*90:*/
-#line 1301 "cwebdir/comm-w2c.ch"
+#line 1305 "cwebdir/comm-w2c.ch"
 
 typedef bool boolean;
 #define HAVE_BOOLEAN
@@ -423,7 +423,7 @@ static void check_change(void);
 static void prime_the_change_buffer(void);
 
 /*:84*//*98:*/
-#line 1402 "cwebdir/comm-w2c.ch"
+#line 1406 "cwebdir/comm-w2c.ch"
 
 static void cb_usage(const_string str);
 static void cb_usagehelp(const_string*message,const_string bug_email);
@@ -463,7 +463,7 @@ root= NULL;
 #line 72 "cwebdir/comm-w2c.ch"
 
 /*91:*/
-#line 1316 "cwebdir/comm-w2c.ch"
+#line 1320 "cwebdir/comm-w2c.ch"
 
 kpse_set_program_name(argv[0],"cweb");
 
@@ -473,7 +473,11 @@ kpse_set_program_name(argv[0],"cweb");
 /*89:*/
 #line 1267 "cwebdir/comm-w2c.ch"
 
+#if !defined(__MINGW32__)
 setlocale(LC_MESSAGES,setlocale(LC_CTYPE,""));
+#else
+setlocale(LC_CTYPE,"");
+#endif
 texmf_locale= kpse_var_expand("${TEXMFLOCALEDIR}");
 
 bindtextdomain("cweb",
@@ -1429,7 +1433,7 @@ if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*74:*/
 if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0)
 
 /*94:*/
-#line 1341 "cwebdir/comm-w2c.ch"
+#line 1345 "cwebdir/comm-w2c.ch"
 
 cb_usagehelp(program==ctangle?CTANGLEHELP:
 program==cweave?CWEAVEHELP:CTWILLHELP,NULL);
@@ -1441,7 +1445,7 @@ program==cweave?CWEAVEHELP:CTWILLHELP,NULL);
 if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0)
 
 /*96:*/
-#line 1383 "cwebdir/comm-w2c.ch"
+#line 1387 "cwebdir/comm-w2c.ch"
 
 printversionandexit(cb_banner,
 program==ctwill?"Donald E. Knuth":"Silvio Levy and Donald E. Knuth",
@@ -1631,7 +1635,7 @@ cb_usage(program==ctangle?"ctangle":program==cweave?"cweave":"ctwill");
 
 #line 953 "cwebdir/comm-w2c.ch"
 /*:70*//*95:*/
-#line 1349 "cwebdir/comm-w2c.ch"
+#line 1353 "cwebdir/comm-w2c.ch"
 
 static void cb_usage(const_string str)
 {
@@ -1664,7 +1668,7 @@ history= spotless;exit(wrap_up());
 }
 
 /*:95*//*97:*/
-#line 1391 "cwebdir/comm-w2c.ch"
+#line 1395 "cwebdir/comm-w2c.ch"
 
 void cb_show_banner(void)
 {

source/texk/web2c/cwebdir/comm-w2c.ch

@@ -1265,7 +1265,11 @@ There are several ways to set |TEXMFLOCALEDIR|:
     or \.{TEXMFLOCALEDIR.cweb=\$TEXMFMAIN/locale}.\par}
 
 @<Set locale...@>=
+#if !defined(__MINGW32__)
 setlocale(LC_MESSAGES, setlocale(LC_CTYPE, ""));
+#else
+setlocale(LC_CTYPE, "");
+#endif
 texmf_locale = kpse_var_expand ("${TEXMFLOCALEDIR}");
 
 bindtextdomain("cweb",

source/texk/web2c/luatexdir/luatex_svnversion.h

@@ -1 +1 @@
-#define luatex_svn_revision 7039
+#define luatex_svn_revision 7047