diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-04-22 12:51:13 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-04-22 12:51:13 +0200 |
| commit | 7ac042aaa117dd702c682cf9ef3b90374b384f37 (patch) | |
| tree | d782577e2d35eb6a27e65c3553c086b618e16750 /build/import/libboost/regex | |
| parent | 9bee16eff6e972a69093ae8e854619986c315581 (diff) | |
Update boost import stub
Diffstat (limited to 'build/import/libboost/regex')
| -rw-r--r-- | build/import/libboost/regex/rules.make | 18 | ||||
| -rw-r--r-- | build/import/libboost/regex/stub.make | 6 |
2 files changed, 20 insertions, 4 deletions
diff --git a/build/import/libboost/regex/rules.make b/build/import/libboost/regex/rules.make index 3b5a0f8..2f6b8f7 100644 --- a/build/import/libboost/regex/rules.make +++ b/build/import/libboost/regex/rules.make @@ -1,6 +1,6 @@ # file : build/import/libboost/regex/rules.make # author : Boris Kolpackov <boris@kolpackov.net> -# copyright : Copyright (c) 2005-2008 Boris Kolpackov +# copyright : Copyright (c) 2005-2010 Boris Kolpackov # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libboost/%: root := $(libboost_root) @@ -10,15 +10,27 @@ $(dcf_root)/import/libboost/regex/regex.l: \ ifeq ($(libboost_type),archive) +ifeq ($(libboost_system),y) +$(dcf_root)/import/libboost/regex/regex.l: \ + $(libboost_root)/stage/lib/libboost_regex$(libboost_suffix).a \ + $(libboost_root)/stage/lib/libboost_system$(libboost_suffix).a +else $(dcf_root)/import/libboost/regex/regex.l: \ $(libboost_root)/stage/lib/libboost_regex$(libboost_suffix).a - @echo $< >$@ +endif + @echo $^ >$@ else +ifeq ($(libboost_system),y) +$(dcf_root)/import/libboost/regex/regex.l: \ + $(libboost_root)/stage/lib/libboost_regex$(libboost_suffix).so \ + $(libboost_root)/stage/lib/libboost_system$(libboost_suffix).so +else $(dcf_root)/import/libboost/regex/regex.l: \ $(libboost_root)/stage/lib/libboost_regex$(libboost_suffix).so - @echo $< >$@ +endif + @echo $^ >$@ @echo rpath:$(root)/stage/lib >>$@ endif diff --git a/build/import/libboost/regex/stub.make b/build/import/libboost/regex/stub.make index 2095e33..eabc515 100644 --- a/build/import/libboost/regex/stub.make +++ b/build/import/libboost/regex/stub.make @@ -1,6 +1,6 @@ # file : build/import/libboost/regex/stub.make # author : Boris Kolpackov <boris@kolpackov.net> -# copyright : Copyright (c) 2005-2008 Boris Kolpackov +# copyright : Copyright (c) 2005-2010 Boris Kolpackov # license : GNU GPL v2; see accompanying LICENSE file $(call include-once,$(scf_root)/import/libboost/configuration-rules.make,$(dcf_root)) @@ -13,7 +13,11 @@ ifdef libboost_installed ifeq ($(libboost_installed),y) +ifeq ($(libboost_system),y) +$(call export,l: -lboost_regex$(libboost_suffix) -lboost_system$(libboost_suffix),cpp_options: ) +else $(call export,l: -lboost_regex$(libboost_suffix),cpp_options: ) +endif else |