Module: wine
Branch: master
Commit: 07c9dd9bdf560f86598aa496a0ffaec6bb8479fa
URL: https://source.winehq.org/git/wine.git/?a=commit;h=07c9dd9bdf560f86598aa496…
Author: Gerald Pfeifer <gerald(a)pfeifer.com>
Date: Tue Nov 23 21:07:18 2021 +0100
configure: Diagnose if NetAPI is not present.
For most other configure options we are warning when some dependency
is not present, in particular when it's been explicitly requested.
Also do this for Samba NetAPI now.
Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
configure | 11 +++++++++++
configure.ac | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/configure b/configure
index 67bcd371525..a38178fb466 100755
--- a/configure
+++ b/configure
@@ -17417,6 +17417,17 @@ fi
CPPFLAGS=$ac_save_CPPFLAGS
fi
+if test "x$ac_cv_lib_soname_netapi" != xyes
+then :
+ case "x$with_netapi" in
+ x) as_fn_append wine_notices "|libnetapi not found, Samba NetAPI won't be supported." ;;
+ xno) ;;
+ *) as_fn_error $? "libnetapi not found, Samba NetAPI won't be supported.
+This is an error since --with-netapi was requested." "$LINENO" 5 ;;
+esac
+enable_netapi=${enable_netapi:-no}
+fi
+
if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \
"x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono
diff --git a/configure.ac b/configure.ac
index b69f738ebca..60d92ec7f03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1711,6 +1711,10 @@ then
WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,,
[WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])])
fi
+WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_soname_netapi" != xyes],
+ [libnetapi not found, Samba NetAPI won't be supported.],
+ [enable_netapi])
+
dnl **** Check for any sound system ****
if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \
Module: wine
Branch: master
Commit: 64534e9b5bc9b31c9efb55b45c9f1a3364b9d326
URL: https://source.winehq.org/git/wine.git/?a=commit;h=64534e9b5bc9b31c9efb55b4…
Author: Piotr Caban <piotr(a)codeweavers.com>
Date: Sun Nov 28 16:19:34 2021 +0100
make_specfiles: Merge -arch options if there are multiple exports with the same name.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
tools/make_specfiles | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 019f16d3f14..49a032ef14c 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -578,7 +578,24 @@ sub read_spec_file($)
next unless %descr;
my $func = $descr{name};
- next if defined $funcs{$func};
+ if (defined $funcs{$func})
+ {
+ my %update = %{$funcs{$func}};
+ next if $update{ordinal} ne $descr{ordinal} or $update{callconv} ne $descr{callconv} or $update{args} ne $descr{args};
+
+ my $arch = $1 if $update{flags} =~ /-arch=(\S+)/;
+ my $new_arch = $1 if $descr{flags} =~ /-arch=(\S+)/;
+ next if !defined $arch or !defined $new_arch;
+
+ if (($arch eq "win32" and $new_arch eq "win64") or ($arch eq "win64" and $new_arch eq "win32"))
+ {
+ $funcs{$func}{flags} =~ s/-arch=\S+\s+//;
+ next;
+ }
+
+ $funcs{$func}{flags} =~ s/-arch=$arch/-arch=$arch,$new_arch/;
+ next;
+ }
next if $func eq "@";
$funcs{$func} = \%descr;
}