fix configuration for QNX
Patch from Tobias Hammer. Closes PR 13265
This commit is contained in:
parent
a4b5336709
commit
9ef485d802
6
src/configure
vendored
6
src/configure
vendored
|
@ -2402,6 +2402,8 @@ INSTALL_SETUP_FLAGS=
|
||||||
|
|
||||||
STRIP_DEBUG=":"
|
STRIP_DEBUG=":"
|
||||||
|
|
||||||
|
use_flag_pthread=yes
|
||||||
|
|
||||||
###### OSKit stuff #######
|
###### OSKit stuff #######
|
||||||
|
|
||||||
if test "${enable_oskit}" = "yes" ; then
|
if test "${enable_oskit}" = "yes" ; then
|
||||||
|
@ -4103,6 +4105,7 @@ case "$host_os" in
|
||||||
;;
|
;;
|
||||||
nto-qnx*)
|
nto-qnx*)
|
||||||
enable_sgc=yes
|
enable_sgc=yes
|
||||||
|
use_flag_pthread=no
|
||||||
LIBS="$LIBS -lsocket -Wl,--export-dynamic"
|
LIBS="$LIBS -lsocket -Wl,--export-dynamic"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -8611,9 +8614,10 @@ fi
|
||||||
############### pthread ###################
|
############### pthread ###################
|
||||||
|
|
||||||
if test "${enable_pthread}" = "yes" ; then
|
if test "${enable_pthread}" = "yes" ; then
|
||||||
# FIXME: the following two flags are GCC-specific:
|
if test "${use_flag_pthread}" = "yes" ; then
|
||||||
PREFLAGS="$PREFLAGS -pthread"
|
PREFLAGS="$PREFLAGS -pthread"
|
||||||
LDFLAGS="$LDFLAGS -pthread"
|
LDFLAGS="$LDFLAGS -pthread"
|
||||||
|
fi
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
#define USE_PTHREAD_INSTEAD_OF_ITIMER 1
|
#define USE_PTHREAD_INSTEAD_OF_ITIMER 1
|
||||||
|
|
|
@ -335,6 +335,8 @@ INSTALL_SETUP_FLAGS=
|
||||||
|
|
||||||
STRIP_DEBUG=":"
|
STRIP_DEBUG=":"
|
||||||
|
|
||||||
|
use_flag_pthread=yes
|
||||||
|
|
||||||
###### OSKit stuff #######
|
###### OSKit stuff #######
|
||||||
|
|
||||||
if test "${enable_oskit}" = "yes" ; then
|
if test "${enable_oskit}" = "yes" ; then
|
||||||
|
@ -641,6 +643,7 @@ case "$host_os" in
|
||||||
;;
|
;;
|
||||||
nto-qnx*)
|
nto-qnx*)
|
||||||
enable_sgc=yes
|
enable_sgc=yes
|
||||||
|
use_flag_pthread=no
|
||||||
LIBS="$LIBS -lsocket -Wl,--export-dynamic"
|
LIBS="$LIBS -lsocket -Wl,--export-dynamic"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -1071,9 +1074,10 @@ fi
|
||||||
############### pthread ###################
|
############### pthread ###################
|
||||||
|
|
||||||
if test "${enable_pthread}" = "yes" ; then
|
if test "${enable_pthread}" = "yes" ; then
|
||||||
# FIXME: the following two flags are GCC-specific:
|
if test "${use_flag_pthread}" = "yes" ; then
|
||||||
PREFLAGS="$PREFLAGS -pthread"
|
PREFLAGS="$PREFLAGS -pthread"
|
||||||
LDFLAGS="$LDFLAGS -pthread"
|
LDFLAGS="$LDFLAGS -pthread"
|
||||||
|
fi
|
||||||
AC_DEFINE(USE_PTHREAD_INSTEAD_OF_ITIMER, 1, [Pthread timer enabled])
|
AC_DEFINE(USE_PTHREAD_INSTEAD_OF_ITIMER, 1, [Pthread timer enabled])
|
||||||
|
|
||||||
[ msg="whether pthread_rwlock is available" ]
|
[ msg="whether pthread_rwlock is available" ]
|
||||||
|
|
|
@ -965,6 +965,8 @@
|
||||||
|
|
||||||
# define FLAGS_ALREADY_SET
|
# define FLAGS_ALREADY_SET
|
||||||
|
|
||||||
|
# define USE_DYNAMIC_FDSET_SIZE
|
||||||
|
|
||||||
#if defined(i386)
|
#if defined(i386)
|
||||||
# define MZ_USE_JIT_I386
|
# define MZ_USE_JIT_I386
|
||||||
# define MZ_JIT_USE_MPROTECT
|
# define MZ_JIT_USE_MPROTECT
|
||||||
|
|
Loading…
Reference in New Issue
Block a user