wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Hugh McMaster : cmd: 'del' should set %errorlevel% to zero, not one, on error.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: 16cb9c4cb7feda719b43f85e0a7acfe50df03636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16cb9c4cb7feda719b43f85e0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Nov 17 15:21:39 2015 +1100 cmd: 'del' should set %errorlevel% to zero, not one, on error. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 4 +--- programs/cmd/tests/test_builtins.cmd | 22 ++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 22f0580..a444330 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1410,10 +1410,8 @@ BOOL WCMD_delete (WCHAR *args) { argsProcessed = TRUE; found = WCMD_delete_one(thisArg); - if (!found) { - errorlevel = 1; + if (!found) WCMD_output_stderr(WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); - } foundAny |= found; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0a8a4f4..db286db 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1493,6 +1493,28 @@ for /f "tokens=3,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k cd .. rd /s/q foobar +echo ------------ Testing del ------------ +echo abc > file +echo deleting 'file' +del file +if errorlevel 0 ( + echo errorlevel is 0, good +) else ( + echo unexpected errorlevel, got %errorlevel% +) +if not exist file ( + echo successfully deleted 'file' +) else ( + echo error deleting 'file' +) +echo attempting to delete 'file', even though it is not present +del file +if errorlevel 0 ( + echo errorlevel is 0, good +) else ( + echo unexpected errorlevel, got %errorlevel% +) + echo ------------ Testing del /a ------------ del /f/q *.test > nul echo r > r.test diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b222158..c2879d6 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1009,6 +1009,12 @@ h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o@or_broken@h=%h i=a j=b k=c l=d e f g m h=%h i=a j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=a j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=b j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=b j=c k= l= m= n=%n o=%o +------------ Testing del ------------ +deleting 'file' +errorlevel is 0, good +successfully deleted 'file' +attempting to delete 'file', even though it is not present +errorlevel is 0, good ------------ Testing del /a ------------ not-r.test not found after delete, good r.test found before delete, good

1 0

Ken Thomases : winemac: Use the display unit number rather than display ID for the initial display mode registry key.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: 66fc13197b6b8eaabd62effcf36d8c27e71c1c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fc13197b6b8eaabd62effcf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 16 22:11:12 2015 -0600 winemac: Use the display unit number rather than display ID for the initial display mode registry key. On Macs with dual GPUs that automatically switch, the display ID is not stable. It changes when the active GPU changes. The resulted in the lookup of the initial display mode failing and games not being able to restore it properly. The display unit number should be more reliable, although still not perfect. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e1357d8..ad01191 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -187,7 +187,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID size_t len; WCHAR* buf = NULL; - snprintf(display_key_name, sizeof(display_key_name), "Display 0x%08x", displayID); + snprintf(display_key_name, sizeof(display_key_name), "Display 0x%08x", CGDisplayUnitNumber(displayID)); /* @@ Wine registry key: HKLM\Software\Wine\Mac Driver\Initial Display Mode\Display 0xnnnnnnnn */ if (RegCreateKeyExA(parent_hkey, display_key_name, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &display_hkey, NULL)) @@ -328,7 +328,7 @@ static struct display_mode_descriptor* create_original_display_mode_descriptor(C init_original_display_mode(); - snprintf(display_key, sizeof(display_key), display_key_format, displayID); + snprintf(display_key, sizeof(display_key), display_key_format, CGDisplayUnitNumber(displayID)); /* @@ Wine registry key: HKLM\Software\Wine\Mac Driver\Initial Display Mode\Display 0xnnnnnnnn */ if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, display_key, 0, KEY_READ, &hkey)) return NULL;

1 0

