From: Tobias Schmidl <T.Schmidl@erhardt-leimer.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/2] Improved support for boost.python
Date: Tue, 26 Jan 2016 14:22:19 +0100 [thread overview]
Message-ID: <OF308D76E0.0782B79D-ONC1257F46.0049744C-C1257F46.0049744D@erhardt-leimer.com> (raw)
In-Reply-To:
This works both against python2 and python3.
Signed-off-by: Tobias Schmidl <T.Schmidl@erhardt-leimer.com>
---
rules/boost.in | 4 ++--
rules/boost.make | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/rules/boost.in b/rules/boost.in
index f1ceeb0..ded0317 100644
--- a/rules/boost.in
+++ b/rules/boost.in
@@ -246,7 +246,7 @@ config BOOST_WAVE
config BOOST_PYTHON
bool
prompt "python"
- depends on BROKEN
+ depends on PYTHON || PYTHON3
help
- boost python support (still broken)
+ boost python support
endif
diff --git a/rules/boost.make b/rules/boost.make
index a1c4d17..3bc3efb 100644
--- a/rules/boost.make
+++ b/rules/boost.make
@@ -131,8 +131,20 @@ BOOST_CONF_OPT := \
$(STATEDIR)/boost.prepare:
@$(call targetinfo)
cd $(BOOST_DIR) && ./bootstrap.sh $(BOOST_CONF_OPT)
+
@cd $(BOOST_DIR) && \
echo "using gcc : $(PTXCONF_ARCH_STRING) : $(CROSS_CXX) ;" > $(BOOST_DIR)/user-config.jam
+
+ifdef PTXCONF_BOOST_PYTHON
+ifdef PTXCONF_PYTHON3
+ @cd $(BOOST_DIR) && \
+ echo "using python : $(PYTHON3_MAJORMINOR) : $(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR)m : $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
+else
+ @cd $(BOOST_DIR) && \
+ echo "using python : $(PYTHON_MAJORMINOR) : $(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON_MAJORMINOR)m : $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR) ;" >> $(BOOST_DIR)/user-config.jam
+endif
+endif
+
@echo "all:" > $(BOOST_DIR)/Makefile
@echo ' @$(BOOST_JAM) $(JAM_MAKE_OPT)' >> $(BOOST_DIR)/Makefile
@echo "install:" >> $(BOOST_DIR)/Makefile
@@ -156,7 +168,7 @@ $(STATEDIR)/boost.targetinstall:
@$(call install_init, boost)
@$(call install_fixup, boost,PRIORITY,optional)
- @$(call install_fixup, boost,SECTION,base)
+ @$(call install_fixup, boost,SECTION,system_libraries)
@$(call install_fixup, boost,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, boost,DESCRIPTION,missing)
@@ -211,4 +223,5 @@ $(STATEDIR)/boost.targetinstall:
@$(call touch)
+# kate: syntax Makefile
# vim: syntax=make
--
2.1.4
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2016-01-26 13:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 13:22 Tobias Schmidl [this message]
2016-02-01 13:45 ` Michael Olbrich
2016-02-10 8:51 ` [ptxdist] Antwort: " Tobias Schmidl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=OF308D76E0.0782B79D-ONC1257F46.0049744C-C1257F46.0049744D@erhardt-leimer.com \
--to=t.schmidl@erhardt-leimer.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox