Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add argument to pass extra arguments to boost b2 build tool #403

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions build/fbcode_builder/getdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,8 @@ def run_project_cmd(self, args, loader, manifest):
else {}
)

extra_b2_args = args.extra_b2_args or []

if sources_changed or reconfigure or not os.path.exists(built_marker):
if os.path.exists(built_marker):
os.unlink(built_marker)
Expand All @@ -620,6 +622,7 @@ def run_project_cmd(self, args, loader, manifest):
loader,
final_install_prefix=loader.get_project_install_prefix(m),
extra_cmake_defines=extra_cmake_defines,
extra_b2_args=extra_b2_args,
)
builder.build(install_dirs, reconfigure=reconfigure)

Expand Down Expand Up @@ -760,6 +763,15 @@ def setup_project_cmd_parser(self, parser):
'e.g: \'{"CMAKE_CXX_FLAGS": "--bla"}\''
),
)
parser.add_argument(
"--extra-b2-args",
help=(
"Repeatable argument that contains extra arguments to pass "
"to b2, which compiles boost. "
"e.g.: 'cxxflags=-fPIC' 'cflags=-fPIC'"
),
action="append",
)
parser.add_argument(
"--shared-libs",
help="Build shared libraries if possible",
Expand Down
48 changes: 37 additions & 11 deletions build/fbcode_builder/getdeps/fetcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -525,12 +525,15 @@ def get_fbsource_repo_data(build_options) -> FbsourceRepoData:
if cached_data:
return cached_data

cmd = ["hg", "log", "-r.", "-T{node}\n{date|hgdate}"]
env = Env()
env.set("HGPLAIN", "1")
log_data = subprocess.check_output(
cmd, cwd=build_options.fbsource_dir, env=dict(env.items())
).decode("ascii")
if "GETDEPS_HG_REPO_DATA" in os.environ:
log_data = os.environ["GETDEPS_HG_REPO_DATA"]
else:
cmd = ["hg", "log", "-r.", "-T{node}\n{date|hgdate}"]
env = Env()
env.set("HGPLAIN", "1")
log_data = subprocess.check_output(
cmd, cwd=build_options.fbsource_dir, env=dict(env.items())
).decode("ascii")

(hash, datestr) = log_data.split("\n")

Expand Down Expand Up @@ -651,15 +654,14 @@ def get_src_dir(self):


def download_url_to_file_with_progress(url: str, file_name) -> None:
print("Download %s -> %s ..." % (url, file_name))
print("Download with %s -> %s ..." % (url, file_name))

class Progress(object):
last_report = 0

def progress(self, count, block, total):
def write_update(self, total, amount):
if total == -1:
total = "(Unknown)"
amount = count * block

if sys.stdout.isatty():
sys.stdout.write("\r downloading %s of %s " % (amount, total))
Expand All @@ -672,10 +674,33 @@ def progress(self, count, block, total):
self.last_report = now
sys.stdout.flush()

def progress_pycurl(self, total, amount, _uploadtotal, _uploadamount):
self.write_update(total, amount)

def progress_urllib(self, count, block, total):
amount = count * block
self.write_update(total, amount)

progress = Progress()
start = time.time()
try:
(_filename, headers) = urlretrieve(url, file_name, reporthook=progress.progress)
if os.environ.get("GETDEPS_USE_LIBCURL") is not None:
import pycurl

with open(file_name, "wb") as f:
c = pycurl.Curl()
c.setopt(pycurl.URL, url)
c.setopt(pycurl.WRITEDATA, f)
# display progress
c.setopt(pycurl.NOPROGRESS, False)
c.setopt(pycurl.XFERINFOFUNCTION, progress.progress_pycurl)
c.perform()
c.close()
headers = None
else:
(_filename, headers) = urlretrieve(
url, file_name, reporthook=progress.progress_urllib
)
except (OSError, IOError) as exc: # noqa: B014
raise TransientFailure(
"Failed to download %s to %s: %s" % (url, file_name, str(exc))
Expand All @@ -684,7 +709,8 @@ def progress(self, count, block, total):
end = time.time()
sys.stdout.write(" [Complete in %f seconds]\n" % (end - start))
sys.stdout.flush()
print(f"{headers}")
if headers is not None:
print(f"{headers}")


class ArchiveFetcher(Fetcher):
Expand Down
3 changes: 3 additions & 0 deletions build/fbcode_builder/getdeps/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ def create_builder( # noqa:C901
loader,
final_install_prefix=None,
extra_cmake_defines=None,
extra_b2_args=None,
):
builder = self.get_builder_name(ctx)
build_in_src_dir = self.get("build", "build_in_src_dir", "false", ctx=ctx)
Expand Down Expand Up @@ -527,6 +528,8 @@ def create_builder( # noqa:C901

if builder == "boost":
args = self.get_section_as_args("b2.args", ctx)
if extra_b2_args is not None:
args += extra_b2_args
return Boost(build_options, ctx, self, src_dir, build_dir, inst_dir, args)

if builder == "bistro":
Expand Down