diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-29 16:01:48 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-30 12:21:11 +0100 |
| commit | 9e6ea09683e5f20c5d5501f8bb5bca569eae0975 (patch) | |
| tree | 9ae918126721f2026725341b7dd36e40a0491a7f /rules/boost.make | |
| parent | 00f4e67047cd2a9b2796e983eb5e6ab1fd9fead2 (diff) | |
| download | ptxdist-9e6ea09683e5f20c5d5501f8bb5bca569eae0975.tar.gz ptxdist-9e6ea09683e5f20c5d5501f8bb5bca569eae0975.tar.xz | |
[boost] cleanup makefile
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/boost.make')
| -rw-r--r-- | rules/boost.make | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/rules/boost.make b/rules/boost.make index 19e816302..1a26dc523 100644 --- a/rules/boost.make +++ b/rules/boost.make @@ -73,7 +73,7 @@ BOOST_LIBRARIES-$(PTXCONF_BOOST_GRAPH) += graph BOOST_CONF := \ --with-bjam="$(BOOST_JAM)" \ - --prefix="$(SYSROOT)/usr" \ + --prefix="$(PKGDIR)/$(BOOST)/usr" \ --with-libraries="$(subst $(space),$(comma),$(BOOST_LIBRARIES-y))" \ --without-icu @@ -127,43 +127,43 @@ $(STATEDIR)/boost.targetinstall: @for BOOST_LIB in $(BOOST_INST_LIBRARIES); do \ read BOOST_LIB <<< $$BOOST_LIB; \ if [ ! -z $(PTXCONF_BOOST_INST_NOMT_DBG) ]; then \ - for SO_FILE in `find $(BOOST_DIR)/bin.v2/libs/$$BOOST_LIB/ \ - -name "*.so.*" -type f -path "*debug*" ! -path "*threading*"`; do \ - $(call install_copy, boost, 0, 0, 0644, $$SO_FILE,\ + for SO_FILE in `find $(BOOST_PKGDIR) -name "libboost_$$BOOST_LIB*.so.*" \ + -type f -name "*-d-*" ! -name "*-mt-*"`; do \ + $(call install_copy, boost, 0, 0, 0644, -,\ /usr/lib/$$(basename $$SO_FILE)); \ - $(call install_link, boost, \ - $$(basename $$SO_FILE), \ - /usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \ + $(call install_link, boost, \ + $$(basename $$SO_FILE), \ + /usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \ done; \ fi; \ if [ ! -z $(PTXCONF_BOOST_INST_NOMT_RED) ]; then \ - for SO_FILE in `find $(BOOST_DIR)/bin.v2/libs/$$BOOST_LIB/ \ - -name "*.so.*" -type f -path "*profile*" ! -path "*threading*"`; do \ - $(call install_copy, boost, 0, 0, 0644, $$SO_FILE,\ + for SO_FILE in `find $(BOOST_PKGDIR) -name "libboost_$$BOOST_LIB*.so.*" \ + -type f ! -name "*-d-*" ! -name "*-mt-*"`; do \ + $(call install_copy, boost, 0, 0, 0644, -,\ /usr/lib/$$(basename $$SO_FILE)); \ - $(call install_link, boost, \ - $$(basename $$SO_FILE), \ - /usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \ + $(call install_link, boost, \ + $$(basename $$SO_FILE), \ + /usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \ done; \ fi; \ if [ ! -z $(PTXCONF_BOOST_INST_MT_DBG) ]; then \ - for SO_FILE in `find $(BOOST_DIR)/bin.v2/libs/$$BOOST_LIB/ \ - -name "*.so.*" -type f -path "*debug*" -path "*threading*"`; do \ - $(call install_copy, boost, 0, 0, 0644, $$SO_FILE,\ + for SO_FILE in `find $(BOOST_PKGDIR) -name "libboost_$$BOOST_LIB*.so.*" \ + -type f -name "*-d-*" -name "*-mt-*"`; do \ + $(call install_copy, boost, 0, 0, 0644, -,\ /usr/lib/$$(basename $$SO_FILE)); \ - $(call install_link, boost, \ - $$(basename $$SO_FILE), \ - /usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \ + $(call install_link, boost, \ + $$(basename $$SO_FILE), \ + /usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \ done; \ fi; \ if [ ! -z $(PTXCONF_BOOST_INST_MT_RED) ]; then \ - for SO_FILE in `find $(BOOST_DIR)/bin.v2/libs/$$BOOST_LIB/ \ - -name "*.so.*" -type f -path "*profile*" -path "*threading*"`; do \ - $(call install_copy, boost, 0, 0, 0644, $$SO_FILE,\ + for SO_FILE in `find $(BOOST_PKGDIR) -name "libboost_$$BOOST_LIB*.so.*" \ + -type f ! -name "*-d-*" -name "*-mt-*"`; do \ + $(call install_copy, boost, 0, 0, 0644, -,\ /usr/lib/$$(basename $$SO_FILE)); \ - $(call install_link, boost, \ - $$(basename $$SO_FILE), \ - /usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \ + $(call install_link, boost, \ + $$(basename $$SO_FILE), \ + /usr/lib/$$(echo `basename $$SO_FILE` | cut -f 1 -d .).so); \ done; \ fi; \ done |