Ken Thomases : winemac: Enable localization of strings used to build Mac menus.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: d8deecab11b747f764e5982b28463d4095df2434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8deecab11b747f764e5982b2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 16 22:10:21 2015 -0600 winemac: Enable localization of strings used to build Mac menus. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/winemac.drv/cocoa_app.m | 52 ++++++++++++++++++++++++--------- dlls/winemac.drv/macdrv_cocoa.h | 4 +++ dlls/winemac.drv/macdrv_main.c | 55 +++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_res.h | 41 ++++++++++++++++++++++++++ dlls/winemac.drv/winemac.rc | 24 ++++++++++++++++ po/ar.po | 64 +++++++++++++++++++++++++++++++++++++---- po/bg.po | 55 +++++++++++++++++++++++++++++++---- po/ca.po | 64 +++++++++++++++++++++++++++++++++++++---- po/cs.po | 64 +++++++++++++++++++++++++++++++++++++---- po/da.po | 64 +++++++++++++++++++++++++++++++++++++---- po/de.po | 64 +++++++++++++++++++++++++++++++++++++---- po/el.po | 54 ++++++++++++++++++++++++++++++---- po/en.po | 50 ++++++++++++++++++++++++++++---- po/en_US.po | 50 ++++++++++++++++++++++++++++---- po/eo.po | 54 ++++++++++++++++++++++++++++++---- po/es.po | 64 +++++++++++++++++++++++++++++++++++++---- po/fa.po | 51 ++++++++++++++++++++++++++++---- po/fi.po | 64 +++++++++++++++++++++++++++++++++++++---- po/fr.po | 64 +++++++++++++++++++++++++++++++++++++---- po/he.po | 64 +++++++++++++++++++++++++++++++++++++---- po/hi.po | 50 ++++++++++++++++++++++++++++---- po/hr.po | 60 ++++++++++++++++++++++++++++++++++---- po/hu.po | 64 +++++++++++++++++++++++++++++++++++++---- po/it.po | 64 +++++++++++++++++++++++++++++++++++++---- po/ja.po | 64 +++++++++++++++++++++++++++++++++++++---- po/ko.po | 64 +++++++++++++++++++++++++++++++++++++---- po/lt.po | 64 +++++++++++++++++++++++++++++++++++++---- po/ml.po | 50 ++++++++++++++++++++++++++++---- po/nb_NO.po | 64 +++++++++++++++++++++++++++++++++++++---- po/nl.po | 64 +++++++++++++++++++++++++++++++++++++---- po/or.po | 50 ++++++++++++++++++++++++++++---- po/pa.po | 50 ++++++++++++++++++++++++++++---- po/pl.po | 64 +++++++++++++++++++++++++++++++++++++---- po/pt_BR.po | 64 +++++++++++++++++++++++++++++++++++++---- po/pt_PT.po | 64 +++++++++++++++++++++++++++++++++++++---- po/rm.po | 52 +++++++++++++++++++++++++++++---- po/ro.po | 64 +++++++++++++++++++++++++++++++++++++---- po/ru.po | 64 +++++++++++++++++++++++++++++++++++++---- po/sk.po | 60 ++++++++++++++++++++++++++++++++++---- po/sl.po | 64 +++++++++++++++++++++++++++++++++++++---- po/sr_RS(a)cyrillic.po | 61 +++++++++++++++++++++++++++++++++++---- po/sr_RS(a)latin.po | 61 +++++++++++++++++++++++++++++++++++---- po/sv.po | 64 +++++++++++++++++++++++++++++++++++++---- po/te.po | 50 ++++++++++++++++++++++++++++---- po/th.po | 51 ++++++++++++++++++++++++++++---- po/tr.po | 64 +++++++++++++++++++++++++++++++++++++---- po/uk.po | 64 +++++++++++++++++++++++++++++++++++++---- po/wa.po | 55 +++++++++++++++++++++++++++++++---- po/wine.pot | 50 ++++++++++++++++++++++++++++---- po/zh_CN.po | 64 +++++++++++++++++++++++++++++++++++++---- po/zh_TW.po | 64 +++++++++++++++++++++++++++++++++++++---- 53 files changed, 2673 insertions(+), 249 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8deecab11b747f764e59…

1 0

