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

configure: Don't create fonts and server symlinks in the WoW64 build tree. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-11-28 15:42:07 +01:00
parent 493129d638
commit 123b92373d
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -5657,8 +5657,6 @@ then
fi fi
test "$srcdir" != . || as_fn_error $? "--with-wine64 cannot be used when building inside the source tree. test "$srcdir" != . || as_fn_error $? "--with-wine64 cannot be used when building inside the source tree.
You should create a separate build directory and run configure from there." "$LINENO" 5 You should create a separate build directory and run configure from there." "$LINENO" 5
enable_fonts=${enable_fonts:-no}
enable_server=${enable_server:-no}
elif test "x$enable_win64" = "xyes" elif test "x$enable_win64" = "xyes"
then then
test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
@ -20014,7 +20012,7 @@ wine_fn_config_makefile dlls/xmllite/tests enable_tests
wine_fn_config_makefile dlls/xolehlp enable_xolehlp wine_fn_config_makefile dlls/xolehlp enable_xolehlp
wine_fn_config_makefile dlls/xpsprint enable_xpsprint wine_fn_config_makefile dlls/xpsprint enable_xpsprint
wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs
test -n "$with_wine64" || wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile fonts enable_fonts
wine_fn_config_makefile include enable_include wine_fn_config_makefile include enable_include
wine_fn_config_makefile libs/port enable_port wine_fn_config_makefile libs/port enable_port
wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile libs/wine enable_wine
@ -20124,7 +20122,7 @@ wine_fn_config_makefile programs/wscript/tests enable_tests
wine_fn_config_makefile programs/wusa enable_wusa wine_fn_config_makefile programs/wusa enable_wusa
wine_fn_config_makefile programs/xcopy enable_xcopy wine_fn_config_makefile programs/xcopy enable_xcopy
wine_fn_config_makefile programs/xcopy/tests enable_tests wine_fn_config_makefile programs/xcopy/tests enable_tests
test -n "$with_wine64" || wine_fn_config_makefile server enable_server wine_fn_config_makefile server enable_server
test "x$enable_tools" = xno || wine_fn_config_makefile tools enable_tools test "x$enable_tools" = xno || wine_fn_config_makefile tools enable_tools
test "x$enable_tools" = xno || wine_fn_config_makefile tools/sfnt2fon enable_sfnt2fon test "x$enable_tools" = xno || wine_fn_config_makefile tools/sfnt2fon enable_sfnt2fon
test "x$enable_tools" = xno || wine_fn_config_makefile tools/widl enable_widl test "x$enable_tools" = xno || wine_fn_config_makefile tools/widl enable_widl
@ -20187,9 +20185,8 @@ then
/*) reldir="" ;; /*) reldir="" ;;
*) reldir="../" ;; *) reldir="../" ;;
esac esac
wine_fn_append_rule "all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader rm -f fonts server 2>/dev/null
fonts server: wine_fn_append_rule "all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader
\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
loader/wine64 loader/wine64-preloader: loader/wine64 loader/wine64-preloader:
\$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ \$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@
$with_wine64/loader/wine: $with_wine64/loader/wine:
@ -20197,7 +20194,7 @@ $with_wine64/loader/wine:
$with_wine64/loader/wine-preloader: $with_wine64/loader/wine-preloader:
\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
clean:: clean::
\$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
else else
TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_DEV="$TOP_INSTALL_DEV include"
TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ TOP_INSTALL_LIB="$TOP_INSTALL_LIB \

14
configure.ac
View File

@ -235,8 +235,6 @@ then
fi fi
test "$srcdir" != . || AC_MSG_ERROR([--with-wine64 cannot be used when building inside the source tree. test "$srcdir" != . || AC_MSG_ERROR([--with-wine64 cannot be used when building inside the source tree.
You should create a separate build directory and run configure from there.]) You should create a separate build directory and run configure from there.])
enable_fonts=${enable_fonts:-no}
enable_server=${enable_server:-no}
elif test "x$enable_win64" = "xyes" elif test "x$enable_win64" = "xyes"
then then
test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
@ -3877,7 +3875,7 @@ WINE_CONFIG_MAKEFILE(dlls/xmllite/tests)
WINE_CONFIG_MAKEFILE(dlls/xolehlp) WINE_CONFIG_MAKEFILE(dlls/xolehlp)
WINE_CONFIG_MAKEFILE(dlls/xpsprint) WINE_CONFIG_MAKEFILE(dlls/xpsprint)
WINE_CONFIG_MAKEFILE(dlls/xpssvcs) WINE_CONFIG_MAKEFILE(dlls/xpssvcs)
WINE_CONFIG_MAKEFILE(fonts,,[test -n "$with_wine64"]) WINE_CONFIG_MAKEFILE(fonts)
WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(include)
WINE_CONFIG_MAKEFILE(libs/port) WINE_CONFIG_MAKEFILE(libs/port)
WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(libs/wine)
@ -3987,7 +3985,7 @@ WINE_CONFIG_MAKEFILE(programs/wscript/tests)
WINE_CONFIG_MAKEFILE(programs/wusa) WINE_CONFIG_MAKEFILE(programs/wusa)
WINE_CONFIG_MAKEFILE(programs/xcopy) WINE_CONFIG_MAKEFILE(programs/xcopy)
WINE_CONFIG_MAKEFILE(programs/xcopy/tests) WINE_CONFIG_MAKEFILE(programs/xcopy/tests)
WINE_CONFIG_MAKEFILE(server,,[test -n "$with_wine64"]) WINE_CONFIG_MAKEFILE(server)
WINE_CONFIG_MAKEFILE(tools,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools,,[test "x$enable_tools" = xno])
WINE_CONFIG_MAKEFILE(tools/sfnt2fon,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/sfnt2fon,,[test "x$enable_tools" = xno])
WINE_CONFIG_MAKEFILE(tools/widl,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/widl,,[test "x$enable_tools" = xno])
@ -4065,10 +4063,10 @@ then
/*) reldir="" ;; /*) reldir="" ;;
*) reldir="../" ;; *) reldir="../" ;;
esac esac
dnl Get rid of old symlinks
rm -f fonts server 2>/dev/null
WINE_APPEND_RULE( WINE_APPEND_RULE(
[all: fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader [all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader
fonts server:
\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
loader/wine64 loader/wine64-preloader: loader/wine64 loader/wine64-preloader:
\$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] \$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@]
$with_wine64/loader/wine: $with_wine64/loader/wine:
@ -4076,7 +4074,7 @@ $with_wine64/loader/wine:
$with_wine64/loader/wine-preloader: $with_wine64/loader/wine-preloader:
\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
clean:: clean::
\$(RM) fonts server loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
else else
TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_DEV="$TOP_INSTALL_DEV include"
TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ TOP_INSTALL_LIB="$TOP_INSTALL_LIB \

5
tools/make_makefiles
View File

@ -464,11 +464,6 @@ sub update_makefiles(@)
die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"};
$args = ",,[test \"x\$enable_tools\" = xno]"; $args = ",,[test \"x\$enable_tools\" = xno]";
} }
elsif (($dir eq "fonts") || ($dir eq "server"))
{
# these are created as symlinks for wow64 builds
$args = ",,[test -n \"\$with_wine64\"]";
}
push @lines, "WINE_CONFIG_MAKEFILE($dir$args)\n"; push @lines, "WINE_CONFIG_MAKEFILE($dir$args)\n";
} }