[PATCH 0/2] MR4487: fix makedep.c

[Fan WenJie (＠fanwenjie)]

Currently Making static unixlib when runninng `make install`. Disable building static unixlib for host arch can solve the problem.

Auto generate *.lib in .gitignore

Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4487

[PATCH 1/2] makedep: disable build static unixlib for native arch

[Fan WenJie]

From: Fan WenJie <fanwj(a)mail.ustc.edu.cn>

---
 tools/makedep.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 8ce575b15ca..f43ae410685 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3774,7 +3774,7 @@ static void output_sources( struct makefile *make )
     /* special case for winetest: add resource files from other test dirs */
     if (make->obj_dir && !strcmp( make->obj_dir, "programs/winetest" ))
     {
-        for (arch = 0; arch < archs.count; arch++)
+        for (arch = 1; arch < archs.count; arch++)
         {
             if (!is_multiarch( arch )) continue;
             for (i = 0; i < subdirs.count; i++)
@@ -3800,13 +3800,13 @@ static void output_sources( struct makefile *make )
 
     if (make->staticlib)
     {
-        for (arch = 0; arch < archs.count; arch++)
+        for (arch = 1; arch < archs.count; arch++)
             if (is_multiarch( arch ) || (so_dll_supported && !make->extlib))
                 output_static_lib( make, arch );
     }
     else if (make->module)
     {
-        for (arch = 0; arch < archs.count; arch++)
+        for (arch = 1; arch < archs.count; arch++)
         {
             if (is_multiarch( arch )) output_module( make, arch );
             if (make->importlib && (is_multiarch( arch ) || !is_native_arch_disabled( make )))
@@ -3821,7 +3821,7 @@ static void output_sources( struct makefile *make )
     }
     else if (make->testdll)
     {
-        for (arch = 0; arch < archs.count; arch++)
+        for (arch = 1; arch < archs.count; arch++)
             if (is_multiarch( arch )) output_test_module( make, arch );
     }
     else if (make->programs.count) output_programs( make );
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/4487

[PATCH 2/2] tools/makedep: add *.lib to .gitignore

[Fan WenJie]

From: Fan WenJie <fanwj(a)mail.ustc.edu.cn>

Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn>
---
 tools/makedep.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/makedep.c b/tools/makedep.c
index f43ae410685..7eb9bb0657b 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -4034,6 +4034,7 @@ static void output_gitignore( const char *dest, struct strarray files )
     output_file = create_temp_file( dest );
 
     output( "# Automatically generated by make depend; DO NOT EDIT!!\n" );
+    output( "*.lib\n" );
     for (i = 0; i < files.count; i++)
     {
         if (!strchr( files.str[i], '/' )) output( "/" );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4487

[PATCH 0/2] MR4487: fix makedep.c - closed

[Alexandre Julliard (＠julliard)]

This merge request was closed by Alexandre Julliard.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4487

[Alexandre Julliard (＠julliard)]

Unix libs are necessary for Winelib. You can use `make install-lib` if you don't need that.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4487#note_53683