wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to revert commit to import libwine only for Windows builds.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-03-13 21:04:42 +01:00
parent 43ea36154f
commit 3e9dbe47e7
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
patches/makefiles-Revert_libwine_Import/0001-Revert-makefiles-Explicitly-import-libwine-only-for-.patch Normal file
View File

@ -0,0 +1,44 @@
From 6ed4b42de6f399c2d0a999a5eb1d703b96849940 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Sun, 13 Mar 2016 13:41:21 -0600
Subject: Revert "makefiles: Explicitly import libwine only for Windows
builds."
This reverts commit 3ebbfd5b6b96877c06de5fab9ec88fd6252d7787.
Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
---
tools/makedep.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index 8cbba1b..43b11a7 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2653,12 +2653,13 @@ static struct strarray output_sources( const struct makefile *make )
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 ));
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 ));
add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */
+ for (i = 0; i < make->delayimports.count; i++)
+ strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] ));
+ strarray_add( &all_libs, "-lwine" );
strarray_addall( &all_libs, add_default_libraries( make, &dep_libs ));
if (*dll_ext)
{
- for (i = 0; i < make->delayimports.count; i++)
- strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] ));
strarray_add( &all_targets, strmake( "%s%s", make->module, dll_ext ));
strarray_add( &all_targets, strmake( "%s.fake", make->module ));
add_install_rule( make, install_rules, make->module, strmake( "%s%s", make->module, dll_ext ),
@@ -2669,7 +2670,6 @@ static struct strarray output_sources( const struct makefile *make )
}
else
{
- strarray_add( &all_libs, "-lwine" );
strarray_add( &all_targets, make->module );
add_install_rule( make, install_rules, make->module, make->module,
strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module ));
--
2.7.1

1
patches/makefiles-Revert_libwine_Import/definition Normal file
View File

@ -0,0 +1 @@
Fixes: Revert commit to import libwine only for Windows builds

16
patches/patchinstall.sh
View File

@ -186,6 +186,7 @@ patch_enable_all ()
enable_libs_Debug_Channel="$1"
enable_libs_Unicode_Collation="$1"
enable_makedep_PARENTSPEC="$1"
enable_makefiles_Revert_libwine_Import="$1"
enable_mfplat_MFTRegister="$1"
enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
enable_mountmgr_DosDevices="$1"
@ -724,6 +725,9 @@ patch_enable ()
makedep-PARENTSPEC)
enable_makedep_PARENTSPEC="$2"
;;
makefiles-Revert_libwine_Import)
enable_makefiles_Revert_libwine_Import="$2"
;;
mfplat-MFTRegister)
enable_mfplat_MFTRegister="$2"
;;
@ -4390,6 +4394,18 @@ if test "$enable_makedep_PARENTSPEC" -eq 1; then
) >> "$patchlist"
fi
# Patchset makefiles-Revert_libwine_Import
# |
# | Modified files:
# | * tools/makedep.c
# |
if test "$enable_makefiles_Revert_libwine_Import" -eq 1; then
patch_apply makefiles-Revert_libwine_Import/0001-Revert-makefiles-Explicitly-import-libwine-only-for-.patch
(
echo '+ { "Erich E. Hoover", "Revert \"makefiles: Explicitly import libwine only for Windows builds.\".", 1 },';
) >> "$patchlist"
fi
# Patchset mfplat-MFTRegister
# |
# | This patchset fixes the following Wine bugs: