wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 52a99f2eadf04394a99d81f97a9a6d2a454fa959.

Browse Source 
[api-ms-win-Stub_DLLs]
Removed multiple api-ms-win stub dlls (accepted upstream).

[kernel32-QT_Environment_Variables]
Removed patch to avoid inheritance of QT_ environment variables from host
environment to Wine (accepted upstream).

[kernel32-VirtualProtect]
Removed patch to allow to pass NULL as old protection to VirtualProtect for
Win9x compatibility (accepted upstream).

[services-SERVICE_FILE_SYSTEM_DRIVER]
Removed patch to load SERVICE_FILE_SYSTEM_DRIVER services with winedevice
(accepted upstream).

[wpcap-Several_Fixes]
Removed patch to fix possible crash in pcap_loop (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-02-17 02:20:12 +01:00
parent bcf8079573
commit 5a7d29e22e
35 changed files with 199 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
View File

@@ -1,23 +1,25 @@
From 0ca9f8bf78340991e99d8f020c5f04d2029a4177 Mon Sep 17 00:00:00 2001
From 4d6ccf2ed54cd7816a9eb304d74398cc8cdbea89 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 17 Dec 2014 04:11:58 +0100
Subject: makedep: Add support for PARENTSPEC Makefile variable.
---
tools/makedep.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
tools/makedep.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index 54aab45..d68bc03 100644
index 9fd704b..71e88e9 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -162,4 +162,5 @@ struct makefile
@@ -169,6 +169,7 @@ struct makefile
const char *top_src_dir;
const char *top_obj_dir;
const char *parent_dir;
+ const char *parent_spec;
const char *module;
const char *testdll;
@@ -2081,7 +2082,13 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
const char *sharedlib;
@@ -2473,7 +2474,12 @@ static struct strarray output_sources( const struct makefile *make )
char *spec_file = NULL;
if (!make->appmode.count)
@@ -28,16 +30,17 @@ index 54aab45..d68bc03 100644
+ else
+ spec_file = src_dir_path( make, make->parent_spec );
+ }
+
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 ));
for (i = 0; i < make->delayimports.count; i++)
strarray_add( &all_libs, strmake( "-l%s", make->delayimports.str[i] ));
for (i = 0; i < make->imports.count; i++)
@@ -2598,4 +2605,5 @@ static void update_makefile( const char *path )
@@ -3188,6 +3194,7 @@ static void load_sources( struct makefile *make )
strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" ));
make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" );
+ make->parent_spec = get_expanded_make_variable( make, "PARENTSPEC" );
make->module = get_expanded_make_variable( make, "MODULE" );
make->testdll = get_expanded_make_variable( make, "TESTDLL" );
make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" );
--
2.1.3
2.7.1