ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libwine: Only link libi386 with the libraries that need it. 

In particular it does not make sense to link executables and dlls built
with MinGW with it.

Signed-off-by: Francois Gouget <fgouget@icodeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Naveen Narayanan 2019-09-02 04:16:28 +02:00 committed by Alexandre Julliard
parent 4b299b286d
commit 624bcd314c
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -752,6 +752,7 @@ LDRPATH_INSTALL
DLLFLAGS DLLFLAGS
CPP CPP
OPENGL_LIBS OPENGL_LIBS
I386_LIBS
ICOTOOL ICOTOOL
CONVERT CONVERT
RSVG RSVG
@ -6857,11 +6858,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_i386_i386_set_ldt" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_i386_i386_set_ldt" >&5
$as_echo "$ac_cv_lib_i386_i386_set_ldt" >&6; } $as_echo "$ac_cv_lib_i386_i386_set_ldt" >&6; }
if test "x$ac_cv_lib_i386_i386_set_ldt" = xyes; then : if test "x$ac_cv_lib_i386_i386_set_ldt" = xyes; then :
cat >>confdefs.h <<_ACEOF I386_LIBS="-li386"
#define HAVE_LIBI386 1
_ACEOF
LIBS="-li386 $LIBS"
fi fi
@ -19770,7 +19767,8 @@ ac_config_commands="$ac_config_commands include/stamp-h"
$as_echo_n "creating Makefile rules..." >&6 $as_echo_n "creating Makefile rules..." >&6
ALL_VARS_RULES="OPENGL_LIBS = $OPENGL_LIBS ALL_VARS_RULES="I386_LIBS = $I386_LIBS
OPENGL_LIBS = $OPENGL_LIBS
COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS
IOKIT_LIBS = $IOKIT_LIBS IOKIT_LIBS = $IOKIT_LIBS
FORCEFEEDBACK_LIBS = $FORCEFEEDBACK_LIBS FORCEFEEDBACK_LIBS = $FORCEFEEDBACK_LIBS

2
configure.ac
View File

@ -409,7 +409,7 @@ WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false],
dnl **** Check for some libraries **** dnl **** Check for some libraries ****
dnl Check for -li386 for NetBSD and OpenBSD dnl Check for -li386 for NetBSD and OpenBSD
AC_CHECK_LIB(i386,i386_set_ldt) AC_CHECK_LIB(i386,i386_set_ldt,[AC_SUBST(I386_LIBS, "-li386")])
AC_SUBST(OPENGL_LIBS,"") AC_SUBST(OPENGL_LIBS,"")

3
include/config.h.in
View File

@ -398,9 +398,6 @@
/* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ /* Define to 1 if you have the `gettextpo' library (-lgettextpo). */
#undef HAVE_LIBGETTEXTPO #undef HAVE_LIBGETTEXTPO
/* Define to 1 if you have the `i386' library (-li386). */
#undef HAVE_LIBI386
/* Define to 1 if you have the `kstat' library (-lkstat). */ /* Define to 1 if you have the `kstat' library (-lkstat). */
#undef HAVE_LIBKSTAT #undef HAVE_LIBKSTAT

3
libs/wine/Makefile.in
View File

@ -1,4 +1,5 @@
EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS)
C_SRCS = \ C_SRCS = \
config.c \ config.c \