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.

Sign up for GitHub

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

Jump to bottom

getdeps: support GETDEPS_WGET_ARGS in wget version #46

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

getdeps: support GETDEPS_WGET_ARGS in wget version #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a2adb
@nocommit: update xz (at least until D56252529 lands)
codyohl Apr 17, 2024
8aec409
getdeps: support GETDEPS_WGET_ARGS in wget version, support skipping …
codyohl Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions build/fbcode_builder/getdeps/fetcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,15 +683,18 @@ def progress_pycurl(self, total, amount, _uploadtotal, _uploadamount):
start = time.time()
try:
if os.environ.get("GETDEPS_USE_WGET") is not None:
subprocess.run(
procargs = (
[
"wget",
]
+ os.environ.get("GETDEPS_WGET_ARGS", "").split()
+ [
"-O",
file_name,
url,
]
)

subprocess.run(procargs, capture_output=True)
headers = None

elif os.environ.get("GETDEPS_USE_LIBCURL") is not None:
Expand Down
6 changes: 3 additions & 3 deletions build/fbcode_builder/manifests/xz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ xz
xz-devel

[download]
url = https://tukaani.org/xz/xz-5.2.5.tar.gz
sha256 = f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
url = https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.gz
sha256 = aeba3e03bf8140ddedf62a0a367158340520f6b384f75ca6045ccc6c0d43fd5c

[build]
builder = autoconf
subdir = xz-5.2.5
subdir = xz-5.4.6

[autoconf.args]
--disable-shared