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 538263d0efe725124df88ce1cce124bc3ad7e2af

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-20 08:24:24 +11:00
parent 852c641a59
commit 3ee8f1c014
15 changed files with 125 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,17 @@
From 8d7b3fda16e6f652e079433ef7653537cdcbe6d1 Mon Sep 17 00:00:00 2001
From 9f17847454bf81d335a318bb38464be636c5d8f1 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.
Subject: [PATCH] makedep: Add support for PARENTSPEC Makefile variable.
---
tools/makedep.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index e1897bc..5540b91 100644
index 6cb7570..09fc2de 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -169,6 +169,7 @@ struct makefile
@@ -175,6 +175,7 @@ struct makefile
const char *top_src_dir;
const char *top_obj_dir;
const char *parent_dir;
@@ -19,21 +19,21 @@ index e1897bc..5540b91 100644
const char *module;
const char *testdll;
const char *sharedlib;
@@ -2541,7 +2542,12 @@ static struct strarray output_sources( const struct makefile *make )
char *spec_file = NULL;
@@ -2913,7 +2914,12 @@ static void output_module( struct makefile *make )
unsigned int i;
if (!make->appmode.count)
- spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
+ {
+ if (!make->parent_spec)
+ spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
+ 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 ));
add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */
@@ -3252,6 +3258,7 @@ static void load_sources( struct makefile *make )
if (!make->appmode.count)
- spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
+ {
+ if (!make->parent_spec)
+ spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" ));
+ 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 ));
add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */
@@ -3693,6 +3699,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" );
@@ -42,5 +42,5 @@ index e1897bc..5540b91 100644
make->testdll = get_expanded_make_variable( make, "TESTDLL" );
make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" );
--
2.7.1
1.9.1