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 7276d5fac1417dd81344db45b3af904f8f2c7d77.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-02-23 20:36:03 +01:00
parent 1a216277ee
commit e88eba680b
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 4d6ccf2ed54cd7816a9eb304d74398cc8cdbea89 Mon Sep 17 00:00:00 2001
From 8d7b3fda16e6f652e079433ef7653537cdcbe6d1 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.
@@ -8,7 +8,7 @@ Subject: makedep: Add support for PARENTSPEC Makefile variable.
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index 9fd704b..71e88e9 100644
index e1897bc..5540b91 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -169,6 +169,7 @@ struct makefile
@@ -19,7 +19,7 @@ index 9fd704b..71e88e9 100644
const char *module;
const char *testdll;
const char *sharedlib;
@@ -2473,7 +2474,12 @@ static struct strarray output_sources( const struct makefile *make )
@@ -2541,7 +2542,12 @@ static struct strarray output_sources( const struct makefile *make )
char *spec_file = NULL;
if (!make->appmode.count)
@@ -32,8 +32,8 @@ index 9fd704b..71e88e9 100644
+ }
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++)
@@ -3188,6 +3194,7 @@ static void load_sources( struct makefile *make )
add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */
@@ -3252,6 +3258,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" );