096f60d5b0
Enable the MediaCtrl class support. Re-enable wide character functions which OpenBSD now has. Remove some now-unnecessary patches. Remove the NULL cast patches. Simplify the autoconf patching. Tested on amd64 by Brad and on sparc64 by me.
80 lines
3.0 KiB
Plaintext
80 lines
3.0 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.8 2011/12/06 10:23:38 dcoppa Exp $
|
|
--- configure.in.orig Tue Mar 22 07:59:37 2011
|
|
+++ configure.in Fri Dec 2 03:18:42 2011
|
|
@@ -3090,7 +3090,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
|
|
dnl HAVE_STDLIB_H which are already defined and this provokes
|
|
dnl a compiler warning which configure considers as an error...
|
|
AC_MSG_CHECKING(for jpeglib.h)
|
|
- AC_CACHE_VAL(ac_cv_header_jpeglib_h,
|
|
+ AC_CACHE_VAL(ac_cv_header_jpeglib_h,[
|
|
AC_TRY_COMPILE(
|
|
[
|
|
#undef HAVE_STDLIB_H
|
|
@@ -3102,7 +3102,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
|
|
ac_cv_header_jpeglib_h=yes,
|
|
ac_cv_header_jpeglib_h=no
|
|
)
|
|
- )
|
|
+ ])
|
|
AC_MSG_RESULT($ac_cv_header_jpeglib_h)
|
|
|
|
if test "$ac_cv_header_jpeglib_h" = "yes"; then
|
|
@@ -4154,13 +4154,13 @@ if test "$TOOLKIT" != "MSW" ; then
|
|
|
|
AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
|
|
if test "x$found_sql_h" = "x1" ; then
|
|
- AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
|
|
+ AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc -pthread",
|
|
[
|
|
AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
|
|
[
|
|
AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
|
|
])
|
|
- ])
|
|
+ ], [-pthread])
|
|
fi
|
|
if test "x$ODBC_LINK" = "x" ; then
|
|
if test "$wxUSE_ODBC" = "sys" ; then
|
|
@@ -4480,7 +4480,7 @@ UNICODE=0
|
|
lib_unicode_suffix=
|
|
WX_CHARTYPE="ansi"
|
|
if test "$wxUSE_UNICODE" = "yes"; then
|
|
- lib_unicode_suffix=u
|
|
+ lib_unicode_suffix=
|
|
WX_CHARTYPE="unicode"
|
|
UNICODE=1
|
|
fi
|
|
@@ -4489,8 +4489,8 @@ lib_debug_suffix=
|
|
WX_DEBUGTYPE="release"
|
|
DEBUG_FLAG=0
|
|
if test "$wxUSE_DEBUG_FLAG" = "yes"; then
|
|
- lib_debug_suffix=d
|
|
- WX_DEBUGTYPE="debug"
|
|
+ lib_debug_suffix=
|
|
+ WX_DEBUGTYPE="release"
|
|
DEBUG_FLAG=1
|
|
fi
|
|
|
|
@@ -4504,7 +4504,7 @@ fi
|
|
|
|
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
|
|
|
|
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
|
|
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
|
|
|
TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
|
|
|
|
@@ -5905,11 +5905,9 @@ else
|
|
dnl Switch on optimisation but keep strict-aliasing off for
|
|
dnl now (see -fstrict-aliasing in the gcc manual). When it is
|
|
dnl switched back on consider using -Wstrict-aliasing=2.
|
|
- OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
|
|
+ OPTIMISE_CFLAGS="-fno-strict-aliasing"
|
|
;;
|
|
esac
|
|
- else
|
|
- OPTIMISE_CFLAGS="-O"
|
|
fi
|
|
fi
|
|
|