mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

concat-deps: tweak boost handling to depend on unpacked target

Browse Source 
Change-Id: Iae93f7a81959a5d9c23e9bddb65e6154655374e6
This commit is contained in:
Michael Stahl
2012-11-07 18:11:37 +01:00
parent a8f357cffd
commit eed17d1f23
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
solenv/bin/concat-deps.c
View File

@@ -113,7 +113,7 @@
int internal_boost = 0;
static char* base_dir;
static char* out_dir;
static char* work_dir;
#ifdef __GNUC__
#define clz __builtin_clz
@@ -785,13 +785,13 @@ elide_dependency(const char* key, int key_len,
}
/*
* We collapse tens of internal boost headers to a single one, such
* We collapse tens of internal boost headers to the unpacked target, such
* that you can re-compile / install boost and all is well.
*/
static void emit_single_boost_header(void)
{
#define BOOST_HEADER "/inc/external/boost/bind.hpp"
fprintf(stdout, "%s" BOOST_HEADER " ", out_dir);
#define BOOST_TARGET "/UnpackedTarball/boost.done"
fprintf(stdout, "%s" BOOST_TARGET " ", work_dir);
}
static void emit_unpacked_target(char const*const token, char const*const end)
@@ -1038,7 +1038,7 @@ const char *env_str;
_usage();
return 1;
}
if(get_var(&base_dir, "SRCDIR") || get_var(&out_dir, "OUTDIR"))
if(get_var(&base_dir, "SRCDIR") || get_var(&work_dir, "WORKDIR"))
return 1;
env_str = getenv("SYSTEM_BOOST");