Opened 18 months ago

Closed 17 months ago

Last modified 17 months ago

#25859 closed enhancement (fixed)

Clean up zlib's build script

Reported by: gk Owned by: tbb-team
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: tbb-rbm, TorBrowserTeam201806R, boklm201806
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

We should clean up the compile and link flags zlib build script:

1) CFLAGS and LDFLAGS seem to be unused, rather LOC is taken to define those.
2) Given 1) we could just assign the relevant flags to LOC and omit CFLAGS and LDFLAGS entirely AND we can omit spelling LOC out twice (once in the make command and once in the make install command).
3) While we are at it, just doing a make install might be enough.
4) No need to hard-code -j4.

Child Tickets

Change History (10)

comment:1 Changed 18 months ago by gk

We can set flag_mwindows to '' I suppose.

comment:2 Changed 17 months ago by boklm

Keywords: boklm201805 TorBrowserTeam201805R added

comment:3 Changed 17 months ago by boklm

Status: newneeds_review

There is a patch for review in branch bug_25859_v2:
https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_25859_v2&id=409e83dcfea7f122df6da2a2326141f6d13a9e7c

I tried removing arguments from the make install command, but it seems most files do not get installed when LOC is missing.

comment:4 Changed 17 months ago by boklm

The branch bug_25859_v2 is based on bug_16472_v15 so it will need to be cherry-picked if #16472 needs revision.

comment:6 Changed 17 months ago by gk

Keywords: TorBrowserTeam201806R added; TorBrowserTeam201805R removed

Moving review tickets to June.

comment:7 Changed 17 months ago by boklm

Keywords: boklm201806 added; boklm201805 removed

boklm201805 -> boklm201806

comment:8 Changed 17 months ago by gk

Resolution: fixed
Status: needs_reviewclosed

Looks good to me. Merge to master with commit fb97d6c9141d3a824954b2e2952974daeada26d7.

comment:10 in reply to:  9 Changed 17 months ago by gk

Replying to cypherpunks:

https://bugzilla.mozilla.org/show_bug.cgi?id=1328099

Yes, I think you are right it's time we look into updating zlib as well. I opened #26304 for that.

Note: See TracTickets for help on using tickets.