diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-26 21:19:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-26 22:20:06 +0100 |
| commit | a53586f4efe26b8875107d04001f4ecec760c343 (patch) | |
| tree | 9b19f0ecf5b5a08cc056e3274a2eaba96894dec8 /boost | |
| parent | 20773c2bb04631d9bfd60167ed091752f0deecee (diff) | |
gbuild: do not copy boost headers around
- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus
Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/StaticLibrary_boostdatetime.mk | 2 | ||||
| -rw-r--r-- | boost/StaticLibrary_boostthread.mk | 2 | ||||
| -rw-r--r-- | boost/UnpackedTarball_boost.mk | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/boost/StaticLibrary_boostdatetime.mk b/boost/StaticLibrary_boostdatetime.mk index 1328d559ffad..bea82da1cf31 100644 --- a/boost/StaticLibrary_boostdatetime.mk +++ b/boost/StaticLibrary_boostdatetime.mk @@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_add_defs,boostdatetime,\ -DBOOST_ALL_NO_LIB \ )) -$(eval $(call gb_StaticLibrary_use_unpacked,boostdatetime,boost)) +$(eval $(call gb_StaticLibrary_use_external,boostdatetime,boost_headers)) $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp)) diff --git a/boost/StaticLibrary_boostthread.mk b/boost/StaticLibrary_boostthread.mk index 3aa4859cbcbe..41b6765e2da3 100644 --- a/boost/StaticLibrary_boostthread.mk +++ b/boost/StaticLibrary_boostthread.mk @@ -16,7 +16,7 @@ $(eval $(call gb_StaticLibrary_add_defs,boostthread,\ -DBOOST_ALL_NO_LIB \ )) -$(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost)) +$(eval $(call gb_StaticLibrary_use_external,boostthread,boost_headers)) $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostthread,cpp)) diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index 4db9aef35f0e..2fcae8c25810 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -62,8 +62,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,boost,\ $(foreach patch,$(boost_patches),boost/$(patch)) \ )) -$(eval $(call gb_UnpackedTarball_copy_header_files,boost,\ - boost \ -)) - # vim: set noet sw=4 ts=4: |