summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bento.info2
-rw-r--r--bscript12
-rw-r--r--numpy/build_utils/waf.py2
3 files changed, 2 insertions, 14 deletions
diff --git a/bento.info b/bento.info
index 4f5057263..f8f0257ae 100644
--- a/bento.info
+++ b/bento.info
@@ -70,8 +70,8 @@ DataFiles: tests
testing/tests/*.py
HookFile: bscript
-
Recurse: numpy
+UseBackends: Waf
Library:
Packages:
diff --git a/bscript b/bscript
index 205414c23..167a75125 100644
--- a/bscript
+++ b/bscript
@@ -26,9 +26,6 @@ from bento.installed_package_description \
import \
InstalledSection
from bento.commands import hooks
-from bento.commands.extras.waf \
- import \
- ConfigureWafContext, BuildWafContext, register_options
import waflib
@@ -202,12 +199,3 @@ def show():
pass
""",
always=True)
-
-@hooks.options
-def options(context):
- register_options(context)
-
-@hooks.startup
-def startup(context):
- context.register_context("configure", ConfigureWafContext)
- context.register_context("build", BuildWafContext)
diff --git a/numpy/build_utils/waf.py b/numpy/build_utils/waf.py
index c1eb23801..051cf27e0 100644
--- a/numpy/build_utils/waf.py
+++ b/numpy/build_utils/waf.py
@@ -497,7 +497,7 @@ def define_cond(self, name, value, comment):
self.undefine(name)
@waflib.Configure.conf
-def get_config_header(self, defines=True, headers=False):
+def get_config_header(self, defines=True, headers=False, define_prefix=None):
"""
Create the contents of a ``config.h`` file from the defines and includes
set in conf.env.define_key / conf.env.include_key. No include guards are added.