Ken Thomases : winemac: Add resource file.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: 1aae516a4942fdbccd9e24e3f89abf0eaa3efa90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aae516a4942fdbccd9e24e3f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 16 22:10:20 2015 -0600 winemac: Add resource file. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/Makefile.in | 2 ++ dlls/winemac.drv/winemac.rc | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index b1ee025..c160895 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -28,3 +28,5 @@ OBJC_SRCS = \ cocoa_opengl.m \ cocoa_status_item.m \ cocoa_window.m + +RC_SRCS = winemac.rc diff --git a/dlls/winemac.drv/winemac.rc b/dlls/winemac.drv/winemac.rc new file mode 100644 index 0000000..b563414 --- /dev/null +++ b/dlls/winemac.drv/winemac.rc @@ -0,0 +1,25 @@ +/* + * Resource file for Mac driver + * + * Copyright (c) 2007 Alexandre Julliard + * Copyright (c) 2013 Ken Thomases for CodeWeavers Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Mac driver" +#define WINE_FILENAME_STR "winemac.drv" + +#include "wine/wine_common_ver.rc"

1 0

Qian Hong : atl100: Implemented semi stub AtlAxCreateControlLic and AtlAxCreateControlLicEx.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: f949c8791c38e8d1a9987b9c9c8487be4229d8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f949c8791c38e8d1a9987b9c9… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Nov 17 08:45:33 2015 +0800 atl100: Implemented semi stub AtlAxCreateControlLic and AtlAxCreateControlLicEx. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 15b0550..083dbe0 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1035,15 +1035,15 @@ static enum content get_content_type(LPCOLESTR name, CLSID *control_id) } /*********************************************************************** - * AtlAxCreateControlEx [atl100.@] + * AtlAxCreateControlLicEx [atl100.@] * * REMARKS * See http://www.codeproject.com/com/cwebpage.asp for some background * */ -HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, +HRESULT WINAPI AtlAxCreateControlLicEx(LPCOLESTR lpszName, HWND hWnd, IStream *pStream, IUnknown **ppUnkContainer, IUnknown **ppUnkControl, - REFIID iidSink, IUnknown *punkSink) + REFIID iidSink, IUnknown *punkSink, BSTR lic) { CLSID controlId; HRESULT hRes; @@ -1053,8 +1053,11 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, IUnknown *pContainer = NULL; enum content content; - TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, - ppUnkContainer, ppUnkControl, iidSink, punkSink); + TRACE("(%s %p %p %p %p %p %p %s)\n", debugstr_w(lpszName), hWnd, pStream, + ppUnkContainer, ppUnkControl, iidSink, punkSink, debugstr_w(lic)); + + if (lic) + FIXME("semi stub\n"); if (ppUnkContainer) *ppUnkContainer = NULL; if (ppUnkControl) *ppUnkControl = NULL; @@ -1427,28 +1430,21 @@ INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND return 0; } -#if _ATL_VER >= _ATL_VER_80 - /*********************************************************************** * AtlAxCreateControlLic [atl100.59] * */ HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, IUnknown **container, BSTR lic) { - FIXME("(%s %p %p %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, debugstr_w(lic)); - return E_NOTIMPL; + return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, NULL, NULL, NULL, lic); } /*********************************************************************** - * AtlAxCreateControlLicEx [atl100.60] + * AtlAxCreateControlEx [atl100.@] * */ -HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, - IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic) +HRESULT WINAPI AtlAxCreateControlEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, + IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink) { - FIXME("(%s %p %p %p %p %s %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, control, - debugstr_guid(iidSink), punkSink, debugstr_w(lic)); - return E_NOTIMPL; + return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, control, iidSink, punkSink, NULL); } - -#endif

1 0

Alexandre Julliard : makefiles: Generate makefiles and po rules only for disabled dlls.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: 480e95ae97f298d2e894a3a943617f88703676fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=480e95ae97f298d2e894a3a94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 18:05:28 2015 +0900 makefiles: Generate makefiles and po rules only for disabled dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 10 ++++++---- configure | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d5a3532..1cd7d1d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -330,9 +330,11 @@ wine_fn_disabled_rules () ac_extraclean="$ac_dir/Makefile" test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - wine_fn_depend_rules - wine_fn_clean_rules $ac_clean - wine_fn_pot_rules + wine_fn_append_rule \ +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy + \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" } wine_fn_config_makefile () @@ -397,7 +399,7 @@ wine_fn_config_dll () AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too - [if wine_fn_has_flag implib && test "$ac_enable" != enable_win16 + [if test "$ac_enable" != enable_win16 then wine_fn_depend_rules wine_fn_clean_rules $ac_clean diff --git a/configure b/configure index b8504ec..72355f2 100755 --- a/configure +++ b/configure @@ -7520,9 +7520,11 @@ wine_fn_disabled_rules () ac_extraclean="$ac_dir/Makefile" test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - wine_fn_depend_rules - wine_fn_clean_rules $ac_clean - wine_fn_pot_rules + wine_fn_append_rule \ +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy + \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" } wine_fn_config_makefile () @@ -7596,7 +7598,7 @@ fi test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_dll" if eval test \"x\$"$ac_enable"\" = x"no"; then : - if wine_fn_has_flag implib && test "$ac_enable" != enable_win16 + if test "$ac_enable" != enable_win16 then wine_fn_depend_rules wine_fn_clean_rules $ac_clean

1 0

Alexandre Julliard : configure: Use the standard dll directory on Android.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: 945d3cf773e681a53d4686b4408d9d0ef3682ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945d3cf773e681a53d4686b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:50:07 2015 +0900 configure: Use the standard dll directory on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - 2 files changed, 2 deletions(-) diff --git a/configure b/configure index 03dbfee..b8504ec 100755 --- a/configure +++ b/configure @@ -8241,7 +8241,6 @@ fi linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" - dlldir="\${libdir}" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : diff --git a/configure.ac b/configure.ac index 5d34272..e265fcd 100644 --- a/configure.ac +++ b/configure.ac @@ -848,7 +848,6 @@ case $host_os in linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" - dlldir="\${libdir}" WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [LDEXECFLAGS="-Wl,--export-dynamic"]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],

1 0

Alexandre Julliard : configure: Disable the preloader on Android.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: 861dd85cc2891f9d828a8c80b9a38bfd4a446031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861dd85cc2891f9d828a8c80b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:49:13 2015 +0900 configure: Disable the preloader on Android. It cannot work anymore now that Android requires PIE binaries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index 3a5a309..03dbfee 100755 --- a/configure +++ b/configure @@ -14938,6 +14938,7 @@ case $build_os in esac case $host_os in + linux-android*) ;; linux*) case $host_cpu in *i[3456789]86*|x86_64*) diff --git a/configure.ac b/configure.ac index 8bdfade..5d34272 100644 --- a/configure.ac +++ b/configure.ac @@ -1928,6 +1928,7 @@ case $build_os in esac case $host_os in + linux-android*) ;; linux*) case $host_cpu in *i[[3456789]]86*|x86_64*)

1 0

Alexandre Julliard : configure: Build binaries as PIE on Android.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: 3d8a91e14d4858fdfd959206f0edbe4c51ff8a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8a91e14d4858fdfd959206f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:48:39 2015 +0900 configure: Build binaries as PIE on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 ++++++++++--------------- configure.ac | 9 ++------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 3d3dfc9..3a5a309 100755 --- a/configure +++ b/configure @@ -8350,36 +8350,31 @@ $as_echo "$ac_cv_cflags__Wl___enable_new_dtags" >&6; } if test "x$ac_cv_cflags__Wl___enable_new_dtags" = xyes; then : LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags" fi - - case $host_cpu in - *i[3456789]86* | x86_64) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5 -$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; } -if ${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-pie" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-pie... " >&6; } +if ${ac_cv_cflags__Wl__pie+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" +CFLAGS="$CFLAGS -Wl,-pie" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes + ac_cv_cflags__Wl__pie=yes else - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no + ac_cv_cflags__Wl__pie=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5 -$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; } -if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then : - LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__pie" >&5 +$as_echo "$ac_cv_cflags__Wl__pie" >&6; } +if test "x$ac_cv_cflags__Wl__pie" = xyes; then : + LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,-pie" fi - ;; - esac LIBWINE_SHAREDLIB="libwine.so" diff --git a/configure.ac b/configure.ac index 7d2449f..8bdfade 100644 --- a/configure.ac +++ b/configure.ac @@ -860,13 +860,8 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,--enable-new-dtags], [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) - - case $host_cpu in - *i[[3456789]]86* | x86_64) - WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], - [LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"]) - ;; - esac + WINE_TRY_CFLAGS([-Wl,-pie], + [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,-pie"]) AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so") AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so")

1 0

Alexandre Julliard : make_makefiles: Configure substitutions are allowed in the top makefile.
by Alexandre Julliard 17 Nov '15

17 Nov '15

Module: wine Branch: master Commit: a30feab7d737c5f121d0127fdd0ddf2eee8f7d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30feab7d737c5f121d0127fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:45:14 2015 +0900 make_makefiles: Configure substitutions are allowed in the top makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 78b6dea..e65429f 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -202,7 +202,7 @@ sub parse_makefile($) if (/\@[A-Z_]+\@/) # config.status substitution variable { - die "Configure substitution is not allowed in $file"; + die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) {

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015