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 avoid generating Makefiles for disabled rules.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-03-06 06:22:13 +01:00
parent eb1782851b
commit fed947e87c
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/makefiles-Disabled_Rules/0001-makefiles-Do-not-generate-Makefile-for-disabled-rule.patch Normal file
View File

@ -0,0 +1,24 @@
From 6356a5fdb13f638ed0f2072fd12dfc6ca0e66935 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 6 Mar 2016 06:17:31 +0100
Subject: makefiles: Do not generate Makefile for disabled rules.
---
aclocal.m4 | 1 -
1 file changed, 1 deletion(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 00eeb98..36c123b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -284,7 +284,6 @@ wine_fn_disabled_rules ()
{
ac_clean=$[@]
- wine_fn_append_file SUBDIRS $ac_dir
wine_fn_append_file DISABLED_SUBDIRS $ac_dir
wine_fn_append_rule \
"__clean__: $ac_dir/clean
--
2.7.1

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

@ -0,0 +1 @@
Fixes: [40253] Avoid generating Makefiles for disabled rules

19
patches/patchinstall.sh
View File

@ -183,6 +183,7 @@ patch_enable_all ()
enable_libs_Debug_Channel="$1"
enable_libs_Unicode_Collation="$1"
enable_makedep_PARENTSPEC="$1"
enable_makefiles_Disabled_Rules="$1"
enable_mfplat_MFTRegister="$1"
enable_mmdevapi_AEV_Stubs="$1"
enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
@ -708,6 +709,9 @@ patch_enable ()
makedep-PARENTSPEC)
enable_makedep_PARENTSPEC="$2"
;;
makefiles-Disabled_Rules)
enable_makefiles_Disabled_Rules="$2"
;;
mfplat-MFTRegister)
enable_mfplat_MFTRegister="$2"
;;
@ -4306,6 +4310,21 @@ if test "$enable_makedep_PARENTSPEC" -eq 1; then
) >> "$patchlist"
fi
# Patchset makefiles-Disabled_Rules
# |
# | This patchset fixes the following Wine bugs:
# | * [#40253] Avoid generating Makefiles for disabled rules
# |
# | Modified files:
# | * aclocal.m4
# |
if test "$enable_makefiles_Disabled_Rules" -eq 1; then
patch_apply makefiles-Disabled_Rules/0001-makefiles-Do-not-generate-Makefile-for-disabled-rule.patch
(
echo '+ { "Sebastian Lackner", "makefiles: Do not generate Makefile for disabled rules.", 1 },';
) >> "$patchlist"
fi
# Patchset mfplat-MFTRegister
# |
# | This patchset fixes the following Wine bugs: