97 lines
3.9 KiB
Plaintext
97 lines
3.9 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2010/05/13 12:29:26 jasper Exp $
|
|
--- configure.orig Thu May 13 13:15:24 2010
|
|
+++ configure Thu May 13 13:19:55 2010
|
|
@@ -16563,9 +16563,9 @@ then
|
|
CXXFLAGS="${CXXFLAGS} -O0 -g -Wall -DGLIBCXX_FORCE_NEW -DGLIBCPP_FORCE_NEW"
|
|
LDFLAGS="${LDFLAGS} -g"
|
|
else
|
|
- CFLAGS="${CFLAGS} -Os -g -DNDEBUG"
|
|
- CXXFLAGS="${CXXFLAGS} -Os -g -DNDEBUG"
|
|
- LDFLAGS="${LDFLAGS} -g"
|
|
+ CFLAGS="${CFLAGS}"
|
|
+ CXXFLAGS="${CXXFLAGS}"
|
|
+ LDFLAGS="${LDFLAGS}"
|
|
fi
|
|
|
|
|
|
@@ -20423,13 +20423,13 @@ fi
|
|
fi
|
|
|
|
if test -z "$LIBPTHREAD"; then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
|
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
|
|
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
|
|
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -20460,7 +20460,7 @@ fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
|
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
|
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
|
|
- LIBPTHREAD="-lpthread"
|
|
+ LIBPTHREAD="-pthread"
|
|
fi
|
|
|
|
fi
|
|
@@ -25994,13 +25994,13 @@ rm -f core conftest.err conftest.$ac_objext \
|
|
if test -n "$gl_have_pthread"; then
|
|
# The program links fine without libpthread. But it may actually
|
|
# need to link with libpthread in order to create multiple threads.
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
|
|
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5
|
|
+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
|
|
if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -26031,7 +26031,7 @@ fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
|
|
$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
|
|
if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
|
|
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
|
|
+ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
|
|
# On Solaris and HP-UX, most pthread functions exist also in libc.
|
|
# Therefore pthread_in_use() needs to actually try to create a
|
|
# thread: pthread_create from libc will fail, whereas
|
|
@@ -26047,13 +26047,13 @@ fi
|
|
|
|
else
|
|
# Some library is needed. Try libpthread and libc_r.
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
|
|
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -pthread" >&5
|
|
+$as_echo_n "checking for pthread_kill in -pthread... " >&6; }
|
|
if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpthread $LIBS"
|
|
+LIBS="-pthread $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -26085,8 +26085,8 @@ fi
|
|
$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
|
|
if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then :
|
|
gl_have_pthread=yes
|
|
- LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
|
|
- LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
|
|
+ LIBTHREAD=-pthread LTLIBTHREAD=-pthread
|
|
+ LIBMULTITHREAD=-pthread LTLIBMULTITHREAD=-pthread
|
|
fi
|
|
|
|
if test -z "$gl_have_pthread"; then
|