diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 705a5fc55b3fa..0000000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ -# Please fill out one of the templates on: https://github.com/Homebrew/homebrew-core/issues/new/choose or we will close it without comment. diff --git a/.github/ISSUE_TEMPLATE/bottle.md b/.github/ISSUE_TEMPLATE/bottle.md new file mode 100644 index 0000000000000..b61b4dbc13d80 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bottle.md @@ -0,0 +1,14 @@ +--- +name: New issue for Bottle Request +about: "Submit a request for a bottle" +title: "FORMULA: Request for a bottle" +labels: bottle + +--- + + +**Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.** + +- [ ] checked that there aren't other open issues for the same formula bottle request? +- [ ] does the FORMULA not have the `bottle` block? +- [ ] ran `brew install FORMULA` and it succeeded? diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 2319d1cec9b32..d4ac751e29742 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -10,6 +10,6 @@ contact_links: - name: New issue on Homebrew/homebrew-cask url: https://github.com/Homebrew/homebrew-cask/issues/new/choose about: Having a `brew cask` problem? Report it to Homebrew/homebrew-cask (the cask tap/repository) -- name: New issue on Homebrew/linuxbrew-core - url: https://github.com/Homebrew/linuxbrew-core/issues/new/choose - about: On Linux? Having a `brew` problem with a `brew install` or `brew upgrade` of a single formula/package? Report it to Homebrew/linuxbrew-core (the Linux core tap/repository). +- name: New issue on Homebrew/homebrew-core + url: https://github.com/Homebrew/homebrew-core/issues/new/choose + about: On macOS? Having a `brew` problem with a `brew install` or `brew upgrade` of a single formula/package? Report it to Homebrew/homebrew-core (the macOS core tap/repository). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index eea0731d26f47..2eab8b0c32858 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,7 +1,8 @@ -- [ ] Have you followed the [guidelines for contributing](https://github.com/Homebrew/homebrew-core/blob/HEAD/CONTRIBUTING.md)? -- [ ] Have you checked that there aren't other open [pull requests](https://github.com/Homebrew/homebrew-core/pulls) for the same formula update/change? +- [ ] Have you followed the [guidelines for contributing](https://github.com/Homebrew/linuxbrew-core/blob/HEAD/CONTRIBUTING.md)? +- [ ] Have you checked that there aren't other open [pull requests](https://github.com/Homebrew/linuxbrew-core/pulls) for the same formula update/change? - [ ] Have you built your formula locally with `brew install --build-from-source `, where `` is the name of the formula you're submitting? - [ ] Is your test running fine `brew test `, where `` is the name of the formula you're submitting? - [ ] Does your build pass `brew audit --strict ` (after doing `brew install `)? +- [ ] Have you included the output of `brew gist-logs ` of the build failure if your PR fixes a build failure. Please quote the exact error message. ----- diff --git a/.github/workflows/dispatch-build-bottle.yml b/.github/workflows/dispatch-build-bottle.yml new file mode 100644 index 0000000000000..431e3971401fd --- /dev/null +++ b/.github/workflows/dispatch-build-bottle.yml @@ -0,0 +1,108 @@ +name: Build bottles from 'brew request-bottle' trigger. + +on: repository_dispatch + +jobs: + bottling: + runs-on: ubuntu-latest + container: + image: homebrew/ubuntu16.04:master + env: + HOMEBREW_PATCHELF_RB: 1 + steps: + # Printing these details should always be the first step listed. + - name: ${{github.event.client_payload.formula}} + id: print_details + run: | + echo formula=${{github.event.client_payload.formula}} + echo sender=${{github.event.sender.login}} + echo name=${{github.event.client_payload.name}} + echo ignore-errors=${{github.event.client_payload.ignore_errors}} + echo issue=${{github.event.client_payload.issue}} + - name: Build bottles + run: | + mkdir ~/bottles + cd ~/bottles + brew update-reset + brew test-bot \ + --only-formulae \ + --keep-old \ + ${{github.event.client_payload.formula}} + - name: Copy bottles + if: always() + run: | + cp -a ~/bottles $GITHUB_WORKSPACE + - name: Upload bottles + if: always() + uses: actions/upload-artifact@v1 + with: + name: bottles + path: bottles + - name: Upload bottles to Bintray + env: + HOMEBREW_BINTRAY_USER: LinuxbrewTestBot + HOMEBREW_BINTRAY_KEY: ${{secrets.HOMEBREW_BINTRAY_KEY}} + if: success() || github.event.client_payload.ignore_errors + run: | + cd ~/bottles + brew update-reset $(brew --repo ${{github.repository}}) + brew test-bot \ + --bintray-org=linuxbrew \ + --ci-upload \ + --publish \ + --keep-old \ + ${{github.event.client_payload.formula}} + - name: Push bottles + env: + GIT_COMMITTER_NAME: ${{github.event.client_payload.name}} + GIT_COMMITTER_EMAIL: ${{github.event.client_payload.email}} + if: success() || github.event.client_payload.ignore_errors + run: | + export PATH=/usr/bin:$PATH + cd $(brew --repo ${{github.repository}}) + git commit --amend --no-edit + git show --pretty=fuller + for try in $(seq 20); do + git fetch + git rebase origin/master + if git push https://x-access-token:${{secrets.HOMEBREW_GITHUB_API_TOKEN}}@github.com/${{github.repository}} master; then + exit 0 + else + max=$(( $try + 10 )) + sleep $(shuf -i 3-$max -n 1) + fi + done + exit 1 + - name: Post comment on failure + if: failure() && github.event.client_payload.issue > 0 + uses: actions/github-script@0.8.0 + env: + ISSUE_NUMBER: ${{github.event.client_payload.issue}} + FORMULA: ${{github.event.client_payload.formula}} + with: + github-token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} + script: | + const run_id = process.env.GITHUB_RUN_ID + const actor = process.env.GITHUB_ACTOR + const issue_number = process.env.ISSUE_NUMBER + const formula = process.env.FORMULA + console.log("run_id=" + run_id) + console.log("actor=" + actor) + console.log("issue=" + issue_number) + console.log("formula=" + formula) + + const issue = await github.issues.get({ + ...context.repo, + issue_number: issue_number + }) + + const ping = (actor == "BrewTestBot") ? issue.data.user.login : actor + + const repository = context.repo.owner + '/' + context.repo.repo + const url = 'https://github.com/' + repository + '/actions/runs/' + run_id + + await github.issues.createComment({ + ...context.repo, + issue_number: issue_number, + body: '@' + ping + ' bottle request for ' + formula + ' failed: ' + url + }) diff --git a/.github/workflows/publish-commit-bottles.yml b/.github/workflows/publish-commit-bottles.yml deleted file mode 100644 index 36e6b68661094..0000000000000 --- a/.github/workflows/publish-commit-bottles.yml +++ /dev/null @@ -1,109 +0,0 @@ -name: Publish and commit bottles - -on: repository_dispatch - -jobs: - upload: - runs-on: ubuntu-latest - env: - HOMEBREW_DEVELOPER: 1 - HOMEBREW_FORCE_HOMEBREW_ON_LINUX: 1 - HOMEBREW_NO_ANALYTICS: 1 - HOMEBREW_NO_AUTO_UPDATE: 1 - steps: - - name: Post comment once started - uses: actions/github-script@0.9.0 - with: - github-token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} - script: | - const run_id = process.env.GITHUB_RUN_ID - const actor = context.actor - const pr = context.payload.client_payload.pull_request - console.log("run_id=" + run_id) - console.log("actor=" + actor) - console.log("pr=" + pr) - - const repository = context.repo.owner + '/' + context.repo.repo - const url = 'https://github.com/' + repository + '/actions/runs/' + run_id - - let comment = '' - if (actor == 'BrewTestBot') { - comment += ':robot: A scheduled task' - } else { - comment += ':shipit: @' + actor - } - comment += ' has [triggered a merge](' + url + ').' - - github.issues.createComment({ - ...context.repo, - issue_number: pr, - body: comment - }) - - name: Update Homebrew - run: | - brew update-reset $(brew --repository) - - name: Checkout tap - uses: actions/checkout@v2 - with: - token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} - fetch-depth: 0 - - name: Setup tap - run: | - rm -rf $(brew --repository ${{github.repository}}) - ln -s $GITHUB_WORKSPACE $(brew --repository ${{github.repository}}) - - name: Setup git - uses: Homebrew/actions/git-user-config@master - - name: Pull bottles - env: - HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} - HOMEBREW_BINTRAY_USER: brewtestbot - HOMEBREW_BINTRAY_KEY: ${{secrets.HOMEBREW_BINTRAY_KEY}} - run: | - brew pr-pull --verbose ${{github.event.client_payload.pull_request}} - - name: Push commits - uses: Homebrew/actions/git-try-push@master - - name: Post comment on failure - if: ${{!success()}} - uses: actions/github-script@0.9.0 - with: - github-token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} - script: | - const run_id = process.env.GITHUB_RUN_ID - const actor = context.actor - const pr = context.payload.client_payload.pull_request - const repository = context.repo.owner + '/' + context.repo.repo - const url = 'https://github.com/' + repository + '/actions/runs/' + run_id - - console.log("run_id=" + run_id) - console.log("actor=" + actor) - console.log("pr=" + pr) - - let comment = ':warning: ' - if (actor != 'BrewTestBot') { - comment += '@' + actor - } - let status = '${{job.status}}'.toLowerCase() - comment += ' bottle publish [' + status + '](' + url + ').' - - github.issues.createComment({ - ...context.repo, - issue_number: pr, - body: comment - }) - - const reviews = await github.pulls.listReviews({ - ...context.repo, - pull_number: pr - }) - - for (const review of reviews.data) { - if (review.state != "APPROVED") - continue - - github.pulls.dismissReview({ - ...context.repo, - pull_number: pr, - review_id: review.id, - message: "bottle publish failed" - }); - } diff --git a/.github/workflows/request-bottle-after-merge.yml b/.github/workflows/request-bottle-after-merge.yml new file mode 100644 index 0000000000000..f206bb2dcb0bf --- /dev/null +++ b/.github/workflows/request-bottle-after-merge.yml @@ -0,0 +1,46 @@ +name: Request bottles after upstream merge. + +on: + push: + branches: + - master + paths: + - 'Formula/*' + +jobs: + request-bottles: + if: startsWith(github.event.head_commit.message, 'Merge') == true && contains(github.event.head_commit.message, 'Conflicts') == true + runs-on: ubuntu-latest + steps: + - name: Update Homebrew + run: brew update-reset + - name: Tap linux-dev + run: | + brew tap homebrew/linux-dev + - name: Get associated pull request + uses: actions/github-script@0.8.0 + id: pr + with: + result-encoding: string + script: | + const prs = await github.repos.listPullRequestsAssociatedWithCommit({ + owner: context.repo.owner, + repo: context.repo.repo, + commit_sha: context.payload.head_commit.id + }) + console.log(prs.data.length + " prs") + if (prs.data.length === 0) { + console.log("No pull requests are associated with this merge commit.") + return 0 + } + const pr = prs.data[0] + return pr.number + - name: Request bottles + env: + HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} + GIT_COMMITTER_NAME: ${{github.event.pusher.name}} + GIT_COMMITTER_EMAIL: ${{github.event.pusher.email}} + run: | + cd $(brew --repo ${{github.repository}}) + git reset --hard ${{github.sha}} + brew find-formulae-to-bottle | xargs -n1 brew request-bottle --issue=${{steps.pr.outputs.result}} diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml deleted file mode 100644 index b25b6d62c9c5b..0000000000000 --- a/.github/workflows/scheduled.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Scheduled tasks - -on: - schedule: - # Once every hour - - cron: '*/60 * * * *' - -jobs: - autopublish: - if: github.repository == 'Homebrew/homebrew-core' - runs-on: ubuntu-latest - env: - HOMEBREW_NO_ANALYTICS: 1 - HOMEBREW_NO_AUTO_UPDATE: 1 - steps: - - name: Update Homebrew - run: | - brew update-reset $(brew --repo) - - name: Run automerge - env: - HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} - run: | - brew pr-automerge --verbose --publish diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c7fb93a1d8ccb..259cd8eda565b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,102 +5,76 @@ on: pull_request: [] jobs: tap_syntax: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macOS-latest] + runs-on: ubuntu-latest steps: - - name: Set up Homebrew - id: set-up-homebrew - run: | - if which brew &>/dev/null; then - HOMEBREW_PREFIX="$(brew --prefix)" - HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX/Homebrew" - brew update-reset "$HOMEBREW_REPOSITORY" - - HOMEBREW_CORE_REPOSITORY="$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core" - git -C "$HOMEBREW_CORE_REPOSITORY" remote set-url origin "https://github.com/$GITHUB_REPOSITORY" - else - HOMEBREW_PREFIX=/home/linuxbrew/.linuxbrew - HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX/Homebrew" - sudo mkdir -p "$HOMEBREW_PREFIX" - sudo git clone --depth=1 https://github.com/Homebrew/brew "$HOMEBREW_REPOSITORY" - - HOMEBREW_CORE_REPOSITORY="$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core" - sudo mkdir -p "$HOMEBREW_CORE_REPOSITORY" - git -C "$HOMEBREW_CORE_REPOSITORY" init - git -C "$HOMEBREW_CORE_REPOSITORY" remote add origin "https://github.com/$GITHUB_REPOSITORY" - - cd "$HOMEBREW_PREFIX" - sudo mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar - sudo ln -sf ../Homebrew/bin/brew "$HOMEBREW_PREFIX/bin/" + - name: Set up Homebrew + id: set-up-homebrew + run: | + if which brew &>/dev/null; then + HOMEBREW_PREFIX="$(brew --prefix)" + HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX/Homebrew" + brew update-reset "$HOMEBREW_REPOSITORY" + HOMEBREW_CORE_REPOSITORY="$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core" + git -C "$HOMEBREW_CORE_REPOSITORY" remote set-url origin "https://github.com/$GITHUB_REPOSITORY" + else + HOMEBREW_PREFIX=/home/linuxbrew/.linuxbrew + HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX/Homebrew" + sudo mkdir -p "$HOMEBREW_PREFIX" + sudo git clone --depth=1 https://github.com/Homebrew/brew "$HOMEBREW_REPOSITORY" + HOMEBREW_CORE_REPOSITORY="$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core" + sudo mkdir -p "$HOMEBREW_CORE_REPOSITORY" + git -C "$HOMEBREW_CORE_REPOSITORY" init + git -C "$HOMEBREW_CORE_REPOSITORY" remote add origin "https://github.com/$GITHUB_REPOSITORY" + cd "$HOMEBREW_PREFIX" + sudo mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar + sudo ln -sf ../Homebrew/bin/brew "$HOMEBREW_PREFIX/bin/" + cd - + fi + export PATH="$HOMEBREW_PREFIX/bin:$PATH" + echo "::add-path::$HOMEBREW_PREFIX/bin" + GEMS_PATH="$HOMEBREW_REPOSITORY/Library/Homebrew/vendor/bundle/ruby/" + echo "::set-output name=gems-path::$GEMS_PATH" + GEMS_HASH=$(shasum -a 256 "$HOMEBREW_REPOSITORY/Library/Homebrew/Gemfile.lock" | cut -f1 -d' ') + echo "::set-output name=gems-hash::$GEMS_HASH" + cd "$HOMEBREW_CORE_REPOSITORY" + rm -rf "$GITHUB_WORKSPACE" + ln -s "$HOMEBREW_CORE_REPOSITORY" "$GITHUB_WORKSPACE" + git fetch origin "${{github.sha}}" + git checkout --force -B master FETCH_HEAD cd - - fi - - export PATH="$HOMEBREW_PREFIX/bin:$PATH" - echo "::add-path::$HOMEBREW_PREFIX/bin" - - GEMS_PATH="$HOMEBREW_REPOSITORY/Library/Homebrew/vendor/bundle/ruby/" - echo "::set-output name=gems-path::$GEMS_PATH" - GEMS_HASH=$(shasum -a 256 "$HOMEBREW_REPOSITORY/Library/Homebrew/Gemfile.lock" | cut -f1 -d' ') - echo "::set-output name=gems-hash::$GEMS_HASH" - - cd "$HOMEBREW_CORE_REPOSITORY" - rm -rf "$GITHUB_WORKSPACE" - ln -s "$HOMEBREW_CORE_REPOSITORY" "$GITHUB_WORKSPACE" - git fetch origin "${{github.sha}}" - git checkout --force -B master FETCH_HEAD - cd - - - if [ "$RUNNER_OS" = "Linux" ]; then - sudo chown -R "$USER" "$HOMEBREW_PREFIX" - sudo chmod -R g-w,o-w "$HOMEBREW_CORE_REPOSITORY" - fi - - - name: Set up Ruby - if: matrix.os == 'ubuntu-latest' - uses: actions/setup-ruby@master - with: - ruby-version: '2.6' - - - name: Cache Bundler RubyGems - id: cache - uses: actions/cache@v1 - with: - path: ${{ steps.set-up-homebrew.outputs.gems-path }} - key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }} - restore-keys: ${{ runner.os }}-rubygems- + if [ "$RUNNER_OS" = "Linux" ]; then + sudo chown -R "$USER" "$HOMEBREW_PREFIX" + sudo chmod -R g-w,o-w "$HOMEBREW_CORE_REPOSITORY" + fi + + - name: Cache Bundler RubyGems + id: cache + uses: actions/cache@v1 + with: + path: ${{ steps.set-up-homebrew.outputs.gems-path }} + key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }} + restore-keys: ${{ runner.os }}-rubygems- - - name: Install Bundler RubyGems - if: steps.cache.outputs.cache-hit != 'true' - run: brew install-bundler-gems + - name: Install Bundler RubyGems + if: steps.cache.outputs.cache-hit != 'true' + run: brew install-bundler-gems - - name: Install taps - run: | - export HOMEBREW_NO_AUTO_UPDATE=1 - brew tap homebrew/test-bot + - name: Install taps + run: | + export HOMEBREW_NO_AUTO_UPDATE=1 + brew tap homebrew/test-bot - - name: Run brew test-bot --only-tap-syntax - run: brew test-bot --only-tap-syntax + - name: Run brew test-bot --only-tap-syntax + run: brew test-bot --only-tap-syntax tests: needs: tap_syntax - if: github.event_name == 'pull_request' - strategy: - matrix: - version: [10.15, 10.14, 10.13] - fail-fast: false - runs-on: ${{ matrix.version }} - timeout-minutes: 4320 + if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.title, 'Merge') == false + runs-on: ubuntu-latest + container: + image: homebrew/ubuntu16.04:master env: - HOMEBREW_GIT_NAME: BrewTestBot - HOMEBREW_GIT_EMAIL: 'homebrew-test-bot@lists.sfconservancy.org' - PATH: '/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin' - HOMEBREW_DEVELOPER: 1 - HOMEBREW_NO_ANALYTICS: 1 - HOMEBREW_NO_AUTO_UPDATE: 1 - GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED: 1 - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + HOMEBREW_PATCHELF_RB: 1 steps: - name: Update Homebrew run: brew update-reset @@ -114,47 +88,38 @@ jobs: git checkout --force ${{github.sha}} git log -1 - - name: Run brew test-bot --only-cleanup-before - run: brew test-bot --only-cleanup-before - - name: Run brew test-bot --only-setup run: brew test-bot --only-setup - name: Run brew test-bot --only-formulae run: | - rm -rf bottles - mkdir bottles - cd bottles - brew test-bot --only-formulae + rm -rf ~/bottles + mkdir ~/bottles + cd ~/bottles + brew test-bot --only-formulae --keep-old - name: Output brew test-bot --only-formulae failures if: always() run: | - cat bottles/steps_output.txt - rm bottles/steps_output.txt + cat ~/bottles/steps_output.txt + rm ~/bottles/steps_output.txt - name: Count bottles id: bottles if: always() run: | - cd bottles + cd ~/bottles count=$(ls *.json | wc -l | xargs echo -n) echo "$count bottles" echo "::set-output name=count::$count" + - name: Move bottles + if: always() && steps.bottles.outputs.count > 0 + run: mv ~/bottles $GITHUB_WORKSPACE + - name: Upload bottles if: always() && steps.bottles.outputs.count > 0 uses: actions/upload-artifact@v1 with: name: bottles path: bottles - - - name: Run brew test-bot --only-cleanup-after - if: always() - run: brew test-bot --only-cleanup-after - - - name: Cleanup - if: always() - run: | - find . - rm -rf * diff --git a/.github/workflows/upload-bottles.yml b/.github/workflows/upload-bottles.yml new file mode 100644 index 0000000000000..19585ea469b06 --- /dev/null +++ b/.github/workflows/upload-bottles.yml @@ -0,0 +1,95 @@ +name: Upload bottles. + +on: + push: + branches: + - master + paths: + - 'Formula/*' + +jobs: + upload-bottles: + if: startsWith(github.event.head_commit.message, 'Merge') == false && github.event.pusher.name != 'BrewTestBot' && github.repository == 'Homebrew/linuxbrew-core' + runs-on: ubuntu-latest + steps: + - name: Update Homebrew + run: brew update-reset + - name: Determine associated pull request + uses: actions/github-script@0.9.0 + id: pr + with: + script: | + const prs = await github.repos.listPullRequestsAssociatedWithCommit({ + ...context.repo, + commit_sha: context.payload.head_commit.id + }) + console.log(prs.data.length + " prs") + if (prs.data.length === 0) { + throw "No pull requests are associated with this merge commit." + } + core.setOutput("number", prs.data[0].number.toString()) + core.setOutput("head_sha", prs.data[0].head.sha) + - name: Download workflow artifacts + uses: Homebrew/actions/download-artifact@master + with: + github_token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} + workflow: tests.yml + commit: ${{steps.pr.outputs.head_sha}} + name: bottles + path: bottles + - name: Upload and publish bottles + env: + HOMEBREW_BINTRAY_USER: LinuxbrewTestBot + HOMEBREW_BINTRAY_KEY: ${{secrets.HOMEBREW_BINTRAY_KEY}} + if: steps.pr.outputs.number != 0 + run: | + cd bottles + brew test-bot \ + --tap=homebrew/core \ + --bintray-org=linuxbrew \ + --ci-upload \ + --publish \ + --keep-old + - name: Push bottle commit + env: + GIT_COMMITTER_NAME: ${{github.event.pusher.name}} + GIT_COMMITTER_EMAIL: ${{github.event.pusher.email}} + if: steps.pr.outputs.number != 0 + run: | + cd $(brew --repo ${{github.repository}}) + git commit --amend --no-edit + git show --pretty=fuller + for try in $(seq 20); do + git fetch + git rebase origin/master + if git push https://x-access-token:${{secrets.HOMEBREW_GITHUB_API_TOKEN}}@github.com/${{github.repository}} master; then + exit 0 + else + max=$(( $try + 10 )) + sleep $(shuf -i 3-$max -n 1) + fi + done + exit 1 + - name: Post comment on failure + if: failure() + uses: actions/github-script@0.9.0 + with: + github-token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}} + script: | + const run_id = process.env.GITHUB_RUN_ID + const actor = process.env.GITHUB_ACTOR + const pr = ${{steps.pr.outputs.number}} + + console.log("run_id=" + run_id) + console.log("actor=" + actor) + console.log("pr=" + pr) + + const repository = context.repo.owner + '/' + context.repo.repo + const url = 'https://github.com/' + repository + '/actions/runs/' + run_id + + github.issues.createComment({ + issue_number: pr, + owner: context.repo.owner, + repo: context.repo.repo, + body: '@' + actor + ' upload bottles job failed: ' + url + }) diff --git a/Aliases/adoptopenjdk@8 b/Aliases/adoptopenjdk@8 new file mode 120000 index 0000000000000..618cd57be0564 --- /dev/null +++ b/Aliases/adoptopenjdk@8 @@ -0,0 +1 @@ +../Formula/adoptopenjdk.rb \ No newline at end of file diff --git a/Aliases/gcc@9 b/Aliases/gcc@9 deleted file mode 120000 index f4c8842b0a913..0000000000000 --- a/Aliases/gcc@9 +++ /dev/null @@ -1 +0,0 @@ -../Formula/gcc.rb \ No newline at end of file diff --git a/Aliases/jdk@9 b/Aliases/jdk@9 new file mode 120000 index 0000000000000..8db127bafdd8d --- /dev/null +++ b/Aliases/jdk@9 @@ -0,0 +1 @@ +../Formula/jdk.rb \ No newline at end of file diff --git a/CODEOWNERS b/CODEOWNERS index 0244a52d4aaa8..31bd69fedcfb7 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -8,10 +8,4 @@ # To be explicit: we will never accept changes to this file adding people from outside the Homebrew GitHub # organisation. If you are not a Homebrew maintainer: you do not personally "own" or "maintain" any formulae. -CODEOWNERS @MikeMcQuaid -CONTRIBUTING.md @MikeMcQuaid -tap_migrations.json @MikeMcQuaid -.github/ @MikeMcQuaid -cmd/ @MikeMcQuaid - LICENSE.txt @Homebrew/plc @MikeMcQuaid diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9251d7174eeb1..229b0255d822b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,9 @@ +# Contributing to Linuxbrew + +[Linuxbrew](https://github.com/Homebrew/linuxbrew-core) is a fork of [Homebrew](https://github.com/Homebrew/homebrew-core). Homebrew is merged into Linuxbrew roughly once per day. To contribute a new formula or a new version of an existing formula, please submit your pull request to Homebrew rather than to Linuxbrew. Patches to fix issues that you have reproduced on both Linuxbrew and Homebrew should be sent to Homebrew. Please send your pull request to Linuxbrew if you are in doubt. + +Patches to fix issues particular to Linux should not affect the behaviour of the formula on Mac. Use `if OS.mac?` and `if OS.linux?` as necessary to preserve the existing behaviour on Mac. + # Contributing to Homebrew First time contributing to Homebrew? Read our [Code of Conduct](https://github.com/Homebrew/.github/blob/HEAD/CODE_OF_CONDUCT.md#code-of-conduct). @@ -51,7 +57,7 @@ https://docs.brew.sh/How-To-Open-a-Homebrew-Pull-Request and then proceed as follows: * run `brew edit foo` and make edits -* leave the section `bottle do ... end` unchanged +* remove the linux bottle in the `bottle do ... end` section * test your changes using the commands listed above * run `git commit` with message formatted `foo ` or `foo: ` * open a pull request as described in the introduction linked to above, wait for the automated test results, and fix any failing tests diff --git a/Formula/a2ps.rb b/Formula/a2ps.rb index 40d18e8be7b4b..8e8643cbea3ed 100644 --- a/Formula/a2ps.rb +++ b/Formula/a2ps.rb @@ -12,12 +12,14 @@ class A2ps < Formula sha256 "99646196c8b9e6d5a7b67ecca1589160749d690128bb89aace3b79d4c355dfde" => :high_sierra sha256 "5a1c466a3f833797710464dd1aaf4ad6c9ff0a47de33ab3b2ba9cf0c2be36bfd" => :sierra sha256 "532c3f14debcd59028285dad1d6fe41dbad481718cc1752b1b9e7c05fd82e27f" => :el_capitan + sha256 "f14fd4a117e48b7378150d8e7deaa9c49f432bb870fad1ba46742084afbed6e0" => :x86_64_linux end + desired_prefix = OS.mac? ? "/usr/local" : "/home/linuxbrew/.linuxbrew" pour_bottle? do - reason "The bottle needs to be installed into /usr/local." + reason "The bottle needs to be installed into #{desired_prefix}." # https://github.com/Homebrew/brew/issues/2005 - satisfy { HOMEBREW_PREFIX.to_s == "/usr/local" } + satisfy { HOMEBREW_PREFIX.to_s == desired_prefix } end on_linux do @@ -27,9 +29,11 @@ class A2ps < Formula # Software was last updated in 2007. # https://svn.macports.org/ticket/20867 # https://trac.macports.org/ticket/18255 - patch :p0 do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/0ae366e6/a2ps/patch-contrib_sample_Makefile.in" - sha256 "5a34c101feb00cf52199a28b1ea1bca83608cf0a1cb123e6af2d3d8992c6011f" + if OS.mac? + patch :p0 do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/0ae366e6/a2ps/patch-contrib_sample_Makefile.in" + sha256 "5a34c101feb00cf52199a28b1ea1bca83608cf0a1cb123e6af2d3d8992c6011f" + end end patch :p0 do diff --git a/Formula/a52dec.rb b/Formula/a52dec.rb index b37f48e81ce35..b17e0e7c76817 100644 --- a/Formula/a52dec.rb +++ b/Formula/a52dec.rb @@ -13,9 +13,14 @@ class A52dec < Formula sha256 "2feac8f578fd1aa43385ce8714b059c90f4aaf3a0401d8ba825939e8e8ab7b1b" => :el_capitan sha256 "cfe0ddcf275b03d9ad0c626174962601ae18d3f77fa35266228425b818ce4a7f" => :yosemite sha256 "cb40eed81300fa32069bac07244cf7f56363cc04af853ddb75bada292e8d9912" => :mavericks + sha256 "1ee3d6cdaaa77669cd10c41de60d933187d83fd792e605eee6e8942201cdc6c2" => :x86_64_linux # glibc 2.19 end def install + # Fix error ld: imdct.lo: relocation R_X86_64_32 against `.bss' can not be + # used when making a shared object; recompile with -fPIC + ENV.append_to_cflags "-fPIC" unless OS.mac? + system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", diff --git a/Formula/aalib.rb b/Formula/aalib.rb index 5084df6eca5bb..6803159ee7a25 100644 --- a/Formula/aalib.rb +++ b/Formula/aalib.rb @@ -13,6 +13,7 @@ class Aalib < Formula sha256 "2c2d05720ca991422e4c27e3f770c29024c5197871cba67404f4e72a3cfaf002" => :sierra sha256 "9b3f19e5da28fb682aeb1fe40f1747d1b532490dd50262978aaefcb7afbc8804" => :el_capitan sha256 "9e08dd4e3545b05353f3158e4e756c20a301bef295b72183e1fd5fb1d6d8e897" => :yosemite + sha256 "40f92137af26fa3729075fc82c0ea3e5539b70a6cb921ba99d6a9e1347d5d33c" => :x86_64_linux end # Fix malloc/stdlib issue on macOS diff --git a/Formula/aamath.rb b/Formula/aamath.rb index 66d4dbafddce2..53ce561ca0817 100644 --- a/Formula/aamath.rb +++ b/Formula/aamath.rb @@ -13,6 +13,7 @@ class Aamath < Formula sha256 "8b805e37fd5f4536b4fbf7f3ae6251b645b4b132027d56ccd015a6036c304744" => :el_capitan sha256 "1e22022e621e7d2337edf4a80ae2c1618a89089132656d85cc141774565e34d7" => :yosemite sha256 "0212e0b5844ea1a491bc7d4fcab2b590921042b28bc50e79c36cd9e15d08e2aa" => :mavericks + sha256 "92b1295c2244f40e6f59e51598b8e41e09f323d63887b9d01d19bad2b793b787" => :x86_64_linux end uses_from_macos "bison" => :build # for yacc diff --git a/Formula/aardvark_shell_utils.rb b/Formula/aardvark_shell_utils.rb index a26f7c147fbe5..d11e32374b8ec 100644 --- a/Formula/aardvark_shell_utils.rb +++ b/Formula/aardvark_shell_utils.rb @@ -13,6 +13,7 @@ class AardvarkShellUtils < Formula sha256 "4fc19fca9729b408c5a77f362fff72a8c74c324d4a81cc0cf3e4c91b41bf2d6f" => :el_capitan sha256 "ca1cb774102a7e5128f964c2c9d48b45877f1fd3347288edb2adef5981fdd0f4" => :yosemite sha256 "e8e8b6fd4ee85d8a6ae267fbd20160c1aeddeb6c8e302793b12a807131ef4b27" => :mavericks + sha256 "5af12d5436a5da770ebdde479342ccce2794d20519122f8f2a61e2f096b94c4e" => :x86_64_linux # glibc 2.19 end conflicts_with "coreutils", :because => "both install `realpath` binaries" diff --git a/Formula/abcm2ps.rb b/Formula/abcm2ps.rb index 6fbd4ce2bbd3b..2b56fdcb9c9d3 100644 --- a/Formula/abcm2ps.rb +++ b/Formula/abcm2ps.rb @@ -8,6 +8,7 @@ class Abcm2ps < Formula sha256 "c67da1ca155904d0794fc458add9bd5cd4a446a212e3aef790083c68e9aef252" => :catalina sha256 "2d592b6fae0b8b94a63cc297f0e29e6c155019f17a830151c341376dcc9d7f6e" => :mojave sha256 "c11af5280e03a986554b9eafa4f2cd0dc91cb725dd35e81228eaf8d126c9660f" => :high_sierra + sha256 "bed3de0de350ee961fa012cf49b9d0c3ede39db5e8be3752a537a5d017de9be5" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/abcmidi.rb b/Formula/abcmidi.rb index c3eb5086d56dd..babdfa03f871f 100644 --- a/Formula/abcmidi.rb +++ b/Formula/abcmidi.rb @@ -15,7 +15,7 @@ def install # configure creates a "Makefile" file. A "makefile" file already exist in # the tarball. On case-sensitive file-systems, the "makefile" file won't # be overridden and will be chosen over the "Makefile" file. - rm "makefile" + rm_f "makefile" system "./configure", "--disable-debug", "--prefix=#{prefix}", diff --git a/Formula/abduco.rb b/Formula/abduco.rb index 102b4d2072433..6a9ef4cf91734 100644 --- a/Formula/abduco.rb +++ b/Formula/abduco.rb @@ -14,6 +14,7 @@ class Abduco < Formula sha256 "62b4673f4fba1d3c5b201b972e220a2736ec053e0c83b1369bb4e5641a71f8e4" => :el_capitan sha256 "17338a1f1f2cace2bfb40c79d746ad60c6604555e8fb34476ec4ef9a2f68234e" => :yosemite sha256 "1f48e0d684ba7b41768b5aa770df9c8ee716a3132d3c8043b4f7ff970c925ac5" => :mavericks + sha256 "9cf73a80e67aeacf95a705b634a5c53aaba2177e8307e7bbb0925698b3c63d20" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/abnfgen.rb b/Formula/abnfgen.rb index 7354c43b5d6b4..db1de82a4169a 100644 --- a/Formula/abnfgen.rb +++ b/Formula/abnfgen.rb @@ -11,6 +11,7 @@ class Abnfgen < Formula sha256 "3a62e72bec09b9bfff637710db366f713abc95de45437aeadbfa87a87dfc040c" => :high_sierra sha256 "0d69f39473838a8e46fb02009329e05be6eeaed579ff5533a09cbbecd8d46a2d" => :sierra sha256 "fd51cb760ed8afb8a9e3dd5d05c8efa832361b238ad95410fb2864c91c081825" => :el_capitan + sha256 "7f87311cc93a40da50b39b5e291eefffd0cd06e8cce69f44a6895e8d9e3ee53b" => :x86_64_linux end def install diff --git a/Formula/abook.rb b/Formula/abook.rb index a74b2468540e2..00395c38bd781 100644 --- a/Formula/abook.rb +++ b/Formula/abook.rb @@ -9,6 +9,7 @@ class Abook < Formula sha256 "09e77aa3db2cf8a702effbebbbf83f7a2f860b0d5db6bcf37549edb7db5438a7" => :catalina sha256 "a6ab99c751a03e11e2ace660ad9325a9fe4262598f284c0fb87626778383e29d" => :mojave sha256 "a0461ecc678e5cb65a901bd39dbd7f0f8015a29ed605e6cf28f1315d5c347ecb" => :high_sierra + sha256 "e575a49ba5afa49d6e3838ee6600f1372a97817fa5849ec1587ea559db216e42" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/abseil.rb b/Formula/abseil.rb index 3a07317031391..473d55edd1808 100644 --- a/Formula/abseil.rb +++ b/Formula/abseil.rb @@ -9,6 +9,7 @@ class Abseil < Formula sha256 "43368dc236c3e6371d904edda75e5a8dae8127ded5b2f9ff9a0a15b4ddf103d0" => :catalina sha256 "68ed0a482bd727a10fc0cf2e2e76c0307dc2d5eba8c9e4a2c0990a1dc68825b9" => :mojave sha256 "bed9e2b638d6c044d31fe88bd04b225eb33548650890084ebb0657a574f7fcee" => :high_sierra + sha256 "17a978af3df1e7184377e4c4b2bd82d4d5a5c4f0d596425bbb9ab1c566c2cde3" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/abyss.rb b/Formula/abyss.rb index 61cfd2a5a32c1..ae60305dac7d2 100644 --- a/Formula/abyss.rb +++ b/Formula/abyss.rb @@ -9,6 +9,7 @@ class Abyss < Formula sha256 "800aa54afd53c585943f86d701ca58a95059577181fdb4a47bf9f08b249e230e" => :catalina sha256 "03e6dc19bfb76f35b4b35c5fb65c88ea4fa28b3c3e112727465a7a5e2fd5ee09" => :mojave sha256 "9ce078498ce23f6a894ca79dd21bee8c6c7e24aeb0ae95d3ccd7091fc55091a2" => :high_sierra + sha256 "bb18910cd175d7d87c8f10abfd3232fd189768563bde0331a95e30358255094a" => :x86_64_linux end head do @@ -21,7 +22,7 @@ class Abyss < Formula depends_on "boost" => :build depends_on "google-sparsehash" => :build - depends_on "gcc" + depends_on "gcc" if OS.mac? depends_on "open-mpi" fails_with :clang # no OpenMP support @@ -46,7 +47,12 @@ def install test do testpath.install resource("testdata") - system "#{bin}/abyss-pe", "k=25", "name=ts", "in=reads1.fastq reads2.fastq" + if OS.mac? || which("column") + system "#{bin}/abyss-pe", "k=25", "name=ts", "in=reads1.fastq reads2.fastq" + else + # Fix error: abyss-tabtomd: column: not found + system "#{bin}/abyss-pe", "unitigs", "scaffolds", "k=25", "name=ts", "in=reads1.fastq reads2.fastq" + end system "#{bin}/abyss-fac", "ts-unitigs.fa" end end diff --git a/Formula/aces_container.rb b/Formula/aces_container.rb index 658ebe5aeb0f3..865245a059dab 100644 --- a/Formula/aces_container.rb +++ b/Formula/aces_container.rb @@ -11,6 +11,7 @@ class AcesContainer < Formula sha256 "4297afa069f1cd305e93038ed43260b3643f0bd27f39e33355061fc111fb7f6f" => :high_sierra sha256 "6b276491297d4052538bd2fd22d5129389f27d90a98f831987236a5b90511b98" => :sierra sha256 "16cf230afdfcb6306c208d169549cf8773c831c8653d2c852315a048960d7e72" => :el_capitan + sha256 "ace21c341d22453d12eb11544a2c84e2623c1be01abafa34f697305660f45601" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/acmetool.rb b/Formula/acmetool.rb index 489da3fef20c4..79a495bebe612 100644 --- a/Formula/acmetool.rb +++ b/Formula/acmetool.rb @@ -1,5 +1,3 @@ -require "language/go" - class Acmetool < Formula desc "Automatic certificate acquisition tool for ACME (Let's Encrypt)" homepage "https://github.com/hlandau/acme" @@ -13,6 +11,7 @@ class Acmetool < Formula sha256 "859ddcc717399c6724283beece51c0a93497e00be685d3f1cfb7153506cbd9bb" => :catalina sha256 "fd6d5e67865a1038fef6f4b183c255e42e4eb6470d5847e804639197f226da6b" => :mojave sha256 "62ec2c87880494488a50d78c36104f75eb97bb160ddf316387ab116e51ace2fd" => :high_sierra + sha256 "ba229bae0e6e2e776ffafa7410ab56220375a55fa4ee2b0217866617038998ae" => :x86_64_linux end depends_on "go" => :build @@ -164,7 +163,6 @@ def install (buildpath/"src/github.com/hlandau").mkpath ln_sf buildpath, buildpath/"src/github.com/hlandau/acme" - Language::Go.stage_deps resources, buildpath/"src" cd "cmd/acmetool" do # https://github.com/hlandau/acme/blob/HEAD/_doc/PACKAGING-PATHS.md @@ -188,6 +186,6 @@ def post_install end test do - assert_match version.to_s, shell_output("#{bin}/acmetool --version", 2) + assert_match "build unknown", shell_output("#{bin}/acmetool --version", 2) end end diff --git a/Formula/acpica.rb b/Formula/acpica.rb index 3e2035be20ea4..8b1393b889650 100644 --- a/Formula/acpica.rb +++ b/Formula/acpica.rb @@ -10,6 +10,7 @@ class Acpica < Formula sha256 "cd77c7ab262dccd3cb56bb5685ef94aabb63a0f3bffb1834504a12fb910bf0ed" => :catalina sha256 "d5be4c0ca5c62d26063618cd358b552f13bde291c68792016b8d3ec3e74579ef" => :mojave sha256 "b6b6ae7b98a9450ac248d85bee082743f749a95320550028198af6f2c6e0681f" => :high_sierra + sha256 "e93edb268726cee6aa00432ed47e0a03a099ba323c912d477b3849f4bda0618e" => :x86_64_linux end uses_from_macos "bison" => :build diff --git a/Formula/activemq-cpp.rb b/Formula/activemq-cpp.rb index 1de7030319868..b47ad6e60d4ae 100644 --- a/Formula/activemq-cpp.rb +++ b/Formula/activemq-cpp.rb @@ -12,6 +12,7 @@ class ActivemqCpp < Formula sha256 "024bf1c2c3ef8e612180b9f82c98f854235e8e371e01210c142304a762a30b3c" => :mojave sha256 "21855925e7e9ecfe125c959c84a6bce710ca409a2a33f4f8d396f45cc52a4ab9" => :high_sierra sha256 "c994de229e86fb7e80c846d6f2b44acba306014f334ba65550c15102214dbcb8" => :sierra + sha256 "67179742b6afabbeb263b6b971fd7b432cd10d8567a38751586d910d8b4d9b7f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/activemq.rb b/Formula/activemq.rb index ae7efac70551d..9b0fb8e7823a9 100644 --- a/Formula/activemq.rb +++ b/Formula/activemq.rb @@ -10,7 +10,7 @@ class Activemq < Formula depends_on "openjdk" def install - rm_rf Dir["bin/linux-x86-*"] + rm_rf Dir["bin/linux-x86-*"] unless OS.linux? libexec.install Dir["*"] (bin/"activemq").write_env_script libexec/"bin/activemq", :JAVA_HOME => Formula["openjdk"].opt_prefix end diff --git a/Formula/adios2.rb b/Formula/adios2.rb index 7bd0aa5e89cfb..00fb10c66f703 100644 --- a/Formula/adios2.rb +++ b/Formula/adios2.rb @@ -9,6 +9,7 @@ class Adios2 < Formula sha256 "70af70aa0923bd141c545211bacad82c881959bd27fe5e6e1eab891e34dcf139" => :catalina sha256 "2e8d20303fea3a882a2e121b0db5423886fccfae4cd02eedaa9321055b32e3fb" => :mojave sha256 "f1f7bd1e46bf719fddca91bf9e805fdfa1a12f562f15a55e6c891489900288bf" => :high_sierra + sha256 "333f58824cddb0ea83c2b83548b339f347fcd5d3fbbe6f5e129c111113d2c0fe" => :x86_64_linux end depends_on "cmake" => :build @@ -21,6 +22,7 @@ class Adios2 < Formula depends_on "open-mpi" depends_on "python@3.8" depends_on "zeromq" + uses_from_macos "bzip2" # macOS 10.13 configuration-time issue detecting float types diff --git a/Formula/admesh.rb b/Formula/admesh.rb index 474f82e18dca2..e5fc856bb8799 100644 --- a/Formula/admesh.rb +++ b/Formula/admesh.rb @@ -9,6 +9,7 @@ class Admesh < Formula sha256 "d877dfc78d057e2124d06b4826e9044b2686f19de3e84fbab1cd19c07524e6df" => :catalina sha256 "86f1775a6dbca0e6309cdfed9fb83d068873f5e8183204f02cc871d013290f62" => :mojave sha256 "2f0fd4e6cda35b4e14f6c8ba627ad7d22ee93507875b6943ea5677c857c4ab36" => :high_sierra + sha256 "adcfcfdeb642ccaf66eb270751ba121b8dd8b3851aabe78accc76788ed737855" => :x86_64_linux end def install diff --git a/Formula/adns.rb b/Formula/adns.rb index 3fe10ce22b6fc..f75d419765a1b 100644 --- a/Formula/adns.rb +++ b/Formula/adns.rb @@ -10,6 +10,7 @@ class Adns < Formula sha256 "d9cc50eec8ac243148a121049c236cba06af4a0b1156ab397d0a2850aa79c137" => :catalina sha256 "7cf73e25044783cd93ecd28e2e8bfb84f0b2fff3343acf39dff3c5fe68d1c5be" => :mojave sha256 "6cbe64a32b077c9abd61337c51c4e17a2286f9bee04b33f24a5dd762125798d1" => :high_sierra + sha256 "fd38f96459e3ebeaef84eb335a08e2a9fe0d8fe37d4f621bed4b11d35a919b5c" => :x86_64_linux end uses_from_macos "m4" => :build diff --git a/Formula/adoptopenjdk.rb b/Formula/adoptopenjdk.rb new file mode 100644 index 0000000000000..f4e4da11921c3 --- /dev/null +++ b/Formula/adoptopenjdk.rb @@ -0,0 +1,31 @@ +class Adoptopenjdk < Formula + desc "Prebuilt binaries produced from OpenJDK class libraries" + homepage "https://adoptopenjdk.net/" + url "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz" + version "1.8.0.242" + sha256 "f39b523c724d0e0047d238eb2bb17a9565a60574cf651206c867ee5fc000ab43" + + bottle :unneeded + + depends_on :linux + + def install + prefix.install Dir["*"] + share.install prefix/"man" + end + + test do + (testpath/"Hello.java").write <<~EOS + class Hello + { + public static void main(String[] args) + { + System.out.println("Hello Homebrew"); + } + } + EOS + system bin/"javac", "Hello.java" + assert_predicate testpath/"Hello.class", :exist?, "Failed to compile Java program!" + assert_equal "Hello Homebrew\n", shell_output("#{bin}/java Hello") + end +end diff --git a/Formula/adoptopenjdk@11.rb b/Formula/adoptopenjdk@11.rb new file mode 100644 index 0000000000000..21e82d3dc27dc --- /dev/null +++ b/Formula/adoptopenjdk@11.rb @@ -0,0 +1,31 @@ +class AdoptopenjdkAT11 < Formula + desc "Prebuilt binaries produced from OpenJDK class libraries" + homepage "https://adoptopenjdk.net/" + url "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz" + version "11.0.3.7" + sha256 "23cded2b43261016f0f246c85c8948d4a9b7f2d44988f75dad69723a7a526094" + + bottle :unneeded + + depends_on :linux + + def install + prefix.install Dir["*"] + share.install prefix/"man" + end + + test do + (testpath/"Hello.java").write <<~EOS + class Hello + { + public static void main(String[] args) + { + System.out.println("Hello Homebrew"); + } + } + EOS + system bin/"javac", "Hello.java" + assert_predicate testpath/"Hello.class", :exist?, "Failed to compile Java program!" + assert_equal "Hello Homebrew\n", shell_output("#{bin}/java Hello") + end +end diff --git a/Formula/advancecomp.rb b/Formula/advancecomp.rb index 4e2eff0400eb9..2a163ba8b62aa 100644 --- a/Formula/advancecomp.rb +++ b/Formula/advancecomp.rb @@ -11,6 +11,7 @@ class Advancecomp < Formula sha256 "798de4490c97283280259ffc1dc39159bd0ded85edb47f3212ad5ec9a174289e" => :mojave sha256 "fdb2a72157445c33a462388f05580489c427f4f0d2a3d4cdc1b7867ef69e7e53" => :high_sierra sha256 "4ef3590e26c5ac96d64dc985b035ec7055f215c84d31dfb09542d958f6ec4e77" => :sierra + sha256 "dce1225bbc46dcb304f138743eb551460eba423d4c8dad0c1a162c49ae892080" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/advancemame.rb b/Formula/advancemame.rb index b1a5d849216ee..60ec1a8bcef99 100644 --- a/Formula/advancemame.rb +++ b/Formula/advancemame.rb @@ -9,6 +9,7 @@ class Advancemame < Formula sha256 "95f2cdff91ff98c3c9f65a0751d7948cefb3829d96e1977b5b8869163eba0790" => :mojave sha256 "9c5e0a9f81f43ec02eb951b82b4930639dafcdbacbeadf7bcc5e74f2e2ec7c45" => :high_sierra sha256 "6ba2c02db07a9ef7ddf561dbc2cde3904abe0b1b0ab9c9469020fdeced72e011" => :sierra + sha256 "0dbb35bda5ac1c608568bca1d3e67906a5139e3ab7795d14d994a80fcd8deb2f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/advancemenu.rb b/Formula/advancemenu.rb index 8b6e76ba89129..69c936a4b587d 100644 --- a/Formula/advancemenu.rb +++ b/Formula/advancemenu.rb @@ -8,6 +8,7 @@ class Advancemenu < Formula sha256 "07f9a82231936429257190078d28ec7313b39dfe9ecf3ed9e82b15fbe1615366" => :catalina sha256 "36ebf0c6727172fa909b933f801986e483892d5cb10c0a2fb27314880d906bd1" => :mojave sha256 "fda952fe67d2c39e57d621b6a1392493a95c8ef62f510f63534f962a97252d26" => :high_sierra + sha256 "30a22cc194562e66fd231e2d476de80ebad66477a5f8cf6b86fecca1f98b950e" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/advancescan.rb b/Formula/advancescan.rb index 554de65825e0f..dd8896b1899ae 100644 --- a/Formula/advancescan.rb +++ b/Formula/advancescan.rb @@ -12,6 +12,7 @@ class Advancescan < Formula sha256 "0bc4290c65271b84aec455adbaf85795857b19102e6efb152a64623420ae5757" => :sierra sha256 "e4295866cda2370aa37cb1144ff1269ada4df6b76145a25efaf072d7a6b09b5c" => :el_capitan sha256 "f91cbe31c7c8072fffffcd0cc8766e20df6f728abc73f66140f97c0a49d6f6c8" => :yosemite + sha256 "d6272ab6536526d95da8ddde9a57b88a8aa3247a8b50758680de48d750669baa" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/adwaita-icon-theme.rb b/Formula/adwaita-icon-theme.rb index 2e260e5cd5c3b..e017abbfabcc9 100644 --- a/Formula/adwaita-icon-theme.rb +++ b/Formula/adwaita-icon-theme.rb @@ -9,6 +9,7 @@ class AdwaitaIconTheme < Formula sha256 "68833a3f5aff79bdf75c2e761a8451750b93e8a955e49356a78a2a3f0e1fbcd8" => :catalina sha256 "68833a3f5aff79bdf75c2e761a8451750b93e8a955e49356a78a2a3f0e1fbcd8" => :mojave sha256 "68833a3f5aff79bdf75c2e761a8451750b93e8a955e49356a78a2a3f0e1fbcd8" => :high_sierra + sha256 "1f6ae9481dec9ba263b89edba0716011797f62a8f5a7b3952dc1028bbb1ed678" => :x86_64_linux end depends_on "gettext" => :build diff --git a/Formula/aescrypt-packetizer.rb b/Formula/aescrypt-packetizer.rb index 08ddaba1754fb..a64b5e459a967 100644 --- a/Formula/aescrypt-packetizer.rb +++ b/Formula/aescrypt-packetizer.rb @@ -10,6 +10,7 @@ class AescryptPacketizer < Formula sha256 "063038d7a6789ce5052fa1f7bf1be43ab9cd5c4157d5f9d1d37a91382b007958" => :mojave sha256 "ad36c0bff9d673c364b18795669f51329d8e7c5ea862af2ef3614051976cf601" => :high_sierra sha256 "39463bd2c693eaa4060f10e8d663346189ff1ebcc9bfa20971158e9e265b7b1c" => :sierra + sha256 "34e5489f89b519308a003cc00a544d184463c19e25a7168a33f96ba0faae499c" => :x86_64_linux end head do @@ -20,13 +21,13 @@ class AescryptPacketizer < Formula depends_on "libtool" => :build end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? def install if build.head? cd "linux" system "autoreconf", "-ivf" - system "./configure", "prefix=#{prefix}", "--enable-iconv", + system "./configure", "prefix=#{prefix}", *("--enable-iconv" if OS.mac?), "--disable-gui" system "make", "install" else @@ -52,6 +53,7 @@ def caveats end test do + aescrypt = bin/"paescrypt" path = testpath/"secret.txt" original_contents = "What grows when it eats, but dies when it drinks?" path.write original_contents @@ -59,7 +61,7 @@ def caveats system bin/"paescrypt", "-e", "-p", "fire", path assert_predicate testpath/"#{path}.aes", :exist? - system bin/"paescrypt", "-d", "-p", "fire", "#{path}.aes" + system aescrypt, "-d", "-p", "fire", "#{path}.aes" assert_equal original_contents, path.read end end diff --git a/Formula/aescrypt.rb b/Formula/aescrypt.rb index f78548b93a93d..96e3e4d67838a 100644 --- a/Formula/aescrypt.rb +++ b/Formula/aescrypt.rb @@ -13,6 +13,7 @@ class Aescrypt < Formula sha256 "0cd940c7c9e59104746a8f83f92a06e703e7f98195a202d20516c03b588fd63f" => :el_capitan sha256 "660c8a9266d7f85e699fb5bfabb82c508a66d303b2a2057c9c70a3c70fed43f6" => :yosemite sha256 "a0bf8895165037991bf5b33be5c995e9b68a1d05898003a0ef45adb7aa3d3da9" => :mavericks + sha256 "7d1dce1bea846032fec3231e860e9b99f66683074a48e72885b5eb34d3bb81ef" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/aespipe.rb b/Formula/aespipe.rb index 9eece41952438..453831b7e43f1 100644 --- a/Formula/aespipe.rb +++ b/Formula/aespipe.rb @@ -9,6 +9,7 @@ class Aespipe < Formula sha256 "c96c3f1ba5bcd7672630d7c9d693cb5d9333e3473ecdca6771290a68ac54db2e" => :catalina sha256 "f52e6c3afc951ca588522d8073b62300113a30cb6d3927a25de643cc10622d74" => :mojave sha256 "00d7cb8240e8e1beb4b8cf701bf38961531df8a9f2d497c4ff5a95747ac3dbae" => :high_sierra + sha256 "e1f386c2d3388f3feb5a0a5e33f1e67d7465c5d5f9a3287a2c89cb9a6788d6f0" => :x86_64_linux end def install diff --git a/Formula/afflib.rb b/Formula/afflib.rb index d94d9fc8c5ab0..34db3b2001439 100644 --- a/Formula/afflib.rb +++ b/Formula/afflib.rb @@ -10,6 +10,7 @@ class Afflib < Formula sha256 "70a2d09ba44f7a032689728e5d57ca403360a0316a12ddbacb800b36f6f3d5e1" => :catalina sha256 "06e421180af02a47847f009f721ca91f7b0d03ed954995a1f12171f9d6467665" => :mojave sha256 "172586f837d2cd9dba9b700758ca855e44af02d524d3fc2ce26e693a5006105a" => :high_sierra + sha256 "544f99f04d25a910507d13de702aed15019d21dbf9e44f4e23ba556b56683068" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/afio.rb b/Formula/afio.rb index 02d78f0fecf50..f7c76e4780ed7 100644 --- a/Formula/afio.rb +++ b/Formula/afio.rb @@ -11,6 +11,7 @@ class Afio < Formula sha256 "28494133d10acea2c1a298fe858d26889ba8567422b9f431710b156a4a8ac858" => :catalina sha256 "733a4169a7be82dc173cc302994ad205493a9085580634b92faa38c96c84608b" => :mojave sha256 "53dbb826f2c3e050bd70078945d92772a4c434b0aa75e1a71cb29e56ed8e62fa" => :high_sierra + sha256 "16d40fe84882c72ac33669b7aad35d8266f227a4e4322104c2de094040d332a6" => :x86_64_linux end def install diff --git a/Formula/afl-fuzz.rb b/Formula/afl-fuzz.rb index 52aed7236b393..601ad3621ed89 100644 --- a/Formula/afl-fuzz.rb +++ b/Formula/afl-fuzz.rb @@ -8,11 +8,14 @@ class AflFuzz < Formula sha256 "7b72b8e23c2227ced43e7cd51fd14e9134af5dab41acefcd76b2dd9671f483ad" => :catalina sha256 "8746ae555c6f7fb52b8deff1a9584e121568da557eb29e967147dc1c6beee305" => :mojave sha256 "cb0c464f59c82a4df3a8ec0cae87ceea54b49445da53be4f32c6a343d7180601" => :high_sierra + sha256 "c1e14e151663611d3925f4722f94a64afb938648b3008945c292665ac8a7e769" => :x86_64_linux end def install - system "make", "PREFIX=#{prefix}" - system "make", "install", "PREFIX=#{prefix}" + defs = ["PREFIX=#{prefix}"] + defs << "AFL_NO_X86=1" unless OS.mac? + system "make", *defs + system "make", "install", *defs end test do @@ -25,7 +28,11 @@ def install } EOS - system bin/"afl-clang++", "-g", cpp_file, "-o", "test" + if which "clang++" + system bin/"afl-clang++", "-g", cpp_file, "-o", "test" + else + system bin/"afl-g++", "-g", cpp_file, "-o", "test" + end assert_equal "Hello, world!", shell_output("./test") end end diff --git a/Formula/aften.rb b/Formula/aften.rb index dd33520392b6e..abccd4dbf4f74 100644 --- a/Formula/aften.rb +++ b/Formula/aften.rb @@ -13,6 +13,7 @@ class Aften < Formula sha256 "68b4983cc843e2d57854a263038a965a2dd6c473c98111f482ec1c69d09ace83" => :el_capitan sha256 "4f785f04a3bbde677452f2c5d1c04f77605e156b4020294c5799c85d0b8586d3" => :yosemite sha256 "b7acaf77ece8e6b51493ce69e713990a4ce13bc5b9d5ad6914cc86c0f745c9d0" => :mavericks + sha256 "146f47a5dfd6ccdc4342e3f71694801c8b4706809b3110982dae3d2062aaed3f" => :x86_64_linux # glibc 2.19 end depends_on "cmake" => :build diff --git a/Formula/afuse.rb b/Formula/afuse.rb index c281fc5e03f17..4321166dad3fd 100644 --- a/Formula/afuse.rb +++ b/Formula/afuse.rb @@ -3,6 +3,7 @@ class Afuse < Formula homepage "https://github.com/pcarrier/afuse/" url "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/afuse/afuse-0.4.1.tar.gz" sha256 "c6e0555a65d42d3782e0734198bbebd22486386e29cb00047bc43c3eb726dca8" + revision 1 unless OS.mac? bottle do cellar :any @@ -12,10 +13,15 @@ class Afuse < Formula sha256 "900e55a47834181f518e87e7cbaaf0f3f078b0d40631ffccfc776e82c7c61f87" => :sierra sha256 "a4c0f86a179ca8c5d1e3977ff167dbcd1abff4ec1ee17fd5700a3fb602c781a3" => :el_capitan sha256 "2a57c7752c7b461f6b628a1c30e845fe13685eab394d933e8da3aebf7102ae9c" => :yosemite + sha256 "7a7953cd690dfef18f9a3ea59b533aa887d9691a559306254a6333ba0b7c011b" => :x86_64_linux end depends_on "pkg-config" => :build - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" @@ -23,6 +29,6 @@ def install end test do - assert_match /OSXFUSE/, pipe_output("#{bin}/afuse --version 2>&1") + assert_match (OS.mac? ? /OSXFUSE/ : /FUSE library version/), pipe_output("#{bin}/afuse --version 2>&1") end end diff --git a/Formula/agedu.rb b/Formula/agedu.rb index 6f926aad15693..959caca63a350 100644 --- a/Formula/agedu.rb +++ b/Formula/agedu.rb @@ -11,6 +11,7 @@ class Agedu < Formula sha256 "93e3e4722e8b4f3e7a28656bd779bd126377542d839f746816027a47073dc254" => :catalina sha256 "84b4caf41c37aec16cc884354491e1464c29e85b584d1555b26002b9cfa9897d" => :mojave sha256 "2a37fae4983a2a71ec1780eae4b0cd7f8367875e2078ff7fa0f5392125751b33" => :high_sierra + sha256 "1d1a32fbaf2418cf638e4ae170dbb75b54ae9a112fdadd2bced3c0d5b2430346" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/aggregate.rb b/Formula/aggregate.rb index 18f6146c0cb98..b004a75c3826f 100644 --- a/Formula/aggregate.rb +++ b/Formula/aggregate.rb @@ -14,6 +14,7 @@ class Aggregate < Formula sha256 "87507a739f2bd5ba57ccd23b34f2b7c41d68a897c128231dbbc32ba23b869ed5" => :el_capitan sha256 "813ccd28b00f94e1574079f7f6816858e32c5d8f9a964b783307d25c7e449d2b" => :yosemite sha256 "169598a0d41382215ba51ed0c377c98857804e82fb1658414dd04ee94ddbb993" => :mavericks + sha256 "5192eb54fd05b00b6ad4c7f342eadedc166c88117e5dd22c8ffb6128e513bf62" => :x86_64_linux # glibc 2.19 end conflicts_with "crush-tools", :because => "both install an `aggregate` binary" diff --git a/Formula/aha.rb b/Formula/aha.rb index a33e6ec66ab36..e5941bc729e4f 100644 --- a/Formula/aha.rb +++ b/Formula/aha.rb @@ -11,6 +11,7 @@ class Aha < Formula sha256 "b22a64305a6e2b05dfbc534169d4536d34dcb5ed81be53dbf57f7dd640a6b9bf" => :mojave sha256 "be1915be3aebd7fdccc3e0d694351b29c9e5af4093492154dbf46ddb5d506a2b" => :high_sierra sha256 "2625fabfb62878a3123448e5dbe56e18efbd0d90f1b4dcf3dc1619274ecb7c08" => :sierra + sha256 "8c23e19b8fa18789c364797676973cef3ba0480889724ba6d9379d5c0260181d" => :x86_64_linux end def install diff --git a/Formula/ahcpd.rb b/Formula/ahcpd.rb index 11df71c4025fd..76f8123c8449e 100644 --- a/Formula/ahcpd.rb +++ b/Formula/ahcpd.rb @@ -13,12 +13,13 @@ class Ahcpd < Formula sha256 "b37143ee365a4a3afd9623d5f49eab0bc4bdf9ac3662d22db9671cffa1078224" => :el_capitan sha256 "36907bc1aadc9d9d874ebd74624d8c2c2e8b4057181df1e964720a41f72ccae8" => :yosemite sha256 "8518f82187d2b8d2bc24648bd072f19073e159abb2bdaf5418ad31e3ab966d0b" => :mavericks + sha256 "79e5e2d17a16e516b378a6967e4c243a9a1e6cfcae57a2062d2b21a872561805" => :x86_64_linux end patch :DATA def install - system "make", "LDLIBS=''" + system "make", "LDLIBS=''" if OS.mac? system "make", "install", "PREFIX=", "TARGET=#{prefix}" end diff --git a/Formula/ahoy.rb b/Formula/ahoy.rb index 7024bb369f0e6..aea537ac2351c 100644 --- a/Formula/ahoy.rb +++ b/Formula/ahoy.rb @@ -10,6 +10,7 @@ class Ahoy < Formula sha256 "eabaf2c0faa64d878f3fd552823b9d5103e0755ba5f3120628e605964fc93257" => :mojave sha256 "93db889b646270f7a92d32f649c9e256e4e90cfa006a04c614334f28557ce7ca" => :high_sierra sha256 "5743854a4e6553adb3318a2facfd941bcf4d95a7ab3c2399400c7818c6e19c6f" => :sierra + sha256 "feaeb1fd36f11d336ecf3a38606e742cc41bf80f076b6413eadde577ec1ac133" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/aide.rb b/Formula/aide.rb index 7bd929de9c31f..85bdec0d92e50 100644 --- a/Formula/aide.rb +++ b/Formula/aide.rb @@ -5,11 +5,12 @@ class Aide < Formula sha256 "17f998ae6ae5afb9c83578e4953115ab8a2705efc50dee5c6461cef3f521b797" bottle do - cellar :any + cellar :any_skip_relocation sha256 "8cf98b716cfdc2e06e059b5c0f780db5940c4fda116c3b0543f8e19bd76a9817" => :catalina sha256 "bb68fa349609a0221b2138e3596ceb803242862b771bb0b76440057e31201050" => :mojave sha256 "fff1a3e469346d9181f73d8c3d734801b900c765308f3c36495b1801fb3ad897" => :high_sierra sha256 "77aef168355fa73b01b0967d80058582f7387997ba2c7f7b7aad0eb335939488" => :sierra + sha256 "8426409e2e44a40c450fea45aa285fc39f2b6d208ee7b42a007daed2df7d09f3" => :x86_64_linux end head do @@ -31,7 +32,7 @@ def install system "./configure", "--disable-lfs", "--disable-static", - "--with-curl", + "--with-curl#{OS.mac? ? "" : "=" + Formula["curl"].prefix}", "--with-zlib", "--sysconfdir=#{etc}", "--prefix=#{prefix}" diff --git a/Formula/aircrack-ng.rb b/Formula/aircrack-ng.rb index 394f11d1b45e1..5a87f30c605c9 100644 --- a/Formula/aircrack-ng.rb +++ b/Formula/aircrack-ng.rb @@ -8,6 +8,7 @@ class AircrackNg < Formula sha256 "1b5ecf42ef840c108536eac5107cf63c514ca2f3d7e8c4f32e5b301f088729c1" => :catalina sha256 "e6bbba9c16ac26aaacaad5ac4935100a79cf702ab8fcb35fa9797e806ec003fe" => :mojave sha256 "fad333ea8e2792d88305c22b62549f63900ea32aa3f856de57d6e8d70740cd49" => :high_sierra + sha256 "341d886372c1d98eb0514492763c1340159cdcbfc66e35c3db9875975dc8c854" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/airspy.rb b/Formula/airspy.rb index b346ee102352e..578deb369cda6 100644 --- a/Formula/airspy.rb +++ b/Formula/airspy.rb @@ -12,6 +12,7 @@ class Airspy < Formula sha256 "bfc1393f3efe5b58016fbee40a4048e7c7246203cb72b02261da1045941bcd4f" => :sierra sha256 "c86b265ed42d8a976ff4bfc6116e5945d103f22af8ced4b9a9a18827ecf4af06" => :el_capitan sha256 "1d6af7e52534bc50625eabcaa2b586e5824a3abbb4c3b42e032e5b4de41c6bfb" => :yosemite + sha256 "19a6d6d3aba7c39def8c064fcc57587e3f60d4a944181c9711a1cc6817f5e5eb" => :x86_64_linux end depends_on "cmake" => :build @@ -23,7 +24,7 @@ def install libusb = Formula["libusb"] args << "-DLIBUSB_INCLUDE_DIR=#{libusb.opt_include}/libusb-1.0" - args << "-DLIBUSB_LIBRARIES=#{libusb.opt_lib}/libusb-1.0.dylib" + args << "-DLIBUSB_LIBRARIES=#{libusb.opt_lib}/libusb-1.0.#{OS.mac? ? "dylib" : "so"}" mkdir "build" do system "cmake", "..", *args diff --git a/Formula/akamai.rb b/Formula/akamai.rb index 793aac64e1dbb..1666b4021ae76 100644 --- a/Formula/akamai.rb +++ b/Formula/akamai.rb @@ -9,6 +9,7 @@ class Akamai < Formula sha256 "a986f3bfc261227cd44447d5ff9cdfb461c50c002118d36caed068f5859432e1" => :catalina sha256 "ce3ea6b8dba89d48bfec3be3bbf5701e7b1dcdde7a2f76a97dd668752b1e95fb" => :mojave sha256 "2b6d07c4926858e1be33bef070a925a6746f396fa27566aaa313d5a2673cb25f" => :high_sierra + sha256 "748751d8976fcaaa48a7921168a25794a81ca3bbd978471f1757e7346854783d" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/alac.rb b/Formula/alac.rb index 84a0db937c6b7..891e22590f4e3 100644 --- a/Formula/alac.rb +++ b/Formula/alac.rb @@ -13,6 +13,7 @@ class Alac < Formula sha256 "4cb85c125553c6c2a49576790c5be5e0b89096569131df3b8576f3499e65ef5a" => :el_capitan sha256 "a3a54a254a147f3a1173870bdd2e9399043b3e506d8c04383f99cf3ce67a4fca" => :yosemite sha256 "20cca431ce69d7eb2e5d894ebbfffdbc633eef2b3447be6d0afdb7c25cac8c0e" => :mavericks + sha256 "13cb21bc650758a34bd9b9dc2ecfcce95fe20461b4c34b304acd2e9046c46683" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/aldo.rb b/Formula/aldo.rb index 692c8dfd44b80..fe64073f78ee0 100644 --- a/Formula/aldo.rb +++ b/Formula/aldo.rb @@ -14,6 +14,7 @@ class Aldo < Formula sha256 "0691c4b9b7ae5b6f104c5b5205f731d4348563b8a9a8c3631395f619ce00aabf" => :el_capitan sha256 "f5d55cefcfc65033f50bf2aedb30298db1540a8dd5f5c028feb3b4b1c7e5610b" => :yosemite sha256 "fea59d120862f6a04da3993dde1b2f6db60183fc6d7f90f77bb622efdf8a16ac" => :mavericks + sha256 "3101dd5c2d8b4646c2623fb0bcd72f1d7ca41346b201c799a90289db96649075" => :x86_64_linux end depends_on "libao" diff --git a/Formula/alexjs.rb b/Formula/alexjs.rb index fe3782c3c8154..6598295e1b2b8 100644 --- a/Formula/alexjs.rb +++ b/Formula/alexjs.rb @@ -11,6 +11,7 @@ class Alexjs < Formula sha256 "7243b8eff6ed19d7bd0e1a4de718b2d1402a29550f0bd86b44089d56c9351ce9" => :catalina sha256 "c9ea2efc68c6fd108fe37e679973dbf6e2f698a31a70c32c01ab7870a9d9dc50" => :mojave sha256 "5ee3fd2c0c5e56bdb56fd7de0e717af9a7998a66e8a2b14374fc6cc2b36bfd86" => :high_sierra + sha256 "ee495807ce2aaf7cbcd3b63ecadeaa5256d3133bd9ecde2b5b831c918035170f" => :x86_64_linux end depends_on "node" diff --git a/Formula/algernon.rb b/Formula/algernon.rb index bddf1138a1419..6a4ce94b5c75e 100644 --- a/Formula/algernon.rb +++ b/Formula/algernon.rb @@ -11,6 +11,7 @@ class Algernon < Formula sha256 "19d76d366a23558e40e5dc37cb8be6807afafebc2b85549bd61df488b4b8ace7" => :catalina sha256 "2f7d73a7d99ea6ca4d406388ea7475f53ac022ca11f9df7ce5e7ff6bf629a634" => :mojave sha256 "fcc2b783a77662cc1831dec57d1895cc078746ecaf4dc618b7df1e165254979d" => :high_sierra + sha256 "05d2ca39f0009f9ff0d04bfb22645195977ef390175b018ef6248d9271239bd9" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/algol68g.rb b/Formula/algol68g.rb index 307129d4f108e..ff48702c7f0e7 100644 --- a/Formula/algol68g.rb +++ b/Formula/algol68g.rb @@ -8,6 +8,7 @@ class Algol68g < Formula sha256 "046ba5e9ec0d0856557085fdf1acde227cd829d9955da28046e98c9a5ee84c09" => :catalina sha256 "7e1acd53615ebc407aaae64eb23af6047dbbd42f967e422b3fcfa0c6d01307b6" => :mojave sha256 "18013401e3eed914022e0a34c6b9b1ed415ec679113de78970d74aa52b0a35e8" => :high_sierra + sha256 "54dfb7001fa1aba552b02d6c63bd20328b446170f06c432e1ddc1ab26e4cd5a1" => :x86_64_linux end on_linux do diff --git a/Formula/align.rb b/Formula/align.rb index 9e0de7e4c80a5..487fe537101cf 100644 --- a/Formula/align.rb +++ b/Formula/align.rb @@ -13,6 +13,7 @@ class Align < Formula sha256 "c2c177c8be3b5a58e60f3a1f39d9fdd3cc3d39247d92be45142cd06ae80273bf" => :el_capitan sha256 "caa9e8c3b3a9d946b95d5222b1518c5307499d57fe17f593ec3911f9cc6eace7" => :yosemite sha256 "f903cb30e079f56c5743e2ca22a168c61d7a7c57b2cf6bc3c6492ed214a296a3" => :mavericks + sha256 "b9eb7dd92c0d92a1baff4714c8f4c7b8b14d4d7cf6102e40af88a9a0d96d3348" => :x86_64_linux # glibc 2.19 end conflicts_with "speech-tools", :because => "both install `align` binaries" diff --git a/Formula/aliyun-cli.rb b/Formula/aliyun-cli.rb index 69557c22e216b..248d6aa173afd 100644 --- a/Formula/aliyun-cli.rb +++ b/Formula/aliyun-cli.rb @@ -9,6 +9,7 @@ class AliyunCli < Formula sha256 "a007089888c8c2e3664a8a92d24d6a0f9a93856b15707d60eeb8953803ea0d8e" => :catalina sha256 "aabafb3a2d1cd90b990669d9d51a79bf6bf61905674778ea4cfae72b77213da0" => :mojave sha256 "4ff3bc16041651a60a2568cfcded5fb40fbd8b8c90ba0af273e41fa41d6ba13b" => :high_sierra + sha256 "f742e37a626d469f28fb6d3a5993b71330bede39c52f4a0cceb80fae2a49d04d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/allureofthestars.rb b/Formula/allureofthestars.rb index e32f403469e1c..c054abb7aa00c 100644 --- a/Formula/allureofthestars.rb +++ b/Formula/allureofthestars.rb @@ -14,6 +14,7 @@ class Allureofthestars < Formula sha256 "cdcc579293d895e65bdfd907c2ab4d66db89e0389f78df9acaf1ea556ea47c63" => :catalina sha256 "4b18f47a9ade6d260030488503b5bb3021ae523cf3b54960c8092495f0ffd47c" => :mojave sha256 "2a056d85e8a4794158435ca324f7bc81d8dcb098770ec1d3d288dfcc77553c47" => :high_sierra + sha256 "6acbd65aa5e42e5029398bb474e72ccff971aa548f6b0effb1696ae1bfb4d564" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/alot.rb b/Formula/alot.rb index baf879ffb79b0..356acde391128 100644 --- a/Formula/alot.rb +++ b/Formula/alot.rb @@ -115,7 +115,11 @@ def install pid = fork do $stdout.reopen("/dev/null") $stdin.reopen("/dev/null") - exec "script", "-q", "/dev/null", bin/"alot", "--logfile", testpath/"out.log" + if OS.mac? + exec "script", "-q", "/dev/null", bin/"alot", "--logfile", testpath/"out.log" + else + exec "script", "-q", "/dev/null", "-e", "-c", "#{bin}/alot --logfile #{testpath}/out.log" + end end sleep 10 ensure diff --git a/Formula/alp.rb b/Formula/alp.rb index b4cd25b1a8130..f6017f128b079 100644 --- a/Formula/alp.rb +++ b/Formula/alp.rb @@ -10,6 +10,7 @@ class Alp < Formula sha256 "755f952f59a31722a849a195b1cc9aaab82d427e104ece552088f322477f1e73" => :catalina sha256 "bda205a8a157441a4a9aebe3c1881575d8a801bf8f8edc3cccdba9607163661e" => :mojave sha256 "2b8f514b8c7540a6db9fc6a70a4b803dbf864e35eb1410e6cc874915485fbbfb" => :high_sierra + sha256 "71a064c5c0bf13260bfe0941ded994b45dfde8ad3002790825158709ea2c95f7" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/alpine.rb b/Formula/alpine.rb index a5b4366bfa987..a799ab2dc4d58 100644 --- a/Formula/alpine.rb +++ b/Formula/alpine.rb @@ -9,11 +9,17 @@ class Alpine < Formula sha256 "3e775bad34dc730ad9c15e3df30e753842ee542695172362cc648ead05e4d151" => :catalina sha256 "5492f86a14779b434ebb069bcef8ae551c93dc8835106d6144699e54191de3bd" => :mojave sha256 "f7b9f13b015de8e08ec73b1e4784abc64e5cf01785ef722ffa3d80441248a640" => :high_sierra + sha256 "8e85aed88d88baccdd32a18ba82bb4a926a1d180ff45a4728bb5052b84fef689" => :x86_64_linux end depends_on "openssl@1.1" uses_from_macos "ncurses" + uses_from_macos "openldap" + + on_linux do + depends_on "linux-pam" + end def install ENV.deparallelize diff --git a/Formula/alsa-lib.rb b/Formula/alsa-lib.rb new file mode 100644 index 0000000000000..d1c3b2494dd21 --- /dev/null +++ b/Formula/alsa-lib.rb @@ -0,0 +1,34 @@ +class AlsaLib < Formula + desc "Provides audio and MIDI functionality to the Linux operating system" + homepage "https://www.alsa-project.org/" + url "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.2.1.2.tar.bz2" + sha256 "958e260e3673f1f6ff6b2d2c0df3fc2e469bea5b2957163ce96ce17f23e87943" + + bottle do + sha256 "8280bb44070d41048d081911ec73782e72cf5739d65997a5d8ee58517cf708f4" => :x86_64_linux + end + + depends_on :linux + + def install + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + (testpath/"test.c").write <<~EOS + #include + int main(void) + { + snd_ctl_card_info_t *info; + snd_ctl_card_info_alloca(&info); + return 0; + } + EOS + system ENV.cc, "test.c", "-L#{lib}", "-lasound", "-o", "test" + system "./test" + end +end diff --git a/Formula/amazon-ecs-cli.rb b/Formula/amazon-ecs-cli.rb index 6383acff9ccc8..b627d1572898b 100644 --- a/Formula/amazon-ecs-cli.rb +++ b/Formula/amazon-ecs-cli.rb @@ -10,6 +10,7 @@ class AmazonEcsCli < Formula sha256 "5d86f8ab877483a5f9612c7a668b5b81e5d2c758c0fb713cc84fb0371e3c005d" => :catalina sha256 "791f175e28303422664e373313952fa2d8c1074c66435f9b70201d77f90567e9" => :mojave sha256 "f15432e9a164b3602b4722c81d03d0d70116d947859b6d113d5b973d0e3d32bb" => :high_sierra + sha256 "7622a3fb39c92336540ba7cb4ee6c1c83a787cb3170c38fa8406fdc94e5c844b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ampl-mp.rb b/Formula/ampl-mp.rb index a382d20605d30..652396b324b15 100644 --- a/Formula/ampl-mp.rb +++ b/Formula/ampl-mp.rb @@ -10,6 +10,7 @@ class AmplMp < Formula sha256 "c111c501330b3ff8e3bde1a7e679f162bea1038df07de96810ea5cbe34775740" => :catalina sha256 "bf329d7a40c3a21cb745d9d86bc0cf4add18397aedd6b36eb8e27feab822f1e3" => :mojave sha256 "835aea5e86e3780681cb38ebe0f0dcd522ed21f80ed4711ad10e66b6c0814d03" => :high_sierra + sha256 "085a8e4fdb7cf54927e2b4422b6e2536a7726b761e95ee38a5b6115ecba41280" => :x86_64_linux end depends_on "cmake" => :build @@ -29,8 +30,10 @@ class AmplMp < Formula def install system "cmake", ".", *std_cmake_args, "-DBUILD_SHARED_LIBS=True" system "make", "all" - MachO::Tools.change_install_name("bin/libasl.dylib", "@rpath/libmp.3.dylib", - "#{opt_lib}/libmp.dylib") + if OS.mac? + MachO::Tools.change_install_name("bin/libasl.dylib", "@rpath/libmp.3.dylib", + "#{opt_lib}/libmp.dylib") + end system "make", "install" # Shared modules are installed in bin @@ -47,7 +50,11 @@ def install end test do - system ENV.cc, pkgshare/"example/miniampl.c", "-I#{include}/asl", "-L#{lib}", "-lasl", "-lmp" + if OS.mac? + system ENV.cc, pkgshare/"example/miniampl.c", "-I#{include}/asl", "-L#{lib}", "-lasl", "-lmp" + else + system ENV.cc, pkgshare/"example/miniampl.c", "-std=c99", "-I#{include}/asl", "-L#{lib}", "-lasl", "-lmp" + end cp Dir[pkgshare/"example/wb.*"], testpath output = shell_output("./a.out wb showname=1 showgrad=1") assert_match "Objective name: objective", output diff --git a/Formula/amqp-cpp.rb b/Formula/amqp-cpp.rb index 0f41c4a95bac9..a7ef788f9db2d 100644 --- a/Formula/amqp-cpp.rb +++ b/Formula/amqp-cpp.rb @@ -10,6 +10,7 @@ class AmqpCpp < Formula sha256 "1bc7470b4ede09d2c270b3581f0e0c791943f050be7c2695dfc6f983a5dfc93a" => :catalina sha256 "dc608777daa46c2b4ac309992b6e958446e812efcd511f4670cef9dc9cf10aeb" => :mojave sha256 "2e4c08dc2967f679c6dc9179dd6d1513309843bf40ab56fee369f863a44e3912" => :high_sierra + sha256 "cdc8d8d8e687d399049086a0f13b404b1d1e8e22aeb266fd3c47f55c9dd16c18" => :x86_64_linux end depends_on "cmake" => :build @@ -35,7 +36,7 @@ def install } EOS system ENV.cxx, "test.cpp", "-std=c++11", "-L#{lib}", "-o", - "test", "-lc++", "-lamqpcpp" + "test", *("-lc++" if OS.mac?), "-lamqpcpp" system "./test" end end diff --git a/Formula/amtk.rb b/Formula/amtk.rb index 57782338672c1..5788023d5644f 100644 --- a/Formula/amtk.rb +++ b/Formula/amtk.rb @@ -75,7 +75,6 @@ def install -L#{lib} -L#{pango.opt_lib} -latk-1.0 - -lamtk-5.0 -lcairo -lcairo-gobject -lgdk-3 @@ -84,10 +83,15 @@ def install -lglib-2.0 -lgobject-2.0 -lgtk-3 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + if OS.mac? + flags << "-lintl" + flags << "-lamtk-5.0" + else + flags << "-lamtk-5" + end system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/amtterm.rb b/Formula/amtterm.rb index 48c8c64fe0e22..a8e4c0f27ed7a 100644 --- a/Formula/amtterm.rb +++ b/Formula/amtterm.rb @@ -13,6 +13,7 @@ class Amtterm < Formula sha256 "256736b4dd1d0b427bdb7ca2f9931cc1c403ffe1e43695920160f4f3ffabfe88" => :sierra sha256 "4035d9bcb4f6785255a5ea3df1dcc309dbf69441b69dde15b1936e8522fc8e95" => :el_capitan sha256 "387897642ba8bcb6daff01adae021264eaf9deea1f264e210e9592b6bc5cc44a" => :yosemite + sha256 "e7c0d404abef30d115b8f4a2b75531883aa01c646d1a3292c1eb45fc0e00ce8a" => :x86_64_linux # glibc 2.19 end resource "SOAP::Lite" do diff --git a/Formula/analog.rb b/Formula/analog.rb index 990afff3026bf..38ec9ea107139 100644 --- a/Formula/analog.rb +++ b/Formula/analog.rb @@ -15,6 +15,7 @@ class Analog < Formula sha256 "097f11e7f53078e6b248e38fc326cded49b08cdbe75ab61e20ab7b2a6e770256" => :el_capitan sha256 "f2f29ea2dcbb9e0576c72f009d8814b0c7f84efd49d6f005085c876c85fd29b9" => :yosemite sha256 "c9ca1f30d5b71b7653ecbbdb4ad8d9e81e41b2e33a9dc2c8e0a92af7cd48007d" => :mavericks + sha256 "5369312ff37a04f3c3043ce76300ead973ac1318483726f11cbf2084ce71b163" => :x86_64_linux end depends_on "gd" @@ -24,11 +25,13 @@ class Analog < Formula uses_from_macos "zlib" def install + libs = "-lz" + libs += " -lm" unless OS.mac? system "make", "CC=#{ENV.cc}", "CFLAGS=#{ENV.cflags}", "DEFS='-DLANGDIR=\"#{pkgshare}/lang/\"' -DHAVE_ZLIB", - "LIBS=-lz", - "OS=OSX" + "LIBS=#{libs}", + "OS=#{OS.mac? ? "OSX" : "UNIX"}" bin.install "analog" pkgshare.install "examples", "how-to", "images", "lang" diff --git a/Formula/angle-grinder.rb b/Formula/angle-grinder.rb index 42956ad47804e..fd81a2224a62f 100644 --- a/Formula/angle-grinder.rb +++ b/Formula/angle-grinder.rb @@ -10,6 +10,7 @@ class AngleGrinder < Formula sha256 "ab4027c863beaa9da3593844c89465ec95ba88d829ef76b4eb0b6c648d01af9a" => :catalina sha256 "5d1c7560b7a8e0437d7534253ad360d9d5d0560d2d8f2e092461691faf0e30fa" => :mojave sha256 "4aedebd2abddc24893f849fd86830efc1247739782fdf239ea04ef6cf25fcd2b" => :high_sierra + sha256 "9a8e3ff6b0a1bb1ab5b3a87920ac38d3a35c84e02ad69727a1315eb451613fd1" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/angular-cli.rb b/Formula/angular-cli.rb index 42a9f5d717d3d..df6963f352c0c 100644 --- a/Formula/angular-cli.rb +++ b/Formula/angular-cli.rb @@ -11,6 +11,7 @@ class AngularCli < Formula sha256 "c0f35a065156914fd9788b0621956ca6148aea6c967f1d936e1a75c77a6a9ee4" => :catalina sha256 "3fe2c00c30457a6be1cdd68f857f1316771118605a9cc174fe8e48470c5dde86" => :mojave sha256 "1cefd0447b33c8507d90e9542a4a9c60497d7f42e686b633c84769edb568bb84" => :high_sierra + sha256 "f6bd490d2b09622464bfdadcc093983dd20522e5635fd379cee3baea6dc0fa60" => :x86_64_linux end depends_on "node" diff --git a/Formula/anime-downloader.rb b/Formula/anime-downloader.rb index 95cceac4d5078..51d7d07df3654 100644 --- a/Formula/anime-downloader.rb +++ b/Formula/anime-downloader.rb @@ -12,6 +12,7 @@ class AnimeDownloader < Formula sha256 "afabaec3f49758f2d6c802a3f6cc732d359bc1aa4f96102d5bbb5db7cb28851f" => :catalina sha256 "7c10ffe30e521687890945769fe95f9d3f08262e8d9a3055072a63b749d9cb26" => :mojave sha256 "842d8ee3c6fc388e9bfb18f9d05f3c07bdeb9aa6b77a218fb05b0803036cd942" => :high_sierra + sha256 "e2385d6ea12815ed985d300d6d74664949531850e644d1f664692fc6086c0443" => :x86_64_linux end depends_on "aria2" diff --git a/Formula/annie.rb b/Formula/annie.rb index b6e9c808058c4..f2e4814c519c3 100644 --- a/Formula/annie.rb +++ b/Formula/annie.rb @@ -9,6 +9,7 @@ class Annie < Formula sha256 "e6d397938206bdc5b5db0106e9cff7de75e0220035ac704729e6b9af676edd9d" => :catalina sha256 "70801555e212940e2dff9619a1df446a0b2b0b45a57f401d62a4b878b7102108" => :mojave sha256 "2187d4d3e865b8a24eb03c7c4c893d48e020791f2901bbc4782344f01647307f" => :high_sierra + sha256 "1930dba2444d51230625959ec95f6587631fb29ca729aa03ce6d733907fccc2b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ansible-lint.rb b/Formula/ansible-lint.rb index 7e0ba0e002b42..6d36ca93bfc68 100644 --- a/Formula/ansible-lint.rb +++ b/Formula/ansible-lint.rb @@ -5,13 +5,14 @@ class AnsibleLint < Formula homepage "https://github.com/ansible/ansible-lint/" url "https://files.pythonhosted.org/packages/fc/e6/e3cf96cb73b1920584cdcc8579164a70b7e8aab276b198f2130a7939efcc/ansible-lint-4.2.0.tar.gz" sha256 "eb925d8682d70563ccb80e2aca7b3edf84fb0b768cea3edc6846aac7abdc414a" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any sha256 "3426e9ec96b4e938f4f0004d1323db89737f1f526fecee081771cf30e1689dd7" => :catalina sha256 "6558f69553bf09ebdef982f05a57492c9fd14a9a0baaed61151d8d054e652e73" => :mojave sha256 "83a905c6fedaabb38d7a53692d892ea9e2bd429d5a39b1c338dc2e26ea0d352f" => :high_sierra + sha256 "961caf6c87b73c351975597381b4a1363ec753d25d3b328ed25b5d8913a73218" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/ansible.rb b/Formula/ansible.rb index ac21c3cb2aac8..285f8606aa1f5 100644 --- a/Formula/ansible.rb +++ b/Formula/ansible.rb @@ -12,6 +12,7 @@ class Ansible < Formula sha256 "263c0ddb504922e2037d22589a7673b8fce2e1076074cdd2545ade0b79c64fe7" => :catalina sha256 "bb18de7615d014c115c00aabe77dda20848a1ccd61c58b19e531578152cf5818" => :mojave sha256 "60c6261e0fa19f70c9f6ade9f8ebc3c2ab2290aecffc47ae3d411f56beaffabb" => :high_sierra + sha256 "7451722ca9b7353c0e51c94658121e7e604b8f529a76ddb4a36f636a37417ac7" => :x86_64_linux end depends_on "pkg-config" => :build @@ -272,9 +273,11 @@ class Ansible < Formula sha256 "fb04cfd54d8d7e4cc533108750047e9ccf43139c3c0220f8a082274b19564e98" end - resource "kerberos" do - url "https://files.pythonhosted.org/packages/34/18/9c86fdfdb27e0f7437b7d5a9e22975dcc382637b2a68baac07843be512fc/kerberos-1.3.0.tar.gz" - sha256 "f039b7dd4746df56f6102097b3dc250fe0078be75130b9dc4211a85a3b1ec6a4" + if OS.mac? + resource "kerberos" do + url "https://files.pythonhosted.org/packages/34/18/9c86fdfdb27e0f7437b7d5a9e22975dcc382637b2a68baac07843be512fc/kerberos-1.3.0.tar.gz" + sha256 "f039b7dd4746df56f6102097b3dc250fe0078be75130b9dc4211a85a3b1ec6a4" + end end resource "keystoneauth1" do @@ -632,14 +635,14 @@ def install ENV.prepend_path "PATH", Formula["python@3.8"].opt_libexec/"bin" # Fix "ld: file not found: /usr/lib/system/libsystem_darwin.dylib" for lxml - ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version <= :sierra + ENV["SDKROOT"] = MacOS.sdk_path if OS.mac? && MacOS.version <= :sierra # Work around Xcode 11 clang bug # https://code.videolan.org/videolan/libbluray/issues/20 ENV.append_to_cflags "-fno-stack-check" if DevelopmentTools.clang_build_version >= 1010 # https://github.com/Homebrew/homebrew-core/issues/7197 - ENV.prepend "CPPFLAGS", "-I#{MacOS.sdk_path}/usr/include/ffi" + ENV.prepend "CPPFLAGS", "-I#{MacOS.sdk_path}/usr/include/ffi" if OS.mac? virtualenv_install_with_resources @@ -665,7 +668,11 @@ def install - name: ping ping: EOS - (testpath/"hosts.ini").write "localhost ansible_connection=local\n" + (testpath/"hosts.ini").write [ + "localhost ansible_connection=local", + *(" ansible_python_interpreter=" + which("python3") unless OS.mac?), + "\n", + ].join("") system bin/"ansible-playbook", testpath/"playbook.yml", "-i", testpath/"hosts.ini" # Ensure requests[security] is activated diff --git a/Formula/ansible@2.8.rb b/Formula/ansible@2.8.rb index fc3ea3685bde5..764d0f352e521 100644 --- a/Formula/ansible@2.8.rb +++ b/Formula/ansible@2.8.rb @@ -275,9 +275,11 @@ class AnsibleAT28 < Formula sha256 "fb04cfd54d8d7e4cc533108750047e9ccf43139c3c0220f8a082274b19564e98" end - resource "kerberos" do - url "https://files.pythonhosted.org/packages/34/18/9c86fdfdb27e0f7437b7d5a9e22975dcc382637b2a68baac07843be512fc/kerberos-1.3.0.tar.gz" - sha256 "f039b7dd4746df56f6102097b3dc250fe0078be75130b9dc4211a85a3b1ec6a4" + if OS.mac? + resource "kerberos" do + url "https://files.pythonhosted.org/packages/34/18/9c86fdfdb27e0f7437b7d5a9e22975dcc382637b2a68baac07843be512fc/kerberos-1.3.0.tar.gz" + sha256 "f039b7dd4746df56f6102097b3dc250fe0078be75130b9dc4211a85a3b1ec6a4" + end end resource "keystoneauth1" do @@ -599,14 +601,14 @@ def install ENV.prepend_path "PATH", Formula["python"].opt_libexec/"bin" # Fix "ld: file not found: /usr/lib/system/libsystem_darwin.dylib" for lxml - ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra + ENV["SDKROOT"] = MacOS.sdk_path if OS.mac? && MacOS.version == :sierra # Work around Xcode 11 clang bug # https://code.videolan.org/videolan/libbluray/issues/20 ENV.append_to_cflags "-fno-stack-check" if DevelopmentTools.clang_build_version >= 1010 # https://github.com/Homebrew/homebrew-core/issues/7197 - ENV.prepend "CPPFLAGS", "-I#{MacOS.sdk_path}/usr/include/ffi" + ENV.prepend "CPPFLAGS", "-I#{MacOS.sdk_path}/usr/include/ffi" if OS.mac? virtualenv_install_with_resources diff --git a/Formula/ansifilter.rb b/Formula/ansifilter.rb index fdab81e5b816f..9620e070c6236 100644 --- a/Formula/ansifilter.rb +++ b/Formula/ansifilter.rb @@ -9,6 +9,7 @@ class Ansifilter < Formula sha256 "29cf09137837f8830ba67d6e8aed9fc2e21192edbdc68531e8c33e5f75b14209" => :catalina sha256 "8498a78c79a4e22b9d644a957508f9641443e10ed00177cb75d8aa9377f7e940" => :mojave sha256 "0e28ecd7fccb6753e0f2b056f553f1434661cbda4972a82b253e3f696762247e" => :high_sierra + sha256 "062c80412b3fa30fdae65f9d662f3452a3df198b91ddbe37147a6dffc931163d" => :x86_64_linux end def install diff --git a/Formula/antibody.rb b/Formula/antibody.rb index 9605b113597f2..00b07a6f1b5a3 100644 --- a/Formula/antibody.rb +++ b/Formula/antibody.rb @@ -9,6 +9,7 @@ class Antibody < Formula sha256 "5c3ec35f32bb0ba5a254c7ea09675251dfa73ec5c0066a3a28a7fd637065e026" => :catalina sha256 "44120733359210252f9b57d7d4d96ab46acb13828a3b65fdb001e639cc46a31a" => :mojave sha256 "ccea6fb02d1df23fc2438993b2434a8826904d3be4779d5efc5310ae2fbddfb2" => :high_sierra + sha256 "82949b5587c9c45eaf38b422aaaa47d8f5dce7a49ca4c31c6a553923ae928e92" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/antigen.rb b/Formula/antigen.rb index 228e1118c25c8..38231e2b08979 100644 --- a/Formula/antigen.rb +++ b/Formula/antigen.rb @@ -1,3 +1,9 @@ +class ZshRequirement < Requirement + fatal true + # formula "zsh" + satisfy { which "zsh" } +end + class Antigen < Formula desc "Plugin manager for zsh, inspired by oh-my-zsh and vundle" homepage "https://antigen.sharats.me/" @@ -7,6 +13,11 @@ class Antigen < Formula bottle :unneeded + unless OS.mac? + depends_on ZshRequirement unless ENV["CI"] + depends_on "zsh" unless which "zsh" + end + def install pkgshare.install "bin/antigen.zsh" end diff --git a/Formula/antiword.rb b/Formula/antiword.rb index f622c54ee9fa5..d0ebd3611c42c 100644 --- a/Formula/antiword.rb +++ b/Formula/antiword.rb @@ -12,6 +12,7 @@ class Antiword < Formula sha256 "ffc3b61781ffb2ae04537e34b28a19a4fe33683c534dd2d1504d2ec8d5ef4bef" => :el_capitan sha256 "1397c95409d671da764658460eba612b2564d4a0403bfffa667510e05f2fb08a" => :yosemite sha256 "4f4938378ed4cad59dc61d652ec8d33b0410f85dd99ac825f1f86eeeedb07402" => :mavericks + sha256 "654c7d9f75bd93466f1e7ec505b59d03d14b71f9c5ba1b73db797685bf856965" => :x86_64_linux # glibc 2.19 end resource "sample.doc" do diff --git a/Formula/anycable-go.rb b/Formula/anycable-go.rb index 9327d66298428..6382cf87d7f3f 100644 --- a/Formula/anycable-go.rb +++ b/Formula/anycable-go.rb @@ -10,6 +10,7 @@ class AnycableGo < Formula sha256 "158a7e9917bcdc099b664996e081dd2b020d2036a22e92f351bc9df43a33995d" => :catalina sha256 "698707ba2032a713055be8a35b6c8ea2baa3df3d90502ac2458996150940716f" => :mojave sha256 "d16176f21d70123a5c709b1a69214acdeb2825dfd50d038e8db815afe62d6a11" => :high_sierra + sha256 "1caab08b12cc3a44b38869f30cf1924186dc37b68651744a51e55fc5426f639f" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/anyenv.rb b/Formula/anyenv.rb index 1f1b5c6eee158..b5007f69026d2 100644 --- a/Formula/anyenv.rb +++ b/Formula/anyenv.rb @@ -10,6 +10,7 @@ class Anyenv < Formula sha256 "0bc3795db6ae8df4151de4fb15be7122a7c0c416d4bc553976e61b23cb9e3c61" => :mojave sha256 "0bc3795db6ae8df4151de4fb15be7122a7c0c416d4bc553976e61b23cb9e3c61" => :high_sierra sha256 "c4073892fe99575a1f23eb24714392f098c2980eaaf465a9a8641d955da08306" => :sierra + sha256 "6428e6a1ef33852c1cfce1c6fca11471fd7575080fb5fae0a8cf33046d7d583a" => :x86_64_linux end def install diff --git a/Formula/aom.rb b/Formula/aom.rb index b026448a31fb3..c60a9dfccad8c 100644 --- a/Formula/aom.rb +++ b/Formula/aom.rb @@ -10,6 +10,7 @@ class Aom < Formula sha256 "acbd463a00751edc0ce704bd14f493442541f4d5a2207225e9497ba4e1ce87a4" => :catalina sha256 "df98cc962553615767b033086833ef6f004c9b2d47062ae23d75f93013b4fba1" => :mojave sha256 "036d2a82eab972d1111020dddf892f94969fc39eaa0c3a1897e20b6d8b1f535b" => :high_sierra + sha256 "475e391927adbb08a3cf19ceb35a10b11226468c829f61146e9cc0af65454e98" => :x86_64_linux end depends_on "cmake" => :build @@ -31,7 +32,8 @@ def install "-DENABLE_EXAMPLES=on", "-DENABLE_TESTDATA=off", "-DENABLE_TESTS=off", - "-DENABLE_TOOLS=off" + "-DENABLE_TOOLS=off", + *("-DBUILD_SHARED_LIBS=1" unless OS.mac?) system "make", "install" end diff --git a/Formula/apache-arrow-glib.rb b/Formula/apache-arrow-glib.rb index 7a393faac7ff3..7a0a179c9bee1 100644 --- a/Formula/apache-arrow-glib.rb +++ b/Formula/apache-arrow-glib.rb @@ -10,6 +10,7 @@ class ApacheArrowGlib < Formula sha256 "e21d3b56afd84a1987c187911ef181bc55a40553ef431c249903641e921ce686" => :catalina sha256 "6947d273ccb270e39f191da00cb267248b667392f64a14eea7c3f7fb79218a29" => :mojave sha256 "75cf8ec68ad7b86de7333cd2355cdbf0ace4610a8cdaff2f1309d79851b62dc2" => :high_sierra + sha256 "37851e6d3dd61d91fe7ca7fd4c2b07116e6ae10cdff97ffe213dc1e5bb5399c9" => :x86_64_linux end depends_on "gobject-introspection" => :build diff --git a/Formula/apache-arrow.rb b/Formula/apache-arrow.rb index 20f06d132e9d3..143fa48bbc400 100644 --- a/Formula/apache-arrow.rb +++ b/Formula/apache-arrow.rb @@ -12,6 +12,7 @@ class ApacheArrow < Formula sha256 "f233da1f2e43a5a98f178cdaa6fe371f74255d3fec4943125d7cfaa219cafc40" => :catalina sha256 "35fbe889ef3e548a2d55a91d75eb846a72d5fdd408993c1d85e93f354a6e44fb" => :mojave sha256 "9af939cc5656770894b4fe2766125584df1fb67487e7000c52c995c1e9067cea" => :high_sierra + sha256 "8c13bda0bf69fcef346db5f8bb4213a98459054030c1b754086f0e3b070849a4" => :x86_64_linux end depends_on "boost" => :build diff --git a/Formula/apache-brooklyn-cli.rb b/Formula/apache-brooklyn-cli.rb index c54c925d7706c..3deda67df88fa 100644 --- a/Formula/apache-brooklyn-cli.rb +++ b/Formula/apache-brooklyn-cli.rb @@ -9,6 +9,7 @@ class ApacheBrooklynCli < Formula sha256 "7769a15fc55f1a6943165e78c0cc3c9677815686b935a888c3db708fbaf2b8dd" => :catalina sha256 "1b73cb46bdd10be0d426298ec972fd37362352b28fadb484374e701619d3a1dc" => :mojave sha256 "b64f20e59f179c2a359d180be65931e06743aea8c62295f58d1afdbd967871d9" => :high_sierra + sha256 "5c8655fd131f04925aac20de9a97160d68c79cd53bf10aea1e42a5b5b21cacd3" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/apache-forrest.rb b/Formula/apache-forrest.rb index 773562d0c8e1d..49728b531c04a 100644 --- a/Formula/apache-forrest.rb +++ b/Formula/apache-forrest.rb @@ -12,6 +12,7 @@ class ApacheForrest < Formula sha256 "53aed268e732c00ae5d57d4b98287c59f12c124f5a1b925d02aefacdc6dc5132" => :catalina sha256 "53aed268e732c00ae5d57d4b98287c59f12c124f5a1b925d02aefacdc6dc5132" => :mojave sha256 "53aed268e732c00ae5d57d4b98287c59f12c124f5a1b925d02aefacdc6dc5132" => :high_sierra + sha256 "f256d7ab9229ee3d56602947b73d30c37502a7c464991700efbd635354e71fb2" => :x86_64_linux end depends_on "openjdk" diff --git a/Formula/apachetop.rb b/Formula/apachetop.rb index 9ecf74c425c71..29485818417fd 100644 --- a/Formula/apachetop.rb +++ b/Formula/apachetop.rb @@ -9,6 +9,7 @@ class Apachetop < Formula sha256 "da48ab193d519f9a3ce1f90d1f6b4f4b9adee43a6a57435329d7a04e2a27e154" => :catalina sha256 "a71dffc1d92dad7331f5e935395a20bb3ba953889f5083e92bcd7e4388a71ab5" => :mojave sha256 "1bab24050249ddcf4f69b48b6568cf8e0464722d1a91cf3c1b6a21da0fdf4462" => :high_sierra + sha256 "0f018e5db1640fbc0a22e8f27c06b9e630d54b91d3ac119bedaadfba4f434212" => :x86_64_linux end depends_on "autoconf" => :build @@ -17,6 +18,7 @@ class Apachetop < Formula depends_on "adns" depends_on "ncurses" depends_on "pcre" + depends_on "readline" def install system "./autogen.sh" diff --git a/Formula/apcupsd.rb b/Formula/apcupsd.rb index 24b63c1ff9e9b..6b2e230c331ca 100644 --- a/Formula/apcupsd.rb +++ b/Formula/apcupsd.rb @@ -9,6 +9,7 @@ class Apcupsd < Formula sha256 "6bdbc101891e5c10b8aead1e1c86ce8ed1560f38b4de96a6c804c73953ad3ac0" => :catalina sha256 "f9e745573abb55d0194e958d48256ace18a8116fc2c7577617de915746e6c18b" => :mojave sha256 "8e604286ac22168ede829d3dff95ac782b458316c3389827c6d6c5168a2552e4" => :high_sierra + sha256 "49fed93d2fa6250a53e982d61b2cfe1e0d3ad9c897d318f2bb90708fbbe1e683" => :x86_64_linux end depends_on "gd" diff --git a/Formula/ape.rb b/Formula/ape.rb index cfaae65414455..c7ec8d70e1727 100644 --- a/Formula/ape.rb +++ b/Formula/ape.rb @@ -11,6 +11,7 @@ class Ape < Formula sha256 "259b19e211ff6d6ffc376db0b3696a912a6ac48dca83cbcbe525c78e56755c82" => :el_capitan sha256 "3859216e566e6faaccc7183d737527dd4785260a698c8344520e7951baebca76" => :yosemite sha256 "83c7ef23309dec2e7bd4bec3ae75b6f0e04fcfecbda489c90810b6948eb3bb28" => :mavericks + sha256 "917659b43365eba970711505af1414fe3ce276e20d40c2a405b181c1a8393e78" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/apib.rb b/Formula/apib.rb index 1e5402198a1f0..277ef1efa18ac 100644 --- a/Formula/apib.rb +++ b/Formula/apib.rb @@ -10,6 +10,7 @@ class Apib < Formula sha256 "b925a48cd3a9047184b5373e4718e4142117a487467cea95be9f43f6c9951712" => :catalina sha256 "fd1f74b58c7a51240d463c8ec1203bce33677409aca81ba0ffba9ea718471433" => :mojave sha256 "aee416aff5715b96b81cfeda0be036a2510ffe760187e396c143a64bae2c25c2" => :high_sierra + sha256 "68841cdea73b58feb482c92e38dcbdb88fd23279c487ee4c07720fca05ec9381" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/apng2gif.rb b/Formula/apng2gif.rb index 686a10fdd2fa1..d2e6f0007f521 100644 --- a/Formula/apng2gif.rb +++ b/Formula/apng2gif.rb @@ -3,6 +3,7 @@ class Apng2gif < Formula homepage "https://apng2gif.sourceforge.io/" url "https://downloads.sourceforge.net/apng2gif/apng2gif-1.8-src.zip" sha256 "9a07e386017dc696573cd7bc7b46b2575c06da0bc68c3c4f1c24a4b39cdedd4d" + revision 2 unless OS.mac? bottle do cellar :any @@ -13,6 +14,7 @@ class Apng2gif < Formula sha256 "fa18274f18fb0d3a2b3f5c360c24587b805db3f4734972c350643c35b8677174" => :sierra sha256 "42d033ae0a661d75b588af8d7c0cdb67a81bfc481aa88665973d95d3e4fb64ec" => :el_capitan sha256 "5456ec2b90086c84f2094972fa0dacc11de0abdde5346e3445a6b7d64b49201c" => :yosemite + sha256 "107c6e920ae40732bf88fe47eb18b22fda83fc86d4a23415e2c3c4bbc493d19e" => :x86_64_linux end depends_on "libpng" diff --git a/Formula/apollo-cli.rb b/Formula/apollo-cli.rb index c15d8890e96b3..b4fcfb7f9d777 100644 --- a/Formula/apollo-cli.rb +++ b/Formula/apollo-cli.rb @@ -11,6 +11,7 @@ class ApolloCli < Formula sha256 "73000a5bd181568ffe0c979d8800c6048fe611954c3b68a68034037aee39689a" => :catalina sha256 "a8e3edf77278ae0c757dfcef93e5ce337add91954f89ed73256c91f5c28c8e8d" => :mojave sha256 "b1ec91bec2690160acdd33b5ba70922ced9d087c99039344038eda1a1f7386d9" => :high_sierra + sha256 "cab7c081e59b20093244d697e0f910dedd017bf5f94ae66aeaec19e4cab8665c" => :x86_64_linux end depends_on "node" diff --git a/Formula/apollo.rb b/Formula/apollo.rb index f6b1c813c553b..2a543d717edc1 100644 --- a/Formula/apollo.rb +++ b/Formula/apollo.rb @@ -12,6 +12,7 @@ class Apollo < Formula sha256 "81b2a6a1110da6cf58c6725eb6e2c331668fa39d01644e0a754a2eb9241fdccd" => :catalina sha256 "81b2a6a1110da6cf58c6725eb6e2c331668fa39d01644e0a754a2eb9241fdccd" => :mojave sha256 "81b2a6a1110da6cf58c6725eb6e2c331668fa39d01644e0a754a2eb9241fdccd" => :high_sierra + sha256 "a15ef5095fa59c9a4d87559b752f648f44b722141b8928dd90e1f0817267d696" => :x86_64_linux end depends_on "openjdk" diff --git a/Formula/apparix.rb b/Formula/apparix.rb index 6dd9aeaaac9db..7e23e8f307346 100644 --- a/Formula/apparix.rb +++ b/Formula/apparix.rb @@ -14,6 +14,7 @@ class Apparix < Formula sha256 "89d7d52f9f2e76f1dd6b91075f407fa71000be0b09bd4548c11a6fd820b87ab3" => :el_capitan sha256 "9ff5a4568499ba2ca67b7c1bae689ab25576409da76798642b3c4caee489c878" => :yosemite sha256 "537fac6c0755ea6ef4ac4a6da2840de49c2c125015afaee6cf691ac33937c380" => :mavericks + sha256 "d714e8ec5986f8476413b576746e61cac00bdd600b092c526aada0effdbc161b" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/appium.rb b/Formula/appium.rb index ee38dcff7d865..b18bec1eb4c4c 100644 --- a/Formula/appium.rb +++ b/Formula/appium.rb @@ -12,6 +12,7 @@ class Appium < Formula sha256 "f0e2cae44d7c89c105ff256f34786ecc53d133fbbc74f21a93dca51ae28dc811" => :catalina sha256 "d45524677747716facf1fc8ff483b34051300fe9ee3ec37797cee98ca91bf810" => :mojave sha256 "086ddbbdae4a0b17e4dec8197f1efd53d5f80b011ffde0d3389260f599238223" => :high_sierra + sha256 "22f35488063d65ad4b3b9ba7db82d211c212e62c18814f67a1dfd1fb0ee63e8b" => :x86_64_linux end depends_on "node" @@ -25,6 +26,9 @@ def install output = shell_output("#{bin}/appium --show-config 2>&1") assert_match version.to_str, output + # Test stays stuck forever on Linux CI + return if ENV["CI"] + port = free_port begin pid = fork do diff --git a/Formula/appledoc.rb b/Formula/appledoc.rb index 6b2ac1e5770b3..e34eecdab0d4d 100644 --- a/Formula/appledoc.rb +++ b/Formula/appledoc.rb @@ -12,7 +12,8 @@ class Appledoc < Formula sha256 "ccae984913f4bcd3c0ff8f9d527a3330445c432af0bf98da315edbea83ccd0a5" => :high_sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? + depends_on :macos def install xcodebuild "-project", "appledoc.xcodeproj", diff --git a/Formula/appscale-tools.rb b/Formula/appscale-tools.rb index 3d8fa591b78a0..8f2bd92730802 100644 --- a/Formula/appscale-tools.rb +++ b/Formula/appscale-tools.rb @@ -11,8 +11,10 @@ class AppscaleTools < Formula sha256 "dc2f20c3743a21aa5f06b3068faadf0f00c5da34728ca55af936439213b9f7ad" => :catalina sha256 "eb5e13b06c11ecb6a29eb79e0bcd474ee8320c5ce4d223427809b03f899aebbf" => :mojave sha256 "70e89498336894ae025118e51e418528d8d73da9b1e2786559b6bcbe6055f55b" => :high_sierra + sha256 "3ce6279fcd352c2a934db1c656884c625164eb4b89b82fe28bde58cb4bc3d014" => :x86_64_linux end + depends_on "pkg-config" => :build depends_on "libyaml" depends_on :macos # Due to Python 2 (Uses SOAPPy, which does not support Python 3) depends_on "openssl@1.1" @@ -315,6 +317,18 @@ class AppscaleTools < Formula sha256 "91ee3949a3a613cac037ddde0b16b17062e248376b11491436e49d5ddc75ff9b" end + unless OS.mac? + resource "secretstorage" do + url "https://files.pythonhosted.org/packages/a5/a5/0830cfe34a4cfd0d1c3c8b614ede1edb2aaf999091ac8548dd19cb352e79/SecretStorage-2.3.1.tar.gz" + sha256 "3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6" + end + + resource "pyparsing" do + url "https://files.pythonhosted.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz" + sha256 "0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04" + end + end + def install ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages" resources.each do |r| diff --git a/Formula/apr-util.rb b/Formula/apr-util.rb index 1abba2ce7f4ab..fadab5f59b9ca 100644 --- a/Formula/apr-util.rb +++ b/Formula/apr-util.rb @@ -4,19 +4,26 @@ class AprUtil < Formula url "https://www.apache.org/dyn/closer.lua?path=apr/apr-util-1.6.1.tar.bz2" mirror "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2" sha256 "d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b" - revision 3 + revision OS.mac? ? 3 : 5 bottle do sha256 "425955a21c3fec8e78f365cd7fc4c6c4ec95d074f720a9b24e8237af90cc4dcc" => :catalina sha256 "b3b8376d8f481164a34b891b926ab22acdc2903e77c4cfbc04c0ba6363ca7597" => :mojave sha256 "20688bea4981567848393aeeb1964f2200847f63ee52eb8c68d8fff0e4dd8b45" => :high_sierra sha256 "16e812e4be2247d8e8f4f8a68ba6765ceb5a98e22a08dda288eb99dff2e41ae0" => :sierra + sha256 "9dc4b219ba6d14635c978cc2d9eaa2bd1362d38ba5148d1c3241653ebd182714" => :x86_64_linux end keg_only :shadowed_by_macos, "Apple's CLT provides apr (but not apr-util)" depends_on "apr" depends_on "openssl@1.1" + unless OS.mac? + depends_on "expat" + depends_on "mawk" + depends_on "sqlite" + depends_on "unixodbc" + end uses_from_macos "expat" uses_from_macos "sqlite" @@ -37,6 +44,7 @@ def install system "make" system "make", "install" bin.install_symlink Dir["#{libexec}/bin/*"] + lib.install_symlink Dir["#{libexec}/lib/*.so*"] unless OS.mac? rm Dir[libexec/"lib/*.la"] rm Dir[libexec/"lib/apr-util-1/*.la"] diff --git a/Formula/apr.rb b/Formula/apr.rb index 0fe12d69fb2ab..c3ae7edce39ad 100644 --- a/Formula/apr.rb +++ b/Formula/apr.rb @@ -11,6 +11,7 @@ class Apr < Formula sha256 "3a245185ed7280d1a19e7c639786b4c21dd0088878be8ac87ca58510eb5c9cc1" => :mojave sha256 "4d01f24009ea389e2c8771c5c0bc069ae09c0f5812d7fdb0d0079106c3fc0838" => :high_sierra sha256 "a49a1725c76754297c0f9a268423ee9a1772d23d264360504cc3401a21d2aa7e" => :sierra + sha256 "55aa3f0c5dcb612e8c201e0ddc63ef52db99f314a14ae0aab4b6f7d6b4f365d3" => :x86_64_linux end keg_only :provided_by_macos, "Apple's CLT provides apr" @@ -35,6 +36,11 @@ def install # The internal libtool throws an enormous strop if we don't do... ENV.deparallelize + if OS.linux? && build.bottle? + # Prevent hardcoded /usr/bin/gcc-4.8 compiler + ENV["CC"] = "cc" + end + # Needed to apply the patch. system "autoconf" @@ -42,6 +48,7 @@ def install system "./configure", "--prefix=#{libexec}" system "make", "install" bin.install_symlink Dir["#{libexec}/bin/*"] + lib.install_symlink Dir["#{libexec}/lib/*.so*"] unless OS.mac? rm Dir[libexec/"lib/*.la"] diff --git a/Formula/apt-dater.rb b/Formula/apt-dater.rb index 95814294eb8f4..894c837cea9a3 100644 --- a/Formula/apt-dater.rb +++ b/Formula/apt-dater.rb @@ -11,6 +11,7 @@ class AptDater < Formula sha256 "d736fdabb393e90e6895b9d5694cc0a78f592bd363483e7e935d044fd0331d41" => :mojave sha256 "f6b5f606925ac38d24ef56fc52e93c3f5a4e8f1ab2d687ebb376c78d4f91f366" => :high_sierra sha256 "66d81a3bf524ab635a34803119837ef26704011b2d362ab7f41aba0d40b54ea3" => :sierra + sha256 "619760d821e7af471578daa6feafdccc5eda13fe1309b475ef8049152006f6b0" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/apt.rb b/Formula/apt.rb new file mode 100644 index 0000000000000..bd6c1bf98c255 --- /dev/null +++ b/Formula/apt.rb @@ -0,0 +1,171 @@ +class Apt < Formula + desc "Advanced Package Tool" + homepage "https://wiki.debian.org/apt" + url "https://deb.debian.org/debian/pool/main/a/apt/apt_1.9.3.tar.xz" + sha256 "f84d5028da78de8b60d80c8639d094422947c8fdc918625ed8f23cbce5e59265" + + bottle do + sha256 "3ee78dbad649cf2acedacbf8d049001118133d2bdcc94068875024a8b793b27b" => :x86_64_linux + end + + depends_on "cmake" => :build + depends_on "docbook-xsl" => :build + depends_on "doxygen" => :build + depends_on "libxslt" => :build + depends_on "perl" => :build + depends_on "w3m" => :build + depends_on "berkeley-db" + depends_on "bzip2" + depends_on "docbook" + depends_on "dpkg" + depends_on "gcc@6" + depends_on "gettext" + depends_on "gnutls" + depends_on :linux + depends_on "lz4" + depends_on "zlib" + + fails_with :gcc => "4" + fails_with :gcc => "5" + + resource "gtest" do + url "https://github.com/google/googletest/archive/release-1.8.1.tar.gz" + sha256 "9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" + end + + resource "SGMLS" do + url "https://cpan.metacpan.org/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz" + sha256 "550c9245291c8df2242f7e88f7921a0f636c7eec92c644418e7d89cfea70b2bd" + end + + resource "triehash" do + url "https://github.com/julian-klode/triehash/archive/v0.3.tar.gz" + sha256 "289a0966c02c2008cd263d3913a8e3c84c97b8ded3e08373d63a382c71d2199c" + end + + resource "Unicode::GCString" do + url "https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2019.001.tar.gz" + sha256 "486762e4cacddcc77b13989f979a029f84630b8175e7fef17989e157d4b6318a" + end + + resource "Locale::gettext" do + url "https://cpan.metacpan.org/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz" + sha256 "909d47954697e7c04218f972915b787bd1244d75e3bd01620bc167d5bbc49c15" + end + + resource "Term::ReadKey" do + url "https://cpan.metacpan.org/authors/id/J/JS/JSTOWE/TermReadKey-2.38.tar.gz" + sha256 "5a645878dc570ac33661581fbb090ff24ebce17d43ea53fd22e105a856a47290" + end + + resource "Text::WrapI18N" do + url "https://cpan.metacpan.org/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz" + sha256 "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488" + end + + resource "YAML::Tiny" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz" + sha256 "bc315fa12e8f1e3ee5e2f430d90b708a5dc7e47c867dba8dce3a6b8fbe257744" + end + + resource "Module::Build" do + url "https://cpan.metacpan.org/authors/id/L/LE/LEONT/Module-Build-0.4222.tar.gz" + sha256 "e74b45d9a74736472b74830599cec0d1123f992760f9cd97104f94bee800b160" + end + + resource "Pod::Parser" do + url "https://cpan.metacpan.org/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz" + sha256 "dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd" + end + + resource "po4a" do + url "https://github.com/mquinson/po4a/releases/download/v0.56/po4a-0.56.tar.gz" + sha256 "d95636906bf71d9ce5131f57045b84c46ae33417346e2437a90013ee01e7d04f" + end + + def install + # Find our docbook catalog + ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" + + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + ENV.prepend_path "PERL5LIB", libexec/"lib" + ENV.prepend_path "PATH", bin + + (buildpath/"gtest").install resource("gtest") + + resource("Unicode::GCString").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + + resource("Locale::gettext").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + + resource("Term::ReadKey").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + + resource("Text::WrapI18N").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + + resource("YAML::Tiny").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + + resource("SGMLS").stage do + chmod 644, "MYMETA.yml" + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + + resource("Module::Build").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + + resource("Pod::Parser").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + + resource("triehash").stage do + bin.install "triehash.pl" => "triehash" + end + + resource("po4a").stage do + system "perl", "Build.PL" + system "./Build" + system "./Build", "install" + end + + mkdir "build" do + system "cmake", "..", + "-DDPKG_DATADIR=#{Formula["dpkg"].opt_libexec}/share/dpkg", + "-DDOCBOOK_XSL=#{Formula["docbook-xsl"].opt_prefix}/docbook-xsl", + "-DBERKELEY_DB_INCLUDE_DIRS=#{Formula["berkeley-db"].opt_include}", + "-DGTEST_ROOT=gtest/googletest", + *std_cmake_args + system "make", "install" + end + + mkdir_p etc/"apt/apt.conf.d/" + end + + test do + assert_equal "apt 1.9.3 (amd64)", shell_output("#{bin}/apt --version").chomp + end +end diff --git a/Formula/aptly.rb b/Formula/aptly.rb index a65dcd3ef4500..c211f9ed587a9 100644 --- a/Formula/aptly.rb +++ b/Formula/aptly.rb @@ -11,6 +11,7 @@ class Aptly < Formula sha256 "d14f3a2e0589a69b545078f4408a7ff804f727769f9ac0f66b0e08cbed96a7de" => :catalina sha256 "4a164a193db58e11d6e7b18f7e911a8d7a96e8b40201160b822d8ade95181f65" => :mojave sha256 "53301cc0bf47b4eeadf784856ee71bc72c9be5db62ad0462ded0f843aed49b42" => :high_sierra + sha256 "18407939fdafe860223058540a8a6a602d33973f5d315d7b807907011d28d458" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/arabica.rb b/Formula/arabica.rb index 691131c3eacf6..978d96ab7b549 100644 --- a/Formula/arabica.rb +++ b/Formula/arabica.rb @@ -15,6 +15,7 @@ class Arabica < Formula sha256 "185edd120b5759f25d1e69b9f24840eef6a404b1001c90e684546e359cf75928" => :el_capitan sha256 "1882f30edf8da8d98df603a6006c3dce96e21941e4266103366930b3e5a922c2" => :yosemite sha256 "5d247d4d5819106404bc7091e3b6141b4d298c77636bee39bfc524a3c5481e7f" => :mavericks + sha256 "04f7acb8f3458aed3aafeebf09f2f5465d5dfb9a05e15c49591bd0904907b793" => :x86_64_linux # glibc 2.19 end depends_on "autoconf" => :build diff --git a/Formula/arangodb.rb b/Formula/arangodb.rb index 0a6e044c9c1cf..abf2d75238619 100644 --- a/Formula/arangodb.rb +++ b/Formula/arangodb.rb @@ -13,7 +13,7 @@ class Arangodb < Formula depends_on "ccache" => :build depends_on "cmake" => :build depends_on "go@1.13" => :build - depends_on :macos => :mojave + depends_on :macos => :mojave if OS.mac? depends_on "openssl@1.1" # the ArangoStarter is in a separate github repository; @@ -25,7 +25,7 @@ class Arangodb < Formula end def install - ENV["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version + ENV["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version if OS.mac? resource("starter").stage do ENV.append "GOPATH", Dir.pwd + "/.gobuild" @@ -50,13 +50,14 @@ def install -DOPENSSL_USE_STATIC_LIBS=On -DCMAKE_LIBRARY_PATH=#{openssl.opt_lib} -DOPENSSL_ROOT_DIR=#{openssl.opt_lib} - -DCMAKE_OSX_DEPLOYMENT_TARGET=#{MacOS.version} -DTARGET_ARCHITECTURE=nehalem -DUSE_CATCH_TESTS=Off -DUSE_GOOGLE_TESTS=Off -DCMAKE_INSTALL_LOCALSTATEDIR=#{var} ] + args << "-DCMAKE_OSX_DEPLOYMENT_TARGET=#{MacOS.version}" if OS.mac? + ENV.append "V8_CXXFLAGS", "-O3 -g -fno-delete-null-pointer-checks" if ENV.compiler == "gcc-6" system "cmake", "..", *args diff --git a/Formula/arcade-learning-environment.rb b/Formula/arcade-learning-environment.rb index d8f8701d3a09c..8c1d665afbb15 100644 --- a/Formula/arcade-learning-environment.rb +++ b/Formula/arcade-learning-environment.rb @@ -7,10 +7,10 @@ class ArcadeLearningEnvironment < Formula head "https://github.com/mgbellemare/Arcade-Learning-Environment.git" bottle do - cellar :any sha256 "dc3acdec1e0fa77c0989f669df73ac9260611e3542db9cd371d27260276037a9" => :catalina sha256 "9fbb8f0997a3ca959a1e2a6e972c4100069b88bbf0450d3ed099a6b344238ca0" => :mojave sha256 "bb28107f88fe1615bd737c5fa76d195e27625e5d9139fd7e9168045952926d22" => :high_sierra + sha256 "ac8d225ad1641210189609d0a99bfdfd3dbaa02bffc3466751d2ad8d5a05a5e5" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/archey.rb b/Formula/archey.rb index 69efa81d7e318..d435edc85ffca 100644 --- a/Formula/archey.rb +++ b/Formula/archey.rb @@ -8,6 +8,8 @@ class Archey < Formula bottle :unneeded + depends_on :macos + # Fix double percent sign in battery output, remove in next release unless build.head? patch do diff --git a/Formula/archivemount.rb b/Formula/archivemount.rb index 0910e56a03240..be77ae5d256cb 100644 --- a/Formula/archivemount.rb +++ b/Formula/archivemount.rb @@ -9,11 +9,16 @@ class Archivemount < Formula sha256 "68c3994948be590e8ee5e9a9de00182162135a76b0a5dd780c7d8b067a480062" => :catalina sha256 "439cdd8d7c962cf9a5144e20206ddaeaabc15c1752c58acd059e31976e254f6a" => :mojave sha256 "428113b60673b6bb8be9467587f1d82bf4c9447c7f0bbdea47749bed3ec86798" => :high_sierra + sha256 "ee2773fc8e07405e24007dcb9351f89e455f7533eea3d2b878c67af5473a3006" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "libarchive" - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end def install ENV.append_to_cflags "-I/usr/local/include/osxfuse" diff --git a/Formula/archiver.rb b/Formula/archiver.rb index 776a07f42c54e..943d08d0c302e 100644 --- a/Formula/archiver.rb +++ b/Formula/archiver.rb @@ -10,6 +10,7 @@ class Archiver < Formula sha256 "f7e2687f04f044894475e29cfb986f9e40658878b52675ef87e8059676629a6d" => :catalina sha256 "0afa338b4f42fb7314d8b5f557a7310824dad082ff85f3940bfa70b39f3c48a9" => :mojave sha256 "3622a493e750f8aaeebe1f807adb002a8d00297a8f69f5b44ad0ce1c961d1851" => :high_sierra + sha256 "405b50dab4e976d4eb02c01f391ab55243f71177050b006bab6bc15e9e177d74" => :x86_64_linux end depends_on "go" => :build @@ -31,7 +32,7 @@ def install assert_predicate testpath/"test.zip", :exist? assert_match "application/zip", - shell_output("file -bI #{testpath}/test.zip") + shell_output("file -b --mime #{testpath}/test.zip") output = shell_output("#{bin}/arc ls test.zip") names = output.lines.map do |line| diff --git a/Formula/arduino-cli.rb b/Formula/arduino-cli.rb index 3e2a8b77cfd43..5949e58ca2526 100644 --- a/Formula/arduino-cli.rb +++ b/Formula/arduino-cli.rb @@ -12,6 +12,7 @@ class ArduinoCli < Formula sha256 "3dd10065c03827d1cc0a508daaf2787c154eda4bfc5378d671b17d16672bd293" => :catalina sha256 "4d176c41402ad7a3ceb8ad20ef4a621675c20bdb080b543193efddad07e7fc26" => :mojave sha256 "d885f46abbb996e64a47d8566677263bca7ca2cacfe78d8bd825d5a4bba02f38" => :high_sierra + sha256 "2444faa21e3a470284d96cfef9667ff630fb39da7c7f619df21c6f0a68a671ac" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/argon2.rb b/Formula/argon2.rb index c5fe2becce9f7..850b6d8698e85 100644 --- a/Formula/argon2.rb +++ b/Formula/argon2.rb @@ -3,7 +3,7 @@ class Argon2 < Formula homepage "https://github.com/P-H-C/phc-winner-argon2" url "https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz" sha256 "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c" - revision 1 + revision OS.mac? ? 1 : 2 head "https://github.com/P-H-C/phc-winner-argon2.git" bottle do @@ -12,12 +12,13 @@ class Argon2 < Formula sha256 "a76192a41826619fc399e7f6de5e6cb1c8a5fbe6bea4f2c1554daa830fa0e296" => :mojave sha256 "830016982e60870f50b3f6fc9a215d8cc4bda6061595f4883f7c11ab19ecba39" => :high_sierra sha256 "21889ac6ed40c792f1b372b5aa0d6b3be1be86577a4c1b06b08569124d2d0da2" => :sierra + sha256 "d5a37785ef088eed38dc1f644878ab3e969f23e3801792f3f8da6a40f8a68a7e" => :x86_64_linux end def install - system "make", "PREFIX=#{prefix}", "ARGON2_VERSION=#{version}" + system "make", "PREFIX=#{prefix}", "ARGON2_VERSION=#{version}", ("LIBRARY_REL=lib" unless OS.mac?) system "make", "test" - system "make", "install", "PREFIX=#{prefix}", "ARGON2_VERSION=#{version}" + system "make", "install", "PREFIX=#{prefix}", "ARGON2_VERSION=#{version}", ("LIBRARY_REL=lib" unless OS.mac?) doc.install "argon2-specs.pdf" end diff --git a/Formula/argtable.rb b/Formula/argtable.rb index 31c163e45e62b..acdef7fc52a4f 100644 --- a/Formula/argtable.rb +++ b/Formula/argtable.rb @@ -14,6 +14,7 @@ class Argtable < Formula sha256 "0a720e738557215bf1b58fa642ec2fc51971da38e98b987862fcd05cc54756f7" => :el_capitan sha256 "9e9d1451712580f090f0078ec7774a0daeb1057be3b1762e3d8465264d969432" => :yosemite sha256 "7081198c76023e34380d35682b7a4274a9faf98d3e3e3fa2a9fa801e0a320a8c" => :mavericks + sha256 "2cb2fa7361e54356f2c353b15fa39096d29a2cd2dd452e5d79e106420a304cdf" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/aria2.rb b/Formula/aria2.rb index 11fe404b4b2b9..ff2bbe3a8543c 100644 --- a/Formula/aria2.rb +++ b/Formula/aria2.rb @@ -3,12 +3,13 @@ class Aria2 < Formula homepage "https://aria2.github.io/" url "https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0.tar.xz" sha256 "1e2b7fd08d6af228856e51c07173cfcf987528f1ac97e04c5af4a47642617dfd" + revision 1 unless OS.mac? bottle do - cellar :any sha256 "9cc5e04be8b0a58d1f2b60b8abfc636168edbf23e7018003c40f1dd6952aab0c" => :catalina sha256 "761836ac608eb0a59d4a6f6065860c0e809ce454692e0937d9d0d89ad47f3ce4" => :mojave sha256 "70cc7566a23c283015368f92dfeaa0d119e53cfc7c1b2276a73ff9f6167b529d" => :high_sierra + sha256 "b183bb202db7c379f72320895fad71685b17d26d7f120f9306eb556e0cf0ddb7" => :x86_64_linux end depends_on "pkg-config" => :build @@ -27,9 +28,9 @@ def install args = %W[ --disable-dependency-tracking --prefix=#{prefix} - --with-appletls + #{OS.mac? ? "--with-appletls" : "--without-appletls"} --with-libssh2 - --without-openssl + #{OS.mac? ? "--without-openssl" : "--with-openssl"} --without-gnutls --without-libgmp --without-libnettle diff --git a/Formula/arm-linux-gnueabihf-binutils.rb b/Formula/arm-linux-gnueabihf-binutils.rb index 64a2f4ecbabfe..ac138c20c4b03 100644 --- a/Formula/arm-linux-gnueabihf-binutils.rb +++ b/Formula/arm-linux-gnueabihf-binutils.rb @@ -9,8 +9,11 @@ class ArmLinuxGnueabihfBinutils < Formula sha256 "207a781d7d5cd45c18138b48c9187ba4315ef78f17d47aec5cf5438841920d6c" => :catalina sha256 "347965a02495f6a03b2b3cd35c969c125e58b7cb0a81f7db64cb0ae296471281" => :mojave sha256 "247a0b582523ad5a3af119b223ef17a04ed4cdcf37cee118d3a0971944f63e17" => :high_sierra + sha256 "2bc8ba3674556b206bb0ca719fd4acb07dae79472642c160896277ac0ab1a232" => :x86_64_linux end + uses_from_macos "texinfo" + def install ENV.cxx11 diff --git a/Formula/armadillo.rb b/Formula/armadillo.rb index 9901db903d2be..2344fbe7b6487 100644 --- a/Formula/armadillo.rb +++ b/Formula/armadillo.rb @@ -9,6 +9,7 @@ class Armadillo < Formula sha256 "5e8fdc3a6dc72295bdbbb3833c6e40dfaff4687ffac588cc6dce0debe13edad6" => :catalina sha256 "3bc08126695bd875b2d65f93464bb6af94d57be20fd8afd30116802876945dc5" => :mojave sha256 "194df3c1ce3c4092f1b36e3be477261800f4ce34728f02ba94094725f69c3d4c" => :high_sierra + sha256 "450a6bba8bd6b4f97ef565ec3d6d9d730e43c1e8516eaa72729eb0aec70c5224" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/armor.rb b/Formula/armor.rb index 7b42696a94cde..ed36ca647456f 100644 --- a/Formula/armor.rb +++ b/Formula/armor.rb @@ -11,6 +11,7 @@ class Armor < Formula sha256 "d0bbf39148c0dabb28f777b951492814a708dc64610106587b1315fcd6a08559" => :catalina sha256 "538f2c340ec151aa7c22847a61d3c8e1d255d121a2b2a75fe2fe7d22f5067347" => :mojave sha256 "8fc3b2ebb6d8bc978f6dd04c92e2a43573b052e51d69398deb4f5a2b04e0f87d" => :high_sierra + sha256 "22317bcb46b542191211393d8c0f460b142991b9b779c0d9c98c0d6b71a8dc3d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/arp-scan.rb b/Formula/arp-scan.rb index 3d294317b06c3..b6b6723233c70 100644 --- a/Formula/arp-scan.rb +++ b/Formula/arp-scan.rb @@ -9,6 +9,7 @@ class ArpScan < Formula sha256 "763b615392ea20ab1900bbc4a21fb0a9a978bbf50d3bbd8d5ff490437defc6f8" => :catalina sha256 "178196ab4312319611ad02c8e086e56fec2217981f9d91d9e7df8cddfeacda4e" => :mojave sha256 "f72f46496eecff4c1a86dbdbf3a295e195310827ef50cdc0b007bd7b6311495d" => :high_sierra + sha256 "37a5e80f04e95b2a555318142289245fdde6c2ccb9433fd5c6f92cbff56ad9ad" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/arp-sk.rb b/Formula/arp-sk.rb index 053d2a6db89cf..6c1dc81d04c60 100644 --- a/Formula/arp-sk.rb +++ b/Formula/arp-sk.rb @@ -11,6 +11,7 @@ class ArpSk < Formula sha256 "bc28c6d58a3838fac59ab625ab26a917b3b0282ac54a8f37a95034efd0740007" => :catalina sha256 "cbe02395698a24f9f835b7cba4128a308a15beefda6ad7e79cfd38d73823cdc2" => :mojave sha256 "67666cd80446c78b49deac3b8f2589ccbd140f32b739b662556a6dc7bda7b453" => :high_sierra + sha256 "1c9215134a1f069e1c1de831073efa158a7cc2194f6a7680b71862f6755f3afc" => :x86_64_linux end depends_on "libnet" diff --git a/Formula/arpack.rb b/Formula/arpack.rb index faf7ed92892a5..cf91e29d2b671 100644 --- a/Formula/arpack.rb +++ b/Formula/arpack.rb @@ -11,6 +11,7 @@ class Arpack < Formula sha256 "d173bfd4d5cad74063506f0a852198124740bb65e44c16be7d1e445e1bd324c0" => :catalina sha256 "db006f0681a1d280da53ac6ac60904a51e0d8158708d20fdcc4e6404289db850" => :mojave sha256 "510b490c32d7adf344c655133c83b74d17fcdba51ccafe6e0a5a1a7f9899f3b1" => :high_sierra + sha256 "190980b53fff34f9e73339fe8e646836fbc9af13092d9306c8712b232fb328cd" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/arping.rb b/Formula/arping.rb index 12ca28755433e..6fdeaf0330877 100644 --- a/Formula/arping.rb +++ b/Formula/arping.rb @@ -10,6 +10,7 @@ class Arping < Formula sha256 "24cb6f161d06e9f2bc38d819a7d724d3f0d337f322cbb6e5b685118829e6cd32" => :catalina sha256 "19a737592d390d0bdf06e03c1a49e22a2d9860e065153e1b84bd325fcfa7640c" => :mojave sha256 "5019bb51a8cf372fd070b0b2686a3bbb2b7c262e2d39c8cae83d0c384971a82c" => :high_sierra + sha256 "0bc9f5957334c0520a50c51d324d0249aeba08626e578c4d8e8924e6fcac77f8" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/arss.rb b/Formula/arss.rb index d461771e15766..50a9e827d4526 100644 --- a/Formula/arss.rb +++ b/Formula/arss.rb @@ -13,6 +13,7 @@ class Arss < Formula sha256 "5da45934b19d0cab02c809932fb8c5da3fd76d2f781bc9e2e7a98fa1825989eb" => :el_capitan sha256 "268225389842f4952424b17c7b94759b7a3d3009053b50718f1e4155b7eace86" => :yosemite sha256 "7159b6b56ad3878bc84b9fdf9d708f0828637db64ae12ef96f39820c2f22d061" => :mavericks + sha256 "7bc019e2012ca8365f5f72677e89d2e3ff80cd4e686b46710fdb2f2693d9c487" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ascii.rb b/Formula/ascii.rb index 1efc81b823014..50cd6e7bcd47e 100644 --- a/Formula/ascii.rb +++ b/Formula/ascii.rb @@ -12,6 +12,7 @@ class Ascii < Formula sha256 "52fb2a78a1409f4f6db0b59589f773c4427c87a84a7fee1809e5f0a4d50e4d65" => :sierra sha256 "bbb5f365f96e42dfaa8af31f21daa8809b0a628451599fab7bc7509ceeb0d14f" => :el_capitan sha256 "ab520ebbe64a946a0ac0466537a0e207e49cd85979e41582ab542dcaef9db3ff" => :yosemite + sha256 "88fa5c873c23b41bab19a85e5feb572ae1a5369885b53a158ba1e0cce52980ef" => :x86_64_linux # glibc 2.19 end head do diff --git a/Formula/asciidoc.rb b/Formula/asciidoc.rb index 98a5fb76ac4a4..86ad236232283 100644 --- a/Formula/asciidoc.rb +++ b/Formula/asciidoc.rb @@ -12,6 +12,7 @@ class Asciidoc < Formula sha256 "273f9046ed7f52aef9e2e858b785b66a79b3bd341c939c3d413d51c39915f66c" => :catalina sha256 "273f9046ed7f52aef9e2e858b785b66a79b3bd341c939c3d413d51c39915f66c" => :mojave sha256 "273f9046ed7f52aef9e2e858b785b66a79b3bd341c939c3d413d51c39915f66c" => :high_sierra + sha256 "1a0b904545b229cb94c00b7f237b97cdd26e07c92dd5a94477ddf688499a6968" => :x86_64_linux end depends_on "autoconf" => :build @@ -20,6 +21,8 @@ class Asciidoc < Formula depends_on "python@3.8" depends_on "source-highlight" + depends_on "xmlto" => :build unless OS.mac? + uses_from_macos "libxml2" => :build uses_from_macos "libxslt" => :build @@ -40,7 +43,7 @@ def install ].map { |f| rewrite_shebang detected_python_shebang, f } # otherwise macOS's xmllint bails out - inreplace "Makefile", "-f manpage", "-f manpage -L" + inreplace "Makefile", "-f manpage", "-f manpage -L" if OS.mac? system "make", "install" system "make", "docs" end diff --git a/Formula/asciidoctor.rb b/Formula/asciidoctor.rb index a2e6b3aaee473..744858b21623e 100644 --- a/Formula/asciidoctor.rb +++ b/Formula/asciidoctor.rb @@ -12,6 +12,7 @@ class Asciidoctor < Formula sha256 "0a76a0014e0f52d35446749f04aa65e28cb148c689e148d412992e6e82adf8ac" => :catalina sha256 "70d93211cdad629b023bd2aa74bfc6736378fc7740f9c2ccfc31ac327977f001" => :mojave sha256 "a5bce7d4fc26dd7a56a80fc10a65f74966e294f2db2e2754f9bfabe95ffa605a" => :high_sierra + sha256 "bad40f72d93b844964ac961bbe2acfc110825d883ab2df576540f5e4ccbb6962" => :x86_64_linux end resource "concurrent-ruby" do diff --git a/Formula/asciinema.rb b/Formula/asciinema.rb index feaa613f9c471..78742311f7c13 100644 --- a/Formula/asciinema.rb +++ b/Formula/asciinema.rb @@ -5,7 +5,7 @@ class Asciinema < Formula homepage "https://asciinema.org" url "https://files.pythonhosted.org/packages/a7/71/771c859795e02c71c187546f34f7535487b97425bc1dad1e5f6ad2651357/asciinema-2.0.2.tar.gz" sha256 "32f2c1a046564e030708e596f67e0405425d1eca9d5ec83cd917ef8da06bc423" - revision 2 + revision OS.mac? ? 2 : 3 head "https://github.com/asciinema/asciinema.git" bottle do @@ -14,6 +14,7 @@ class Asciinema < Formula sha256 "4ac59de631594cea60621b45d85214e39a90a0ba8ddf4eeec5cba34bd6145711" => :catalina sha256 "b395128b1d0825a1b0ab81c4238d0acf38f6edc2df2a1bcfcaf6658ba191900d" => :mojave sha256 "1a941e2c0594a7c0a07c66f02c411e121ed2b3e869f3f015c6e69cb4fd92daba" => :high_sierra + sha256 "21867b3730473f70d30f31aa5be231e2513df4d4c7d1cb64f6270eed36bbea14" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/asciitex.rb b/Formula/asciitex.rb index 27d69cc0150dd..213af5dfa9837 100644 --- a/Formula/asciitex.rb +++ b/Formula/asciitex.rb @@ -13,6 +13,7 @@ class Asciitex < Formula sha256 "0ae267d7ffcf17769da97275af047dc2a4ba9e5086acdb53dd11ca41f3d40ddb" => :el_capitan sha256 "e9eadc960e449db67f305c3e1cc8d4f025288967bb8b6a37f5ba4bf5ad58493d" => :yosemite sha256 "31518a63d9b06f8e47ff57c5d6d22ca838abc2c1366d59db2bb8967971134d52" => :mavericks + sha256 "ff836eecd95aa223fac118053ba0925d62bc46fb55e896a36f6a4f79e55a4027" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/ask-cli.rb b/Formula/ask-cli.rb index 2fd2e6f2509b2..23da2c804fd63 100644 --- a/Formula/ask-cli.rb +++ b/Formula/ask-cli.rb @@ -11,6 +11,7 @@ class AskCli < Formula sha256 "1dced66ff98b6b76395ad2fe9efe4efc6a168576168eb94619edbcb639f6bcf1" => :catalina sha256 "abd4865724c072dd0495b882ced8d9a22952bfcf3703156099d619cb7298d24d" => :mojave sha256 "cc2a74bb91d72e0ef5aa5844ed087c2e7c19e1e2bac38629b632dfa45b32d601" => :high_sierra + sha256 "f55702b527d9ed574e258790a8aced4e7dccfedf2aade28c29d7800c0aca1f00" => :x86_64_linux end depends_on "node" diff --git a/Formula/asn1c.rb b/Formula/asn1c.rb index 50b0cb0c5e879..4a3c4dd26c540 100644 --- a/Formula/asn1c.rb +++ b/Formula/asn1c.rb @@ -11,6 +11,7 @@ class Asn1c < Formula sha256 "432aa83cf3a3f9db86435fe75330902b556885605446a477a3f55e9e0ac13806" => :sierra sha256 "be0a7e18cf6c2a3cf04831fb854247b26b6da96d3b56b3f8b3088fe3bd5c7668" => :el_capitan sha256 "c9f31dc8f2f27a99370713ad9d5dfc1969ced862045bfa3680b48e85080277b5" => :yosemite + sha256 "74bd40e36d1c22346152c63574cf3f039817d086f00903c565c75ab5241a1744" => :x86_64_linux # glibc 2.19 end head do diff --git a/Formula/aspell.rb b/Formula/aspell.rb index 1939ce4145814..fbea905856a23 100644 --- a/Formula/aspell.rb +++ b/Formula/aspell.rb @@ -9,6 +9,7 @@ class Aspell < Formula sha256 "f34a5b53fa80f6f0ea3cef83d04eceed93f918153463e0b77a596374a842249d" => :catalina sha256 "756d2f24409150b932043544af99bc1c2ea242299174ab89a2d06c7878812af8" => :mojave sha256 "9bbb8be505d953395bcccde4712cf85792c6bf03af535cc553783361476ddddb" => :high_sierra + sha256 "656812de17722f98453445ec8d15ae92863dfe33c19b508fc56d233b4bb07943" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/assh.rb b/Formula/assh.rb index 37f1ef13d6d2e..1d79b6cd75194 100644 --- a/Formula/assh.rb +++ b/Formula/assh.rb @@ -10,6 +10,7 @@ class Assh < Formula sha256 "e12956db15a33133390f2317143315710f6692aad3e5b36fafa3934e43ab3241" => :catalina sha256 "2507b79a656698c02c1fb678ebe280ba44326a9f8ec17d4fd355a3843b60253b" => :mojave sha256 "359270a9985af3faba8cfe637027d2a4d44ed3b0ce129bd5eb22354eb000bf45" => :high_sierra + sha256 "0d7438819c7f98d04af1e27290f7d466d72912917bd5289ef7ac6ab90e61ee2d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/assimp.rb b/Formula/assimp.rb index 43596275fefbc..e37346ba79a50 100644 --- a/Formula/assimp.rb +++ b/Formula/assimp.rb @@ -10,6 +10,7 @@ class Assimp < Formula sha256 "f049baf0e3bc3941e8449dbfbc997d0448b0a1722bfdceadb69b2eacc48e3464" => :catalina sha256 "620f5f399783c487ae78077da65b65f6a0c81dce23768ae56eb1edd383a57daa" => :mojave sha256 "6dffc67ca984f5870bdc09a1c0adbb3c0d2209c7fb8169e2204c4c2d2d44aebe" => :high_sierra + sha256 "b438e25ca1ddb822185a3a16c429cbff8b9bbcdb9855e44af6c600adb6e1c5af" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/astyle.rb b/Formula/astyle.rb index 762bb9a003946..4456e1e9a7552 100644 --- a/Formula/astyle.rb +++ b/Formula/astyle.rb @@ -1,8 +1,13 @@ class Astyle < Formula desc "Source code beautifier for C, C++, C#, and Java" homepage "https://astyle.sourceforge.io/" - url "https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1/astyle_3.1_macos.tar.gz" - sha256 "c4eebbe082eb2cb98f90aafcce3da2daeb774dd092e4cf8b728102fded8d1dcf" + if OS.mac? + url "https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1/astyle_3.1_macos.tar.gz" + sha256 "c4eebbe082eb2cb98f90aafcce3da2daeb774dd092e4cf8b728102fded8d1dcf" + elsif OS.linux? + url "https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1/astyle_3.1_linux.tar.gz" + sha256 "cbcc4cf996294534bb56f025d6f199ebfde81aa4c271ccbd5ee1c1a3192745d7" + end head "https://svn.code.sf.net/p/astyle/code/trunk/AStyle" bottle do @@ -12,11 +17,13 @@ class Astyle < Formula sha256 "a58fdf5320a691b37337973e0ca43d2e69f42adbc96d6ab160066c3574373047" => :high_sierra sha256 "7a3ff647da72399ee8aa05f1c55806b3bc273409e4a7b2ab0f68930227a47b5f" => :sierra sha256 "e6eb9d95f56fa99005173fcd1c147f9335f55c9ccf52067f57da36e95f7f4c7e" => :el_capitan + sha256 "6a9ffbe6d6e56b46c9a01b7ff4571e44a409a353db7afdc25fab6f905af250c3" => :x86_64_linux end def install cd "src" do - system "make", "CXX=#{ENV.cxx}", "-f", "../build/mac/Makefile" + dir = OS.mac? ? "mac" : "gcc" + system "make", "CXX=#{ENV.cxx}", "-f", "../build/#{dir}/Makefile" bin.install "bin/astyle" end end diff --git a/Formula/asuka.rb b/Formula/asuka.rb index b2bdb59077e02..8a8b578d030f7 100644 --- a/Formula/asuka.rb +++ b/Formula/asuka.rb @@ -10,9 +10,14 @@ class Asuka < Formula sha256 "3ff6b3aa52148d1468bf6d59d63302c76069dbad963f8722f7e87e53342c40a4" => :catalina sha256 "0042a8cf343f444996bcd95e6b279e891e360f309bea3901a02b983833f48dc8" => :mojave sha256 "174f726dde72bd1ef2a31a0c4b49728338c60521b4ca2c8c3364ceb6f54a0b4d" => :high_sierra + sha256 "cc7f7a893757d692c6e7fd66508a8f83bbf218f158fc6887a50c8a115f0d6b59" => :x86_64_linux end depends_on "rust" => :build + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "openssl@1.1" + end uses_from_macos "ncurses" diff --git a/Formula/asymptote.rb b/Formula/asymptote.rb index c76d2a2db519b..cb51fd27d85aa 100644 --- a/Formula/asymptote.rb +++ b/Formula/asymptote.rb @@ -9,6 +9,7 @@ class Asymptote < Formula sha256 "6ca74cb50ce6bc7523fd8a36c14f9732722c0b3e2cb7b32e8b951b9ee0ee1c4e" => :catalina sha256 "b98bacf73a3bc568f492f76e999e598a6a32d53a5830b6e756cb853eaf4ea436" => :mojave sha256 "2404ace2bb76465726c7297a228032c883de1a2ba71aa93557a4ecc93dba0a90" => :high_sierra + sha256 "d4551c4232485a1295c3ad0d21b8fcc7976565e99925d8e29e71c8984d640b4c" => :x86_64_linux end depends_on "glm" => :build diff --git a/Formula/at-spi2-atk.rb b/Formula/at-spi2-atk.rb new file mode 100644 index 0000000000000..790a5bb2d0494 --- /dev/null +++ b/Formula/at-spi2-atk.rb @@ -0,0 +1,30 @@ +class AtSpi2Atk < Formula + desc "Accessibility Toolkit GTK+ module" + homepage "https://www.freedesktop.org/wiki/Accessibility/AT-SPI2" + url "https://download.gnome.org/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.1.tar.xz" + sha256 "776df930748fde71c128be6c366a987b98b6ee66d508ed9c8db2355bf4b9cc16" + + bottle do + cellar :any_skip_relocation + sha256 "84e9aa44ceb2d66828bcfa592b36669027cbec0d27ac33313fb6a0914cd97e78" => :x86_64_linux + end + + depends_on "meson" => :build + depends_on "ninja" => :build + depends_on "pkg-config" => :build + depends_on "python" => :build + depends_on "at-spi2-core" + depends_on "atk" + depends_on "libxml2" + depends_on :linux + + def install + ENV.refurbish_args + + mkdir "build" do + system "meson", "--prefix=#{prefix}", "--libdir=#{lib}", ".." + system "ninja" + system "ninja", "install" + end + end +end diff --git a/Formula/at-spi2-core.rb b/Formula/at-spi2-core.rb new file mode 100644 index 0000000000000..83cd2cb456ced --- /dev/null +++ b/Formula/at-spi2-core.rb @@ -0,0 +1,38 @@ +class AtSpi2Core < Formula + desc "Protocol definitions and daemon for D-Bus at-spi" + homepage "https://www.freedesktop.org/wiki/Accessibility/AT-SPI2" + url "https://download.gnome.org/sources/at-spi2-core/2.34/at-spi2-core-2.34.0.tar.xz" + sha256 "d629cdbd674e539f8912028512af583990938c7b49e25184c126b00121ef11c6" + + bottle do + sha256 "218486e16a9dfcce0b1426a8aed933288220fa1fc9080008809400258987c414" => :x86_64_linux + end + + depends_on "gobject-introspection" => :build + depends_on "intltool" => :build + depends_on "meson" => :build + depends_on "ninja" => :build + depends_on "pkg-config" => :build + depends_on "python" => :build + depends_on "dbus" + depends_on "gettext" + depends_on "glib" + depends_on :linux + depends_on "linuxbrew/xorg/libx11" + depends_on "linuxbrew/xorg/libxtst" + depends_on "linuxbrew/xorg/xorgproto" + + def install + ENV.refurbish_args + + mkdir "build" do + system "meson", "--prefix=#{prefix}", "--libdir=#{lib}", ".." + system "ninja" + system "ninja", "install" + end + end + + test do + system "#{libexec}/at-spi2-registryd", "-h" + end +end diff --git a/Formula/atari800.rb b/Formula/atari800.rb index 0dd04377b7835..41298d484ea8d 100644 --- a/Formula/atari800.rb +++ b/Formula/atari800.rb @@ -9,6 +9,7 @@ class Atari800 < Formula sha256 "5bc2d96418e21a76809abfa2513f630cb207848b0894f27cda34b2f55bace81c" => :catalina sha256 "f5508c8a0021a0fcbd1e35d7a4313d8c9ba52ab937d0fde59ccc5f81e3c49ac0" => :mojave sha256 "497ce17afc99e76180b94b76b08c1aca973eab554ee3ccecfd14818c71e97035" => :high_sierra + sha256 "cf4acbde8ded93005a2795a12b71ddb01f4f948d71ecaa7da1f2524e137e0085" => :x86_64_linux end depends_on "libpng" diff --git a/Formula/atasm.rb b/Formula/atasm.rb index 130181dc2b818..75aaf3631c797 100644 --- a/Formula/atasm.rb +++ b/Formula/atasm.rb @@ -10,6 +10,7 @@ class Atasm < Formula sha256 "8f142806b05036e541ef3fec3009d481423f451cbcd99e6be68ae5095cfa205e" => :catalina sha256 "7a2437b5a0adf8047fc75a20fb669d2d80b15d261eab0ec0ad5c7d74b9123a2b" => :mojave sha256 "b9eb26201949590ab8fce80ee3feabe7f0be2f611e7c60b6b456c8d78480680c" => :high_sierra + sha256 "3fed5da64215e63255a1a33dfe370205e21c66e194c957e26610411da56517a2" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/atdtool.rb b/Formula/atdtool.rb index 42ed59943eb85..48cf7d4c68350 100644 --- a/Formula/atdtool.rb +++ b/Formula/atdtool.rb @@ -5,13 +5,14 @@ class Atdtool < Formula homepage "https://github.com/lpenz/atdtool" url "https://files.pythonhosted.org/packages/83/d1/55150f2dd9afda92e2f0dcb697d6f555f8b1f578f1df4d685371e8b81089/atdtool-1.3.3.tar.gz" sha256 "a83f50e7705c65e7ba5bc339f1a0624151bba9f7cdec7fb1460bb23e9a02dab9" - revision 3 + revision OS.mac? ? 3 : 4 bottle do cellar :any_skip_relocation sha256 "f02a78aa9dbb19e8ca8670a6890f3d51949d014e6890ba5039fd9695bc1f46ce" => :catalina sha256 "17b2ed63f8b4f8aa53e367572b53344fa3e6fa8569e5a9fb48f3a0d5257d04cc" => :mojave sha256 "0f301757a596e02344c15171a834557e19e4c4145fd440cd9e960b72993e459a" => :high_sierra + sha256 "2acb86b3a89d8a9df54e4e0544bfd740d44d87679affc00fae9abc3cc21d56a1" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/aterm.rb b/Formula/aterm.rb index 2f03ab05c4d25..446cbc27b28c1 100644 --- a/Formula/aterm.rb +++ b/Formula/aterm.rb @@ -14,6 +14,7 @@ class Aterm < Formula sha256 "5140e20287eda941f8756dfdaf377663f84f6872d1ca3f6d70e04b554591d11a" => :el_capitan sha256 "d12bebbfa2e764abb9cfac1aecd6fc04e58f83eadf0fb3db298d5be03d7f8dca" => :yosemite sha256 "f565d64b5b19b549cfe6eacedd587ff6d2b0e0b3129e1018b364edc0c2d9c415" => :mavericks + sha256 "a4e4c8cc34a33e6d5ff5720845a2e8ee8876f789e638d94169b850d8a2d8ecad" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/atf.rb b/Formula/atf.rb index 68579525ffc46..1a9a77fda8a7e 100644 --- a/Formula/atf.rb +++ b/Formula/atf.rb @@ -12,6 +12,7 @@ class Atf < Formula sha256 "74493d4b4868628a7a84338eb28ecfce8afdd896962f3ba632b1e785def48737" => :el_capitan sha256 "e4caa0498d0caf2e99e0eea9ae9269240e4f4a49a41f712cf6a730fab8d72672" => :yosemite sha256 "240443a1a96ba8ed51ac7b263749f69013f05d42eb84018824791e419a6d5e81" => :mavericks + sha256 "425b01c2d934a3dc46586d83a0e58ef07c6dc185733e7678c5be4844b82b9147" => :x86_64_linux end def install diff --git a/Formula/atk.rb b/Formula/atk.rb index 2510b911e6ee4..9232eea846c2d 100644 --- a/Formula/atk.rb +++ b/Formula/atk.rb @@ -5,10 +5,10 @@ class Atk < Formula sha256 "fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788" bottle do - cellar :any sha256 "1065293046ab2984940dfa0b9c9e724439838e63f685c932d508ccd74bcf921b" => :catalina sha256 "68c7b621339c03964036877987db69806f663612ba275e68554a97d218a2b5b4" => :mojave sha256 "fa8f525bfeacab676f795bac37f622fc100e63c9e9661fbd6ddd3e1725ebd097" => :high_sierra + sha256 "757c817c1b9c5452175b1719ed8c9da934883f3d6657e98fdde3de5ce0f58301" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -47,8 +47,8 @@ def install -latk-1.0 -lglib-2.0 -lgobject-2.0 - -lintl ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/atkmm.rb b/Formula/atkmm.rb index 0de2ec1aa09fd..1cabfe5bba119 100644 --- a/Formula/atkmm.rb +++ b/Formula/atkmm.rb @@ -11,6 +11,7 @@ class Atkmm < Formula sha256 "41fa55c1a359635acac27990de9ef7d4c84c6e45f43b54b4fecd0c85010d5ed0" => :mojave sha256 "cc4325eb5abdb8248ea4d4ec36f5ab37abfce03459034c700b92cfaa757392e8" => :high_sierra sha256 "918691593ee2144c7aae041f3f83a3f961af0408329b69907a893669f267f5b1" => :sierra + sha256 "453213dac2df1c2b58aed305208049d674e649753c78c72955e0467ba9f64275" => :x86_64_linux end depends_on "pkg-config" => :build @@ -59,9 +60,9 @@ def install -lglib-2.0 -lglibmm-2.4 -lgobject-2.0 - -lintl -lsigc-2.0 ] + flags << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/atlantis.rb b/Formula/atlantis.rb index 7a0f378b5c1c6..57b908973a6b7 100644 --- a/Formula/atlantis.rb +++ b/Formula/atlantis.rb @@ -10,6 +10,7 @@ class Atlantis < Formula sha256 "8c0aefa951b91e25f8f056fff30b6db346a068f00d842fc3071753063156a012" => :catalina sha256 "cf40282b89b9a69798283312bea51f14234b4d9e116780402d766da68c670c95" => :mojave sha256 "6d089fb9b809612d0145a43d7fb8d991b6177c5791714a59764024eca13fe61a" => :high_sierra + sha256 "4f4c56397a66bc5df96655eb30b1deb706ba37b31027c2c919121f44a8d73673" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/atomicparsley.rb b/Formula/atomicparsley.rb index 269410bc04de0..eb34ba941e081 100644 --- a/Formula/atomicparsley.rb +++ b/Formula/atomicparsley.rb @@ -13,6 +13,7 @@ class Atomicparsley < Formula sha256 "05c4cdc1dfc14fa6f06fdbbcadead5055a9fb53091d014458b86ecb4b22111fe" => :high_sierra sha256 "d5f8672d420511ff76fd9ecc4d41c8aee5eecbf4382d7c4bd3fb04400c4617f4" => :sierra sha256 "c0a7964ced998b2db7150f95b9329e138f28f0768be50d531fd4d82754e0ebde" => :el_capitan + sha256 "736efa28b543dfe6cf9f1163d026a05d02896e8e6777f6e11f9b5ee117dbbe77" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/atool.rb b/Formula/atool.rb index 1c4f4678d9cad..c3ccdf4bd479d 100644 --- a/Formula/atool.rb +++ b/Formula/atool.rb @@ -14,6 +14,7 @@ class Atool < Formula sha256 "dcfdcb720aa3704b9103aa01bb8efac42d24327bc8664baa420a9a69d75a98b6" => :el_capitan sha256 "efdeeb165e146f4a76477417d2af9c60e2f776d06081bb579ff73ceb296a899d" => :yosemite sha256 "4eed286344a3a1d4fc6efc908b34062b5cc7c7fdf2449cf85b7767168585fc7a" => :mavericks + sha256 "7c908cc1f52028e534fb1c085b492506ea04ecf663a8159b1469d8d13221ee84" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/ats2-postiats.rb b/Formula/ats2-postiats.rb index 8ec6108f82e77..3255b21db78b6 100644 --- a/Formula/ats2-postiats.rb +++ b/Formula/ats2-postiats.rb @@ -9,6 +9,7 @@ class Ats2Postiats < Formula sha256 "e4b7bf748d9ad11c38273dd2fc11d273c8f02a1702778ef368307c57f1b4f402" => :catalina sha256 "d86462909117de7a2a09d0816df8909c5d0b6cba14f24932612f4c3c54734453" => :mojave sha256 "c787afdba7391ce0aa745938259f3dc79e8b97d0842daa378de854def8c4a9bd" => :high_sierra + sha256 "95c352ac8b3f24fc45cbfd95f171337836e7b8e3e2b1084c8efa58d409b54e79" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/attr.rb b/Formula/attr.rb new file mode 100644 index 0000000000000..41f9d0fe96ff0 --- /dev/null +++ b/Formula/attr.rb @@ -0,0 +1,29 @@ +class Attr < Formula + desc "Manipulate filesystem extended attributes" + homepage "https://savannah.nongnu.org/projects/attr" + url "https://mirror.csclub.uwaterloo.ca/nongnu/attr/attr-2.4.48.tar.gz" + sha256 "5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7" + + bottle do + sha256 "3b9b66637bfe43449338f3c00e2cd44d597f8cc2f94d439fb2d61845096cc1ba" => :x86_64_linux + end + + depends_on "gettext" => :build + depends_on :linux + + def install + # Fix No rule to make target `../libattr/libattr.la', needed by `attr' + ENV.deparallelize + + system "./configure", + "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + system bin/"attr", "-l", "/bin/sh" + end +end diff --git a/Formula/audacious.rb b/Formula/audacious.rb index 95654dd0de244..bd1992b4fdabe 100644 --- a/Formula/audacious.rb +++ b/Formula/audacious.rb @@ -48,6 +48,7 @@ class Audacious < Formula depends_on "libsoxr" depends_on "libvorbis" depends_on :macos # Due to Python 2 + depends_on :macos # Due to Python 2 depends_on "mpg123" depends_on "neon" depends_on "qt" diff --git a/Formula/audiofile.rb b/Formula/audiofile.rb index 46375850d8f45..c0f7806606593 100644 --- a/Formula/audiofile.rb +++ b/Formula/audiofile.rb @@ -22,6 +22,7 @@ class Audiofile < Formula sha256 "86f668b5e2ddbbbb8c156a3145382431865936ba8e54469a565101e9b28de3a4" => :catalina sha256 "b3f405c20f331ae6ded75f702bd68e45994c3c81eaf23abf650233859a830769" => :mojave sha256 "daf0e362bb9e6c4fb3e6e04b0309a975d94893e5240bf394038693b9b1a2a024" => :high_sierra + sha256 "f4024aee6f2305107229848df9d156158607989441ca686b1e048017e4700adb" => :x86_64_linux end head do @@ -32,6 +33,8 @@ class Audiofile < Formula depends_on "libtool" => :build end + depends_on "alsa-lib" unless OS.mac? + # These have all been reported upstream but beside # 03_CVE-2015-7747 not yet merged or fixed. # https://github.com/mpruett/audiofile/issues/31 @@ -58,6 +61,13 @@ class Audiofile < Formula "patches/10_Check-for-division-by-zero-in-BlockCodec-runPull.patch" end + unless OS.mac? + resource "aiff" do + url "http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/AIFF/Samples/CCRMA/wood24.aiff" + sha256 "a87279e3a101162f6ab0d4f70df78594d613e16b80e6257cf19c5fc957a375f9" + end + end + def install if build.head? inreplace "autogen.sh", "libtool", "glibtool" @@ -72,8 +82,22 @@ def install end test do - inn = "/System/Library/Sounds/Glass.aiff" - out = "Glass.wav" + unless OS.mac? + resource("aiff").stage do + mv "wood24.aiff", testpath/"test.aiff" + end + end + + inn = if OS.mac? + "/System/Library/Sounds/Glass.aiff" + else + testpath/"test.aiff" + end + out = if OS.mac? + "Glass.wav" + else + "test.wav" + end system bin/"sfconvert", inn, out, "format", "wave" system bin/"sfinfo", "--short", "--reporterror", out diff --git a/Formula/augeas.rb b/Formula/augeas.rb index e971bb338ee4e..69a7a06ea8359 100644 --- a/Formula/augeas.rb +++ b/Formula/augeas.rb @@ -9,6 +9,7 @@ class Augeas < Formula sha256 "9a561491e3574dfe2cfe7da2a618c12d02218f88f760de46722d9b603e4f27ba" => :mojave sha256 "0e1477f692cf67442dfcaf7c20a24733838df072ec867f59322070a7eaf3f925" => :high_sierra sha256 "55b3fab93f2ec4a703dc2bb3b3d58c47375456bdb5f0308e0856b231d309c02d" => :sierra + sha256 "1cc7c0b182fa466465f1f115c4d5194d9578f49358f2de2fcf60b256a2a6267a" => :x86_64_linux end head do diff --git a/Formula/augustus.rb b/Formula/augustus.rb index 9c69bba8b1d75..443b6550e8ada 100644 --- a/Formula/augustus.rb +++ b/Formula/augustus.rb @@ -11,11 +11,17 @@ class Augustus < Formula sha256 "14e2ca7f36d9f579c4c04e9cd50dd941abcafcb1d7195dcef4a299773aa199b6" => :catalina sha256 "4525c482c78d272c6094e2689a3cfa2221c9a57f455d34e5f497015938a3550e" => :mojave sha256 "217c1233a38cc11b261fa1481b41362b14afeeaaa16ec83f1afff04639961054" => :high_sierra + sha256 "2a1db11f97c9a1aaa3a55f1a182efb173f8fb8bbffc6fbc70974d6c834630181" => :x86_64_linux end depends_on "boost" => :build depends_on "bamtools" - depends_on "gcc" + + if OS.mac? + depends_on "gcc" + else + depends_on "zlib" + end def install # Avoid "fatal error: 'sam.h' file not found" by not building bam2wig diff --git a/Formula/aurora.rb b/Formula/aurora.rb index 58255c6758c89..008b1680661e2 100644 --- a/Formula/aurora.rb +++ b/Formula/aurora.rb @@ -10,6 +10,7 @@ class Aurora < Formula sha256 "f3b45006b5b5c6f15166d11d1a740fb14f3b22c1d64b3b64397ed2958e9c882d" => :catalina sha256 "21abebb582fbac2ebb400328b455c890206f78ae0910f75ded8019bfc6a40c1f" => :mojave sha256 "e3e9b06b4b9053afb4b75b48d90555d00fcc8404309d8b2b2b336538810746cb" => :high_sierra + sha256 "35bc4d2607dbf232b1e8e0e9c6bc14acaa9a5937d522c3fc21fb420dc1a7ed62" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/autobench.rb b/Formula/autobench.rb index 25f0e75141db1..a3a1f59fbbd28 100644 --- a/Formula/autobench.rb +++ b/Formula/autobench.rb @@ -13,6 +13,7 @@ class Autobench < Formula sha256 "37bb6f40825953f9ba176522bc64d74a6375304d7963331aee937417e339964f" => :el_capitan sha256 "9884556bd5f7ab7c29a0aa199328cbe609e04437b1ddce4703214ba65f15d40a" => :yosemite sha256 "d31d3625f06d036af97b6cc80d62856b9d3eecadb4ed9fe7a0cb9b96f8d9f9a0" => :mavericks + sha256 "342fdb1de1b87378f1e9949a1b4427f79ba9d7519a4ba62cf70fcdf99be71688" => :x86_64_linux end depends_on "httperf" diff --git a/Formula/autocode.rb b/Formula/autocode.rb index eb64e7a782105..920adc69a1a79 100644 --- a/Formula/autocode.rb +++ b/Formula/autocode.rb @@ -16,6 +16,7 @@ class Autocode < Formula sha256 "c321c73e1662332392c5949467c544e18db30849019555086ad14eeb097656d2" => :el_capitan sha256 "a0b7c969db9e2870e818587c7d832bbe0bb187cbc01346b85bb81a6097a9e015" => :yosemite sha256 "04effb5aecdd48e2a3c38435079424fd83f08dff206096f9807ff7c4ccd68b93" => :mavericks + sha256 "4376dc40af997dae743476e80fb878e02b05d62e22d4af3f4e38f8ea23df3c8e" => :x86_64_linux # glibc 2.19 end depends_on "node" diff --git a/Formula/autoconf-archive.rb b/Formula/autoconf-archive.rb index c85b22323a6a2..da3d912073201 100644 --- a/Formula/autoconf-archive.rb +++ b/Formula/autoconf-archive.rb @@ -11,6 +11,7 @@ class AutoconfArchive < Formula sha256 "37d5baf229236e25cc249934f6e052f3c99fe2b2c0fbf799c35e3b46ae861520" => :mojave sha256 "37d5baf229236e25cc249934f6e052f3c99fe2b2c0fbf799c35e3b46ae861520" => :high_sierra sha256 "73d531bc05f0eb0e5bb6ced9782bd2920157d89fd72ab42ee2e81b36f783fe98" => :sierra + sha256 "96663418d10893d071178e735c46a9b15c1cc3f07ef2b41d3496717677e15451" => :x86_64_linux end # autoconf-archive is useless without autoconf diff --git a/Formula/autoconf.rb b/Formula/autoconf.rb index 645f06fc0e325..346caa3d29991 100644 --- a/Formula/autoconf.rb +++ b/Formula/autoconf.rb @@ -4,6 +4,7 @@ class Autoconf < Formula url "https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz" mirror "https://ftpmirror.gnu.org/autoconf/autoconf-2.69.tar.gz" sha256 "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -15,13 +16,15 @@ class Autoconf < Formula sha256 "ded69c7dac4bc8747e52dca37d6d561e55e3162649d3805572db0dc2f940a4b8" => :el_capitan sha256 "daf70656aa9ff8b2fb612324222aa6b5e900e2705c9f555198bcd8cd798d7dd0" => :yosemite sha256 "d153b3318754731ff5e91b45b2518c75880993fa9d1f312a03696e2c1de0c9d5" => :mavericks + sha256 "37e77a2e7ca6d479f0a471d5f5d828efff621bd051c1884ff1363d77c5c4675e" => :mountain_lion + sha256 "d8a7ca62ed0f84bbdb3c6206fc3d0b7b1222e28dcfffff2a0c7a91193204ccce" => :x86_64_linux end uses_from_macos "m4" uses_from_macos "perl" def install - ENV["PERL"] = "/usr/bin/perl" + ENV["PERL"] = "/usr/bin/perl" if OS.mac? # force autoreconf to look for and use our glibtoolize inreplace "bin/autoreconf.in", "libtoolize", "glibtoolize" diff --git a/Formula/autogen.rb b/Formula/autogen.rb index 7820d1fa19031..ec109d55350f6 100644 --- a/Formula/autogen.rb +++ b/Formula/autogen.rb @@ -10,6 +10,7 @@ class Autogen < Formula sha256 "fa3818d518a214d9798a514e90c461d3a6be2c6fc0758c85ad4ad6b134a28851" => :catalina sha256 "76df021218eb1d338cb8ee2a18c04e1d120166991c94ba64055537beac0e68fb" => :mojave sha256 "45fb9e222b8c21729659821aa5565010df9c3f347fae4bc2f0e5fc01680a2c1a" => :high_sierra + sha256 "ee193e837db096f9f15c0c3f39d577e48b333e0195299a64cf2a0c1ab8467dbe" => :x86_64_linux end depends_on "coreutils" => :build diff --git a/Formula/autojump.rb b/Formula/autojump.rb index 4deeef97b9521..9a7a4b82c5309 100644 --- a/Formula/autojump.rb +++ b/Formula/autojump.rb @@ -11,6 +11,7 @@ class Autojump < Formula sha256 "5576b3f2b9fcb2a236d6ac22b163af03994edb98b69c997ed5a88db85c8d0a15" => :mojave sha256 "5576b3f2b9fcb2a236d6ac22b163af03994edb98b69c997ed5a88db85c8d0a15" => :high_sierra sha256 "c95107719bd784e0e348be6dbfb3a780240d96f8d76710271c3642335babbd8f" => :sierra + sha256 "922ca87c1c1f1cb50bb7a8d68d06c0709ea5ed6e5aa71ecd5b72eb370fcc7449" => :x86_64_linux end depends_on :macos # Due to Python 2 @@ -40,12 +41,10 @@ def caveats test do path = testpath/"foo/bar" path.mkpath - output = ` - source #{etc}/profile.d/autojump.sh - j -a "#{path.relative_path_from(testpath)}" - j foo >/dev/null - pwd - `.strip + output = shell_output("bash -c '. #{etc}/profile.d/autojump.sh; + j -a #{path.relative_path_from(testpath)}; + j foo >/dev/null; + pwd'").strip assert_equal path.realpath.to_s, output end end diff --git a/Formula/automake.rb b/Formula/automake.rb index b613693c0222f..e3f762f4c6a2d 100644 --- a/Formula/automake.rb +++ b/Formula/automake.rb @@ -10,12 +10,13 @@ class Automake < Formula sha256 "fe26d4df57481b6a7ca0a6915c37c53648c27ffb41926b3570c45f80fdd8888e" => :catalina sha256 "fe26d4df57481b6a7ca0a6915c37c53648c27ffb41926b3570c45f80fdd8888e" => :mojave sha256 "fe26d4df57481b6a7ca0a6915c37c53648c27ffb41926b3570c45f80fdd8888e" => :high_sierra + sha256 "58010f1a4c69947d29d90b64c5accba7246f0e7b7507bcf57076ccdc1dc41a3d" => :x86_64_linux end depends_on "autoconf" def install - ENV["PERL"] = "/usr/bin/perl" + ENV["PERL"] = "/usr/bin/perl" if OS.mac? system "./configure", "--prefix=#{prefix}" system "make", "install" diff --git a/Formula/autopep8.rb b/Formula/autopep8.rb index e16b1a6a6a940..97fa7b25853cb 100644 --- a/Formula/autopep8.rb +++ b/Formula/autopep8.rb @@ -11,6 +11,7 @@ class Autopep8 < Formula sha256 "79f648b311983b7ce858f88fff0d313502b052b077792db504409a8868181498" => :catalina sha256 "4ae421fc461c433ce9dc26c3e9bb1280e468c0a7e2fdcc15abd6c4bcdd5731c1" => :mojave sha256 "0c8ee3e0d4202ea2e0a9a438291e7821a22e4046fa5d89a8572adb7823491fc1" => :high_sierra + sha256 "7af2de9551b2cbba6e5c38c6fe3cd69d086608191073502c91207e073a6f5dc3" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/autossh.rb b/Formula/autossh.rb index d589115ba12c4..7eff75117cf10 100644 --- a/Formula/autossh.rb +++ b/Formula/autossh.rb @@ -11,6 +11,7 @@ class Autossh < Formula sha256 "2674ee43690b5d99490a0979359fdefa52033650b935547a6353de726f916275" => :mojave sha256 "f88fcb32499fff8aa2899c85fc39dc6678ebed2849791a4312d427d9073b6b98" => :high_sierra sha256 "78d258f52bc14a2539da8c6d3ce69db5c062bb70e95130d9f22113720f853c67" => :sierra + sha256 "d306d129107ccac39d797aaf4f592446f196f0e84029c55ec58ed9e0e541ae4a" => :x86_64_linux end patch :DATA diff --git a/Formula/avahi.rb b/Formula/avahi.rb new file mode 100644 index 0000000000000..9f1ddbdf9152b --- /dev/null +++ b/Formula/avahi.rb @@ -0,0 +1,48 @@ +class Avahi < Formula + desc "Service Discovery for Linux using mDNS/DNS-SD" + homepage "https://avahi.org" + url "https://github.com/lathiat/avahi/archive/v0.7.tar.gz" + sha256 "fd45480cef0559b3eab965ea3ad4fe2d7a8f27db32c851a032ee0b487c378329" + + bottle do + sha256 "48295b3c720629ae91ce5f6c663b49497d6e55fde9d2e605c9c0e9bbb38a6b4c" => :x86_64_linux + end + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "intltool" => :build + depends_on "libtool" => :build + depends_on "m4" => :build + depends_on "pkg-config" => :build + depends_on "xmltoman" => :build + depends_on "dbus" + depends_on "glib" + depends_on "libdaemon" + depends_on :linux + + def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" + + system "./bootstrap.sh", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}", + "--sysconfdir=#{prefix}/etc", + "--localstatedir=#{prefix}/var", + "--disable-mono", + "--disable-monodoc", + "--disable-python", + "--disable-qt3", + "--disable-qt4", + "--disable-gtk", + "--disable-gtk3", + "--with-distro=none", + "--with-systemdsystemunitdir=no" + system "make", "install" + end + + test do + assert_match "avahi-browse #{version}", shell_output("#{bin}/avahi-browse --version").chomp + end +end diff --git a/Formula/avanor.rb b/Formula/avanor.rb index 0a6e0ec7a1ae0..d22eac00c010d 100644 --- a/Formula/avanor.rb +++ b/Formula/avanor.rb @@ -11,6 +11,7 @@ class Avanor < Formula sha256 "848e96ed26b258042b77a3c2139398b8e6f62722719263c082fb4c6655ffd4bc" => :sierra sha256 "a66b436a645cafa77a5bd79d22f314ff2b9331526f5efeaf79d38346647cad66" => :el_capitan sha256 "1c12fd7f45993d18b481d3317594083e4bb88f0eecf100d4b5dd4a927c866200" => :yosemite + sha256 "fac0daf5f6f98e48364ce42b619096483a60a03e52c268e5729f9843dcbb87fe" => :x86_64_linux # glibc 2.19 end # Upstream fix for clang: https://sourceforge.net/p/avanor/code/133/ diff --git a/Formula/avce00.rb b/Formula/avce00.rb index c10017bd4d13d..0995fc9fbe936 100644 --- a/Formula/avce00.rb +++ b/Formula/avce00.rb @@ -13,6 +13,7 @@ class Avce00 < Formula sha256 "45f18e289431af4de0d1e96c1fadd6a056e80907a1650654f8ee0dd1dafab401" => :el_capitan sha256 "56e15b29411b2947d9a842d91ae713e16566aa59e297e06f7d4de4b301847e66" => :yosemite sha256 "55990b93f7fe4639c6fdf29c4cc6c5791c6178c8661e22ef9e0dd64606532f56" => :mavericks + sha256 "00d468662055c9c9ab55d2860e8b812505e0e5aafac1a94aec57b6e9e8f8287e" => :x86_64_linux # glibc 2.19 end conflicts_with "gdal", :because => "both install a cpl_conv.h header" diff --git a/Formula/avfs.rb b/Formula/avfs.rb index 630394a11def7..ddad2cdb70c08 100644 --- a/Formula/avfs.rb +++ b/Formula/avfs.rb @@ -10,13 +10,15 @@ class Avfs < Formula sha256 "e9f048f1f3f156b62c0650d07b51e82020a896538a51fdffd2ae06bf2d661380" => :mojave sha256 "4ca7d845c2b2e3c066c2441490b7e9588ef727ab0815aee57c5321ad826435df" => :high_sierra sha256 "9dd4c35adcc1c1350b48f0a37130414370b38c63a886a0b1824838da34a16c97" => :sierra + sha256 "b3c7bf216075ce43a42a995fb3cb71239e598b671c48db93828668c146035a2d" => :x86_64_linux end depends_on "pkg-config" => :build depends_on :macos => :sierra # needs clock_gettime depends_on "openssl@1.1" - depends_on :osxfuse + depends_on :osxfuse if OS.mac? depends_on "xz" + depends_on "libfuse" unless OS.mac? def install args = %W[ diff --git a/Formula/avian.rb b/Formula/avian.rb index 190c79eb0b57d..b6f93c11f8ac9 100644 --- a/Formula/avian.rb +++ b/Formula/avian.rb @@ -14,6 +14,7 @@ class Avian < Formula sha256 "d2719509725f4c1fad3a53c32de18aff5d45685fb35ae352f1d51fc61e566f4a" => :el_capitan sha256 "d002876c03742fc7ec4157fff598e7c11ed1e62f97ce1b217f8b089db87e43ed" => :yosemite sha256 "20dd7125d138e05021b473d026190d8f4652e807afcfe057614e5c2e66ce0ed1" => :mavericks + sha256 "4eebce66edee44582178986d2f36e98392b97cf36cf683aaf3b353627cb8cf3a" => :x86_64_linux # glibc 2.19 end depends_on :java => "1.8" @@ -21,9 +22,17 @@ class Avian < Formula uses_from_macos "zlib" def install - system "make", "use-clang=true" - bin.install Dir["build/macosx-*/avian*"] - lib.install Dir["build/macosx-*/*.dylib", "build/macosx-*/*.a"] + if OS.mac? + system "make", "use-clang=true" + bin.install Dir["build/macosx-*/avian*"] + lib.install Dir["build/macosx-*/*.dylib", "build/macosx-*/*.a"] + else + inreplace "makefile", "warnings = -Wall -Wextra -Werror", + "warnings = -Wall -Wextra" + system "make" + bin.install Dir["build/linux-*/avian*"] + lib.install Dir["build/linux-*/*.so", "build/linux-*/*.a"] + end end test do diff --git a/Formula/aview.rb b/Formula/aview.rb index 4a2237177991f..db988bc409d7c 100644 --- a/Formula/aview.rb +++ b/Formula/aview.rb @@ -13,6 +13,7 @@ class Aview < Formula sha256 "cb20b8513b3b7d2977943d7ba14f2627892697e9a6b69c4366563786810ca95c" => :el_capitan sha256 "886a6800deefcf7a1e377db57c9df0579b6f1fcb4b491a6262171411bce3517b" => :yosemite sha256 "142a0b64e457e900e395f35d5112bd968e605fa6182bdc9ca77b923a5e5263f6" => :mavericks + sha256 "33b728b4aed33b9dfac8d1b346b9681c118cd614cad7803f06085e92a15ead59" => :x86_64_linux end depends_on "aalib" diff --git a/Formula/avimetaedit.rb b/Formula/avimetaedit.rb index f09febc1f884c..1f54042282132 100644 --- a/Formula/avimetaedit.rb +++ b/Formula/avimetaedit.rb @@ -11,6 +11,7 @@ class Avimetaedit < Formula sha256 "323673de85bd3c8f272d5f8d0b32d34304faaa02f88c2ce44f08c697266e889e" => :high_sierra sha256 "75d65e8ef1ecf31ebb016aa7e1a940bdaac33042af895729a230b6ee4beab3f0" => :sierra sha256 "41873fc416d070f417f1387e50515ffa099018c2f8ef27a2b8ce8b8a94b5c43f" => :el_capitan + sha256 "cf2378bdb33b344b09b14ca9bc41cc0463dbf3e6058339d12ce78c9b9420f3e8" => :x86_64_linux end def install diff --git a/Formula/avra.rb b/Formula/avra.rb index bfd5a77d96b43..992371bea0c0c 100644 --- a/Formula/avra.rb +++ b/Formula/avra.rb @@ -10,6 +10,7 @@ class Avra < Formula sha256 "8d75188d31649e471e5851df65c723016924a08307b6560cfa855379a7169b1c" => :mojave sha256 "401635c4cf252ba0d19ed77866748d3d3deb05a6f024f3aa3c8bfbba69eba8f3" => :high_sierra sha256 "0c349d7192c3eb3b3ba63fc26efb3ea2ca58de6160747804da51ee85c7cc98b5" => :sierra + sha256 "f062c3f0f705f64e6faa8021eb2049ef1e19147cfffbfaff6ab0337fe0b2a38c" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/avro-c.rb b/Formula/avro-c.rb index bae1e6dd4ce0a..b3a7c0162d849 100644 --- a/Formula/avro-c.rb +++ b/Formula/avro-c.rb @@ -6,9 +6,11 @@ class AvroC < Formula sha256 "3ee583d4c370ca6176e9d74f8a6f51ce97edff9b9c7146a8e23bfae31f33051e" bottle do + cellar :any_skip_relocation sha256 "44708472b87d7d9375ed156ad510f1884b050d4cc345bfef49e6e9f2bc7a756c" => :catalina sha256 "971102fc6b294cb8b98759edba3e390d376d7660eb49c6ed9063e03cf0cf2067" => :mojave sha256 "6aec75d7260ab6eb56a7c7b6bceb03f547947a2b1c0eba579ad21a7b048b0367" => :high_sierra + sha256 "ea7a013e3e42840f887dc32c2d59929cd5edf93a881643d692e50e418a689015" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/awf.rb b/Formula/awf.rb index a7e468374f4a0..236549dbec8d5 100644 --- a/Formula/awf.rb +++ b/Formula/awf.rb @@ -12,6 +12,7 @@ class Awf < Formula sha256 "b0290ffc5c750f924cbf96a2a5398215a41137a69211d262387789e399aba9d8" => :mojave sha256 "090ec40bbd96bea15714d411b9c89e6b06ca9723050252f00623b49c61da1497" => :high_sierra sha256 "417806f1ab0aa5d1c2e2e0302dd2c3c4cdaaf2957ac18fbfe1f9a2ced72947bd" => :sierra + sha256 "18e68a5fb538e601bd2d7d6485f82427cb8c8607028e8ebcac8174d7348b8f7b" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/aws-apigateway-importer.rb b/Formula/aws-apigateway-importer.rb index 3657d9eb6b2e4..5c8790c6c6bb5 100644 --- a/Formula/aws-apigateway-importer.rb +++ b/Formula/aws-apigateway-importer.rb @@ -13,6 +13,7 @@ class AwsApigatewayImporter < Formula sha256 "65d77c58ac90e7767f93896c9ec95a478dc1388316bcdafb4c06ed10db089caf" => :sierra sha256 "bbe12dac66d033674840eace741bcf5c3549e7317ab9ca6fa9f349418a6c9861" => :el_capitan sha256 "bbe12dac66d033674840eace741bcf5c3549e7317ab9ca6fa9f349418a6c9861" => :yosemite + sha256 "c1b5793a470c5027f4be302cb0d3143a41cf0de2edce8ce8bb7b399be125072a" => :x86_64_linux # glibc 2.19 end depends_on "maven" => :build diff --git a/Formula/aws-cdk.rb b/Formula/aws-cdk.rb index d6ad93a5ff5ca..2a11118e185a7 100644 --- a/Formula/aws-cdk.rb +++ b/Formula/aws-cdk.rb @@ -11,6 +11,7 @@ class AwsCdk < Formula sha256 "9d2f7cb20724118443f62dacfaf01e823ea0519b32916d1875ddb78370777fc3" => :catalina sha256 "57bb09b8cab78eb4ba4f8cea26f19f5de75a06c7d73d0a1c2cd30718a92eee5b" => :mojave sha256 "f421900eb939b2e0c592e7c41265ffc4066fa7c9c8ef8f8a4971114828ec2764" => :high_sierra + sha256 "fd1ac01ff3df989328007f366b62d973d75fc8f045161a680db28ed5bbd7e9a3" => :x86_64_linux end depends_on "node" diff --git a/Formula/aws-elasticbeanstalk.rb b/Formula/aws-elasticbeanstalk.rb index 5278b75122f71..1de4b5ea77af8 100644 --- a/Formula/aws-elasticbeanstalk.rb +++ b/Formula/aws-elasticbeanstalk.rb @@ -7,10 +7,11 @@ class AwsElasticbeanstalk < Formula sha256 "a44fb91b3f6b35ea1166200df1954f8dde2228e0e1b37267b2ca6b8fa66809b5" bottle do - cellar :any + cellar :any_skip_relocation sha256 "d14253acd05c343f517faa6d1f24a7ca4fa6290dd4ab28fd5a67769508dbd1fc" => :catalina sha256 "52baaf0d0f9d339358d8b6241ae5b0f0b0d7f9b5bd870c986eeee9c2badddabd" => :mojave sha256 "42cb725eb85274070418f47eb1300f010e79222da68f010840ec6b6831ce2517" => :high_sierra + sha256 "f3e44606f2559f7f210a7296029a9546da11b717f05db01aeafbcfedc6690f05" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/aws-google-auth.rb b/Formula/aws-google-auth.rb index 09150e06bec58..ecb00c1fbae2e 100644 --- a/Formula/aws-google-auth.rb +++ b/Formula/aws-google-auth.rb @@ -146,9 +146,38 @@ class AwsGoogleAuth < Formula sha256 "18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59" end + unless OS.mac? + resource "pycparser" do + url "https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a/pycparser-2.19.tar.gz#sha256=a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" + sha256 "a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" + end + + resource "cffi" do + url "https://files.pythonhosted.org/packages/2d/bf/960e5a422db3ac1a5e612cb35ca436c3fc985ed4b7ed13a1b4879006f450/cffi-1.13.2.tar.gz#sha256=599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346" + sha256 "599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346" + end + + resource "cryptography" do + url "https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4/cryptography-2.8.tar.gz#sha256=3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651" + sha256 "3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651" + end + + resource "jeepney" do + url "https://files.pythonhosted.org/packages/74/24/9b720cc6b2a73c908896a0ed64cb49780dcfbf4964e23a725aa6323f4452/jeepney-0.4.3.tar.gz#sha256=3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e" + sha256 "3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e" + end + + resource "secretstorage" do + url "https://files.pythonhosted.org/packages/a6/89/df343dbc2957a317127e7ff2983230dc5336273be34f2e1911519d85aeb5/SecretStorage-3.1.1.tar.gz#sha256=20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92" + sha256 "20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92" + end + end + def install - # Fix "ld: file not found: /usr/lib/system/libsystem_darwin.dylib" for lxml - ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra + if OS.mac? + # Fix "ld: file not found: /usr/lib/system/libsystem_darwin.dylib" for lxml + ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra + end venv = virtualenv_create(libexec, "python3") @@ -163,19 +192,25 @@ def install resource("Pillow").stage do inreplace "setup.py" do |s| - sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" - s.gsub! "openjpeg.h", - "probably_not_a_header_called_this_eh.h" - s.gsub! "ZLIB_ROOT = None", - "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + if OS.mac? + sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" + end + s.gsub! "openjpeg.h", "probably_not_a_header_called_this_eh.h" + if OS.mac? + s.gsub! "ZLIB_ROOT = None", "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + else + s.gsub! "ZLIB_ROOT = None", + "ZLIB_ROOT = ('#{Formula["zlib"].opt_prefix}/lib', '#{Formula["zlib"].opt_prefix}/include')" + end + free_pre = Formula["freetype"].opt_prefix s.gsub! "JPEG_ROOT = None", - "JPEG_ROOT = ('#{Formula["jpeg"].opt_prefix}/lib', '#{Formula["jpeg"].opt_prefix}/include')" + "JPEG_ROOT = ('#{Formula["jpeg"].opt_prefix}/lib', '#{Formula["jpeg"].opt_prefix}/include')" s.gsub! "FREETYPE_ROOT = None", - "FREETYPE_ROOT = ('#{Formula["freetype"].opt_prefix}/lib', '#{Formula["freetype"].opt_prefix}/include')" + "FREETYPE_ROOT = ('#{free_pre}/lib', '#{free_pre}/include')" end # avoid triggering "helpful" distutils code that doesn't recognize Xcode 7 .tbd stubs - unless MacOS::CLT.installed? + if OS.mac? && MacOS::CLT.installed? ENV.append "CFLAGS", "-I#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers" end venv.pip_install Pathname.pwd diff --git a/Formula/aws-iam-authenticator.rb b/Formula/aws-iam-authenticator.rb index 26a4451096e82..8de3c44174cd6 100644 --- a/Formula/aws-iam-authenticator.rb +++ b/Formula/aws-iam-authenticator.rb @@ -12,6 +12,7 @@ class AwsIamAuthenticator < Formula sha256 "9009147f0817116c801357d6d8bc082d1f320971a81b7c00051e0d43c8066a60" => :catalina sha256 "c475da0533c8bc809525e65a99410bcd39a8a4331216537e55a5c55a8599ebfe" => :mojave sha256 "152fe875fe64835efb1e13d088b7e2ca6cf2aa826333465047e8c90bb91e0dc7" => :high_sierra + sha256 "3d45f79e7f5a1dcace10b3b84b33b0ba3362984f1f53a906f16b4beb62050cc6" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/aws-keychain.rb b/Formula/aws-keychain.rb index 5e3768dacf175..b8f8751d28e88 100644 --- a/Formula/aws-keychain.rb +++ b/Formula/aws-keychain.rb @@ -6,6 +6,8 @@ class AwsKeychain < Formula bottle :unneeded + depends_on :macos + def install bin.install "aws-keychain" end diff --git a/Formula/aws-okta.rb b/Formula/aws-okta.rb index 3ca25a08ad350..b814342707489 100644 --- a/Formula/aws-okta.rb +++ b/Formula/aws-okta.rb @@ -9,9 +9,11 @@ class AwsOkta < Formula sha256 "8647c8a1715974a8a1cc46a5b8a09a6075a0d209e6d65615c8b0443df8556010" => :catalina sha256 "8cf8eea3db470ccd75831e98107b0689b40e3f4212f11bea3d038d3e94c9b197" => :mojave sha256 "898f8d08ba4aa093b782fc52d119f02a4e679b1991d97dd0e787e62b3a062d96" => :high_sierra + sha256 "8c9d75bf1f85e57e20c7f91d75c87a341c8ad08581cad7653cd7464ecaa24d38" => :x86_64_linux end depends_on "go" => :build + depends_on "govendor" => :build on_linux do depends_on "pkg-config" => :build diff --git a/Formula/aws-sdk-cpp.rb b/Formula/aws-sdk-cpp.rb index 77b6364a50bf6..2d1230d7b7f58 100644 --- a/Formula/aws-sdk-cpp.rb +++ b/Formula/aws-sdk-cpp.rb @@ -10,6 +10,7 @@ class AwsSdkCpp < Formula sha256 "0bccf3dd10a46000eac270f2bc844be37203f0eb34e5478e7c87020417523c84" => :catalina sha256 "3dc06f45d138d4a2eca6ab20eb2f23b4b91fbe6904f1688bec28b739da4e38b4" => :mojave sha256 "549e21118042e2d70bab5c3373c78a180a1ccc337432022beb71450470b55dc7" => :high_sierra + sha256 "e4d8b2cf8619dd488523a42612136ae182fca749d9b3b240fe95c24bb8e319c8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/aws-shell.rb b/Formula/aws-shell.rb index 97d8b9cec684a..1fd799eafe7fb 100644 --- a/Formula/aws-shell.rb +++ b/Formula/aws-shell.rb @@ -5,13 +5,14 @@ class AwsShell < Formula homepage "https://github.com/awslabs/aws-shell" url "https://files.pythonhosted.org/packages/46/5a/c01bbff96fcbe8051e0b59e6191e07f5917f7f2cf667557c7dcbb85f62c3/aws-shell-0.2.1.tar.gz" sha256 "2044b0ef78c7542c392f2cee4b74a4439545c63dda0a3e28b712fff53e8e5823" - revision 2 + revision OS.mac? ? 2 : 3 bottle do - cellar :any + cellar :any_skip_relocation sha256 "80649fd9dfb5ef9c0506db4f74e0a4ff275617a718249cbc12d2c62efb46657f" => :catalina sha256 "174cce4bc60dfa38babc3bae1dd3b1ab8614c2339340eaaf438012724ebc3646" => :mojave sha256 "e59a26cea8549c99c0f6586db2f85d9400b53911902ec9ebdac1e6379d2518ac" => :high_sierra + sha256 "c62e6ef0f327fdb655dc2da20b7d4006c739c0f85cd125bcc73911ff03423021" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/aws-vault.rb b/Formula/aws-vault.rb new file mode 100644 index 0000000000000..b6423c665352e --- /dev/null +++ b/Formula/aws-vault.rb @@ -0,0 +1,32 @@ +class AwsVault < Formula + desc "Securely store and access AWS credentials in development environments" + homepage "https://github.com/99designs/aws-vault" + url "https://github.com/99designs/aws-vault/archive/v5.4.4.tar.gz" + sha256 "29844e459a3421ae0123b83a3097c15bc2980bf787374c1ade44328cf14fde4e" + + bottle do + cellar :any_skip_relocation + sha256 "a3d9afc0fe1efde7018bcf2216db2f85e0360049878038a6647254dbb80b127b" => :x86_64_linux + end + + depends_on "go" => :build + depends_on :linux + + def install + ENV["GOOS"] = "linux" + ENV["GOARCH"] = "amd64" + + flags = "-X main.Version=#{version} -s -w" + + system "go", "build", "-ldflags=#{flags}" + bin.install "aws-vault" + + zsh_completion.install "completions/zsh/_aws-vault" + bash_completion.install "completions/bash/aws-vault" + end + + test do + assert_match("aws-vault: error: required argument 'profile' not provided, try --help", + shell_output("#{bin}/aws-vault login 2>&1", 1)) + end +end diff --git a/Formula/awscli.rb b/Formula/awscli.rb index 32014e7970df9..2e1983d07b52b 100644 --- a/Formula/awscli.rb +++ b/Formula/awscli.rb @@ -11,6 +11,7 @@ class Awscli < Formula sha256 "e78c56cc551a3f5e252aaa51b79b27a08eeb0f23fdbb541f2cff2f44cc5cc0da" => :catalina sha256 "da6bfc03f073d766d0aa7ea4b488e1ea5be5fb10b7cf6180d99a2fcfc06174ec" => :mojave sha256 "6d865fb7ef17e1ca4eb5759ac5c647fca9a6cacb238b042c0af893db4e32a2e8" => :high_sierra + sha256 "9cdec595d85460031977b991751648f0cbb25412f8adcfd59b3a93356945857e" => :x86_64_linux end # Some AWS APIs require TLS1.2, which system Python doesn't have before High diff --git a/Formula/awscli@1.rb b/Formula/awscli@1.rb index d3a591828cc17..9178b0a6f4772 100644 --- a/Formula/awscli@1.rb +++ b/Formula/awscli@1.rb @@ -12,6 +12,7 @@ class AwscliAT1 < Formula sha256 "8a7a9bfd08ca249226988cb0945e69386d750a10401befd9b134817b60f762bc" => :catalina sha256 "b037edaad8cccdc7962c11d69b47df3efddf284bbe1c8f1fccaaf1e3afcb72c5" => :mojave sha256 "37ca4ba85490ca5b7e78e2b15a29a6fa61b747d67aa03e6aa7c3e3ba58905ab7" => :high_sierra + sha256 "50f2a1f7550f24058e6a85587f69d4cceba992ecb6ca7e12e0e5f18d62ece8f9" => :x86_64_linux end keg_only :versioned_formula diff --git a/Formula/awscurl.rb b/Formula/awscurl.rb index a2c5f20bdfb89..025f66ef91286 100644 --- a/Formula/awscurl.rb +++ b/Formula/awscurl.rb @@ -5,7 +5,7 @@ class Awscurl < Formula homepage "https://github.com/okigan/awscurl" url "https://github.com/okigan/awscurl/archive/v0.20.tar.gz" sha256 "3ce06d105067b42398cf0bb6696742b790258e16487d5e5afa025b7c3ca983e4" - revision 1 + revision OS.mac? ? 1 : 3 head "https://github.com/okigan/awscurl.git" bottle do @@ -13,6 +13,7 @@ class Awscurl < Formula sha256 "b6eb9274da3699bce4675068f5476e63c900b9e1aaecaaf3a7d80845143ff919" => :catalina sha256 "2de296f8d1c89e5532526017faba23cdb36ec34bae668308c671d4a56a252995" => :mojave sha256 "38ad9e69f5e0d14d4c8007d059b8faf61cec1f6a6ec9f61cf2e25fc19ba3d005" => :high_sierra + sha256 "5f8b9cde81a30e26ee995aef8bf6efaac5366cae1a0ddf900cb116f4fce78dc5" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/awslogs.rb b/Formula/awslogs.rb index 4676b8f4641e5..a8447d29698b6 100644 --- a/Formula/awslogs.rb +++ b/Formula/awslogs.rb @@ -5,7 +5,7 @@ class Awslogs < Formula homepage "https://github.com/jorgebastida/awslogs" url "https://github.com/jorgebastida/awslogs/archive/0.11.0.tar.gz" sha256 "6258a121629cb872ee61fe78bf112753c8782c971524f0943a0e21f74d5e28bd" - revision 2 + revision OS.mac? ? 2 : 4 head "https://github.com/jorgebastida/awslogs.git" bottle do @@ -13,6 +13,7 @@ class Awslogs < Formula sha256 "7918feeb3d8bd6ff0944c55afae7864eaf5cea516029b33647aa2ce87288ce86" => :catalina sha256 "5079a8ee7893316f2febeb41caf7afe6a0a2efad9f553f04dcfb80be9109e1d0" => :mojave sha256 "04e319b2b99b8c62ce50d8c4cce6804aac585d063ac4da9ec8459dc9a8719512" => :high_sierra + sha256 "2e9fcaa48890e8f0434a65297339882ee2b9be428b539ec936e2c1a58a4d51d0" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/awsume.rb b/Formula/awsume.rb index cd793c92c5f69..0ed5a0ab3b859 100644 --- a/Formula/awsume.rb +++ b/Formula/awsume.rb @@ -5,7 +5,7 @@ class Awsume < Formula homepage "https://www.trek10.com/blog/awsume-aws-assume-made-awesome" url "https://github.com/trek10inc/awsume/archive/4.4.1.tar.gz" sha256 "66d698b4716a1dc7c927778a8fe124a6ac2d99334aff2be5dac6b13598b4e08f" - revision 1 + revision OS.mac? ? 2 : 3 head "https://github.com/trek10inc/awsume.git" bottle do @@ -13,10 +13,12 @@ class Awsume < Formula sha256 "09170cb98ec4947ddb04623d32745624623fc054f1c82edfa7f4c89442da9c7a" => :catalina sha256 "503d4ddd068d70a0a5e2f7f4ea54584b551e8bb52f5c07f05801527bf5d750b3" => :mojave sha256 "33c1bd0d60b93b7de79359a971d7abb9182cb33065036b8ece6d75a8bc437552" => :high_sierra + sha256 "eb839e0eae5a00d1490dde42924674cb8fb87003d0606ec603c26fd8d0dae9d5" => :x86_64_linux end depends_on "openssl@1.1" depends_on "python@3.8" + uses_from_macos "sqlite" resource "boto3" do diff --git a/Formula/axel.rb b/Formula/axel.rb index af64ddf5b9192..649919cda61e8 100644 --- a/Formula/axel.rb +++ b/Formula/axel.rb @@ -6,10 +6,10 @@ class Axel < Formula head "https://github.com/eribertomota/axel.git" bottle do - cellar :any sha256 "8c4c87ce64a4aaa3691e965a7c5843503f80d348f5d17b0e9d1840c45bbc1aaf" => :catalina sha256 "e1ab7026adcf06373662caad04dbc1d93b5fcabb40ff79b6bbba466e0f6d8da4" => :mojave sha256 "d27855f8ffa19450a2ba4b54a6338105004f342e85527efaa074d67d245af943" => :high_sierra + sha256 "3469fafd2ce9f9e5ff51bfdde1e6567b5c32d5878caf5bae7f718e86ba99bb3a" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/azure-cli.rb b/Formula/azure-cli.rb index 9a3a4823e653c..bb30798439d34 100644 --- a/Formula/azure-cli.rb +++ b/Formula/azure-cli.rb @@ -13,6 +13,7 @@ class AzureCli < Formula sha256 "598ab7a63b33b28358d77eeeab9da803e5d60c2e75c28732dcff62b7da4c851d" => :catalina sha256 "40a648dc3718f8c688c8ff97a185df2184717cf0e135b79b89da7833cf684c1f" => :mojave sha256 "48f14aa020e67d7788e3ec6c9df8bdc5c559987f385e3dc323dfc0cd9b702462" => :high_sierra + sha256 "1229360bcf6ffab59bffa4018fe3b9918a464cad0eb5f4bf68bb8819923c0b4b" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/b2-tools.rb b/Formula/b2-tools.rb index 226d8364700d1..a9bf7b3ef8c42 100644 --- a/Formula/b2-tools.rb +++ b/Formula/b2-tools.rb @@ -11,6 +11,7 @@ class B2Tools < Formula sha256 "12f9cb755703e43d3cd9a0cb0fe180f523957f938a9ad2230ce4b331055ef131" => :catalina sha256 "eb1b00f5b35be71648ba4ad3c5aac6d4e784e198995a2fc2b0f65541e249a3d7" => :mojave sha256 "7ecf4f59a02475ac05c13a3d2354c1253ca09367d4d007b639b06640a432dc79" => :high_sierra + sha256 "034ecabc38126d84ed98f1ee375ac4aac4ba0b0e6f910fee8962825b05711e6f" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/b2sum.rb b/Formula/b2sum.rb index 0fff94cf8cd40..76c0594605550 100644 --- a/Formula/b2sum.rb +++ b/Formula/b2sum.rb @@ -9,6 +9,7 @@ class B2sum < Formula sha256 "339b959eb5c2cbc8c26a39022937ea27b7911ff1c9f0611c3f2ac1595f5b0e50" => :catalina sha256 "905b975371fd88632649e08f732ff25277cd1fd4b584dbc3e4914bcb08f85cd8" => :mojave sha256 "129dbe4d91bf7843a40399b392b3ddc2448e56c249a45567bd9193e4fb722b37" => :high_sierra + sha256 "772728967c21dbd98cb2afac3042a3ddacc88afd88e75de2e91d35ae90271bcb" => :x86_64_linux end conflicts_with "coreutils", :because => "both install `b2sum` binaries" diff --git a/Formula/b3sum.rb b/Formula/b3sum.rb index eadead172e07a..cd824597d8cbe 100644 --- a/Formula/b3sum.rb +++ b/Formula/b3sum.rb @@ -9,6 +9,7 @@ class B3sum < Formula sha256 "ca1b6befbfcc0f9b29988734eb9e7f4a4733f93eaad4fd044979dd92b6e7db27" => :catalina sha256 "ffa534e58550dd15036ab9cffc692b1d1fac2fe8cd2f69edda255e056169c927" => :mojave sha256 "1b12778aa33337ea2212e925fb0779a15b0eac8d939a5c402e8271ea91e12815" => :high_sierra + sha256 "c8dc6b93f6bf294e388e88ace9311664560746e02b77bd6333d44dd9e972d2c7" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/babel.rb b/Formula/babel.rb index a0f74eb830f55..179c09461d9e4 100644 --- a/Formula/babel.rb +++ b/Formula/babel.rb @@ -11,6 +11,7 @@ class Babel < Formula sha256 "a91bf9298747d0b3a067094627f6ba514a5ba49813edd83e81e649609434f5ec" => :catalina sha256 "96141bc2ca574f0400c9f2c5ab1984e908efa3c827a8dfe5330d434fb732d7b8" => :mojave sha256 "bc5b854a5f7d651d3265f094ecbbfbfc695bfd0248207a689362a4421a0ba49c" => :high_sierra + sha256 "d991230c176dc1bdea6cceae8dbb9172fe73219c6bbfff7ad9dfd914f422967a" => :x86_64_linux end depends_on "node" diff --git a/Formula/babeld.rb b/Formula/babeld.rb index db4f7b6845e32..d492844f321f6 100644 --- a/Formula/babeld.rb +++ b/Formula/babeld.rb @@ -10,19 +10,25 @@ class Babeld < Formula sha256 "d65c7dd41ac16cb2f791a80f3cbebdb6616321e106874504644b0ab5cd37da24" => :catalina sha256 "14f512383b868d8c9752414328fd4681de70d6aa37992cdcb55be61406bcb08a" => :mojave sha256 "6b920612afb160b31950f28dad5b38880689cb3f52a23be723e8dd680370fca8" => :high_sierra + sha256 "bb268a068c9424beeddb9933a57aa9593c6cd4ffceb58dab58d14368509081eb" => :x86_64_linux end def install - system "make", "LDLIBS=''" + system "make" unless OS.mac? + system "make", "LDLIBS=''" if OS.mac? system "make", "install", "PREFIX=#{prefix}" end test do shell_output("#{bin}/babeld -I #{testpath}/test.pid -L #{testpath}/test.log", 1) - expected = <<~EOS - Couldn't tweak forwarding knob.: Operation not permitted - kernel_setup failed. - EOS - assert_equal expected, (testpath/"test.log").read + if OS.mac? + expected = <<~EOS + Couldn't tweak forwarding knob.: Operation not permitted + kernel_setup failed. + EOS + assert_equal expected, (testpath/"test.log").read + else + assert_match "kernel_setup failed", (testpath/"test.log").read + end end end diff --git a/Formula/babl.rb b/Formula/babl.rb index 0bdfe2214f17a..55052520ebe55 100644 --- a/Formula/babl.rb +++ b/Formula/babl.rb @@ -10,6 +10,7 @@ class Babl < Formula sha256 "d163bc0d4cd1f816df3ec00ed7facadbf95946f1650bf9aa4dce2f37c2ef815c" => :catalina sha256 "50a1461b22dcef2951014ac2b5162c90a97b784d8f03310e35dac0ba60c3c4cf" => :mojave sha256 "d6b0c2274b044725b9a4fa63c9264f16077407fe9b424277399837e539e2386a" => :high_sierra + sha256 "767c6a550eb8c734d51faec882843331bd8292699c0fd1b5d5223c41ad37de62" => :x86_64_linux end depends_on "glib" => :build # for gobject-introspection @@ -40,7 +41,7 @@ def install return 0; } EOS - system ENV.cc, "-I#{include}/babl-0.1", "-L#{lib}", "-lbabl-0.1", testpath/"test.c", "-o", "test" + system ENV.cc, "-I#{include}/babl-0.1", testpath/"test.c", "-L#{lib}", "-lbabl-0.1", "-o", "test" system testpath/"test" end end diff --git a/Formula/backupninja.rb b/Formula/backupninja.rb index 19f59d0bcde93..2b0c3a04f71ae 100644 --- a/Formula/backupninja.rb +++ b/Formula/backupninja.rb @@ -11,6 +11,7 @@ class Backupninja < Formula sha256 "39df0693351a58ac9f406d6c16ab9c15ddb5d96ddf7ac9e98cf94061ccffe9a8" => :mojave sha256 "39df0693351a58ac9f406d6c16ab9c15ddb5d96ddf7ac9e98cf94061ccffe9a8" => :high_sierra sha256 "071ac37b853475ae44c4b3dde995d694a5fce322e68d7eeb39eb52a85c781cea" => :sierra + sha256 "46e71b934970638888d029ae6b69b09090e6f111c8eae190dd677234ebfb8601" => :x86_64_linux end depends_on "bash" diff --git a/Formula/bacula-fd.rb b/Formula/bacula-fd.rb index 77511cfa16434..1b68105317787 100644 --- a/Formula/bacula-fd.rb +++ b/Formula/bacula-fd.rb @@ -5,9 +5,11 @@ class BaculaFd < Formula sha256 "510f35b86138472abe6c559caded7bc773bf5eb1b9ee10905ee8f4f827c7c77a" bottle do + cellar :any_skip_relocation sha256 "9f60d58bc6f3709d3ed3fabb03a82d9197a76a4f8bea6f0b4d5cef24bec5e5ea" => :catalina sha256 "af55545e264e8fb2b7b0ce417194d7d27ddb17d41d28e9664c8e9371164958d0" => :mojave sha256 "a615488f494959d4d19cee5d863c4c306a2180ceab548742c93cef68fe8b688c" => :high_sierra + sha256 "970048b5ef752b10fee61ee4363e4819b51dd93d388e5617507093563bf3a001" => :x86_64_linux end depends_on "openssl@1.1" @@ -39,9 +41,15 @@ def install system "make" system "make", "install" - # Avoid references to the Homebrew shims directory - inreplace Dir[prefix/"etc/bacula_config"], - HOMEBREW_SHIMS_PATH/"mac/super/", "" + if OS.mac? + # Avoid references to the Homebrew shims directory + inreplace Dir[prefix/"etc/bacula_config"], + HOMEBREW_SHIMS_PATH/"mac/super/", "" + else + # Avoid references to the Homebrew shims directory + inreplace Dir[prefix/"etc/bacula_config"], + HOMEBREW_SHIMS_PATH/"linux/super/", "" + end (var/"lib/bacula").mkpath end diff --git a/Formula/badtouch.rb b/Formula/badtouch.rb index 0734beefd5d7a..5d056ec965def 100644 --- a/Formula/badtouch.rb +++ b/Formula/badtouch.rb @@ -9,6 +9,7 @@ class Badtouch < Formula sha256 "f6294a3dc8e19096623409df112ed32d30005d7ea9539529b39d374b21c6d4ac" => :catalina sha256 "4ac7d4d570c30b3f024a276f50aa39429350a852efd5c29e4941d66dbe7227f6" => :mojave sha256 "e4f2eb394ebc2c5f2b674d577ef2263b6580927d1b0eb15ee38384fbfb6565f4" => :high_sierra + sha256 "ed071347875c49d01f88be056b885ce87b8ecc2e04ae731f12463c8fbf8b9645" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/balena-cli.rb b/Formula/balena-cli.rb index 1a5699baee7fd..b17269041c7f4 100644 --- a/Formula/balena-cli.rb +++ b/Formula/balena-cli.rb @@ -11,6 +11,7 @@ class BalenaCli < Formula sha256 "1a1cd43449289e17cee991e60872d303b26c338b037e4e52e0e4e3f2ad6bb603" => :catalina sha256 "4b2701babc77af9b4f96430bf30f0646b315405f6398ff38fa486c69d0a19031" => :mojave sha256 "ae8f56791b14ebf36f7f101bb3e4af9e996a157cc1b7a46e8a20449bba43e7f6" => :high_sierra + sha256 "b5f39c80271265c2471797c7e3cff04a6ca75a848aaebfc892dea63d72cc86b6" => :x86_64_linux end depends_on "node" diff --git a/Formula/ballerburg.rb b/Formula/ballerburg.rb index 617aa2d69b9e2..52d5e1abef951 100644 --- a/Formula/ballerburg.rb +++ b/Formula/ballerburg.rb @@ -13,6 +13,7 @@ class Ballerburg < Formula sha256 "fa38cec8799ff4dcd33735146d4d93c986eb42c72bf6a9f1b3bd997acb5613c1" => :sierra sha256 "314236d328ffdbaa4ddbcfbe38566ab0669df3935a9a051d3366a8d0e87d3de9" => :el_capitan sha256 "46502878f24bf976bc5798ff74c145059f642ca2e9cb9d8467e296ad5b582f00" => :yosemite + sha256 "b42b2c1998ea713ceadebf3787a2752e4ef1277b6a607adc5c2bb63b464b1ca0" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/bam.rb b/Formula/bam.rb index 34f1306278e0b..3add0ae6c9686 100644 --- a/Formula/bam.rb +++ b/Formula/bam.rb @@ -12,6 +12,7 @@ class Bam < Formula sha256 "59aebec505aba51189ccedb1872affd1c48ca84598caa591c2e0c955817e7cd7" => :high_sierra sha256 "f237da39dd743732f3cfa0a5029b3cce4b332fb08e4326183eece8fd50dcf789" => :sierra sha256 "4ded8f152aa05211053796e77b9b7a9e5671b9d5871c374a85ee74e6b9cb8e50" => :el_capitan + sha256 "82fa4928436da37b10d17b6194f49e2772505c95c1e4a0c17606c409fa9947c7" => :x86_64_linux end def install diff --git a/Formula/bamtools.rb b/Formula/bamtools.rb index 7489c2328d3bb..648fad5b64717 100644 --- a/Formula/bamtools.rb +++ b/Formula/bamtools.rb @@ -12,6 +12,7 @@ class Bamtools < Formula sha256 "cd3886cfb77b71ef9924d5475e4dbae2d42c4c66ef3880de33ca202855ce92b0" => :high_sierra sha256 "5e72d5b1b5b18551bbd91c7f3b7a2dd6e763b13add38b9a3a798bb5a450be64e" => :sierra sha256 "920e533776328d79f47bb562af5cfa00d855223818916e00614ee81d821f211c" => :el_capitan + sha256 "a2834fffb6da7861d948cdfe78e9942bff4e88bc17361a506ac5d2058acef3c9" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/bandcamp-dl.rb b/Formula/bandcamp-dl.rb index 5c6271aa31bd4..d624f6d56fa72 100644 --- a/Formula/bandcamp-dl.rb +++ b/Formula/bandcamp-dl.rb @@ -6,7 +6,7 @@ class BandcampDl < Formula url "https://github.com/iheanyi/bandcamp-dl/archive/v0.0.8-12.tar.gz" version "0.0.8-12" sha256 "3252f52780f280ba18818d40cda1c89bdb99ee33d7911320ec2ce4c374df2d6b" - revision 3 + revision OS.mac? ? 3 : 4 head "https://github.com/iheanyi/bandcamp-dl.git" bottle do @@ -14,6 +14,7 @@ class BandcampDl < Formula sha256 "7906dfa2016495c4e0aeca69d9aa2b7e9bcc2ac4742ba2900f3e4b6a942a3053" => :catalina sha256 "5bce4baa9ae47a78a43206aad853a0a202395dc335d41756050af358967f035f" => :mojave sha256 "9c8c311b18dad230648661c3b981583ece5e647285239c6024efa2f2598f439e" => :high_sierra + sha256 "4cf828c7fff6676f90bcea676952e38575fd0b22b80e5248a5218dcbd0ebbb7e" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/bandwhich.rb b/Formula/bandwhich.rb index e7cf4ba020ba4..3e8ee4e97fd72 100644 --- a/Formula/bandwhich.rb +++ b/Formula/bandwhich.rb @@ -9,6 +9,7 @@ class Bandwhich < Formula sha256 "fb83c727c5291d983c43865d1b6f6ce27c173ad883e24f1d9ff61909fe159580" => :catalina sha256 "e84c13bce1bf2e21052fbc23f8f77ffb18fa61840af4881895df8164e2bb1c09" => :mojave sha256 "247f4d7303f2053bbb920b260b39e017ab2cc8140862edfebcabdb5c2464c0e5" => :high_sierra + sha256 "d18a0d030fcca6f7cbf71322e84eeff564b061ea18638f4321817b8dd811659f" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/baobab.rb b/Formula/baobab.rb index be4f9eba927b1..a78f242882b78 100644 --- a/Formula/baobab.rb +++ b/Formula/baobab.rb @@ -9,6 +9,7 @@ class Baobab < Formula sha256 "8724ad2149b4e8d51b5de9268a3a7cdd99855736478bac1dcf97b3ea6d741ac6" => :catalina sha256 "21588b8f71e80696d785cbbe33284214c38f73b2a72a62f537de4e3393ed2bfa" => :mojave sha256 "922b36653952a0c8e4c44678faf7d042a1e89c3b455ac1d3e46a4292606f26d9" => :high_sierra + sha256 "8f15def8eafd1d905f45cbc71b90a968131bc780bfb7548adf33fade34389db7" => :x86_64_linux end depends_on "itstool" => :build diff --git a/Formula/bartycrouch.rb b/Formula/bartycrouch.rb index 3bbfedd9a1f67..9bb89c306ae07 100644 --- a/Formula/bartycrouch.rb +++ b/Formula/bartycrouch.rb @@ -11,7 +11,8 @@ class Bartycrouch < Formula sha256 "86f4e9f2e99b0e6c34756e73365228833f3ea39251cb082eff4f37b7a38dc42e" => :catalina end - depends_on :xcode => ["11.4", :build] + depends_on :xcode => ["11.4", :build] if OS.mac? + depends_on :macos def install system "make", "install", "prefix=#{prefix}" diff --git a/Formula/base64.rb b/Formula/base64.rb index 654483d63276c..82e478352ef6b 100644 --- a/Formula/base64.rb +++ b/Formula/base64.rb @@ -13,6 +13,7 @@ class Base64 < Formula sha256 "0ab522634adf5c9eefb08c11d51d2b6e0477d8ea607afdb8eefe204de764f180" => :el_capitan sha256 "5681332029a2ed1fe1272b2ef9877a6348501897822c6a8955b26bb904426b1a" => :yosemite sha256 "42e0864be73790c541237c3a2d41183cf1baacad346cb16c97bd3576f5f50cfc" => :mavericks + sha256 "9a9ce00338cde1af65b9283cc9893621c645bf32307eae5f3cf6e5f3e88efdce" => :x86_64_linux end def install diff --git a/Formula/base91.rb b/Formula/base91.rb index 17498f4c7b20b..f5bfd387ac3ad 100644 --- a/Formula/base91.rb +++ b/Formula/base91.rb @@ -10,6 +10,7 @@ class Base91 < Formula sha256 "fca64b5013c75658646a7d758365a624aa5f3a89488573222f2bbb867b04cc49" => :mojave sha256 "3b9c972390a56bc2ea0be9943558018cc271802369b5b36ff0fa10391aaf1f57" => :high_sierra sha256 "7d43d307ad7fb92e10b21696e4f3d5880979f12b465db614f7ecaf9e4c9d4904" => :sierra + sha256 "82a3cf665258a220fef0f0d1a06f76cf2f8cc6453706601c8d8bdf79ac82f61f" => :x86_64_linux end def install diff --git a/Formula/bash-completion.rb b/Formula/bash-completion.rb index af394d61a7430..08d04c2ab6a99 100644 --- a/Formula/bash-completion.rb +++ b/Formula/bash-completion.rb @@ -15,6 +15,7 @@ class BashCompletion < Formula sha256 "58be92ef01d5068f37b1c00af8e9b202bdb409c93121bb0e07dcbb5e55dc3be2" => :sierra sha256 "58be92ef01d5068f37b1c00af8e9b202bdb409c93121bb0e07dcbb5e55dc3be2" => :el_capitan sha256 "58be92ef01d5068f37b1c00af8e9b202bdb409c93121bb0e07dcbb5e55dc3be2" => :yosemite + sha256 "d8e44d076970e70be1e5d910511f582857021c4e418db385f11be9d8ff354d1d" => :x86_64_linux end conflicts_with "bash-completion@2", :because => "Differing version of same formula" diff --git a/Formula/bash-completion@2.rb b/Formula/bash-completion@2.rb index 285ffbb02b953..ca36f03a62459 100644 --- a/Formula/bash-completion@2.rb +++ b/Formula/bash-completion@2.rb @@ -10,6 +10,7 @@ class BashCompletionAT2 < Formula sha256 "b162bc315662861c84f428b262c9883d34ff7eab80ddff09148f81aef4d5d7ff" => :catalina sha256 "b162bc315662861c84f428b262c9883d34ff7eab80ddff09148f81aef4d5d7ff" => :mojave sha256 "b162bc315662861c84f428b262c9883d34ff7eab80ddff09148f81aef4d5d7ff" => :high_sierra + sha256 "697694dcb374592ad8c96c73050d716c3602861d5dc95bd32077f7d30c7407d8" => :x86_64_linux end head do diff --git a/Formula/bash.rb b/Formula/bash.rb index 69079287b3fdb..eb49817c08883 100644 --- a/Formula/bash.rb +++ b/Formula/bash.rb @@ -44,6 +44,7 @@ class Bash < Formula sha256 "ce9312721ce3700e3b95d3e2f663ee51c16423cea9e54a867ad17a1f9676aa68" => :catalina sha256 "0a002b85e82af9ada464528e5e34180897cde3f26f77b04944cc45d4f6bff9d8" => :mojave sha256 "7711a176d742d4df6c92930da1b56e45b44075ab6839f5e7ea8eefa4227701d4" => :high_sierra + sha256 "f6b02b59a35899899de7240d7a536e5cee02793e7e57b1cecc90dfd72429401e" => :x86_64_linux end def install diff --git a/Formula/bashdb.rb b/Formula/bashdb.rb index 76a3338b881ee..365bbbac77320 100644 --- a/Formula/bashdb.rb +++ b/Formula/bashdb.rb @@ -10,6 +10,7 @@ class Bashdb < Formula sha256 "0ab6de48ce871bc7b6abc582154b425350a70b7f2ecadd3b303c7a91dafc3c41" => :catalina sha256 "0ab6de48ce871bc7b6abc582154b425350a70b7f2ecadd3b303c7a91dafc3c41" => :mojave sha256 "0ab6de48ce871bc7b6abc582154b425350a70b7f2ecadd3b303c7a91dafc3c41" => :high_sierra + sha256 "6640e91c77bca53d33acf19d11ea1db0cf02a6b41107b857c0e827dcdd02fa9a" => :x86_64_linux end depends_on "bash" diff --git a/Formula/bashish.rb b/Formula/bashish.rb index 6189f80124355..e9f97b8413173 100644 --- a/Formula/bashish.rb +++ b/Formula/bashish.rb @@ -12,6 +12,7 @@ class Bashish < Formula sha256 "114d2ce95e530c6850bc36a52a1053ecf05185d774ed499bd1725811b3c1b88c" => :el_capitan sha256 "cb3bfee8b595277be04660817eb269e97744d5f49dcac431ae7473982ad5d405" => :yosemite sha256 "048bdedf5840f06f7ce38c153663d9c7b440f8829ade2474a47672a9e33b2c12" => :mavericks + sha256 "c4b2a6375186d1d478b34054c54359b6489bfbf12b63a41fe6d082e5bcffec66" => :x86_64_linux # glibc 2.19 end depends_on "dialog" diff --git a/Formula/bastet.rb b/Formula/bastet.rb index 6a63286e324d7..f70f372065134 100644 --- a/Formula/bastet.rb +++ b/Formula/bastet.rb @@ -11,6 +11,7 @@ class Bastet < Formula sha256 "188658452934d4ef5d48d6837fb0c6bf3e3875488e0c1da8dcf62ca37c1ee998" => :high_sierra sha256 "8133c13d1b98d96eacf5d420d30378fbfcd9cbe898b0f13b188112618f4338f5" => :sierra sha256 "e3745b716c09ce7f3834f4fc30163fa132f93feeec4c301dc9d46b0bc9ca564f" => :el_capitan + sha256 "254d21cc32a309c4b91ba5008fdfe56dbd355312948de849e2172fbf2201ab83" => :x86_64_linux end depends_on "boost" diff --git a/Formula/bat.rb b/Formula/bat.rb index ab38b000394e7..a6ad5b0615da8 100644 --- a/Formula/bat.rb +++ b/Formula/bat.rb @@ -9,9 +9,11 @@ class Bat < Formula sha256 "ae2c26d25a0dac35bd839a091f89201b5d9eee32ef613325426c7e8b8812d1a9" => :catalina sha256 "40dea8577c06a08d3e3bd20a949245ff02ea85153d25f72a65cee03c1b1e1cf9" => :mojave sha256 "59bed16f8a4741a9d92f62cb7c9965d1abe40dc5dd2323bc4f37e71330b1abf2" => :high_sierra + sha256 "3dc5ecc2a5177627ab2f56d2967b4001aab4d35f84e61f3d564b96fc4fb6c1a5" => :x86_64_linux end depends_on "rust" => :build + depends_on "llvm" => :build unless OS.mac? uses_from_macos "zlib" diff --git a/Formula/bazaar.rb b/Formula/bazaar.rb index 0929ee781223d..cc77e7be67aac 100644 --- a/Formula/bazaar.rb +++ b/Formula/bazaar.rb @@ -3,7 +3,7 @@ class Bazaar < Formula homepage "https://bazaar.canonical.com/" url "https://launchpad.net/bzr/2.7/2.7.0/+download/bzr-2.7.0.tar.gz" sha256 "0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3" - revision 1 + revision OS.mac? ? 1 : 3 bottle do cellar :any_skip_relocation @@ -11,6 +11,7 @@ class Bazaar < Formula sha256 "c9ab575e1e27fe8e550690c760464c37890ca5c1fa8ea111c74d0172d0fa1453" => :catalina sha256 "32411a9e28eb27b3637bc915150581524897a18ba223313e5bc2f776785aae9b" => :mojave sha256 "cb1c0c8b5f19abef4043195d8cbd19f363a78581596de1ddcc763621964335b3" => :high_sierra + sha256 "79b5e97e1039d9bc01f9aede661104531f9abcf8c12aace2aeeab3855b41d5a0" => :x86_64_linux end depends_on :macos # Due to Python 2 @@ -34,7 +35,7 @@ def install ENV.prepend_path "PATH", "/System/Library/Frameworks/Python.framework/Versions/Current/bin" system "make" - inreplace "bzr", "#! /usr/bin/env python", "#!/usr/bin/python" + inreplace "bzr", "#! /usr/bin/env python", "#!/usr/bin/python" if OS.mac? libexec.install "bzr", "bzrlib" (bin/"bzr").write_env_script(libexec/"bzr", :BZR_PLUGIN_PATH => "+user:#{HOMEBREW_PREFIX}/share/bazaar/plugins") diff --git a/Formula/bbcolors.rb b/Formula/bbcolors.rb index 29f6263715d42..471f22bfe5a3d 100644 --- a/Formula/bbcolors.rb +++ b/Formula/bbcolors.rb @@ -13,6 +13,7 @@ class Bbcolors < Formula sha256 "2a713dae009e44685d1ef02b01d5202a24087129dab70366d2e30800b7dfb9cb" => :el_capitan sha256 "506d7f82fa38e1f694550be30a29554b8ecc8b303d47e9bb4fcadfc534ac55c7" => :yosemite sha256 "68b63b5913be9e20b8ebc726c5272e030f7572aeb6baab709a70725f632c69b1" => :mavericks + sha256 "bb899d6daaee980ab6d555057a7dd939c7d020b766564b12ba351cfb2ba77cfd" => :x86_64_linux end def install diff --git a/Formula/bbe.rb b/Formula/bbe.rb index 76596d9f4ab25..fb8fe9dcb6632 100644 --- a/Formula/bbe.rb +++ b/Formula/bbe.rb @@ -13,6 +13,7 @@ class Bbe < Formula sha256 "d9c63d7b9657e6f1c0e53048564f275283177e3513e202a7a9cfc69571bb5008" => :el_capitan sha256 "ae0aa826fcd9f11e93428e9eaeedb14a56c193c861f09123999a8ba0f3d7f9cd" => :yosemite sha256 "6b7c4c2c05ab444212260dfef6b2ab2ed7e9230844007651217259d1f957ed02" => :mavericks + sha256 "ab60278e8805481ca3a130113a209d80fa06df1069af1f3c750ded36844b3d74" => :x86_64_linux end def install diff --git a/Formula/bc.rb b/Formula/bc.rb index 823a4b1ff0a43..8c0b44c5d396a 100644 --- a/Formula/bc.rb +++ b/Formula/bc.rb @@ -13,12 +13,14 @@ class Bc < Formula sha256 "0baf2e31191d80258636186bf9adcdf6b3f554f213d36cb3054213f736e52bf1" => :high_sierra sha256 "1d8f0459c0b67aae275c43e01e5312146be72163acadd3d6c8f2bc440181508c" => :sierra sha256 "e5c4b3fa712d705c3cc9bfae12242c9b4dc429e329c61d12aa01b65c1623a11f" => :el_capitan + sha256 "57de5ac07f99f1b7b67b854997e9f2a6fb69664f904ea3c3cf4538d509227d91" => :x86_64_linux end keg_only :provided_by_macos uses_from_macos "bison" => :build uses_from_macos "ed" => :build + uses_from_macos "texinfo" => :build uses_from_macos "flex" def install diff --git a/Formula/bcftools.rb b/Formula/bcftools.rb index ff37ffa19afb1..062dd7b83fa81 100644 --- a/Formula/bcftools.rb +++ b/Formula/bcftools.rb @@ -8,6 +8,7 @@ class Bcftools < Formula sha256 "6d232b149d6f1edc21116002d675d1f62ab0bf73158e67802ecb94091fa1ceaa" => :catalina sha256 "deb19fb24a4a943cf577b31b53f6aecf55e195fb62133e6b613d5e657e5dbbe0" => :mojave sha256 "af4d6172e2cdd40aaa8c49c6e4e8fde3cb90bf7f04f516bd1d1673e3e1659c73" => :high_sierra + sha256 "06cbaf0d8378e093540f80b7c2b5def4320f49031c6be235b5acde099c5255d0" => :x86_64_linux end depends_on "gsl" diff --git a/Formula/bchunk.rb b/Formula/bchunk.rb index 4e182264fbb5f..119f81e710257 100644 --- a/Formula/bchunk.rb +++ b/Formula/bchunk.rb @@ -12,6 +12,7 @@ class Bchunk < Formula sha256 "d6183607b5b987345ee3380263819f1d5e12f2f3cc9f6fd55accfbf92c26d5ef" => :high_sierra sha256 "95ef5fddc2234902187dde834690fb5957bd99ce11403e3d0f8881a705bb8f27" => :sierra sha256 "665af973709071e982939f37ba39c79c6e41f7f18277d65670475ba9d8315f94" => :el_capitan + sha256 "d704539396152281a0fc791189fb40a9045fe93db151709f5c09d03b351c1b0f" => :x86_64_linux end def install diff --git a/Formula/bcpp.rb b/Formula/bcpp.rb index 87775c6f4f58c..65b800c6281f3 100644 --- a/Formula/bcpp.rb +++ b/Formula/bcpp.rb @@ -12,6 +12,7 @@ class Bcpp < Formula sha256 "25399ade6485e4272d264611a32db839905b56a3607f04ad9d66a5571469aa03" => :high_sierra sha256 "339190468a41d319c161ab16933012517f68d11e5162d57b117bdc0220a51db0" => :sierra sha256 "62ea91b7f94761da062c0f78757f48299bdd614ffba1cbc9e3e44794b305901e" => :el_capitan + sha256 "01ff025412579440b2eabae4134284062929b319f63b657d376ffc4269f964f6" => :x86_64_linux end def install diff --git a/Formula/bdw-gc.rb b/Formula/bdw-gc.rb index 72d72a7993447..b285de59f977e 100644 --- a/Formula/bdw-gc.rb +++ b/Formula/bdw-gc.rb @@ -10,6 +10,7 @@ class BdwGc < Formula sha256 "05219d7d030791e3c3e3751b36a603a710cce86dc63c97cc64ea6743b8828406" => :mojave sha256 "280e51afa899236777022c30b756fb4b87e034b9e23a5526c183fe3d0e24731c" => :high_sierra sha256 "6a4132230171a8bff236796655c87f453d9f711ea1d22a9e0d61ac05dc624394" => :sierra + sha256 "5cef552892e80a1da0c8c491ea8b0700ae0a7f58df6ae8d02eae1242a36e5fb1" => :x86_64_linux end head do diff --git a/Formula/beagle.rb b/Formula/beagle.rb index 7c195efbc846c..eb48feab50e45 100644 --- a/Formula/beagle.rb +++ b/Formula/beagle.rb @@ -10,6 +10,7 @@ class Beagle < Formula sha256 "de8fe667e01d1e204c669980753cf9ef84b4d2406ab52c0882d6d9108d2dc7eb" => :catalina sha256 "fe9ae7aaa01df98d34b5cbd7dce8abd9ac840f2bb54797851b42a056ee258e01" => :mojave sha256 "d2a42acc06fa4bf26c25b4d63a96c0d6bf46f7b1a21bacf91ef70fbff58e77b4" => :high_sierra + sha256 "63900f8765697b102f54bd6065c79eaaaec3a9ab861bdf617f6c3225a1cd55fc" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/beansdb.rb b/Formula/beansdb.rb index dd60c9a73220a..b1a13db77be30 100644 --- a/Formula/beansdb.rb +++ b/Formula/beansdb.rb @@ -13,6 +13,7 @@ class Beansdb < Formula sha256 "0c93cb38fd445baab2c301b3cb76ce0b6c7af9d3e879113d4c78bf761756bc08" => :sierra sha256 "5bb5311949ba21cde40848d1c1f58cf3317d8e8d604d3d0590dab2e9953a5ece" => :el_capitan sha256 "e3c0bfa02e012ef1b0935fe13be8286dce080e8898b6519f5bf8c886ea77b9bc" => :yosemite + sha256 "471954afefb48115bc2e42ec8ab7a55b18c0fc7816b265c3edadd0a00140db60" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/beanstalkd.rb b/Formula/beanstalkd.rb index 9aeeff42c0e80..46c710b4bd285 100644 --- a/Formula/beanstalkd.rb +++ b/Formula/beanstalkd.rb @@ -9,6 +9,7 @@ class Beanstalkd < Formula sha256 "eb308ce225c6f335a5a27518b63f8ce70caa263e94afbb7d9c2bb9000c12d974" => :catalina sha256 "da06f9b4142a163f26de89e5d67c729fd4edd9fbd2dcf3ada91507f92f45ec93" => :mojave sha256 "d57a1db5de295181c1f5596951160cc65b7f27645806fb35834f6409cbc57a6e" => :high_sierra + sha256 "71c624737a869ad08a91ab865c6a353fb63cbcb5313e18e1294424321e3458c9" => :x86_64_linux end def install diff --git a/Formula/bear.rb b/Formula/bear.rb index b26eb1c1969fc..f3fb75108ddab 100644 --- a/Formula/bear.rb +++ b/Formula/bear.rb @@ -13,6 +13,7 @@ class Bear < Formula sha256 "9eb44bc5187c1986a1e1650315df5e1632af4ea0333a39fa8c8a2a320c87b072" => :catalina sha256 "07a6d7a49a420177a0b4abeffc91bdb578527a2c6e16e7807ef35dbb1cd8cc69" => :mojave sha256 "d7c87944b1c2ada8378c85b7123f026524166bc8629332beb294c1ce83fc180a" => :high_sierra + sha256 "622dd50bf0714edabbae2f696bd41ff0af8d9a67cc965363452aaba46567fb83" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/beast.rb b/Formula/beast.rb index d66f2d6b6ad2b..73415e596d3f9 100644 --- a/Formula/beast.rb +++ b/Formula/beast.rb @@ -11,6 +11,7 @@ class Beast < Formula sha256 "5f4b312595410d83df9099dc15657241dc4cb758d58a5836565127275a6fb912" => :catalina sha256 "d441fd3733557c8de6c227663566e9ac668562a7ecf113504a8c604490752763" => :mojave sha256 "2c157d2d74ef17b3fcf8f5cf11d62d1b7ba939f0d7d48872d83706cbeb2b2908" => :high_sierra + sha256 "9ce0d5d61df4527eed8d56681179a85a3c3782539d4d7b2a6372ec1f8965a29f" => :x86_64_linux end depends_on "ant" => :build @@ -19,11 +20,13 @@ class Beast < Formula def install ENV["JAVA_HOME"] = Formula["openjdk@11"].opt_prefix + ENV.prepend_path "PATH", Formula["openjdk@11"].opt_bin unless OS.mac? system "ant", "linux" libexec.install Dir["release/Linux/BEASTv*/*"] pkgshare.install_symlink libexec/"examples" bin.install Dir[libexec/"bin/*"] - bin.env_script_all_files libexec/"bin", :JAVA_HOME => ENV["JAVA_HOME"] + bin.env_script_all_files libexec/"bin", :JAVA_HOME => ENV["JAVA_HOME"], :PATH => ENV["PATH"] + inreplace libexec/"bin/beast", "/usr/local/lib:$LD_LIBRARY_PATH", Formula["beagle"].lib unless OS.mac? end test do diff --git a/Formula/bedops.rb b/Formula/bedops.rb index 663343b706ab3..ef9b2e4a1b2a1 100644 --- a/Formula/bedops.rb +++ b/Formula/bedops.rb @@ -9,6 +9,7 @@ class Bedops < Formula sha256 "067fa5b0cf0288e60ec7378b07b622218ff385dfc7cadd19ac6fe92ef087aff3" => :catalina sha256 "a3e404afc30d1f77ebfd5c713933a36fed137ab2086da3d7a07ff08d2cd36fb6" => :mojave sha256 "d30e93e415036d271dd424feebc451de8de2e6ed195f950ff6682623c2969dab" => :high_sierra + sha256 "678a3120631740be6e9e1fc843fd7992737236ca886800b86cbfc6abdcf0291a" => :x86_64_linux end def install diff --git a/Formula/bedtools.rb b/Formula/bedtools.rb index 725c264c06e90..b5835d4281475 100644 --- a/Formula/bedtools.rb +++ b/Formula/bedtools.rb @@ -9,6 +9,7 @@ class Bedtools < Formula sha256 "4cdd660e64c7d78876a2ccf60eec8891f484cdd24e2c40ce36800828dffcce1c" => :catalina sha256 "5c40ac3daf8ba6022cd5229aac50458d80b14920ddd513f2e165b233c9e95e72" => :mojave sha256 "2f534f9efbdd387764924f2a9e3a08b435cab0ff0a0edabd6bafe8fa4123af6a" => :high_sierra + sha256 "65f6f96f78e63ee61fe6789e68ff850953665531a647bc3ededfb3b1da24291c" => :x86_64_linux end depends_on "python@3.8" => :build diff --git a/Formula/befunge93.rb b/Formula/befunge93.rb index 3c843d6a399bf..b69603054af55 100644 --- a/Formula/befunge93.rb +++ b/Formula/befunge93.rb @@ -12,6 +12,7 @@ class Befunge93 < Formula sha256 "f77d79e0bc06317441221cf22696f3be81f75221531f63bcb71d819954e2884b" => :mojave sha256 "3e82d14825ded095e92ebec797f682a65c7ada55ec178e069d0093eb29da8e4a" => :high_sierra sha256 "302f0c69592719782676dc2873a9a9faef3f72b6ec7bb225d60e74ca1cc0f640" => :sierra + sha256 "2b19ed78fa5347491cfbe765a36211d158f31dc708505847609be361060f94e0" => :x86_64_linux end def install diff --git a/Formula/bench.rb b/Formula/bench.rb index 2eac7cad1dcdf..8cf3bd8650a04 100644 --- a/Formula/bench.rb +++ b/Formula/bench.rb @@ -16,15 +16,17 @@ class Bench < Formula end bottle do - cellar :any_skip_relocation sha256 "b1eccbf77a04e4de1a59a0eed5c0f6e2d8b6b191736ee9ad4fdea9a173010651" => :catalina sha256 "493de8888b6fe1745a887cda10a421448a08943496124b1cb49cc02453002638" => :mojave sha256 "cd0e9ae0bc13d3db0330ae839689d9b2d129bc0bf0c1b7165033968a9e6a0f22" => :high_sierra + sha256 "23f3a716580dbbceca9a43b79afced24b66180ae2abecf25ce6c429363f53354" => :x86_64_linux end depends_on "cabal-install" => :build depends_on "ghc@8.8" => :build + uses_from_macos "zlib" + def install system "cabal", "v2-update" system "cabal", "v2-install", *std_cabal_v2_args diff --git a/Formula/benthos.rb b/Formula/benthos.rb index 14a682a954adf..ddc52d77c4baf 100644 --- a/Formula/benthos.rb +++ b/Formula/benthos.rb @@ -9,6 +9,7 @@ class Benthos < Formula sha256 "b003b0dfdd876e4a3dd3dd3aad15dbf339d71f61f90c9849420bd3301a539ede" => :catalina sha256 "265d61d3e33d4eb24b80e6e3700183b222768b6deb561884577a9b210d042547" => :mojave sha256 "bbd8737d7565570f34bd2b059797228c2245ed94d0f4ac25e08126675d7f9d5b" => :high_sierra + sha256 "7b0dbc81efdcd6394ee981c2cf8289e2a56658af3bda9352a049add5e9ada6bc" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/bento4.rb b/Formula/bento4.rb index 40092de20ff4c..5f4f41615d4e2 100644 --- a/Formula/bento4.rb +++ b/Formula/bento4.rb @@ -11,9 +11,11 @@ class Bento4 < Formula sha256 "c2a563a7f037d33921334541e706a3f98ae0556ff08ba3e33992d4c26342de19" => :catalina sha256 "f74dc8941419a6fffe52606dd40e2f612a8b8713ea6249fc6d20b6f3656e1859" => :mojave sha256 "39cf05c54bc595fa014196b8f0fa0847e2d39d25e720bf9c6b581a578a77631b" => :high_sierra + sha256 "4e8f883c55edd2f50eb6886668b04ebbe48d82688be5a50b234db59b964390b6" => :x86_64_linux end - depends_on :xcode => :build + depends_on "cmake" => :build unless OS.mac? + depends_on :xcode => :build if OS.mac? depends_on "python@3.8" conflicts_with "gpac", :because => "both install `mp42ts` binaries" @@ -21,15 +23,26 @@ class Bento4 < Formula :because => "both install `mp4extract` and `mp4info` binaries" def install - cd "Build/Targets/universal-apple-macosx" do - xcodebuild "-target", "All", "-configuration", "Release", "SYMROOT=build" - programs = Dir["build/Release/*"].select do |f| - next if f.end_with? ".dylib" - next if f.end_with? "Test" + if OS.mac? + cd "Build/Targets/universal-apple-macosx" do + xcodebuild "-target", "All", "-configuration", "Release", "SYMROOT=build" + programs = Dir["build/Release/*"].select do |f| + next if f.end_with? ".dylib" + next if f.end_with? "Test" - File.file?(f) && File.executable?(f) + File.file?(f) && File.executable?(f) + end + bin.install programs + end + else + mkdir "cmakebuild" do + system "cmake", "..", *std_cmake_args + system "make" + programs = Dir["./*"].select do |f| + File.file?(f) && File.executable?(f) + end + bin.install programs end - bin.install programs end rm Dir["Source/Python/wrappers/*.bat"] diff --git a/Formula/berglas.rb b/Formula/berglas.rb index bad34294f1bb7..15b93fad48c39 100644 --- a/Formula/berglas.rb +++ b/Formula/berglas.rb @@ -9,6 +9,7 @@ class Berglas < Formula sha256 "d895f86692ef19159a769e2c30742f694ffbd54dbe272f58a9c755a097bbb3a8" => :catalina sha256 "56c43d970f6af85431a1a40b6c249de56c2e22f74c385919118351de749a4a7a" => :mojave sha256 "cde26510e8ea539500c5b76a3b7130a4f29d03c1776eb36e4e1043f065f52dbb" => :high_sierra + sha256 "acac871c5f7986bd9fb685cab2d58bf31073bde6f4e677457c858e1ddbddde14" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/berkeley-db.rb b/Formula/berkeley-db.rb index cb109b211795a..6381ac64bc390 100644 --- a/Formula/berkeley-db.rb +++ b/Formula/berkeley-db.rb @@ -13,6 +13,7 @@ class BerkeleyDb < Formula sha256 "eb5d0a59cec0fab48a0539f96195b1890599603577ca1792f831085418b19707" => :mojave sha256 "fa53aeeca3bef551d9f604b5eafb6b94bf1f14b95530a8d16e243fb7c2ad790e" => :high_sierra sha256 "1b3c06f6d3b1f45180068cb7127508072ed661e981e922dd273d6faef0030bc1" => :sierra + sha256 "a61c738d8e2597fe1e662c1eda22005d1c846b2dee3516c89506c16d09fd0012" => :x86_64_linux end depends_on "openssl@1.1" @@ -21,6 +22,13 @@ def install # BerkeleyDB dislikes parallel builds ENV.deparallelize + # Fix this error for ARM64: + # checking build system type... .../sqlite/config.guess: unable to guess system type + if !OS.mac? && Hardware::CPU.arm? + cp "dist/config.guess", "lang/sql/sqlite/config.guess" + cp "dist/config.sub", "lang/sql/sqlite/config.sub" + end + # --enable-compat185 is necessary because our build shadows # the system berkeley db 1.x args = %W[ diff --git a/Formula/berkeley-db@4.rb b/Formula/berkeley-db@4.rb index 1ee0bb2684702..a252ad17311eb 100644 --- a/Formula/berkeley-db@4.rb +++ b/Formula/berkeley-db@4.rb @@ -11,6 +11,7 @@ class BerkeleyDbAT4 < Formula sha256 "cb0243107a7db2e935f10533d1e9b34f12681861125e208463b240572b86507d" => :mojave sha256 "03f1fc49446d69741f764d7e7388a6006fc5cdb2a0a710b1389b5b662b25e9b7" => :high_sierra sha256 "93b2d7980cba62914bcce0a631a8f28212a17e2cfdce1f41db3d47ec3da37fde" => :sierra + sha256 "c03b0cab9af5ee6e433d3133a9bb9b4e51236e7575b60f301c6de4f4b3455c49" => :x86_64_linux end keg_only :versioned_formula diff --git a/Formula/bettercap.rb b/Formula/bettercap.rb index 1224aea1e8e86..716ce23fbfb2d 100644 --- a/Formula/bettercap.rb +++ b/Formula/bettercap.rb @@ -10,16 +10,22 @@ class Bettercap < Formula sha256 "93ceb9310c486462aa1d940fabfc290e059a5cfc2b80b711e2d6e13b5ad5dc82" => :catalina sha256 "88f0cb583f1c9f4975c76b31ef2c500feb3a7fc194a2c873847dc35ba4a58da0" => :mojave sha256 "a87e2e19f4a7e4a0f1393baa44a908cffbbc4114f13657e4e2a937e420d78aee" => :high_sierra + sha256 "339f8bdc43776e0897147d9fe096899d37324cefa73a731fe5a9bdd177bc3b38" => :x86_64_linux end depends_on "dep" => :build depends_on "go" => :build depends_on "pkg-config" => :build depends_on "libusb" + depends_on "libnetfilter-queue" unless OS.mac? uses_from_macos "libpcap" def install + unless OS.mac? + ENV.prepend_path "PKG_CONFIG_PATH", Formula["libpcap"].opt_lib/"pkgconfig" + ENV.prepend_path "PKG_CONFIG_PATH", Formula["libnetfilter-queue"].opt_lib/"pkgconfig" + end system "make", "build" bin.install "bettercap" end diff --git a/Formula/bgpq3.rb b/Formula/bgpq3.rb index eee0986d64781..09db926cff087 100644 --- a/Formula/bgpq3.rb +++ b/Formula/bgpq3.rb @@ -11,6 +11,7 @@ class Bgpq3 < Formula sha256 "a16c482aa8e1a821d6747b2871174109ccbcf407e5799794f6307303fcffafcb" => :mojave sha256 "2bf730bec0bca51bd9a3db7a3cd5e4bf36199717a8190db270a5f4751bb1a5e1" => :high_sierra sha256 "052fb1ae9a1546b13f865b25f4ff5879f4a7c77350d14720442fc6cd898d833d" => :sierra + sha256 "6a81728f0f9249808a321ec0c7274e98d7589462d97170bef94877cf77c1153b" => :x86_64_linux end # Makefile: upstream has been informed of the patch through email (multiple diff --git a/Formula/bib-tool.rb b/Formula/bib-tool.rb index bf2ba37f3950c..1b453b43945db 100644 --- a/Formula/bib-tool.rb +++ b/Formula/bib-tool.rb @@ -9,6 +9,7 @@ class BibTool < Formula sha256 "26f2121d720fa6ffc20547b0bfc6754930f6b8660b51f634c686279dae7e73ce" => :catalina sha256 "d75a1a60204b002cc06acc025cfdc74db76a563b9bb508876d0e45d771f61dc8" => :mojave sha256 "0d92e3fead68380fc84cbf5517d2ed2eecdfcbfc1fc14c6343f51ee60d43f948" => :high_sierra + sha256 "2d08088ea14ff23b7caf8124dc1f95923939331c35e54ab980cadc8742326b5b" => :x86_64_linux end def install diff --git a/Formula/bibclean.rb b/Formula/bibclean.rb index d3e40d9716f8b..0a15cb5bf0024 100644 --- a/Formula/bibclean.rb +++ b/Formula/bibclean.rb @@ -9,6 +9,7 @@ class Bibclean < Formula sha256 "15dbbabace79aafd93546976d8a899a393c6489d7951ce2bd2bb148a45f262a3" => :catalina sha256 "82a7919c9d5054012b54d53eacf5a9c0785105071c4c65c83bc2ff428642b3e5" => :mojave sha256 "9a2beadc688b6b12a22359890a6a85f20f3c79af561b5d4268e86069b806f585" => :high_sierra + sha256 "ae4136132d9dab8d9728409fa6423969d405eacea6dbfd43d95945cf5a0b7802" => :x86_64_linux end def install diff --git a/Formula/bibtex2html.rb b/Formula/bibtex2html.rb index a8fb2b8ba7988..d4ec5a44e9dfd 100644 --- a/Formula/bibtex2html.rb +++ b/Formula/bibtex2html.rb @@ -10,6 +10,7 @@ class Bibtex2html < Formula sha256 "e9c4f95aaae6ddb40473a8c4349dbd9455c58e71ea4f580c8aa268292578464d" => :catalina sha256 "1a56c6ff9929a75570f231a4fd8b1a4e367d82a8a632c4a45f126b1845ff8ff3" => :mojave sha256 "e2b32aea9dcfb51cff11b8014425975198b73b3a74f48c2f7103e01ef2ec7a9b" => :high_sierra + sha256 "f6ff3569aee2b2cfe3d32c6bf303c412ac5462e8024be9fc23c8b219b1c440fc" => :x86_64_linux end depends_on "ocaml" => :build diff --git a/Formula/bibtexconv.rb b/Formula/bibtexconv.rb index 6d1b6992ccd35..64a33aa22f8e0 100644 --- a/Formula/bibtexconv.rb +++ b/Formula/bibtexconv.rb @@ -10,6 +10,7 @@ class Bibtexconv < Formula sha256 "bd1a809b90e1092407e7a81fe30aca8f8df52791fa701afc7b65c4dc74f6f5d0" => :catalina sha256 "b8f6412efed90b19aff5945ab58113ae7849f338527a801e48f531a31e289bc5" => :mojave sha256 "294bfcaa004f25eee6806d01d80dce51a3e88e172034b2696247aa2c8776196b" => :high_sierra + sha256 "c49d08b9d11cfeea9894a64896f6fa39f6656506649aae0aa2ea635ae091a7df" => :x86_64_linux end depends_on "cmake" => :build @@ -20,8 +21,9 @@ class Bibtexconv < Formula uses_from_macos "curl" def install + dylib = OS.mac? ? "dylib" : "so" system "cmake", *std_cmake_args, - "-DCRYPTO_LIBRARY=#{Formula["openssl@1.1"].opt_lib}/libcrypto.dylib" + "-DCRYPTO_LIBRARY=#{Formula["openssl@1.1"].opt_lib}/libcrypto.#{dylib}" system "make", "install" end diff --git a/Formula/bibutils.rb b/Formula/bibutils.rb index ffb2d88f1e294..01a51e05e2fa8 100644 --- a/Formula/bibutils.rb +++ b/Formula/bibutils.rb @@ -9,6 +9,7 @@ class Bibutils < Formula sha256 "eeb586f94730c9030e089a45e4360c5cb3171c6e41ba738744fe4e5a30e31cb7" => :catalina sha256 "f420f3882e82a0bf4441c804ed065b5272ce1e5d03812392534d91b29814cd13" => :mojave sha256 "4fb4ed2978195afedc30fff98661e2663120bd956633845b7e41967dd7a28621" => :high_sierra + sha256 "22b0ff794d65384df112518452e24c7172b88f936990b83cd65256da704badf5" => :x86_64_linux end def install diff --git a/Formula/bic.rb b/Formula/bic.rb index 6ad77a9e558f2..c2ce051219ee9 100644 --- a/Formula/bic.rb +++ b/Formula/bic.rb @@ -8,6 +8,7 @@ class Bic < Formula sha256 "41d1871d125642f8437b5bb7b74f205b0eee956be0ad46b7677680b76764c0cb" => :catalina sha256 "36575a3c3444985140e94eba8fe8f6711fff5433eb7f17141c4b4ae30e1f2bf7" => :mojave sha256 "23f308f2bfda3b9ee498680e08565997818570d74d1280137ef940f70801b8d9" => :high_sierra + sha256 "77e58c48a6bcb0982874c5a465ee59aeaa79573a61b2bae243afebe5eccfe97c" => :x86_64_linux end head do diff --git a/Formula/bigloo.rb b/Formula/bigloo.rb index 8c63248e0adef..e178da76025c4 100644 --- a/Formula/bigloo.rb +++ b/Formula/bigloo.rb @@ -28,7 +28,6 @@ def install --mandir=#{man1} --infodir=#{info} --customgc=yes - --os-macosx --native=yes --disable-alsa --disable-mpg123 diff --git a/Formula/bind.rb b/Formula/bind.rb index 31e2216222d72..b4b49e85a8554 100644 --- a/Formula/bind.rb +++ b/Formula/bind.rb @@ -17,6 +17,7 @@ class Bind < Formula sha256 "70241ad6d2f56111afb65d37c9f42af9800985a7d0b4be0f947bb7f345d0399e" => :catalina sha256 "dd5dd34d8bea26779cab3bc19989ec2e697d05f334f7419038c914826a76fb0b" => :mojave sha256 "c26d433c7becc138abf7e029fc3abe20ffcd1ed4184b69ad310c3d079dba5175" => :high_sierra + sha256 "2c3d280896e2d73c9e9c56d4ecad107eef9dc3f2753f4a8f1c01a2ad393196ee" => :x86_64_linux end depends_on "pkg-config" => :build @@ -48,8 +49,9 @@ def install "--with-openssl=#{Formula["openssl@1.1"].opt_prefix}", "--with-libjson=#{Formula["json-c"].opt_prefix}", "--with-python-install-dir=#{vendor_site_packages}", + "--without-lmdb", "--with-python=#{Formula["python@3.8"].opt_bin}/python3", - "--without-lmdb" + *("--disable-linux-caps" unless OS.mac?) system "make" system "make", "install" diff --git a/Formula/bindfs.rb b/Formula/bindfs.rb index b735a76327d8e..78a959cc8600f 100644 --- a/Formula/bindfs.rb +++ b/Formula/bindfs.rb @@ -9,6 +9,7 @@ class Bindfs < Formula sha256 "1b6004bba2060be73c1bb139ce3ebd5edf33fbb542a91672b5e98ac149126775" => :catalina sha256 "eba7a033496208341d5ce0fb59e3871cbb7503b7d2f6c73922bb9764f539b3b2" => :mojave sha256 "b18a684fe8e4bff83e37e1a36eefd66ea24e1a8ebf31bcc2f0c3c5b7e4348402" => :high_sierra + sha256 "6e82b879420f4c661199e010e8d6933c4dd96a9ad86ea7ea100d8fca487c260b" => :x86_64_linux end head do @@ -19,7 +20,11 @@ class Bindfs < Formula end depends_on "pkg-config" => :build - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end def install args = %W[ diff --git a/Formula/bingrep.rb b/Formula/bingrep.rb index 52bea56c60f53..0b1b605da0596 100644 --- a/Formula/bingrep.rb +++ b/Formula/bingrep.rb @@ -9,6 +9,7 @@ class Bingrep < Formula sha256 "38cb293ea71d8d11e422838e378cb67b09334590ed501e45b9a0f6da7d70f3ac" => :catalina sha256 "cef323546a1e6978ca5a67f9f18333819e318bbe136d9ba210c1fbd89f4af82f" => :mojave sha256 "d63ae62eff912723629b9d991fb77771f700ee306cf3b3cc40a934e3f2f13dd1" => :high_sierra + sha256 "82493ec0332b42ccaa1cf0a4415517a986cb4edcdad43e9edfd04da557c7684f" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/binutils.rb b/Formula/binutils.rb index b757d4ec417d4..34d732597dc9f 100644 --- a/Formula/binutils.rb +++ b/Formula/binutils.rb @@ -5,10 +5,14 @@ class Binutils < Formula mirror "https://ftpmirror.gnu.org/binutils/binutils-2.34.tar.xz" sha256 "f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952" + # binutils is portable. bottle do + cellar :any + rebuild 1 sha256 "1e21593a927df65e405f9d3bdc8f86fe83b1236c5c945641a2de775c99327953" => :catalina sha256 "142e380448ac77bc0f7974ff9b9ddae6a90c4ef5f182cac0c2b029baa8460173" => :mojave sha256 "87bda0c909a5bd2043d35b073f2268cac7aed074a89d903973e4909d68dfdf46" => :high_sierra + sha256 "c2500eb69208e13f94dff91ee34f982db40b26f14c8a84a52eb513b8d35f5f26" => :x86_64_linux end keg_only :shadowed_by_macos, "Apple's CLT provides the same tools" @@ -18,6 +22,7 @@ class Binutils < Formula def install system "./configure", "--disable-debug", "--disable-dependency-tracking", + ("--with-sysroot=/" unless OS.mac?), "--enable-deterministic-archives", "--prefix=#{prefix}", "--infodir=#{info}", @@ -26,12 +31,21 @@ def install "--enable-interwork", "--enable-multilib", "--enable-64-bit-bfd", + ("--enable-gold" unless OS.mac?), + ("--enable-plugins" unless OS.mac?), "--enable-targets=all" system "make" system "make", "install" - Dir["#{bin}/*"].each do |f| - bin.install_symlink f => "g" + File.basename(f) + bin.install_symlink "ld.gold" => "gold" unless OS.mac? + + if OS.mac? + Dir["#{bin}/*"].each do |f| + bin.install_symlink f => "g" + File.basename(f) + end end + + # Reduce the size of the bottle. + system "strip", *Dir[bin/"*", lib/"*.a"] unless OS.mac? end test do diff --git a/Formula/binwalk.rb b/Formula/binwalk.rb index 4b26a50d37476..eef00fbdf56ef 100644 --- a/Formula/binwalk.rb +++ b/Formula/binwalk.rb @@ -5,7 +5,7 @@ class Binwalk < Formula homepage "https://github.com/ReFirmLabs/binwalk" url "https://github.com/ReFirmLabs/binwalk/archive/v2.2.0.tar.gz" sha256 "f5495f0e4c5575023d593f7c087c367675df6aeb7f4d9a2966e49763924daa27" - revision 2 + revision OS.mac? ? 2 : 3 head "https://github.com/ReFirmLabs/binwalk.git" bottle do @@ -13,6 +13,7 @@ class Binwalk < Formula sha256 "d412322a98c5207c19bdf2d0b7d6abcb6133f875fc48d6227c4c69213e761852" => :catalina sha256 "0edd480cef965ccd9d112aa0f2699e53420aab5a9c9d7397856d6dc0c476cae8" => :mojave sha256 "8ce1ff5841406677da86e5b0976dd7230ae814616a3b368eb8020c467b2e4235" => :high_sierra + sha256 "1bd05bfe04bb9b994df2e458b474c491021504989d31c71ab697da23765c3a0a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/bioawk.rb b/Formula/bioawk.rb index fdeded37414ff..d7821f1984926 100644 --- a/Formula/bioawk.rb +++ b/Formula/bioawk.rb @@ -11,6 +11,7 @@ class Bioawk < Formula sha256 "023f5cafaa31404e68b8fc6bcfbeee27e63eb5fbcab897d2f406fceda90ec9ff" => :high_sierra sha256 "154d44dd9ea56db8170127711e991950d487e379ae12df76332e4b7512f79fe8" => :sierra sha256 "df0810bc087f924cdddcdb73f00faf9772de9475e0e698c7af8a7d036b3a4c91" => :el_capitan + sha256 "a07d49e22f1a40df39ff561f21e6c534241c7ff77815a65c48cde505df132960" => :x86_64_linux end uses_from_macos "bison" => :build diff --git a/Formula/biogeme.rb b/Formula/biogeme.rb new file mode 100644 index 0000000000000..7b5ec26f96358 --- /dev/null +++ b/Formula/biogeme.rb @@ -0,0 +1,37 @@ +class Biogeme < Formula + desc "Maximum likelihood estimation of choice models" + homepage "https://biogeme.epfl.ch/" + url "https://biogeme.epfl.ch/distrib/biogeme-2.6a.tar.gz" + sha256 "f6de0ea12f83ed183f31a41b9a56d1ec7226d2305549fb89ea7b1de8273ede49" + revision 5 + + bottle do + cellar :any + sha256 "78b929e88aa59e057b7c4cc65a17ae1f9d3a88f5a521ea3709d0c8c82f9aa097" => :catalina + sha256 "669b97da46ec4e508169b764b6c801682f9282702ec6f17d32f9e4b7426cf8dc" => :mojave + sha256 "b90e3f0d203a5ad33d2ad1f70e12503a93784bb4a97d78b284c0d4c746666ea5" => :high_sierra + sha256 "cad38740685b800f07bece9dd13238b900427155697582fc689bd3eee42e8c38" => :sierra + sha256 "94f0cd9214a8a0ace8581f120d3bee4405397457ac980e2ce8247e17910a105e" => :x86_64_linux + end + + depends_on "gtkmm3" + depends_on "python" + + def install + system "./configure", "--prefix=#{prefix}" + system "make", "install" + end + + test do + (testpath/"minimal.py").write <<~EOS + from biogeme import * + rowIterator('obsIter') + BIOGEME_OBJECT.SIMULATE = Enumerate({'Test':1},'obsIter') + EOS + (testpath/"minimal.dat").write <<~EOS + TEST + 1 + EOS + system bin/"pythonbiogeme", "minimal", "minimal.dat" + end +end diff --git a/Formula/biosig.rb b/Formula/biosig.rb index f8b3c9a42d1bc..1e130487492cb 100644 --- a/Formula/biosig.rb +++ b/Formula/biosig.rb @@ -9,6 +9,7 @@ class Biosig < Formula sha256 "7faee142a4545ee3bcfcd393b9c748b3cfa788a35a410e0299e562a58a026426" => :catalina sha256 "4560a057f36948b31ceb176ca1edc978e8b1b5ac5f5a5a9b4ccafe9c32b7c787" => :mojave sha256 "95e1c70220b78441a73db60830eb00dc380810e6b0aab5209cc00c51eaa36612" => :high_sierra + sha256 "69eab014bbeb96ebbbde6c30a4897808bc23009bdae5bb40c09f021a6e289521" => :x86_64_linux end depends_on "gawk" => :build diff --git a/Formula/bison.rb b/Formula/bison.rb index e8bbbf9fd1de5..c71361c4803e6 100644 --- a/Formula/bison.rb +++ b/Formula/bison.rb @@ -11,6 +11,7 @@ class Bison < Formula sha256 "fa08dd0a1dba7bfa9ed18da2ffb499ebcc937e6cbc5a1f6acef3d21100809488" => :catalina sha256 "63bf0bf94d33d9c54626574815748ad614ebe8e9bdcf157a4053c98fcecde837" => :mojave sha256 "6d3c4120535bafcb81ef4539d6cf7422a03a158192bf2c2555e52850673e8047" => :high_sierra + sha256 "c3c25a07122e718e9a2255039cebe99aaaba21e1e07e53205b887f321f724f6b" => :x86_64_linux end keg_only :provided_by_macos @@ -18,6 +19,8 @@ class Bison < Formula uses_from_macos "m4" def install + # https://www.mail-archive.com/bug-guix@gnu.org/msg13512.html + ENV.deparallelize unless OS.mac? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" diff --git a/Formula/bit.rb b/Formula/bit.rb index 92d419fb6c12f..fc401e933c35e 100644 --- a/Formula/bit.rb +++ b/Formula/bit.rb @@ -8,6 +8,7 @@ class Bit < Formula head "https://github.com/teambit/bit.git" bottle do + cellar :any_skip_relocation sha256 "18a71387be68c7f440813843978c12367e2a1f3a0b1bafaefee2c586ab335861" => :catalina sha256 "e69afe4485e14108e15f2c521307f418e3b7b35e4d497427e8798f687afd9751" => :mojave sha256 "263a77fc0d1c0d54a845a30cd4f82dcddea65a6044256d0c42eeaaf1a72ce4bc" => :high_sierra diff --git a/Formula/bitcoin.rb b/Formula/bitcoin.rb index 9e49923c57a9b..1329bd621b0a5 100644 --- a/Formula/bitcoin.rb +++ b/Formula/bitcoin.rb @@ -21,6 +21,7 @@ class Bitcoin < Formula depends_on "libevent" depends_on "miniupnpc" depends_on "zeromq" + depends_on "bsdmainutils" => :build unless OS.mac? # `hexdump` from bsdmainutils required to compile tests def install ENV.delete("SDKROOT") if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0" diff --git a/Formula/bitlbee.rb b/Formula/bitlbee.rb index 8a1d8e63117a4..c63eeef86f2e4 100644 --- a/Formula/bitlbee.rb +++ b/Formula/bitlbee.rb @@ -12,6 +12,7 @@ class Bitlbee < Formula sha256 "52da03d26df7e96ae71125343859b754e24146c8ad5e6c58bc33eb634862ef40" => :catalina sha256 "d6f39cdbf633e779a47d625e8c62393d75fe1656d4d1d8cbe342940fb65cba53" => :mojave sha256 "cefcf70546bf4746913b64ee8c282deb9ca15ffb61a0e564f3f1dc8da09fb447" => :high_sierra + sha256 "0540fc381c40c0f78b8edf53a919c877435b72254f4d0b3c509a4170a41fbf37" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/bitrise.rb b/Formula/bitrise.rb index d0ac0ae2897f3..eb6be8483aed7 100644 --- a/Formula/bitrise.rb +++ b/Formula/bitrise.rb @@ -9,9 +9,11 @@ class Bitrise < Formula sha256 "be12010efef572c81e44f103fed0667d5e0919f04693360730cc3a23c783b9ac" => :catalina sha256 "2376e5b982ba2714a22d76d8605aebd5e5e668e66d79e79266c2e74ec7958161" => :mojave sha256 "120bd8f30c634d9667552feb74a5b1263b70fd06299537406a9f2dcde5ec13ac" => :high_sierra + sha256 "ff5d537cc568bab42a3e3061c76852826eab32dc420803be8c947cb501110283" => :x86_64_linux end depends_on "go" => :build + depends_on "rsync" => :test def install ENV["GOPATH"] = buildpath diff --git a/Formula/bitwarden-cli.rb b/Formula/bitwarden-cli.rb index d1a3e8989c96b..082c41da747bf 100644 --- a/Formula/bitwarden-cli.rb +++ b/Formula/bitwarden-cli.rb @@ -11,6 +11,7 @@ class BitwardenCli < Formula sha256 "51e8383bae9b679aab1fa6074bd937c5809217ef54ad08912cc6f1e35a6624c6" => :catalina sha256 "3bec10843b5e7ec281406da08716010e506b2d1735eb92c2e8bf9e08f7f7b31f" => :mojave sha256 "9de5e68d590ac2a541940afa618b03b1c1c00f207d7b41f3c3da64d127f3674b" => :high_sierra + sha256 "f0f5770816eb6e4e046b18e5fbfb59d8491288cc8707505e6b578836f9524181" => :x86_64_linux end depends_on "node" diff --git a/Formula/bitwise.rb b/Formula/bitwise.rb index d4331979ff17b..62adb61327232 100644 --- a/Formula/bitwise.rb +++ b/Formula/bitwise.rb @@ -9,6 +9,7 @@ class Bitwise < Formula sha256 "d7d90a1402b7b87e1989b2504e6c55ea5bea27282f4bf909b6248aac2d5263cd" => :catalina sha256 "95674ac94d09b5502765956cc94b5f1a9687f22f145e2757bd708f7f7613f913" => :mojave sha256 "e5e76e2ec3f762a6c79b52552fb5513bc891e55831aa75806f61b75834369d6d" => :high_sierra + sha256 "dd29287d00806ef80327a226de16d1721c442c74b5cd7962fd0c29ed8ba62509" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/black.rb b/Formula/black.rb index c016fffe5c1d4..bd4de8a63a10c 100644 --- a/Formula/black.rb +++ b/Formula/black.rb @@ -5,13 +5,14 @@ class Black < Formula homepage "https://black.readthedocs.io/en/stable/" url "https://files.pythonhosted.org/packages/b0/dc/ecd83b973fb7b82c34d828aad621a6e5865764d52375b8ac1d7a45e23c8d/black-19.10b0.tar.gz" sha256 "c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539" - revision 3 + revision OS.mac? ? 3 : 4 bottle do cellar :any_skip_relocation sha256 "868f4480634c6571a0d958fee56dce581a51e491f91b759667b9425033a496dd" => :catalina sha256 "1cb2be65eab785311661e4ad488d4019e15c59ffb5d7495c518118728c72e933" => :mojave sha256 "7ac913822922277b632cbd5b88cac2898a31db3d17745840280e14060fc653b2" => :high_sierra + sha256 "28f02040a602055660c8490ba62b1668f7d8df2fa889629c040171c9cbf10194" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/blahtexml.rb b/Formula/blahtexml.rb index 9fadb8ff444f7..d350b7c2bf855 100644 --- a/Formula/blahtexml.rb +++ b/Formula/blahtexml.rb @@ -12,6 +12,7 @@ class Blahtexml < Formula sha256 "c2696cdaa1724541f0d07900219247365e30061a471df0b80f6469b3bc2b4a14" => :high_sierra sha256 "bcd628072b5b7d6625e2b2caad1c6f64483807facda1b2eff32795de1b25070f" => :sierra sha256 "b1788b8622b704c67b11295f6bf84ab881298980f8101b5fed6cb7441b4edc82" => :el_capitan + sha256 "5d88f5d4496b22549a57283b33cf3eb95f0a0ec8db5105e6180d48ab59422f01" => :x86_64_linux end depends_on "xerces-c" @@ -30,9 +31,10 @@ class Blahtexml < Formula def install ENV.cxx11 - system "make", "blahtex-mac" + os = OS.mac? ? "mac" : "linux" + system "make", "blahtex-#{os}" bin.install "blahtex" - system "make", "blahtexml-mac" + system "make", "blahtexml-#{os}" bin.install "blahtexml" end diff --git a/Formula/blast.rb b/Formula/blast.rb index 99434ca321b21..e2e9c4b164bde 100644 --- a/Formula/blast.rb +++ b/Formula/blast.rb @@ -9,9 +9,11 @@ class Blast < Formula sha256 "652c133a61840c1a1f69de4f5827bd358434f3d7caa7886c273b3bab034e0721" => :catalina sha256 "b544b1e6e510c0c72b82b581a17eb8704ad53e46e9574d4dfd24bef8f5044148" => :mojave sha256 "9dd8d68f78e3825fc33064bc3b79d6474d56593e7260d39ab5f6408ad2e1e939" => :high_sierra + sha256 "938bc954cc11d2820575a6de50e6da2cdca768630aa445fcd00aabd79985964a" => :x86_64_linux end depends_on "lmdb" + depends_on "cpio" => :build unless OS.mac? uses_from_macos "bzip2" uses_from_macos "zlib" diff --git a/Formula/blazeblogger.rb b/Formula/blazeblogger.rb index 559117cc595e7..5b34cc16bed5f 100644 --- a/Formula/blazeblogger.rb +++ b/Formula/blazeblogger.rb @@ -14,6 +14,7 @@ class Blazeblogger < Formula sha256 "0d6bf439fa6f880cb9457581da66082f49f514f8b0fd4b57ac81180948aaa5e1" => :el_capitan sha256 "bac92237da25ffb0b9b31bd78fea353bf717cfb6f1381fbb0df333f555fbab91" => :yosemite sha256 "d48ad0f2ce8de2cf98f111a491e47136debbd0e585ff20b9978eb00349e454b3" => :mavericks + sha256 "2899ae65143abb4b3408f02950b73824a6d7f1c436efa6a819da9b5c0ec873d1" => :x86_64_linux end def install diff --git a/Formula/blitz.rb b/Formula/blitz.rb index 1f46874e36a01..8c2413b78b398 100644 --- a/Formula/blitz.rb +++ b/Formula/blitz.rb @@ -10,6 +10,7 @@ class Blitz < Formula sha256 "2bfa3e5a52f0f51e9e02c84f10f804093b7080c158b3376f330dd51c0f9e3d23" => :catalina sha256 "a06052c039592fe7b41face9c72d715ba0602456a9df07a40a472d3ceba02c00" => :mojave sha256 "79901f790ea3583942a72ababfba3dc6569169f228b0428c047da52f1f99c02d" => :high_sierra + sha256 "d278a8e077c31a5cf4f75a3fbbc0564ed2a59c814fe81aeb6d94bd13878dd731" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/blitzwave.rb b/Formula/blitzwave.rb index 92c6b2e7cb5f1..1b189ba10e1be 100644 --- a/Formula/blitzwave.rb +++ b/Formula/blitzwave.rb @@ -13,6 +13,7 @@ class Blitzwave < Formula sha256 "be9ba4deb07a468b23f430fe2f0896206b120f70e07f94d48267448c0524d3bc" => :el_capitan sha256 "609c85eec329a8aa988a2b026522642f41b392039936661ce428d13887dfa84d" => :yosemite sha256 "af7d02c7520db927c0d835992719922753e89d26588a00a2a53601a1e5aabd8b" => :mavericks + sha256 "c1e0d672e0b49081bb7c4e96249b304063bd41067e1d5671ece8e8a7c3b711f9" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/bloaty.rb b/Formula/bloaty.rb index b314f1215ad36..cbb75e57c8bae 100644 --- a/Formula/bloaty.rb +++ b/Formula/bloaty.rb @@ -5,10 +5,11 @@ class Bloaty < Formula sha256 "a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f" bottle do - cellar :any + cellar :any_skip_relocation sha256 "5be88b30573e9dfe1beaa3b5d7ee0f6114b23a07ff9a6cc539e3a962a2a45783" => :catalina sha256 "fde9f093c351e8ef57e6b8df5f6b0a2faade0eee0cdddfaf3ebf5927e8fd52c1" => :mojave sha256 "c54b0712732e3943c2ea3ca2e0eb9b7dcfce2a9b4793a353315b7142af8c156d" => :high_sierra + sha256 "c7398d2f992b643cee0e086bed4da308973ce521024bde57bb5bc0b49d579dbe" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/blockhash.rb b/Formula/blockhash.rb index daf5cb8e4fce7..299435735a0d2 100644 --- a/Formula/blockhash.rb +++ b/Formula/blockhash.rb @@ -11,6 +11,7 @@ class Blockhash < Formula sha256 "e5b78f0c14faf009da78d00c1b31700837bd14c42be49d5609cf2f584678006a" => :catalina sha256 "d9580b0bade98b0d083d3838b1b7078894b6d3d56e758628a050345a1ddf526b" => :mojave sha256 "fdba183a92f5cfea8db07f626ccf13993bc59dec11ee2e402b063133da33f2eb" => :high_sierra + sha256 "70ce9fc2106d1212a82e7bffdb856d5db873fb9a355bb32c8dff7100d84b2f99" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/bluepill.rb b/Formula/bluepill.rb index f37f99609d56e..b9677e5ee2943 100644 --- a/Formula/bluepill.rb +++ b/Formula/bluepill.rb @@ -12,7 +12,8 @@ class Bluepill < Formula sha256 "6782b815d7d64190194460589adc6d790ebf4265ceeab8f869ff915a658d0aad" => :mojave end - depends_on :xcode => ["11.2", :build] + depends_on :xcode => ["11.2", :build] if OS.mac? + depends_on :macos def install xcodebuild "-workspace", "Bluepill.xcworkspace", diff --git a/Formula/blueutil.rb b/Formula/blueutil.rb index ca12a2cc4c9ec..99a4e7eaac1a3 100644 --- a/Formula/blueutil.rb +++ b/Formula/blueutil.rb @@ -12,7 +12,7 @@ class Blueutil < Formula sha256 "afceca3182b5a43540b44c2b61bb0d510888f0744e924468ee3208d8ab612a4a" => :high_sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? def install # Set to build with SDK=macosx10.6, but it doesn't actually need 10.6 diff --git a/Formula/bmake.rb b/Formula/bmake.rb index 9e6baf9d2b036..3c7a6d3674dfd 100644 --- a/Formula/bmake.rb +++ b/Formula/bmake.rb @@ -8,6 +8,7 @@ class Bmake < Formula sha256 "886b5ffb2e30376d34055f5be095492bd2785d0db40f6e8614a7e7a5b44959db" => :catalina sha256 "ff919e5a081fc27c0b4ebc93c1a44ec096b1dcf2818faa4fe79e220b5c3ae1d7" => :mojave sha256 "c2dc9c5f51d0114a4402192f43bf3bf634e819c796c98e90d81e4d6ee35ecbe5" => :high_sierra + sha256 "af74aceab75306b244c2715c8d2cecaf012e27a180748504700d6089cc0d40f2" => :x86_64_linux end def install @@ -18,6 +19,7 @@ def install args = ["--prefix=#{prefix}", "-DWITHOUT_PROG_LINK", "--install"] system "sh", "boot-strap", *args + chmod "u+w", man1/"bmake.1" man1.install "bmake.1" end diff --git a/Formula/bnfc.rb b/Formula/bnfc.rb index cb1b6de26fad7..a7913926ec263 100644 --- a/Formula/bnfc.rb +++ b/Formula/bnfc.rb @@ -19,6 +19,8 @@ class Bnfc < Formula depends_on "antlr" => :test depends_on "openjdk" => :test + depends_on "make" => [:build, :test] unless OS.mac? + uses_from_macos "bison" => :test uses_from_macos "flex" => :test diff --git a/Formula/bogofilter.rb b/Formula/bogofilter.rb index 69a764b244f98..19b534b0ee254 100644 --- a/Formula/bogofilter.rb +++ b/Formula/bogofilter.rb @@ -9,6 +9,7 @@ class Bogofilter < Formula sha256 "2f2d4c414683f922e687d054e71619a0455560aac2522484132099fbddcc6a77" => :catalina sha256 "d7df5e0d29f4fcbc9eafc129ddfd993dc785ee3a4bf79b70b0dce9b5f31f7be4" => :mojave sha256 "c7998fa1651590e6aaf27f8fe014a7b0e305a48a02de4cdcb9ba53f1c84bd1e7" => :high_sierra + sha256 "215db90cbfc337c7c96e5bee3f2848b49798f6795ac0f33234ab32e366c67b55" => :x86_64_linux end depends_on "berkeley-db" diff --git a/Formula/bonnie++.rb b/Formula/bonnie++.rb index 84fc2ceca2529..9150f5db7e8d1 100644 --- a/Formula/bonnie++.rb +++ b/Formula/bonnie++.rb @@ -9,6 +9,7 @@ class Bonniexx < Formula sha256 "d6efac6fef771ca5d88fd4f8157e185e120c5e6935f9d940f2c6c3d5c9564ce0" => :catalina sha256 "af6277fc9f23e9665b134aa2790dc30ebdaba386492c1832bf88a1f67280c63c" => :mojave sha256 "50872a4a0cbca4eecb515214f23efe7eb5e421dbbbe406a5e95a7bd62e4f9d34" => :high_sierra + sha256 "7307deac96eeb1fee3e7ded67d2ded07af3e22b08def4d4f481a42b926a3386b" => :x86_64_linux end # Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the @@ -28,6 +29,10 @@ def install end test do - system "#{sbin}/bonnie++", "-s", "0" + if Process.uid.zero? + system "#{sbin}/bonnie++", "-s", "0", "-u", "0:0" + else + system "#{sbin}/bonnie++", "-s", "0" + end end end diff --git a/Formula/bookloupe.rb b/Formula/bookloupe.rb index 4a29bb15a0aed..742507c447c9d 100644 --- a/Formula/bookloupe.rb +++ b/Formula/bookloupe.rb @@ -11,6 +11,7 @@ class Bookloupe < Formula sha256 "f5e7f38cfa342d15025f798e9476a7091d3dbd60a15a6635d9fd784033dd531c" => :mojave sha256 "8cade7bb36828e32d7be412d29404748198079745defd97ed2ec533ff91f5645" => :high_sierra sha256 "564cdae8b088da04903efd886b33ed12e5673a64866679f67b37acdb68bf539c" => :sierra + sha256 "53e3b9cf02016d4e3e81fbd6153e59f3f39c5ef4215a37abc568b903c29693fe" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/boost-bcp.rb b/Formula/boost-bcp.rb index 96df88f3fa142..7e13ed9fc07dd 100644 --- a/Formula/boost-bcp.rb +++ b/Formula/boost-bcp.rb @@ -11,6 +11,7 @@ class BoostBcp < Formula sha256 "206a46348fb75f752b6a7166c4a549888208f62b1d57d4aedc0abacb71e51e3d" => :catalina sha256 "2d4b85c52ab0dceed07984c4c6f9e35c0f7dbcbb73528a5993177c3a94457ebc" => :mojave sha256 "fde3e6baae64ff2297e6babed41147071065c4ac0f37c2ea5dd6530f49865582" => :high_sierra + sha256 "037fb1b7aaea517dd09a720582b619d416d02249c7b67f04b1eeea2f047d04bb" => :x86_64_linux end depends_on "boost-build" => :build diff --git a/Formula/boost-build.rb b/Formula/boost-build.rb index 20bdb84ceb9d7..5f65c80ae6aef 100644 --- a/Formula/boost-build.rb +++ b/Formula/boost-build.rb @@ -11,6 +11,7 @@ class BoostBuild < Formula sha256 "f6bb502b7848e98f4b184c2bf2604cc005e4bad599b1078a35119c2e8a2dccf1" => :catalina sha256 "68b1dea12cdbab911e66842020a3f66690b85612ccf539e337ed71129747ed89" => :mojave sha256 "2422cb690b00b75fa6dd4bfe63e7a775abd7659a537a627aec33115af051907e" => :high_sierra + sha256 "abb19abac7fd041e69c4a97e3722b3c85d6f50f4812ca7741a17b8e82518ddb3" => :x86_64_linux end conflicts_with "b2-tools", :because => "both install `b2` binaries" @@ -35,7 +36,13 @@ def install (testpath/"Jamroot.jam").write("exe hello : hello.cpp ;") system bin/"b2", "release" - out = Dir["bin/darwin-*/release/hello"] + if OS.mac? + release = "darwin-*" + else + version = IO.popen("gcc -dumpversion").read.chomp + release = "gcc-#{version}" + end + out = Dir["bin/#{release}/release/hello"] assert out.length == 1 assert_predicate testpath/out[0], :exist? assert_equal "Hello world", shell_output(out[0]) diff --git a/Formula/boost-mpi.rb b/Formula/boost-mpi.rb index 6a257f7479b77..19da0a5f353b7 100644 --- a/Formula/boost-mpi.rb +++ b/Formula/boost-mpi.rb @@ -7,9 +7,11 @@ class BoostMpi < Formula head "https://github.com/boostorg/boost.git" bottle do + cellar :any_skip_relocation sha256 "85d4a3e20c2b6c3383a6fc6bb2829a08284bd23dfed1ddfe23c95b042ab6a73d" => :catalina sha256 "76a3472fb7d69bd52c36f936d932dc70b800108c8ecedf1c11c132ce094af595" => :mojave sha256 "9f6879e54a786105e9a2d4cc7275a31f22d4aea0f62417b8eed45e7f82d80449" => :high_sierra + sha256 "a8b20fe8b424af73e203c6ad8ff397ad4d865512b705d1cab9392d61c22b11c8" => :x86_64_linux end depends_on "boost" @@ -40,7 +42,11 @@ def install args << "cxxflags=-stdlib=libc++" << "linkflags=-stdlib=libc++" if ENV.compiler == :clang open("user-config.jam", "a") do |file| - file.write "using darwin : : #{ENV.cxx} ;\n" + if OS.mac? + file.write "using darwin : : #{ENV.cxx} ;\n" + else + file.write "using gcc : : #{ENV.cxx} ;\n" + end file.write "using mpi ;\n" end @@ -54,14 +60,16 @@ def install lib.install Dir["install-mpi/lib/*mpi*"] (lib/"cmake").install Dir["install-mpi/lib/cmake/*mpi*"] - # libboost_mpi links to libboost_serialization, which comes from the main boost formula - boost = Formula["boost"] - MachO::Tools.change_install_name("#{lib}/libboost_mpi-mt.dylib", - "libboost_serialization-mt.dylib", - "#{boost.lib}/libboost_serialization-mt.dylib") - MachO::Tools.change_install_name("#{lib}/libboost_mpi.dylib", - "libboost_serialization.dylib", - "#{boost.lib}/libboost_serialization.dylib") + if OS.mac? + # libboost_mpi links to libboost_serialization, which comes from the main boost formula + boost = Formula["boost"] + MachO::Tools.change_install_name("#{lib}/libboost_mpi-mt.dylib", + "libboost_serialization-mt.dylib", + "#{boost.lib}/libboost_serialization-mt.dylib") + MachO::Tools.change_install_name("#{lib}/libboost_mpi.dylib", + "libboost_serialization.dylib", + "#{boost.lib}/libboost_serialization.dylib") + end end test do @@ -93,7 +101,7 @@ def install } EOS boost = Formula["boost"] - system "mpic++", "test.cpp", "-L#{lib}", "-L#{boost.lib}", "-lboost_mpi", "-lboost_serialization", "-o", "test" - system "mpirun", "-np", "2", "./test" + system "mpic++", "test.cpp", "-L#{lib}", "-L#{boost.lib}", "-lboost_mpi-mt", "-lboost_serialization", "-o", "test" + system "mpirun", *("--allow-run-as-root" if ENV["CI"]), "-np", "2", "./test" end end diff --git a/Formula/boost-python.rb b/Formula/boost-python.rb index 13ece68c65970..a0f9e9c02dba1 100644 --- a/Formula/boost-python.rb +++ b/Formula/boost-python.rb @@ -11,6 +11,7 @@ class BoostPython < Formula sha256 "c15c8bf03d5ca454c93782648f700c1149c164bec8334561ef3727eee0f0435a" => :catalina sha256 "12e538b3468eff6e1afe41cbe595a389473ad37972fbc1ea69a5abc37ead890e" => :mojave sha256 "d0ff391db5f8864d6025e654708a84629aba54d59bdf7b366a6eb7cdca808918" => :high_sierra + sha256 "a1216a35ca5e7ef9b116263756d5c8c546cf16f4626284403b94388ec6f05e82" => :x86_64_linux end depends_on "boost" @@ -83,6 +84,7 @@ def caveats system ENV.cxx, "-shared", "hello.cpp", "-L#{lib}", "-lboost_python27", "-o", "hello.so", "-I#{pyprefix}/include/python2.7", + ("-fPIC" unless OS.mac?), *pyincludes, *pylib output = <<~EOS diff --git a/Formula/boost-python3.rb b/Formula/boost-python3.rb index 736e5f58d4c84..4757230c79b5e 100644 --- a/Formula/boost-python3.rb +++ b/Formula/boost-python3.rb @@ -12,6 +12,7 @@ class BoostPython3 < Formula sha256 "dbb68300aafb7dc618ed08e91ba34d07e8d2e80a28988a68ebb9fccba4e0e11e" => :catalina sha256 "3c02bc31d2de7b3df8379ee24f70b9740c9fcd07f0d7ea5fcbf8de59be9edb1e" => :mojave sha256 "ba57a38cc8bd70c95bc62b0c41dea57a931fbf4ee1b3601e4406f8f537129006" => :high_sierra + sha256 "79e100e0c3f158a42557a7b80c4c7b1eb072aefaa3132b2abd08093f1854303d" => :x86_64_linux end depends_on "numpy" => :build @@ -48,11 +49,16 @@ def install inreplace "bootstrap.sh", "using python", "#using python" pyver = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3" - py_prefix = Formula["python@3.8"].opt_frameworks/"Python.framework/Versions/#{pyver}" + py_prefix = if OS.mac? + Formula["python@3.8"].opt_frameworks/"Python.framework/Versions/#{pyver}" + else + Formula["python@3.8"].opt_prefix + end # Force boost to compile with the desired compiler + darwin = OS.mac? ? "using darwin : : #{ENV.cxx} ;" : "" (buildpath/"user-config.jam").write <<~EOS - using darwin : : #{ENV.cxx} ; + #{darwin} using python : #{pyver} : python3 : #{py_prefix}/include/python#{pyver} @@ -92,7 +98,7 @@ def install pylib = shell_output("#{Formula["python@3.8"].opt_bin}/python3-config --ldflags --embed").chomp.split(" ") pyver = Language::Python.major_minor_version(Formula["python@3.8"].opt_bin/"python3").to_s.delete(".") - system ENV.cxx, "-shared", "hello.cpp", "-L#{lib}", "-lboost_python#{pyver}", "-o", + system ENV.cxx, "-shared", *("-fPIC" unless OS.mac?), "hello.cpp", "-L#{lib}", "-lboost_python#{pyver}", "-o", "hello.so", *pyincludes, *pylib output = <<~EOS diff --git a/Formula/boost.rb b/Formula/boost.rb index 8b3c43f228ed3..f395ba3ee7b59 100644 --- a/Formula/boost.rb +++ b/Formula/boost.rb @@ -24,9 +24,10 @@ class Boost < Formula sha256 "2e0d985997503d0f069ca63a7bcd1bc516d81341754de984f1953390d5540b76" => :catalina sha256 "3a89882d5d2bb7ab3bd55f99f07020f8cc880df3e8f01a1996b6288df05bf93f" => :mojave sha256 "9527177a4b362d9090526ab4b6c934a17a39ecbd2fe1349a00f352f41be82a91" => :high_sierra + sha256 "42c1b6f2b749385d6e0ad734c817a4b4fd6e1ebd745173342859b106ae5fa2ce" => :x86_64_linux end - depends_on "icu4c" + depends_on "icu4c" if OS.mac? uses_from_macos "bzip2" uses_from_macos "zlib" @@ -41,7 +42,11 @@ class Boost < Formula def install # Force boost to compile with the desired compiler open("user-config.jam", "a") do |file| - file.write "using darwin : : #{ENV.cxx} ;\n" + if OS.mac? + file.write "using darwin : : #{ENV.cxx} ;\n" + else + file.write "using gcc : : #{ENV.cxx} ;\n" + end end # libdir should be set by --prefix but isn't @@ -49,8 +54,12 @@ def install bootstrap_args = %W[ --prefix=#{prefix} --libdir=#{lib} - --with-icu=#{icu4c_prefix} ] + bootstrap_args << if OS.mac? + "--with-icu=#{icu4c_prefix}" + else + "--without-icu" + end # Handle libraries that will not be built. without_libraries = ["python", "mpi"] @@ -81,6 +90,10 @@ def install args << "cxxflags=-std=c++14" args << "cxxflags=-stdlib=libc++" << "linkflags=-stdlib=libc++" if ENV.compiler == :clang + # Fix error: bzlib.h: No such file or directory + # and /usr/bin/ld: cannot find -lbz2 + args += ["include=#{HOMEBREW_PREFIX}/include", "linkflags=-L#{HOMEBREW_PREFIX}/lib"] unless OS.mac? + system "./bootstrap.sh", *bootstrap_args system "./b2", "headers" system "./b2", *args @@ -119,7 +132,11 @@ def caveats return 0; } EOS - system ENV.cxx, "test.cpp", "-std=c++14", "-stdlib=libc++", "-o", "test" + if OS.mac? + system ENV.cxx, "test.cpp", "-std=c++14", "-stdlib=libc++", "-o", "test" + else + system ENV.cxx, "test.cpp", "-std=c++14", "-o", "test" + end system "./test" end end diff --git a/Formula/boost@1.60.rb b/Formula/boost@1.60.rb index 6b14a2059fc2b..07303fc25389c 100644 --- a/Formula/boost@1.60.rb +++ b/Formula/boost@1.60.rb @@ -12,6 +12,7 @@ class BoostAT160 < Formula sha256 "8ab5b0be67a534c2340b488d27ebc51ccb088c49735949da4c0099359c6ef9f1" => :sierra sha256 "f6ef8ae275a8d0c03969eceb248235dbeafd4316d1c97f6a9b79d8aa4ef71027" => :el_capitan sha256 "489a6420dc137a356ad300cb10a519073adbf99573515601f6bb87ff5a6622b3" => :yosemite + sha256 "d727d8b3d4b78e069d75e87e4bfaaffd79d14ab3c30c444e2a9550202220fd47" => :x86_64_linux end keg_only :versioned_formula @@ -43,7 +44,11 @@ class BoostAT160 < Formula def install # Force boost to compile with the desired compiler open("user-config.jam", "a") do |file| - file.write "using darwin : : #{ENV.cxx} ;\n" + if OS.mac? + file.write "using darwin : : #{ENV.cxx} ;\n" + else + file.write "using gcc : : #{ENV.cxx} ;\n" + end end # libdir should be set by --prefix but isn't @@ -75,6 +80,10 @@ def install link=shared,static ] + # Fix error: bzlib.h: No such file or directory + # and /usr/bin/ld: cannot find -lbz2 + args += ["include=#{HOMEBREW_PREFIX}/include", "linkflags=-L#{HOMEBREW_PREFIX}/lib"] unless OS.mac? + system "./bootstrap.sh", *bootstrap_args system "./b2", "headers" system "./b2", *args diff --git a/Formula/bootloadhid.rb b/Formula/bootloadhid.rb index 558de387a286f..28ff141d724b8 100644 --- a/Formula/bootloadhid.rb +++ b/Formula/bootloadhid.rb @@ -10,6 +10,7 @@ class Bootloadhid < Formula sha256 "aa0bc95a39610d6b5951d064d781d85b898ca2ebf230acbc60aa2f4e1f51e573" => :catalina sha256 "36032498ab37f82f538d6aa037dac2b2f1c90f552ab5403f3e87c184bc47e75b" => :mojave sha256 "59d545d65c052c2a62f171d4b6e92098a2725cb7c44997051e96863e30d26a03" => :high_sierra + sha256 "c8108a1a45c76b9c9f1d366a8ccaeb28bc0fa8c915e7d9ad767176ad92632ba1" => :x86_64_linux end depends_on "libusb-compat" diff --git a/Formula/borgmatic.rb b/Formula/borgmatic.rb index cb4eed51f8d69..61753c98cbd83 100644 --- a/Formula/borgmatic.rb +++ b/Formula/borgmatic.rb @@ -11,6 +11,7 @@ class Borgmatic < Formula sha256 "7719c427e76b7782b88aeb911769f7166868648968da6cc06a10b8f4403957ee" => :catalina sha256 "15926fc11401673dbd3c4be00d85a4d745648a1bdd0a5fb39a75f57c294d44d3" => :mojave sha256 "6e098d4767583834825aa6039bf01f7e1dfb135be8f5a6794c22963c61eb8418" => :high_sierra + sha256 "7846d35e2a78463df3ea370f1e2efe7daa5142bf31e0e91c0f356a882a894b65" => :x86_64_linux end depends_on "libyaml" diff --git a/Formula/boringtun.rb b/Formula/boringtun.rb index 000ceb4f995ae..029933f3d27b1 100644 --- a/Formula/boringtun.rb +++ b/Formula/boringtun.rb @@ -10,6 +10,7 @@ class Boringtun < Formula sha256 "dd119327645c4905c39a4b0e6f65472690d619e127088e62573b5a0c454cbb01" => :catalina sha256 "c871b547c950e928ee065ce5dbe1442a41d65213b840654bb9e6922b7dedae0f" => :mojave sha256 "7e6fc1a3b6458d9df1b0c15ee53d14f0ea04e85494f306034fd8531d2ff4277c" => :high_sierra + sha256 "7d8a39ce6471c7a9e7798349efaffdc70771882984e80976969526768e97d8a4" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/botan.rb b/Formula/botan.rb index 8088d8d22c959..17a8bb37d6f53 100644 --- a/Formula/botan.rb +++ b/Formula/botan.rb @@ -25,7 +25,8 @@ def install args = %W[ --prefix=#{prefix} --docdir=share/doc - --cc=#{ENV.compiler} + --cc=#{OS.mac? ? ENV.compiler : "gcc"} + --os=#{OS.mac? ? "darwin" : "linux"} --os=darwin --with-openssl --with-zlib diff --git a/Formula/bower.rb b/Formula/bower.rb index 002638b09fd5f..a031c0cbc46aa 100644 --- a/Formula/bower.rb +++ b/Formula/bower.rb @@ -13,6 +13,7 @@ class Bower < Formula sha256 "82494967ba46ded634fb761e4fb166ab1d27605ba7514c4248ada0a00b1ce0cd" => :mojave sha256 "077291dbebb25e070a3387fb9e38f3400a35d1551fbf97936643061be4d522b3" => :high_sierra sha256 "2a5689573d8841a0ce8be340aea74f0585c3537340f9d53746fefd21cada43f5" => :sierra + sha256 "d61ba40a138cc28ffedd2906793790bdee44625d4f628335f32705da53fadad6" => :x86_64_linux end depends_on "node" diff --git a/Formula/bowtie2.rb b/Formula/bowtie2.rb index 3e04b6b12ca22..10482d3470f2d 100644 --- a/Formula/bowtie2.rb +++ b/Formula/bowtie2.rb @@ -9,6 +9,7 @@ class Bowtie2 < Formula sha256 "fd107ab602165eac36dc748124cc6688f8eccf63ff9a64ebcf82fa4db45b5788" => :catalina sha256 "ca70730942c77835fc3ee267dd6c284d51351af0f59db282876ca9ada2ce4672" => :mojave sha256 "61597b46c1e6bd55d74c89e107342c4bdb5014d3a7ea37628d544b6f429bef9c" => :high_sierra + sha256 "9fc18ff25544ba4e4d7c88174680ea46e74a5a7421f444a3d510b2906fbb4e9d" => :x86_64_linux end depends_on "tbb" diff --git a/Formula/bpm-tools.rb b/Formula/bpm-tools.rb index 1d94541ed22f5..7f02b6b65dd7f 100644 --- a/Formula/bpm-tools.rb +++ b/Formula/bpm-tools.rb @@ -12,6 +12,7 @@ class BpmTools < Formula sha256 "56e3a889338b82d5b477c1564506e23549d9651b08260d9c9a38b5e6bd1555ab" => :mojave sha256 "422342ce8dd8a50853e8289ccc936747f4a77a20803850e6481498cf8c4a12c5" => :high_sierra sha256 "f1219d522f61e89606f3e607a636e406faf5f954846b48965e37cc25dbb29b87" => :sierra + sha256 "20c8a421d7c78aa0c0eec565f1a5584218910bd55c366ad06c865198b8a0a315" => :x86_64_linux end def install diff --git a/Formula/braid.rb b/Formula/braid.rb index 464a79f65dda9..1cad2300fde79 100644 --- a/Formula/braid.rb +++ b/Formula/braid.rb @@ -13,7 +13,7 @@ class Braid < Formula sha256 "dfc5dbab04d6fd62ac13cbc8ba2dcd6ebe87c3fcc1d1645fbf844dbcfb651cea" => :sierra end - depends_on "ruby" if MacOS.version <= :sierra + depends_on "ruby" if !OS.mac? || MacOS.version <= :sierra resource "arrayfields" do url "https://rubygems.org/gems/arrayfields-4.9.2.gem" diff --git a/Formula/breezy.rb b/Formula/breezy.rb index 29dfc8fc50e63..45efbb29280f6 100644 --- a/Formula/breezy.rb +++ b/Formula/breezy.rb @@ -12,6 +12,7 @@ class Breezy < Formula sha256 "62d9eebeddd2d53cc2fd55a8279ef68569432e9efafd808c80b32960221d4591" => :catalina sha256 "351b1dd293f3be714605174c0f1cd4d2baade3679a6f57b00c97b4f085d2291d" => :mojave sha256 "3e8d6bc11b32867e0243b9459981358cdf3628314e89e3927b3cfb9fb1f767f8" => :high_sierra + sha256 "986525fd5e0900b79a8d60b084fa80cec180d76fa09d7bf95ad4293257e1a4d5" => :x86_64_linux end depends_on "cython" => :build diff --git a/Formula/brightness.rb b/Formula/brightness.rb index 9ea48f89f3fe9..00ef47f4e771f 100644 --- a/Formula/brightness.rb +++ b/Formula/brightness.rb @@ -15,6 +15,8 @@ class Brightness < Formula sha256 "222e314519f00aa2ad858c718f0dbed624f486f307828ed93a85d1df4e08a8f8" => :mavericks end + depends_on :macos + def install system "make" system "make", "prefix=#{prefix}", "install" diff --git a/Formula/brogue.rb b/Formula/brogue.rb index 2508cda2e4a39..5da5d5843beeb 100644 --- a/Formula/brogue.rb +++ b/Formula/brogue.rb @@ -13,6 +13,7 @@ class Brogue < Formula sha256 "62d88540558c2f014403686898cf68d9a44c62e0095e285e77958b66e5c1ff3a" => :mojave sha256 "864ae48cf80e2f1f3dc2a31a2ea4811177906eda30b11d12d5e3018ca4f1f3b8" => :high_sierra sha256 "b5f6a25670f2eeb737bcde972b78801892971e2af4e3f7df1bbaa237eb4db50f" => :sierra + sha256 "9e01e39ea1e103323f0a090d5a82aae9fe100e85efb8d22cacc9d1f8b652cf37" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/broot.rb b/Formula/broot.rb index bae5617a6e651..ca54ee2c4b9f4 100644 --- a/Formula/broot.rb +++ b/Formula/broot.rb @@ -10,6 +10,7 @@ class Broot < Formula sha256 "77631c9cd67cb3d3b46ec795f26a70b6c81375ba3659e85f90f67588a3e570e4" => :catalina sha256 "3b679acce747c0dde24f1496ae8c303eccea3f06f3da7de9beb7c8a28a8eb014" => :mojave sha256 "d1646aa8177e130c8c0cbb1d651b9e6288f1fa1b7ac0c634a3871e038c4e89c4" => :high_sierra + sha256 "d4604534217349d123afa6c5f78e1c7394c7b6c51a5bac12859e0b811af4e6a5" => :x86_64_linux end depends_on "rust" => :build @@ -23,6 +24,8 @@ def install test do assert_match "A tree explorer and a customizable launcher", shell_output("#{bin}/broot --help 2>&1") + return if !OS.mac? && ENV["CI"] + require "pty" require "io/console" PTY.spawn(bin/"broot", "--cmd", ":pt", "--no-style", "--out", testpath/"output.txt", :err => :out) do |r, w, pid| diff --git a/Formula/brotli.rb b/Formula/brotli.rb index 424fdc4ed4505..f11100959f5ec 100644 --- a/Formula/brotli.rb +++ b/Formula/brotli.rb @@ -11,6 +11,7 @@ class Brotli < Formula sha256 "d2d4f821f8d9c52de15a4d3b5ddeab760ad9ae71105f1c859b7811adff9af9da" => :mojave sha256 "700e223c43dff6781343568d3b0838c3ae66381307293c40312c1941b74fb9c6" => :high_sierra sha256 "5f38b687e2e1bc18aeecc6598723bcbf0d6c89385e4b227678bc8d97e60890be" => :sierra + sha256 "f409e0f79486fc1ca83ab95c923de3537aedbdf3735843bbc5a97b7258173f98" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/browser.rb b/Formula/browser.rb index e315271b88644..33f73829aa404 100644 --- a/Formula/browser.rb +++ b/Formula/browser.rb @@ -9,6 +9,7 @@ class Browser < Formula bottle :unneeded def install + inreplace "browser", 'exec "open', 'exec "xdg-open' unless OS.mac? bin.install "browser" end diff --git a/Formula/bsdconv.rb b/Formula/bsdconv.rb index a700acf4706d9..1e48787af9eb4 100644 --- a/Formula/bsdconv.rb +++ b/Formula/bsdconv.rb @@ -12,6 +12,7 @@ class Bsdconv < Formula sha256 "9afd5dd285b98bf656bbd0e29fa3594128a312e525e079e4348b1a706e16b16a" => :sierra sha256 "565a934e96be6ef7726d1c03dbd6eec63ac5ad82678192b544cfe2bff706b1b7" => :el_capitan sha256 "ccb11937d94df29b9434925b9416291f9d927c2e4669fb39cad96c47912662e5" => :yosemite + sha256 "64f6a3c295d2ef87edf8342ff0022c3c66f34fc1164c09bfd60f4234b1668fd0" => :x86_64_linux end def install diff --git a/Formula/bsdmainutils.rb b/Formula/bsdmainutils.rb new file mode 100644 index 0000000000000..c85f7f3332c10 --- /dev/null +++ b/Formula/bsdmainutils.rb @@ -0,0 +1,32 @@ +class Bsdmainutils < Formula + desc "Collection of utilities from FreeBSD" + homepage "https://packages.debian.org/sid/bsdmainutils" + url "http://ftp.debian.org/debian/pool/main/b/bsdmainutils/bsdmainutils_11.1.2.tar.gz" + sha256 "101c0dede5f599921533da08a46b53a60936445e54aa5df1b31608f1407fee60" + + bottle do + cellar :any_skip_relocation + sha256 "1d97c44ab6e2decc460d0950e77a3ff5ea6edff38a55aa4b8a5d8182d997461f" => :x86_64_linux + end + + depends_on :linux + unless OS.mac? + depends_on "ncurses" + depends_on "libbsd" + end + + def install + File.open("debian/patches/series") do |file| + file.each { |patch| system "patch -p1 :el_capitan sha256 "fd15cb46a9499bcd1182e8fe4a6ae1de9fb77ced85186601ef6c6579a22d9c51" => :yosemite sha256 "7d0590952682b7baf619122a2942dacbf7ed455263c49b0314a85be7d51b1dc1" => :mavericks + sha256 "0af32dda6454f7bed3a7c476ac500f8826dc9ab48b56604205245f1ea491ace6" => :x86_64_linux end # bug report: diff --git a/Formula/bsponmpi.rb b/Formula/bsponmpi.rb index d2783b2f1e914..01e907aae3c5e 100644 --- a/Formula/bsponmpi.rb +++ b/Formula/bsponmpi.rb @@ -11,6 +11,7 @@ class Bsponmpi < Formula sha256 "b80c1f5b34b4530ae8cbf402418693e93bd400aa4fb14b998053a3c07024dd35" => :high_sierra sha256 "caf59320e2eb005dc2de2daa363d15464e3c83519875503e3a498ab8963bb3aa" => :sierra sha256 "10a864ad11ea1145898ae9bcd8897f107c034818e66faf3632d916d51a13a191" => :el_capitan + sha256 "f0fdab74c81db0e65d122e33eb8d325d369ee060a9f395236a8ebd116818def1" => :x86_64_linux end depends_on "scons" => :build diff --git a/Formula/btparse.rb b/Formula/btparse.rb index 8fff14197fa50..a84c6887de8eb 100644 --- a/Formula/btparse.rb +++ b/Formula/btparse.rb @@ -10,6 +10,7 @@ class Btparse < Formula sha256 "d69b814282b1205eb311f2b8f1f2d0077e2adeef72c2a010084eec34ffef7b71" => :mojave sha256 "92fe826bfbaed8583343dbae8d2cf51d6161658e8ecd44a4bf7a308ab1f06d61" => :high_sierra sha256 "b31041f88e5253fd880d38190b4828f8c9cee34f141352d5c3b70b33e18d824f" => :sierra + sha256 "6771f62ade564f4abdb912af9b7c0d307a5701fc52516167f181e8656215d0e3" => :x86_64_linux end def install diff --git a/Formula/btpd.rb b/Formula/btpd.rb index e499a7e9e5997..4ce7b71d7965e 100644 --- a/Formula/btpd.rb +++ b/Formula/btpd.rb @@ -11,6 +11,7 @@ class Btpd < Formula sha256 "0b479e7b812055a0ebbbae40c63624258044d74cb11a2d698392792a5b543e4d" => :mojave sha256 "35042eba57182babbaff9f4a2eb1cbe891ebd82d2427a14926fd3617475da363" => :high_sierra sha256 "6951afbf4af1e9d0df95f5d9260ef04eeb7e558cd2d58c3a429a99ad93c2dddc" => :sierra + sha256 "95efe8dcf2dd43bf343fbed145bfdf71fcf389b5eab16afe0ddefb0bbbec1252" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/buildkit.rb b/Formula/buildkit.rb index b738ad18469b7..213a58dfab8cd 100644 --- a/Formula/buildkit.rb +++ b/Formula/buildkit.rb @@ -11,6 +11,7 @@ class Buildkit < Formula sha256 "015f74ee73a6d745263b7a46d0f8ae09ec2f8f2ee2c48372cadb10003ca3c05b" => :catalina sha256 "befe8115b0af92a43a56bcd5ce5566d53cd7f94594a55518a069abd5a9055def" => :mojave sha256 "02e8b1b9949bed96e5f5b69f12513622a89d7ad7d244241081bb4f6ec8af304d" => :high_sierra + sha256 "62f0b5c44fbb9b678f89585a1ca487e8c8e343b3b0538a94fcf747a72dc4fb43" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/buku.rb b/Formula/buku.rb index 837f6c6dc17ee..06dd7bec12faf 100644 --- a/Formula/buku.rb +++ b/Formula/buku.rb @@ -11,6 +11,7 @@ class Buku < Formula sha256 "eddbed7b65e27d075deac0c14aaad86714085e02fa8e565a9f34524049c9a9b9" => :catalina sha256 "211a2ba97cba060b7820a7def2d2956224ea21ae56ac9c2a97ee233f055ec4ec" => :mojave sha256 "663b219a77e3005f067e4030633ed9ffbdf9d89213b66b8d1d07ab54df23c078" => :high_sierra + sha256 "1a4dc1f62db94a1d127753bc07291806493e843a637d8cecabd34337ab522d93" => :x86_64_linux end depends_on "openssl@1.1" @@ -84,6 +85,8 @@ def install test do ENV["LC_ALL"] = "en_US.UTF-8" ENV["XDG_DATA_HOME"] = "#{testpath}/.local/share" + ENV["PYTHONIOENCODING"] = "utf-8" unless OS.mac? + expect = OS.mac? ? "/usr/bin/expect" : "#{Formula["expect"].opt_bin}/expect" # Firefox exported bookmarks file (testpath/"bookmarks.html").write <<~EOS @@ -115,9 +118,13 @@ def install -re ".*ERROR.*" { exit 1 } "1. Title unknown" } + spawn #{bin}/buku --nc --import bookmarks.html + expect "Add imported folders names as tags? (y/n): " + send "y\r" + expect "\\[ERROR\\] URL \\[https://github.com/Homebrew/brew\\] already exists at index 1" spawn sleep 5 EOS - system "/usr/bin/expect", "-f", "import" + system expect, "-f", "import" # Test online components -- fetch titles system bin/"buku", "--update" @@ -144,7 +151,7 @@ def install "File decrypted" } EOS - system "/usr/bin/expect", "-f", "crypto-test" + system expect, "-f", "crypto-test" # Test database content and search result = shell_output("#{bin}/buku --np --sany Homebrew") diff --git a/Formula/bullet.rb b/Formula/bullet.rb index 0e48cae4589b2..244f3524d4064 100644 --- a/Formula/bullet.rb +++ b/Formula/bullet.rb @@ -9,6 +9,7 @@ class Bullet < Formula sha256 "38cdb6c948cb2c75ad2d6640629f1cf72b7901b54483f9bc25ba0fd307b90b55" => :catalina sha256 "e4a628878c9358b5a986ffddc682795f13a0a3d04f11f8bbf753e98827d4fdbf" => :mojave sha256 "ddfb705ac9e42845d9d357131add82eea36bdceee95118a970cf4830a4be1878" => :high_sierra + sha256 "1b0d2f97a1d9ddd748379bfd3387f212a2b63fcbfd72688cbce4500cdbbe9330" => :x86_64_linux end depends_on "cmake" => :build @@ -44,8 +45,14 @@ def install } EOS + cxx_lib = if OS.mac? + "-lc++" + else + "-lstdc++" + end + system ENV.cc, "test.cpp", "-I#{include}/bullet", "-L#{lib}", - "-lLinearMath", "-lc++", "-o", "test" + "-lLinearMath", cxx_lib, "-o", "test" system "./test" end end diff --git a/Formula/bumpversion.rb b/Formula/bumpversion.rb index 774a8f0b94604..c7785032be2c2 100644 --- a/Formula/bumpversion.rb +++ b/Formula/bumpversion.rb @@ -23,7 +23,11 @@ def install test do ENV["COLUMNS"] = "80" - assert_includes shell_output("script -q /dev/null #{bin}/bumpversion --help"), "bumpversion: v#{version}" + if OS.mac? + assert_includes shell_output("script -q /dev/null #{bin}/bumpversion --help"), "bumpversion: v#{version}" + else + assert_includes shell_output("script -q /dev/null -c \"#{bin}/bumpversion --help\""), "bumpversion: v#{version}" + end version_file = testpath/"VERSION" version_file.write "0.0.0" system bin/"bumpversion", "--current-version", "0.0.0", "minor", version_file diff --git a/Formula/bup.rb b/Formula/bup.rb index 2691be89929a1..5491db67f676e 100644 --- a/Formula/bup.rb +++ b/Formula/bup.rb @@ -14,6 +14,7 @@ class Bup < Formula depends_on "pandoc" => :build depends_on :macos # Due to Python 2 + depends_on :macos # Due to Python 2 resource "certifi" do url "https://files.pythonhosted.org/packages/b8/e2/a3a86a67c3fc8249ed305fc7b7d290ebe5e4d46ad45573884761ef4dea7b/certifi-2020.4.5.1.tar.gz" @@ -43,8 +44,13 @@ def install end end - # set AC_CPP_PROG due to Mojave issue, see https://github.com/Homebrew/brew/issues/5153 - system "make", "AC_CPP_PROG=xcrun cpp" + if OS.mac? + # set AC_CPP_PROG due to Mojave issue, see https://github.com/Homebrew/brew/issues/5153 + system "make", "AC_CPP_PROG=xcrun cpp" + else + system "./configure" + system "make" + end system "make", "install", "DESTDIR=#{prefix}", "PREFIX=" mv bin/"bup", libexec/"bup.py" diff --git a/Formula/burp.rb b/Formula/burp.rb index 0fef869de40cd..5eb349f1b1411 100644 --- a/Formula/burp.rb +++ b/Formula/burp.rb @@ -18,6 +18,7 @@ class Burp < Formula sha256 "f45062f56a6cc3bc9ba09b84d9f44e599015387d6d31b0ae8a289fa74a904021" => :mojave sha256 "1855c5623a4d7ec1ed397f2646772d807a127f80f196c41dcae0efe7615afd8d" => :high_sierra sha256 "157aa6cc33291ec50b8597b3bd97b08e0a92f79e634ec122eb0911e86bc395c9" => :sierra + sha256 "45e7d81443d968ab019a7df6456563734ccdb6b8544e2cefc836a7e940cc59e0" => :x86_64_linux end head do diff --git a/Formula/bvi.rb b/Formula/bvi.rb index bad606eca11da..c39c7dc55029e 100644 --- a/Formula/bvi.rb +++ b/Formula/bvi.rb @@ -8,6 +8,7 @@ class Bvi < Formula sha256 "83cfa7a1fe8848d8eab7f01da94a32e75eb7c57221854a3f3f06a05417975977" => :catalina sha256 "567e9512dfd4fcf7768c442a6e609f7b798b887e4cdd59c1b38970940b9c528f" => :mojave sha256 "28ba5db61217dfe797423fd55b5fce06def1d5760aa466685759f1e315459777" => :high_sierra + sha256 "b2d9959aa4e3c0a638e71e63adec26ecf582eaf67204d4feabadd1dc177e26e4" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/bwa.rb b/Formula/bwa.rb index 1a225b54369d2..6dabee56e19a5 100644 --- a/Formula/bwa.rb +++ b/Formula/bwa.rb @@ -11,6 +11,7 @@ class Bwa < Formula sha256 "02da3eecd6569c193a55436f705c8d351d052e44b79a43d6afc50f7308603a73" => :high_sierra sha256 "4db97125930b495fc34b6d161bea57171ac4bf2a5bf48ca1088a69a594874710" => :sierra sha256 "bee09d138e9d8f45c12d6c99b48a3e6891b6e4d3f5c6a6847bfeaa28afc2f362" => :el_capitan + sha256 "543858a704eb3d584f464d78d092e92f015b36cb289e2e0949cba3494feccfcc" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/bwctl.rb b/Formula/bwctl.rb index 54925f8447e41..bdf0a0d8e4fe4 100644 --- a/Formula/bwctl.rb +++ b/Formula/bwctl.rb @@ -10,6 +10,7 @@ class Bwctl < Formula sha256 "125c3592d5a34d3913dde26356ee894136716f6b224ab1d8bc14ab487fbd2633" => :catalina sha256 "b4e91dbfca063d51a0280dffde519e9d4e5d66d0e0a301936dbbe86239e295a3" => :mojave sha256 "2d326aaaa5c9031fd668569cbd68627d84884389b4883282d82259af152b12c3" => :high_sierra + sha256 "8667bc495aaeaca247c9a643f35baec59af1143de4d3cbf69904c35257899940" => :x86_64_linux end # https://software.internet2.edu/bwctl/ diff --git a/Formula/bwfmetaedit.rb b/Formula/bwfmetaedit.rb index 29b0d12c6df2c..335f3fc231096 100644 --- a/Formula/bwfmetaedit.rb +++ b/Formula/bwfmetaedit.rb @@ -9,6 +9,7 @@ class Bwfmetaedit < Formula sha256 "72cdfdf26527d3a82cac945c81a9a53097dd4831f3a315fdbd1dc67e0f1a01d0" => :catalina sha256 "3afb53dc8f46493cc50dbce9d6369b84385110b908a847d2ab84eca9c06ff8cb" => :mojave sha256 "332b5ad0e217e6433f51d25135f98036120f6444820dcece627228c1fdfe881c" => :high_sierra + sha256 "4e4215948f108e5b28c52e1614ca3bff59efddcd651e599e45dba402c979f93f" => :x86_64_linux end def install diff --git a/Formula/bwm-ng.rb b/Formula/bwm-ng.rb index 0794a8c2fa622..4d30bd2ab5e8a 100644 --- a/Formula/bwm-ng.rb +++ b/Formula/bwm-ng.rb @@ -11,6 +11,7 @@ class BwmNg < Formula sha256 "4126db28facbbd0c0575d166a4c30968c4449b8094430022d3c8455ec7481809" => :mojave sha256 "4a8ffbfe0bc2c9bf93bd516cff8916e9ea1d9554d939f21c4f7e9bfbd02ab04f" => :high_sierra sha256 "0c663c3fedbcdc690b553ccb88b6f69b94a4a70dea67e3d152dbaaa741973ba8" => :sierra + sha256 "bf00b9c1ce57401fbb0e37101f7dab5afb91dd4019807b78f017f47230ce6257" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/byacc.rb b/Formula/byacc.rb index 477a151487d0c..a3e62ae57f200 100644 --- a/Formula/byacc.rb +++ b/Formula/byacc.rb @@ -9,6 +9,7 @@ class Byacc < Formula sha256 "720be331b73d9d96ab6132e804413990c6ce224322071972634b4175d2289188" => :catalina sha256 "06a2014523f5c2efedefa5463275a441ada57a50d61a4f801d8c503d0406bde8" => :mojave sha256 "37c98bb69ca30ceee1ed62383b98ae1ca639f2b52e224baf0b71d5616244c638" => :high_sierra + sha256 "e4995ed31f15275c33722d2c278602349a2446a113df3169bf0c1a2ed321794d" => :x86_64_linux end def install diff --git a/Formula/byobu.rb b/Formula/byobu.rb index 994bb3ba38233..6003133032ff5 100644 --- a/Formula/byobu.rb +++ b/Formula/byobu.rb @@ -9,6 +9,7 @@ class Byobu < Formula sha256 "39b468dabc1497338b4511f9f565f9adcdd058a99207de345da28b18a0826ae6" => :catalina sha256 "39b468dabc1497338b4511f9f565f9adcdd058a99207de345da28b18a0826ae6" => :mojave sha256 "39b468dabc1497338b4511f9f565f9adcdd058a99207de345da28b18a0826ae6" => :high_sierra + sha256 "d669fa391399dca19080254c209c0b74f3bbf9ae5012db03e17d2272662726f9" => :x86_64_linux end head do diff --git a/Formula/bzip2.rb b/Formula/bzip2.rb index 25103fa087347..9efd253b5d8b9 100644 --- a/Formula/bzip2.rb +++ b/Formula/bzip2.rb @@ -10,6 +10,7 @@ class Bzip2 < Formula sha256 "b8683b824f4cc702d06031c3762ba079e8bc1ea27413f6d08f10e93c539d89fd" => :mojave sha256 "c7f2266c2d354c706de5163c23bb7b7204f1f15a85027ea486877a0c5d253336" => :high_sierra sha256 "1f11350ccb9a3bd1dd250b5e440d68a5ea65408d4b91f9eae2aa7628e899b7c5" => :sierra + sha256 "e5fce257b9fee119d28d0e7f7dac9332bd26b248fe35d983ba85104243e4bc2e" => :x86_64_linux end keg_only :provided_by_macos @@ -18,6 +19,15 @@ def install inreplace "Makefile", "$(PREFIX)/man", "$(PREFIX)/share/man" system "make", "install", "PREFIX=#{prefix}" + + unless OS.mac? + # Install the shared library. + system "make", "-f", "Makefile-libbz2_so", "clean" + system "make", "-f", "Makefile-libbz2_so" + lib.install "libbz2.so.#{version}", "libbz2.so.1.0" + lib.install_symlink "libbz2.so.#{version}" => "libbz2.so.1" + lib.install_symlink "libbz2.so.#{version}" => "libbz2.so" + end end test do diff --git a/Formula/c-ares.rb b/Formula/c-ares.rb index b37c61f9051a9..abb5a7adccdf6 100644 --- a/Formula/c-ares.rb +++ b/Formula/c-ares.rb @@ -9,6 +9,7 @@ class CAres < Formula sha256 "0ba43741f90d2529cf03785faf077ee38898124474bd147718ed8a9ccf0f68a5" => :catalina sha256 "5c144152a0ea9ce016043fc37b6f456f9a8270298432d5283c52ec3676c70b3c" => :mojave sha256 "a2761fa50d7e565997a8c1f5fffdad4ad439b5f5245852b5bf6c431b85fe447a" => :high_sierra + sha256 "9653f87c516fe97a45f9bd9b7d663aabe12b6550f96ef8564a843182daf35a24" => :x86_64_linux end head do diff --git a/Formula/c-blosc.rb b/Formula/c-blosc.rb index 1c13de303f585..e56b6f33648db 100644 --- a/Formula/c-blosc.rb +++ b/Formula/c-blosc.rb @@ -9,6 +9,7 @@ class CBlosc < Formula sha256 "3f0bd48f8086cb7ea76dfca4b61d702b91badee76faf05ceff514f795537c5af" => :catalina sha256 "da10033ade2963d8903182fe9f7b5f98f9064d0fcba9fd1b0ca00bacc23efb8f" => :mojave sha256 "83492ba1473b33ebbd54b0369bc67a904293e345a15f89ad7ba2a59039933b56" => :high_sierra + sha256 "48755ec9179e494cddee4df21e752a29417a61a80f89f9097eb076790eb34a41" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/c14-cli.rb b/Formula/c14-cli.rb index fb1013faf5fed..066c72eb58267 100644 --- a/Formula/c14-cli.rb +++ b/Formula/c14-cli.rb @@ -10,6 +10,7 @@ class C14Cli < Formula sha256 "137f585fd6aef342e9ac97ce6ffe819d30641727e7f9d621fa6d0124afeb46f5" => :catalina sha256 "245dc470e7883100e9b8d3dd229a5fbf2e0960993c7432be11e31ba7ef887f71" => :mojave sha256 "6b3262c0d209f01dd93a491c541ee7f9fedca9f6ff03203487394e0e4f5cdecf" => :high_sierra + sha256 "239b003f8c7be81fbeea6be3488aa2d353b614b92b57d23b5bd6237827d4bad1" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/c2048.rb b/Formula/c2048.rb index 93dc65ece3529..78f071a7cb2eb 100644 --- a/Formula/c2048.rb +++ b/Formula/c2048.rb @@ -13,6 +13,7 @@ class C2048 < Formula sha256 "d2f33783cf7cd2ac69eaed113d940aca31e02e5863fcdb40e200e3fe9a4d0623" => :sierra sha256 "8f9e75196f87718be0c572f731cecba0c8cd4e8dc35f8b3027392cd6e1c45f5d" => :el_capitan sha256 "c06bde9e58788a1a4f16b6d0ace89be02cf07f86211e0c78af5fdaa7d70a3614" => :yosemite + sha256 "29b61ea85269a57e48f2399fc9e135d05830435461c4fc16bde7573899f1bf18" => :x86_64_linux end def install diff --git a/Formula/cabal-install.rb b/Formula/cabal-install.rb index 964a692d5f7cd..f5b15563d9a01 100644 --- a/Formula/cabal-install.rb +++ b/Formula/cabal-install.rb @@ -10,6 +10,7 @@ class CabalInstall < Formula sha256 "7fbdab393a7e9c70d4da3246152d852eb919f1fb6fd45eda6ab9b0326b3516fe" => :catalina sha256 "11e3cd8f442d083b175f8d4e043f5d232c2593fc8c606551ef65b41b988b9748" => :mojave sha256 "2946e5b36632d7e33e1312c0597d4858479748ee94eb1a52df9f4869c87eb2a7" => :high_sierra + sha256 "ff9801bed6a4ea5190fde9ba6eb83736885d5d448c7f2fdb11d0ecbbf92ec416" => :x86_64_linux end depends_on "ghc" diff --git a/Formula/cabextract.rb b/Formula/cabextract.rb index f373536af62b3..e512134f03739 100644 --- a/Formula/cabextract.rb +++ b/Formula/cabextract.rb @@ -10,6 +10,7 @@ class Cabextract < Formula sha256 "cd27b939a0191d4dfff8ae13300b260b5ae01c563a21613718160012a982d5e8" => :mojave sha256 "c77caa7c32b4320f9e887abeea99261345e83f03e2c321ec9e99ddd9c75f5d98" => :high_sierra sha256 "c531546af69afda3101f07b509eb143cdaef00f4fdcbdd420e60287508a87e5e" => :sierra + sha256 "629e79b7cb08ae0bd4c7c1e04ff729865f7efba43c589575a2f9f2d1af507989" => :x86_64_linux end def install diff --git a/Formula/cacli.rb b/Formula/cacli.rb index a687615025274..1afa2844a75a7 100644 --- a/Formula/cacli.rb +++ b/Formula/cacli.rb @@ -9,6 +9,7 @@ class Cacli < Formula sha256 "63f761d1b56137cdb4a2d94e5894c7a43ac28f8d9f7f36c2011da7ea21445c9e" => :catalina sha256 "6b8148ab93f63cc8342a2b77356c1154d875f710edceacaac4258d36d1ccb108" => :mojave sha256 "6dbca926050f4ca29a073d05591e818690d9a3d3cae0dffc7d658aab9afef02d" => :high_sierra + sha256 "7b818e31128751aae6a9ee92dcb411e9cb77f7168b0b254c40a0789228389995" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/caf.rb b/Formula/caf.rb index 9404d2df6daf8..e52b7bf1efecb 100644 --- a/Formula/caf.rb +++ b/Formula/caf.rb @@ -11,6 +11,7 @@ class Caf < Formula sha256 "f7edfd696aeb6da9b5648198f012848abcbdcfef7563d33a5dcfa7fa5d00f3e7" => :catalina sha256 "4e94b6afe4bf7e9c61e368c75348f667168dbdf6d0b1400163e7c9cc83ad1f68" => :mojave sha256 "7e72d56ec3a0119e2a2d141e1373e1977c2315efcb18b34261af3d863be39331" => :high_sierra + sha256 "16ff2be919e67c8a19dc755dd74cad9f02d14e58ecfd894578f10289867548e8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cairo.rb b/Formula/cairo.rb index 3eb55af8893b6..4c2c54122670b 100644 --- a/Formula/cairo.rb +++ b/Formula/cairo.rb @@ -9,6 +9,7 @@ class Cairo < Formula sha256 "6a23a68837269a8410a54950fdc8883feda091f221118370f1bfd3adbf5ee89c" => :catalina sha256 "0984045234fb22fa3e54a337137e9e43a1bf997f5d77692ed02249dfdee2b1bf" => :mojave sha256 "5c383ad4625fb1bd15e44e99fba1201490fa478b26178abaca5abb0fdb51510e" => :high_sierra + sha256 "2ff97b7c8abbb95791c1dc1e28b42e8f007adaf4f649cb46732c8140ad19dfd1" => :x86_64_linux end head do @@ -26,23 +27,33 @@ class Cairo < Formula depends_on "lzo" depends_on "pixman" + unless OS.mac? + depends_on "linuxbrew/xorg/libxext" + depends_on "linuxbrew/xorg/libxrender" + end + uses_from_macos "zlib" def install + args = %W[ + --disable-dependency-tracking + --prefix=#{prefix} + --enable-gobject=yes + --enable-svg=yes + --enable-tee=yes + --enable-quartz-image=#{OS.mac? ? "yes" : "no"} + --enable-xcb=#{OS.mac? ? "no" : "yes"} + --enable-xlib=#{OS.mac? ? "no" : "yes"} + --enable-xlib-xrender=#{OS.mac? ? "no" : "yes"} + --enable-valgrind=no + ] + if build.head? ENV["NOCONFIGURE"] = "1" system "./autogen.sh" end - system "./configure", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--enable-gobject=yes", - "--enable-svg=yes", - "--enable-tee=yes", - "--enable-quartz-image", - "--enable-xcb=no", - "--enable-xlib=no", - "--enable-xlib-xrender=no" + system "./configure", *args system "make", "install" end diff --git a/Formula/cairomm.rb b/Formula/cairomm.rb index fbdcfd1738e0e..1c66e134e52a1 100644 --- a/Formula/cairomm.rb +++ b/Formula/cairomm.rb @@ -11,6 +11,7 @@ class Cairomm < Formula sha256 "2a77a830256c2da441f636fddbdc2bd4ad390e920fc223b4ea33821ec1265195" => :mojave sha256 "08a29b621ee8173cb17452f2e7a62adb83a60a65f0758cab545ddc0c53ecf681" => :high_sierra sha256 "1845ba3e5dd9364551980e16b446620e4088f1fe90517b5af7cd81435b60cc08" => :sierra + sha256 "008e269d93b7195ae23ad74ba46c4ade2370e758c2adf06b01ae1bcc6ef5c8b3" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/calc.rb b/Formula/calc.rb index d2210dec87e09..6eba4819ec354 100644 --- a/Formula/calc.rb +++ b/Formula/calc.rb @@ -10,9 +10,11 @@ class Calc < Formula sha256 "1b4e5456d4965f8b74c120590070f74896c1fca85c8aa30354ffe519c1755600" => :mojave sha256 "7614247fc707caf03a96e302ab2e1324f6a3609cfd1cdd7c6389bca77511ff18" => :high_sierra sha256 "c31e4ac4a08ff6f1803cfcbe2d90a2634737ed69f4c38538f7ba77fc6a3e6728" => :sierra + sha256 "aa397c39014605519cf2c3b441559197c4fa1f1f1dffec06d6ae8e7952f95f30" => :x86_64_linux end depends_on "readline" + depends_on "bsdmainutils" => :build unless OS.mac? # for 'col' def install ENV.deparallelize @@ -22,7 +24,7 @@ def install readline = Formula["readline"] - system "make", "install", "INCDIR=#{MacOS.sdk_path}/usr/include", + system "make", "install", *("INCDIR=#{MacOS.sdk_path}/usr/include" if OS.mac?), "BINDIR=#{bin}", "LIBDIR=#{lib}", "MANDIR=#{man1}", diff --git a/Formula/calceph.rb b/Formula/calceph.rb index a7f56841889f9..934358cbdc2fd 100644 --- a/Formula/calceph.rb +++ b/Formula/calceph.rb @@ -9,6 +9,7 @@ class Calceph < Formula sha256 "a802022cd32748bace434c30ee3158b0d7f881611910499b86ff9139db35a736" => :catalina sha256 "f851c7aba23bd20b4a589c74a9e61d82968f9a7898193ac2d9b289bb3605f9ca" => :mojave sha256 "7486d6888b3b78219d2e804e1a929b183152f069ea394652ccd4fc7bda41fc67" => :high_sierra + sha256 "e92583eae9861f37d5e69c1f91f94fb273861e7046d2497cd967baacbe93173c" => :x86_64_linux end depends_on "gcc" # for gfortran diff --git a/Formula/calcurse.rb b/Formula/calcurse.rb index 8a1ec6bdc12a7..77573de12d450 100644 --- a/Formula/calcurse.rb +++ b/Formula/calcurse.rb @@ -9,6 +9,7 @@ class Calcurse < Formula sha256 "21cb64443bbffe19f0adb8dfc8f5e49eabed5fc5c0347215bbb7aa3383126719" => :catalina sha256 "0d114c613163c192e9f156750ffa9c3c9a4a303c103a7bc7091c369da151a4c4" => :mojave sha256 "41886cc820da1133c6c5f57fea4f9fbe072a0735e3ef8522a9301736216f4e70" => :high_sierra + sha256 "e6837ec220aa83a774184ff8c0de47670f14e28f6ca53f37112a3db9a72d7e82" => :x86_64_linux end depends_on "gettext" diff --git a/Formula/calicoctl.rb b/Formula/calicoctl.rb index 8bc84ee806c56..9b07088976678 100644 --- a/Formula/calicoctl.rb +++ b/Formula/calicoctl.rb @@ -10,6 +10,7 @@ class Calicoctl < Formula sha256 "8de790a124ab604ed37a27516adc4037fd556b418798e7bcb0fb71658520c831" => :catalina sha256 "cc705142d894a3eb3e0385b0dfb4b892214a7655c08ef76751bc3907b9adbed8" => :mojave sha256 "d46e338642a4c1056cd4b16e10fd80415c8519364072c303f4b3a2c36946ccd7" => :high_sierra + sha256 "6552212ae8e478536f93865e1c52794fcdcfc99856ead7bb997045370acb4f96" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/camlp5.rb b/Formula/camlp5.rb index 7a957aad00de6..f096ac44c0d27 100644 --- a/Formula/camlp5.rb +++ b/Formula/camlp5.rb @@ -10,6 +10,7 @@ class Camlp5 < Formula sha256 "37dddf4bb25b87697f67da03bafce93b5ed258468e4ca3381f92a76a76c1b956" => :catalina sha256 "b2fddd39a3d20529598983ab9a1b1b80c86e228111e613501a71a223bf0d5694" => :mojave sha256 "ab802383d18fa5a34dc9dc1abd3d264c006693df3205a53c4be17cca6e5f223d" => :high_sierra + sha256 "535425cbbe01d378bc3e5cb91f4d7fb1f64b957ca6cd3213e1c4c75cc91aa67a" => :x86_64_linux end depends_on "ocaml" diff --git a/Formula/capnp.rb b/Formula/capnp.rb index 615f44fb9b56d..9e42bd9777c22 100644 --- a/Formula/capnp.rb +++ b/Formula/capnp.rb @@ -10,6 +10,7 @@ class Capnp < Formula sha256 "741c2079361cdb5881a60684190bc4aa98ff9cc6f8d29aa46880e809ac1b06c3" => :catalina sha256 "f389012b8211b70af4fa7d2eed8db8ad399ef2bdc98e286fb57a4b1beb93dfe4" => :mojave sha256 "9c3beb8d8db3b372e4d2fd07d99a553fde6ff53824c6cfec82c3db41e212bc5b" => :high_sierra + sha256 "db7f26f75d26566d62caebd676bef134040fbf97d3129d63594b59bb28eef3ba" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/capstone.rb b/Formula/capstone.rb index bbcce6b7c4965..4ba1ec269721c 100644 --- a/Formula/capstone.rb +++ b/Formula/capstone.rb @@ -10,13 +10,18 @@ class Capstone < Formula sha256 "b434ee96e9d7c413e289340b280705a6c3b9929cf1859de865d88bc012c34396" => :catalina sha256 "c90885740ef54af155c2a0151dc85f728a3aa7ca304a45510e5524ac7fecb7fc" => :mojave sha256 "c6d974a3c237fc36bfea2042d95551f2be7197d37fc0df6c7b9ea2179cd01084" => :high_sierra + sha256 "ad74aefb601c270f6203f038bfe7c98275227df8e99b694f22a2f4ec0556953e" => :x86_64_linux end def install ENV["HOMEBREW_CAPSTONE"] = "1" ENV["PREFIX"] = prefix system "./make.sh" - system "./make.sh", "install" + if OS.mac? + system "./make.sh", "install" + else + system "make", "install", "PREFIX=#{prefix}" + end end test do diff --git a/Formula/cargo-c.rb b/Formula/cargo-c.rb index e9e19e65c07df..ee7ef12c0aa15 100644 --- a/Formula/cargo-c.rb +++ b/Formula/cargo-c.rb @@ -5,10 +5,11 @@ class CargoC < Formula sha256 "ca8cb5e08b0ba5b6eccea1481854829e1b411ebb9885be891a897c27b5a76cba" bottle do - cellar :any + cellar :any_skip_relocation sha256 "c4b83b9a8932ab1c15706585dda3ec88b75c966c967a25661f479150e4c29d20" => :catalina sha256 "97f34a38dae6ffe05ff7b03fda5c6fd8db83a23acd6d2d19abd4b50306d2a022" => :mojave sha256 "2633e4edabee4b62a5959a068022356e914db735201437b9c813cc19d58b6bdb" => :high_sierra + sha256 "4c232c8e7e8fa55c0ce675852f03dd71e066bedeac814ba5d13a3246a4b50bd9" => :x86_64_linux end depends_on "rust" => :build @@ -16,6 +17,8 @@ class CargoC < Formula depends_on "libssh2" depends_on "openssl@1.1" + uses_from_macos "zlib" + on_linux do depends_on "pkg-config" => :build end diff --git a/Formula/carina.rb b/Formula/carina.rb index cca27b0768536..a8b136815c4cc 100644 --- a/Formula/carina.rb +++ b/Formula/carina.rb @@ -14,6 +14,7 @@ class Carina < Formula sha256 "ee6c8cdf2eddda983618f7de29bf3bcc7e81d8d9a7085a037d67cd7cdb25377a" => :sierra sha256 "34086f8b3418d96c3ee5c2f50ad5ffc7ee839fd26b36d0e8911c364a8c82586e" => :el_capitan sha256 "0706998cd1dc286030e20382ac69a96c744ec558784685f769aa4276966dcd12" => :yosemite + sha256 "1ee0aff79b4f66a658c25e412f0b59d92b2eee945b8cc8d4f7ea76d17faa448e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/carthage.rb b/Formula/carthage.rb index b10e50a87add9..cc77313f42ace 100644 --- a/Formula/carthage.rb +++ b/Formula/carthage.rb @@ -14,7 +14,7 @@ class Carthage < Formula sha256 "130fcb9bc06ef8e7f1c5ac9af0d155bd347db039b2cf80fa0fef764b3627ffbf" => :high_sierra end - depends_on :xcode => ["10.0", :build] + depends_on :xcode => ["10.0", :build] if OS.mac? def install system "make", "prefix_install", "PREFIX=#{prefix}" diff --git a/Formula/cash-cli.rb b/Formula/cash-cli.rb index 9e282cd014452..5bee0894acdd4 100644 --- a/Formula/cash-cli.rb +++ b/Formula/cash-cli.rb @@ -11,6 +11,7 @@ class CashCli < Formula sha256 "f22f6404f47adb8a6c0253362d61fb529da4d6a71045a2902407ed112329310d" => :catalina sha256 "7aa6e66eef5defae364924b00859ad4d884a15563c52488462ab489676f02141" => :mojave sha256 "903fde1135bcc71b70d74b852084897a2708f1d87ad00c200c793600472c42aa" => :high_sierra + sha256 "ac658974304a186ac419096566ef7e36d16b491c1d4eab90d2c9eb0394a6704e" => :x86_64_linux end depends_on "node" diff --git a/Formula/cassandra-cpp-driver.rb b/Formula/cassandra-cpp-driver.rb index 7e643f8ccee06..fb435b424572f 100644 --- a/Formula/cassandra-cpp-driver.rb +++ b/Formula/cassandra-cpp-driver.rb @@ -10,6 +10,7 @@ class CassandraCppDriver < Formula sha256 "25abbbd19f8ff6ab026f3ccccd466da53e1daeeb52550c85211e833547e4c4aa" => :catalina sha256 "49b53bff19ed2897ab07d47bb9db03697a659b55e007c0db0b8d2f0ef70dcb78" => :mojave sha256 "0b5b67f7208a2491fa77f5393d993f36e76b23af72d848806b364a2e707c0091" => :high_sierra + sha256 "8bc7c5623fcacee4fd266603fdcfd85a3fb8f9b81f25168371880aac3f08f732" => :x86_64_linux end depends_on "cmake" => :build @@ -25,7 +26,7 @@ class CassandraCppDriver < Formula def install Dir.mkdir "build" Dir.chdir "build" do - system "cmake", "..", *std_cmake_args + system "cmake", "..", *std_cmake_args, ("-DLIBUV_ROOT_DIR=#{Formula["libuv"].opt_prefix}" unless OS.mac?) system "make" system "make", "install" end diff --git a/Formula/cassandra@2.1.rb b/Formula/cassandra@2.1.rb index 5cbbfc9ca86d1..fa3932f6a7fe1 100644 --- a/Formula/cassandra@2.1.rb +++ b/Formula/cassandra@2.1.rb @@ -11,11 +11,13 @@ class CassandraAT21 < Formula sha256 "ba43927921cfc8c4540736eec7472dcb5fb78efbd0fb7e948df64cedc243d2b5" => :catalina sha256 "cbe96bf658b154f84a1ad7188ca3ea667f3f3201e46452f2e95f8d4a1c946af8" => :mojave sha256 "7a0183c65df7ad2f04c6d53f781150af2540d52a80d4f349e59087d35c418399" => :high_sierra + sha256 "08675aa418fb7762b8cdf0ab92f995917c6642651c578d16edaa041ead24f0ba" => :x86_64_linux end keg_only :versioned_formula depends_on :macos # Due to Python 2 (does not support Python 3) + depends_on :java => ["1.8+", :test] unless OS.mac? # Only Yosemite has new enough setuptools for successful compile of the below deps. resource "setuptools" do diff --git a/Formula/cassandra@2.2.rb b/Formula/cassandra@2.2.rb index 41ca31a1964ca..55944008a3918 100644 --- a/Formula/cassandra@2.2.rb +++ b/Formula/cassandra@2.2.rb @@ -15,6 +15,7 @@ class CassandraAT22 < Formula keg_only :versioned_formula depends_on "cython" => :build + depends_on :java => ["1.8+", :test] unless OS.mac? depends_on :macos # Due to Python 2 (does not support Python 3) # Only >=Yosemite has new enough setuptools for successful compile of the below deps. diff --git a/Formula/cassowary.rb b/Formula/cassowary.rb index e05c14a16c7da..00ed07af4337d 100644 --- a/Formula/cassowary.rb +++ b/Formula/cassowary.rb @@ -10,6 +10,7 @@ class Cassowary < Formula sha256 "b8f7d3def722987e81c22df1ea898ed28973476fc309988756c573f0372b381a" => :catalina sha256 "10de18f2c186dffe62c5407365f5201379b0f3da3bc37eb9e0b60fd465959c19" => :mojave sha256 "2eb13fb3ce1f657d59791152266497761fc5c6a562c49f96ec6b7cf81c3099aa" => :high_sierra + sha256 "38691ea7460a2f2228f145f210c3f9f7608e50d6f989a13507e9b073be10dae6" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/castxml.rb b/Formula/castxml.rb index e3b289b9ebeb7..1373b5789ac08 100644 --- a/Formula/castxml.rb +++ b/Formula/castxml.rb @@ -10,6 +10,7 @@ class Castxml < Formula sha256 "2cca1b4b5c7298f2e385a5d24f0c507fde75691d70bb45fdc4e52092c02356da" => :catalina sha256 "5eab772fc46e134783b1339b365c894bae9d2a15d714579206fb9a92a6c63964" => :mojave sha256 "65232354608516831cd91b5e705e12551b09a6df773fbce9475fa609d3cefc32" => :high_sierra + sha256 "686db10ef8c776e557f388958f2bfdd3c1291d0aac7be53ae8d1a15a9d68178a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/catch2.rb b/Formula/catch2.rb index dd96d62ec8624..67c746cbf398c 100644 --- a/Formula/catch2.rb +++ b/Formula/catch2.rb @@ -9,6 +9,7 @@ class Catch2 < Formula sha256 "28cba45445941657d8e793a3eda2f29a5d5c4d2424c90a044dab7131638ff288" => :catalina sha256 "28cba45445941657d8e793a3eda2f29a5d5c4d2424c90a044dab7131638ff288" => :mojave sha256 "28cba45445941657d8e793a3eda2f29a5d5c4d2424c90a044dab7131638ff288" => :high_sierra + sha256 "9cf33f13ee4ea3583414251acc5b417c51e95a0ccf2285afc816d70352738ef1" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/catimg.rb b/Formula/catimg.rb index 9755d9d34a2c5..424cad1d7a061 100644 --- a/Formula/catimg.rb +++ b/Formula/catimg.rb @@ -11,6 +11,7 @@ class Catimg < Formula sha256 "c969dbc14fe8778d997abe119365a9a5b72a5192a2a73724edf820f4cc3d73c6" => :mojave sha256 "afc3fe119461f26efece013456a43798b2898e4c903d80e37998222081e7699f" => :high_sierra sha256 "2a7088bcac247d0dde972240369c4e7708511072f95e4bf43e3a1e2daa8e4e30" => :sierra + sha256 "3cab917aef75e201af3d31002020a182a16186f09cf061ebd389750a54b24178" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cattle.rb b/Formula/cattle.rb index 95c4066a8d08e..d5f47c5244a2e 100644 --- a/Formula/cattle.rb +++ b/Formula/cattle.rb @@ -8,6 +8,7 @@ class Cattle < Formula sha256 "d721fea1c78f6b79eb7ae7e325442e276638919bdef0a21604e910501d4cc67f" => :catalina sha256 "7ce0b67200025300e8e326dc890c79b94be12b627ebc4bbf230ae64437aa286d" => :mojave sha256 "43b809e209b52621c0ac66810b751a22f43d1718f75f41c9c0364d6ecb762b83" => :high_sierra + sha256 "650f1eebb6873a8161a9c781a69e66a9bddc26a8788f47faecdff837e6de27a7" => :x86_64_linux end head do diff --git a/Formula/cbmbasic.rb b/Formula/cbmbasic.rb index 85942bc2ff5c1..b3b0b44f4477e 100644 --- a/Formula/cbmbasic.rb +++ b/Formula/cbmbasic.rb @@ -14,6 +14,7 @@ class Cbmbasic < Formula sha256 "92762d9b7f5f21190b98d23e7fedf787cccc14e1c82699b60036948beaf1e7d1" => :el_capitan sha256 "d7285a8376e20ac008e51814a97f155f8ac80ce94a809c953ee63932a1d2c1d7" => :yosemite sha256 "ffe1126f8e12f15471abadf280fa83b8e77770170749805a28fdaa1a1adf51b0" => :mavericks + sha256 "57872625bdd6d2e29e92686aa65efa7fce3991612851bc0d6edba4526dd82f72" => :x86_64_linux end def install diff --git a/Formula/cc65.rb b/Formula/cc65.rb index ce84ae6824413..2244a44c2557f 100644 --- a/Formula/cc65.rb +++ b/Formula/cc65.rb @@ -10,6 +10,7 @@ class Cc65 < Formula sha256 "a84e72ecee825a41a9614a7563df24418d5173ff13ff767adf2a924e28b00fcb" => :mojave sha256 "2fecec53d0f65fc2ae409fc29516207cf11377e6726574087da4f06502e10770" => :high_sierra sha256 "e4bf2981ea6489e414bf2166f6e591612b2e589aa30a3beaab1fd0d7a2ca1207" => :sierra + sha256 "270039e4dbd2433378c9a1fbd8e2f50d7ba3a05665650f01d59db44e08ba1b95" => :x86_64_linux end conflicts_with "grc", :because => "both install `grc` binaries" diff --git a/Formula/ccache.rb b/Formula/ccache.rb index 06b591c955d1f..d8dd4633bc363 100644 --- a/Formula/ccache.rb +++ b/Formula/ccache.rb @@ -9,6 +9,7 @@ class Ccache < Formula sha256 "bfd4fe5e5f9cbc89cc6e7fb75f81f3e8242051a4d5a3f826393e687391d99d04" => :catalina sha256 "3313b78106163a3a402a17dd3685585d847acab5d1fbaad5ee66820f4d0c55da" => :mojave sha256 "e7cf896321b1436855c0289911fdf7a9942c67d3c9c5312aecb94c6b869e1e09" => :high_sierra + sha256 "4c600ae1a410efcac788b3418a172f31619b99a785199bd70fcd11418016994e" => :x86_64_linux end head do diff --git a/Formula/ccat.rb b/Formula/ccat.rb index 23c3a18392909..ddf0124f0b9ed 100644 --- a/Formula/ccat.rb +++ b/Formula/ccat.rb @@ -13,6 +13,7 @@ class Ccat < Formula sha256 "10eb7df98a05c968f006bbda2c6f690bd7d5053e4bb6d2c9c4a043616648a23b" => :el_capitan sha256 "063b4cab434b5d16e8884aad6eb7d18068c33f9ec884fabf5ada3ad821428897" => :yosemite sha256 "04342b5be5ffffaa696799b006b592cad530b0fcd510514ad9c72bc70c5865ba" => :mavericks + sha256 "367d83eed7e3770942329b8a196b93ecbcc66f12e4ccd207ba306bcb96be1d61" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ccd2iso.rb b/Formula/ccd2iso.rb index d3d66b26e622b..72379a9383c0f 100644 --- a/Formula/ccd2iso.rb +++ b/Formula/ccd2iso.rb @@ -13,6 +13,7 @@ class Ccd2iso < Formula sha256 "e74b2779ef3d832bc899422285c2d03ea33aa6ab979ca835914343999b444671" => :el_capitan sha256 "020f198fa4476dc640fa14e8efa7ad04985143e7007c45610b890bdc7db47599" => :yosemite sha256 "46facd34e7bbf203fe76dcd6e99bcf066eb245992aef01f1d703a9ce7a69cac3" => :mavericks + sha256 "df95c15a655c42ab3e041f2b4782b90e783f4ad341108e4866f8a3f03adf87f2" => :x86_64_linux end def install diff --git a/Formula/ccfits.rb b/Formula/ccfits.rb index 4548aca17c0ce..5652e01e0641c 100644 --- a/Formula/ccfits.rb +++ b/Formula/ccfits.rb @@ -10,15 +10,24 @@ class Ccfits < Formula sha256 "bcf673522fe7245b6ca8c93139793acf10c0fb3e351de96cfd634e296a5be813" => :catalina sha256 "22aa452875d79f09825a87f9f3e384552e7fd92e5d954cd361a1b92cd9e52513" => :mojave sha256 "b527e857acac1d749786f44a06af0cfa5f19f34c568c5f21c65675fa04b97f26" => :high_sierra + sha256 "d661601e7892871a69152d9c4c993f6523cbeb09256b6c2f597fe222bf865bd9" => :x86_64_linux end depends_on "cfitsio" def install - system "./configure", "--disable-debug", + if OS.mac? + system "./configure", "--disable-debug", "--disable-dependency-tracking", "--disable-silent-rules", "--prefix=#{prefix}" + else + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}", + "pfk_cxx_lib_path=/usr/bin/g++" + end system "make" system "make", "install" end diff --git a/Formula/ccheck.rb b/Formula/ccheck.rb index a042a4aed4d15..68aec14c6b233 100644 --- a/Formula/ccheck.rb +++ b/Formula/ccheck.rb @@ -9,6 +9,7 @@ class Ccheck < Formula sha256 "edc3a16f072eeca5647916de805bc80a753d00548b860a052f670b4698464632" => :catalina sha256 "4afea0fa685001ecf5777cb37975074cc382f2282bfe7fbaf9543c3b520272df" => :mojave sha256 "564171a220f9f031bd04044319b1e99e0a294208b3e804513ee0fe607525fe81" => :high_sierra + sha256 "130c5a25ecfddaf42d7d5c6a0a4ff3e48a1b51505ddb4bf6c644c83053498cce" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ccls.rb b/Formula/ccls.rb index 2e97f39252829..0097b25b63a47 100644 --- a/Formula/ccls.rb +++ b/Formula/ccls.rb @@ -9,14 +9,26 @@ class Ccls < Formula sha256 "826b74e4e2f5ed44734b1776e960fb4485bbd20ee6383dc9bc426ca2fed9ba03" => :catalina sha256 "f32c94ebdd1b65fa75a32701573dfb1c87d16a339f57f261712ead133caeab3f" => :mojave sha256 "fe0edff63df20a3c4624ce335c73276299f60d5bfad836c1acba32ce7435de18" => :high_sierra + sha256 "342494b296a491c055769bdcfdaac545951c867897ec7cd418368090cd37216b" => :x86_64_linux end depends_on "cmake" => :build depends_on "rapidjson" => :build depends_on "llvm" depends_on :macos => :high_sierra # C++ 17 is required + depends_on "gcc@9" unless OS.mac? # C++17 is required + + fails_with :gcc => "4" + fails_with :gcc => "5" + fails_with :gcc => "6" + fails_with :gcc => "7" do + version "7.1" + end def install + # https://github.com/Homebrew/brew/issues/6070 + ENV.remove %w[LDFLAGS LIBRARY_PATH HOMEBREW_LIBRARY_PATHS], "#{HOMEBREW_PREFIX}/lib" unless OS.mac? + system "cmake", *std_cmake_args system "make", "install" end diff --git a/Formula/ccm.rb b/Formula/ccm.rb index 49c5560fb14a4..b0ad9f8a66b79 100644 --- a/Formula/ccm.rb +++ b/Formula/ccm.rb @@ -10,6 +10,7 @@ class Ccm < Formula sha256 "1301713c60ca83ef5a2b1d5b0df50fcb73d57574ce1fb9f34091e549ba969815" => :catalina sha256 "93f09667b609d1fe582de827efc3d48b4638717871336697b736cf7b997f1eb3" => :mojave sha256 "6f301f55003b0542009458f90cebed245edb4f38abac9a0755552380f2174d12" => :high_sierra + sha256 "d56a867e17b5c3a82fe652aa5452749ba0bd791fe667230a3ba557c8c7fb403a" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/ccrypt.rb b/Formula/ccrypt.rb index 159f921bd5a7b..2cef99d71069c 100644 --- a/Formula/ccrypt.rb +++ b/Formula/ccrypt.rb @@ -10,6 +10,7 @@ class Ccrypt < Formula sha256 "a4d270d5b5f467870f0b265f6f2d1861762d853df46756a34ac7e6a6d83e2121" => :high_sierra sha256 "048295cb4f95c9f0f3c5f1a619141e08c0326b6d8252c62c97608fb028cb48f7" => :sierra sha256 "a98ea0f3dbee5e9086bea342ac8291303970b1d8a85344be2b4d91330a919ae9" => :el_capitan + sha256 "bbafdb89f6dcdae6562aab322471f931d15daae8bd47744d417aa45f79fae7ec" => :x86_64_linux end conflicts_with "ccat", :because => "both install `ccat` binaries" diff --git a/Formula/ccze.rb b/Formula/ccze.rb index 80cf9ca18ab48..c19c34113f7e1 100644 --- a/Formula/ccze.rb +++ b/Formula/ccze.rb @@ -11,6 +11,7 @@ class Ccze < Formula sha256 "1d7fe7ec73840e77d3f76f6f9d38757e4ab62d9d6a951e6d9ccf83782f73a29a" => :catalina sha256 "f748556612ca69454aec71083d8cedbb3def5091c9663c7df046c597fe26048f" => :mojave sha256 "fdc8abe565f7cec57dd3461d6840e2676c556fa54eaccada60df4958310ff8a7" => :high_sierra + sha256 "4136c751b6e40c99933e0a71ca4c90a3ea1c8c847c49385db41c020951b3575e" => :x86_64_linux end # query via the last repo status change `https://api.github.com/repos/madhouse/ccze` @@ -28,6 +29,9 @@ def install inreplace "src/Makefile.in", "-Wreturn-type -Wswitch -Wmulticharacter", "-Wreturn-type -Wswitch" + # error: two or more data types in declaration specifiers + inreplace "system.h.in", "#undef error_t", "" unless OS.mac? + system "./configure", "--prefix=#{prefix}", "--with-builtins=all" system "make", "install" diff --git a/Formula/cd-discid.rb b/Formula/cd-discid.rb index fcfeedfa4a2f4..34fb7a465c372 100644 --- a/Formula/cd-discid.rb +++ b/Formula/cd-discid.rb @@ -26,6 +26,7 @@ class CdDiscid < Formula sha256 "f0c17cfc3c345c661104a6f29562b766cac2a80747feea0c26cda04ece3c8326" => :el_capitan sha256 "3331be095997a1e5e6acb9f82f5e5473ed51c0f35976229371dc1d0c703c2e3b" => :yosemite sha256 "86f0066d344a2a0a37e3c00d08255d4a505b41cc2c38e7d33ac643d16af8ad71" => :mavericks + sha256 "0eb2e3c44b9ba6f98ce5c5e34eca8ee576d3283b109dcbb0974bafc652a6c625" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/cdk.rb b/Formula/cdk.rb index e31860a1c73bd..487ad96eac20e 100644 --- a/Formula/cdk.rb +++ b/Formula/cdk.rb @@ -10,6 +10,7 @@ class Cdk < Formula sha256 "f6af3de91a67f7bec4481770831733635e80467dde908806b7f236c4a367fec1" => :catalina sha256 "d14ec66c67dd3cfeea5679661a1c6341ac1efa6d5090bbe72def80529051d9b4" => :mojave sha256 "c3576b57b44eba4148477a0e987197c9f7d766ba6652280aa915989dcee441ad" => :high_sierra + sha256 "ba4b3922f6a41117b8e3ff1203e6a01451331f739155cb4fd4ce9e360d2517fb" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/cdparanoia.rb b/Formula/cdparanoia.rb index 438d3c59118c9..fa6b6c3721412 100644 --- a/Formula/cdparanoia.rb +++ b/Formula/cdparanoia.rb @@ -18,9 +18,18 @@ class Cdparanoia < Formula depends_on "autoconf" => :build # Patches via MacPorts - patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/2a22152/cdparanoia/osx_interface.patch" - sha256 "3eca8ff34d2617c460056f97457b5ac62db1983517525e5c73886a2dea9f06d9" + if OS.mac? + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/2a22152/cdparanoia/osx_interface.patch" + sha256 "3eca8ff34d2617c460056f97457b5ac62db1983517525e5c73886a2dea9f06d9" + end + end + + if OS.linux? + patch do + url "https://gist.githubusercontent.com/iMichka/c6d0ed5adb5375a8117d7c06999ae1be/raw/1592803a16ede7d3e8e15aebeff56097d6615cdd/cdparanoia-fpic" + sha256 "496f53d21dde7e23f4c9cf1cc28219efcbb5464fe2abbd5a073635279281c9c4" + end end def install diff --git a/Formula/cdrdao.rb b/Formula/cdrdao.rb index 666c328b290f8..29fbd929e1124 100644 --- a/Formula/cdrdao.rb +++ b/Formula/cdrdao.rb @@ -20,9 +20,11 @@ class Cdrdao < Formula # first patch fixes build problems under 10.6 # see https://sourceforge.net/p/cdrdao/patches/23/ - patch do - url "https://sourceforge.net/p/cdrdao/patches/_discuss/thread/205354b0/141e/attachment/cdrdao-mac.patch" - sha256 "ee1702dfd9156ebb69f5d84dcab04197e11433dd823e80923fd497812041179e" + if OS.mac? + patch do + url "https://sourceforge.net/p/cdrdao/patches/_discuss/thread/205354b0/141e/attachment/cdrdao-mac.patch" + sha256 "ee1702dfd9156ebb69f5d84dcab04197e11433dd823e80923fd497812041179e" + end end # second patch fixes device autodetection on macOS diff --git a/Formula/cdrtools.rb b/Formula/cdrtools.rb index 7a0598c097636..4e6ca5ebebae0 100644 --- a/Formula/cdrtools.rb +++ b/Formula/cdrtools.rb @@ -15,6 +15,7 @@ class Cdrtools < Formula sha256 "4724b3dfe367cf28dbd98dad6ddd47179e5b5d1b599a8fff8f0fa8cc4621acb2" => :el_capitan sha256 "5370586e423d9b842b7ebd0cdb3dd2c763c433be9896bcab636cc56ecd5e0634" => :yosemite sha256 "1b3f3ab5baf44ad31f8d09e36de6df59901ce036cc681c54187fe5f41dc8bb94" => :mavericks + sha256 "87a5a55d8abcb8c25ed3de7945d0e972fcb1146e24f72c6c506610ab56cec6de" => :x86_64_linux # glibc 2.19 end depends_on "smake" => :build diff --git a/Formula/celero.rb b/Formula/celero.rb index b8d99c5be3fe5..4474c068a272c 100644 --- a/Formula/celero.rb +++ b/Formula/celero.rb @@ -9,6 +9,7 @@ class Celero < Formula sha256 "50180fabca883914fd2b120cee3258ef4a58015287babb1883274c03d5be0fa6" => :catalina sha256 "2ae8505c1415e5a9ca3b9d2d80a4f28516f311c755a0cbe809bc45b521a0169b" => :mojave sha256 "c73b3bcf8fc8dfcb1df8367febe579c11b60067550500a5e94ec1ef7f279882c" => :high_sierra + sha256 "7b6c149c6ad85d5e22bcb18a22f1cea31ca1c27a2dbf0d9b2747c9ad59fbd918" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ceres-solver.rb b/Formula/ceres-solver.rb index da19fb3095164..a7aa10e72585e 100644 --- a/Formula/ceres-solver.rb +++ b/Formula/ceres-solver.rb @@ -11,6 +11,7 @@ class CeresSolver < Formula sha256 "2c086c9caaf2828a6429164960e438bc7b1d601a468599400dbcd9fce6baa33e" => :catalina sha256 "6f3edef5bdaf1b23723825305b7cdc84d28a06705bd55735de70813b28cef37f" => :mojave sha256 "4d59a78cc1d4fa075ad3cebfabb88f59080b3abe80a834445b018b670f9f2d0b" => :high_sierra + sha256 "4619c393087cb5917a963ce1850ddb960f39cf16ec068933a920bf9a7fc4d681" => :x86_64_linux end depends_on "cmake" @@ -21,10 +22,11 @@ class CeresSolver < Formula depends_on "suite-sparse" def install + dylib = OS.mac? ? "dylib" : "so" system "cmake", ".", *std_cmake_args, "-DBUILD_SHARED_LIBS=ON", "-DEIGEN_INCLUDE_DIR=#{Formula["eigen"].opt_include}/eigen3", - "-DMETIS_LIBRARY=#{Formula["metis"].opt_lib}/libmetis.dylib", + "-DMETIS_LIBRARY=#{Formula["metis"].opt_lib}/libmetis.#{dylib}", "-DGLOG_INCLUDE_DIR_HINTS=#{Formula["glog"].opt_include}", "-DGLOG_LIBRARY_DIR_HINTS=#{Formula["glog"].opt_lib}", "-DTBB=OFF" diff --git a/Formula/cern-ndiff.rb b/Formula/cern-ndiff.rb index 3e7cf8f9c9e8a..8503b44f966bd 100644 --- a/Formula/cern-ndiff.rb +++ b/Formula/cern-ndiff.rb @@ -11,6 +11,7 @@ class CernNdiff < Formula sha256 "bb7ec4fd2605658c5d2ff764a6dc867c1322c673d6aad93acf9e269237a34907" => :catalina sha256 "77bdb65653b6d4ab9fd1b2f7b5f4af951fce1f50cd5403b3d30eeafdfd85c20a" => :mojave sha256 "66b88d2c6cf4f38ad0a3277175c83d99597ffdde3165905c9bcec285a6befd4d" => :high_sierra + sha256 "99a89db89a9b39ef1c66b42aa453c82f23f4adc7f9518badeffbcee51d6f5a66" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/certbot.rb b/Formula/certbot.rb index 9282c546398be..d8a74107ba2de 100644 --- a/Formula/certbot.rb +++ b/Formula/certbot.rb @@ -8,10 +8,10 @@ class Certbot < Formula head "https://github.com/certbot/certbot.git" bottle do - cellar :any sha256 "51124f197ac71687d356136fbc026856bd84d23882feb1374b4c4e686f318478" => :catalina sha256 "7c0ab82841234e68bedfabdce7186d07058e6ba00db871172e7a9115640ec77e" => :mojave sha256 "319c9005e3d5c4c21e4c8f34589a10e89564563b955be5c599a1f13c2e7405f2" => :high_sierra + sha256 "70b9d03a3bbd95ea8de874265a4eae068c76be9d772cee16a2b329d93c0d14c9" => :x86_64_linux end depends_on "augeas" @@ -25,6 +25,14 @@ class Certbot < Formula depends_on "pkg-config" => :build end + unless OS.mac? + # https://github.com/pypa/setuptools/issues/2017#issuecomment-605354361 + resource "setuptools" do + url "https://files.pythonhosted.org/packages/fd/76/3c7f726ed5c582019937f178d7478ce62716b7e8263344f1684cbe11ab3e/setuptools-45.0.0.zip" + sha256 "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" + end + end + resource "certifi" do url "https://files.pythonhosted.org/packages/b4/19/53433f37a31543364c8676f30b291d128cdf4cd5b31b755b7890f8e89ac8/certifi-2020.4.5.2.tar.gz" sha256 "5ad7e9a056d25ffa5082862e36f119f7f7cec6457fa07ee2f8c339814b80c9b1" @@ -193,6 +201,10 @@ def install # This throws a bad exit code but we can check it actually is failing # for the right reasons by asserting. --version never fails even if # resources are missing or outdated/too new/etc. - assert_match "Either run as root", shell_output("#{bin}/certbot 2>&1", 1) + if Process.uid.zero? + assert_match "Saving debug log", shell_output("#{bin}/certbot 2>&1", 1) + else + assert_match "Either run as root", shell_output("#{bin}/certbot 2>&1", 1) + end end end diff --git a/Formula/certigo.rb b/Formula/certigo.rb index 2f9defd928a8f..525b6b11f2856 100644 --- a/Formula/certigo.rb +++ b/Formula/certigo.rb @@ -10,6 +10,7 @@ class Certigo < Formula sha256 "61a54ac161807e81d794206ccc248a322d98c829c7ac0c70ac3e49cd7e67d7cf" => :catalina sha256 "70770a8b125b80a1af24d9e5285cbeae82407bf496dbf80c6e747cbffa0e10c6" => :mojave sha256 "964af2666fb75b2b389605bc8d3805ef5ff6790ba5dd31da2eb5c344b98a3c7b" => :high_sierra + sha256 "8e52ffcc4a1a0511fddcb915d2af42e0313bc7de7239864436e2b3b6fde67de3" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/certstrap.rb b/Formula/certstrap.rb index 352b2648f4cff..d8d8edd931c7d 100644 --- a/Formula/certstrap.rb +++ b/Formula/certstrap.rb @@ -10,6 +10,7 @@ class Certstrap < Formula sha256 "52e68d4bcd2256bb1026aafefc9aef39c0e7945e1f26c06b3e09f3b7e7d9ab14" => :catalina sha256 "8f7fb0f6d8b559ee4d30972a68d5d76117a86c07233abc49237c516f45f07277" => :mojave sha256 "12fdf1f518c3f2944d30f4289813a82aa56580b844fc2cc1ad3383d8675c9882" => :high_sierra + sha256 "ec79bceff5d4e3a4bce19eb034ef2cb2013ed3da76a0840747b10c01e6640765" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/cf-tool.rb b/Formula/cf-tool.rb index 22596a85c07bb..883ca7dfb2d46 100644 --- a/Formula/cf-tool.rb +++ b/Formula/cf-tool.rb @@ -9,6 +9,7 @@ class CfTool < Formula sha256 "3369b5efe4c26d786fa8a54d4ca208c11dc89850565adaf6a1c922f4f16d2a3f" => :catalina sha256 "4344edd7a9160d7113d135c574146f6ca5bedfded9e8633b02642276999e6dbe" => :mojave sha256 "a3497993ba1bae8cda20da28d5fb7ea8687ba0e50a23d5f6687d515457c4a00c" => :high_sierra + sha256 "a09556afd41a886a94200257be4a8e24647b25d2c0fde35cf7d5426bde6fe30f" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/cf.rb b/Formula/cf.rb index 568e8a0293699..3c2d4408610e2 100644 --- a/Formula/cf.rb +++ b/Formula/cf.rb @@ -13,6 +13,7 @@ class Cf < Formula sha256 "658dbcf6f4868922582db207b8713c8a9009bc99d3d976866ecfacbb9f95dfd5" => :el_capitan sha256 "4b4d294a9bd632f4daa07e643f7e33e3ffcf419d4df76c6656d2c688795f0d3c" => :yosemite sha256 "ea165ebb43cf7e6d55e34b43df6dc31bc3b8a3d5d3441cb4106630b168e8c90b" => :mavericks + sha256 "3b47e2cebacba554b75bfe7e7caecd4068b25306d27032e8505e20f664c7289c" => :x86_64_linux end def install diff --git a/Formula/cfitsio.rb b/Formula/cfitsio.rb index 2cc4a35d99bc9..6e852c331c0e3 100644 --- a/Formula/cfitsio.rb +++ b/Formula/cfitsio.rb @@ -10,6 +10,7 @@ class Cfitsio < Formula sha256 "efaeebd4d115eabfc622672dc88f12b4aafce9ff20bce08e887147985c42d781" => :catalina sha256 "a35caaadc929ff314d3b93b9bd8951b263724ef8300a433fe7607a477ab2b1d7" => :mojave sha256 "27d890a098774743dd8c60c77d9faa7e303f52dfc977ebaa54469ff393c84929" => :high_sierra + sha256 "dc54708591f515b2bad76c71f8d1ed7a2dd5d9ebcb09f743348d947d2103b19c" => :x86_64_linux end def install diff --git a/Formula/cfn-lint.rb b/Formula/cfn-lint.rb index 78926532ac39e..ea074a5edcfd4 100644 --- a/Formula/cfn-lint.rb +++ b/Formula/cfn-lint.rb @@ -11,6 +11,7 @@ class CfnLint < Formula sha256 "71c470a124bb44cb608b9a30cf4687d68beb76d1f17850971dc4989a40e3c9e6" => :catalina sha256 "370848b62d535b14ce6fe4b8d6fad6514a11d8a56c5b3981b7d7312e2125006b" => :mojave sha256 "5a90db54e3d6e999977cee93b83874e73fd8974ff50dda3e9997ea6d7b21faed" => :high_sierra + sha256 "3f887106c2a724296418d40e04cf67c37662abd589e52d882055dde6edbfe46a" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/cfssl.rb b/Formula/cfssl.rb index 12df3c0b41b13..3a5dd79d082c6 100644 --- a/Formula/cfssl.rb +++ b/Formula/cfssl.rb @@ -11,6 +11,7 @@ class Cfssl < Formula sha256 "324cc909a9f6ade935def00160e7031fefa4a6aeb54d7595bec67986015e916b" => :catalina sha256 "186357f1d25264be064c11a9aa2f7d7638687b8842a6945f313e576214a0f961" => :mojave sha256 "0ad5f71f0350706a43d6fe121ad328c9d9fee4595c51ea900a0b9b466e4909b0" => :high_sierra + sha256 "5085744583d54c9c21674082fefc3cf760683048e9c39805bd67a8855b2ef6ae" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/cgdb.rb b/Formula/cgdb.rb index fdfdd0ba4d326..d61ba5d54798f 100644 --- a/Formula/cgdb.rb +++ b/Formula/cgdb.rb @@ -9,6 +9,7 @@ class Cgdb < Formula sha256 "8f361fcad59ddf4825f4d42b516a099ba75bfffc0b885d42aeb875dbd1b2a1d4" => :mojave sha256 "9ab4c0a880cb71903094929b04eada3c279a48ddb00b651a8a93d55cd523d380" => :high_sierra sha256 "db6c63b20e2185ecaaf3ddef92d1ff052f0b0322c727f3f0429ef0d38ac9d269" => :sierra + sha256 "32af136630de23cbfe59ed7d9593aa8e133a5c680d44042ab9f7901bf31acc6f" => :x86_64_linux end head do @@ -22,6 +23,7 @@ class Cgdb < Formula depends_on "readline" uses_from_macos "flex" => :build + uses_from_macos "texinfo" => :build def install system "sh", "autogen.sh" if build.head? diff --git a/Formula/cglm.rb b/Formula/cglm.rb index 5e5a78a856221..42e4c4e782ef7 100644 --- a/Formula/cglm.rb +++ b/Formula/cglm.rb @@ -9,6 +9,7 @@ class Cglm < Formula sha256 "71acb4380ab467ed76133c76d7b971a9914c0ba07b41ad51ee7e5b74334b6861" => :catalina sha256 "253894ff185a4f8499253543a8cd246dc8958f65746f3319f1e311c0f81feabc" => :mojave sha256 "683def15df6b8bf55a4954a3427291b559204975b5cdc35d74a18170d4e7db58" => :high_sierra + sha256 "50ba2936befa7cbfd7a802d3b5a6f55d4d5c1ab0b959ab7d2708c53c5c4da38d" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/cgns.rb b/Formula/cgns.rb index 16bc4fea0c1ed..fa7e49e3f6812 100644 --- a/Formula/cgns.rb +++ b/Formula/cgns.rb @@ -7,10 +7,10 @@ class Cgns < Formula head "https://github.com/CGNS/CGNS.git" bottle do - cellar :any sha256 "bd68e99330428811196cf3ed189ea61b67d86a2e58af3f0971b6d5f20f1d8ec4" => :catalina sha256 "f2f5d0c81b8adfcd2ef8d1a91c9b29f8e875fe6349badcac81e7e475caa4df89" => :mojave sha256 "d81da89ddc8f36b947f476362e60be07f7b5c81c209b4dfa960a26b007d9d1c8" => :high_sierra + sha256 "4eaf1a8d3e02f932154dbab824505b465d0c59d7eefd53351bb5319fa792361e" => :x86_64_linux end depends_on "cmake" => :build @@ -33,7 +33,9 @@ def install end # Avoid references to Homebrew shims - inreplace include/"cgnsBuild.defs", HOMEBREW_LIBRARY/"Homebrew/shims/mac/super/clang", "/usr/bin/clang" + os = OS.mac? ? "mac" : "linux" + cc = OS.mac? ? "clang" : "gcc-5" + inreplace include/"cgnsBuild.defs", HOMEBREW_LIBRARY/"Homebrew/shims/#{os}/super/#{cc}", "/usr/bin/#{cc}" end test do diff --git a/Formula/cgrep.rb b/Formula/cgrep.rb index 8c8ce74bdd253..8f44c227318c3 100644 --- a/Formula/cgrep.rb +++ b/Formula/cgrep.rb @@ -7,10 +7,10 @@ class Cgrep < Formula head "https://github.com/awgn/cgrep.git" bottle do - cellar :any sha256 "cee7f82d8e3e6b46e2afae649e13cf55202771da2473fbbebc6a712aa2f46496" => :catalina sha256 "0ac8d5bcfc0ce6d295aa617cf0e5c624c61df4fc28a2ddb8c7b21bf753c7e369" => :mojave sha256 "55118e5aa9a1999081105f7b2aa3e00793de45623fa61c0e69c6830e598d045a" => :high_sierra + sha256 "faed5ae9e1b22ce868f4ec9605a6efe66b093017475f6b6eeed44c30b6de8b65" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/cgvg.rb b/Formula/cgvg.rb index d94baec2b7e23..e8d3659134be6 100644 --- a/Formula/cgvg.rb +++ b/Formula/cgvg.rb @@ -14,6 +14,7 @@ class Cgvg < Formula sha256 "a8232322755cb4c369193dca37fecb968ff689c6463611680e12f216f46507c4" => :el_capitan sha256 "de0c8b890aa68670097790093fdceccfe1d69598c18ea5385069efc2f73a3c5d" => :yosemite sha256 "d05cafffec1008fff858f9c0210d37d4d081aa34d8a490b968a8b824866a69be" => :mavericks + sha256 "a9fabe57878811418054600d055d15f12daa8a845f577fecea291d1306ddd63d" => :x86_64_linux end def install diff --git a/Formula/chadwick.rb b/Formula/chadwick.rb index 8830779861166..62ff6527cb787 100644 --- a/Formula/chadwick.rb +++ b/Formula/chadwick.rb @@ -9,6 +9,7 @@ class Chadwick < Formula sha256 "693c6ee0980401936a83453bdbc398aeb0eb06ba9bb8e101046508b14edfdc98" => :catalina sha256 "a068fd25b1e8b3d6f9a56a8a1d4ac18a49f07f82450b1ab3f3766b86fb0a362a" => :mojave sha256 "427b5c0fca10b23b66c56bda3537080df2ba467edea59a9dfd2f0fba56f50f9b" => :high_sierra + sha256 "0ac0ab43ad4ecd66454b88ba1f04ac9c8e258caf0ea1202012e3d9d1dd2794a5" => :x86_64_linux end def install diff --git a/Formula/chafa.rb b/Formula/chafa.rb index c10800ee7fcca..cda4ddb37bccd 100644 --- a/Formula/chafa.rb +++ b/Formula/chafa.rb @@ -9,6 +9,7 @@ class Chafa < Formula sha256 "f8285220cba2737c58bea611f3c0b653b3c5e1306b8cef3ff33642ed26260fb8" => :catalina sha256 "a483480366443ac91c52ebab6a06d0995a541098ce163a03c6cef71c0829be1c" => :mojave sha256 "272891299f7962a49755de583274a21a49759e020418586fa0e7cdfe7c8e2202" => :high_sierra + sha256 "d58a4f786612b2f204f4f80088c24338be9c0136343cf8a87173bd0184a935c4" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/chamber.rb b/Formula/chamber.rb index 78e33af9014bd..6d92156443e9c 100644 --- a/Formula/chamber.rb +++ b/Formula/chamber.rb @@ -10,6 +10,7 @@ class Chamber < Formula sha256 "8371eee8ce1d24a682597422a12b651ef6cdbabe3ef81c9678ee8f460401d063" => :catalina sha256 "fe13b0ef1b110c43034f0e4ce3c414c68f199bcc5147ba2dda16608ab6673a05" => :mojave sha256 "948c865eb11c46e8d662dad8db21f39d53476a99bfb5475aa1fdb68b5cd86201" => :high_sierra + sha256 "b3cedfa05f8333eb07ebbf3eb1293a81565fb25ffd5e0277ded0593957cade67" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/chapel.rb b/Formula/chapel.rb index 52e6d06a97651..393d28a7c206a 100644 --- a/Formula/chapel.rb +++ b/Formula/chapel.rb @@ -8,9 +8,14 @@ class Chapel < Formula sha256 "aa7c3e7f089ac71f88c51eb06d0551d78661cb4fadaa86d9807a908c45650df8" => :catalina sha256 "e722faf3c5f799150134f179d81733830b9b838812bdec77d350e0f752f71a5e" => :mojave sha256 "9ba754a9f0788efe6ff78a6218773a915078ef798c2a9c72defa12ff18374fd1" => :high_sierra + sha256 "197dcc2a4738c1c7b222aae3a334ee24a748d8b9dbc47f83d776d99e9eecfba1" => :x86_64_linux end + depends_on "python@3.8" unless OS.mac? + def install + ENV.prepend_path "PATH", Formula["python@3.8"].opt_libexec/"bin" unless OS.mac? + libexec.install Dir["*"] # Chapel uses this ENV to work out where to install. ENV["CHPL_HOME"] = libexec @@ -29,12 +34,22 @@ def install prefix.install_metafiles # Install chpl and other binaries (e.g. chpldoc) into bin/ as exec scripts. - bin.install Dir[libexec/"bin/darwin-x86_64/*"] - bin.env_script_all_files libexec/"bin/darwin-x86_64/", :CHPL_HOME => libexec + platform = if OS.mac? + "darwin-x86_64" + else + Hardware::CPU.is_64_bit? ? "linux64-x86_64" : "linux-x86_64" + end + bin.install Dir[libexec/"bin/#{platform}/*"] + bin.env_script_all_files libexec/"bin/#{platform}/", :CHPL_HOME => libexec man1.install_symlink Dir["#{libexec}/man/man1/*.1"] end test do + # Fix [Fail] chpl not found. Make sure it available in the current PATH. + # Makefile:203: recipe for target 'check' failed + ENV.prepend_path "PATH", bin unless OS.mac? + ENV.prepend_path "PATH", Formula["python@3.8"].opt_libexec/"bin" unless OS.mac? + ENV["CHPL_HOME"] = libexec cd libexec do system "util/test/checkChplInstall" diff --git a/Formula/charm-tools.rb b/Formula/charm-tools.rb index 419f14169208d..cb40a1ad759e5 100644 --- a/Formula/charm-tools.rb +++ b/Formula/charm-tools.rb @@ -11,6 +11,7 @@ class CharmTools < Formula sha256 "dddb172886d1220f9973ec549d167d1f0ba86b8eaf1f02399be820e7086c8ed5" => :catalina sha256 "b90b92410de61d3af7cfce211d45d38943f9d991a254a699e4b9321831c122e9" => :mojave sha256 "93bf33040e5829839cebebd39bcab01a5e4fdf678730fecdca3a93502d333777" => :high_sierra + sha256 "e0eda69da6315a4239708a2a0c67c2f79c977fe51f240564a6094f9835174ac6" => :x86_64_linux end depends_on "charm" @@ -111,8 +112,15 @@ class CharmTools < Formula end resource "keyring" do - url "https://files.pythonhosted.org/packages/a6/52/eb8a0e13b54ec9240c7dd68fcd0951c52f62033d438af372831af770f7cc/keyring-21.2.1.tar.gz" - sha256 "c53e0e5ccde3ad34284a40ce7976b5b3a3d6de70344c3f8ee44364cc340976ec" + if OS.mac? + url "https://files.pythonhosted.org/packages/a6/52/eb8a0e13b54ec9240c7dd68fcd0951c52f62033d438af372831af770f7cc/keyring-21.2.1.tar.gz" + sha256 "c53e0e5ccde3ad34284a40ce7976b5b3a3d6de70344c3f8ee44364cc340976ec" + else + # 'keyring<21' + # https://github.com/juju/charm-tools/commit/cde3ea4120736236dac160895d17065fc5483c83 + url "https://files.pythonhosted.org/packages/97/b5/983b219cc9288340b1a572dc85b1efd96938d807dae9ebc9355616e0db32/keyring-20.0.1.tar.gz" + sha256 "963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d" + end end resource "launchpadlib" do diff --git a/Formula/charm.rb b/Formula/charm.rb index 69e6990d94ac9..3eb25e49fa565 100644 --- a/Formula/charm.rb +++ b/Formula/charm.rb @@ -11,6 +11,7 @@ class Charm < Formula sha256 "8fceac06a83052ab1a67a5845ebc910438105e543677756c774c05b3a03a81c8" => :mojave sha256 "0b0552a903e6a0a29fbf38c1d2110263df22fd5a12599e36cd60b22bc1dab71e" => :high_sierra sha256 "1e3250586c714b629398dc02cd1b8168fe0cfe70a8a067d700b8b425f16d2ffa" => :sierra + sha256 "cf57aa362a823a2770abd4a2a0603ece0df3fe293e91fa3cb318e16a5b3b2b81" => :x86_64_linux end depends_on "bazaar" => :build diff --git a/Formula/cheapglk.rb b/Formula/cheapglk.rb index ecae4ab436014..4fe0690d3f938 100644 --- a/Formula/cheapglk.rb +++ b/Formula/cheapglk.rb @@ -13,6 +13,7 @@ class Cheapglk < Formula sha256 "d76d29db8ea0201fcef949e02cbddb1c06311dece796a263192ffef487a3aa2c" => :sierra sha256 "497a5399738c026d318d3213b764f20fb80ccea94181919fad2e80eb75086055" => :el_capitan sha256 "8351c9dec39fd8e860e50a8e693e1c648def81c3ddcbdd3a856f656d585b0082" => :yosemite + sha256 "bef666b5ffc26b22b763537ee7dc2b26854f2e329fb950194e4b5fd80151e50f" => :x86_64_linux end keg_only "it conflicts with other Glk libraries" diff --git a/Formula/cheat.rb b/Formula/cheat.rb index 2504d60ac2c06..578a417b47cef 100644 --- a/Formula/cheat.rb +++ b/Formula/cheat.rb @@ -9,6 +9,7 @@ class Cheat < Formula sha256 "22e47b7e9dfb461e2e9f8c3dac9ead9fe261026a0f4b4ce2b89f490253ea2962" => :catalina sha256 "c46bf0a127b1fd10e45b26e4fdf88333228f9d230f71190580891acd64a2a7bd" => :mojave sha256 "78d1fc2437cda33d65afab69eadf4870afcb0ac7a0ff6fbe55ede0af982d52a7" => :high_sierra + sha256 "78c2a9c1dd7daaa44b957bcfb170785475ce29d8a2c29a2fffcbb942122b6e9c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/check.rb b/Formula/check.rb index 554b5798e103c..5118b7b541ca8 100644 --- a/Formula/check.rb +++ b/Formula/check.rb @@ -9,6 +9,7 @@ class Check < Formula sha256 "dbc7dd0d84f86a9ad3813a4ad45b076903120f0e3d0cb949c46f2dfc448e7d3c" => :catalina sha256 "9820eed7640c7e834672ea0a378b37ebc8825b0513de1b06b6321eb51c799686" => :mojave sha256 "f1f7a1f81a08235f922124a0e833fd9862e9e53931c5113ad543b42c4636a2b6" => :high_sierra + sha256 "3d23c9dde99765d537b865cc6de56a9765f7c195fa0127d02d3cb0b080ca0572" => :x86_64_linux end on_linux do diff --git a/Formula/check_postgres.rb b/Formula/check_postgres.rb index 4157af5dc06d6..892d17e5c101f 100644 --- a/Formula/check_postgres.rb +++ b/Formula/check_postgres.rb @@ -10,6 +10,7 @@ class CheckPostgres < Formula sha256 "2f164aefe3706e144350278db4e9246359a8a58bba1f16fae289344553e33b64" => :catalina sha256 "2f164aefe3706e144350278db4e9246359a8a58bba1f16fae289344553e33b64" => :mojave sha256 "e0ae2298e162d333e8833ad294906ba369ac5adaf704b8478ebf54c7a134b9f4" => :high_sierra + sha256 "2eccb3b3d0b61f22cb4d7e3f0662217ba801a46d754cc8528e011a89a0640e02" => :x86_64_linux end depends_on "postgresql" diff --git a/Formula/checkstyle.rb b/Formula/checkstyle.rb index 6a86480f644e5..9c5db4fd7052b 100644 --- a/Formula/checkstyle.rb +++ b/Formula/checkstyle.rb @@ -6,6 +6,8 @@ class Checkstyle < Formula bottle :unneeded + depends_on :java unless OS.mac? + def install libexec.install "checkstyle-#{version}-all.jar" bin.write_jar_script libexec/"checkstyle-#{version}-all.jar", "checkstyle" diff --git a/Formula/cheops.rb b/Formula/cheops.rb index 68d466e8b44cf..a947b9a0ae864 100644 --- a/Formula/cheops.rb +++ b/Formula/cheops.rb @@ -13,6 +13,7 @@ class Cheops < Formula sha256 "f6087558b906474548d121bf3e745a7291dbc307d0c9ef16b3b6edd92d9dc830" => :sierra sha256 "3ed8f3d4920c6c44b4d25f16402564db5639acb1e3f104329f244cd52051a9f6" => :el_capitan sha256 "de719231c43b1494c0a77fe0ef97868399bd67e3c3386fecfd6564f26f4acbdf" => :yosemite + sha256 "eaf5dea55f884df12d85f17d3324013999917660e20cb4e73ee993d3f1daf6d8" => :x86_64_linux end def install diff --git a/Formula/chibi-scheme.rb b/Formula/chibi-scheme.rb index aee109ac9d4d4..c6edd612e330c 100644 --- a/Formula/chibi-scheme.rb +++ b/Formula/chibi-scheme.rb @@ -10,6 +10,7 @@ class ChibiScheme < Formula sha256 "f282470572fc6498ab24bf3fae1239eb7cc89b424251446dc8bf8063bbd99aea" => :catalina sha256 "5cfc8a336bc76a1a268d2af908dd3f78a40cd87aedae92258b1ebb5755409cd9" => :mojave sha256 "f5380c4a6d6fb13f6937117da61e71a088897fd53bbbeaa12fdab5cf41bc5540" => :high_sierra + sha256 "d7cac8d7d4c7c8c6a257d8e453631e0ef80320297499a58bcc5ad7ba7d1a54bb" => :x86_64_linux end def install diff --git a/Formula/chicken.rb b/Formula/chicken.rb index eb5ec2bcdc74d..7e054be4baa59 100644 --- a/Formula/chicken.rb +++ b/Formula/chicken.rb @@ -9,19 +9,20 @@ class Chicken < Formula sha256 "674b9d864481f15a5b406c1ef2e1dfce8ee584a100edf2501a096afee44ad396" => :catalina sha256 "3d35a95b8296a8e37c5bbaf5d77188684adcccc7f3f3d77e73c6c3e9ac566f86" => :mojave sha256 "17b093038bb0845a2687c1294288a11992f4e2279a64c93ef0e2c80977a1d882" => :high_sierra + sha256 "e6629e7f5cabe5d64f4f886e1daa4f6baa5c005d163a766d146f3889f0722544" => :x86_64_linux end def install ENV.deparallelize args = %W[ - PLATFORM=macosx + PLATFORM=#{OS.mac? ? "macosx" : "linux"} PREFIX=#{prefix} C_COMPILER=#{ENV.cc} LIBRARIAN=ar - POSTINSTALL_PROGRAM=install_name_tool ARCH=x86-64 ] + args << "POSTINSTALL_PROGRAM=install_name_tool" if OS.mac? system "make", *args system "make", "install", *args diff --git a/Formula/chinadns-c.rb b/Formula/chinadns-c.rb index 246dab3a7de5f..ca202f28b98fe 100644 --- a/Formula/chinadns-c.rb +++ b/Formula/chinadns-c.rb @@ -13,6 +13,7 @@ class ChinadnsC < Formula sha256 "a620bce8421a9773233c51886c6845995569a1fda80e252efa86f6271c1d274c" => :el_capitan sha256 "329351a4f82e4f871cbc2b384902b0c84040bd1df222970d67be7513bbead207" => :yosemite sha256 "4266825a8ecbb6a84d459b41465fe9318a918b171880ac8ddfd8bdf3e37573d1" => :mavericks + sha256 "0ae6ba84c62433d9152027bd8ba7ed3d463db892624f07ec38955f5a986d080b" => :x86_64_linux end head do diff --git a/Formula/chipmunk.rb b/Formula/chipmunk.rb index f7c8b20fbf94c..9486ce4790172 100644 --- a/Formula/chipmunk.rb +++ b/Formula/chipmunk.rb @@ -12,6 +12,7 @@ class Chipmunk < Formula sha256 "16292e5518bae60c6990a6f1565e1416f91ffe1c878ab43b58465bb2a24d3d11" => :mojave sha256 "5370b9d8db489d6b8944c23fd4906768c84d87e22f054ca3381c7ee527233f4d" => :high_sierra sha256 "c92a9c1134a272244ca3936b2c94431df7ed7002a9eec99f6914fe1128adae12" => :sierra + sha256 "01338d806746c74b8500036c3014a0fdba695cedc95c58a7938046698191aecb" => :x86_64_linux end depends_on "cmake" => :build @@ -37,8 +38,9 @@ def install return 0; } EOS - system ENV.cc, "-I#{include}/chipmunk", "-L#{lib}", "-lchipmunk", - testpath/"test.c", "-o", testpath/"test" + system ENV.cc, *("-pthread" unless OS.mac?), "-I#{include}/chipmunk", + testpath/"test.c", "-L#{lib}", "-lchipmunk", + "-o", testpath/"test" system "./test" end end diff --git a/Formula/chmlib.rb b/Formula/chmlib.rb index f9eeb08da937f..8e99a4e6e011c 100644 --- a/Formula/chmlib.rb +++ b/Formula/chmlib.rb @@ -15,6 +15,7 @@ class Chmlib < Formula sha256 "6b834a6ae6e95f8daaa726fd6ae1a2d3e60335f98862fea9e790c24e5a6411d1" => :el_capitan sha256 "bdc19058cbf1690e960bd88d06f6c8b2ff47f8b743947eb82c259ba394881a65" => :yosemite sha256 "366c564a2cd0185d84ff6892f5d773f80ddee50f6db39e763060b3ebb31413b3" => :mavericks + sha256 "05d5aa707c42b2a693b39a0817744d2383450b6303c2dd3de8b8a89f56e6012d" => :x86_64_linux end def install diff --git a/Formula/chocolate-doom.rb b/Formula/chocolate-doom.rb index 72eb409ee2007..5c85b2f33d491 100644 --- a/Formula/chocolate-doom.rb +++ b/Formula/chocolate-doom.rb @@ -9,6 +9,7 @@ class ChocolateDoom < Formula sha256 "91f8a622d0299afd99d6eb4768184100addb0d1a804683aa6486548ed5a14d8d" => :catalina sha256 "9090cd83e434977b523647ea125b5de78ca8c2b434f1933a606200999e137a30" => :mojave sha256 "c4799300dc6c4b10d68e0764cb57eec612fbe3d07a2ce7eeb0cf6bc60905a687" => :high_sierra + sha256 "83a3b28127e0b310a0bcd36bdba4a61c34cef25b6771dc7385e12ebbb209fde6" => :x86_64_linux end head do diff --git a/Formula/choose-gui.rb b/Formula/choose-gui.rb index f464c4478a44c..f3c2500a310ed 100644 --- a/Formula/choose-gui.rb +++ b/Formula/choose-gui.rb @@ -12,7 +12,9 @@ class ChooseGui < Formula sha256 "7b5031da703f0297a387fc3f8220e28070b120c91ae4989327164955eedc56d6" => :high_sierra end - depends_on :xcode => :build + on_macos do + depends_on :xcode => :build + end conflicts_with "choose", :because => "both install a `choose` binary" conflicts_with "choose-rust", :because => "both install a `choose` binary" diff --git a/Formula/choose.rb b/Formula/choose.rb index 818ba504ab1dc..35c7483291aee 100644 --- a/Formula/choose.rb +++ b/Formula/choose.rb @@ -12,6 +12,7 @@ class Choose < Formula sha256 "add76ddd5165ad17bfc784dff7237777eac7ee898379bd55d76228e6f6897d6d" => :catalina sha256 "74170f2582ab4a29bffcc34583017f97f39c5b600a5f5cfebacd6d66ecd5c818" => :mojave sha256 "388b64e8072a54f01006ab9cad297789eda36fe0bec83b45759cfe80dbf8cb2c" => :high_sierra + sha256 "2f389f87ab1391b4adea1d0ec7040eacbe47564e5aeef6c8e747b4e36c3b9853" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/chordii.rb b/Formula/chordii.rb index 5ce3ce72bb055..00d4e0421a007 100644 --- a/Formula/chordii.rb +++ b/Formula/chordii.rb @@ -9,6 +9,7 @@ class Chordii < Formula sha256 "ed1f635a737973af4b9f4f784757cdf0ddbb3f946cb285917c171392a9b59d4a" => :catalina sha256 "def6b665fba55dfb8fa30269966e059b0a827f62a2338f73ea89c47a42fa7de7" => :mojave sha256 "1901080a06bb4728ec9858e4e548f68e044534b9d65dee1996f0590b56abc1a9" => :high_sierra + sha256 "13518eaae4f3c625d0e2aeb45dc91339c9f14c7a010f9d8eef1ea962d468ed8d" => :x86_64_linux end def install diff --git a/Formula/chromaprint.rb b/Formula/chromaprint.rb index e27199516d892..ad7b95f78d69f 100644 --- a/Formula/chromaprint.rb +++ b/Formula/chromaprint.rb @@ -10,6 +10,7 @@ class Chromaprint < Formula sha256 "8693666d997e651672c56e619fb9a024d7f839748625cf481028600010f37ab3" => :catalina sha256 "eebfcab3bf0e6534a89b8a69c2cfa3d89b4c4f6114351e8cc3a368c4220d31b5" => :mojave sha256 "f47fb0b6d7cb0f7b6f974a8ec2f85c9c1afe1cbb553a87dbf0c47742f5db7e72" => :high_sierra + sha256 "daab2a8d6099f0cfde55428d2ba70a143974fbbefe2a54e58576bf405dfec44c" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/chrome-cli.rb b/Formula/chrome-cli.rb index 91ba4c3e087f4..5d53f4e43773f 100644 --- a/Formula/chrome-cli.rb +++ b/Formula/chrome-cli.rb @@ -14,7 +14,8 @@ class ChromeCli < Formula sha256 "e1d04616371d4c7147f884886d2e61df3bdea48c388dc50a684434f89b417792" => :el_capitan end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? + depends_on :macos def install # Release builds diff --git a/Formula/chruby-fish.rb b/Formula/chruby-fish.rb index 8cf8eb23fa72f..b03cfbfa39ffe 100644 --- a/Formula/chruby-fish.rb +++ b/Formula/chruby-fish.rb @@ -11,6 +11,7 @@ class ChrubyFish < Formula sha256 "ba0ca145d65c92efa34f257219a96d94c4a82800ac5e37b71e3208ed61a82293" => :mojave sha256 "1ebd01df8a1edd51c2b73568c1db57b38a672b530fd0a55d063595370d0c301d" => :high_sierra sha256 "1ebd01df8a1edd51c2b73568c1db57b38a672b530fd0a55d063595370d0c301d" => :sierra + sha256 "09b1fe583b6d4d1c4c0162cbecd82e99deb3ca3a623fdec950680fd7d882e66d" => :x86_64_linux end depends_on "chruby" diff --git a/Formula/chruby.rb b/Formula/chruby.rb index 47a6ae2febf76..8432455c4b3fe 100644 --- a/Formula/chruby.rb +++ b/Formula/chruby.rb @@ -14,6 +14,7 @@ class Chruby < Formula sha256 "ff70dff83817f093d39384a40d3dfb2aaccc1cbe475d58383d4ef157085f2c64" => :el_capitan sha256 "eb14810c552b693c5ae82a577be81398e7dfeadc5489666bb0ff89581f09bfe4" => :yosemite sha256 "c7ede5a22e512d3c22406f222b539fe05b78dfb9721cfff8ce94ed0357883ba5" => :mavericks + sha256 "4c70e64524d054d86b15f623df44c800640b9b8ca8ee62b4ae4c4585a4ea48c8" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/chuck.rb b/Formula/chuck.rb index 61b97979834cb..674fb05d44491 100644 --- a/Formula/chuck.rb +++ b/Formula/chuck.rb @@ -11,7 +11,7 @@ class Chuck < Formula sha256 "bf6caf2f7ecd22b43afca372f0fd7e26fab5145aee922725ddbb237039cd1883" => :high_sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? def install system "make", "-C", "src", "osx" diff --git a/Formula/cidrmerge.rb b/Formula/cidrmerge.rb index b38dfdd39983e..ebdb049f278c9 100644 --- a/Formula/cidrmerge.rb +++ b/Formula/cidrmerge.rb @@ -13,6 +13,7 @@ class Cidrmerge < Formula sha256 "7e607252679cd1648e6c9f48ebbeaa2379ce089ad87815bd6636e65dcedebc7b" => :el_capitan sha256 "20c6f57fc6081c8d27d2e68b81e3d4c5cd68e7c799dc30e076f45ee71b42e69d" => :yosemite sha256 "89b2d5b31bd190e0aa8837b84f3a684cf01b4501321e898507e5d8dd809f09d7" => :mavericks + sha256 "0d9f0abe1ec4904e40318954285c522fa2bfce4117c3ae70386b7f86cd01a0d2" => :x86_64_linux end def install diff --git a/Formula/cig.rb b/Formula/cig.rb index 626b8a4a74411..c493535c5d67e 100644 --- a/Formula/cig.rb +++ b/Formula/cig.rb @@ -12,6 +12,7 @@ class Cig < Formula sha256 "6ae38e73bed4326d85c7f31498b0a5715d877c7a2e32aad9987ba7726efe240e" => :mojave sha256 "9215f225d4b314d1047f6bb4e5c909b82b456d2005fffed8c637ca2d63641791" => :high_sierra sha256 "5d4eb1f34f8b185513d59dc9072f1a95555dd222f0f7a0526c89983e1643fef6" => :sierra + sha256 "31b282304027a333bf1d0320610f1edbb7794bece22b236a2f249013e49d07c4" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/circleci.rb b/Formula/circleci.rb index 42e9b1e5e47e2..254ecc3898640 100644 --- a/Formula/circleci.rb +++ b/Formula/circleci.rb @@ -11,6 +11,7 @@ class Circleci < Formula sha256 "1e91ba4669d88aaaf56cfd9efd279ff16321522c004e8c66fac38eaec79ef51e" => :catalina sha256 "cb73dd99de7f008b70e72aa7ffde2766dfd317c3505748f044c8519bf237b2c1" => :mojave sha256 "4921166b95c0d9fbd55d676ac6d3bc30916832ee4b83091a706c979ae9b1ea54" => :high_sierra + sha256 "7b6309e1b4c12f6ae9e2d635c82b249b20ad8eb499fe85997949794f96cf696a" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/cksfv.rb b/Formula/cksfv.rb index 6dadd4334a137..6a10c04d02a61 100644 --- a/Formula/cksfv.rb +++ b/Formula/cksfv.rb @@ -13,6 +13,7 @@ class Cksfv < Formula sha256 "41d81d535cfa41b4eb03709e646b0bdc36a78f99c8e15746b7eb289a98afbb97" => :el_capitan sha256 "9885cadccdeec56d0f665bad80655cfba3397c3ff2958c7a44af514a69bc8114" => :yosemite sha256 "3838548d5febbed5d9db37e8634397a589bcec766ee5ec84949a17dae9b34cdd" => :mavericks + sha256 "5d651d6c6dda4c293b8cf1e56e647a86aac048ccc29b19c7c574c82c1bac23ba" => :x86_64_linux end def install diff --git a/Formula/clac.rb b/Formula/clac.rb index 7c7ccf72fa571..1d77c2ed29a8d 100644 --- a/Formula/clac.rb +++ b/Formula/clac.rb @@ -9,6 +9,7 @@ class Clac < Formula sha256 "afa69f51c57695ae2e01a3ad9a44690fa746e925129ab2809550811cafe0fb3f" => :catalina sha256 "af0e4194b84f969e0a701f32c102dd64a432f6f675e6913716b81b96e548d451" => :mojave sha256 "5be5ed82ad0b8669aef16942e39e9d60341ab6201ee019b9b997ab5ee4ea76b1" => :high_sierra + sha256 "702df9f7e39ddc26efbd1fc951822cb2b8349cda6e6da962639f65a6ac566b97" => :x86_64_linux end def install diff --git a/Formula/clamav.rb b/Formula/clamav.rb index 73e5c419bd9c1..5f1cd4cf06fe3 100644 --- a/Formula/clamav.rb +++ b/Formula/clamav.rb @@ -9,6 +9,7 @@ class Clamav < Formula sha256 "14f69086a768c2a4a30fd5c4316201363b5265eb4a303159fd7773bc44d42e05" => :catalina sha256 "1de7b34afbff07514302deb8ea6f3fb79095509911be98e3ab4f5d674f0f8ef2" => :mojave sha256 "7d2140eef1f3af64ec2dc22c78d4a8f1778f56eb9ae84ee3a38fa1814d70d98a" => :high_sierra + sha256 "6d2ecc40f914ceae36567a29a58fb63d71bf5a65d67b76c8ffb9c2884d22e0c5" => :x86_64_linux end head do @@ -21,7 +22,7 @@ class Clamav < Formula depends_on "pkg-config" => :build depends_on "json-c" - depends_on "libiconv" + depends_on "libiconv" if OS.mac? depends_on "openssl@1.1" depends_on "pcre2" depends_on "yara" @@ -47,11 +48,19 @@ def install --with-libjson-static=#{Formula["json-c"].opt_prefix}/lib/libjson-c.a --with-openssl=#{Formula["openssl@1.1"].opt_prefix} --with-pcre=#{Formula["pcre2"].opt_prefix} - --with-zlib=#{MacOS.sdk_path_if_needed}/usr - --with-libbz2-prefix=#{MacOS.sdk_path_if_needed}/usr - --with-xml=#{MacOS.sdk_path_if_needed}/usr ] + if OS.mac? + args << "--with-zlib=#{MacOS.sdk_path_if_needed}/usr" + args << "--with-libbz2-prefix=#{MacOS.sdk_path_if_needed}/usr" + args << "--with-xml=#{MacOS.sdk_path_if_needed}/usr" + else + args << "--with-zlib=#{Formula["zlib"].opt_prefix}" + args << "--with-libbz2-prefix=#{Formula["bzip2"].opt_prefix}" + args << "--with-xml=#{Formula["libxml2"].opt_prefix}" + args << "--with-libcurl=#{Formula["curl"].opt_prefix}" + end + pkgshare.mkpath system "autoreconf", "-fvi" if build.head? system "./configure", *args diff --git a/Formula/clang-format.rb b/Formula/clang-format.rb index 93de40b0a1dcd..9c39de4465af8 100644 --- a/Formula/clang-format.rb +++ b/Formula/clang-format.rb @@ -2,7 +2,6 @@ class ClangFormat < Formula desc "Formatting tools for C, C++, Obj-C, Java, JavaScript, TypeScript" homepage "https://clang.llvm.org/docs/ClangFormat.html" version_scheme 1 - head "https://github.com/llvm/llvm-project.git" stable do url "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/llvm-10.0.0.src.tar.xz" @@ -24,10 +23,32 @@ class ClangFormat < Formula sha256 "7a2d877df6d298cba78b2ea3e543b5a874cf7af853538d9e1ae4b74b5f69bb65" => :catalina sha256 "91e010b88d1779626bd693c6df0da1e10156887bc5bc2d3ed6500965ea66ec96" => :mojave sha256 "dc9b3fe7f1b043286fb5554d26a70defabf0aa668b2861624451005c9593eca3" => :high_sierra + sha256 "0d8f5ada639dfdcd66d7dd6d8eca52b859d7d9a4fc09aad30759db6868dad94b" => :x86_64_linux + end + + head do + url "https://git.llvm.org/git/llvm.git" + + resource "clang" do + url "https://git.llvm.org/git/clang.git" + end + + resource "libcxx" do + url "https://git.llvm.org/git/libcxx.git" + end end depends_on "cmake" => :build depends_on "ninja" => :build + depends_on "subversion" => :build + unless OS.mac? + depends_on "bison" => :build + depends_on "gcc" # needed for libstdc++ + if Formula["glibc"].any_version_installed? || OS::Linux::Glibc.system_version < Formula["glibc"].version + depends_on "glibc" + end + depends_on "libedit" # llvm requires + end uses_from_macos "libxml2" uses_from_macos "ncurses" @@ -35,10 +56,10 @@ class ClangFormat < Formula def install if build.head? - ln_s buildpath/"libcxx", buildpath/"llvm/projects/libcxx" + ln_s buildpath/"libcxx", buildpath/"llvm/projects/libcxx" if OS.mac? ln_s buildpath/"clang", buildpath/"llvm/tools/clang" else - (buildpath/"projects/libcxx").install resource("libcxx") + (buildpath/"projects/libcxx").install resource("libcxx") if OS.mac? (buildpath/"tools/clang").install resource("clang") end @@ -46,7 +67,8 @@ def install mkdir llvmpath/"build" do args = std_cmake_args - args << "-DLLVM_ENABLE_LIBCXX=ON" + args << "-DLLVM_ENABLE_LIBCXX=ON" if OS.mac? + args << "-DLLVM_ENABLE_LIBCXX=OFF" unless OS.mac? args << ".." system "cmake", "-G", "Ninja", *args system "ninja", "clang-format" diff --git a/Formula/classads.rb b/Formula/classads.rb index b3068d61bb9bd..770440fabfa16 100644 --- a/Formula/classads.rb +++ b/Formula/classads.rb @@ -14,6 +14,7 @@ class Classads < Formula sha256 "52bd3bb21e7a2491ad96f01988b802ab183c5e93d3123e9cc57b75e1a0076171" => :el_capitan sha256 "2ec01b2285391e8c1a696c783db281dc69c05e0f2c483792129799b8ad304d7e" => :yosemite sha256 "b2ba8857a9e07ece0c19ac04a78893322bb22b361e28d5eb23abfa2515e965c9" => :mavericks + sha256 "909635d1a430caa525b45dc818b110296da7c70d5e54c0a549156e5b8a532a33" => :x86_64_linux end depends_on "pcre" diff --git a/Formula/clean.rb b/Formula/clean.rb index d4be33da70dae..be69c75ff5243 100644 --- a/Formula/clean.rb +++ b/Formula/clean.rb @@ -13,6 +13,7 @@ class Clean < Formula sha256 "7a433c07eb3c8a3846d352ddf27a6ac32fdc6528b6b2e6212f78318ff0f04a6a" => :el_capitan sha256 "f06ca56bca5a139222603fac5d84555a1af9812a2dd669e44501b2022a16eef8" => :yosemite sha256 "a847561f68c5d636ee3c0802dccfc7a7b1a5cf66030f026b074c000f6cea258d" => :mavericks + sha256 "21a316333cbdf717809703b81bb43aa4ef5541dc00a87fd24fdff0fe06474cc4" => :x86_64_linux end def install diff --git a/Formula/clhep.rb b/Formula/clhep.rb index 2a43b0bb321ce..9ad75cfa52b3c 100644 --- a/Formula/clhep.rb +++ b/Formula/clhep.rb @@ -9,6 +9,7 @@ class Clhep < Formula sha256 "8c8ce7164df92c63519e8d361f341ef848796cdd4087982e507f32d06952afbf" => :catalina sha256 "fda146a801791ab47ea095d0ba4d201de7fe52a23b90626e56f05aaeaf181a8f" => :mojave sha256 "7cd39923fcc37640a5f8bf841252c1f914494443aa5c359a6aa68a6e57ee9282" => :high_sierra + sha256 "78f4da8fe0568e8c05b7d54dd8410a952b073de572577229e2520df426860d7a" => :x86_64_linux end head do diff --git a/Formula/cli53.rb b/Formula/cli53.rb index e3b1f53703ea5..f8719c3e14b7c 100644 --- a/Formula/cli53.rb +++ b/Formula/cli53.rb @@ -9,6 +9,7 @@ class Cli53 < Formula sha256 "65f9f13eb5c2f53afcb697f9699f8dd6b9df5f400908a2d3423879f8ca895942" => :catalina sha256 "73ec9efeaf423dd32530bd4a547b11522b54dd5666942735268bb7690479ff09" => :mojave sha256 "190e2e02b890cf099ca52d1468b224d16c82840a3a534db83a2aed5553b07bfc" => :high_sierra + sha256 "c55f9bc54d14e0b1164a0fdf4e3e631ebf5adcd6e9a37601d068a3f0fa7937bd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/click.rb b/Formula/click.rb index 991784dd06163..c483b910308db 100644 --- a/Formula/click.rb +++ b/Formula/click.rb @@ -10,9 +10,11 @@ class Click < Formula sha256 "6bced21af1d4a16b96986fccbab5781f1aae9d9816ce12fdbb299f70b8711229" => :catalina sha256 "7ac283d05682f3cf9698b324fc749c7a3281048e3789ab0af61f01c649eebf7d" => :mojave sha256 "e1b015903b819bc7f0bde965ca968457f2cac039001abc040ed9652e642fabe7" => :high_sierra + sha256 "e788021a40b1820c2beebef629c3e7c0bf8127eb4536bebc7e5dc5f8ed28dc58" => :x86_64_linux end depends_on "rust" => :build + depends_on "tcl-tk" unless OS.mac? uses_from_macos "expect" => :test diff --git a/Formula/clingo.rb b/Formula/clingo.rb index 606a8c7c0fb50..c4959b0121aed 100644 --- a/Formula/clingo.rb +++ b/Formula/clingo.rb @@ -9,6 +9,7 @@ class Clingo < Formula sha256 "d22f05f1666d6e1c24b92e98b6cec9c44dafc53943555092f79de4625fb0bd9d" => :catalina sha256 "68f3b4714a71193844fd338a4a426e469015db3f3ac11dd42c82080c5a182553" => :mojave sha256 "ace56673b60a0576b584efb515b795354e7b0c2421c82e55a025dc08cba03980" => :high_sierra + sha256 "4d89638e109c043e8cf22a07b9a8498f1a08f02b9f49dbaa4cd91d86a5b5a3db" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cln.rb b/Formula/cln.rb index fa0b16c7fe140..16861da58a19b 100644 --- a/Formula/cln.rb +++ b/Formula/cln.rb @@ -9,6 +9,7 @@ class Cln < Formula sha256 "bbc7716e6028fc3dc95dc22bf20033d13119b6ffe62dbd4c2609ecce85459a92" => :catalina sha256 "1e62717cf6b0562643947c904c547e737bc9209cb349c388c6b7f9edcd915001" => :mojave sha256 "0f14327e937f0a665dc66c5b62dc5d11094d812831221d8b86f8e5ba966e9540" => :high_sierra + sha256 "606f7f6ca6c5ad8665656a09e521befc389ffa71d2ea87eadaca14f5af003671" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/cloc.rb b/Formula/cloc.rb index db9358a6dee78..4c11ebcd3cc18 100644 --- a/Formula/cloc.rb +++ b/Formula/cloc.rb @@ -10,6 +10,19 @@ class Cloc < Formula sha256 "e4ae9366fde0331f1c3e03f8d86c110d25afce7153d6972a0118148d9b368cfa" => :catalina sha256 "824cc150f418d0a1c19dc33cc619da314e553bcd0d42c97ac1cb24394c19ef24" => :mojave sha256 "d8a0fda0a037a1268e61ece760e6d09ce02ad769985142bf997d84d61960baa5" => :high_sierra + sha256 "04c4022eaa1fbfafa8ec3ed9c93938a2c6cfc13c17188e2000a52b763141c1ce" => :x86_64_linux + end + + unless OS.mac? + resource "Devel::GlobalDestruction" do + url "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.14.tar.gz" + sha256 "34b8a5f29991311468fe6913cadaba75fd5d2b0b3ee3bb41fe5b53efab9154ab" + end + + resource "Sub::Exporter::Progressive" do + url "https://cpan.metacpan.org/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz" + sha256 "d535b7954d64da1ac1305b1fadf98202769e3599376854b2ced90c382beac056" + end end resource "Regexp::Common" do diff --git a/Formula/clog.rb b/Formula/clog.rb index 2841e176e13e4..2a8f7beaa486d 100644 --- a/Formula/clog.rb +++ b/Formula/clog.rb @@ -14,6 +14,7 @@ class Clog < Formula sha256 "8f42168b8e165c4c1f1265b410ef62087b370075cc27269f1908eb0f373645c5" => :el_capitan sha256 "a6c42c7d0795252434a3e1fc0307fc40490a4f29a9186408fa3ed7d82ba5f02e" => :yosemite sha256 "61ce3b9c332f9487f9981d8bb93d62fd4b6dfd0bbf0aa8f680b3fd625b2d8576" => :mavericks + sha256 "3b3caad1b6f75007a0aa346d967c2c975ab3e67d6491acfcaa01518de350a269" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cloog.rb b/Formula/cloog.rb index 133b5d284fe41..07332d6ee610a 100644 --- a/Formula/cloog.rb +++ b/Formula/cloog.rb @@ -12,6 +12,7 @@ class Cloog < Formula sha256 "32b9d6ae3b69a1ac153d83997999add0a5836214c21d41fe18a0ef2dd44b3123" => :high_sierra sha256 "f517f774f48f11a1fdcf7d0023bdeacbd919cb22085a539fba539fac80025826" => :sierra sha256 "2e4ac62185b9291272f07381c19bba476eac505a40ff974aa8017b9ec4359b13" => :el_capitan + sha256 "170ae23042338f87e56b4520b6862fe2b5d3fbdfa3f213b12aed7239551ae18c" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/cloud-nuke.rb b/Formula/cloud-nuke.rb index 7cfaf9263e14d..ffb7b68a23994 100644 --- a/Formula/cloud-nuke.rb +++ b/Formula/cloud-nuke.rb @@ -10,6 +10,7 @@ class CloudNuke < Formula sha256 "1bd062358ee79ddd80e6aa82b70586c35e5db0f5578e828534186a2945114be2" => :catalina sha256 "00d0e25987130eef854be69b476785b5c9520c010462b152435aa6a406098c2a" => :mojave sha256 "a7a6c5ebabdab4c70e408d12dac4798d675dcb067de4e342d08c9d8a894ea9b9" => :high_sierra + sha256 "7d570c656c8ae737e58b20205dfeed640dd085c834cd67268f2253a47f92a3fd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/clozure-cl.rb b/Formula/clozure-cl.rb index 672de506d9379..9178691e732b6 100644 --- a/Formula/clozure-cl.rb +++ b/Formula/clozure-cl.rb @@ -12,7 +12,7 @@ class ClozureCl < Formula sha256 "3e2a8e6263055e8e21ae373b0def8f4ad5aebaa4e64df12d67b148bbb3fde177" => :high_sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? resource "bootstrap" do url "https://github.com/Clozure/ccl/releases/download/v1.12/darwinx86.tar.gz" diff --git a/Formula/clp.rb b/Formula/clp.rb index 973f29e5eed6c..9a45c8a46280d 100644 --- a/Formula/clp.rb +++ b/Formula/clp.rb @@ -9,6 +9,7 @@ class Clp < Formula sha256 "4bb1c3b9b0322715b8a83db078a82c02c9430f4eca4032778ef1eb9dbf93db21" => :catalina sha256 "a432a402144f37847273405880b184ffac8b7895da9f7f8c75e1e22069305031" => :mojave sha256 "477054153fcd64813168336f9dc9e35e39a2c49029b15533e16dbf366009c365" => :high_sierra + sha256 "4ff4252dcc098665a72c64e05eafa0d8e4076fcf10fa24c87a01bbcfb74f529a" => :x86_64_linux end depends_on "pkg-config" => [:build, :test] diff --git a/Formula/clpbar.rb b/Formula/clpbar.rb index e17dbfac3601c..1c5628bc6db9f 100644 --- a/Formula/clpbar.rb +++ b/Formula/clpbar.rb @@ -13,6 +13,7 @@ class Clpbar < Formula sha256 "b54fa0ce24de6dda141e3fc025b67f2e0216b01a3664ec5992a98f8087881ddd" => :el_capitan sha256 "edaa21e4d80bbf174e3c040d3c786eb48e381ca8e9477dfbafb06b4ec0bfd19f" => :yosemite sha256 "36f1ece44bec7c54d2235fbfba5122d3a3d0430532498dc5c35601a59f9c4616" => :mavericks + sha256 "58966a976aa612bd843e160151ce6618068a08227feaa6e0868a043b94da43c3" => :x86_64_linux end def install diff --git a/Formula/clucene.rb b/Formula/clucene.rb index d059e0de5791f..5679f9c447f86 100644 --- a/Formula/clucene.rb +++ b/Formula/clucene.rb @@ -15,6 +15,7 @@ class Clucene < Formula sha256 "5ee0c98072c18c75dd8c25fd309ccb49f033300d474367a8e325ec601c427f66" => :el_capitan sha256 "182db4f73e058e9d28b77cbbd642c40ecc403fbf1d9dc8357387b2c54dba8d1e" => :yosemite sha256 "f85cdb67e53bc6eb380ae1bd8e087b42faca7c65f665f9719209adfa8aaa7b31" => :mavericks + sha256 "ba2a75557dc712e5d72f88dc5687a8e13332c197723f462739872b902e04cd93" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/clzip.rb b/Formula/clzip.rb index ded5e85c2d2b9..119657fb48252 100644 --- a/Formula/clzip.rb +++ b/Formula/clzip.rb @@ -10,6 +10,7 @@ class Clzip < Formula sha256 "654a41ff519d4109d38f17c3fb321f130e60c9d72d137674f2dde9ef5cf129be" => :mojave sha256 "2a3bf6819a2fdbef49fa7bf1e1cea7ef6c6d090bf8fa787fe7b2a582b2631045" => :high_sierra sha256 "26dbdb3a397aa3f62acc15bbbf599a32e5b832564ea6ddc6e15327baac90b5ba" => :sierra + sha256 "81366015fe25b9f1c91d1b517cbe434e4bc5f1558c36b828f22c5e13a5f74f57" => :x86_64_linux end def install diff --git a/Formula/cmake.rb b/Formula/cmake.rb index 5cb0dee99fd68..530ebd78252cf 100644 --- a/Formula/cmake.rb +++ b/Formula/cmake.rb @@ -20,9 +20,11 @@ class Cmake < Formula sha256 "564519865874717cf13a1418e256722bf7b33ccafff19d3c28333e5f8f3a783e" => :catalina sha256 "9ca139a61e79b6f4a274b7b3ac9b0d22d456b37362b4a3405641698bc9afc73c" => :mojave sha256 "0a6f34d0b0a70d12ccdf4e3b134f240dc38e5391eebee24c63958081b970f5ae" => :high_sierra + sha256 "49f80bc58e28001339fd6d0e929249cb27dd96aa85141fc21642a27edf7214c2" => :x86_64_linux end depends_on "sphinx-doc" => :build + depends_on "ncurses" on_linux do depends_on "openssl@1.1" @@ -35,6 +37,8 @@ class Cmake < Formula # For the GUI application please instead use `brew cask install cmake`. def install + ENV.cxx11 unless OS.mac? + args = %W[ --prefix=#{prefix} --no-system-libs @@ -49,6 +53,7 @@ def install --system-bzip2 --system-curl ] + args -= ["--system-zlib", "--system-bzip2", "--system-curl"] unless OS.mac? # There is an existing issue around macOS & Python locale setting # See https://bugs.python.org/issue18378#msg215215 for explanation diff --git a/Formula/cmark-gfm.rb b/Formula/cmark-gfm.rb index 28db2da63fb5c..667ff13af8614 100644 --- a/Formula/cmark-gfm.rb +++ b/Formula/cmark-gfm.rb @@ -11,6 +11,7 @@ class CmarkGfm < Formula sha256 "bce67909783f14886f3c68195fa316e12019208e07a2893ece68bce3ab421014" => :catalina sha256 "08cd69b6691e7f38c84c85272f39ce900d0cb7e8270218e48da25068da5fce2e" => :mojave sha256 "c5b7a2ec9f938dc64d3bccead2e1b7fcb1d21de9404b0e33e433e2d0e6379243" => :high_sierra + sha256 "2803ba2009cf5f086c63cf9642fd17a1728012da9d5cb2f334f469abca642a2f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cmark.rb b/Formula/cmark.rb index 8f78053d7ec87..058a6e7f3c8cd 100644 --- a/Formula/cmark.rb +++ b/Formula/cmark.rb @@ -10,6 +10,7 @@ class Cmark < Formula sha256 "3af95418f96f4b0cec4bd76abaab312f3caf4cea591f38d3b725f15068d06491" => :catalina sha256 "7cbb32d00d44170f5fe426cf2f1d4b5d756738b18631a13f8c5f94524b39f73b" => :mojave sha256 "fb673191d96707019c8eefc224de72045149830f445fb7340c454cc6e8510981" => :high_sierra + sha256 "14f173767120e1a8b3b60f470e2b1812e2f3e295e5f92e9a19f8c49fb3822e05" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cmatrix.rb b/Formula/cmatrix.rb index d4622f41a6d2a..a5339980078b8 100644 --- a/Formula/cmatrix.rb +++ b/Formula/cmatrix.rb @@ -9,6 +9,7 @@ class Cmatrix < Formula sha256 "fcc9c366c560e89ee2b4f61d1bdece14379a2c598719fd2eef784564bf9ed677" => :catalina sha256 "1b3d3155c87c8f2b788fe18c3e72f04af4e79c609030e3447c3e17f9d3870c7b" => :mojave sha256 "2c3b0ce73a2f89ece3783885e44aba5f584268768283e650d8b6552bc00f058d" => :high_sierra + sha256 "c9600181e01647d9ac4c14bb5a24f9df43be3c4c3f1a4a568f83917a9609187c" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/cmdshelf.rb b/Formula/cmdshelf.rb index f8ad277b5f1cf..a7e880a383a13 100644 --- a/Formula/cmdshelf.rb +++ b/Formula/cmdshelf.rb @@ -10,6 +10,7 @@ class Cmdshelf < Formula sha256 "e4093bda9528ae027e122f321e2f1a44d3b4fc8b569e2bf0eba526399cccdacd" => :catalina sha256 "4c83af8661b368f727a389f12d434be45655d10aef9ae1acb8b2be830aae0558" => :mojave sha256 "c0cdc78df3f3896e4e8ba2112ec6e5189682da06419637ebfa9d660ff4fb902f" => :high_sierra + sha256 "82099daa45b421c6b4565bb3c82a57b5e4d443f69410186d8308ef3f392a82af" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/cmigemo.rb b/Formula/cmigemo.rb index 6d2b6e773f979..ca6b649967aa6 100644 --- a/Formula/cmigemo.rb +++ b/Formula/cmigemo.rb @@ -19,18 +19,21 @@ class Cmigemo < Formula sha256 "866dfa4f493c088c1b2eb3cff23ed04e33862f7bc5dcff0976ce5b7cb4835dd2" => :el_capitan sha256 "4ab378bb5f5d2462a6043d9226aade8b87974b52a7fec8a24e3814f93ac936f6" => :yosemite sha256 "f4b8738e34c2b8b7d8489c70a6e15e1634e9d2b0f20b2180be4dd6d43eca6c4a" => :mavericks + sha256 "80f1d10147ee04054a1b6e3d24b18267640e1378c418bbec844cb4694f91b69c" => :x86_64_linux end depends_on "nkf" => :build def install + ENV.deparallelize unless OS.mac? chmod 0755, "./configure" system "./configure", "--prefix=#{prefix}" - system "make", "osx" - system "make", "osx-dict" + os = OS.mac? ? "osx" : "gcc" + system "make", os + system "make", "#{os}-dict" system "make", "-C", "dict", "utf-8" if build.stable? ENV.deparallelize # Install can fail on multi-core machines unless serialized - system "make", "osx-install" + system "make", "#{os}-install" end def caveats diff --git a/Formula/cminpack.rb b/Formula/cminpack.rb index 3766ba3039f3f..bf1815fbf30c8 100644 --- a/Formula/cminpack.rb +++ b/Formula/cminpack.rb @@ -11,6 +11,7 @@ class Cminpack < Formula sha256 "f01181d9cd0882df08500e79b24c98a0d101579592684fe151fac5efa4e34835" => :catalina sha256 "4ee55e748a0b20cf6450c88beaf821fd962e78c81c640a569720c0831b653ac0" => :mojave sha256 "07714bb85b22bf0a9408337520ec68ac1ebbf4141070319e26975b641b936cd2" => :high_sierra + sha256 "99a68c3718eb9c5c7352aa2d8c7928ba853137e9fa9f70c6ec27ea659834a91d" => :x86_64_linux end depends_on "cmake" => :build @@ -24,6 +25,11 @@ def install man3.install Dir["doc/*.3"] doc.install Dir["doc/*"] pkgshare.install "examples" + + unless OS.mac? + lib64 = Pathname.new "#{lib}64" + mv lib64, lib if lib64.directory? + end end test do diff --git a/Formula/cmix.rb b/Formula/cmix.rb index 7f3d3c04d1256..55dab115779b4 100644 --- a/Formula/cmix.rb +++ b/Formula/cmix.rb @@ -11,6 +11,7 @@ class Cmix < Formula sha256 "448fa06555b59d6a0541d1e36ff9eac14e05775fd2ef119e860a305368b800ec" => :mojave sha256 "6e1bc1de5f3c36e6fcda7874b8fbd18938aedbdbce94039763302f9643964a0a" => :high_sierra sha256 "3dc97bda2656e2b2ffccb50915f9a981513fff5a8f90af2a1c5521afe52568d0" => :sierra + sha256 "778bb75257364cd8793b1adae549d2e354e52679e9ae2f4e74995bef1505e57b" => :x86_64_linux end def install diff --git a/Formula/cmocka.rb b/Formula/cmocka.rb index cdeba11258513..60e45f8f1b9c1 100644 --- a/Formula/cmocka.rb +++ b/Formula/cmocka.rb @@ -11,6 +11,7 @@ class Cmocka < Formula sha256 "a05bfdbe08b08dc01db59d0c2c724b2a58c4f9e12c260dc5865e27dd456e7771" => :mojave sha256 "c4fc9fe8a73b23206c0db8907c2f67dea482d689afea18c5e746556aff8098b5" => :high_sierra sha256 "a8d32491c7cfd1670be11c022faa07619d7821a4328fb034e76f225933b5c4dc" => :sierra + sha256 "dacb3afc69c0d8909169bea6655014be1e07d12828d286e318740e6a8dfd15b3" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cmockery.rb b/Formula/cmockery.rb index 57da3369a49e7..967124ca24ccc 100644 --- a/Formula/cmockery.rb +++ b/Formula/cmockery.rb @@ -13,6 +13,7 @@ class Cmockery < Formula sha256 "6cc440503b2fce7def7d584aacf8e9142ad430de799b466f609f57fd9beb4ede" => :el_capitan sha256 "a6ac86af8d5b7f5964a480cc91bfbdaf260c59eae2c4b79663ebab2dfdb7d062" => :yosemite sha256 "673662bebae6bc4e43b60137ebad7141af0eeecffa41f4e7c61065b0f2262d25" => :mavericks + sha256 "d33ee2f770bf5dbd31c9380f87d6bd88d9e2814ecb20c0700759c4cd561aa122" => :x86_64_linux end # This patch will be integrated upstream in 0.1.3, this is due to malloc.h being already in stdlib on OSX diff --git a/Formula/cmockery2.rb b/Formula/cmockery2.rb index fb0604f596269..0b9aa28a3c1df 100644 --- a/Formula/cmockery2.rb +++ b/Formula/cmockery2.rb @@ -14,6 +14,7 @@ class Cmockery2 < Formula sha256 "61b64aeaf89d205742bbb254148502cd2df83bcf05d20377bdce8637f275bee5" => :el_capitan sha256 "ea94ba8420bd5bc01412b52ce9c03b392b933f279d1bce7a8ff8f7502bc83f88" => :yosemite sha256 "ce0cc1a3151655d4bb970ca92c87c5ebb5ed660c3c445e763edc4b835ca7e9a6" => :mavericks + sha256 "665950abd92ba0f6e67c6b959d0ec246608c7950084e2053aa2d94ba171ac435" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/cmt.rb b/Formula/cmt.rb index a6485b64caa29..0ca388782f4ae 100644 --- a/Formula/cmt.rb +++ b/Formula/cmt.rb @@ -14,6 +14,7 @@ class Cmt < Formula sha256 "5ef577014cea6d1ca60ece5686461755e83bdb5134e696f0769ab46bafecb740" => :catalina sha256 "de80bda11c02f8abaa16357a8c2d796370b04012d6bbd6af3ac9d6c5e43f14f0" => :mojave sha256 "afef38c021fa48504acb547a5c0006e2a50c59fdd69a88b3eb9d279c8aea496d" => :high_sierra + sha256 "6e59e8ec8b4b175d5edca321dbb86b4ee7b44fbdde4b040f38fd6752e7faf1e7" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/cmuclmtk.rb b/Formula/cmuclmtk.rb index 1a7507b63c8f5..5cdedc1703ea5 100644 --- a/Formula/cmuclmtk.rb +++ b/Formula/cmuclmtk.rb @@ -13,6 +13,7 @@ class Cmuclmtk < Formula sha256 "c647327d709c3b4a93d5541f8b340d2726540c9efdcbc53d1124043c8c4989bd" => :el_capitan sha256 "320a3590af1e9a1bee6827eb71e4d91fb283952f178b7f0393406a120046d4ee" => :yosemite sha256 "37703a65f22b994f724e54ebcf19ab8204b6d7a27e17d176af13440f611642a3" => :mavericks + sha256 "4daeffb741d35393fc5a8d66a2b92ed24e52700d995167b9e113f6cab16183e0" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/cmus.rb b/Formula/cmus.rb index 7506e00f85f3d..575d7653a3028 100644 --- a/Formula/cmus.rb +++ b/Formula/cmus.rb @@ -12,6 +12,7 @@ class Cmus < Formula sha256 "5597b87c7fcdceec789103df12ae89408e69f98668da522b7ee6a908e622c290" => :mojave sha256 "38f6dda244d82bc960b7e1c65e2e0316c2cde6cc61174bad763b7243e6f88ad8" => :high_sierra sha256 "42cab3ddb96e7b36b2b8cf67d2384adea5169e2955841c35166aece5afcd9329" => :sierra + sha256 "c5ebf8f2e19405be615a0809277aeb7f7e9b8a9963cdb140af64be69b10b4a9a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/cnats.rb b/Formula/cnats.rb index f805193c41665..df6b634a97443 100644 --- a/Formula/cnats.rb +++ b/Formula/cnats.rb @@ -9,6 +9,7 @@ class Cnats < Formula sha256 "39678d7d1bf583fc5c5812a7dff8626a8a5d4ca8028fb0b8b30a74fafcca82a8" => :catalina sha256 "7c8e7fe9a642ba2e33c0e25b702171b557f29a3dd37921826d16566a0417cf66" => :mojave sha256 "d961682c43b33f7149ed477bdff2246a6449463a2f51c592501eec7096dbbd11" => :high_sierra + sha256 "15ee6fcfd9de2f3eeccffdffd586f09fc607ca4ab33af64626040af5d6f6f486" => :x86_64_linux end depends_on "cmake" => :build @@ -19,6 +20,7 @@ class Cnats < Formula def install system "cmake", ".", "-DCMAKE_INSTALL_PREFIX=#{prefix}", + ("-DNATS_PROTOBUF_LIBRARY=#{Formula["protobuf-c"].lib}/libprotobuf-c.so" unless OS.mac?), "-DBUILD_TESTING=OFF", *std_cmake_args system "make", "install" end diff --git a/Formula/cntlm.rb b/Formula/cntlm.rb index 1541566046d0d..5dcf96d9c484c 100644 --- a/Formula/cntlm.rb +++ b/Formula/cntlm.rb @@ -11,6 +11,7 @@ class Cntlm < Formula sha256 "97bf4da991ae873495d574675c4bca87dd184322ff6855818d19d6ef4eb28a0d" => :high_sierra sha256 "aee92f33d388d2c759c9ff881ebc1c9da35b2295d4050e489ebd72f48401a163" => :sierra sha256 "e41938ee125ee2ac25f72833b79f2c6326f421ac54f2bcf1ec46de6ebf59fa44" => :el_capitan + sha256 "866866cd8bf1bd0c86c69d88aaf21dec850c282dd0d9d3fbe5711289f5e701d1" => :x86_64_linux end def install diff --git a/Formula/cobalt.rb b/Formula/cobalt.rb index 359b913facb60..6a79aa7a989ce 100644 --- a/Formula/cobalt.rb +++ b/Formula/cobalt.rb @@ -9,6 +9,7 @@ class Cobalt < Formula sha256 "a7c8244a8382566add8c7079660767c3c1a5fe9d7ab86c345cef6b1117d2b800" => :catalina sha256 "ea5ecf4c34c78804e3cfa3ea54ca7af15872ea3929ba8a397f108430fdf8296e" => :mojave sha256 "e67e4a6d4176e16ba9e089325204d7c3bde339141067b4df13b4f0bfe6019e0a" => :high_sierra + sha256 "b22e05f2d27d97beaaee8ec55cacf01b93f0da22e35645f2729360c5b6ada50d" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/cocot.rb b/Formula/cocot.rb index 53d1acf822cc3..ac285a6e70f2d 100644 --- a/Formula/cocot.rb +++ b/Formula/cocot.rb @@ -12,6 +12,7 @@ class Cocot < Formula sha256 "0070eb38e06043e3c1a4ad1b77205a6ed978ed300e8d0bb407391fecb191b050" => :high_sierra sha256 "a91ba93032e33b6a062b82f2df0b9170d5269cf0312d75eb6f16341fca54f9bd" => :sierra sha256 "60cbdadb074b019535319e5089d5c55c43b68e0b52a73b01cec3a9a8311e51a4" => :el_capitan + sha256 "3ebf62b8bae739c78d96ebe840e53d06d7088421519c7b634deb6c4ed386842c" => :x86_64_linux end def install diff --git a/Formula/code-server.rb b/Formula/code-server.rb index 5e65840532ac1..ea733076a430e 100644 --- a/Formula/code-server.rb +++ b/Formula/code-server.rb @@ -10,6 +10,7 @@ class CodeServer < Formula sha256 "e60052993a7053e4814d3ea9aa1b516b5ab7131c71dc524e2edd7abdf1fa7aee" => :catalina sha256 "eda0ef4457730392ec9fbd0354ef3c25e67d6c658563876837c16cc994200b02" => :mojave sha256 "f795b83b4a1333b0da1ef805257473937783aefecc0bb93c6e6ef36d83df07e9" => :high_sierra + sha256 "c195a1ee714211c222bc5b1af1351936d1ccac844b99d8207a81389b13520b45" => :x86_64_linux end depends_on "python@3.8" => :build @@ -21,6 +22,11 @@ class CodeServer < Formula depends_on "libsecret" end + unless OS.mac? + depends_on "linuxbrew/xorg/libxkbfile" + depends_on "linuxbrew/xorg/libx11" + end + def install system "yarn", "--production", "--frozen-lockfile" libexec.install Dir["*"] diff --git a/Formula/codec2.rb b/Formula/codec2.rb index db6771a843dd4..2b39846afd215 100644 --- a/Formula/codec2.rb +++ b/Formula/codec2.rb @@ -10,6 +10,7 @@ class Codec2 < Formula sha256 "d41040646585e5b91438818ff4dfdccc94b3a2567d31d6960710f8f2455bab04" => :catalina sha256 "460c2febeb64e913796ee3f161b8fa50bbc00904c99228d5122324ebadd91fe9" => :mojave sha256 "5f4530a54adbc38253b993bdbb21da86b4d11725b2edcbec79e43ed739875208" => :high_sierra + sha256 "1abf3196c1426021346c7d023af9ea7c1540e20f25977080ee22f5e78e47909f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/codemod.rb b/Formula/codemod.rb index 52d3c4b7aa3f5..6996f89a57221 100644 --- a/Formula/codemod.rb +++ b/Formula/codemod.rb @@ -5,7 +5,7 @@ class Codemod < Formula homepage "https://github.com/facebook/codemod" url "https://files.pythonhosted.org/packages/9b/e3/cb31bfcf14f976060ea7b7f34135ebc796cde65eba923f6a0c4b71f15cc2/codemod-1.0.0.tar.gz" sha256 "06e8c75f2b45210dd8270e30a6a88ae464b39abd6d0cab58a3d7bfd1c094e588" - revision 3 + revision OS.mac? ? 3 : 4 version_scheme 1 head "https://github.com/facebook/codemod.git" @@ -14,6 +14,7 @@ class Codemod < Formula sha256 "3b32fef1fef317a4544225f6de58e0c1e970de6deb10258fe2d3f937116d5468" => :catalina sha256 "da2eee278c0136d201d2c59db1876f90996600c8a00a0c2434742015846d7457" => :mojave sha256 "31f1ef7e3e6867ef52f0922c807762363b3a4f1c520b0de5bbd448282f95a5e5" => :high_sierra + sha256 "956b526604a6234390ad5c0f0fdb9c9d8a393b66d6f5b124543868d0c44d6a9e" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/codespell.rb b/Formula/codespell.rb index 90a6dd1cab659..ac17467d82af7 100644 --- a/Formula/codespell.rb +++ b/Formula/codespell.rb @@ -11,6 +11,7 @@ class Codespell < Formula sha256 "fb3fb87c3d707656b5c796fd40a13b6e7d0170f5cc4db6361751074b1f089bcf" => :catalina sha256 "f44c96916092e661dfa53499d3570b98bba5fbcf964751f55c775e0aee68b37c" => :mojave sha256 "752254907866753d1941f39193d67cb2fbaa54f294d6d0f4a1f11cd8a8247aae" => :high_sierra + sha256 "457962ac99c5f486ca4df20fe840035d2205d396cb8aa8c71dc0f0724eb6f4d8" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/codestore.rb b/Formula/codestore.rb new file mode 100644 index 0000000000000..ddfc1ee7026df --- /dev/null +++ b/Formula/codestore.rb @@ -0,0 +1,18 @@ +class Codestore < Formula + desc "Command-line interface of code.store" + homepage "https://code.store/" + url "https://s3.eu-central-1.amazonaws.com/s3.code.store/codestore-v1.2.12/codestore-v1.2.12.tar.gz" + sha256 "7474ac084e12cdd946b30e2eed7e5689cfbc656ff19e53f947141e67fa3c0d28" + license "MIT" + depends_on "node" + + def install + inreplace "bin/codestore", /^CLIENT_HOME=/, "export CODESTORE_OCLIF_CLIENT_HOME=#{lib/"client"}\nCLIENT_HOME=" + libexec.install Dir["*"] + bin.install_symlink libexec/"bin/codestore" + end + + test do + system bin/"codestore", "version" + end +end diff --git a/Formula/coffeescript.rb b/Formula/coffeescript.rb index 276fbaf3bba3f..7d23eb16f25fd 100644 --- a/Formula/coffeescript.rb +++ b/Formula/coffeescript.rb @@ -12,6 +12,7 @@ class Coffeescript < Formula sha256 "090fe2a4161fbcf4e7615cded97c8e9736f7939c1a70a863f37d83141f5cb118" => :catalina sha256 "acd2a08cb5db976c36508582ac5ff82476ad9dc037ab065353d071cf46c211f5" => :mojave sha256 "4ee049a8e7bb8a0c67452cb0b912ef5fd4e402c4948cf1b4cb8a5022640df19e" => :high_sierra + sha256 "e83af49fa56a8b6562eba8f4d48728258fd12a43f50cd83a76769ed8f055c943" => :x86_64_linux end depends_on "node" diff --git a/Formula/cointop.rb b/Formula/cointop.rb index 3ba1207eddf57..277803db73504 100644 --- a/Formula/cointop.rb +++ b/Formula/cointop.rb @@ -9,6 +9,7 @@ class Cointop < Formula sha256 "1c5c3dd8363fa4b9d138cbf5a8689618b69f3cc4854b1216de0bc7299b68f4bd" => :catalina sha256 "d04baa2622fcb278c5924a1eb8658ca2360b92864267008fa0e9007739c783c2" => :mojave sha256 "672b40275b391c7ea1ea215eda5ac2c09df08a583adc6c2d7f59af41ad174c3e" => :high_sierra + sha256 "d17dea8d01c10710542e37234c9730a05472418509fef245f751639758b5eebd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/coinutils.rb b/Formula/coinutils.rb index 9155fc536978d..b4163855c382b 100644 --- a/Formula/coinutils.rb +++ b/Formula/coinutils.rb @@ -12,6 +12,7 @@ class Coinutils < Formula sha256 "ec360d8c70a2f54dc6ab4cbabedf3e7f801bc1ae85e630ef9884d0a79ad706f0" => :catalina sha256 "eb85ec2e02aed09292625122dc05fbcf64b85d7f82cc6d001975eed43cfc1de1" => :mojave sha256 "f7bfde6c8c42b6f7d3925de0577d10bcef5b171b3337ea4c70b08a8ec20c026a" => :high_sierra + sha256 "e87df3c11a95d2d1b043b7d5ffaeae860c96673dbe37723faaa59aff21d5127b" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/collectd.rb b/Formula/collectd.rb index 30d2d2ba506b5..481111552dc8f 100644 --- a/Formula/collectd.rb +++ b/Formula/collectd.rb @@ -8,6 +8,7 @@ class Collectd < Formula sha256 "6b1fc316e7cab7aa33cfb8034a4e7485798ef2ceb477ceee88c212af480a1d3d" => :catalina sha256 "0a3e17f5f67372dfb30d24f1a3253f53d20d22304f061d90d48a4f7cdd38bbb2" => :mojave sha256 "380302d441ea46e334793feb602e788fe93fdaf13356bf8acc4ef8914d8005bb" => :high_sierra + sha256 "bce3fe033fd6fb1c413f1aaa1b133b8ff2096675f9adc9c2affc5e3f6fc20c80" => :x86_64_linux end head do diff --git a/Formula/collector-sidecar.rb b/Formula/collector-sidecar.rb index 29af418711ae2..e84ac2f57d9eb 100644 --- a/Formula/collector-sidecar.rb +++ b/Formula/collector-sidecar.rb @@ -10,6 +10,7 @@ class CollectorSidecar < Formula sha256 "c5df7e3fe89d27da283cba2d44c8d9bfd4edd686167b8d4acf0c6f0387154fef" => :mojave sha256 "267c985605ca057bff286bc111fc6ac84dfc0d4bb391da19c044ddef381c7a74" => :high_sierra sha256 "6e09f805d30b96d2650a6541fddbda8a55d6ef74d7de7e96c642df5d2cd7d18b" => :sierra + sha256 "d3992dcaef26a9cbfaa9f8433cd8a17c854b1de2b9a23273e36ebc4910ad9d39" => :x86_64_linux end depends_on "glide" => :build diff --git a/Formula/colordiff.rb b/Formula/colordiff.rb index 7f1646e828157..bdd8dd1cbe9e7 100644 --- a/Formula/colordiff.rb +++ b/Formula/colordiff.rb @@ -10,6 +10,7 @@ class Colordiff < Formula sha256 "f0433560a0417e350a57ad24a80d277cb3cc2665046a10d8db630ef432529603" => :catalina sha256 "f0433560a0417e350a57ad24a80d277cb3cc2665046a10d8db630ef432529603" => :mojave sha256 "f0433560a0417e350a57ad24a80d277cb3cc2665046a10d8db630ef432529603" => :high_sierra + sha256 "61474e3b705ddfcc3f3056f0fa017f7f53e3fa26c30c7c316bee544d6c589314" => :x86_64_linux end depends_on "coreutils" => :build # GNU install diff --git a/Formula/colortail.rb b/Formula/colortail.rb index 5865b1aac98cb..662e111d4b844 100644 --- a/Formula/colortail.rb +++ b/Formula/colortail.rb @@ -14,6 +14,7 @@ class Colortail < Formula sha256 "e0c8c9af739ce911c0d09eaee26b615444c17f48de27c680cbaf27739e45d8f5" => :el_capitan sha256 "1be1c0067a5621f5edcabf64ec06a775d334924e4ea01bccd1c42830f6c9d0c6" => :yosemite sha256 "8570fbda1625d70eac83d0e53a1d32d0cd7b32f9fb0b8dea38d32a3228dc6688" => :mavericks + sha256 "d3cd61e660155bded960b5fb5334e8dcc587efb36575a832c85b7a9a2e28bd0b" => :x86_64_linux # glibc 2.19 end depends_on "autoconf" => :build diff --git a/Formula/comby.rb b/Formula/comby.rb index f785723dafa1f..9120035390130 100644 --- a/Formula/comby.rb +++ b/Formula/comby.rb @@ -5,10 +5,10 @@ class Comby < Formula sha256 "6f7304c1644f6212c3b86542f8325e6f76cd268b787fbfbbe3cc0de61ddec14a" bottle do - cellar :any sha256 "64591a0ced2e6ecd71e43e773ec1ae8dd8f0a1fe3507ecb121e665db02a8f21c" => :catalina sha256 "7f8b23196d449a572f0e7061d33a509c479c7f526fae9a9754388f645e601bcc" => :mojave sha256 "87c8b380a96b5f9cfe0ee6de72f837ee5f1b61fc5777a0cb35d538b262f4ba01" => :high_sierra + sha256 "85731a40031c830e1011b4d8c09ce51f745845b177754491e524f033a24aa69b" => :x86_64_linux end depends_on "gmp" => :build diff --git a/Formula/compface.rb b/Formula/compface.rb index 95f81ebedf915..c201003cf5d7b 100644 --- a/Formula/compface.rb +++ b/Formula/compface.rb @@ -15,6 +15,7 @@ class Compface < Formula sha256 "50200eb6f7cb61be39420d2e127eb4e2af9391a514f7cfbd26fa9203ca137d21" => :el_capitan sha256 "4f7a202ead9c7b6ba1498be71c937500d64cad15ae451ec37c54a8fba70816a0" => :yosemite sha256 "3208feb3c0055906ee163662c0d5b5cbe561222128a0979f6e159110973ee3fa" => :mavericks + sha256 "6019f23941dfc2bb4d58a8abb7c83e2e2d9ca300793de5fc65f71a6ebc599115" => :x86_64_linux end def install diff --git a/Formula/conan.rb b/Formula/conan.rb index 29a2db7f2660b..2e5440f5ecdfe 100644 --- a/Formula/conan.rb +++ b/Formula/conan.rb @@ -12,6 +12,7 @@ class Conan < Formula sha256 "e8cd4e160acd1aa33211b9de3cff6f36b63c40a06dfeab109b8f306e884246d6" => :catalina sha256 "64dfff4b9e3406429f9b3e88856d665822e7272f08a6f8e222c94199a95dc4d1" => :mojave sha256 "fd298bf524f8377373896eba81928a4660b5ee411ad6e9c23ff26ced0709dfc4" => :high_sierra + sha256 "7718036a84fdfd4da4f50588cd534a1607757f0973594925b6d36dd0753a9f4d" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/concurrencykit.rb b/Formula/concurrencykit.rb index a96d30ec50e4d..80f0249ba1be6 100644 --- a/Formula/concurrencykit.rb +++ b/Formula/concurrencykit.rb @@ -13,6 +13,7 @@ class Concurrencykit < Formula sha256 "12788eda54c82375102f2f33e28f533151b4d3f6fa9042ea7c7aa03fb25c3e3a" => :catalina sha256 "357062d84adf8f0c8d1a92a7fda6fb9278b6264edf061935d595342e0c334aed" => :mojave sha256 "c8def7655e173d45ff8ec94bc78750507235fa9eb8b79be639bf250698d59761" => :high_sierra + sha256 "59cf6e7dcb3c88a1baa7bca25f270b0c14a0758c81e33194d52439d7f52022d9" => :x86_64_linux end def install diff --git a/Formula/configen.rb b/Formula/configen.rb index daadc6a4ece5c..0e9a141f366b3 100644 --- a/Formula/configen.rb +++ b/Formula/configen.rb @@ -11,7 +11,7 @@ class Configen < Formula sha256 "1eba1c4035e8bd429023f782d093cbb98dae2c7d4f6a876640afdddc8aaef9e2" => :mojave end - depends_on :xcode => ["10.2", :build] + depends_on :xcode => ["10.2", :build] if OS.mac? def install xcodebuild "SYMROOT=build" diff --git a/Formula/confuse.rb b/Formula/confuse.rb index db72e723b3978..4d1daf4e4ae52 100644 --- a/Formula/confuse.rb +++ b/Formula/confuse.rb @@ -5,10 +5,10 @@ class Confuse < Formula sha256 "1dd50a0320e135a55025b23fcdbb3f0a81913b6d0b0a9df8cc2fdf3b3dc67010" bottle do - cellar :any sha256 "13ad01ca606e746ab7f6bcd42b0da08abdcc29ccaaa9e8106f9d28bfe96bffd7" => :catalina sha256 "d6038fe2a7fcfea4ba6e3c29174cb6201ce7d05e22ef4c76b881b9f12dabcff6" => :mojave sha256 "371f699488d7e4459251c55e4ef4d9087b08e07b4fedfc553476bc30070ca9c1" => :high_sierra + sha256 "f33b7f3eb72f36f423997e802ef9f9a427b0690e2ef04ec97b005c694979d523" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/conjure-up.rb b/Formula/conjure-up.rb index 0114f5d382428..b3618fbbe25ac 100644 --- a/Formula/conjure-up.rb +++ b/Formula/conjure-up.rb @@ -5,13 +5,14 @@ class ConjureUp < Formula homepage "https://conjure-up.io/" url "https://github.com/conjure-up/conjure-up/archive/2.6.9.tar.gz" sha256 "b5ebba187d27b3474b36acd715df015b198c0e5df8aefb32200ba4f3f3de17f4" - revision 2 + revision OS.mac? ? 2 : 4 bottle do cellar :any sha256 "e9e7df0108dd3be03a9391a95befbbfa66950bbbb48ae8fd28f4855ae6c69932" => :catalina sha256 "dc221c6071b5a37760a530da1981a96a1f404fa461d44fee7a217897e9a01077" => :mojave sha256 "b20ebbe1aa0c30c713e58c03ac167196f7c3b5635f95c1ce8687e6bfad9a0294" => :high_sierra + sha256 "abcb88b800c672924ce6f4666e3f3261480a4b373076f55e228b7e1be63e5bc9" => :x86_64_linux end depends_on "awscli" @@ -29,6 +30,8 @@ class ConjureUp < Formula depends_on "pkg-config" => :build end + patch :DATA unless OS.mac? + # list generated from the 'requirements.txt' file in the repository root resource "aiofiles" do url "https://files.pythonhosted.org/packages/94/c2/e3cb60c1b7d9478203d4514e2d33ea424ad9bb98e45b21d6225db93f25c9/aiofiles-0.4.0.tar.gz" @@ -258,6 +261,13 @@ class ConjureUp < Formula end def install + unless OS.mac? + inreplace "conjureup/juju.py" do |s| + s.gsub! "@@HOMEBREW_JUJU@@", Formula["juju"].opt_bin/"juju" + s.gsub! "@@HOMEBREW_JUJU_WAIT@@", Formula["juju-wait"].opt_bin/"juju-wait" + end + end + venv = virtualenv_create(libexec, "python3") venv.pip_install resource("cffi") # needs to be installed prior to bcrypt res = resources.map(&:name).to_set - ["cffi"] @@ -270,9 +280,33 @@ def install end test do + # "!! This should _not_ be run as root or with sudo. !!" + return if Process.uid.zero? + assert_match "conjure-up #{version}", shell_output("#{bin}/conjure-up --version") system bin/"conjure-up", "openstack-base", "metal", "--show-env" assert_predicate testpath/".cache/conjure-up-spells/spells-index.yaml", :exist? end end +__END__ +diff --git a/conjureup/juju.py b/conjureup/juju.py +index 6be93a4..1f9469a 100644 +--- a/conjureup/juju.py ++++ b/conjureup/juju.py +@@ -44,6 +44,7 @@ def set_bin_path(): + """ Sets the juju binary path + """ + candidates = [ ++ '@@HOMEBREW_JUJU@@', + '/snap/bin/juju', + '/snap/bin/conjure-up.juju', + '/usr/bin/juju', +@@ -60,6 +61,7 @@ def set_wait_path(): + """ Sets juju-wait path + """ + candidates = [ ++ '@@HOMEBREW_JUJU_WAIT@@', + '/snap/bin/juju-wait', + '/snap/bin/conjure-up.juju-wait', + '/usr/bin/juju-wait', diff --git a/Formula/connect.rb b/Formula/connect.rb index c9683ff9df320..0c459a7deb1de 100644 --- a/Formula/connect.rb +++ b/Formula/connect.rb @@ -13,6 +13,7 @@ class Connect < Formula sha256 "af244ce650bc1ebd50209b62d98c9780df9ff3b90b2b7496f7b74426f33349a6" => :el_capitan sha256 "1285bb995a9eed5ce5198da853bd33ce49c04ac0caa328b651be5d0421e784f4" => :yosemite sha256 "4f1dffe41e3164e12fe447c123e17a998cdc936d5dddb7cdc6195fb1b2293fcb" => :mavericks + sha256 "b163fb2c62a3efaaf4cf53e49c4fd3838f087680d53f8ff0b1c09b37437e8998" => :x86_64_linux end def install diff --git a/Formula/conserver.rb b/Formula/conserver.rb index 300c4f0a5db4b..ff4ee187a6627 100644 --- a/Formula/conserver.rb +++ b/Formula/conserver.rb @@ -9,6 +9,7 @@ class Conserver < Formula sha256 "ce9d095a9e435480fe4a8eb2e73c0732fe0d7eda89aafc98e0599453eaa8f626" => :catalina sha256 "70283393748aaf6397ea4b0bcdda5f7192597da2093e8fe0c21fcbc89cd5e900" => :mojave sha256 "e5de5fdc13fd75c8ab4cb11f0a86408b63b2683ac9aacf573d7df0500dc38210" => :high_sierra + sha256 "0ee043f7dd6beaa92ab45ca422e907247392f9e8273dac8fc0df2ee45d57d73e" => :x86_64_linux end def install diff --git a/Formula/console_bridge.rb b/Formula/console_bridge.rb index 1e628d3cf3a7d..ce036af522459 100644 --- a/Formula/console_bridge.rb +++ b/Formula/console_bridge.rb @@ -9,6 +9,7 @@ class ConsoleBridge < Formula sha256 "8d2a1fc160054eeb2a8e373599867ce8c02c2e1a9e6c4f6ca38e1108d328577f" => :catalina sha256 "61bbee506d4e6aced344f034fca587e56f0608bc75bf1b378fbecfd31e334a40" => :mojave sha256 "ec5140cfb22e4dd077bb5d2f15b8c4e5189205e00b235dee4e8574369f38f903" => :high_sierra + sha256 "d3ab67689ac858a42d97247c1d0b1f2c9db1492d8cddbb90508f196b649fa71d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/consul-backinator.rb b/Formula/consul-backinator.rb index 7d548d7792094..2d2844bb4e218 100644 --- a/Formula/consul-backinator.rb +++ b/Formula/consul-backinator.rb @@ -12,6 +12,7 @@ class ConsulBackinator < Formula sha256 "f77ec3bd0fa7598d79ca30469140e989ddae59dbb5512d0aa22f0c21190dcd02" => :high_sierra sha256 "c52eaf11b850dea9c74b96d94157d25ee1912e52423628105c8b8d9240a2e52a" => :sierra sha256 "bb39c88ad9e3e5aa6b12ea08bbd6ec2b31601d0c14f943aaaf10bfcf14cc5b8d" => :el_capitan + sha256 "9dba886712a0b508e360ec764ef7004a1251bae60a1024c7637ef11c62027904" => :x86_64_linux end depends_on "glide" => :build diff --git a/Formula/consul-template.rb b/Formula/consul-template.rb index a2ed61f8a649e..3b3c65909141a 100644 --- a/Formula/consul-template.rb +++ b/Formula/consul-template.rb @@ -11,6 +11,7 @@ class ConsulTemplate < Formula sha256 "77a1af87ecaca41eb729f51fd37eb6f4a77b24025f84cf1db131b867c839a273" => :catalina sha256 "cee50257ce590058be3c5a0962d95d5c332d67f38982f5315ad78d67ffce2323" => :mojave sha256 "5589f360ea103acdb601bcd3cd1552ec2d06418c175509cd762cd35a97c1f22e" => :high_sierra + sha256 "86a26e7598e83ed702c0b7b04204843c62c040ac713b30d65806bbdce0dddb9c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/consul.rb b/Formula/consul.rb index eca9e9323b0a9..0bf6bf6916cde 100644 --- a/Formula/consul.rb +++ b/Formula/consul.rb @@ -12,15 +12,17 @@ class Consul < Formula sha256 "62f051244bfe72f748a7ced54bffae31d3a42e1e9116750f4b01d26008012e18" => :catalina sha256 "a4f980e5674099da1126571ade778cf935e80d1325c71104194bd40de7bbcac8" => :mojave sha256 "d0e30c7d24b99ba1dba65f4ff57019995ff44905ada6c6f5068ae5af0faf0694" => :high_sierra + sha256 "090a5606a46d0d7abfa7c07db0a393860698ca0998c989199840df6c8fe58cd1" => :x86_64_linux end depends_on "go" => :build depends_on "gox" => :build + depends_on "zip" => :build unless OS.mac? uses_from_macos "zip" => :build def install - ENV["XC_OS"] = "darwin" + ENV["XC_OS"] = OS.mac? ? "darwin" : "linux" ENV["XC_ARCH"] = "amd64" ENV["GOPATH"] = buildpath contents = Dir["{*,.git,.gitignore}"] @@ -72,7 +74,7 @@ def plist test do fork do - exec "#{bin}/consul", "agent", "-data-dir", "." + exec "#{bin}/consul", "agent", *("-bind" unless OS.mac?), *("127.0.0.1" unless OS.mac?), "-data-dir", "." end sleep 3 system "#{bin}/consul", "leave" diff --git a/Formula/contacts.rb b/Formula/contacts.rb index 164bca9298819..38d1f5a813300 100644 --- a/Formula/contacts.rb +++ b/Formula/contacts.rb @@ -18,7 +18,8 @@ class Contacts < Formula sha256 "9a9c89e40f9ccf4ec45cf63414eaf31266dfc9b71dc96d8c02f7ab2b38e8f346" => :mavericks end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? + depends_on :macos def install system "make", "SDKROOT=#{MacOS.sdk_path}" diff --git a/Formula/container-diff.rb b/Formula/container-diff.rb index 1ee073ff7bfd6..2a454c14fc4d2 100644 --- a/Formula/container-diff.rb +++ b/Formula/container-diff.rb @@ -10,6 +10,7 @@ class ContainerDiff < Formula sha256 "31af3976b5c63927f934d3155de81d6b6a241bae7244d103012d0d7cbfbeded7" => :mojave sha256 "6002efa7d3d475f95c9bec04896e338a99da5bd333f6fc0ccd20ca80eb6e9726" => :high_sierra sha256 "20eeaca03031026c546e493be1fc57560f9495f621526dae1c07fd4ac5f5d189" => :sierra + sha256 "602af5958215fc1d335342b60d71cc33437e9fad1994e14682b6a4aab274bc9e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/contentful-cli.rb b/Formula/contentful-cli.rb index 62e0438563668..1e662e44bde25 100644 --- a/Formula/contentful-cli.rb +++ b/Formula/contentful-cli.rb @@ -12,6 +12,7 @@ class ContentfulCli < Formula sha256 "ee999dffb7af4fad17a347edf0fc62f9a656ae50f47c696da3f0f5a55bddd65c" => :catalina sha256 "ab4a672a796b111fdbb118c51a9fa9503f31bd9d34309ca29d7a223dc508011d" => :mojave sha256 "104bb38a1761914b3c4648fc8e65d97fccda587bcb2b646aa383a7684f2d0f2d" => :high_sierra + sha256 "6182ddc9cf86c8fd2193ddf3a573fc8bf18263343ae748793fce6c5d75599634" => :x86_64_linux end depends_on "node" diff --git a/Formula/convertlit.rb b/Formula/convertlit.rb index e7757673c1335..3c1e04a4f68ee 100644 --- a/Formula/convertlit.rb +++ b/Formula/convertlit.rb @@ -13,6 +13,7 @@ class Convertlit < Formula sha256 "66b05c2c6371f16620c82b31b507413556b511b859644322c65f4ceea4a83a64" => :el_capitan sha256 "024a9fdb4b58a3e04c12ec300facbac636b3510f8726726c4be93c60cf272ab1" => :yosemite sha256 "366ce6afb71223d3f14939c5d4d382a90cf56df7920cb41dca0eeae72e809702" => :mavericks + sha256 "bd8d9edf3ca47dcc76718f182d4c9e1114f45a7d8d21b05721a2828cfbae63d2" => :x86_64_linux end depends_on "libtommath" diff --git a/Formula/convmv.rb b/Formula/convmv.rb index 96369b9db9f23..fa9ffb3d6fc92 100644 --- a/Formula/convmv.rb +++ b/Formula/convmv.rb @@ -11,6 +11,7 @@ class Convmv < Formula sha256 "856021a73afb22052e496ced9eb1a7386d810a6d75903aac99feb98298801ea8" => :high_sierra sha256 "cc6cf7ff9cfd8909a76e29dd6ddbdddc9ad95638e154b72a36fe6c255e3a367d" => :sierra sha256 "43278a7c7ef7720e20fed3179ff8519230678d3fd4e98f4b0e8e796b5fdb40ac" => :el_capitan + sha256 "a13979825940c67173e3fe04fffe23c4e1239b1a808cf365ce7a667eeaaf5bd5" => :x86_64_linux end def install diff --git a/Formula/convox.rb b/Formula/convox.rb index 5c11599709c4e..7ee274b3a04cf 100644 --- a/Formula/convox.rb +++ b/Formula/convox.rb @@ -10,6 +10,7 @@ class Convox < Formula sha256 "b059a013ae71e82ad47072fb1ad52c148fe3c06c222ad16436820e85b0f73022" => :catalina sha256 "ebd896aca14faf93bd386cac4ecc50b41914a3aedfa86d10c3e0d430241ee627" => :mojave sha256 "de50e42271669f8f491fb4855ef2bca4bb51a4d68645554b79d01999296689a7" => :high_sierra + sha256 "f600ac5f7a59bc32f1de779fe87009016741a50518e747246774213d8d1213a7" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/cookiecutter.rb b/Formula/cookiecutter.rb index c6adb21d8546d..671b38c6989a0 100644 --- a/Formula/cookiecutter.rb +++ b/Formula/cookiecutter.rb @@ -12,6 +12,7 @@ class Cookiecutter < Formula sha256 "a2478744f1af2f5f7c88cf397f9b0909aa7ccbd9006bb47bae8d0d7de47e827a" => :catalina sha256 "94952b16808a3e0428e3403f495d163532079a93ed7e1d1c56b0946f8bc354f4" => :mojave sha256 "ced26761fb874fe209564d63067b40713ae17de01c7bb16baed6b8e75675abc6" => :high_sierra + sha256 "2369cd6f497d050bf658b20d592de11dfdce8846b92d9cff478b8b7f41ec5910" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/coq.rb b/Formula/coq.rb index cf66acc58d741..c9d3e0f17466e 100644 --- a/Formula/coq.rb +++ b/Formula/coq.rb @@ -9,6 +9,7 @@ class Coq < Formula sha256 "d59f03425ecdc2f904fd492996559a62ae9de11b7c80095913cecd7aee4ce876" => :catalina sha256 "deb0c46797b5ef1f57420938278b8f7e2626e0c3a3225f12e07383ea1e8f530d" => :mojave sha256 "cb85d3d2260c1ee93a1e05cdd0a3a61ccd77ddf7048d0ff0bd3db641bdbadeb8" => :high_sierra + sha256 "21150256ac480ebed9b0fbdb1ff0920c1833ccbc88a1e7f530c07f891b022d0c" => :x86_64_linux end depends_on "ocaml-findlib" => :build diff --git a/Formula/coreos-ct.rb b/Formula/coreos-ct.rb index 1b8ef6ca10702..f683598998408 100644 --- a/Formula/coreos-ct.rb +++ b/Formula/coreos-ct.rb @@ -11,6 +11,7 @@ class CoreosCt < Formula sha256 "5acd28f4e5dd0c74938cc7e7e10c5501badbab1d05316537a9afa173ff64f44e" => :high_sierra sha256 "8f09ba9875fe34e55de7fd25514493f41276d5c5e9f3cd37e00288fb6d44323e" => :sierra sha256 "9a48da5217b7e4b57e56702ee884fbc3067ccd895c2144cf7b02571cbcb80b42" => :el_capitan + sha256 "8b89024eadf9553ff4da1feb5b0d463ac5f4a7f251a4a3a706b7228ac3a7fe49" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/coreutils.rb b/Formula/coreutils.rb index 0a8df1dc263b5..3a9130860e292 100644 --- a/Formula/coreutils.rb +++ b/Formula/coreutils.rb @@ -9,6 +9,7 @@ class Coreutils < Formula sha256 "67a4452d75a1882bd7fb977b384204edfa2758276d66290e595487922368e093" => :catalina sha256 "5da6cb9dbc0a8144480dde2fb78eb0a5a1710490afc3697174f7e261ec69763f" => :mojave sha256 "caa8cd8965727d0e805eccdc3e306cd0599720cdd0d5417cfcca03bead670663" => :high_sierra + sha256 "0ab60eb4edf1fd8af5c9fc02ed8de15dee45a6dd2658deaaccc5ce75924dd054" => :x86_64_linux end head do @@ -21,6 +22,7 @@ class Coreutils < Formula depends_on "texinfo" => :build depends_on "wget" => :build depends_on "xz" => :build + depends_on "gperf" => :build unless OS.mac? end conflicts_with "aardvark_shell_utils", :because => "both install `realpath` binaries" @@ -33,6 +35,9 @@ class Coreutils < Formula conflicts_with "uutils-coreutils", :because => "coreutils and uutils-coreutils install the same binaries" def install + # Fix configure: error: you should not run configure as root + ENV["FORCE_UNSAFE_CONFIGURE"] = "1" if ENV["CI"] + system "./bootstrap" if build.head? args = %W[ @@ -62,6 +67,11 @@ def install b2sum base32 chcon hostid md5sum nproc numfmt pinky ptx realpath runcon sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf stdbuf tac timeout truncate ] + unless OS.mac? + no_conflict << "dir" + no_conflict << "dircolors" + no_conflict << "vdir" + end no_conflict.each do |cmd| bin.install_symlink "g#{cmd}" => cmd man1.install_symlink "g#{cmd}.1" => "#{cmd}.1" @@ -69,8 +79,9 @@ def install end def caveats + msg = OS.mac? ? "Commands also provided by macOS" : "All commands" <<~EOS - Commands also provided by macOS have been installed with the prefix "g". + #{msg} have been installed with the prefix "g". If you need to use these commands with their normal names, you can add a "gnubin" directory to your PATH from your bashrc like: PATH="#{opt_libexec}/gnubin:$PATH" diff --git a/Formula/corkscrew.rb b/Formula/corkscrew.rb index 66fb6fb94f1a7..ccd10d23bb66d 100644 --- a/Formula/corkscrew.rb +++ b/Formula/corkscrew.rb @@ -13,6 +13,7 @@ class Corkscrew < Formula sha256 "f7e4e63df01aa33a6518f4f6c2c0ccbb0c7b8aaca95052d4aa827b5e56ed8e5c" => :el_capitan sha256 "5a0916aa242a22808bbbb652664f1e44620c1c78b896982f67c9a5a1b85a5efc" => :yosemite sha256 "79ca3f19c2a8df1cd7b43410ab600d32c4fc7038f99998acb656e5cc61807f25" => :mavericks + sha256 "722088638812e2a57b6db3f78697f0f0b7c823281a9328c1cc92fb608cf2eb58" => :x86_64_linux end depends_on "libtool" => :build diff --git a/Formula/corsixth.rb b/Formula/corsixth.rb index 23ed3aa3c0ba9..fe5956048c818 100644 --- a/Formula/corsixth.rb +++ b/Formula/corsixth.rb @@ -13,7 +13,7 @@ class Corsixth < Formula depends_on "cmake" => :build depends_on "luarocks" => :build - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "ffmpeg" depends_on "freetype" depends_on "lua" diff --git a/Formula/cosi.rb b/Formula/cosi.rb index c9d3e1ace464a..366ed812f97ee 100644 --- a/Formula/cosi.rb +++ b/Formula/cosi.rb @@ -11,6 +11,7 @@ class Cosi < Formula sha256 "30bbb457c0fb67ee264331e434068a4a747ece4cbc536cb75d289a06e93988e2" => :catalina sha256 "2ddd695441977b1cd435fbae28d9aa864d48b7a90ec24971348d91b5d0e551df" => :mojave sha256 "00663999a04ee29f52e334022cc828d7ebe89a442f1e713afb2167112f4ebf75" => :high_sierra + sha256 "a85b745a4bb4a8952e0fc0b53a7a07964f81270460c0d0eab46e43245d469605" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/coturn.rb b/Formula/coturn.rb index 5b0b2771a1538..410782260524d 100644 --- a/Formula/coturn.rb +++ b/Formula/coturn.rb @@ -9,6 +9,7 @@ class Coturn < Formula sha256 "9f00d9739c200fad1363e0290ea1c07320da8c960fab8c93e1a299c58ba52242" => :catalina sha256 "b8021791ebdd945f3d5aa6c2e31d4a55a24137b5759c6cd64b7da569843a05f3" => :mojave sha256 "35f3504a39e5c58c3cc81c0f1d544f5a2e28c6c651281c54b8a98f096b0332aa" => :high_sierra + sha256 "f8897cac2b0e57f33d000e717f25c12c4fe4b917f7325d6200906d89af6c628e" => :x86_64_linux end depends_on "hiredis" diff --git a/Formula/cowsay.rb b/Formula/cowsay.rb index 770a0eabe43df..c189c8bf5fc37 100644 --- a/Formula/cowsay.rb +++ b/Formula/cowsay.rb @@ -14,6 +14,7 @@ class Cowsay < Formula sha256 "360390af15a3c4793e07eda95f55f4a5466ffafc766cb6b62f9790146080a62a" => :el_capitan sha256 "a622af361a6139bc930b371fbde7cfc54bbe8bebfbbe0782e59248fadb10b95f" => :yosemite sha256 "185bfafd379cd6f6d6202fdae0750fdd2998cc94f33ea349bd4872a0274cb1dc" => :mavericks + sha256 "14ece8675c31ee32596f14164e0aef65b634430cef9545f3f0c557bda05dbca5" => :x86_64_linux end def install diff --git a/Formula/cpio.rb b/Formula/cpio.rb index 53b4a71248fa8..b982eaf26fb5b 100644 --- a/Formula/cpio.rb +++ b/Formula/cpio.rb @@ -10,6 +10,7 @@ class Cpio < Formula sha256 "7648c6e9a9cc7c7834674ec839f8811134a109e9419fefc165107e1489fffefb" => :catalina sha256 "d8e90cbadcf1856c4c3291ba0d2798984a8c6069464d87be92ef3b9db622118e" => :mojave sha256 "cfd09e4738ac54a935262baf38b546770942e90b6327c3b5342d2604aa37e733" => :high_sierra + sha256 "024d4a95f66e7d87cff9103bf8ba0e96218be046c2ee8ef4cd30b3f530116cc6" => :x86_64_linux end keg_only :shadowed_by_macos, "macOS provides cpio" diff --git a/Formula/cpl.rb b/Formula/cpl.rb index c5d7f5b2c6ec1..21c13b8af245b 100644 --- a/Formula/cpl.rb +++ b/Formula/cpl.rb @@ -10,6 +10,7 @@ class Cpl < Formula sha256 "4585413a3561eea4a3443b1214dd1759e82853ca5273929e202a2c38ad526add" => :catalina sha256 "d9410e5fc7b4e1466f88233e8e5e925133257d3f33953a8ce91aee780d53db33" => :mojave sha256 "7a810f03ee554b573832fd30285a2fad70be6b9ad6b0e9936300130396f151cd" => :high_sierra + sha256 "64dd8bc9b8cdd2bfa8377617dea0f781e4b93173d7f43761fc6efa51cb2ac542" => :x86_64_linux end depends_on "cfitsio" diff --git a/Formula/cpp-gsl.rb b/Formula/cpp-gsl.rb index 4574203c627bb..8fde746c4afb5 100644 --- a/Formula/cpp-gsl.rb +++ b/Formula/cpp-gsl.rb @@ -10,6 +10,7 @@ class CppGsl < Formula sha256 "ba5b32881db75527872525bcde6bef641bdb6c89dff511ccf5105229f1ba1e7c" => :catalina sha256 "262709d81631cc7aa7477b03bd1904320da93b12cecf4aded01e3cc59917287f" => :mojave sha256 "262709d81631cc7aa7477b03bd1904320da93b12cecf4aded01e3cc59917287f" => :high_sierra + sha256 "97f327299cd75544b8cd99c97a7d574e00d939e3e001cdec0b9045df30731977" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cppad.rb b/Formula/cppad.rb index a5d7445a55c22..d9e16f7d2153c 100644 --- a/Formula/cppad.rb +++ b/Formula/cppad.rb @@ -8,10 +8,11 @@ class Cppad < Formula head "https://github.com/coin-or/CppAD.git" bottle do - cellar :any + cellar :any_skip_relocation sha256 "4ef0d734cddee5d7dfde8398b8b295cc35100424639db041816459636de3087f" => :catalina sha256 "948e5a9ae91c50297d528c87b1f38afcd15f4e6b6f162ce7ddffa2f43b329143" => :mojave sha256 "d74b4ab769dccd4537ef03dd28fea858b81ee2938df776e5d45a23069c57c142" => :high_sierra + sha256 "3f24f827195344fe1e1a9eca220cca50b3a7417553c1e4d6ffce7f9ed46e9b96" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cppcheck.rb b/Formula/cppcheck.rb index 87f6017b529db..86e18e30c2e31 100644 --- a/Formula/cppcheck.rb +++ b/Formula/cppcheck.rb @@ -9,6 +9,7 @@ class Cppcheck < Formula sha256 "ddc02ed55b089565973fc8936be8a0ae23829827d0bb8730f2dad2582ad68450" => :catalina sha256 "416cb05e0dbd7f6b4a8c63a8dfe3a6c1d6d24c7c5d121842a4fab38bc70177f8" => :mojave sha256 "4ea4c94f96f842874d9b07e5fd267df48d638c186ea26ee17715c1b130a0248b" => :high_sierra + sha256 "0e740708792cd975b7a877b01d1127bb4a0295ad821f4e9c9806ee6322f3ab71" => :x86_64_linux end depends_on "python@3.8" => :test diff --git a/Formula/cppman.rb b/Formula/cppman.rb index f07e8d3746782..3925a1a10df6d 100644 --- a/Formula/cppman.rb +++ b/Formula/cppman.rb @@ -11,6 +11,7 @@ class Cppman < Formula sha256 "fdae58d79f577a45b067be37598b239ee07f339f0dbdce0ef206caed7c83f33b" => :catalina sha256 "6d2a39cf742b3c18ce35010bb81addd1164c6ce254e7fbf8999b0922b9326174" => :mojave sha256 "df16ad64a2749394e0d105be9ddad4ddf782d5db56648577bf2d2568d5bd800b" => :high_sierra + sha256 "6506709b782702938dd7e70ab26d7d14956714900641db783daf3f719e930942" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/cppp.rb b/Formula/cppp.rb index 47d21298a3ebd..67e8d32ebea31 100644 --- a/Formula/cppp.rb +++ b/Formula/cppp.rb @@ -13,6 +13,7 @@ class Cppp < Formula sha256 "3bb773301b97402f783e506f3ccc339d7363df6e292d255d6b3209e5be8d1c1a" => :el_capitan sha256 "7c18c1844a89ca3a0ee7084b06c908de2288378eaeac09c7872b0eae97129fc3" => :yosemite sha256 "2765ea90bea4f32ba431ef1f53699a61c2abaf0d3035ed32fb579d42794c9567" => :mavericks + sha256 "d57d66bfceb8cb6bdae878532ec2935fd4199da506b2c017dc777e9a846c95d2" => :x86_64_linux end def install diff --git a/Formula/cpptest.rb b/Formula/cpptest.rb index e2f97a5d0a4ac..8d7365d6bc299 100644 --- a/Formula/cpptest.rb +++ b/Formula/cpptest.rb @@ -9,6 +9,7 @@ class Cpptest < Formula sha256 "531646bba9e8aedff87216058a90e2fdc245b11ef55ad3f5c3aaaf717fd998cb" => :catalina sha256 "5a109d0b6cb796d0de9e6b32a6373e1e78fd4da316be33a26ba9c84fbf799eb8" => :mojave sha256 "cac49d059592f8d9f030855041727a61c7358404e16fc63d106ade58253ba0f1" => :high_sierra + sha256 "3fcc825dd84cc6f9b04594bba8a87fdc7ce4b1ed740701b16b521a1beec82503" => :x86_64_linux end def install @@ -37,7 +38,7 @@ class TestCase: public Test::Suite return 0; } EOS - system ENV.cxx, "test.cpp", "-L#{lib}", "-lcpptest", "-o", "test" + system ENV.cxx, "test.cpp", ("-std=c++11" unless OS.mac?), "-L#{lib}", "-lcpptest", "-o", "test" system "./test" end end diff --git a/Formula/cppunit.rb b/Formula/cppunit.rb index c310ce7553e21..e71382cb880a9 100644 --- a/Formula/cppunit.rb +++ b/Formula/cppunit.rb @@ -9,6 +9,7 @@ class Cppunit < Formula sha256 "3e194b84577c733e5641f305a1cb5cc76355f13037898afc56c3096f98bb78fe" => :catalina sha256 "1c107efb84d656dd5327aa8cf13e6cbce8db7542aacba98ae98a2b05940b16ff" => :mojave sha256 "08a339bc38db169bce2f5eb0fc0b940bc82562c37274aa770668f681aeca4386" => :high_sierra + sha256 "4a7ea94b2d798f84044519d25ed5655e364629b67fd509a86c1ff9ff216a5ee8" => :x86_64_linux end def install diff --git a/Formula/cpr.rb b/Formula/cpr.rb index d4480d7ab695f..da9de60711c18 100644 --- a/Formula/cpr.rb +++ b/Formula/cpr.rb @@ -11,6 +11,7 @@ class Cpr < Formula sha256 "74202966e61defa4ad315d34ebc29d8faad8585f90207b4a881beaf7c65de069" => :catalina sha256 "3c77beee80978eb95c7f56e8ad524b164559f81ca0a3b632f2aee8f90b02925d" => :mojave sha256 "a34a587114287f9cc031b31dc268301334ee145d3acd7adad077194c00576751" => :high_sierra + sha256 "11e74a24bbfb883216930d3239ca8917fe2e5905f8f5185b0344d107933d1da4" => :x86_64_linux end depends_on "cmake" => :build @@ -45,8 +46,13 @@ def install } EOS - system ENV.cxx, "-std=c++11", "-I#{include}", "-L#{lib}", "-lcpr", - "test.cpp", "-o", testpath/"test" + if OS.mac? + system ENV.cxx, "-std=c++11", "-I#{include}", "-L#{lib}", "-lcpr", + "test.cpp", "-o", testpath/"test" + else + system ENV.cxx, "test.cpp", "-std=c++11", "-I#{include}", "-L#{lib}", + "-lcpr", "-o", testpath/"test" + end assert_match "200", shell_output("./test") end end diff --git a/Formula/cpu_features.rb b/Formula/cpu_features.rb index c52531fbe1f2d..5ee099db34f41 100644 --- a/Formula/cpu_features.rb +++ b/Formula/cpu_features.rb @@ -10,6 +10,7 @@ class CpuFeatures < Formula sha256 "b2736429ca74d23173266aab1d3ee6fea58ee963e0042391d803b26d322838d7" => :mojave sha256 "0d8119f02b609f5cfcac19177bd669668686c549bb138fbe2a0aa391df7dc838" => :high_sierra sha256 "d703ec98a4f4913ac50c872475e7c37e6c439326db607297fa14cd438e75f919" => :sierra + sha256 "6b04b4841bfe83e30514f090f9c6e7f3bc214b6251980805f665d63305f20563" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cpulimit.rb b/Formula/cpulimit.rb index 3140bbc85028b..7b39771f22a64 100644 --- a/Formula/cpulimit.rb +++ b/Formula/cpulimit.rb @@ -14,6 +14,7 @@ class Cpulimit < Formula sha256 "9d7320465152a12ba75ce924beada5a3ce365b14becaa75e08ee8334c2cb2f6a" => :el_capitan sha256 "7ff9d929c5a1178b250b756cefcbecc4b202c72f03073e9eb43f4a47420930a8" => :yosemite sha256 "c24a495cd69c62693bcb0bd2a44c41c5bca84f0b9754019681816c1d2b47fe3e" => :mavericks + sha256 "14d6bb8b03bf1a09123c93a7f5dc02a81b90c84d5bd7d7f8c13bd0ceb8449e24" => :x86_64_linux end def install diff --git a/Formula/cql.rb b/Formula/cql.rb index 7fef4267af0b7..e00f63d6cc946 100644 --- a/Formula/cql.rb +++ b/Formula/cql.rb @@ -11,6 +11,7 @@ class Cql < Formula sha256 "6910f358939ba05d8db050688abe4d6df42ce12801949e8be7f49743023d572f" => :catalina sha256 "dd644eb78e0c68e04fcde376481d12ab7d5a0cfddcd844fe3529d8129fec262b" => :mojave sha256 "623599aba9f2a656f5ee530dd367b0741b6b1e7a3e564c629adf29b5ef3a290e" => :high_sierra + sha256 "b23b0a63a57b44e3d610c5fd7e3a872cc499084cf2ffa42ece22612b35a6a169" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/cquery.rb b/Formula/cquery.rb index 5f33187c1fb56..80d83fcc7adf1 100644 --- a/Formula/cquery.rb +++ b/Formula/cquery.rb @@ -6,12 +6,14 @@ class Cquery < Formula :tag => "v20180718", :revision => "b523aa928acf8ffb3de6b22c79db7366a9672489" head "https://github.com/cquery-project/cquery.git" + revision 2 unless OS.mac? bottle do sha256 "8d2680e2397cbaa0a6c6cb2ffa00da5a10d3c2b89f5faeaa493c066417199e87" => :catalina sha256 "e35aabf6a4b2b0ac21c59b6e6121aa3bc8cc623ca7fe1bd763dd6430d3339eae" => :mojave sha256 "ee46fd2b279edc3b52df5ca9b84bdce404bb888f8a7d31e092b3fda33285a02b" => :high_sierra sha256 "ac3ad5aada30ca31d70f36e6e3ba76d96aa0e235ccdd62259a086578fe182b44" => :sierra + sha256 "d40c1ad58cc6c437eb718cbd26204d101cc140c05784428ac5cc0f7d93661613" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cracklib.rb b/Formula/cracklib.rb index 2a2e0b9ddca91..97bb7fd1e92a2 100644 --- a/Formula/cracklib.rb +++ b/Formula/cracklib.rb @@ -6,11 +6,12 @@ class Cracklib < Formula revision 1 bottle do - cellar :any + cellar :any_skip_relocation sha256 "6b22a44df4e1602edc9d248bd1ef58a638c1d04cfdfcbc745f331d05ea91d8ac" => :catalina sha256 "cdf8e3240e77e574df95271024c7b260ef5eafea27dfa6f6188c1a686dd1b9be" => :mojave sha256 "210b950eee847fdccdb388c14d87eb425182282e581187302daa91dfa166fb78" => :high_sierra sha256 "3e74c66c810e5faa99833fc89d375945d0059ddc4b13b5f57128de70cff9dfef" => :sierra + sha256 "da217b61f4dab75cc43b8ea8e4fd5238176ce19c555f247652522e8dad2bd582" => :x86_64_linux end depends_on "gettext" diff --git a/Formula/crc.rb b/Formula/crc.rb new file mode 100644 index 0000000000000..fa98526a351f0 --- /dev/null +++ b/Formula/crc.rb @@ -0,0 +1,36 @@ +class Crc < Formula + desc "OpenShift 4 cluster on your local machine" + homepage "https://code-ready.github.io/crc/" + url "https://github.com/code-ready/crc.git", + :tag => "1.10.0", + :revision => "9025021f545acab4c3e3016bed0172490ce53c72" + head "https://github.com/code-ready/crc.git" + + bottle do + cellar :any_skip_relocation + sha256 "14180b123d70eb87176d98d4953b3a6f9965ffaf789be18643bbeaed9dd26a0e" => :catalina + sha256 "8dfd8898768fef9aa17d6d3348aefad034a678ed7c3f0d162ebae696041c920b" => :mojave + sha256 "cd8bc4a64283ed6e3dd0a52d35f196d9f690f555671390de00a4fe0c95dbf767" => :high_sierra + sha256 "655e5a5582c3e7a694856aec6c2ccaf899216f63167571bc41f85f3ceaa0b375" => :x86_64_linux + end + + depends_on "go" => :build + + def install + os = OS.mac? ? "macos" : "linux" + system "make", "out/#{os}-amd64/crc" + bin.install "out/#{os}-amd64/crc" + end + + test do + assert_match /^crc version: #{version}/, shell_output("#{bin}/crc version") + + # Should error out as running crc requires root + status_output = shell_output("#{bin}/crc setup 2>&1", 1) + if Process.uid.zero? + assert_match "crc should be ran as a normal user", status_output + else + assert_match "Unable to set ownership", status_output + end + end +end diff --git a/Formula/crc32c.rb b/Formula/crc32c.rb index ae416070c54d2..fa66b30851880 100644 --- a/Formula/crc32c.rb +++ b/Formula/crc32c.rb @@ -10,11 +10,13 @@ class Crc32c < Formula sha256 "8ac4299583c3155c0410e246277214110bbbe453df5cc6b67694c67ba722bfbc" => :catalina sha256 "f5e232ed8a57eea6b226f4596f94281ea4ea5467c626e83a1576e74aee32711e" => :mojave sha256 "a8f21980c0fee7ffb9911b1eaa1bf7641940b4bb798a7dbd508ae60a6c1a46a8" => :high_sierra + sha256 "fade39ba2de89b5f331d458f132ae09f52049648b6c5567ab3eac727142d8f53" => :x86_64_linux end depends_on "cmake" => :build def install + ENV.cxx11 unless OS.mac? system "cmake", ".", "-DCRC32C_BUILD_TESTS=0", "-DCRC32C_BUILD_BENCHMARKS=0", "-DCRC32C_USE_GLOG=0", *std_cmake_args @@ -42,7 +44,7 @@ def install } EOS - system ENV.cxx, "test.cpp", "-I#{include}", "-L#{lib}", "-lcrc32c", "-o", "test" + system ENV.cxx, "test.cpp", "-I#{include}", "-L#{lib}", "-lcrc32c", "-std=c++11", "-o", "test" system "./test" end end diff --git a/Formula/credstash.rb b/Formula/credstash.rb index 1b7aa66a56142..9304eec6c0389 100644 --- a/Formula/credstash.rb +++ b/Formula/credstash.rb @@ -5,6 +5,7 @@ class Credstash < Formula homepage "https://github.com/fugue/credstash" url "https://github.com/fugue/credstash/releases/download/v1.17.1/credstash-1.17.1.tar.gz" sha256 "6c04e8734ef556ab459018da142dd0b244093ef176b3be5583e582e9a797a120" + revision 2 unless OS.mac? head "https://github.com/fugue/credstash.git" bottle do @@ -12,6 +13,7 @@ class Credstash < Formula sha256 "1a3850180efec6b674ec067a0368fb02e4d6e4c24c3b47102be54d4c23e7c1c7" => :catalina sha256 "be020fc56818a3f17b978b50d666107cfbd67e1f91140fdc1bf800e4a25be785" => :mojave sha256 "a36fac918c07dd8551a33c276b172bedab2df1953d0bb6d4c696710cdbccae74" => :high_sierra + sha256 "46edaba0a0c0f0353434969f414e6a82e6b160b8033492264adf07a7945cfe4c" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/creduce.rb b/Formula/creduce.rb index be1c6a4e5f5c1..bd80c2a54a31b 100644 --- a/Formula/creduce.rb +++ b/Formula/creduce.rb @@ -17,6 +17,14 @@ class Creduce < Formula depends_on "delta" depends_on "llvm@9" + unless OS.mac? + resource "URI::Escape" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/URI-1.72.tar.gz" + mirror "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.72.tar.gz" + sha256 "35f14431d4b300de4be1163b0b5332de2d7fbda4f05ff1ed198a8e9330d40a32" + end + end + resource "Exporter::Lite" do url "https://cpan.metacpan.org/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz" sha256 "c05b3909af4cb86f36495e94a599d23ebab42be7a18efd0d141fc1586309dac2" diff --git a/Formula/crf++.rb b/Formula/crf++.rb index df6cfd11eef94..74886efaee533 100644 --- a/Formula/crf++.rb +++ b/Formula/crf++.rb @@ -12,6 +12,7 @@ class Crfxx < Formula sha256 "478347b2973b7ace27af0bc55b3ed3fca14e158433b512a8e92d9cc8f3336872" => :mojave sha256 "fa5bcfa302710b90736e3fd21709d4da3619a86251b876d52c9adbb57a3b17f7" => :high_sierra sha256 "5c958b605baab60e1b01eb3bbb67851119025c84e1c4c1b2c0a0dd2b272f70ea" => :sierra + sha256 "5ce42f436921eb39a43fbaa965db9159b2f26bdc1aed91aa5fa12541215ee5a7" => :x86_64_linux end def install diff --git a/Formula/crm114.rb b/Formula/crm114.rb index ca59ef7d2096a..ecd7d47f67aa4 100644 --- a/Formula/crm114.rb +++ b/Formula/crm114.rb @@ -13,6 +13,7 @@ class Crm114 < Formula sha256 "d48449acfcd105d07e11c0ac7c47fdb21b88d3346c0b51377b9e44b8c8726073" => :el_capitan sha256 "151316bd14f7cfce5cea3b765cf4e7801e31c63b72dd786fb38989d8b9380eb3" => :yosemite sha256 "30c0c390671485747b7fd2e19bd8735ccfe3bfaae8864dc361bf2abe917ba342" => :mavericks + sha256 "43888e087fce5f4ab5cc950624eb59a645abdc54619c175c8fcf93dd02a27fcf" => :x86_64_linux # glibc 2.19 end depends_on "tre" diff --git a/Formula/cronolog.rb b/Formula/cronolog.rb index ebf5c5ac70ab5..3cb905adadca2 100644 --- a/Formula/cronolog.rb +++ b/Formula/cronolog.rb @@ -15,6 +15,7 @@ class Cronolog < Formula sha256 "964df15660a5c0ec25bedec56aeb128ae93794a8ad721c1c600e377df9be1c2d" => :el_capitan sha256 "f3f485105f7466422a507bafef3acfd741f18b8ab26438c267d10dbf4701282e" => :yosemite sha256 "288bcd1671de08659b7d2f67141aa5178d797870597837c569dccfaae460afd8" => :mavericks + sha256 "aa50fabd761e781ea3ca94c6a2bd28cbeed0e05260beb3f7e02c57fa82c603bd" => :x86_64_linux end def install diff --git a/Formula/crosstool-ng.rb b/Formula/crosstool-ng.rb index bfb0637c01e18..7aae27aa77c42 100644 --- a/Formula/crosstool-ng.rb +++ b/Formula/crosstool-ng.rb @@ -44,12 +44,13 @@ class CrosstoolNg < Formula def install system "./bootstrap" if build.head? + make = OS.mac? ? "gmake" : "make" ENV["BISON"] = "#{Formula["bison"].opt_bin}/bison" ENV["M4"] = "#{Formula["m4"].opt_bin}/m4" - ENV["MAKE"] = "#{Formula["make"].opt_bin}/gmake" - ENV.append "LDFLAGS", "-lintl" + ENV["MAKE"] = "#{Formula["make"].opt_bin}/#{make}" + ENV.append "LDFLAGS", "-lintl" if OS.mac? - system "./configure", "--prefix=#{prefix}" + system "./configure", "--prefix=#{prefix}", ("--disable-dependency-tracking" unless OS.mac?) # Must be done in two steps system "make" diff --git a/Formula/crunch.rb b/Formula/crunch.rb index 174de99de987d..e3430d7077590 100644 --- a/Formula/crunch.rb +++ b/Formula/crunch.rb @@ -14,6 +14,7 @@ class Crunch < Formula sha256 "84c0c275e63cc5c27fd468587f67ae5f1ab31a3923fe2eda27b4e33477356844" => :el_capitan sha256 "406d94f00713b83bbf41b36453605a5f85f154f88aec9b3ae23e7646ddcc03c1" => :yosemite sha256 "379e5d6a2a8a9baaa9b337f3e702e25ccca6025fd8b49e2685031e67d8ce8666" => :mavericks + sha256 "28d49ef615d8f26edf0fec888973fffb2649332d84acc0f34c8faa43b294dda8" => :x86_64_linux end def install diff --git a/Formula/cryptol.rb b/Formula/cryptol.rb index e3f2f2445cf1a..342ab1915567d 100644 --- a/Formula/cryptol.rb +++ b/Formula/cryptol.rb @@ -10,10 +10,10 @@ class Cryptol < Formula head "https://github.com/GaloisInc/cryptol.git" bottle do - cellar :any_skip_relocation sha256 "0aca3e2c29be5d4533e6114f0e7fd774173358f92d0f4e73903d0d536fb54160" => :mojave sha256 "04d3178e67b8836a720d82dc3b88d1c69366aae6f0e7abdb9a1155b7dc31c28c" => :high_sierra sha256 "3c3ffec1e47196b6c1767086fb9cc62e792546476cad5c6b92896eb45db13744" => :sierra + sha256 "b5fb735247e6b341317e8c77e072f21ebcfbe6415a4699e6d6c283c776aaec4f" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/crystal-icr.rb b/Formula/crystal-icr.rb index 4b87ff8713804..97d5f15607cc0 100644 --- a/Formula/crystal-icr.rb +++ b/Formula/crystal-icr.rb @@ -8,6 +8,7 @@ class CrystalIcr < Formula sha256 "22389822712ed2a634ba8d32817a29e0930eb53669d4c931f740b5c895de9ed4" => :catalina sha256 "5c73c5c37ed0cd5ceb6fc72f88afe4a9156417a0e4752e93500d0aec755646c0" => :mojave sha256 "1ea960e6dd1eeffc8c7e9471a2e17e9dc912eccdc7558d18346a856c10e078bb" => :high_sierra + sha256 "8965286da3d3950ee9b0ddfdcb35f292a2370df1581dddb5c9b6e9ce4a4722d9" => :x86_64_linux end depends_on "crystal" diff --git a/Formula/crystal.rb b/Formula/crystal.rb index 4961f89d922e4..c582f2c1d74ae 100644 --- a/Formula/crystal.rb +++ b/Formula/crystal.rb @@ -13,10 +13,10 @@ class Crystal < Formula end bottle do - cellar :any sha256 "30ff80e4ecf74d90f348b0d67f4d56a226011cc913eede7404f2aa85ad2dcf56" => :catalina sha256 "3dbac82a2904c35628c7af5d55975fd15cfd5147b60c369875a7fc95ceacc88e" => :mojave sha256 "997a4ea8263263d8aac54b25ec7d992b3190e328f84e03262e57cf18069dfe52" => :high_sierra + sha256 "32db3315537b6e799942f1a4fc881dd905f8cd9917892f79acd49e186f7aae60" => :x86_64_linux end head do @@ -53,9 +53,15 @@ class Crystal < Formula end resource "boot" do - url "https://github.com/crystal-lang/crystal/releases/download/0.34.0/crystal-0.34.0-1-darwin-x86_64.tar.gz" - version "0.34.0-1" - sha256 "979b3006b03e5c598deb0c5a519b7fc9c5a805c930416b77b492a28af0a3a972" + if OS.mac? + url "https://github.com/crystal-lang/crystal/releases/download/0.34.0/crystal-0.34.0-1-darwin-x86_64.tar.gz" + version "0.34.0-1" + sha256 "979b3006b03e5c598deb0c5a519b7fc9c5a805c930416b77b492a28af0a3a972" + else + url "https://github.com/crystal-lang/crystal/releases/download/0.34.0/crystal-0.34.0-1-linux-x86_64.tar.gz" + version "0.34.0-1" + sha256 "268ace9073ad073b56c07ac10e3f29927423a8b170d91420b0ca393fb02acfb1" + end end def install @@ -95,8 +101,9 @@ def install # Install shards resource("shards").stage do ENV["CRYSTAL_OPTS"] = "--release --no-debug" + shards = OS.mac? ? buildpath/"boot/embedded/bin/shards" : buildpath/"boot/bin/shards" system "make", "bin/shards", "CRYSTAL=#{buildpath/"bin/crystal"}", - "SHARDS=#{buildpath/"boot/embedded/bin/shards"}" + "SHARDS=#{shards}" # Install shards bin.install "bin/shards" diff --git a/Formula/cscope.rb b/Formula/cscope.rb index dee826d2c3393..b4993b549e109 100644 --- a/Formula/cscope.rb +++ b/Formula/cscope.rb @@ -10,6 +10,7 @@ class Cscope < Formula sha256 "0a8c76e372e2c965e654b5024cbf872931e6204b7e2ba79623d5d7d002cd3c2f" => :mojave sha256 "ae7b5f716debeb937c3472add41f69c7176e9c4a9a0668090afd63313eabbe86" => :high_sierra sha256 "7eef899511b0d7eb0d6a35acf677d9b19f89528aae0272d5c414bbafbe5daaaf" => :sierra + sha256 "f2b2a031558cffb1e8fc759945cbefd3ac9702400fedeabef65dbec8e970ab11" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/csound.rb b/Formula/csound.rb index 486e946f84651..6a0aaf7820d4e 100644 --- a/Formula/csound.rb +++ b/Formula/csound.rb @@ -28,6 +28,7 @@ class Csound < Formula depends_on "libsamplerate" depends_on "libsndfile" depends_on :macos # Due to Python 2 + depends_on :macos # Due to Python 2 depends_on "numpy" depends_on "openjdk" depends_on "portaudio" diff --git a/Formula/csv-fix.rb b/Formula/csv-fix.rb index 728d44bcffe85..6018b8b376935 100644 --- a/Formula/csv-fix.rb +++ b/Formula/csv-fix.rb @@ -13,6 +13,7 @@ class CsvFix < Formula sha256 "ba19053a978b57b6b962f8fa24d099d964ceb90cd28304e3a6c2a7fe0d3abc32" => :el_capitan sha256 "b8dbaf2e14e35cc4c1d7b5d04a5615377f7eeb4d9b1f25fe554b8711511c28f6" => :yosemite sha256 "0b86933c8e32830d5abd0f26ef83b1a60e0254da67542b695fd50ab1e3ba2e68" => :mavericks + sha256 "c4342077ef0be14c36cb6b367a5d78aba77964cb2cba0b52cbbdd5346fb42f06" => :x86_64_linux end def install diff --git a/Formula/csvkit.rb b/Formula/csvkit.rb index 4632fe0e867e6..e4a6f1cb1ea8f 100644 --- a/Formula/csvkit.rb +++ b/Formula/csvkit.rb @@ -5,13 +5,14 @@ class Csvkit < Formula homepage "https://csvkit.readthedocs.io/" url "https://files.pythonhosted.org/packages/95/c9/8dd118c0ea0114125a8bf50d552626b95f6478bcf29a252296e93d778855/csvkit-1.0.5.tar.gz" sha256 "7bd390f4d300e45dc9ed67a32af762a916bae7d9a85087a10fd4f64ce65fd5b9" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any_skip_relocation sha256 "1bb059e0420e7f4e117ad9bb0ad9ec2e281547c87ce3dec197dbcbcc2fbb3223" => :catalina sha256 "39eb13816f8ea1ff6e91d759450a1cb56edc558cdc997776eb60a1fbfeaf4881" => :mojave sha256 "2d7e167505bd1635d0fa97f525683c5a938cb6ebf7351299260822a4560cf513" => :high_sierra + sha256 "eca9d9a30535293a1d92b3c0ee728e0c0b6d905836dee067cf31659d86711310" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/csvq.rb b/Formula/csvq.rb index 7d787094a0f86..7641a2b749308 100644 --- a/Formula/csvq.rb +++ b/Formula/csvq.rb @@ -9,6 +9,7 @@ class Csvq < Formula sha256 "f12b5af1956393fe1c7eb3c8a66af0395a57ca1fabce3fa46ec9abbc42d4c98f" => :catalina sha256 "515f33d52a7f0aadd4fe25263cd1f9b48d93a2cfcd56642437b478e12d806568" => :mojave sha256 "098d117004b545984482edb34ecc8961dd7d230afa950306669197d668d23182" => :high_sierra + sha256 "b1b73812a4b862475e19780e11edb13aca41e822e96e669ec5997698341f0568" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/csvtomd.rb b/Formula/csvtomd.rb index af7c98a32582a..97c0a7e570b1e 100644 --- a/Formula/csvtomd.rb +++ b/Formula/csvtomd.rb @@ -5,13 +5,14 @@ class Csvtomd < Formula homepage "https://github.com/mplewis/csvtomd" url "https://files.pythonhosted.org/packages/9d/59/ea3c8b102f9c72e5d276a169f7f343432213441c39a6eac7a8f444c66681/csvtomd-0.3.0.tar.gz" sha256 "a1fbf1db86d4b7b62a75dc259807719b2301ed01db5d1d7d9bb49c4a8858778b" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any_skip_relocation sha256 "a095eb1747bdc18b737a5a1a090486cd0b694f33283163007f19b3b9e0abfade" => :catalina sha256 "87c756127704a0211c2dcb8d7e0b7b11dfbaf0a2878dfec9a4881e034f114fd0" => :mojave sha256 "c7ec7a2ff12f6d5707bb51b14bd078c2401840108cf1f6c4a774d04ffedf427b" => :high_sierra + sha256 "fa7f4a2b8a46ab51e9353a8406c82baff42e655d3f2ee0859f36f8f7b0a3d5d2" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/ctags.rb b/Formula/ctags.rb index ddaa70fd05a53..50cde4b19e93e 100644 --- a/Formula/ctags.rb +++ b/Formula/ctags.rb @@ -21,6 +21,7 @@ class Ctags < Formula sha256 "0f9bebdadd76a7ec818b904d6266eae183e869bf6f83302d836b93fc50a03714" => :catalina sha256 "da05bcfc8536c7e627dbea17e67997b45388706ba9bb84e521682c0358cf18b5" => :mojave sha256 "169b9d458f2db04d609c86c36e9d9dd4ee2474b7c472a1a11c766454e4bba1a4" => :high_sierra + sha256 "e255dbb5dd25a98b678c818d310a9b6d180901400cd8606a38bf3291f416a2a1" => :x86_64_linux end head do diff --git a/Formula/ctail.rb b/Formula/ctail.rb index c5464fcd47c5a..d94450630d78b 100644 --- a/Formula/ctail.rb +++ b/Formula/ctail.rb @@ -13,6 +13,7 @@ class Ctail < Formula sha256 "829ed2ea1ac94bf32fd1817f714b87301abf2c488cf151675239d5d9bf6f6ef8" => :sierra sha256 "80a2ae43fba99e6eb5eb4b50b52ee0e32213d521f59e147a109444439b86365d" => :el_capitan sha256 "e23b4f67bc165d9d4549963b41b9ee89a5fa2e18040277750c4800da016a919e" => :yosemite + sha256 "397b05cee383b7688f98baebeb5bc2a39aaf0c9e64a5cdea9efbe0e94af1edcb" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/ctl.rb b/Formula/ctl.rb index 3683dc5780c46..49c7a0b13b512 100644 --- a/Formula/ctl.rb +++ b/Formula/ctl.rb @@ -9,6 +9,7 @@ class Ctl < Formula sha256 "e44cbdbb013b350d22ff4cafeeb2a8e93dd164dc36bb6e181fb5cf086a8345c1" => :catalina sha256 "6c88c03a0826a11e7267bf056e15362d4824cea2291b16af6db172d21f3654ce" => :mojave sha256 "61b7606c62fb60aa86d887084e1cb0aa194ff5c64cb9726208ee364f870d7b43" => :high_sierra + sha256 "c881b098820751501e599afde3cd07cad9da0bc4ae2174b2fae5a4d6eaa2044a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ctop.rb b/Formula/ctop.rb index 4ad6feeb9375c..0a8eca13d11ac 100644 --- a/Formula/ctop.rb +++ b/Formula/ctop.rb @@ -11,6 +11,7 @@ class Ctop < Formula sha256 "d91134c9c0f82fa52d66316b3ce2508e6c53878e2bfcbb937a62f33bc0267d0c" => :catalina sha256 "c70a8b08c6acf81b7c1b8a3183da8d02218be1ab966f5357c1ed537f4830b258" => :mojave sha256 "fe7d332a2e1068be73ef3ef524745ddf444b77bcc0f67b8368e4fc78f3abb69e" => :high_sierra + sha256 "7afc1c6bcc016a1c699344aa1b57af8be8a8aaa47d53ef51dd52092995223ed4" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/cucumber-cpp.rb b/Formula/cucumber-cpp.rb index a4d337f13a5b4..9c9ba98e2fd9f 100644 --- a/Formula/cucumber-cpp.rb +++ b/Formula/cucumber-cpp.rb @@ -10,6 +10,7 @@ class CucumberCpp < Formula sha256 "647928a1ca3316d5d7c46f1022b616f88c21fa9fab3ca147e8944a92377e2d67" => :catalina sha256 "1913b19a2c3c876ae0ec6cf46bed0ea144cb97ab025b769472d9371c267e3764" => :mojave sha256 "8d325d95cdd4a3dabcee3f9fe3184585dc5ddbae623033d157847a4ceca2bd45" => :high_sierra + sha256 "771d87f6d002fcf7256b4ad7c4af1e0a10c381c0d20c7635873cb844034113bd" => :x86_64_linux end depends_on "cmake" => :build @@ -64,7 +65,8 @@ def install system ENV.cxx, "test.cpp", "-o", "test", "-I#{include}", "-L#{lib}", "-lcucumber-cpp", "-I#{Formula["boost"].opt_include}", "-L#{Formula["boost"].opt_lib}", "-lboost_regex", "-lboost_system", - "-lboost_program_options", "-lboost_filesystem", "-lboost_chrono" + "-lboost_program_options", "-lboost_filesystem", "-lboost_chrono", + *("-pthread" unless OS.mac?) begin pid = fork { exec "./test" } expected = <<~EOS diff --git a/Formula/cucumber-ruby.rb b/Formula/cucumber-ruby.rb index bb7392db3f165..46295f183d34a 100644 --- a/Formula/cucumber-ruby.rb +++ b/Formula/cucumber-ruby.rb @@ -5,9 +5,11 @@ class CucumberRuby < Formula sha256 "719c6d4c95b6afe6382b1ec3ab7e5650e80aa898103ca530962fa365eac3b4dc" bottle do + cellar :any_skip_relocation sha256 "2d892e849fd1ab7316828b4abfe97a44c57183ccebd229ab36e5524a88f9cccd" => :catalina sha256 "5c4665caf4f97a942ee7f6d104c34cfde3bf2a0d303d724283bc7cbaa05b3fa9" => :mojave sha256 "fe710e1054db86c901f9eb84d164fdf92faf474b3f1f83b72689b8054e350f22" => :high_sierra + sha256 "f087144de2509da942748d59e492e7e97b0026e30c31f184389405f3823292c9" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/cunit.rb b/Formula/cunit.rb index 594c3b50c407e..73694a4a387bb 100644 --- a/Formula/cunit.rb +++ b/Formula/cunit.rb @@ -13,6 +13,7 @@ class Cunit < Formula sha256 "0b92535641c86f38bf7a3a1b08a07aa6523e4c0135792dd92829e00579a5e3a9" => :el_capitan sha256 "63c1d2905cf9214281b8dad71a7d86fcf57d46ccbeb026a43dc73dddac569840" => :yosemite sha256 "4add1b332febce1ba3ee01ab98213be0729f3d2cad14f435f4064fec0273c3cd" => :mavericks + sha256 "a86744b54062d104e87ddc420c8f6d182395772e7be621b351ed60a1570f87aa" => :x86_64_linux # glibc 2.19 end depends_on "autoconf" => :build diff --git a/Formula/cups.rb b/Formula/cups.rb index 68f2a7e14292b..9796cc32d8bf1 100644 --- a/Formula/cups.rb +++ b/Formula/cups.rb @@ -8,6 +8,7 @@ class Cups < Formula sha256 "1bed38f7aa9ee2c76fed5393e308cf7de5dd6d443debb0455ee7739e010b0e20" => :catalina sha256 "19ea09cef986e1c66f1736409f4e7917914100bb68525d8118e705500fbf28e0" => :mojave sha256 "0d3328bddece686cfa54e63b61f68c68fed1b1f8553cd45ed194d8a80e56f9c9" => :high_sierra + sha256 "0a7ab2887648d19d46f47447bb7e1545fb2ecc5438dc7df4deaa79b7fbb4f510" => :x86_64_linux end keg_only :provided_by_macos @@ -18,7 +19,8 @@ def install system "./configure", "--disable-debug", "--with-components=core", "--without-bundledir", - "--prefix=#{prefix}" + "--prefix=#{prefix}", + *("--disable-gssapi" unless OS.mac?) system "make", "install" end diff --git a/Formula/curaengine.rb b/Formula/curaengine.rb index b6fb603ee83bb..4c1b690821647 100644 --- a/Formula/curaengine.rb +++ b/Formula/curaengine.rb @@ -12,6 +12,7 @@ class Curaengine < Formula sha256 "d9822c078d322e27271b988695b8c62dcffb3c47a2d6cf3ba0924f8b7c2d718e" => :catalina sha256 "491aae5f2853ac119f560dc64fa8bc4afcc27bf1b218d6fd3cf8170e6b041858" => :mojave sha256 "7067dcf153826d767fc01831c4e535408ee1eca05b9bd7d858aca18964893ecb" => :high_sierra + sha256 "88e6f58f884f3bb8fd95b001fb32c9c2e740230e2b6cfaf16e11c997b935c74a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/curl-openssl.rb b/Formula/curl-openssl.rb index 21991bd6ff82e..3c6fbc2f03859 100644 --- a/Formula/curl-openssl.rb +++ b/Formula/curl-openssl.rb @@ -8,6 +8,7 @@ class CurlOpenssl < Formula sha256 "3eb7b47868af07e3b766a325a2576749dc2f10ea1ff7ff6ccca3be59d1345712" => :catalina sha256 "1bb271e14654750ec19a61283af0865b7f3ea18c2310bf6c7fd235ff294986b4" => :mojave sha256 "8706151f228258eb6a75d98a661f9ab498025261b56d4fe6b44d0b3cc9967d6a" => :high_sierra + sha256 "0de128181cd0176b39521040a50b9e4a8ff87d60e625bbf532d76c8766527558" => :x86_64_linux end head do @@ -18,7 +19,11 @@ class CurlOpenssl < Formula depends_on "libtool" => :build end - keg_only :shadowed_by_macos, "macOS provides curl" + if OS.mac? + keg_only :shadowed_by_macos, "macOS provides curl" + else + keg_only "it conflicts with curl" + end depends_on "pkg-config" => :build depends_on "brotli" diff --git a/Formula/curl.rb b/Formula/curl.rb index 337dbf5b750db..ae04746e6e48a 100644 --- a/Formula/curl.rb +++ b/Formula/curl.rb @@ -9,6 +9,12 @@ class Curl < Formula sha256 "36dc71f1899b803ab093e727c920b40f91b197402d9c73124c86d02feb0023c5" => :catalina sha256 "99d574c0dec0a50f21ce736d77759038353f2301c7d7a64d5855d311aac4b506" => :mojave sha256 "083d119978d82e86d68567b5fc48faf3d80bf66bf3f6e1c21400a2462d3c460c" => :high_sierra + sha256 "1e9ddfcfe79c3a7e976b61f10f489d174778f4db5b203442ccad87b9640be292" => :x86_64_linux + end + + pour_bottle? do + reason "The bottle needs to be installed into #{Homebrew::DEFAULT_PREFIX} when built with OpenSSL." + satisfy { OS.mac? || HOMEBREW_PREFIX.to_s == Homebrew::DEFAULT_PREFIX } end head do @@ -38,10 +44,21 @@ def install --disable-silent-rules --prefix=#{prefix} --with-secure-transport - --without-ca-bundle - --without-ca-path ] + if OS.mac? + args << "--with-darwinssl" + args << "--without-ca-bundle" + args << "--without-ca-path" + else + ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["openssl@1.1"].opt_lib}/pkgconfig" + args << "--with-ssl=#{Formula["openssl@1.1"].opt_prefix}" + args << "--with-ca-bundle=#{etc}/openssl@1.1/cert.pem" + args << "--with-ca-path=#{etc}/openssl@1.1/certs" + args << "--disable-ares" + args << "--disable-ldap" + end + system "./configure", *args system "make", "install" system "make", "install", "-C", "scripts" diff --git a/Formula/cvs.rb b/Formula/cvs.rb index f1ec1bca81595..8e270d0f1bc21 100644 --- a/Formula/cvs.rb +++ b/Formula/cvs.rb @@ -3,35 +3,50 @@ # MacPorts: https://trac.macports.org/browser/trunk/dports/devel/cvs/Portfile # Creating a useful testcase: https://mrsrl.stanford.edu/~brian/cvstutorial/ +class VimRequirement < Requirement + fatal true + # formula "vim" + satisfy { which "vim" } +end + class Cvs < Formula desc "Version control system" homepage "https://www.nongnu.org/cvs/" url "https://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2" sha256 "78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "c80cc90d6ffbb4113745eac9386396c82b63ceee000f88acba79b7a16e05724d" => :catalina sha256 "2fba5fb7a0ece4b19030e2217a9297f13d3a763303443b9f6935f48d434f636a" => :mojave sha256 "eac3fab201c8e47ee3d05e95a240c2f53306e000a416956843083d7305b48da9" => :high_sierra + sha256 "fc5cffd3bed4c1fab6d223c18b3cf941e71e7fc7bec71ed694b611d7f4eed3ad" => :x86_64_linux + end + + unless OS.mac? + depends_on VimRequirement unless ENV["CI"] + depends_on "vim" unless which "vim" + depends_on "linux-pam" + depends_on "zlib" end patch :p0 do url "https://opensource.apple.com/tarballs/cvs/cvs-45.tar.gz" sha256 "4d200dcf0c9d5044d85d850948c88a07de83aeded5e14fa1df332737d72dc9ce" - apply "patches/PR5178707.diff", - "patches/ea.diff", - "patches/endian.diff", - "patches/fixtest-client-20.diff", - "patches/fixtest-recase.diff", - "patches/i18n.diff", - "patches/initgroups.diff", - "patches/nopic.diff", - "patches/remove-libcrypto.diff", - "patches/remove-info.diff", - "patches/tag.diff", - "patches/zlib.diff" + patches = ["patches/PR5178707.diff", + "patches/ea.diff", + "patches/endian.diff", + "patches/fixtest-client-20.diff", + "patches/fixtest-recase.diff", + "patches/i18n.diff", + "patches/initgroups.diff", + ("patches/nopic.diff" if OS.mac?), + "patches/remove-libcrypto.diff", + "patches/remove-info.diff", + "patches/tag.diff", + "patches/zlib.diff"] + apply(*patches.compact) end # Fixes error: 'Illegal instruction: 4'; '%n used in a non-immutable format string' on 10.13 diff --git a/Formula/cvsutils.rb b/Formula/cvsutils.rb index c1f015d1909ff..a84a05248b705 100644 --- a/Formula/cvsutils.rb +++ b/Formula/cvsutils.rb @@ -13,6 +13,7 @@ class Cvsutils < Formula sha256 "f8e35c8b0ed2db868e7dd12f653c20d7d2709059fb5a773fd49084a2655f4ca0" => :el_capitan sha256 "ccefce4b4a1053e9a32e4f43318c7bf73c7154f0bee1be1cf1777e8fd3e8eabf" => :yosemite sha256 "ab6140058099bdc798e0e294640504035d5c976a8752742044a161c416e2e31e" => :mavericks + sha256 "6c92191b9d66b07bd787d20209cfec0f3c9942bb1760a153451e333fa8a34c1e" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/cweb.rb b/Formula/cweb.rb index 2171250af2091..56858d6140155 100644 --- a/Formula/cweb.rb +++ b/Formula/cweb.rb @@ -12,6 +12,7 @@ class Cweb < Formula sha256 "377a987173b8274ab97de6d8978816372d6f380a0fe4c9e0b09cfcd7d27ab66e" => :sierra sha256 "86ff3ceca459e8f087644249378a19a7f53f4ebbd5c74ddfbbe6ea795003a1a2" => :el_capitan sha256 "27c017af8f2e004888240d99a14b29ea9ac8d1fa5339d228b6a79ecda8031e4e" => :yosemite + sha256 "e0bd51f987885533c083d4c71995a5f6db5657d191cbf272045bae08b23c2fdd" => :x86_64_linux end def install diff --git a/Formula/cwlogs.rb b/Formula/cwlogs.rb index 151b55adadc6d..97e16b4d946a4 100644 --- a/Formula/cwlogs.rb +++ b/Formula/cwlogs.rb @@ -11,6 +11,7 @@ class Cwlogs < Formula sha256 "1c07bb31b455ea7e28f55854424b9fbcba9f9ab9e352f759377d7152b1b3c367" => :high_sierra sha256 "b3528646611cd4f462bafe83c25c84f551e191629a93a84b11c872f9e86b720f" => :sierra sha256 "6384495666e5235c5969ccd1688092fe335a5147b31156e1cb658a41594ae594" => :el_capitan + sha256 "7f13ec74eec4d4b9e8b35ddac2adbe0d145413b13ae3ad0bf21e46d05fc6e399" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/cxxopts.rb b/Formula/cxxopts.rb index e3484e4f5b397..a02fb86b2536f 100644 --- a/Formula/cxxopts.rb +++ b/Formula/cxxopts.rb @@ -11,6 +11,7 @@ class Cxxopts < Formula sha256 "0d218ecd42f83ea5e0fac4c6d8e36d5acf555133c7d52fed9657107edffef917" => :mojave sha256 "0d218ecd42f83ea5e0fac4c6d8e36d5acf555133c7d52fed9657107edffef917" => :high_sierra sha256 "36f6ff18ae628891ca7d188c749fea2a097db1b9d83181bfd123ce09adddebb3" => :sierra + sha256 "32a2ad60750fff708d6ae0f350c367b61d438d5759ba6bbb4b91d2579c9f3d71" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/cxxtest.rb b/Formula/cxxtest.rb index e96bdec09c506..bb6ba9e981734 100644 --- a/Formula/cxxtest.rb +++ b/Formula/cxxtest.rb @@ -6,13 +6,14 @@ class Cxxtest < Formula url "https://github.com/CxxTest/cxxtest/releases/download/4.4/cxxtest-4.4.tar.gz" mirror "https://deb.debian.org/debian/pool/main/c/cxxtest/cxxtest_4.4.orig.tar.gz" sha256 "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any_skip_relocation sha256 "90b9ca9996eb575a2e8665223f38731979a38630f5462fd3c2babf81ce7ceee4" => :catalina sha256 "d6f91fba5743dc04e2c929036f59a34cd7833e5a75a6ebf6785209f8fabca4f1" => :mojave sha256 "99b1ea9c495bf4ee03b88aadb33a5ae964741bcd387d678c6dcc5a18c925ad12" => :high_sierra + sha256 "0b7b7422a6733c4916039f16e9dac10d703b2c68bfa8aadf99d3166bdc6fdc96" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/cython.rb b/Formula/cython.rb index f5d05b9fdfe28..c144b5098e4b8 100644 --- a/Formula/cython.rb +++ b/Formula/cython.rb @@ -9,6 +9,7 @@ class Cython < Formula sha256 "faaf677dba9dabd0743bda5c369559a147225edb9d5c73fdd708400e0753d52c" => :catalina sha256 "08cdc1c4a364a931965ae85df0b973d056a46c365f1d072f6f16ddf5c5f63a9a" => :mojave sha256 "2f85d3bdf5028c787e9d94e5ef3a751d119617001153b632f8f15fc73c473121" => :high_sierra + sha256 "7f54d809c6c915269ee6065a70479973c8d3ef7fa7a921e399bf637e5f078501" => :x86_64_linux end keg_only <<~EOS diff --git a/Formula/czmq.rb b/Formula/czmq.rb index 7c89e7c02b4d3..4d179acf89436 100644 --- a/Formula/czmq.rb +++ b/Formula/czmq.rb @@ -10,6 +10,7 @@ class Czmq < Formula sha256 "19b9f2b1d8d73f7314d0534f22bacd8bc02b39b2a985a07fc8e40365583fc45e" => :mojave sha256 "a1afab02e1ff88b48e2bd92900a701745e18fb05ca700d5c2635fa4c986010f8" => :high_sierra sha256 "d64960ca3558f8a571a51095b9c0e41b1eb8c535e2efc0882ea20c44a41b5563" => :sierra + sha256 "fd818064dc69c9241b817ae075b3be16a0a569acf58385221e957c6dc3ead835" => :x86_64_linux end head do diff --git a/Formula/daemon.rb b/Formula/daemon.rb index 464e0f941918b..c593f27d46f64 100644 --- a/Formula/daemon.rb +++ b/Formula/daemon.rb @@ -13,6 +13,7 @@ class Daemon < Formula sha256 "ad4f8ad9e7deeb0039c6c603b0108fb6733abe425c49fa6344f762e26b49cf2d" => :el_capitan sha256 "f48000af3631f28d47d01d3d89a1f03e7c4f7eac4a81ab7db9c38a1ce9ff66cd" => :yosemite sha256 "09a420b59d2e5cbaf3073b2daf81d57d01c733b79a928bb58da6418de7f5bd3a" => :mavericks + sha256 "5b3c34a25d3a69f29dbdeebc15caea003778c939bc9dd3d1fd54ce3c7e80b581" => :x86_64_linux end # fixes for strlcpy/strlcat: https://trac.macports.org/ticket/42845 diff --git a/Formula/daemonize.rb b/Formula/daemonize.rb index 83fd81f63e0f9..7cf2729b7fd39 100644 --- a/Formula/daemonize.rb +++ b/Formula/daemonize.rb @@ -11,6 +11,7 @@ class Daemonize < Formula sha256 "bc501e9e4ba9fd11390fa9749a7b9a38a70353edaf75499bd969c45921d06bfe" => :high_sierra sha256 "d4d5109292158ef32eb73a37b9b6a037dcae620e234be945410ea927322bb998" => :sierra sha256 "5e05991cf0462e4fe32dd70354d2520a378831d2b1c0fc2cf0b4fbca8dc85489" => :el_capitan + sha256 "81cb7cd8608e51f75e9aa312249e8cca0112ef7144c45e86a6559638c3d7d242" => :x86_64_linux end def install diff --git a/Formula/dante.rb b/Formula/dante.rb index e8cf6fbd986d7..71f919f55dcb8 100644 --- a/Formula/dante.rb +++ b/Formula/dante.rb @@ -11,6 +11,7 @@ class Dante < Formula sha256 "26eb48c9eda005d8486f2dddee23420047a326f82638b71c5aa2f7d28f3ce402" => :mojave sha256 "6a234a72eb6a8bc9439a9a45129ca2214151dee7b63c1ab76c7b5831bda8d1ea" => :high_sierra sha256 "5d4fb552b729372afc0b5450af162d9b49984c64e28d7f1825fd879b4cf3bdf7" => :sierra + sha256 "8517c1b876d52e5e50025c37e160886dfefc9fbf2ea2e161662f869cbcbb8af8" => :x86_64_linux end def install diff --git a/Formula/daq.rb b/Formula/daq.rb index 55322a11281a9..9ce6ef850a4be 100644 --- a/Formula/daq.rb +++ b/Formula/daq.rb @@ -10,6 +10,7 @@ class Daq < Formula sha256 "3b1f25eab6e2c04f4b5e609a1d3e72c3eb55eb12d4a7acb61f43ae815bd10347" => :catalina sha256 "8d57a1f8536259612d6ce312b54a96e8d0fd5527000593d11765baf095d1fd2d" => :mojave sha256 "861fbfd197f0cef898687b427cfa259d6dbf15b2eace0036477910177b8c4c16" => :high_sierra + sha256 "ab76328a84f298fd8d74970dc1ea5c71b5696d9f2b150a141ab47f2caf6c898d" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/dark-mode.rb b/Formula/dark-mode.rb index c4fcc85df01d9..e113a6602b4f4 100644 --- a/Formula/dark-mode.rb +++ b/Formula/dark-mode.rb @@ -12,6 +12,7 @@ class DarkMode < Formula end depends_on :xcode => :build + depends_on :macos depends_on :macos => :mojave def install diff --git a/Formula/darkhttpd.rb b/Formula/darkhttpd.rb index 1a9c73494f57d..91f7334fdf6dc 100644 --- a/Formula/darkhttpd.rb +++ b/Formula/darkhttpd.rb @@ -13,6 +13,7 @@ class Darkhttpd < Formula sha256 "cf8e5885072baed885238dc1a6b23466f80d96a32eb48d5f61f3b9d519df88b5" => :el_capitan sha256 "2fc16040a837b47ac947b8462f93530a387f9db0e0d6a594e4b7dba3437e6e11" => :yosemite sha256 "0ac0b5be3f8e944981806ed255740a6feaee64cd14d78d817e8c5a75391d9837" => :mavericks + sha256 "9b1b5edd27b676c8f32e1d4f6fc28e1850e9a1725dc02754e4c47a781191943e" => :x86_64_linux end def install diff --git a/Formula/darksky-weather.rb b/Formula/darksky-weather.rb index 387270e902f06..4a5491856a9a1 100644 --- a/Formula/darksky-weather.rb +++ b/Formula/darksky-weather.rb @@ -9,6 +9,7 @@ class DarkskyWeather < Formula sha256 "64aac1bb9c9f6fc856fdb6e818b11d715addb17c6f35480abf0a337c1dcaa311" => :catalina sha256 "ae72f00275774f08c66fb8f90697545b97701c4fb819416fb6215779ec775cab" => :mojave sha256 "b621c14d94f6e0e1c350e0bc78c0269bed889b065d811acb8da39d137de5ac4f" => :high_sierra + sha256 "9cb0f60666bf5eb88aec5d15f07fc60965b78eb72e36f3dfed5a7c5aa1a68614" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dash.rb b/Formula/dash.rb index e4ceccb4c9936..90c9d06156d25 100644 --- a/Formula/dash.rb +++ b/Formula/dash.rb @@ -12,6 +12,7 @@ class Dash < Formula sha256 "aa6941a564fca697da6eb30e3691a8fa354de093d05ee84bbbc50c8045a55f66" => :mojave sha256 "49ebe51a7662187224ab620aa50b0473b11c1f88372f7c17da328559d895f5e0" => :high_sierra sha256 "4c7ca79c9b006065cb9bba57190103c518791b5a7ea078bb1f960e6f6c9dd7e9" => :sierra + sha256 "7b89662b945b9f67b47a226c0edee6404f54b029166c4e01f9ba5a5d2026ca82" => :x86_64_linux end head do diff --git a/Formula/dashing.rb b/Formula/dashing.rb index 9326a320b1ed3..9428abf6eae35 100644 --- a/Formula/dashing.rb +++ b/Formula/dashing.rb @@ -10,6 +10,7 @@ class Dashing < Formula sha256 "cdfb4329ae48807046deb40bb2adb9969afda47a25502cedb374cf21a6a605ee" => :catalina sha256 "79874bca8f27064c16aa81b398131d7ed3558bd5987913e344d0075859d9f7c7" => :mojave sha256 "8c34e42f44271bfea4aecbb5dedb18deecfc4b8d0d0564344efa861bb816e8d4" => :high_sierra + sha256 "1028f1f96047d42ee97201f81ec6ed31e4fc43b75d1981e9ae7850f1755afa73" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dasm.rb b/Formula/dasm.rb index 751ab3f36fe40..8f50967687cdb 100644 --- a/Formula/dasm.rb +++ b/Formula/dasm.rb @@ -11,6 +11,7 @@ class Dasm < Formula sha256 "a55169cf45fc0d3d61dc77f69c0817fed7b28b66206a93e2c8f7715f867199ac" => :catalina sha256 "45e8803c881a3ca3a3c7c1c45a5fd55185ba804765b0512971d798c04b1626fd" => :mojave sha256 "b6c8d3f75172985f0f60172e654785fee331070fdd4c0fa58c4247db8c0ac192" => :high_sierra + sha256 "1057d92a54e1b0c0806f2f274e83dfcbc1d40a7da755bd66114eee88e8e59896" => :x86_64_linux end def install diff --git a/Formula/datamash.rb b/Formula/datamash.rb index a2e0022dee547..1b3cb2392c6ef 100644 --- a/Formula/datamash.rb +++ b/Formula/datamash.rb @@ -6,10 +6,10 @@ class Datamash < Formula sha256 "574a592bb90c5ae702ffaed1b59498d5e3e7466a8abf8530c5f2f3f11fa4adb3" bottle do - cellar :any_skip_relocation sha256 "f592c4bda737ef924fb4c1642fb381db54c9ce246eb51d03a145dd28a8391406" => :catalina sha256 "6533f0decc607d6e3ce1ad1fdb7f5b30f99bbbcbacbba1bcd880486eef648189" => :mojave sha256 "b6100d066c3cf9d91b2bd4a8d8bcdc5fa453c6eb6a28d7cacb06659baa358e46" => :high_sierra + sha256 "b6f4deeb3882c4a6cd44f5b7be736a12c38d6a2ed810d6bf376904804beddfa1" => :x86_64_linux end head do diff --git a/Formula/datetime-fortran.rb b/Formula/datetime-fortran.rb index 209a01540d9f0..a6b98e129252b 100644 --- a/Formula/datetime-fortran.rb +++ b/Formula/datetime-fortran.rb @@ -9,6 +9,7 @@ class DatetimeFortran < Formula sha256 "82d8b0e2a51fb7df321659ed4f5da43c24edd5aba81e5e05250508b541f2eb4b" => :catalina sha256 "ef59feabc30610c41a5ac4b2e594f1378d3edeb3b13dd7912825c48815d547e2" => :mojave sha256 "cf59b21c0539aa14f5e0274387669d13dae47b3e11267cdb1baed8545f2bd535" => :high_sierra + sha256 "feb4d7b3d80d6171b60cbaeef71edddc00a6b65467d24750bc4d583f6fd8ad3d" => :x86_64_linux end head do @@ -30,8 +31,13 @@ def install end test do - system "gfortran", "-o", "test", "-I#{include}", "-L#{lib}", "-ldatetime", - pkgshare/"test/datetime_tests.f90" + if OS.mac? + system "gfortran", "-o", "test", "-I#{include}", "-L#{lib}", "-ldatetime", + pkgshare/"test/datetime_tests.f90" + else + system "gfortran", "-I#{include}", pkgshare/"test/datetime_tests.f90", + "-L#{lib}", "-ldatetime", "-o", "test" + end system "./test" end end diff --git a/Formula/dateutils.rb b/Formula/dateutils.rb index 611e4ea7618a9..08a5d6afd8421 100644 --- a/Formula/dateutils.rb +++ b/Formula/dateutils.rb @@ -8,6 +8,7 @@ class Dateutils < Formula sha256 "25d5db665c0591e56c4ec698656a5519f20417473e3cb763299d804bc735a9a5" => :catalina sha256 "3124ddab0439b64bcfc95057ee52c7c902e684898a2d96832732819682fba75c" => :mojave sha256 "310bbe8e2d4d039d065fb9bc5cd33ced2fc45f970057f21a205ff0004d6921e0" => :high_sierra + sha256 "0258e09d2b5ca98808b7c7c9d94f69b10d80370a002796701b721d3631ed6788" => :x86_64_linux end head do diff --git a/Formula/dav1d.rb b/Formula/dav1d.rb index dcb43bc702b25..cb968f0df05f6 100644 --- a/Formula/dav1d.rb +++ b/Formula/dav1d.rb @@ -9,6 +9,7 @@ class Dav1d < Formula sha256 "72583c13b3f1a20ebf5bb51a44d23e29cbb19de60ee3cd9b2530dfd5f3061283" => :catalina sha256 "457283e7f7e3066bcbacff2fda7c7630ccd476dc34908ab1e150f759d88dbe42" => :mojave sha256 "9cadd5bf4b109037700161dcc12376d5f05a6ba73df925c592a01392f2247db6" => :high_sierra + sha256 "73a77c41782a0ab4503074e4484c702eaf0e8d3d9d5d91e53869e5c93339f467" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/davix.rb b/Formula/davix.rb index 203b82ec74c4b..d6fd8d188ed72 100644 --- a/Formula/davix.rb +++ b/Formula/davix.rb @@ -10,11 +10,16 @@ class Davix < Formula sha256 "31228a01aae02ff881132588f85e59c563d3bcaf206f7600afb16eed76f478c8" => :catalina sha256 "d7af8ace083026f5fbbebc6e986162b16f651df17bd64a5303f6f4af6a110a9c" => :mojave sha256 "562abf97a898044427a6f968145208d27ada1bf7b6e793fb64eb6fef5864731a" => :high_sierra + sha256 "9399c0b125164acb2b0a4e1cf48171e0c5dd5000513de0e81178185ff0c114f3" => :x86_64_linux end depends_on "cmake" => :build depends_on "doxygen" => :build depends_on "openssl@1.1" + unless OS.mac? + depends_on "libxml2" + depends_on "util-linux" # for libuuid + end uses_from_macos "libxml2" diff --git a/Formula/dbacl.rb b/Formula/dbacl.rb index 908dd570768b4..0dd8fa88d6370 100644 --- a/Formula/dbacl.rb +++ b/Formula/dbacl.rb @@ -13,6 +13,7 @@ class Dbacl < Formula sha256 "750c29761c5784ddbd0d46643f2d462d8b22c14822773e2366db01be17a3e310" => :el_capitan sha256 "b3d759bba5d1e478bc3df9e829594f49fb37cdd96e589937ebf4a7da87416855" => :yosemite sha256 "09d4e7e62bc73cf25f16d366c768519e10f3ce33894c4a7eaa327046cc05889a" => :mavericks + sha256 "a6377e27a2e528d660a52c39167fbf9ce6c8449ab93324ee75c105f6c723edc3" => :x86_64_linux end def install diff --git a/Formula/dbhash.rb b/Formula/dbhash.rb index 67d3df68f78b5..624335d1897ee 100644 --- a/Formula/dbhash.rb +++ b/Formula/dbhash.rb @@ -10,6 +10,7 @@ class Dbhash < Formula sha256 "2c15b1a7f943559d1fc5f1ff3ce17c29d6ab54889aab413fccef92ea83ebb446" => :catalina sha256 "09e619708878d1b09a08e398f326409d32b333e2130463a576ea24daaee12e31" => :mojave sha256 "961c5f59efe16bf5e88a8876277faf106efe0786db58fe46feb36e1ad5ae8246" => :high_sierra + sha256 "182be693665245eb0a8d9fe80745da80192e3e3c4ffab501e7363bdf0ca1385b" => :x86_64_linux end uses_from_macos "tcl-tk" => :build @@ -24,8 +25,9 @@ def install test do dbpath = testpath/"test.sqlite" sqlpath = testpath/"test.sql" + sqlite = OS.mac? ? "/usr/bin/sqlite3" : Formula["sqlite"].bin/"sqlite3" sqlpath.write "create table test (name text);" - system "/usr/bin/sqlite3 #{dbpath} < #{sqlpath}" + system "#{sqlite} #{dbpath} < #{sqlpath}" assert_equal "b6113e0ce62c5f5ca5c9f229393345ce812b7309", shell_output("#{bin}/dbhash #{dbpath}").strip.split.first end diff --git a/Formula/dbmate.rb b/Formula/dbmate.rb index 94c1c736ec751..9c5e853b03d9f 100644 --- a/Formula/dbmate.rb +++ b/Formula/dbmate.rb @@ -10,6 +10,7 @@ class Dbmate < Formula sha256 "380ddb2a725ca5e1657afd10acd7b343dc1c5826a4a455f8efe24e7c9bf3d779" => :catalina sha256 "968002c69f18deead19c7f7e7ff9a387df34e7e30abb094c2176d6dc96f74e2a" => :mojave sha256 "b2956de9991ef878a24b0e14a64527e7642fec5330ae8b5ca1c5d509adb42506" => :high_sierra + sha256 "32cd3f17fb4d89461c55d062e144132087213c6a97dc81ddd74fc540cd3cddbf" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dbus-glib.rb b/Formula/dbus-glib.rb index 74204981d2f43..7751bd054792d 100644 --- a/Formula/dbus-glib.rb +++ b/Formula/dbus-glib.rb @@ -11,6 +11,7 @@ class DbusGlib < Formula sha256 "107de2a15de30b069b1628b2b6aa347eaee4bc3931b9ba5a0b6ff9390e3550a8" => :mojave sha256 "c47b5a0470a8fa82ea95e53317aa255f413b158a0f63a6b5b2ecfd368f176ad4" => :high_sierra sha256 "bdf88ebc93b14b3f934f8ea8415234e099a20919bcf71b86c244393e31442f1c" => :sierra + sha256 "3a6cc0cee967d37809dc698e1b8cc0b69bab8454b3454bfa53377057ed6f6dcb" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/dbus.rb b/Formula/dbus.rb index 6d8ca3a99e554..4a174833a46d3 100644 --- a/Formula/dbus.rb +++ b/Formula/dbus.rb @@ -10,6 +10,7 @@ class Dbus < Formula sha256 "db3b485e8763fb2a9be8876eaf71f73101964c2a62950faafe46b53ddeb0e9a9" => :catalina sha256 "603c1f498659a45af2d0267c7e42926136cb0997d8462886b50f37cb3bc1ffcf" => :mojave sha256 "14db248f05b8f20db085cfd60f4ac9132403c9c16898b236a9c2f7b61017ae0a" => :high_sierra + sha256 "19597b1374873684f890709dff9a88bcdf1e6b1570dc578c6d88f57f0c76ff6e" => :x86_64_linux end head do @@ -21,7 +22,7 @@ class Dbus < Formula depends_on "libtool" => :build end - depends_on "xmlto" => :build + depends_on "xmlto" => :build if OS.mac? uses_from_macos "expat" @@ -29,20 +30,24 @@ class Dbus < Formula depends_on "pkg-config" => :build end - # Patch applies the config templating fixed in https://bugs.freedesktop.org/show_bug.cgi?id=94494 - # Homebrew pr/issue: 50219 - patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/0a8a55872e/d-bus/org.freedesktop.dbus-session.plist.osx.diff" - sha256 "a8aa6fe3f2d8f873ad3f683013491f5362d551bf5d4c3b469f1efbc5459a20dc" + if OS.mac? + # Patch applies the config templating fixed in https://bugs.freedesktop.org/show_bug.cgi?id=94494 + # Homebrew pr/issue: 50219 + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/0a8a55872e/d-bus/org.freedesktop.dbus-session.plist.osx.diff" + sha256 "a8aa6fe3f2d8f873ad3f683013491f5362d551bf5d4c3b469f1efbc5459a20dc" + end end def install # Fix the TMPDIR to one D-Bus doesn't reject due to odd symbols ENV["TMPDIR"] = "/tmp" - # macOS doesn't include a pkg-config file for expat - ENV["EXPAT_CFLAGS"] = "-I#{MacOS.sdk_path}/usr/include" - ENV["EXPAT_LIBS"] = "-lexpat" + if OS.mac? + # macOS doesn't include a pkg-config file for expat + ENV["EXPAT_CFLAGS"] = "-I#{MacOS.sdk_path}/usr/include" + ENV["EXPAT_LIBS"] = "-lexpat" + end ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" @@ -51,10 +56,11 @@ def install "--prefix=#{prefix}", "--localstatedir=#{var}", "--sysconfdir=#{etc}", - "--enable-xml-docs", + ("--enable-xml-docs" if OS.mac?), + ("--disable-xml-docs" unless OS.mac?), "--disable-doxygen-docs", - "--enable-launchd", - "--with-launchd-agent-dir=#{prefix}", + ("--enable-launchd" if OS.mac?), + ("--with-launchd-agent-dir=#{prefix}" if OS.mac?), "--without-x", "--disable-tests" system "make", "install" diff --git a/Formula/dbxml.rb b/Formula/dbxml.rb index ecd0b89f59b16..e57a94b6dbdaa 100644 --- a/Formula/dbxml.rb +++ b/Formula/dbxml.rb @@ -11,6 +11,7 @@ class Dbxml < Formula sha256 "1886b654f152fc03a6a6e781ca94e5ca3a08f7f190bc1168326bf46b337c02e9" => :high_sierra sha256 "2a350300c31d639d46e9fafc16747d5cbe1897035acf1c365f795127535693b3" => :sierra sha256 "e2c82383d79f243654a0bbebdfb141334bbf683c6925b5a8f3ce0d1568024fec" => :el_capitan + sha256 "612cb40d40a4b4504ac8831c8ff3cc95085d61688199f9caabaac6231605a24c" => :x86_64_linux end depends_on "berkeley-db" diff --git a/Formula/dcd.rb b/Formula/dcd.rb index 7e8f340fd1993..273908470394f 100644 --- a/Formula/dcd.rb +++ b/Formula/dcd.rb @@ -11,6 +11,7 @@ class Dcd < Formula sha256 "1db1c37fa9dd757c4a91439bb36c8bbfae7983b9cfcaaa82b7cefcb6dfc5237e" => :mojave sha256 "932bb7fa259d950135a91973e7385e3fba9690cf899f65f0e1ffeb5b01d274e6" => :high_sierra sha256 "92cc0dcf3830b9b5fe63abe6d54323f8c310147f280be907123fa69b1646d868" => :sierra + sha256 "f685c41c791bd02755b9f6748d36bee4abe36a8baa90ff35d16a64b6d4010c5a" => :x86_64_linux end depends_on "dmd" => :build diff --git a/Formula/dcfldd.rb b/Formula/dcfldd.rb index 23567e8a1accc..f6105d3985449 100644 --- a/Formula/dcfldd.rb +++ b/Formula/dcfldd.rb @@ -13,6 +13,7 @@ class Dcfldd < Formula sha256 "0d5ff357d74fa90a97d80e202ddb5b5554bfec35efa2c4cb6e0f7e6dc9cf8ece" => :el_capitan sha256 "4731a1409199c0eb8d83f9f2f23106c1f71ccb1f8d8faf71a3fd691ba394791f" => :yosemite sha256 "5aeedb1165a426057dce57cf8b9b5b33db33f502d8cf2611276f2526bde1dda4" => :mavericks + sha256 "b7c9ef612fb36d98dd72de1602453bc739c5c0f51cb4a4e9309d5062a07f4286" => :x86_64_linux end def install diff --git a/Formula/dcled.rb b/Formula/dcled.rb index 9b3e386829713..c663ead14dccb 100644 --- a/Formula/dcled.rb +++ b/Formula/dcled.rb @@ -13,6 +13,7 @@ class Dcled < Formula sha256 "53d07c9548eaeba12645e944ce92c27a02667758176815220dc4ee2a8945c661" => :el_capitan sha256 "2ead7c4eb3c170690890c294936a2d3fc39def2fc332ce4c1da6d17cc8f91b50" => :yosemite sha256 "47a0b2e1eba58932936c25726d631d19f0f2a0a7b8872aff9e1d3a83b4e3cfc9" => :mavericks + sha256 "f38a543b5462687bb4a85af64c955326f5aaa0d635186d585b1b93ed01d1297c" => :x86_64_linux end depends_on "libhid" diff --git a/Formula/dcm2niix.rb b/Formula/dcm2niix.rb index 43ba3a754c6ce..16ad24cc96b62 100644 --- a/Formula/dcm2niix.rb +++ b/Formula/dcm2niix.rb @@ -10,6 +10,7 @@ class Dcm2niix < Formula sha256 "d6087edcd6fc5bd534295bbb5d909764b0f83ecc50812e58923a8200a22f3b65" => :catalina sha256 "bd5449e4418187c4882e2b32afa857632dd8119f2583f5741272f74d65d82603" => :mojave sha256 "072d6b24939de3dd5202142398083a4e9759c7adfc2c34d323b4b76fcecb542f" => :high_sierra + sha256 "e49a56f40cba1ec1fd94180224d97c81402b64723d871901944c405f152c9608" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/dcmtk.rb b/Formula/dcmtk.rb index 3d889d182e444..6795bb6cff83d 100644 --- a/Formula/dcmtk.rb +++ b/Formula/dcmtk.rb @@ -9,6 +9,7 @@ class Dcmtk < Formula sha256 "5b49e8b8d34cd1472f5091fc4d6e4b4a05133ac3cd85f6f428aef6c1013234b0" => :catalina sha256 "3d149b4aa7f6d76df7ddda09d845c4c43a0aa0617800b9ea25602183e213f5b0" => :mojave sha256 "70ba2b42c6a522f2da68ac47834f240db316afd12b388edb4bc7c1f586a18f2c" => :high_sierra + sha256 "32e89cab68de6f2e4ef50ae0c975f344bc5feba5b2a6d91c28e02ecb13756120" => :x86_64_linux end depends_on "cmake" => :build @@ -20,7 +21,7 @@ class Dcmtk < Formula def install mkdir "build" do - system "cmake", *std_cmake_args, ".." + system "cmake", *("-DBUILD_SHARED_LIBS=ON" unless OS.mac?), *std_cmake_args, ".." system "make", "install" end end diff --git a/Formula/dcos-cli.rb b/Formula/dcos-cli.rb index 9d89fa74ced9c..4dcc36ea1ce9b 100644 --- a/Formula/dcos-cli.rb +++ b/Formula/dcos-cli.rb @@ -9,6 +9,7 @@ class DcosCli < Formula sha256 "1f98490af0a9ce9a22e7de6f764d887342e11bbd25ca70131e2987a93131170f" => :catalina sha256 "d38aab9ff56007a19cc5a6e16546ac852b10a08d9b951c32dc36fd10642a15c0" => :mojave sha256 "a44dadc1335fa9f20ef25f10cd6a6ef826b7d34cf20de7261b3e67d5c86f3474" => :high_sierra + sha256 "97dd114d3dd6a290945c01e51c2f1c0c55ec173712235cc7fea2db252a1eb609" => :x86_64_linux end depends_on "go" => :build @@ -17,8 +18,9 @@ def install ENV["NO_DOCKER"] = "1" ENV["VERSION"] = version.to_s - system "make", "darwin" - bin.install "build/darwin/dcos" + platform = OS.mac? ? "darwin" : "linux" + system "make", platform + bin.install "build/#{platform}/dcos" end test do diff --git a/Formula/dcraw.rb b/Formula/dcraw.rb index 8ff9d40f23a03..b5da44eb088e2 100644 --- a/Formula/dcraw.rb +++ b/Formula/dcraw.rb @@ -12,6 +12,7 @@ class Dcraw < Formula sha256 "21f31347e500f314a1f2e6fe03f0d6009b25fa5bd9f1f339b0fe77fc38050e81" => :high_sierra sha256 "dc99d6de1166a3f4fa66d23b798dad9a58e0fac24f72c02ab38ea32e74b30a9e" => :sierra sha256 "022f85e8da7b4cd8c68d7251d39bf3084ec28a15cb859d9cfe49bd439e312466" => :el_capitan + sha256 "3c8ab286691825d083271820ab48336b8456d5effa2fa3b4efe7f82ee17a16f8" => :x86_64_linux end depends_on "jasper" diff --git a/Formula/ddate.rb b/Formula/ddate.rb index d001da8e965f0..84b1b3da799e3 100644 --- a/Formula/ddate.rb +++ b/Formula/ddate.rb @@ -14,6 +14,7 @@ class Ddate < Formula sha256 "fe87fe60ad1e8cbff1ebbcefd8be0f6f8ec87013a91e6385adbde0aebd45edea" => :el_capitan sha256 "ad575dd84b5d2ac8395c9cd11c4ef811f28f105eb81510369bb33078164ec2e9" => :yosemite sha256 "6d1dd4a9a1cc787cbd79add910fd80181dc5efc24712b9e84a7c37ce8de46d12" => :mavericks + sha256 "4b4632697240a4e7b6dfb7a27a0ace8a692a1b31702fbe1c23e225f3815a76f9" => :x86_64_linux end def install diff --git a/Formula/ddd.rb b/Formula/ddd.rb index 0692a2de52238..8c56fc1794160 100644 --- a/Formula/ddd.rb +++ b/Formula/ddd.rb @@ -13,10 +13,15 @@ class Ddd < Formula sha256 "381ae07c96a67534b05a03ca72741d99aa3437a01c0fef603336ea218c470df9" => :high_sierra sha256 "af12e95b5b4326906236559a40f6715e896d164d5c18d9448384e0e22d089abf" => :sierra sha256 "68864faf1967b400bc5df5809ab9ee03a0d632f3736071131dd5469be715c58f" => :el_capitan + sha256 "c1345dc1802ab1a6ac44e15310d37a5d1052f41c806d847c7c1d47ece4313386" => :x86_64_linux end depends_on "openmotif" - depends_on :x11 + if OS.mac? + depends_on :x11 + else + depends_on "linuxbrew/xorg/xorg" + end # Needed for OSX 10.9 DP6 build failure: # https://savannah.gnu.org/patch/?8178 @@ -39,6 +44,12 @@ class Ddd < Formula end def install + unless OS.mac? + # Patch to fix compilation error + # https://savannah.gnu.org/bugs/?33960 + inreplace "ddd/strclass.C", "#include ", "#include \n#include " + end + system "./configure", "--disable-debug", "--disable-dependency-tracking", "--enable-builtin-app-defaults", diff --git a/Formula/ddgr.rb b/Formula/ddgr.rb index 7e0cb8603e57e..4630df7de23ce 100644 --- a/Formula/ddgr.rb +++ b/Formula/ddgr.rb @@ -11,6 +11,7 @@ class Ddgr < Formula sha256 "ba751df7de76dd4c286e8502cf5e46f406f1e6b1467689f98158bc92f7df42b2" => :catalina sha256 "ba751df7de76dd4c286e8502cf5e46f406f1e6b1467689f98158bc92f7df42b2" => :mojave sha256 "ba751df7de76dd4c286e8502cf5e46f406f1e6b1467689f98158bc92f7df42b2" => :high_sierra + sha256 "b8c024c062ce3af6dc579bf931c0e8e1b6d5d109d54068ef69f70d14e6ba64bf" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/ddrescue.rb b/Formula/ddrescue.rb index ec7dd33beb701..748eca659b2bc 100644 --- a/Formula/ddrescue.rb +++ b/Formula/ddrescue.rb @@ -10,6 +10,7 @@ class Ddrescue < Formula sha256 "517175b22fc4cc660059801b497484ffd7096ade308222c752e758f5036f570a" => :catalina sha256 "73234513fd966432d0cd11f907614b350c6943b3d2c82a7d1ed487fa93f948ca" => :mojave sha256 "a4090204da6b3ef1ff36ff144dd7737e42424e7adf59519becd76ca134cbc08c" => :high_sierra + sha256 "666e7869d9f475268ca4670edfe9aa7448c50e80974ffed2240000bea4c31be1" => :x86_64_linux end def install diff --git a/Formula/deark.rb b/Formula/deark.rb index ca460e70c032f..f6a4a5ed3b5eb 100644 --- a/Formula/deark.rb +++ b/Formula/deark.rb @@ -11,6 +11,7 @@ class Deark < Formula sha256 "f8d53f955cfd1e3e506c9db344479771a29d4a59408a845dcf58fa3c13f21641" => :catalina sha256 "950b65739f9a3770e1e98ef497aef22a529f31aff07186e287dc41764ca8086f" => :mojave sha256 "a66a4003564df921fd305c02fc9a2996093780365841a615615f953946f2b37d" => :high_sierra + sha256 "b42cca51983539a02b362e22b567efc2fc6afaddd987adf0dae257384a1e0d77" => :x86_64_linux end def install diff --git a/Formula/debianutils.rb b/Formula/debianutils.rb index f2a17cdd81482..db3992cd3475a 100644 --- a/Formula/debianutils.rb +++ b/Formula/debianutils.rb @@ -9,6 +9,7 @@ class Debianutils < Formula sha256 "91343603e1d52380fd28a65781e2cc8e7f9708cd94fd710a60261cc626509286" => :catalina sha256 "0968d5be34075a8d95c5884baee76f3147216d403446cf2d121931a20664925b" => :mojave sha256 "632fac3d90523c039bc7ab6829de0a27cd3f1fc39ce41337ba90ea6d14f2be89" => :high_sierra + sha256 "a2c7377c4bce5f2bcc5a2128203d4eeb66bb6c9b3470b481c51d914c1c3be662" => :x86_64_linux end def install diff --git a/Formula/defaultbrowser.rb b/Formula/defaultbrowser.rb index 2728fe27ff366..ec46c446f4f8b 100644 --- a/Formula/defaultbrowser.rb +++ b/Formula/defaultbrowser.rb @@ -13,6 +13,8 @@ class Defaultbrowser < Formula sha256 "f0ccf84abbd31469f80c4d232292dd280a978d3f04a1a6db46079902d9821d1e" => :el_capitan end + depends_on :macos + def install system "make", "install", "PREFIX=#{prefix}" end diff --git a/Formula/deheader.rb b/Formula/deheader.rb index a8f36fda47fbf..d7b8a3d04f58e 100644 --- a/Formula/deheader.rb +++ b/Formula/deheader.rb @@ -14,9 +14,11 @@ class Deheader < Formula sha256 "2b70a9eb18042a3e93ab8fc1bf018c417d8b41f9b8efe6d818d45aed6922cf52" => :sierra sha256 "2b70a9eb18042a3e93ab8fc1bf018c417d8b41f9b8efe6d818d45aed6922cf52" => :el_capitan sha256 "2b70a9eb18042a3e93ab8fc1bf018c417d8b41f9b8efe6d818d45aed6922cf52" => :yosemite + sha256 "a8e0f9dbb9facba1035da6d491a2b4cb150a5fd78da8b8e34939f04a01bfac19" => :x86_64_linux # glibc 2.19 end depends_on "xmlto" => :build + depends_on "libarchive" => :build unless OS.mac? def install ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" @@ -24,9 +26,10 @@ def install # Remove for > 1.6 # Fix "deheader-1.6/deheader.1: Can't create 'deheader-1.6/deheader.1'" # See https://gitlab.com/esr/deheader/commit/ea5d8d4 - system "/usr/bin/tar", "-xvqf", "deheader-1.6.tar.gz", + tar = OS.mac? ? "/usr/bin/tar" : Formula["libarchive"].bin/"bsdtar" + system tar, "-xvqf", "deheader-1.6.tar.gz", "deheader-1.6/deheader.1" - system "/usr/bin/tar", "-xvf", "deheader-1.6.tar.gz", "--exclude", + system tar, "-xvf", "deheader-1.6.tar.gz", "--exclude", "deheader-1.6/deheader.1" cd "deheader-1.6" do system "make" diff --git a/Formula/dehydrated.rb b/Formula/dehydrated.rb index fe278398878e5..db552934afae7 100644 --- a/Formula/dehydrated.rb +++ b/Formula/dehydrated.rb @@ -10,6 +10,7 @@ class Dehydrated < Formula sha256 "376b14fa1047117a1779c583cd73139b7e4e8d3dafae240bac62912580aae571" => :mojave sha256 "376b14fa1047117a1779c583cd73139b7e4e8d3dafae240bac62912580aae571" => :high_sierra sha256 "1b4042e46b66cb78a1f4a423d742bfe3110f12ea8d26177ff0f05d2aea24d6b2" => :sierra + sha256 "8d3a983fc6c6d06115d24b0a12f231ad9328bf1a362e3f3fa5c37c9e0eceea53" => :x86_64_linux end def install diff --git a/Formula/delta.rb b/Formula/delta.rb index 3c027eac90ad9..160ea6c5a9572 100644 --- a/Formula/delta.rb +++ b/Formula/delta.rb @@ -14,6 +14,7 @@ class Delta < Formula sha256 "202409012500969cfd034c9d44c441a809445a3b367d514357346438aa850f14" => :el_capitan sha256 "d3374cc3e84c93bb84615b1669503ea8b708ab65baf629ee0be9a728b12b10bc" => :yosemite sha256 "04102ae55ffc2cc4351816b010544b854c21f1c5e2a462a6af0e57ec2f57b501" => :mavericks + sha256 "7e5e52d7dc76e51b87d66da63bbd2ce30941fad5041509bdbd38722da81e31c8" => :x86_64_linux end conflicts_with "git-delta", :because => "both install a `delta` binary" diff --git a/Formula/deno.rb b/Formula/deno.rb index 6c580afc4ad9f..d60286fff97f7 100644 --- a/Formula/deno.rb +++ b/Formula/deno.rb @@ -14,7 +14,7 @@ class Deno < Formula depends_on "llvm" => :build depends_on "ninja" => :build depends_on "rust" => :build - depends_on :xcode => ["10.0", :build] # required by v8 7.9+ + depends_on :xcode => ["10.0", :build] if OS.mac? # required by v8 7.9+ depends_on :macos # Due to Python 2 (see https://github.com/denoland/deno/issues/2893) uses_from_macos "xz" @@ -42,6 +42,8 @@ def install ENV["CLANG_BASE_PATH"] = Formula["llvm"].prefix ENV.remove "HOMEBREW_LIBRARY_PATHS", Formula["llvm"].opt_lib + system "core/libdeno/build/linux/sysroot_scripts/install-sysroot.py", "--arch=amd64" unless OS.mac? + cd "cli" do system "cargo", "install", "-vv", *std_cargo_args end diff --git a/Formula/dep.rb b/Formula/dep.rb index 1fefa3b9f48f4..93571cea4946e 100644 --- a/Formula/dep.rb +++ b/Formula/dep.rb @@ -12,6 +12,7 @@ class Dep < Formula sha256 "33200b5422fac00416ac44c7c28ad5aa627b845cd4d9aeb7002f7d41304deab0" => :mojave sha256 "29cfe5b8c29bfbb09a93087dfbd30a9894ed596d3a4219072f022a001d2975cd" => :high_sierra sha256 "ef9a0a978cbf2d4e537d21c4ff7b89a75b66228697b0aa348daa2284bc7362a9" => :sierra + sha256 "6810c65308b77a4a99a657fc8963221b9729b5f63ea2d7500932d38191063a87" => :x86_64_linux end depends_on "go" @@ -20,12 +21,13 @@ class Dep < Formula def install ENV["GOPATH"] = buildpath + platform = OS.mac? ? "darwin" : "linux" (buildpath/"src/github.com/golang/dep").install buildpath.children cd "src/github.com/golang/dep" do - ENV["DEP_BUILD_PLATFORMS"] = "darwin" + ENV["DEP_BUILD_PLATFORMS"] = platform ENV["DEP_BUILD_ARCHS"] = "amd64" system "hack/build-all.bash" - bin.install "release/dep-darwin-amd64" => "dep" + bin.install "release/dep-#{platform}-amd64" => "dep" prefix.install_metafiles end end diff --git a/Formula/depqbf.rb b/Formula/depqbf.rb index e7fe343782be2..4009118f39ae6 100644 --- a/Formula/depqbf.rb +++ b/Formula/depqbf.rb @@ -13,6 +13,7 @@ class Depqbf < Formula sha256 "fea1eb8ca62fccc5ce43b0a645fb67feffbf97c5a343d0ea6c9a015c37e24ccc" => :sierra sha256 "3229005d870984af6beee544d5178094fc859525bd96552ac42301860c175f5b" => :el_capitan sha256 "2e56b8bac22dbf77677e825ee6242fea35545c2714859c4f22872c1c0fb056e3" => :yosemite + sha256 "42229ac07c7d7c12f9feb7078fa28b318c4ce52892940056a79a9baa70e79f6a" => :x86_64_linux # glibc 2.19 end resource "nenofex" do @@ -30,7 +31,8 @@ def install (buildpath/"picosat-960").install resource("picosat") system "./compile.sh" bin.install "depqbf" - lib.install "libqdpll.a", "libqdpll.1.0.dylib" + lib.install "libqdpll.a" + lib.install "libqdpll.#{OS.mac? ? "1.0.dylib" : "so.1.0"}" end test do diff --git a/Formula/desktop-file-utils.rb b/Formula/desktop-file-utils.rb index f2870f22ce741..1b7de6ce4ceb7 100644 --- a/Formula/desktop-file-utils.rb +++ b/Formula/desktop-file-utils.rb @@ -8,6 +8,7 @@ class DesktopFileUtils < Formula sha256 "fba87a1749b744c74510df1a49ed7627615ab10a2398922eac1389f4e35a5cb8" => :catalina sha256 "2e6548daf5b3fd3f038205986130d39390fd4b22955ed07ad06f6378d5e6e5f2" => :mojave sha256 "12e7bfe0f9a579f826f7c74f5a67d41ed4dee469f1cf0f3b4be89ef9e884996e" => :high_sierra + sha256 "54eb9c27199557ef1a471d7fd819708615a3125e2e8ae048a7ebf093dae599c2" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/devd.rb b/Formula/devd.rb index 6b3418ea407fb..bd6743912120e 100644 --- a/Formula/devd.rb +++ b/Formula/devd.rb @@ -16,7 +16,7 @@ class Devd < Formula depends_on "go" => :build def install - ENV["GOOS"] = "darwin" + ENV["GOOS"] = OS.mac? ? "darwin" : "linux" ENV["GOARCH"] = "amd64" ENV["GOPATH"] = buildpath (buildpath/"src/github.com/cortesi/devd").install buildpath.children diff --git a/Formula/devdash.rb b/Formula/devdash.rb index 518fdf6363a91..7ac2179d8feca 100644 --- a/Formula/devdash.rb +++ b/Formula/devdash.rb @@ -9,6 +9,7 @@ class Devdash < Formula sha256 "86085a11dbf43d1edafd9e9fd7e47443ec11ab692b9b48a80c5ffc58a2f1b39a" => :catalina sha256 "a15bcbbc6085b0420bb9bc863acfffbd4a8fd05956dc66dd163caa8ddf731fc3" => :mojave sha256 "ef75c99c9d174815f7fb244f8b63866e0b27e22d5c35c9e37190da3293c7678b" => :high_sierra + sha256 "206bd004980a01c0b63a85d9a7ff2cf6b13e5275bbf375cb1e6a8f6133be75b6" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/device-mapper.rb b/Formula/device-mapper.rb new file mode 100644 index 0000000000000..59df3e68359ef --- /dev/null +++ b/Formula/device-mapper.rb @@ -0,0 +1,28 @@ +class DeviceMapper < Formula + desc "Device mapper userspace library and tools" + homepage "https://sourceware.org/dm" + url "https://sourceware.org/git/lvm2.git", + :tag => "v2_02_186", + :revision => "4e5761487efcb33a47f8913f5302e36307604832" + version "2.02.186" + + bottle do + cellar :any_skip_relocation + sha256 "b9a0ecca9c06b7f9ac4483406452aa241f1429667a1ee41948426b8a5347eb74" => :x86_64_linux + end + + depends_on "libaio" + depends_on :linux + + def install + # https://github.com/NixOS/nixpkgs/pull/52597 + ENV.deparallelize + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}", + "--enable-pkgconfig" + system "make", "device-mapper" + system "make", "install_device-mapper" + end +end diff --git a/Formula/devspace.rb b/Formula/devspace.rb index ea061f058ffb5..62d0a5da3bdfd 100644 --- a/Formula/devspace.rb +++ b/Formula/devspace.rb @@ -10,6 +10,7 @@ class Devspace < Formula sha256 "800c4beb26a89994591ac2b93d34df71c216a4119050b14624484309fce91d3d" => :catalina sha256 "fddccd393244d8caecd811418a97f33656386695a1ea887e8ae5c739ab3c087e" => :mojave sha256 "1d7462c7832f9935b7440ac252cc814713a43d1f27cbcf5d6c50f69502b6445d" => :high_sierra + sha256 "48f52ba347a6cf58ad51a602ed503789abcec338176fa995622460c4ddd7bc2a" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dfc.rb b/Formula/dfc.rb index aa78495ceeda6..66986c6c91c70 100644 --- a/Formula/dfc.rb +++ b/Formula/dfc.rb @@ -11,6 +11,7 @@ class Dfc < Formula sha256 "1a313424cdf9c4eecd2f9c343f8218da48bec1cf1da3585038e0b0d7742d5247" => :mojave sha256 "6729cbd05c951477c251e240afc01f6a1cc4ab04441f653194388a6dcf048d13" => :high_sierra sha256 "158a1dc96381a8c13a38aa6682120c5f6985ee2a71bf511eba5b99c32d6ab9e4" => :sierra + sha256 "5ce0086df3e06d06cb47e5482012a456238b7c7b530c255a2d75cb21ace98f5f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/dfix.rb b/Formula/dfix.rb index ec89b3ec957f7..78af4ad548f48 100644 --- a/Formula/dfix.rb +++ b/Formula/dfix.rb @@ -12,6 +12,7 @@ class Dfix < Formula sha256 "ff3b76977bcbfb5b7a04bbebb53a794cc522b64987f724fe5f8a8236812eb1f8" => :catalina sha256 "24d234e206efa754f8bd900102720280d8efb1af6ec93059a467589acddca3ee" => :mojave sha256 "13a2621737c198bd0540f507293a9b015a0ebe36cd3373589a69ec834a863d8d" => :high_sierra + sha256 "8f27a62cadfd35f223e416b0b68b05b57f4d8d5b0710c735a579f6aeeae2385b" => :x86_64_linux end depends_on "dmd" => :build diff --git a/Formula/dfmt.rb b/Formula/dfmt.rb index e671950ea488e..72c0bc45362bc 100644 --- a/Formula/dfmt.rb +++ b/Formula/dfmt.rb @@ -11,6 +11,7 @@ class Dfmt < Formula sha256 "8a3b74f50717d236b6ef445de2608ab31e4c43ae10af01e71d9b95d590c4c8e7" => :catalina sha256 "db3e4c50f54d7dd31c9b2768d7b0539d8dea62ae0d7c3ccef7c8ce955721a595" => :mojave sha256 "2fa9649c94a8f624d772d76a1cd43ecc3e8b016a29711d4ea0b6e92906646f09" => :high_sierra + sha256 "de41bc11011336ab17570c6ea22fcab33e0b4a30dc0afca4d58a90c83f69979d" => :x86_64_linux end depends_on "dmd" => :build diff --git a/Formula/dfu-programmer.rb b/Formula/dfu-programmer.rb index b5b95ff994529..d37de0064a98a 100644 --- a/Formula/dfu-programmer.rb +++ b/Formula/dfu-programmer.rb @@ -13,6 +13,7 @@ class DfuProgrammer < Formula sha256 "e9657f69d69597d89bd94bb1b1fc806f61a476c409a2da5a57abb062742bed04" => :el_capitan sha256 "4dea1ba0456ff657f6bc332db3040d1f9955a1845fcf8d34585187d67637c39e" => :yosemite sha256 "f7e6ab4ed28bf63c21b76917c71ada3675e312475eba15ae1f5f7a5fede3e872" => :mavericks + sha256 "ab293081baff8944500f1762a63faee39af4c65bdcd95c1f29a6c660de054ef6" => :x86_64_linux end head do diff --git a/Formula/dfu-util.rb b/Formula/dfu-util.rb index 076daffa05d79..c701009f736a5 100644 --- a/Formula/dfu-util.rb +++ b/Formula/dfu-util.rb @@ -13,6 +13,7 @@ class DfuUtil < Formula sha256 "49975a34b6bacad4549871097effce90e376d3cd26ed24b2d7dfd925a199f0f8" => :el_capitan sha256 "776c3ed14def87511f9280201a95490145a9d469e2c1e29873c335e2c39ed279" => :yosemite sha256 "75c7ffa4e2d5067618c41f999f3d0c8a9aac1080e9eb8cd1f9bec8dd154aa1c1" => :mavericks + sha256 "4eabf9616d0f18eb1f6bccc227498bcfb26b8a386af6ed4b53027fa0b1f441e2" => :x86_64_linux end head do diff --git a/Formula/dgen.rb b/Formula/dgen.rb index 972fa27e733ed..a549a91d97a63 100644 --- a/Formula/dgen.rb +++ b/Formula/dgen.rb @@ -12,6 +12,7 @@ class Dgen < Formula sha256 "50383807ec76387aa156cf6157ea537465bf20ad35e4e9eddda7d34685ded635" => :sierra sha256 "ebcab68ba8d0aa9c6aacae94d43a67ce016dcdd219c5770c3b7d6d9c3590ef9f" => :el_capitan sha256 "53f1fc72dbaab000eae45e143ca46a054a6ff655f91190d6aa30e71e8e505494" => :yosemite + sha256 "2c5589f2c0b42ed5b00e3f5448f1b2d979f9d2ec49c400df18f00b5d779ec30c" => :x86_64_linux end head do diff --git a/Formula/dhall-json.rb b/Formula/dhall-json.rb index f3d55084f6648..a5030eb121b24 100644 --- a/Formula/dhall-json.rb +++ b/Formula/dhall-json.rb @@ -7,10 +7,10 @@ class DhallJson < Formula head "https://github.com/dhall-lang/dhall-haskell.git" bottle do - cellar :any_skip_relocation sha256 "30e4dd29ec472fb53ba842fe792e0ed75d82530750621aeddd9ec9e642f12351" => :catalina sha256 "cf806eab9566d74071a545e27dd26a568cbf019d87705f059d98c100fb21c9bc" => :mojave sha256 "953853ab55f1421a6fed8908407593c62b60d20d28a1a3daac47d04f2d366efc" => :high_sierra + sha256 "7270fef856a00e105b4d915ce5f5e33d156a3bbbbb9b395bb10e7dcd9b661774" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/dhcping.rb b/Formula/dhcping.rb index e48be79920d18..afc13ed5fc0fd 100644 --- a/Formula/dhcping.rb +++ b/Formula/dhcping.rb @@ -14,6 +14,7 @@ class Dhcping < Formula sha256 "d3b03b1004d3a2d97b80fbbe9714bd29d006d9099a8f6baec343feb2833f3996" => :el_capitan sha256 "7741adb9bc166ee2450e521f7468e2b023632e737eb4da065848c5e87b6bd35a" => :yosemite sha256 "49206410d2fc5259798c2a76ee871df08c54772d1501d7ce1d29be652d600905" => :mavericks + sha256 "8e9caa0cf1255efac9ad5135ab1b0a7c82853f5f75877640b5d241bcd08e8f36" => :x86_64_linux end def install diff --git a/Formula/dhex.rb b/Formula/dhex.rb index 18f86ec176ac9..092268a8c97bd 100644 --- a/Formula/dhex.rb +++ b/Formula/dhex.rb @@ -10,6 +10,7 @@ class Dhex < Formula sha256 "2d6043ce881b7b407fa40691639c25c72d73a427fcdd39a56e0683f48b16b328" => :mojave sha256 "bfc2aa6c73ffff61a471b4dd8e183e493781a5c34baeddffc56fa89b0542a9bd" => :high_sierra sha256 "b83e63ad0f1e2910e1f2495903ac4077aa5caaabe8cb2702094f42c3921c7a9c" => :sierra + sha256 "e9acf5875c20249ac61ecf9884713525aab0ae56d86f42155713f4151b1e72ff" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/di.rb b/Formula/di.rb index 23172efea04a2..d32ef68a125df 100644 --- a/Formula/di.rb +++ b/Formula/di.rb @@ -9,6 +9,7 @@ class Di < Formula sha256 "c49db9fca46dd848d4cf5badc22524ab66f8169c6368a7839023b3593969f451" => :catalina sha256 "e3ba587be02153b3fc475ffe3dfc21714ce0e82e9a4d03d32e9ecaff4400e287" => :mojave sha256 "14522350f027f600e28be34b412ba66ab95c1fcbbce81dd064826493165aa142" => :high_sierra + sha256 "6fba7e812ebd0836cd48cfe0651dc40795484350bc9b96495edbd56f64102882" => :x86_64_linux end def install diff --git a/Formula/dialog.rb b/Formula/dialog.rb index fa8fc4b41959c..3b224f9f800a7 100644 --- a/Formula/dialog.rb +++ b/Formula/dialog.rb @@ -9,6 +9,7 @@ class Dialog < Formula sha256 "23d7541b2fbba5903eafedde0a4182a3bfe11542139e35fa39d308c9464d62c6" => :catalina sha256 "73aa99c7e00983a9fdefedd5fec29cd77d2825529aa64a10367b7e9f7bb7e1a1" => :mojave sha256 "ef79f4d596a4ebfcb5bde2ac34d0e27e67092263a05b54e110ecc783cfffa4fd" => :high_sierra + sha256 "c401f64732a2120fa8ea87a32ba240c234fa0c75d322f51fabf5fdc46531aac2" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/diamond.rb b/Formula/diamond.rb index 08b3fb2c0a7fc..bca3e0bc13d6e 100644 --- a/Formula/diamond.rb +++ b/Formula/diamond.rb @@ -9,6 +9,7 @@ class Diamond < Formula sha256 "f68458d1886716c4ee0c34e31187ea85e149cfcd72b190050ab464e5657a600a" => :catalina sha256 "722f1d03a45520b61f51afee74e119732bae1fb90a775a0433382ab7ccf67d61" => :mojave sha256 "ebda6089e20340b49dc7dc3144cc459d3a9b7e075dd699249e2fc6be61bf5a6e" => :high_sierra + sha256 "294191f3a713d927d4a43f5cc0d87f9d345b37661c1bdc13f6c06fb7c47dcc58" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/diceware.rb b/Formula/diceware.rb index 954fb73256749..3bd2e6fe9b375 100644 --- a/Formula/diceware.rb +++ b/Formula/diceware.rb @@ -5,13 +5,14 @@ class Diceware < Formula homepage "https://github.com/ulif/diceware" url "https://github.com/ulif/diceware/archive/v0.9.6.tar.gz" sha256 "ff55832e725abff212dec1a2cb6e1c3545ae782b5f49ec91ec870a2b50e1f0e8" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "510a0f4aca2e72306d28a54c0c5d5a2d5dd98b6a7c5e8b5a104e637b1499866a" => :catalina sha256 "f5dfaf498b1d3097b8b5346b215e81f1af6dcd98da65ec123a8b129690df3650" => :mojave sha256 "a5838d0d6d69978d1bd9d56699ae4256af9a56bd5636614e783b4e4379c8365f" => :high_sierra + sha256 "e27e65a0056b41043543f929af44918d21896d2b35d006eee9e173cf80d2d0c4" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/diction.rb b/Formula/diction.rb index e8fca121291cc..d70a0d2f99fff 100644 --- a/Formula/diction.rb +++ b/Formula/diction.rb @@ -13,6 +13,7 @@ class Diction < Formula sha256 "858b8312ef527a7745a02b3bf40cd483c0212216e3342ac7eaddbfe6045893dd" => :el_capitan sha256 "ce2b0d6b0f7184596753de94a3cbd171f5236c947f47536d3bf5be806c8ef804" => :yosemite sha256 "b993bef13629751dc5ac23a38e67ea8fdce3e75f0d96585dc71508543e099f0e" => :mavericks + sha256 "b4aae6928c07ee315dc2f01803d9e57b81efaa1eaba626b6a71650db7d6ea525" => :x86_64_linux end def install diff --git a/Formula/dieharder.rb b/Formula/dieharder.rb index 8c9e290fc5948..ceabc25413c7d 100644 --- a/Formula/dieharder.rb +++ b/Formula/dieharder.rb @@ -11,10 +11,14 @@ class Dieharder < Formula sha256 "b7b1bdbb6f105e4286320ad067689d8e3f7a2c7821a53382ebc2007b47d06dc9" => :mojave sha256 "341bdf1e0fce90d69db4e6749ec3ee3b8c5903559e365a19e9f5a8ba2723d403" => :high_sierra sha256 "8a40fb61aef5230ad77b3b851a6e8b6d575ff2adaa747c3b73a75cd203197945" => :sierra + sha256 "c73860b6159dcac52f7317e850475c526e7d0ded994adf8d61d8ba920b317aac" => :x86_64_linux end depends_on "gsl" + # https://aur.archlinux.org/cgit/aur.git/tree/stdint.patch?h=dieharder + patch :DATA unless OS.mac? + def install system "./configure", "--prefix=#{prefix}", "--disable-shared" system "make", "install" @@ -24,3 +28,15 @@ def install system "#{bin}/dieharder", "-o", "-t", "10" end end + +__END__ +--- dieharder-3.31.1/include/dieharder/libdieharder.h 2011-10-14 15:41:37.000000000 +0200 ++++ dieharder-3.31.1/include/dieharder/libdieharder.h.new 2015-03-27 16:34:40.978860858 +0100 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + + /* This turns on uint macro in c99 */ \ No newline at end of file diff --git a/Formula/diff-pdf.rb b/Formula/diff-pdf.rb index f7db9ada81e69..c765a4c10b5f1 100644 --- a/Formula/diff-pdf.rb +++ b/Formula/diff-pdf.rb @@ -18,7 +18,8 @@ class DiffPdf < Formula depends_on "cairo" depends_on "poppler" depends_on "wxmac" - depends_on :x11 + depends_on :x11 if OS.mac? + depends_on "linuxbrew/xorg/xorg" unless OS.mac? def install system "./configure", "--disable-dependency-tracking", diff --git a/Formula/diffoscope.rb b/Formula/diffoscope.rb index c2f7975fc9227..5e26e8ddad120 100644 --- a/Formula/diffoscope.rb +++ b/Formula/diffoscope.rb @@ -11,6 +11,7 @@ class Diffoscope < Formula sha256 "c727fbee3d4c7e8056d9015b6027c917ac76c3b214d57aecddf55f432a16857d" => :catalina sha256 "cbc2eb2ec9172cc4c3743fccdc8a5f684d2fc089d7cd423045e5acee390e6a8e" => :mojave sha256 "32705ed9fd0b48e8709e2e7c514a24aa41fd007c074077ebbd79855ac4a4a2f2" => :high_sierra + sha256 "61024945033cd1092300a8deeb1f26cd2ec155848d1f0ef5bff286862dd362a1" => :x86_64_linux end depends_on "gnu-tar" @@ -46,7 +47,7 @@ def install venv.pip_install buildpath bin.install libexec/"bin/diffoscope" - libarchive = Formula["libarchive"].opt_lib/"libarchive.dylib" + libarchive = Formula["libarchive"].opt_lib/"libarchive.#{OS.mac? ? "dylib" : "so"}" bin.env_script_all_files(libexec/"bin", :LIBARCHIVE => libarchive) end diff --git a/Formula/diffr.rb b/Formula/diffr.rb index 26aa60147ebc1..74b16e5d32fc8 100644 --- a/Formula/diffr.rb +++ b/Formula/diffr.rb @@ -9,6 +9,7 @@ class Diffr < Formula sha256 "95c977ef5f56699e0007be2b869e12007afec6fabdd84b003825e04e66d52d74" => :catalina sha256 "b3d54c3e09b5b8a5a6de7b1d8c4511b4ff1d0b835250738343a45e3e872a0d08" => :mojave sha256 "4b0ac077f6fd419d00c67dbfa100b8822dc041a8b12925cbda7a4d87a2c470fc" => :high_sierra + sha256 "4546c2044f9aa0a32b88a13e4e8d5c0995cb5be3be023ed2017513b829902a6c" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/diffstat.rb b/Formula/diffstat.rb index a00a96d1fd147..a016c257cd1ce 100644 --- a/Formula/diffstat.rb +++ b/Formula/diffstat.rb @@ -9,6 +9,7 @@ class Diffstat < Formula sha256 "056ed50b34a51b0f86dd9aad74785dc956e204621faa7c0ee4535e4bb54dfdfb" => :catalina sha256 "ccdff1c449f1d218ae636de168f9f36fdc1fd8aee3dd71c83ad4d562c7cd4567" => :mojave sha256 "aa3691a218fb3b34065729e648dbf4339150de2247f48c458832fba6221ca509" => :high_sierra + sha256 "d3e8ca3a4acd3bc5ec87bacb4eb49701e72cec0c80da5a1a8cf69560a0bd9117" => :x86_64_linux end def install diff --git a/Formula/diffutils.rb b/Formula/diffutils.rb index 80cf2c2e0c55f..65f9d472947cd 100644 --- a/Formula/diffutils.rb +++ b/Formula/diffutils.rb @@ -6,11 +6,11 @@ class Diffutils < Formula sha256 "b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26" bottle do - cellar :any_skip_relocation sha256 "25a2f5fcdfcdf2efa36b97841e45455950fe322e1c642d97a36abbb2662007cf" => :catalina sha256 "4ec2a5ef0ca889d6c449b31ed43c797a0656ff7a2acfd913d0f87d8f14248031" => :mojave sha256 "fe012f4e981c3df3b2d1b3eb2b77009991148e3bdc08dd974d6f6071108e8937" => :high_sierra sha256 "3a04e2e2de81458a8fc75482a97a02883a1cdf231ee340ce30d9a712d0475305" => :sierra + sha256 "14aedfee9f25b2e2d0ba28dfc62941767d078919fce26cdcc60ff05ddba50f5b" => :x86_64_linux end def install diff --git a/Formula/digitemp.rb b/Formula/digitemp.rb index 08c0195343870..2ecbdfe1cce73 100644 --- a/Formula/digitemp.rb +++ b/Formula/digitemp.rb @@ -11,6 +11,7 @@ class Digitemp < Formula sha256 "54fbf374d90a378d49b86174f4c00e0a56a1cee599d040a740469d7ad7b3a991" => :mojave sha256 "a91be4056f24f4bef0c19c8a3693d48e0f7d391494e7db1be416ab1eb833daa2" => :high_sierra sha256 "dab9de93acb1edb05e3607075b36ce233e567dd9a1918aacf3b19f3826aa30ef" => :sierra + sha256 "b595d6bc1bac893fb36797b950580b6b726aa8195fe705694bb6013518622480" => :x86_64_linux end depends_on "libusb-compat" diff --git a/Formula/dirac.rb b/Formula/dirac.rb index 04b4dc087505b..d99bc3fe58527 100644 --- a/Formula/dirac.rb +++ b/Formula/dirac.rb @@ -16,6 +16,7 @@ class Dirac < Formula sha256 "8f4414614755f863d3ba0f43d6415684fbc00976ae24c7e45c88fe736be918d2" => :el_capitan sha256 "1d3049d9dcdbd0116c65c54582601b20cdd17c8b89cf80e74efc79f71b641ca4" => :yosemite sha256 "e7c407545085631c27c77f2d15abe84b3cc0a3645cf5e538aa15f0aacfe6de50" => :mavericks + sha256 "bcf101614a66678b18f442ea650f3ee58a813a1a2d15cb1655da65608bd90d3d" => :x86_64_linux end # First two patches: the only two commits in the upstream repo not in 1.0.2 diff --git a/Formula/direnv.rb b/Formula/direnv.rb index 6e1ca24d6ce0f..cc16c14358015 100644 --- a/Formula/direnv.rb +++ b/Formula/direnv.rb @@ -10,6 +10,7 @@ class Direnv < Formula sha256 "3d27ce73fbfdf133817b8e25f217d935be47a2467aa2f008d8ae2ef0ffaeccf4" => :catalina sha256 "1b16dd8e83fd2463744faad358496812599d8844eb773c62947652958d20662d" => :mojave sha256 "4b5a41fc1184ff2362f9558b9e822821b350aae36a98ec81bb2c70c9f1bc9bed" => :high_sierra + sha256 "969f98b980575db254c203f8ab599da140edab8acd50083e374f8bcbcba260a7" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/disktype.rb b/Formula/disktype.rb index aceb1819c52fe..637078d4af45b 100644 --- a/Formula/disktype.rb +++ b/Formula/disktype.rb @@ -14,6 +14,7 @@ class Disktype < Formula sha256 "c1f45dc2bdcec2e3b56741bf03d673f3a99534f851d1c77de59d6832d0f75236" => :el_capitan sha256 "cc767e7be270b683021ecb2ef3dd16c77b05e9cdf34ed524c942a89514284f57" => :yosemite sha256 "36d5db65030be2813c20d3d9df48ae5f2114ea1a3b4f5fb2db324169a52c3c87" => :mavericks + sha256 "6aeac4c1730506db19d26ac09455d04351060539fe9210bbf12263181fee22d7" => :x86_64_linux end def install diff --git a/Formula/diskus.rb b/Formula/diskus.rb index 301327f01540a..8fe44dd3eaf4f 100644 --- a/Formula/diskus.rb +++ b/Formula/diskus.rb @@ -10,6 +10,7 @@ class Diskus < Formula sha256 "3c4f0aafa14c810b36b2d5dbeb6998bdc866aad7b531f12f14508ee2e8b1c46d" => :catalina sha256 "16deb101df03efdcc20f56ed24d2e9608e8733e3bf9f552935ccc73428ac96a3" => :mojave sha256 "e603cd7daf7d48e0f139b584ef77f4f59949470e4e2d0ee0f430ac229fe444ea" => :high_sierra + sha256 "4ac7bf3d18a34673bd95b60032380e37241ac655357bab665b63d2c5fc8f30ca" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/distcc.rb b/Formula/distcc.rb index 64b12de9a6e97..f030f6fc32578 100644 --- a/Formula/distcc.rb +++ b/Formula/distcc.rb @@ -10,6 +10,7 @@ class Distcc < Formula sha256 "396eca7aa3ec899e2eff031b2cdcd7169939996efd98dafee94cfb9f2e658a68" => :catalina sha256 "4a4f365ee6991e812eb3aba1aa8bab9ae2f780e49793efe12b6b2bcb5e792fcf" => :mojave sha256 "f759768f1363120b7bd6b3ee7717ef75d2c703082c697f0bfc607809cf6c32f6" => :high_sierra + sha256 "39005d749961edd8cd3cffc26d3ed01a17ae986fd8d0144d3b84b084a1898862" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/dive.rb b/Formula/dive.rb index aba13beeca560..7829542b3e42d 100644 --- a/Formula/dive.rb +++ b/Formula/dive.rb @@ -10,9 +10,13 @@ class Dive < Formula sha256 "bb8417748b9d7e9199951eccdeb6892e468721480b5b639e94bee7541cfdf25c" => :catalina sha256 "12d537965d7d988136ff5aa24f002dbf8ce1a161f30e89167d7c1262ac1346c8" => :mojave sha256 "8ad8419f3ac59cb8b3e1627c0c329d773a1c6583e10693441a49a5f66c1efc71" => :high_sierra + sha256 "ce0c36c28347a8a8311c625d51f6511634a40ed0dc7ed643bc00452a11887e18" => :x86_64_linux end depends_on "go" => :build + depends_on "gpgme" => :build + depends_on "pkg-config" => :build + depends_on "device-mapper" unless OS.mac? def install system "go", "build", "-ldflags", "-s -w -X main.version=#{version}", "-trimpath", "-o", bin/"dive" diff --git a/Formula/djview4.rb b/Formula/djview4.rb index 5b1089b636c69..6c71496684837 100644 --- a/Formula/djview4.rb +++ b/Formula/djview4.rb @@ -21,7 +21,7 @@ class Djview4 < Formula depends_on "qt" def install - inreplace "src/djview.pro", "10.6", MacOS.version + inreplace "src/djview.pro", "10.6", MacOS.version if OS.mac? system "autoreconf", "-fiv" system "./configure", "--disable-debug", @@ -34,6 +34,10 @@ def install # From the djview4.8 README: # Note3: Do not use command "make install". # Simply copy the application bundle where you want it. - prefix.install "src/djview.app" + if OS.mac? + bin.install "src/djview.app" + else + bin.install "src/djview" + end end end diff --git a/Formula/djvulibre.rb b/Formula/djvulibre.rb index 994a4e34e9e26..64bc763472f57 100644 --- a/Formula/djvulibre.rb +++ b/Formula/djvulibre.rb @@ -12,6 +12,7 @@ class Djvulibre < Formula sha256 "7f3f10f71e06342886c20b449551fc36d9edebf5bf5e90cb3fc355cf4624f4d9" => :sierra sha256 "9f0fa17a46c514ab33d1d5fc88429f4d9f27926aef59807bdd74f94f8f4343ca" => :el_capitan sha256 "a175ac622b0f8914e401ba93938b4316c08f35bc186c35196a5a3de6b56b95ab" => :yosemite + sha256 "71cf898acc0513af2c01317a518eecb234355ae7eab3791cfc6d5535aea9d169" => :x86_64_linux end head do diff --git a/Formula/dlib.rb b/Formula/dlib.rb index b45e6e9dd300a..d4c14107481ce 100644 --- a/Formula/dlib.rb +++ b/Formula/dlib.rb @@ -16,7 +16,7 @@ class Dlib < Formula depends_on "cmake" => :build depends_on "jpeg" depends_on "libpng" - depends_on :macos => :el_capitan # needs thread-local storage + depends_on :macos => :el_capitan if OS.mac? # needs thread-local storage depends_on "openblas" def install @@ -49,7 +49,7 @@ def install dlog << dlib::LINFO << "The answer is " << 42; } EOS - system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", "-I#{include}", + system ENV.cxx, *("-pthread" unless OS.mac?), "-std=c++11", "test.cpp", "-o", "test", "-I#{include}", "-L#{lib}", "-ldlib" assert_match /INFO.*example: The answer is 42/, shell_output("./test") end diff --git a/Formula/dmd.rb b/Formula/dmd.rb index 5ada9e153bf80..4a5d47af8601d 100644 --- a/Formula/dmd.rb +++ b/Formula/dmd.rb @@ -26,6 +26,7 @@ class Dmd < Formula sha256 "90cd978b1793cea1804fc18c99c46f64966b392b634bcf3874f5a7846d264bd0" => :catalina sha256 "8710eba4bf54759b19a89aef4c77188ceb1c3da9f6eef5d100986309f2bd625c" => :mojave sha256 "ef79ba1e5aa6e2605dc601e5cd4618dd66854fe3813b10cabff2352877485e9d" => :high_sierra + sha256 "bc81e8616a05b5bbb06a0f10ae7ac59d3a9993dc48a2f17cea5816753d8cd877" => :x86_64_linux end head do @@ -80,13 +81,18 @@ def install system "make", "install", *make_args end - bin.install "generated/osx/release/64/dmd" + os = OS.mac? ? "osx" : "linux" + bin.install "generated/#{os}/release/64/dmd" pkgshare.install "samples" man.install Dir["docs/man/*"] (include/"dlang/dmd").install Dir["druntime/import/*"] cp_r ["phobos/std", "phobos/etc"], include/"dlang/dmd" - lib.install Dir["druntime/lib/*", "phobos/**/libphobos2.a"] + if OS.mac? + lib.install Dir["druntime/**/libdruntime.*", "phobos/**/libphobos2.a"] + else + lib.install Dir["druntime/**/libdruntime.*", "phobos/**/libphobos2.*"] + end (buildpath/"dmd.conf").write <<~EOS [Environment] diff --git a/Formula/dmtx-utils.rb b/Formula/dmtx-utils.rb index 0c2de836ead9f..1253482506a12 100644 --- a/Formula/dmtx-utils.rb +++ b/Formula/dmtx-utils.rb @@ -10,6 +10,7 @@ class DmtxUtils < Formula sha256 "b769c72ede0c30f8d66fa831a0228e1896a59bee2c1edb833cc983ffad647ff3" => :catalina sha256 "2aa5a9010d8aa229b81b7b571739131420a33643814b93d23de55547ac7c0202" => :mojave sha256 "dc6b4de991219302c6cc12f6bfc4ef867469f76278f77e0b7bed41e07e27f598" => :high_sierra + sha256 "3026fcaa10b6b0d87e3614aa5fad4c1d6c870e8ee1818631e99aa7b826ddcc27" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/dns2tcp.rb b/Formula/dns2tcp.rb index 45b4f5e3ba598..e2954a7acc7cf 100644 --- a/Formula/dns2tcp.rb +++ b/Formula/dns2tcp.rb @@ -13,6 +13,7 @@ class Dns2tcp < Formula sha256 "2cd5e77bec42f0f5e2715494c38eb8773ab30d53b140509d3f428d38890bf640" => :el_capitan sha256 "3e805ac804eea824b81bd15191b71cdc42d4ac779ebfc1d74d5de51500be18a5" => :yosemite sha256 "2f69efb2f705eb1514e8b46d7daa61379df3f4892cfe2d570c233a18ff109e7d" => :mavericks + sha256 "29555ccb8cdf2fba7bfc8807ff887b4494f4858c100248f0c680f4e6c0194702" => :x86_64_linux end def install diff --git a/Formula/dnscontrol.rb b/Formula/dnscontrol.rb index c33e6fd0e766f..b83de5ba78ba6 100644 --- a/Formula/dnscontrol.rb +++ b/Formula/dnscontrol.rb @@ -9,6 +9,7 @@ class Dnscontrol < Formula sha256 "11902a795449df78e2ce8174379731bdb4de50cc33db13572f4fb2b69d26bc60" => :catalina sha256 "824126b2be00c26cab160969986e4087e009770a21f137c30a5a21fec6abfab5" => :mojave sha256 "79ba6c6fc6bca016d55960d7746a8b6fd29477eeec4b37d88ae2630d2989f2f2" => :high_sierra + sha256 "cdfaa03ff55cf4b33953ef5ddb9d96285cd745289e985e764875e639b1fc870c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dnscrypt-proxy.rb b/Formula/dnscrypt-proxy.rb index 7fb5377382fa5..f88bc256e1a7b 100644 --- a/Formula/dnscrypt-proxy.rb +++ b/Formula/dnscrypt-proxy.rb @@ -10,6 +10,7 @@ class DnscryptProxy < Formula sha256 "7da6a093ba0eb0f91a5e0395c9d59c312ae0ba7ad4d768571084bf9910d4b89e" => :catalina sha256 "902573b2edeac760122d4ef659865578d36ba7478d1c161649c53042fd745c8f" => :mojave sha256 "19c5849e4acc8ba26110aff8d2dded822c406fd9f4fc41a20fe2a891d019c03d" => :high_sierra + sha256 "dad66e59650962c34a646461fc3ed9ba6944e618327377c098dd116cff128476" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dnscrypt-wrapper.rb b/Formula/dnscrypt-wrapper.rb index a41923f108437..a431c022a4d38 100644 --- a/Formula/dnscrypt-wrapper.rb +++ b/Formula/dnscrypt-wrapper.rb @@ -12,6 +12,7 @@ class DnscryptWrapper < Formula sha256 "129be9e2c08af0351401437f09a950f0d4050e99cce47da220561a3153d5334d" => :mojave sha256 "226bbce3fbcc39a1619bfd77451c6e0cf0d0054b61696acc2617e4f30580e69b" => :high_sierra sha256 "92da097e90b1cd593efb8d0d1a16c24dd016aa93933a3036be671b5596c6af0d" => :sierra + sha256 "11c144deef3cb7e5c58f6447c4555f6680e005a8c8901f0b69e8a087f24c66de" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/dnsmap.rb b/Formula/dnsmap.rb index 7b28dfc4bcf96..1a58ac39b93fe 100644 --- a/Formula/dnsmap.rb +++ b/Formula/dnsmap.rb @@ -13,6 +13,7 @@ class Dnsmap < Formula sha256 "57d5f7ea4a8a73b454bbc60e38fdb9a55e07c2d97f0b5acf38db0408e83b197b" => :el_capitan sha256 "6ede00304c268f3a0013f8aa708f5bfc314acbac1db7a3547e8381dc620b18eb" => :yosemite sha256 "8ed334077b5c440a7e7015e0b178f0e9500d816d6ee99d00e81a532b8e028e26" => :mavericks + sha256 "f3209acb66a74659763a47b9f921ee423040b8f090a5fc67a7037547c652e057" => :x86_64_linux end def install diff --git a/Formula/dnsmasq.rb b/Formula/dnsmasq.rb index 3b70252516449..9c5814a684060 100644 --- a/Formula/dnsmasq.rb +++ b/Formula/dnsmasq.rb @@ -8,6 +8,7 @@ class Dnsmasq < Formula sha256 "e46052d3d5ae49135b80d383a9d891d58148f47a62ccd054633614ce02c35ed6" => :catalina sha256 "773bdf846730a553e63613d73f9488f3d946b2cd3fdc024fa2d9dbd6d659b09f" => :mojave sha256 "ff6cfbbe9a2bb3caf6e079d62db676f459c882bff835717dbfc443ec920cfe77" => :high_sierra + sha256 "46120a8a063aa26ee639ad85a00ef565a8bf9a4f3c35399d89d3a92486651838" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/dnsperf.rb b/Formula/dnsperf.rb index e4606428686bb..fff1c60c01f3b 100644 --- a/Formula/dnsperf.rb +++ b/Formula/dnsperf.rb @@ -9,6 +9,7 @@ class Dnsperf < Formula sha256 "7c89a8d743a3a62653aebf2d0a6102991a88efa5fb0b8743d425745b2cc60e2a" => :catalina sha256 "8901054afed6de33bdbbe8eda68f9238f0ac3915acd5ee319c942acae741841a" => :mojave sha256 "f67934e4c9b06aafd7220815911a6fa27e430ef0add19b5fe8cfda3adb9dcae9" => :high_sierra + sha256 "124dc492204c13b056132330b9df2346f24fb6a575a4e43550549ce0564078c2" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/dnsviz.rb b/Formula/dnsviz.rb index 7019cceddd8f6..361f3705d8b2e 100644 --- a/Formula/dnsviz.rb +++ b/Formula/dnsviz.rb @@ -21,6 +21,8 @@ class Dnsviz < Formula depends_on "libsodium" depends_on "openssl@1.1" depends_on "python@3.8" + # Fix build error of m2crypto, see https://github.com/crocs-muni/roca/issues/1#issuecomment-336893096 + depends_on "swig" unless OS.mac? resource "dnspython" do url "https://files.pythonhosted.org/packages/ec/c5/14bcd63cb6d06092a004793399ec395405edf97c2301dfdc146dfbd5beed/dnspython-1.16.0.zip" @@ -121,10 +123,10 @@ def install PGJqJru7+7aaRr1PP+ne7Wer+gE= ) EOS (testpath/"example.com.zone-delegation").write <<~EOS - example.com. IN NS ns1.example.com. - ns1.example.com. IN A 127.0.0.1 - example.com. IN DS 34983 10 1 EC358CFAAEC12266EF5ACFC1FEAF2CAFF083C418 - example.com. IN DS 34983 10 2 608D3B089D79D554A1947BD10BEC0A5B1BDBE67B4E60E34B1432ED00 33F24B49 + example.com. IN NS ns1.example.com. + ns1.example.com. IN A 127.0.0.1 + example.com. IN DS 34983 10 1 EC358CFAAEC12266EF5ACFC1FEAF2CAFF083C418 + example.com. IN DS 34983 10 2 608D3B089D79D554A1947BD10BEC0A5B1BDBE67B4E60E34B1432ED00 33F24B49 EOS system "#{bin}/dnsviz", "probe", "-d", "0", "-A", "-x", "example.com:example.com.zone.signed", diff --git a/Formula/docbook-xsl.rb b/Formula/docbook-xsl.rb index 667038d08bb1b..e0e12a556ae42 100644 --- a/Formula/docbook-xsl.rb +++ b/Formula/docbook-xsl.rb @@ -10,6 +10,7 @@ class DocbookXsl < Formula sha256 "65a5442556a88a865ef377cb73df0b3edf9ab2240e6f4bb2d71a71eabc74fa26" => :catalina sha256 "65a5442556a88a865ef377cb73df0b3edf9ab2240e6f4bb2d71a71eabc74fa26" => :mojave sha256 "65a5442556a88a865ef377cb73df0b3edf9ab2240e6f4bb2d71a71eabc74fa26" => :high_sierra + sha256 "6b52c47bc47c4a19699fb52277f477d27bfb519d9b7e01d94ad6c566cf27f873" => :x86_64_linux end depends_on "docbook" @@ -50,6 +51,10 @@ def install bin.write_exec_script "#{prefix}/docbook-xsl/epub/bin/dbtoepub" end + def xmlcatalog + OS.mac? ? "xmlcatalog" : "#{Formula["libxml2"].opt_bin}/xmlcatalog" + end + def post_install etc_catalog = etc/"xml/catalog" ENV["XML_CATALOG_FILES"] = etc_catalog @@ -64,8 +69,8 @@ def post_install # add/replace catalog entries cat_loc = "#{loc}/catalog.xml" - system "xmlcatalog", "--noout", "--del", cat_loc, etc_catalog - system "xmlcatalog", "--noout", "--add", "nextCatalog", "", cat_loc, etc_catalog + system xmlcatalog, "--noout", "--del", cat_loc, etc_catalog + system xmlcatalog, "--noout", "--add", "nextCatalog", "", cat_loc, etc_catalog # add rewrites for the new and old catalog URLs [ @@ -73,9 +78,9 @@ def post_install "http://docbook.sourceforge.net/release/#{old_name}", ].each do |url_prefix| [version.to_s, "current"].each do |ver| - system "xmlcatalog", "--noout", "--del", "#{url_prefix}/#{ver}", etc_catalog + system xmlcatalog, "--noout", "--del", "#{url_prefix}/#{ver}", etc_catalog ["rewriteSystem", "rewriteURI"].each do |k| - system "xmlcatalog", "--noout", "--add", k, "#{url_prefix}/#{ver}", loc, etc_catalog + system xmlcatalog, "--noout", "--add", k, "#{url_prefix}/#{ver}", loc, etc_catalog end end end @@ -83,13 +88,13 @@ def post_install end test do - system "xmlcatalog", "#{etc}/xml/catalog", "https://cdn.docbook.org/release/xsl-nons/current/" - system "xmlcatalog", "#{etc}/xml/catalog", "https://cdn.docbook.org/release/xsl-nons/#{version}/" - system "xmlcatalog", "#{etc}/xml/catalog", "https://cdn.docbook.org/release/xsl/current/" - system "xmlcatalog", "#{etc}/xml/catalog", "https://cdn.docbook.org/release/xsl/#{version}/" - system "xmlcatalog", "#{etc}/xml/catalog", "http://docbook.sourceforge.net/release/xsl/current/" - system "xmlcatalog", "#{etc}/xml/catalog", "http://docbook.sourceforge.net/release/xsl/#{version}/" - system "xmlcatalog", "#{etc}/xml/catalog", "http://docbook.sourceforge.net/release/xsl-ns/current/" - system "xmlcatalog", "#{etc}/xml/catalog", "http://docbook.sourceforge.net/release/xsl-ns/#{version}/" + system xmlcatalog, "#{etc}/xml/catalog", "https://cdn.docbook.org/release/xsl-nons/current/" + system xmlcatalog, "#{etc}/xml/catalog", "https://cdn.docbook.org/release/xsl-nons/#{version}/" + system xmlcatalog, "#{etc}/xml/catalog", "https://cdn.docbook.org/release/xsl/current/" + system xmlcatalog, "#{etc}/xml/catalog", "https://cdn.docbook.org/release/xsl/#{version}/" + system xmlcatalog, "#{etc}/xml/catalog", "http://docbook.sourceforge.net/release/xsl/current/" + system xmlcatalog, "#{etc}/xml/catalog", "http://docbook.sourceforge.net/release/xsl/#{version}/" + system xmlcatalog, "#{etc}/xml/catalog", "http://docbook.sourceforge.net/release/xsl-ns/current/" + system xmlcatalog, "#{etc}/xml/catalog", "http://docbook.sourceforge.net/release/xsl-ns/#{version}/" end end diff --git a/Formula/docbook.rb b/Formula/docbook.rb index 92e085ab98c59..fa62501162cc6 100644 --- a/Formula/docbook.rb +++ b/Formula/docbook.rb @@ -10,6 +10,7 @@ class Docbook < Formula sha256 "8152e5356c47a7b8282f3ed84ee3f29565e8ce620bddeaeaf23dfd1f5ef111a3" => :catalina sha256 "8152e5356c47a7b8282f3ed84ee3f29565e8ce620bddeaeaf23dfd1f5ef111a3" => :mojave sha256 "8152e5356c47a7b8282f3ed84ee3f29565e8ce620bddeaeaf23dfd1f5ef111a3" => :high_sierra + sha256 "465a79c737b1a8dc5f8726607820f9e0424dbfe8d47e0a946f9fb3fdc1e5c36d" => :x86_64_linux end uses_from_macos "libxml2" @@ -70,20 +71,24 @@ def install end end + def xmlcatalog + OS.mac? ? "xmlcatalog" : "#{Formula["libxml2"].opt_bin}/xmlcatalog" + end + def post_install etc_catalog = etc/"xml/catalog" ENV["XML_CATALOG_FILES"] = etc_catalog # only create catalog file if it doesn't exist already to avoid content added # by other formulae to be removed - system "xmlcatalog", "--noout", "--create", etc_catalog unless File.file?(etc_catalog) + system xmlcatalog, "--noout", "--create", etc_catalog unless File.file?(etc_catalog) %w[4.2 4.1.2 4.3 4.4 4.5 5.0 5.1].each do |version| catalog = opt_prefix/"docbook/xml/#{version}/catalog.xml" - system "xmlcatalog", "--noout", "--del", + system xmlcatalog, "--noout", "--del", "file://#{catalog}", etc_catalog - system "xmlcatalog", "--noout", "--add", "nextCatalog", + system xmlcatalog, "--noout", "--add", "nextCatalog", "", "file://#{catalog}", etc_catalog end end diff --git a/Formula/docbook2x.rb b/Formula/docbook2x.rb index 4a3f6bf897557..4b88a0fc8a2a2 100644 --- a/Formula/docbook2x.rb +++ b/Formula/docbook2x.rb @@ -3,6 +3,7 @@ class Docbook2x < Formula homepage "https://docbook2x.sourceforge.io/" url "https://downloads.sourceforge.net/docbook2x/docbook2X-0.8.8.tar.gz" sha256 "4077757d367a9d1b1427e8d5dfc3c49d993e90deabc6df23d05cfe9cd2fcdc45" + revision 2 unless OS.mac? bottle do cellar :any_skip_relocation @@ -13,6 +14,7 @@ class Docbook2x < Formula sha256 "acfdd1c80cb523b213dea0125819b1b6fc783d6d740cc8fc0047f44756b57889" => :el_capitan sha256 "e3efe4afe190e126174c6e3bec0a9feb4ad37ddd0ecaef778b1e8df8a60e8717" => :yosemite sha256 "4b4750b139d7a262735e33ee0e314c7a589b6ada2d72e336aabaf334789a411d" => :mavericks + sha256 "6126b20affa23fe0188587c074546cf73b49a0b9e28217ac07a23e415d28f096" => :x86_64_linux end depends_on "docbook" @@ -20,7 +22,25 @@ class Docbook2x < Formula uses_from_macos "libxslt" uses_from_macos "perl" + unless OS.mac? + resource "XML::Parser" do + url "https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz" + sha256 "1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216" + end + end + def install + unless OS.mac? + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + resources.each do |res| + res.stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make", "PERL5LIB=#{ENV["PERL5LIB"]}", "CC=#{ENV.cc}" + system "make", "install" + end + end + end + inreplace "perl/db2x_xsltproc.pl", "http://docbook2x.sf.net/latest/xslt", "#{share}/docbook2X/xslt" inreplace "configure", "${prefix}", prefix system "./configure", "--disable-dependency-tracking", diff --git a/Formula/docker-compose.rb b/Formula/docker-compose.rb index 1968e312b30c3..a56ebb9a4feee 100644 --- a/Formula/docker-compose.rb +++ b/Formula/docker-compose.rb @@ -12,6 +12,7 @@ class DockerCompose < Formula sha256 "2fad16dc653ab154af4ab9107bd8222df6370b3fe5ffa64ae31a5b6abb47cefa" => :catalina sha256 "bddf16f5594ee5172d3a1afe22ef4d372fb4dc0d7f3fc8112bcaff041015cbec" => :mojave sha256 "5a69754a7f778e02ea6b7a4ca6ee0fa97682f2b019e80e43833faba4654bfd13" => :high_sierra + sha256 "2ddbae1b152bb31875f7c0f31b5964c4d297bd399c91edb9755e82640314e15a" => :x86_64_linux end depends_on "libyaml" @@ -20,6 +21,8 @@ class DockerCompose < Formula uses_from_macos "libffi" def install + ENV.prepend "CPPFLAGS", "-I#{Formula["libffi"].lib}/libffi-#{Formula["libffi"].version}/include" unless OS.mac? + system "./script/build/write-git-sha" if build.head? venv = virtualenv_create(libexec, "python3") system libexec/"bin/pip", "install", "-v", "--no-binary", ":all:", diff --git a/Formula/docker-credential-helper-ecr.rb b/Formula/docker-credential-helper-ecr.rb index 825d8ee086f17..3f1d80b3215a0 100644 --- a/Formula/docker-credential-helper-ecr.rb +++ b/Formula/docker-credential-helper-ecr.rb @@ -10,6 +10,7 @@ class DockerCredentialHelperEcr < Formula sha256 "d5e603dc272c983cfd10995ac0b39418308e26c791a28d1a56fc13282d5425bb" => :catalina sha256 "2bcb4437b3096c71bc248e4bcbe4aa20d4cd801a63eb139c2250cd73f5c9f5cb" => :mojave sha256 "5db19be899dc7a06ab6e180bbf2972d6f8b4e44a092e6f7b2be35297f03044f5" => :high_sierra + sha256 "7cf5a406c35496bdf17ac443edf4e66f1aa49e22aed04e096c77e79d4e5a36d2" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/docker-credential-helper.rb b/Formula/docker-credential-helper.rb index 776d5f0896dd0..9bd0c33f35deb 100644 --- a/Formula/docker-credential-helper.rb +++ b/Formula/docker-credential-helper.rb @@ -14,6 +14,7 @@ class DockerCredentialHelper < Formula end depends_on "go" => :build + depends_on :macos def install ENV["GOPATH"] = buildpath diff --git a/Formula/docker-gen.rb b/Formula/docker-gen.rb index a21f5db752dcf..c5e73e3c8d2bb 100644 --- a/Formula/docker-gen.rb +++ b/Formula/docker-gen.rb @@ -13,6 +13,7 @@ class DockerGen < Formula sha256 "42d2757b01271ef6c14de5441b3c65507538388db1e00e69f322272a5ba5b59c" => :high_sierra sha256 "222a5586670fec7643e9e7651f0b1fa82ff012048bd29b959ac720743f1a1a4f" => :sierra sha256 "c274701a545e5a4885995718f5f01ca6df2f9c6b9a143d4ffcf46b1771ac4cbc" => :el_capitan + sha256 "6c5b758ab172bccc2ff8c911334e91ba4fcd0fe1eb53eae51cdf19e7cf8908eb" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/docker-ls.rb b/Formula/docker-ls.rb index 30f677211e365..29b4cec82d1a1 100644 --- a/Formula/docker-ls.rb +++ b/Formula/docker-ls.rb @@ -11,6 +11,7 @@ class DockerLs < Formula sha256 "13e48e45be8cdb09ff06ca244927b8131debc11b3bc8a31f3d1a1960015024f9" => :mojave sha256 "f16bb4511bb3880c9f9dfe114c825f57075ae5524c4e009372a4c9305c236f8d" => :high_sierra sha256 "a32421f644c0385dfce1af8091c254502471625cde6ba304cba9dd86f547ada9" => :sierra + sha256 "0a8ba5557ca267c32e84d8a94b960afd9e1f8e3f2017313d2db3a36dd8f29244" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/docker-machine-driver-vmware.rb b/Formula/docker-machine-driver-vmware.rb index df1193d22fb51..b865ca05d8717 100644 --- a/Formula/docker-machine-driver-vmware.rb +++ b/Formula/docker-machine-driver-vmware.rb @@ -11,6 +11,7 @@ class DockerMachineDriverVmware < Formula sha256 "df81e5c14ec3961d53f6490a165a17b8ceda29beba747ee659b57d82a9468e26" => :mojave sha256 "e65553889741f8c077de12706314e9f95805d673b186d1d545617515d7ab4a03" => :high_sierra sha256 "4901f8daf5bc087b0b4bb64a2798696604e618b8d11433b6fa851dd90fd1b77f" => :sierra + sha256 "7c45c6504fc180d77486bae9bda595892d4941c08fe4250e1ee1f1d8d445dff4" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/docker-machine-parallels.rb b/Formula/docker-machine-parallels.rb index e2640c2a310f0..c806ef951d4b7 100644 --- a/Formula/docker-machine-parallels.rb +++ b/Formula/docker-machine-parallels.rb @@ -16,6 +16,9 @@ class DockerMachineParallels < Formula depends_on "go" => :build depends_on "docker-machine" + # Parallels Desktop is inherently Mac-only + depends_on :macos + def install ENV["GOPATH"] = buildpath diff --git a/Formula/docker-machine.rb b/Formula/docker-machine.rb index af6b5207dc811..ebf84af22815d 100644 --- a/Formula/docker-machine.rb +++ b/Formula/docker-machine.rb @@ -12,6 +12,7 @@ class DockerMachine < Formula sha256 "cc56a9c37702ecaeea1a5034326d87fa145fbc4cb613d151756571b78ca8f1ab" => :mojave sha256 "320ef0f8b7fba8e679c784f854155314c7bdcbc4e7d43fd11dbce6e0e3e0f85b" => :high_sierra sha256 "23a2165e741ea1a9321476d3037a5d76bc24bd494ae0bd8b16f35e3248c0aa77" => :sierra + sha256 "5f2e8a19e50bd86e950f26a996cb2d84e1ea731045885ae725a70acb6e52635c" => :x86_64_linux end depends_on "automake" => :build diff --git a/Formula/docker-slim.rb b/Formula/docker-slim.rb index 66eaa9102d65e..c3dbf9716c085 100644 --- a/Formula/docker-slim.rb +++ b/Formula/docker-slim.rb @@ -9,6 +9,7 @@ class DockerSlim < Formula sha256 "a38712870dab03f740f73860a7aaab80e6957975554d45a0a271842c07a133f6" => :catalina sha256 "a38712870dab03f740f73860a7aaab80e6957975554d45a0a271842c07a133f6" => :mojave sha256 "a38712870dab03f740f73860a7aaab80e6957975554d45a0a271842c07a133f6" => :high_sierra + sha256 "240a909fd588202a5ca4ce5bd550702ef48826e8b2e9bf7bf2179f8610539fc8" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/docker-squash.rb b/Formula/docker-squash.rb index 55b34d5d21c67..41f4cd297b183 100644 --- a/Formula/docker-squash.rb +++ b/Formula/docker-squash.rb @@ -5,13 +5,14 @@ class DockerSquash < Formula homepage "https://github.com/goldmann/docker-squash" url "https://files.pythonhosted.org/packages/8c/b4/429be44bdb8ad42bbca4ab4a813f771ef517b00a8d733feb6d62716c4209/docker-squash-1.0.8.tar.gz" sha256 "f677bc9129d1156516454b0b334cdc2642f7b9a3328dca3a7477c43ac5ee23a9" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "acf125fff4af17093f168aa89c5e1d5842970435f1016749e4250d37d5653552" => :catalina sha256 "cdeaa159137369db885656b13f7f893b0ebff19898eabb3577d3fcac567b5f8d" => :mojave sha256 "afdfce8a93406db973df50f90527e4554769207e0c3b0b5de323fe2b0de1a419" => :high_sierra + sha256 "4a352212c85831f34d47a3d709124d83176654abaf40d60c790f6454ee15b002" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/docker-swarm.rb b/Formula/docker-swarm.rb index 90ff9d9a188ac..a4b56c8fae51d 100644 --- a/Formula/docker-swarm.rb +++ b/Formula/docker-swarm.rb @@ -11,6 +11,7 @@ class DockerSwarm < Formula sha256 "e2d8d18ea613fd94a32e0918f29238836b89dd32464e8f6e1145e744348ab0cd" => :catalina sha256 "d3cc672187adb5d73dfb2b6a90326de6ad228ccf48141ef3242447ca0416aee3" => :mojave sha256 "29e47d799c8e2d2977dd58444095a51c9ac7f261f56eeb5d5b6f71ed299e7533" => :high_sierra + sha256 "a42a84b6767a59aabcb8d3ba43abfd97c654ba389c6f4137686ffa6f40ca4434" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/docker.rb b/Formula/docker.rb index d6f0b7946b266..b738a4ef14ca4 100644 --- a/Formula/docker.rb +++ b/Formula/docker.rb @@ -10,6 +10,7 @@ class Docker < Formula sha256 "5e76b1ee2d9b079a727d17ffadb111658103f1fc00f18cc2a943d1d6542e60fa" => :catalina sha256 "fb5823bc2477f1fd68e373a5bf5dc97f54a5f2295d77622539a8c604cd7cf692" => :mojave sha256 "02b3b6ea3d7899408807c186742dd60339eaa0cdb80d03d494780924dfefdae3" => :high_sierra + sha256 "95d58575f76fd50dd6cc5eb9e38391ddebe04881f9a01bb3ba6c62c546373444" => :x86_64_linux end depends_on "go" => :build @@ -43,6 +44,7 @@ def install test do assert_match "Docker version #{version}", shell_output("#{bin}/docker --version") - assert_match "ERROR: Cannot connect to the Docker daemon", shell_output("#{bin}/docker info", 1) + # Fails on CI: WARNING: No swap limit support + assert_match "ERROR: Cannot connect to the Docker daemon", shell_output("#{bin}/docker info", 1) if OS.mac? end end diff --git a/Formula/docker2aci.rb b/Formula/docker2aci.rb index a131a5a685979..23768a6809def 100644 --- a/Formula/docker2aci.rb +++ b/Formula/docker2aci.rb @@ -11,6 +11,7 @@ class Docker2aci < Formula sha256 "786e30d746607eea372c8eaa2705f850320dd74e28385fd3b75946e6e8c8e52d" => :high_sierra sha256 "6cfeb751ff7db4e703938e2bfc4e28d4ec9a30e59261e75aa5adf690d0f33061" => :sierra sha256 "b1a61fc4d329ef1e3ad97ea701e2c0be392f29e8d4a8bd2f1934bf7bac620121" => :el_capitan + sha256 "cd729e36e463154b10f4198024ca0760669ebf198f12dc2d3b73162684ae2ddd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dockerize.rb b/Formula/dockerize.rb index b54240096b9f0..ec8df417fd03d 100644 --- a/Formula/dockerize.rb +++ b/Formula/dockerize.rb @@ -11,17 +11,19 @@ class Dockerize < Formula sha256 "94d889365e9e7c502449a79a431e4731faec239a1d2b18f65bf204671890f285" => :mojave sha256 "3a88ca84f7279093a08fda378d2e502de8f3e255a9cd36480473b4c22972854e" => :high_sierra sha256 "94083315a1f3b4e812d0468603900c691ab28d8c16762574c87a922863628b29" => :sierra + sha256 "a406932ca332e1b86ab3740ca07bcdb5de47282624e0ec15dba4d71175b84139" => :x86_64_linux end depends_on "go" => :build def install + platform = OS.mac? ? "darwin" : "linux" ENV["GOPATH"] = buildpath (buildpath/"src/github.com/jwilder/dockerize").install buildpath.children ENV.append_path "PATH", buildpath/"bin" cd "src/github.com/jwilder/dockerize" do system "make", "dist" - bin.install "dist/darwin/amd64/dockerize" + bin.install "dist/#{platform}/amd64/dockerize" end end diff --git a/Formula/dockutil.rb b/Formula/dockutil.rb index 430a8eab7e929..8c7c9c5ea9838 100644 --- a/Formula/dockutil.rb +++ b/Formula/dockutil.rb @@ -6,6 +6,8 @@ class Dockutil < Formula bottle :unneeded + depends_on :macos + def install bin.install "scripts/dockutil" end diff --git a/Formula/dockviz.rb b/Formula/dockviz.rb index 7380a1d3301aa..fc895c48536b8 100644 --- a/Formula/dockviz.rb +++ b/Formula/dockviz.rb @@ -13,6 +13,7 @@ class Dockviz < Formula sha256 "7334e941bcf3841a724103ecc7bd1cf028dc5e41bd9e80283c6f34637515cd02" => :high_sierra sha256 "8fbcc273dbbf14a33f44cb9d56d350440168c7943d6c29ba489c2db7cc8f293b" => :sierra sha256 "0df5881e825be40043790f3759fa2f3976d75c3c8273e69c4bfbd4cc039744b3" => :el_capitan + sha256 "f654c128a3e76f7b1578e74894e4c827ae7bd72906e57a4f5a62668dcf630457" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dockward.rb b/Formula/dockward.rb index d9b1ae32cd486..15c4b25d54e38 100644 --- a/Formula/dockward.rb +++ b/Formula/dockward.rb @@ -15,6 +15,7 @@ class Dockward < Formula sha256 "50c2b838bbd89349e40050810a833cfea2803ac699cd006d47e796075be975b2" => :high_sierra sha256 "3dcac3afd57773d1c4b07b72f7f1bc9d66953dccccb0b3eadf7f40e43175d89b" => :sierra sha256 "b1b33f2b4db8242f9b422232d49bfde4c9b8fa0fa5053437366a9bc16795d9b5" => :el_capitan + sha256 "4179e72cfea7fc705ca8ad840a473dc0e6d0a152a0c46f302ad77d4569d417b6" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/doctl.rb b/Formula/doctl.rb index 1d1d3c1528b6b..d9c0a58950b81 100644 --- a/Formula/doctl.rb +++ b/Formula/doctl.rb @@ -10,6 +10,7 @@ class Doctl < Formula sha256 "e6e9288be9f8a0b1481dfa693a8a17d3ccb4712f6c5f5c01ca0ef90924e685f3" => :catalina sha256 "eade457a9301889f62515066726d7e762675b40aa6bc5a67748e148021561fa7" => :mojave sha256 "44255495677369f45527289fdde2588bd5893721d8362ab55e32a40c6cb60590" => :high_sierra + sha256 "1312e1542b8c9e0b2710723fba47e9e0f360ec2c2bae0720e3f154655ce21109" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/docutils.rb b/Formula/docutils.rb index d84d8b79e42cf..a08ff0698796f 100644 --- a/Formula/docutils.rb +++ b/Formula/docutils.rb @@ -5,13 +5,14 @@ class Docutils < Formula homepage "https://docutils.sourceforge.io" url "https://downloads.sourceforge.net/project/docutils/docutils/0.16/docutils-0.16.tar.gz" sha256 "7d4e999cca74a52611773a42912088078363a30912e8822f7a3d38043b767573" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any_skip_relocation sha256 "ed4972eaa10a0be627db7bc83f75f7537b1a6b3507bb7b3331ffa6afcfcc8f44" => :catalina sha256 "ad73ff1ad1ea76399afbf1b988d956837dd9864eb287e8356760b2929d8cd875" => :mojave sha256 "549d758b772b99e1f231b5c1e661f4a661dbcd5eb81092de92fad8f2b1f76a2c" => :high_sierra + sha256 "488cfbc3cf5bb6e81d31c905c11ef5abb0d12213af0d1a97a62cd6198d37b4ff" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/docx2txt.rb b/Formula/docx2txt.rb index 01d3d1a618958..cf1df9fe99ffd 100644 --- a/Formula/docx2txt.rb +++ b/Formula/docx2txt.rb @@ -13,6 +13,7 @@ class Docx2txt < Formula sha256 "c3a67138c91e968e6c2a6ff1033bca0fe8527ebdcaaa208194c073b4f75dd453" => :el_capitan sha256 "78154a4b95613538a9d508c521d74d0bc6b398b005de4468b4cb4e62c3208b8e" => :yosemite sha256 "2d9f0f37b4c6c5a37f22a4b0e7cdc6d440e842d2d3e7df433ccebf1b03cf80cd" => :mavericks + sha256 "e97a9776dc1cd6984be64900928a3dfc0b2e18c8b4fde1d5f4b866909c7143a9" => :x86_64_linux end resource "sample_doc" do diff --git a/Formula/doitlive.rb b/Formula/doitlive.rb index 481e5d922213a..1c9a2e3974e80 100644 --- a/Formula/doitlive.rb +++ b/Formula/doitlive.rb @@ -5,13 +5,14 @@ class Doitlive < Formula homepage "https://doitlive.readthedocs.io/en/latest/" url "https://files.pythonhosted.org/packages/e5/d9/4ce969d98f521c253ec3b15a0c759104a01061ac90fb9d8636b015bcb4ea/doitlive-4.3.0.tar.gz" sha256 "4cb1030e082d8649f10a61d599d3ff3bcad7f775e08f0e68ee06882e06d0190f" - revision 8 + revision OS.mac? ? 8 : 9 bottle do cellar :any_skip_relocation sha256 "5434bf69eb3f7d608ef63faf1003dbacf2fb9faf39c45ad392e580f4e5809cc3" => :catalina sha256 "ae4ab2b939e8ab89e1c539c1d9fc8eff24706715b37771fe87d0a7fc03c35c42" => :mojave sha256 "6362e404ef2f1af74b0a564186b5a16967f140ba549fda494c286143dd387bbe" => :high_sierra + sha256 "a6557c9dc90c28116133b140039f888093565afde4d972ef3875355bfdc51c8f" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/dopewars.rb b/Formula/dopewars.rb index e4694011ba303..054b6db09392b 100644 --- a/Formula/dopewars.rb +++ b/Formula/dopewars.rb @@ -10,6 +10,7 @@ class Dopewars < Formula sha256 "8bb4cbd11a3db0bbdbdd283d531742c9485dc1d86b57b9986f3b86da01947807" => :mojave sha256 "3808bf43bb96b796624f8ffb855b176ea2a908f3b9477fd7d07a1f960dff0ef2" => :high_sierra sha256 "db1c91122cf53f166a5811595bbf84b63227818ca11877b78a21592686a975f2" => :sierra + sha256 "dfee1dc909fc4b49a18c62e358bc652c661bb9c0e614643cbc53e2760b75d34e" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/dos2unix.rb b/Formula/dos2unix.rb index 7234b4ef3eede..b5df26d1b6d3a 100644 --- a/Formula/dos2unix.rb +++ b/Formula/dos2unix.rb @@ -10,6 +10,7 @@ class Dos2unix < Formula sha256 "e361c9877212a1666721d1b62348690d8dd24dadc94ef0f33b582c44b9650ab6" => :catalina sha256 "98ca83a3810ce6daa87546fbe821345859d943f7609389a52c2b59bf6cef03d3" => :mojave sha256 "24f1fc82e112c612641898b1e25d96c9f5b38442566041fce45c3b1aa998af09" => :high_sierra + sha256 "5ec981b42645d4a86d5f1d15242a5477d7c92a24aa748a17e18cdea57f456e20" => :x86_64_linux end def install diff --git a/Formula/dosbox.rb b/Formula/dosbox.rb index 79408854c674c..633167ba73126 100644 --- a/Formula/dosbox.rb +++ b/Formula/dosbox.rb @@ -10,6 +10,7 @@ class Dosbox < Formula sha256 "de46ee6c3c638829ba3b9dc3ee009811d26a19359d10804b9ff93706df2a6863" => :mojave sha256 "66b1b073b1ae7db629c64f66249254aefcb8fb6585c065c858a364bd258785d4" => :high_sierra sha256 "3bd2c41c7f76e214c0964acec02723d2a2a611eca92cf5edb93c029333a78adf" => :sierra + sha256 "e39aea7e583b6ec129959c2bba3aa75d70a80ce21820bfc54bd15a57b106197e" => :x86_64_linux end head do diff --git a/Formula/dosfstools.rb b/Formula/dosfstools.rb index c95e774de4e7e..b70c49f612df8 100644 --- a/Formula/dosfstools.rb +++ b/Formula/dosfstools.rb @@ -20,6 +20,7 @@ class Dosfstools < Formula sha256 "a12605487c15e462c7ae652bb3f1587d254fc0001bfbae9261903c9f85542c2e" => :mojave sha256 "44d8a1baa92d553ec9c24c1152c875b0f7d3730146d3decf4cdfa8f7b1516434" => :high_sierra sha256 "b14dc5d79955f0ee586a33c7e265df2def55b1c64b7eb123539fce827cdeb6ec" => :sierra + sha256 "66d79cb2d7855f2005f138e92b15d5120ae057379afce31fb889e27251ae4006" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/double-conversion.rb b/Formula/double-conversion.rb index efd98350f8795..b12b782169140 100644 --- a/Formula/double-conversion.rb +++ b/Formula/double-conversion.rb @@ -4,6 +4,7 @@ class DoubleConversion < Formula url "https://github.com/google/double-conversion/archive/v3.1.5.tar.gz" sha256 "a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13" head "https://github.com/google/double-conversion.git" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -11,15 +12,26 @@ class DoubleConversion < Formula sha256 "faa661750aeda3faf356d445d3d293fa52021c93a08fea35fd6666251b44203b" => :mojave sha256 "c948a1b31bc508f9218b6373e5ac3cc92838aa033e15f777aa046675921c3369" => :high_sierra sha256 "6fad17756240370dffc053a66fdfff4f17b02669c9456546a591349c3ea0e959" => :sierra + sha256 "56bbcd9d6807fce5bfb95994a7c5a36e906b39f1ee47d379c1e752c2aef33f00" => :x86_64_linux end depends_on "cmake" => :build def install mkdir "dc-build" do - system "cmake", "..", *std_cmake_args + system "cmake", "..", ("-DBUILD_SHARED_LIBS=ON" unless OS.mac?), *std_cmake_args system "make", "install" end + + unless OS.mac? + # Move lib64/* to lib/ on Linuxbrew + lib64 = Pathname.new "#{lib}64" + if lib64.directory? + mkdir_p lib + mv lib64, lib + rmdir lib64 + end + end end test do diff --git a/Formula/dovecot.rb b/Formula/dovecot.rb index 888c0749a7f43..c966db23e0cae 100644 --- a/Formula/dovecot.rb +++ b/Formula/dovecot.rb @@ -8,12 +8,16 @@ class Dovecot < Formula sha256 "e8d7b6bf587b5673826b467c3a30b148a191ed94246797609fcdad42e3ad40e4" => :catalina sha256 "3b05663fc50f7669b2f16f6b55821f6fb2abf54fea8a858301ed7d5dbf7de7b5" => :mojave sha256 "3f35d37650ccc397e11584b5a31ef13157e63b7db3b4886a5f3b7c4fb73a3e7b" => :high_sierra + sha256 "47b8adf6f1185cea99b1d2ef6c44b6eef74fbd3edb6605bd13e2ef51432971dc" => :x86_64_linux end depends_on "openssl@1.1" + uses_from_macos "bzip2" uses_from_macos "sqlite" + depends_on "linux-pam" unless OS.mac? + resource "pigeonhole" do url "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.9.tar.gz" sha256 "36da68aae5157b83e21383f711b8977e5b6f5477f369f71e7e22e76a738bbd05" diff --git a/Formula/doxygen.rb b/Formula/doxygen.rb index f16d83f4f596e..a97dd37a28d1b 100644 --- a/Formula/doxygen.rb +++ b/Formula/doxygen.rb @@ -11,10 +11,15 @@ class Doxygen < Formula sha256 "7a9d0dcd889aba7e0e96fc62b1e5cce048adacbab03d3b924f9940b50c7b2d3c" => :catalina sha256 "ac54e6ace4d6167a03b7c0c8dbb956f696921eb32a5507e842227220852385df" => :mojave sha256 "630a2c57c428c9ae42d5d6f6f5986a08292db010c51f407c1bbb6224c4d9ddf7" => :high_sierra + sha256 "e36b34a53fd30b6006ce74cdd48303c4c3a60af66ae50613802ad8e1e298cd4f" => :x86_64_linux end depends_on "bison" => :build depends_on "cmake" => :build + unless OS.mac? + depends_on "bison" + depends_on "flex" + end def install args = std_cmake_args + %W[ diff --git a/Formula/dpkg.rb b/Formula/dpkg.rb index 06dc4ea6f36aa..a3cf3d6751c6f 100644 --- a/Formula/dpkg.rb +++ b/Formula/dpkg.rb @@ -12,6 +12,7 @@ class Dpkg < Formula sha256 "1ea539c6582dfe53b7ea304bfe7cd35a13ba10bed3e8e8ae5e5811d38ede02a5" => :catalina sha256 "697ae45f87862d0db104c87895a80ff03068ed8a131479a36e461bbfb9c535f6" => :mojave sha256 "a7457962cce9de6a30804597648331f3327e9e1fdd0968e54967c843dc8d2771" => :high_sierra + sha256 "b1a7953dfac36ef7e9b2ce2075787a8a0f67bf506ef0bbd2cd74a7bfbfd586a8" => :x86_64_linux end depends_on "pkg-config" => :build @@ -30,7 +31,7 @@ class Dpkg < Formula def install # We need to specify a recent gnutar, otherwise various dpkg C programs will # use the system "tar", which will fail because it lacks certain switches. - ENV["TAR"] = Formula["gnu-tar"].opt_bin/"gtar" + ENV["TAR"] = Formula["gnu-tar"].opt_bin/(OS.mac? ? "gtar" : "tar") # Since 1.18.24 dpkg mandates the use of GNU patch to prevent occurrences # of the CVE-2017-8283 vulnerability. diff --git a/Formula/dps8m.rb b/Formula/dps8m.rb index cf906a3fcfc11..58cb71a798230 100644 --- a/Formula/dps8m.rb +++ b/Formula/dps8m.rb @@ -10,6 +10,7 @@ class Dps8m < Formula sha256 "d9d967a0c7dad0b63ea6327102cb5d83345ff6b0bcdbf754398c1a5cdb0b0916" => :catalina sha256 "2c148e6bcd3a83e91b6b327d285bcfbb6490a3f7d8f08c4d904a6b907fbe61cf" => :mojave sha256 "600be3242396b61b2e807ed850cd65fc30a4676993c44c5171488954be496ce4" => :high_sierra + sha256 "faab297b7a33705cd9ad1b286ff537635b888fa6c901ce6cb93d63698fda8478" => :x86_64_linux end depends_on "libuv" diff --git a/Formula/draco.rb b/Formula/draco.rb index be70f0ceed041..b1482f8c8bb42 100644 --- a/Formula/draco.rb +++ b/Formula/draco.rb @@ -9,6 +9,7 @@ class Draco < Formula sha256 "54ea5852087b08f08945c7a73f6fc3b9d91958e6f23685c9848e08c2bce1ac03" => :catalina sha256 "cd40c18a7c54185a154785e7245ae1b3ddeff275a96854488e625f9a1b6701a5" => :mojave sha256 "341560bdd2d7831f274feaa1646f10c79a00618d8c00f9522e885f23af1f2f87" => :high_sierra + sha256 "19af4530991cdb4a4f9de3998d2040d3655bd083dda1fa033dd6c609528d5f37" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/drafter.rb b/Formula/drafter.rb index 9d85059fcd8ea..7b011a8ab46f2 100644 --- a/Formula/drafter.rb +++ b/Formula/drafter.rb @@ -10,6 +10,7 @@ class Drafter < Formula sha256 "29fa18ff148f6ebf454ed383181384bfb9aff1520e64072dfb386445bf8e52a3" => :catalina sha256 "2a56e75e39f7b46eba355ae6163b645e161c4e458a4f127c37a948377143ac3e" => :mojave sha256 "125fb907888693fd3d638a79d185483f44112f5bb64f098626aa17f00b25513d" => :high_sierra + sha256 "dae182cf5ed4215eb80c1dd0ee4d67041f8316947f02ef1cc36220f7c53be2e4" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/drip.rb b/Formula/drip.rb index 4a45e25309a19..9fcd2cac7dff9 100644 --- a/Formula/drip.rb +++ b/Formula/drip.rb @@ -13,6 +13,7 @@ class Drip < Formula sha256 "69a071055da45949c56df74c4959336f9511f863f447aed941a66547169f2c88" => :el_capitan sha256 "14711be9325c0b2df465197156b4b78bed673bf441011d0ce29d48a0c2ee0045" => :yosemite sha256 "69207c24aa1f8e6ba406e6cc3f811cd7000ee14c713cc32b49d72f2c76a702bc" => :mavericks + sha256 "048944c8240d219b4777e4f35bb7d456062042385e6b2a375f2d00d1b9d517f9" => :x86_64_linux end depends_on :java => "1.8" diff --git a/Formula/drone-cli.rb b/Formula/drone-cli.rb index 6ee5ccfd9b809..8088b158e7c86 100644 --- a/Formula/drone-cli.rb +++ b/Formula/drone-cli.rb @@ -10,6 +10,7 @@ class DroneCli < Formula sha256 "6f6c2e86acf8190aa34f419213a622ac59c6f1b7848743b5066baebc89402605" => :catalina sha256 "6f942cbf4739e14966324724d37dfb422bfc22949c5aec9ed568f212f8ff88ef" => :mojave sha256 "2e3947c81733f0b548815fe37601551165ccb1f8d49df7f49b3b0671529f4e22" => :high_sierra + sha256 "235b723ad6ecd9f44e0e5a1d79744701d16c8ab5852d2ef3a76087e3e6473ccc" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dscanner.rb b/Formula/dscanner.rb index dca281e250a74..29d6216c8e5b6 100644 --- a/Formula/dscanner.rb +++ b/Formula/dscanner.rb @@ -11,6 +11,7 @@ class Dscanner < Formula sha256 "e126b7c883e69957151817c0170cd3cfbab3e35788c54d9d94570fdd7c3924ed" => :catalina sha256 "2e01bcfd71923a8eddc1e9f5eade8b12106fd619ad0f7ff004cf3a26d59378a5" => :mojave sha256 "45e4022ceacab5d30dacb2cbe69db65a9079e5624cb0f54144abce50b014948c" => :high_sierra + sha256 "13b72579ba30f2485c1de0ac0207a159d131c719a1240edb1e23127436984b05" => :x86_64_linux end depends_on "dmd" => :build diff --git a/Formula/dsh.rb b/Formula/dsh.rb index 17936b9ee3f70..4f0c4ea939e0e 100644 --- a/Formula/dsh.rb +++ b/Formula/dsh.rb @@ -10,6 +10,7 @@ class Dsh < Formula sha256 "9d694a476e5d74d7c3edbf284628e3f68c96c5a30c91b7fd3c624630805636ea" => :sierra sha256 "0b6a147235228473634c424e5e12671b6e9a4609ce6b732dd5ca9f56f335add5" => :el_capitan sha256 "fba83e836f8fa0ddca0a9c35f5f8781aabb0a3c7dfadc8eb6cd69ca1e2930cd0" => :yosemite + sha256 "af00cb33411711ee205dd780436403d2c5ce9841142641cb043db8e3d2b951e5" => :x86_64_linux end depends_on "libdshconfig" diff --git a/Formula/dshb.rb b/Formula/dshb.rb index 4379dfb9c4bc2..1ed4799ce5bd9 100644 --- a/Formula/dshb.rb +++ b/Formula/dshb.rb @@ -12,7 +12,8 @@ class Dshb < Formula sha256 "e0aa0f64ac02e9244fc59773a966d1ac5755dc4a4c91c0dbcd92633c4330f14b" => :el_capitan end - depends_on :xcode => ["8.0", :build] + depends_on :xcode => ["8.0", :build] if OS.mac? + depends_on :macos def install system "make", "release" diff --git a/Formula/dssim.rb b/Formula/dssim.rb index 29e6af28390df..93c771a7dd5ec 100644 --- a/Formula/dssim.rb +++ b/Formula/dssim.rb @@ -10,6 +10,7 @@ class Dssim < Formula sha256 "c03454b7582f988de44af524a342e016b3bf63937496450365c758809e79a224" => :mojave sha256 "f1284c6d8db31ce548232d0e7c0d4204249555ee5a9c92958b2c8bea4deee832" => :high_sierra sha256 "61c6019667ce76ccc145381eea2131ee3119366b1d54d2878da908eca8f85339" => :sierra + sha256 "5635a51030f5e5ac1c06136f7ffbfa957998ef17a9d88de03c9140916b1fe043" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/dsvpn.rb b/Formula/dsvpn.rb index 75c1eaf7450a0..cb351b7617aa2 100644 --- a/Formula/dsvpn.rb +++ b/Formula/dsvpn.rb @@ -10,6 +10,7 @@ class Dsvpn < Formula sha256 "a08464eca0167991c580594ecd9f1893a7be6d1cb522ceb385ff1883dca507c3" => :catalina sha256 "31a8359d756b673788aad04e1b776c0e1d5b6331f7e64494d3c6680280ea11ec" => :mojave sha256 "d34ff5d83b0b259c5051de2e2e8cf4599679d1d7e61dd282065afb0516fe62b1" => :high_sierra + sha256 "2a5b30492c82d2d600cc3415292215407dff9af8e98516dd4d95a6143d1ad024" => :x86_64_linux end def install @@ -26,7 +27,11 @@ def caveats end test do - expected = "tun device creation: Operation not permitted" + expected = if which("ip") + "tun device creation: Operation not permitted" + else + "Unable to automatically determine the gateway IP" + end assert_match expected, shell_output("#{sbin}/dsvpn client /dev/zero 127.0.0.1 0 2>&1", 1) end end diff --git a/Formula/dtach.rb b/Formula/dtach.rb index 8a35deb5647b9..4ec2b110f8c3d 100644 --- a/Formula/dtach.rb +++ b/Formula/dtach.rb @@ -13,6 +13,7 @@ class Dtach < Formula sha256 "bf26c7f68f65ae257c878e2008683d496a8c7542b3048e057bc3d588d779e16a" => :el_capitan sha256 "fe8735b33ebb6f2fd2ea1e7c3542981833e8cad8c16fb6d9fbb5ac0f2ce493b8" => :yosemite sha256 "bd984d95c0e21eda63bbb210acd381fb44e019a335ebff85a66fca89db5f11ae" => :mavericks + sha256 "cc943a3594ca35cd8cd8ac982fafc0a64b8f5da972b40b2d0fb1d49f4572209d" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/dtc.rb b/Formula/dtc.rb index cdbfa5a891ceb..ed1db0dea8d15 100644 --- a/Formula/dtc.rb +++ b/Formula/dtc.rb @@ -9,10 +9,14 @@ class Dtc < Formula sha256 "3cbdb48bb892f6cce39b9cc381f60a9ad8a785ad3582a4f324be8ec4caed7423" => :catalina sha256 "d80813f17abce4b20eb1e656919e9a5ee9d4fd10613b144c61217f3f1febf55c" => :mojave sha256 "00273c1cc191558075437f3e1938977cbc22cc84c58bb6b8920acc672d25b85d" => :high_sierra + sha256 "486d6f5408439cefdd39be0cea8869992c7b16d3c020cfa65c09a894161e7e69" => :x86_64_linux end depends_on "pkg-config" => :build + uses_from_macos "bison" + uses_from_macos "flex" + def install inreplace "libfdt/Makefile.libfdt", "libfdt.$(SHAREDLIB_EXT).1", "libfdt.1.$(SHAREDLIB_EXT)" system "make", "NO_PYTHON=1" diff --git a/Formula/dub.rb b/Formula/dub.rb index fd559718ccbc5..522a5d9e4c0c0 100644 --- a/Formula/dub.rb +++ b/Formula/dub.rb @@ -11,6 +11,7 @@ class Dub < Formula sha256 "cfa1ed65889521a635bcdd69945d9d4b77aa72cce963c544286e76dbc85b2cb2" => :catalina sha256 "3d818daf0852931d00d7780838f1c60b8907a3b0eecfbccba1166a9bf26d2834" => :mojave sha256 "e0abff9d8011d7bdbd603fe27e226e8f11b3d33c536947ce944b577bb5a34a64" => :high_sierra + sha256 "db9a1dddb4efdac5101da668dfd94a49a3c8ca9d27ffec4270d6884c322b03e1" => :x86_64_linux end depends_on "dmd" => :build diff --git a/Formula/duck.rb b/Formula/duck.rb index 7dc754ed00e49..89d509641917d 100644 --- a/Formula/duck.rb +++ b/Formula/duck.rb @@ -17,6 +17,7 @@ class Duck < Formula depends_on :java => ["1.8", :build] depends_on "maven" => :build depends_on :xcode => :build + depends_on :macos def install xcconfig = buildpath/"Overrides.xcconfig" diff --git a/Formula/dumb.rb b/Formula/dumb.rb index 05bccf64508c3..755ae1ba72ed5 100644 --- a/Formula/dumb.rb +++ b/Formula/dumb.rb @@ -13,6 +13,7 @@ class Dumb < Formula sha256 "d2352df11bee735e963b887609578ec1b3acf0e07748385f472a6add0e1cd2b6" => :el_capitan sha256 "317ac8139d8efb03022bb4f9a76ad61f2358570680563924d13229c52b282dff" => :yosemite sha256 "ee41051ed609807bfb8ce774fa614869db6bdd0fe9a307f6f2cb89f99e9db78e" => :mavericks + sha256 "9d63c3a89ff351dd4c33d5691699b2df26badcf7a95da1a557c7ef052caae078" => :x86_64_linux end def install diff --git a/Formula/dune.rb b/Formula/dune.rb index 05fa536b4b920..2a1f2f85a9594 100644 --- a/Formula/dune.rb +++ b/Formula/dune.rb @@ -10,6 +10,7 @@ class Dune < Formula sha256 "3925b22f4991e9fb8e13829ab177b67d47fd7f83855008897bbde3b136525a0b" => :catalina sha256 "9004fbf716ba62b978342e9a658138a380244e67efb6f1d527e4adfd5ff0998a" => :mojave sha256 "d53326785711c403eaa8e734edea397b888a12025386dc512f894850624e4397" => :high_sierra + sha256 "be5b3c4ea6ef3b396e5961bb537aa54f0975840f2bb79bd597d8304169dd6f21" => :x86_64_linux end depends_on "ocaml" => [:build, :test] diff --git a/Formula/duo_unix.rb b/Formula/duo_unix.rb index 3b202e9aacc07..17d1f99e7df82 100644 --- a/Formula/duo_unix.rb +++ b/Formula/duo_unix.rb @@ -8,12 +8,14 @@ class DuoUnix < Formula sha256 "67a6ff6605578e287fc862f6fb2ee9360dea7c22f8fbaa97a1bf18dd13db5ec0" => :catalina sha256 "753e3f0d60c4c0404a6e347d052bc1ed4bd1e66b43170675549a36d4fe736f25" => :mojave sha256 "8e707bc378fa13dfd92fb39e0de055c58f2470973fe80edc41bf500e4863128a" => :high_sierra + sha256 "bdf77d178534c6a4a6283ea965b0a0ba7457641c44ac445a07a2841cf1cf455c" => :x86_64_linux end depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build depends_on "openssl@1.1" + depends_on "linux-pam" unless OS.mac? def install system "./bootstrap" diff --git a/Formula/duplicity.rb b/Formula/duplicity.rb index 9ab55902d9250..334d5330bd047 100644 --- a/Formula/duplicity.rb +++ b/Formula/duplicity.rb @@ -11,6 +11,7 @@ class Duplicity < Formula sha256 "0d756f0ecb780738749b81b2690410e46cae206274f6eafa10fa9e02091159e7" => :catalina sha256 "289a00438f22f232182fdc74f8e96786fc256144b2cf38d148c2a3173548522a" => :mojave sha256 "808f67ed7d51d07ca5b8f0811c60ce6edf841318cb3bbd2138c10f5ed12c5197" => :high_sierra + sha256 "f293653f4db0f907ccf11af6304b3d12d908caa6a029f3cd5fbe2c185545b776" => :x86_64_linux end depends_on "gnupg" diff --git a/Formula/dupseek.rb b/Formula/dupseek.rb index 14ebb83827869..db6edcabc4f89 100644 --- a/Formula/dupseek.rb +++ b/Formula/dupseek.rb @@ -13,6 +13,7 @@ class Dupseek < Formula sha256 "576106465507f9281685d12dba4409e1b409f090fc6ac1397c92b5190a5416d4" => :el_capitan sha256 "ec38b1caa009ca1c33efe85eb1b00cd7e37f67f3cf43b547f889e39f5be4d28a" => :yosemite sha256 "ff34b6c5ac5fcf84bf532008fb5fd2b2cfd9db7736854efb09e451e54b370c37" => :mavericks + sha256 "a955e2e3cb7bd26091695842ff64e66bba4b03a6ead7b3647e5279fb3f5bcfd7" => :x86_64_linux end def install diff --git a/Formula/dust.rb b/Formula/dust.rb index 131c222639ff2..bdd3e650eba95 100644 --- a/Formula/dust.rb +++ b/Formula/dust.rb @@ -10,6 +10,7 @@ class Dust < Formula sha256 "2d26a2fa524049d8b2a32b3076f7de243c7929c943b5c0190d8cc5c9a2ba41d3" => :catalina sha256 "3e92fcb18d37bd8dde1d8e52a44c8f96a5086a7afb5ced6895262af0b3e8395b" => :mojave sha256 "ffa147a323f5ff57cbea0eb8817acdfff88c1f349f5f1f35d0bf3dc64e6c8faf" => :high_sierra + sha256 "0c1e0d04561447feeb3622630f84a33e42aedabf202784024c36068670537a7e" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/duti.rb b/Formula/duti.rb index 3945b537d0fbe..e6bb684ad255d 100644 --- a/Formula/duti.rb +++ b/Formula/duti.rb @@ -14,6 +14,7 @@ class Duti < Formula end depends_on "autoconf" => :build + depends_on :macos # Fix compilation on macOS 10.14 Mojave patch do diff --git a/Formula/dvanalyzer.rb b/Formula/dvanalyzer.rb index fb681a33811aa..55eb9df5d18f9 100644 --- a/Formula/dvanalyzer.rb +++ b/Formula/dvanalyzer.rb @@ -11,6 +11,7 @@ class Dvanalyzer < Formula sha256 "59667b7174026e959f123ebbf8f8e30559dabb70814565f8bec8316c4b9c02b1" => :high_sierra sha256 "fb066074dde3b6e94ba30bf37bc85c2e17ef30a7e2b8f874b1a09f3aca2275f7" => :sierra sha256 "0e138c105a1f4604dbb4b7c911e83c660f2078cb24af6ba0ba12564a6e93d9c0" => :el_capitan + sha256 "8fb153dacbee299079b32dc7f85c9d8d832e9e691a82d87719cdfe66bd6b9061" => :x86_64_linux end def install diff --git a/Formula/dvc.rb b/Formula/dvc.rb index 734410107e2d3..e06818acb291f 100644 --- a/Formula/dvc.rb +++ b/Formula/dvc.rb @@ -11,6 +11,7 @@ class Dvc < Formula sha256 "e2b50d19496f94cb108104bb7aa45e23773f6ba262af55c4d1773eb546416f46" => :catalina sha256 "1b080eb57eb576ad7b247e5b8b2e272a4c459a42b3ed8d5002bbea682548de41" => :mojave sha256 "f42c065cd2cb833e573256c9c0d90d7808c2c1321de793eda0924895ed2e75dc" => :high_sierra + sha256 "9dbbe76d5fb3a2341ea699050dd8a1d54b05bff580dad97a39eb06216f2fe331" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/dvd-vr.rb b/Formula/dvd-vr.rb index 9f3a08c2f81da..196953cde4992 100644 --- a/Formula/dvd-vr.rb +++ b/Formula/dvd-vr.rb @@ -12,6 +12,7 @@ class DvdVr < Formula sha256 "7b38c83a9bb9daded6a6f28be018076cdcdbbfb0d47102ecbdd06128bebb33ee" => :sierra sha256 "a048c7985df06e3a1d4c7145064b87bd51945f15da2494c03e7af542f07ca8b4" => :el_capitan sha256 "22919ace8aeedc16d406797273402498c0c97ceec31e2dfbffcba6fff957ce65" => :yosemite + sha256 "1a88e4ac057d6ae1fef7f0e82342ce3f6e80f40a4c7cde9a46bfb55bd1d0875b" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/dvdauthor.rb b/Formula/dvdauthor.rb index 196364a820ada..d0cee3185d2b7 100644 --- a/Formula/dvdauthor.rb +++ b/Formula/dvdauthor.rb @@ -10,6 +10,7 @@ class Dvdauthor < Formula sha256 "669b5fe5348ceb668f9ff55c4942c240f585eb5167e2dfbe1142442fcf7b776b" => :catalina sha256 "3e4e46c56905c289d31d167e75ee3b033a197fc0dda4b6b56dec752ac9773c51" => :mojave sha256 "55cee6a535eec67fc4f1ea65c2283d69c420d32933d9bcd6106168796ba1af9a" => :high_sierra + sha256 "9ade5a5edb37f54854bf606072d350546422a8473320cf79fc0e64e91a4b0ba2" => :x86_64_linux end # Dvdauthor will optionally detect ImageMagick or GraphicsMagick, too. diff --git a/Formula/dvm.rb b/Formula/dvm.rb index 1c7737d5c9e52..607a50989e7a4 100644 --- a/Formula/dvm.rb +++ b/Formula/dvm.rb @@ -10,6 +10,7 @@ class Dvm < Formula sha256 "9c7cc18808affb5cc05958f3e501602c8d40889157c776dfb9f5ba9109a717b7" => :catalina sha256 "fa56fd369d0ef2dc43d29316d202f7cc3ca670765e07a3295429971929d93d24" => :mojave sha256 "d98c151704057dc821b67634c0387b15ed3b0e86b07e1eecd9c073f2f27abcd4" => :high_sierra + sha256 "734113d157dd69892f74cc2a68f860bb5f0a9b4192184c538a7260b2e5fd4575" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/dwarf.rb b/Formula/dwarf.rb index 624d39fa13751..75d70204729e1 100644 --- a/Formula/dwarf.rb +++ b/Formula/dwarf.rb @@ -11,6 +11,7 @@ class Dwarf < Formula sha256 "c10f3ccbb2dc59b7c76c9dd46a71f1e41d7c7faa8fab5f4326599b3a5467c770" => :mojave sha256 "92db022169f222a0ce002e6c20e6256cc5636f61c1e6fa1c44b56481c5a2422d" => :high_sierra sha256 "dbc5a7043b5888284ddab1d97b57406fc6c24d71c205a54482e3ef0e442e20fd" => :sierra + sha256 "9a2b04c0db1e8704be568606f6f8d6ed401fa34026a9d418d0058194056575a1" => :x86_64_linux end depends_on "flex" @@ -36,7 +37,12 @@ def install } EOS system ENV.cc, "test.c", "-o", "test" - output = shell_output("#{bin}/dwarf -c 'pp $mac' test") - assert_equal "magic: 0xfeedfacf (-17958193)", output.lines[0].chomp + if OS.mac? + output = shell_output("#{bin}/dwarf -c 'pp $mac' test") + assert_equal "magic: 0xfeedfacf (-17958193)", output.lines[0].chomp + else + # pp may not be installed on Linux, test something else + assert_match /main header: elf/, shell_output("#{bin}/dwarf -p test") + end end end diff --git a/Formula/dwarfutils.rb b/Formula/dwarfutils.rb index 0d7b7b7e5f585..cba9f55846bde 100644 --- a/Formula/dwarfutils.rb +++ b/Formula/dwarfutils.rb @@ -9,9 +9,14 @@ class Dwarfutils < Formula sha256 "7a752aaf0ef830de3bef1041516ecb1efc505e577b67deb690c9d38b99fbaeeb" => :catalina sha256 "12c22459b32e39867a9943b958de8fecdc311a233f1b80722ecebca44fb5ce50" => :mojave sha256 "7e815620405e86d932cba7502cbf8ee63fd786fb18258a0318d4ca9680f8912e" => :high_sierra + sha256 "42c1fb7a0ac814903a1dc40306763a6e0dba04fd07ff6aad6a8e2f5438a3e7fd" => :x86_64_linux end - depends_on "libelf" => :build + if OS.mac? + depends_on "libelf" => :build + else + depends_on "libelf" + end uses_from_macos "zlib" @@ -52,7 +57,11 @@ def install return 0; } EOS - system ENV.cc, "-L#{lib}", "-I#{include}", "-ldwarf", "test.c", "-o", "test" + if OS.mac? + system ENV.cc, "-L#{lib}", "-I#{include}", "-ldwarf", "test.c", "-o", "test" + else + system ENV.cc, "-I#{include}", "test.c", "-L#{lib}", "-ldwarf", "-o", "test" + end system "./test" end end diff --git a/Formula/dwatch.rb b/Formula/dwatch.rb index 462c177c5ff9f..2173efc54e69f 100644 --- a/Formula/dwatch.rb +++ b/Formula/dwatch.rb @@ -9,6 +9,7 @@ class Dwatch < Formula sha256 "c79f51f4329569d682357a97014bd67a14ac1444e4fb983abd3a9e96339ba87a" => :catalina sha256 "69b3cb7cc60c1635c3134a0cd5e9dd884b3e28f52955e62da9beb0605e43cff5" => :mojave sha256 "fdf97f373c4bb18a3025d0f4acd9e16c826eca19cb60c9abd59d59bee8741c0f" => :high_sierra + sha256 "1d0a738bdfb6cf47f3b6d582d3e0bf8607689334cf80948c2b903e1c6f189199" => :x86_64_linux end def install diff --git a/Formula/dxflib.rb b/Formula/dxflib.rb index a0f4f93e90373..de1f374f56281 100644 --- a/Formula/dxflib.rb +++ b/Formula/dxflib.rb @@ -14,6 +14,7 @@ class Dxflib < Formula sha256 "aff6c3f5e5bca552c5962e8ef5c43d1dd5fb0630d091e206a164e99ed8b70637" => :el_capitan sha256 "e883aa60c9baab1198671db178c0723e4331ed9fb65ad4d87ba72ca921d7d0b4" => :yosemite sha256 "0e591fba7cac298bf4afbb4d7f9895c10865998c6ae64ad4db31c7a33c3377cc" => :mavericks + sha256 "1d27d9e4512514a9f7e8decef99169b11f75acb96845e2cf59a1b8efef7ba3be" => :x86_64_linux end def install diff --git a/Formula/dxpy.rb b/Formula/dxpy.rb index 3b80693c8d395..20197aea61430 100644 --- a/Formula/dxpy.rb +++ b/Formula/dxpy.rb @@ -11,9 +11,15 @@ class Dxpy < Formula sha256 "091dff300142f23d040ba2710491b7e594a8d504c2be2a5a557daf21075bd43d" => :catalina sha256 "148096c7298b8cff022fa36f564c17152f0e6462cec8f4f3ec4ec05c1be7cad9" => :mojave sha256 "8f170d1267f1b0dde4cbf437eebf5d6bd1c59a73606826ea71553e189bfa493c" => :high_sierra + sha256 "3acd87851e7b78da2eb80f9f094800e6b63792ace6a80a8dcadf5adfa8e29f22" => :x86_64_linux end depends_on "python@3.8" + unless OS.mac? + depends_on "libffi" # for cffi + # pkg-config helps setuptools find libffi + depends_on "pkg-config" => :build + end resource "argcomplete" do url "https://files.pythonhosted.org/packages/43/61/345856864a72ccc004bea5f74183c58bfd6675f9eab931ff9ce21a8fe06b/argcomplete-1.11.1.tar.gz" @@ -90,6 +96,16 @@ class Dxpy < Formula sha256 "3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527" end + resource "ws4py" do + url "https://files.pythonhosted.org/packages/d6/69/0f5723c5784317278866891546c5fe4521dc404600df504651e9c934fd0d/ws4py-0.3.2.tar.gz" + sha256 "48a4e005496a60081f74ca130ce55603ff87e1507483535acf902b94761bda8b" + end + + resource "xattr" do + url "https://files.pythonhosted.org/packages/60/80/a1f35bfd3c7ffb78791b2a6a15c233584a102a20547fd96d48933ec453e7/xattr-0.9.6.tar.gz" + sha256 "7cb1b28eeab4fe99cc4350e831434142fce658f7d03f173ff7722144e6a47458" + end + resource "websocket-client" do url "https://files.pythonhosted.org/packages/fb/1f/9acd71b77e66fafb19cfb023e50cbb7ed2c3be3c72db999162bd36c518c4/websocket_client-0.53.0.tar.gz" sha256 "c42b71b68f9ef151433d6dcc6a7cb98ac72d2ad1e3a74981ca22bc5d9134f166" diff --git a/Formula/dylibbundler.rb b/Formula/dylibbundler.rb index 1530a8d48cb5b..11130c8a7c213 100644 --- a/Formula/dylibbundler.rb +++ b/Formula/dylibbundler.rb @@ -11,6 +11,7 @@ class Dylibbundler < Formula sha256 "f2554553b0c00165394e41ade50712f490331d7bf084792abc2cb4f12ae1164e" => :mojave sha256 "60b4e47bfbb3450f6901e6c104d37530940e9cc22abacaacbe37eb4539b820c6" => :high_sierra sha256 "c8f470a6e3c0c5eaf632dd384f5098f0e59f60ab2c873482424f7c6729a4fe07" => :sierra + sha256 "2d60ed35ec5b1678f660e73cbca3c2c3dd5a6a663a9191ae7255c8138e1c8301" => :x86_64_linux end def install diff --git a/Formula/dynet.rb b/Formula/dynet.rb index 34801e829ae58..26f865c90c5f1 100644 --- a/Formula/dynet.rb +++ b/Formula/dynet.rb @@ -9,6 +9,7 @@ class Dynet < Formula sha256 "2e0c6026d6a047f6c1885779da5e72f2503568b711fc1f7c0c00322814cb1213" => :catalina sha256 "06482cc7dee2e337482c31e935e9384cbec243a6c407e9e35aeb02f08361e450" => :mojave sha256 "f6603f28e5bf6209808e58ffbe27b7c8841a3bc00be1bc98d9aff6b4f8bf4f37" => :high_sierra + sha256 "14fb6c34ceaa1ed2ffbf989357c84383cfded0b32074d5307fc1a56cf822309d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/e2fsprogs.rb b/Formula/e2fsprogs.rb index 2253f7623086b..9ecceb5d5e72f 100644 --- a/Formula/e2fsprogs.rb +++ b/Formula/e2fsprogs.rb @@ -9,6 +9,7 @@ class E2fsprogs < Formula sha256 "bf44ad4af62150e9f29827532fced8640fdfcd9ef77e890347ce3eda288be30a" => :catalina sha256 "2986dc8e3be65b03e27990226e78ba8bcd2d512381836bb09223f04c94974837" => :mojave sha256 "0cdfcb50d1b1046d90d56ece1c4d1c7e624adf4c8b7f19587285bf77b10b7ec7" => :high_sierra + sha256 "6f5eefda353f129cc71b8b29f9e81b30fad3079aed79ca5e10e8083f25deff3d" => :x86_64_linux end keg_only "this installs several executables which shadow macOS system commands" @@ -25,8 +26,8 @@ def install # see https://github.com/Homebrew/homebrew-core/pull/35339 # and https://sourceforge.net/p/e2fsprogs/discussion/7053/thread/edec6de279/ system "./configure", "--prefix=#{prefix}", "--disable-e2initrd-helper", - "MKDIR_P=mkdir -p" - + "MKDIR_P=mkdir -p", + *("--enable-elf-shlibs" unless OS.mac?) system "make" system "make", "install" system "make", "install-libs" diff --git a/Formula/eccodes.rb b/Formula/eccodes.rb index 95adcd8495d4c..2f49f55e60e6b 100644 --- a/Formula/eccodes.rb +++ b/Formula/eccodes.rb @@ -8,6 +8,7 @@ class Eccodes < Formula sha256 "0fb7a83f5bee61fa6a8fffd42e1c85a4d346ff29138c5cb3ecfbce71f3ef1219" => :catalina sha256 "9433af73710db4cd672ef9fde0e05d18709d37bb89e826a2de638110c9c0a61b" => :mojave sha256 "0764fe043a83858da925b7d55367ee7c516e1d351009e3e6bde6c611944a3e9d" => :high_sierra + sha256 "39e15894bc036c18e89f64bc0cfead0ef6de113682a7a8bbaf8bba301373090e" => :x86_64_linux end depends_on "cmake" => :build @@ -26,9 +27,12 @@ def install end # Avoid references to Homebrew shims directory - inreplace include/"eccodes_ecbuild_config.h", HOMEBREW_LIBRARY/"Homebrew/shims/mac/super/clang", "/usr/bin/clang" - inreplace lib/"pkgconfig/eccodes.pc", HOMEBREW_LIBRARY/"Homebrew/shims/mac/super/clang", "/usr/bin/clang" - inreplace lib/"pkgconfig/eccodes_f90.pc", HOMEBREW_LIBRARY/"Homebrew/shims/mac/super/clang", "/usr/bin/clang" + os = OS.mac? ? "mac" : "linux" + cc = OS.mac? ? "clang" : "gcc" + path = HOMEBREW_LIBRARY/"Homebrew/shims/#{os}/super/#{cc}" + inreplace include/"eccodes_ecbuild_config.h", path, "/usr/bin/#{cc}" + inreplace lib/"pkgconfig/eccodes.pc", path, "/usr/bin/#{cc}" + inreplace lib/"pkgconfig/eccodes_f90.pc", path, "/usr/bin/#{cc}" end test do diff --git a/Formula/ecl.rb b/Formula/ecl.rb index 363eaa82b39de..033602f0c2d7e 100644 --- a/Formula/ecl.rb +++ b/Formula/ecl.rb @@ -9,6 +9,7 @@ class Ecl < Formula sha256 "2a33f32a5ae0e6f53cc341e2235525a5c5bdeaf1a696e19f1fdaf2b8c36bb02c" => :catalina sha256 "1cccfc0bb6405dc4c9515936ee14589837794b61738477bd72ba77d5e0fcc9e9" => :mojave sha256 "8b216d4e8eb3491593160a2d291beb13b228bc8442cc0c5d391c196754f8968c" => :high_sierra + sha256 "7d11f160ae86154953f4b021d265b1a6020aed9edc8f22c634ff8d5dfb10a295" => :x86_64_linux end depends_on "texinfo" => :build # Apple's is too old diff --git a/Formula/ecm.rb b/Formula/ecm.rb index f790f4ad08c65..a2a3f4972bd89 100644 --- a/Formula/ecm.rb +++ b/Formula/ecm.rb @@ -14,6 +14,7 @@ class Ecm < Formula sha256 "3ecb325a368ef42737e77003e9ecc13a8d402a34da3a25c039b36565fef0b55d" => :el_capitan sha256 "9eef5eb54af2ad50ab05ee9382efe8d0ca831a6d058fe1fa2679cff87aa0a064" => :yosemite sha256 "c80a78299a5042d8588806066af2b03e9a3a679e8284fb863d9ee15edc690933" => :mavericks + sha256 "a0317499c49200f9441ac84077e6d84d00de074410fd2c33ac830f0c3421bdcf" => :x86_64_linux end def install diff --git a/Formula/ed.rb b/Formula/ed.rb index 63f7e17b910e3..6e4309431f2aa 100644 --- a/Formula/ed.rb +++ b/Formula/ed.rb @@ -11,6 +11,7 @@ class Ed < Formula sha256 "c8ffa15f236faed29b760318f598903144a8f30ed6a09161f67578b9789760c9" => :catalina sha256 "2d8205eb80873325eb1b485238270df1d0e4ad71212d02f48dffbbdb77b529ed" => :mojave sha256 "57b85675d5c24f9fa076b9e115274f03c8ec136a36400956b488d6e11fb37e5c" => :high_sierra + sha256 "097142ff8a9a39656648d9410269047249755173afa49999432ccdbc93f31270" => :x86_64_linux end keg_only :provided_by_macos @@ -18,19 +19,23 @@ class Ed < Formula def install ENV.deparallelize - system "./configure", "--prefix=#{prefix}", "--program-prefix=g" + system "./configure", "--prefix=#{prefix}", *("--program-prefix=g" if OS.mac?) system "make" system "make", "install" - %w[ed red].each do |prog| - (libexec/"gnubin").install_symlink bin/"g#{prog}" => prog - (libexec/"gnuman/man1").install_symlink man1/"g#{prog}.1" => "#{prog}.1" + if OS.mac? + %w[ed red].each do |prog| + (libexec/"gnubin").install_symlink bin/"g#{prog}" => prog + (libexec/"gnuman/man1").install_symlink man1/"g#{prog}.1" => "#{prog}.1" + end end libexec.install_symlink "gnuman" => "man" end def caveats + return unless OS.mac? + <<~EOS All commands have been installed with the prefix "g". If you need to use these commands with their normal names, you @@ -43,10 +48,17 @@ def caveats testfile = testpath/"test" testfile.write "Hello world\n" - pipe_output("#{bin}/ged -s #{testfile}", ",s/o//\nw\n", 0) - assert_equal "Hell world\n", testfile.read + if OS.mac? + pipe_output("#{bin}/ged -s #{testfile}", ",s/o//\nw\n", 0) + assert_equal "Hell world\n", testfile.read + + pipe_output("#{opt_libexec}/gnubin/ed -s #{testfile}", ",s/l//g\nw\n", 0) + assert_equal "He word\n", testfile.read + end - pipe_output("#{opt_libexec}/gnubin/ed -s #{testfile}", ",s/l//g\nw\n", 0) - assert_equal "He word\n", testfile.read + unless OS.mac? + pipe_output("#{bin}/ed -s #{testfile}", ",s/o//\nw\n", 0) + assert_equal "Hell world\n", testfile.read + end end end diff --git a/Formula/editorconfig.rb b/Formula/editorconfig.rb index 1dd6d266bc40e..a188de7488e1a 100644 --- a/Formula/editorconfig.rb +++ b/Formula/editorconfig.rb @@ -11,6 +11,7 @@ class Editorconfig < Formula sha256 "da824a4d67b8c1c1627d90e222b5f2441caf9cd7eca50de40380d3e7839db047" => :mojave sha256 "26eceb21fd8d34c04799f70ba22ca0da11456c1e3fa30b0b90e592038b840d01" => :high_sierra sha256 "a4655cde0acc92e11b02263337d384770bf0b592d828d44b8bef8be961572ad8" => :sierra + sha256 "7d8384563dc4403965721e691a1ef91254112e58d7f1e9a59eae2460a965d9f3" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/eg.rb b/Formula/eg.rb index a79798e995f29..0c37a19a1f371 100644 --- a/Formula/eg.rb +++ b/Formula/eg.rb @@ -12,6 +12,7 @@ class Eg < Formula sha256 "307a0ce0f1514288179dbbc56fdac3de02100c80e8c57b1abedcab5cd0cff458" => :sierra sha256 "500a97f229b78ab83b97591d9276f7d9e1e4ce4d392f2530f5c8a9f10543b469" => :el_capitan sha256 "65d2bab2a43912dfd487f817724dc7feee3ba3e226c07d0bd78ad22edcea970c" => :yosemite + sha256 "381f38352b8cdb673571eabd8b5f72cbf32ee9cbe92d61748f0cf943ffc8cede" => :x86_64_linux end depends_on "s-lang" diff --git a/Formula/eigen.rb b/Formula/eigen.rb index 3b478465213a2..6e367f114aa0b 100644 --- a/Formula/eigen.rb +++ b/Formula/eigen.rb @@ -11,6 +11,7 @@ class Eigen < Formula sha256 "683c2dd898245f61c298d1f2675885e7c67ec7e18f6665df1ec56f088bd670f4" => :mojave sha256 "79c52d57394cf485eb324effab69279e4f3beb63cbacfa600ae0a678d852a827" => :high_sierra sha256 "79c52d57394cf485eb324effab69279e4f3beb63cbacfa600ae0a678d852a827" => :sierra + sha256 "aadf704e7dcb42aa6ff5f6ab4d42cda3a3a2fc4325efa10c37636aa5ca6b1968" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ejdb.rb b/Formula/ejdb.rb index 20dd53055821a..c832ac63cc9c8 100644 --- a/Formula/ejdb.rb +++ b/Formula/ejdb.rb @@ -10,6 +10,7 @@ class Ejdb < Formula sha256 "ecaeba23e44b6d133b7b12e9a20df32c52fdb907756434c6c12806f527ffef0e" => :catalina sha256 "90944ae10cf3c474e865e58d29ef4fcc77264b432e5b6156e0cb00075d1a22dc" => :mojave sha256 "f53205e6596883184a1a14b7105c7d9c98ace426ed6594dff0fc20445d08cd47" => :high_sierra + sha256 "cb324868091db189931de3c3015e9187402d5f1b7713248fb2b2cd6579ea7ff6" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/eject.rb b/Formula/eject.rb index ce19237f383c4..2d24853aca6cf 100644 --- a/Formula/eject.rb +++ b/Formula/eject.rb @@ -12,7 +12,7 @@ class Eject < Formula sha256 "37fd3d134428952fda16239392f4960428852c1f83eb942bd0b45da2e76dcc3b" => :el_capitan end - depends_on :xcode => ["8.0", :build] + depends_on :xcode => ["8.0", :build] if OS.mac? def install xcodebuild "SYMROOT=build" diff --git a/Formula/ekg2.rb b/Formula/ekg2.rb index c6005a2b56e46..cb4215d079e93 100644 --- a/Formula/ekg2.rb +++ b/Formula/ekg2.rb @@ -11,6 +11,7 @@ class Ekg2 < Formula sha256 "78778e95338d2a0a61f7d4773716d927534d24e4d5867a04038401427b07c855" => :mojave sha256 "f946e56a032b9526280745e6e57f8bc42a18d12fa9ced783f5515eb600bcdf0b" => :high_sierra sha256 "35f01a57bbceb1a79abfa8b035e3135d0c821bbca22a63b273e32159e517813f" => :sierra + sha256 "b59e23e03c20b4c014961d5dbcc43c9a057a966b1d883dbddfea71ae37dc4f59" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/ekhtml.rb b/Formula/ekhtml.rb index 9e5ed8cd044e3..c2abf43984827 100644 --- a/Formula/ekhtml.rb +++ b/Formula/ekhtml.rb @@ -13,6 +13,7 @@ class Ekhtml < Formula sha256 "d606a2fe3d466a5e76f22a0736f0b485be613bad4a09575d496d9396d3a71903" => :el_capitan sha256 "450e3decaf7077d771f4a5eb43047c820867b17bffb312b039be8b1a33a81611" => :yosemite sha256 "4ae02f9ef463d52c8c0c7bccfd3f63441258a89a976f2869bf416b408fc534f3" => :mavericks + sha256 "79205418065a2c160a0d0d7ca7d2f1f93e4a476027a144f5901e6a06ed71ce4b" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/elektra.rb b/Formula/elektra.rb index 26f6f95bfcdbd..7adf388072338 100644 --- a/Formula/elektra.rb +++ b/Formula/elektra.rb @@ -9,6 +9,7 @@ class Elektra < Formula sha256 "e621021dfaf81727f50302993a94b0f06eaccfc0c4d57c6879bbb0d3d5a42368" => :catalina sha256 "761e2bc6bbda33e08a6aebe9ea36d490d05b6bf0ec6e4d1bf3d9dc92ceb72ac0" => :mojave sha256 "f53a1b4ba82ab8165ec9b265e2fe71b1cbd97b47d9ce5e2607e7fe35a3814b0e" => :high_sierra + sha256 "20539e26a296c10a387abf04ceb870cf2148aa0a404b7c6df1aaf9b669a403a7" => :x86_64_linux end depends_on "cmake" => :build @@ -22,8 +23,9 @@ def install end # Avoid references to the Homebrew shims directory + os = OS.mac? ? "mac" : "linux" inreplace Dir[prefix/"share/elektra/test_data/gen/gen/highlevel/*.check.sh"], - HOMEBREW_SHIMS_PATH/"mac/super/", "" + HOMEBREW_SHIMS_PATH/"#{os}/super/", "" bash_completion.install "scripts/completion/kdb-bash-completion" => "kdb" fish_completion.install "scripts/completion/kdb.fish" diff --git a/Formula/elfutils.rb b/Formula/elfutils.rb new file mode 100644 index 0000000000000..d72c083d20895 --- /dev/null +++ b/Formula/elfutils.rb @@ -0,0 +1,71 @@ +class Elfutils < Formula + desc "Libraries and utilities for handling ELF objects" + homepage "https://fedorahosted.org/elfutils/" + url "https://sourceware.org/elfutils/ftp/0.177/elfutils-0.177.tar.bz2" + sha256 "fa489deccbcae7d8c920f60d85906124c1989c591196d90e0fd668e3dc05042e" + + bottle do + sha256 "8297b1cab94e012e52507b9b733a53599c5d5f928aa6cbe866de9dfb3e5e5e64" => :x86_64_linux + end + + depends_on "m4" => :build + depends_on "bzip2" + depends_on :linux + depends_on "xz" + depends_on "zlib" + + conflicts_with "libelf", :because => "both install `libelf.a` library" + + fails_with :clang do + build 700 + cause "gcc with GNU99 support required" + end + + def install + system "./configure", + "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--program-prefix=elfutils-", + "--prefix=#{prefix}" + system "make" + + # Some tests in elfutils require that the package + # is built with `-g` flag which if filtered out + # by the superenv. Instead of hacking around to + # re-enable the flag for elfutils, we disable the + # tests that require it. + skip_tests = %w[ + backtrace-data + backtrace-dwarf + backtrace-native-core + backtrace-native + deleted + disasm-x86 + dwarf-die-addr-die + elfclassify + exprlocs-self + get-units-invalid + get-units-split + readelf-self + strip-g + strip-reloc + strip-strmerge + unit-info + varlocs-self + ] + skip_tests.each do |test| + file = "tests/run-#{test}.sh" + rm_f file + Pathname(file).write("exit 77", :perm => 0755) + end + + system "make", "check" + system "make", "install" + end + + test do + output = `#{bin}/elfutils-nm #{bin}/elfutils-nm` + assert_match /elf_kind/, output + end +end diff --git a/Formula/elinks.rb b/Formula/elinks.rb index 25e24683fb96b..f3c377ac9fdc6 100644 --- a/Formula/elinks.rb +++ b/Formula/elinks.rb @@ -10,6 +10,7 @@ class Elinks < Formula sha256 "67ab168d9d6d5bb65791d4c432e7e1e0109a09076039d4d6b2addec9219bef43" => :catalina sha256 "c48e70700c0ad0c4b66a376e6634417cd84c84de064bad74d384469d8f7597ab" => :mojave sha256 "219f12e44db5b6e966e2f8999fc1d5553c834b58645531f5167e6031aaa6e89b" => :high_sierra + sha256 "ab4293cfda42f97571a458390345ec93be5d45e8af56e23999aabdce777b0cb8" => :x86_64_linux end head do diff --git a/Formula/elixir.rb b/Formula/elixir.rb index cb3d0d8e5f6b7..529e0f6db5545 100644 --- a/Formula/elixir.rb +++ b/Formula/elixir.rb @@ -10,6 +10,7 @@ class Elixir < Formula sha256 "d02f86bae935461933e8dbde1052e954351d6adb39575df31b974ba97c5cb98c" => :catalina sha256 "267c46f18891050670a9c0872f155a646394ae311bf87491681540004dbba0ea" => :mojave sha256 "0d3ef8c94f9def9cb7dba9236ca215a0a6b0da34974393b771015c83bb81aed0" => :high_sierra + sha256 "5c8695ed8c01089a4cde499964b68b17065e0a27b30802c4c1465b2da956ef8c" => :x86_64_linux end depends_on "erlang" diff --git a/Formula/elm-format.rb b/Formula/elm-format.rb index 9846a0dff2e30..cebf2406dd93f 100644 --- a/Formula/elm-format.rb +++ b/Formula/elm-format.rb @@ -11,6 +11,7 @@ class ElmFormat < Formula sha256 "5a325127c11c78285bfc7c68812dc6c0425c9c3305e32312c10c39e2dc2c1ce9" => :catalina sha256 "b785f70ac7b4cb766f7d09e6263268ed2d3934331c65b6f5fde4829a530d5fa3" => :mojave sha256 "e1807b5063dd15258a1fd041bdc21faea8f598e7c0c8a3f39557e880fc22ec2c" => :high_sierra + sha256 "eceb1af0371a06125c320c914e4532fdd2eaaef8213a81d758d2554d9355dd9f" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/elm.rb b/Formula/elm.rb index fef643c7ebfb8..5d6cb227030c3 100644 --- a/Formula/elm.rb +++ b/Formula/elm.rb @@ -9,10 +9,10 @@ class Elm < Formula sha256 "aa161caca775cef1bbb04bcdeb4471d3aabcf87b6d9d9d5b0d62d3052e8250b1" bottle do - cellar :any_skip_relocation sha256 "e1bbfe4ff7deba3ed60eb55b81b86b6d3346325bea584802ca1212369f0fa0bb" => :catalina sha256 "288eeb47caccfaa9bae220492cee8de7206d40b7760e1e309a139a2398f9710d" => :mojave sha256 "7fb65ff925701c39bbc7d9a5099cd88f10a56949ae019bc8817035ed1d56edbd" => :high_sierra + sha256 "1e9cbf0cacc21654787824f241af953966ff9f6df2d8218413962ded9bbfa139" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/elvish.rb b/Formula/elvish.rb index 2a19b3948d854..86273c107e83f 100644 --- a/Formula/elvish.rb +++ b/Formula/elvish.rb @@ -11,6 +11,7 @@ class Elvish < Formula sha256 "95d0ba1cd11926f557c3fd4c1469bee75f0fd57d50f112d653a9e38bddf5acde" => :catalina sha256 "924589665ab16270187a6bb836b685df927db24d4f770557ad9413e6c6f01c23" => :mojave sha256 "0eda28eadf0e9e4bf6161ccb199eea49267e3085e6180b8b607827cdeca2bcda" => :high_sierra + sha256 "45f4362e69185bc3ef4bc42973ba6674a38f1f9b40a72d288b61d62237fb9187" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/emacs-clang-complete-async.rb b/Formula/emacs-clang-complete-async.rb index c8c5299fd531b..f0cb7deee44e5 100644 --- a/Formula/emacs-clang-complete-async.rb +++ b/Formula/emacs-clang-complete-async.rb @@ -17,6 +17,7 @@ class EmacsClangCompleteAsync < Formula sha256 "3e57ed30a99d26abf1dfe26989adfa19b258fe4c7e372eac8469566ac89be31b" => :mojave sha256 "628ef0dce4d14042267c54e8baa1c20b594c7853f23ac35c012a5a6a2f506880" => :high_sierra sha256 "3161dd4faf73ca236e5258011e2bd6229706a01dea444fbd2fa22de05070c0d1" => :sierra + sha256 "fcc133a814c53dd5c1b4dae8ed7fc51b81912b5bb41bac2ac824201ed8e56603" => :x86_64_linux end depends_on "llvm" diff --git a/Formula/emacs.rb b/Formula/emacs.rb index affc1841611dd..41e86b79c0f5c 100644 --- a/Formula/emacs.rb +++ b/Formula/emacs.rb @@ -20,6 +20,8 @@ class Emacs < Formula depends_on "texinfo" => :build end + disable! if ENV["CI"] + depends_on "pkg-config" => :build depends_on "gnutls" diff --git a/Formula/embree.rb b/Formula/embree.rb index 98fe810efc832..3a3c1f7806e24 100644 --- a/Formula/embree.rb +++ b/Formula/embree.rb @@ -17,7 +17,7 @@ class Embree < Formula depends_on "tbb" def install - max_isa = MacOS.version.requires_sse42? ? "SSE4.2" : "SSE2" + max_isa = (!OS.mac? || MacOS.version.requires_sse42?) ? "SSE4.2" : "SSE2" args = std_cmake_args + %W[ -DBUILD_TESTING=OFF diff --git a/Formula/emp.rb b/Formula/emp.rb index 4af6f0a77955e..c5f4263d7bcad 100644 --- a/Formula/emp.rb +++ b/Formula/emp.rb @@ -11,6 +11,7 @@ class Emp < Formula sha256 "d96c6b3f2ee49480ddc0dac10484284e7620dce5499482bdaf12c26f42f93a13" => :high_sierra sha256 "2a45cd98d7345ff1872137576f97a028729ff4c0d62994d1ce6d573e3835e9db" => :sierra sha256 "af64990b64d29f8383db471092279e9d039c7c81b6294099bb456890b6b5161b" => :el_capitan + sha256 "1fafb36d1f5d4ce6fe346db198f96b78ea2abb8488b3888273a666849ede6bc3" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ems-flasher.rb b/Formula/ems-flasher.rb index d2bb6ad08ad3e..e4b215671b8c3 100644 --- a/Formula/ems-flasher.rb +++ b/Formula/ems-flasher.rb @@ -12,6 +12,7 @@ class EmsFlasher < Formula sha256 "51ac3640147a25c8cf9f1177c2f3c430fa3c6a95d75022544eea825b14934593" => :sierra sha256 "2be0a155a5442879c3cfa7a804e125be814bb3d1b5c002326a33e0b84ce6024b" => :el_capitan sha256 "3f978e8b96d4c1f0464ce2d4af86ff5bac6cb60810e1b8d81ce4fe55bb2abb63" => :yosemite + sha256 "e0b86e15a3c8e88341e949b5b01cfecce5508c45eba1c494690f49aa121f4594" => :x86_64_linux end head do diff --git a/Formula/enchant.rb b/Formula/enchant.rb index 19574cf47c4da..840794e6f010b 100644 --- a/Formula/enchant.rb +++ b/Formula/enchant.rb @@ -8,6 +8,7 @@ class Enchant < Formula sha256 "d469967da67083b5cc8bc487abecda421ee2e325b96e39fde1c7e8679c58b0c7" => :catalina sha256 "ec8877a36d41989ae3bd3c532908017c4f4b959956777c6098bcd5e305d22b51" => :mojave sha256 "b2fb985de774158cad73461be089bf6734bc096f0060c7b6cb2eed2016ed273b" => :high_sierra + sha256 "9c9c78c046eb039a77c8b21da3ae2098c1b76884fbac94496e01cd27b867b326" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/enet.rb b/Formula/enet.rb index dc1ccf4284ab8..5eeff8acf64a2 100644 --- a/Formula/enet.rb +++ b/Formula/enet.rb @@ -9,6 +9,7 @@ class Enet < Formula sha256 "7188260137953334ee61ed7eb2252d813e3cb7d86985d0d18ed3e1ce84bc965f" => :catalina sha256 "34bc8c1bbc9d71e2af3ec8f65dd24d681ad70be68f67534bba9a40f6e68bf21e" => :mojave sha256 "95634a66c99f7cb4f2b4a402017fee5f2ab1f6cb36f2fe75725c44c36908bf1b" => :high_sierra + sha256 "da28e265105bb1320a50618cef9277bd1bd913204fd8a4b6f9b051e23be8a2cb" => :x86_64_linux end def install diff --git a/Formula/enigma.rb b/Formula/enigma.rb index 2ce1b16e87efa..8a42bf8e40387 100644 --- a/Formula/enigma.rb +++ b/Formula/enigma.rb @@ -11,6 +11,7 @@ class Enigma < Formula sha256 "8011aae1fa4e166dd9fb406844b1efcb246eb26ecc4e29c67dec71a3f8a7b231" => :mojave sha256 "9eeb7a516f7188b38bc1a9e9ea2450db22391e65401d1377028881c11acbcc15" => :high_sierra sha256 "cdca7a198f3decfc3d387d590f84a7c3125adb06185469afa737eb5d61c150b3" => :sierra + sha256 "5527fa5fdc8da6a0e8a14ad5bf48e5d7764d46b9fb63567c1b043815221e951e" => :x86_64_linux end head do diff --git a/Formula/enscript.rb b/Formula/enscript.rb index 10e16bee540a2..0c8bd92534efc 100644 --- a/Formula/enscript.rb +++ b/Formula/enscript.rb @@ -12,6 +12,7 @@ class Enscript < Formula sha256 "a8bbba8f7d64eed40dd59a9db980b049ec786e148d31a0aeb92556959b4ad0b0" => :mojave sha256 "00045dff3bdf7ac98a19236838d7af7101cc1fc002e55550312042bb2e4d7426" => :high_sierra sha256 "c14fad6cfd67fa782beb7a425eb03c3ed0b8090ed751c37f5f5ec426808df25c" => :sierra + sha256 "f0446241cc1d01788286f4e310935bb4b52e88ff728d84bc0d84aa5735410bd3" => :x86_64_linux end depends_on "gettext" diff --git a/Formula/ensmallen.rb b/Formula/ensmallen.rb index 285e276f90dc1..b5ebbfb860ab8 100644 --- a/Formula/ensmallen.rb +++ b/Formula/ensmallen.rb @@ -9,6 +9,7 @@ class Ensmallen < Formula sha256 "13f0abb19e1a1fa352d5de61de0467a9460c3c4d6e0eda0681bdb38eedd2aa7c" => :catalina sha256 "13f0abb19e1a1fa352d5de61de0467a9460c3c4d6e0eda0681bdb38eedd2aa7c" => :mojave sha256 "13f0abb19e1a1fa352d5de61de0467a9460c3c4d6e0eda0681bdb38eedd2aa7c" => :high_sierra + sha256 "77a226b9b233a823bc5d4f8dca94c7517ff5ca7e0d94c5b5947a5a276be8b1bd" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ent.rb b/Formula/ent.rb index b85d74c91b30e..6a25a6cf1f4e8 100644 --- a/Formula/ent.rb +++ b/Formula/ent.rb @@ -14,6 +14,7 @@ class Ent < Formula sha256 "f5244a065b7aafe3ba60077de0072e9b5d231a7fd1eb348cd7f6583a69a08ad3" => :el_capitan sha256 "072e3e71ee3b6813dafb15e53e8b474c1d15f26865b9cd05652e46c220e3926d" => :yosemite sha256 "cb4bd5766cdb804092f73a908921e034da352b890fdc34f5cc1f0d56a27d3c3a" => :mavericks + sha256 "421d447a11fbeeb4d73be9117dd2dcfa5be8f4b5cfd1251fb0d8d6e5dc621d58" => :x86_64_linux end def install diff --git a/Formula/entityx.rb b/Formula/entityx.rb index e31d5315dc269..347d1a64f27bc 100644 --- a/Formula/entityx.rb +++ b/Formula/entityx.rb @@ -10,6 +10,7 @@ class Entityx < Formula sha256 "5d2b3d80d9be39b08b61003fe0f8c30bf8aec792636b78e475fbbbb55d3e01a7" => :mojave sha256 "b015609cd7e4ad7154e846a34e91627a605983ab3e3f1767df5ccf7e46cc9d10" => :high_sierra sha256 "d0ecde656ac88f1f312d69894a32330827cd52ac64a7e20d1357a0a9bbe8d596" => :sierra + sha256 "be45260984e492cd4f3fa0e0a7e3ab576e574ef210c47cb518745e885bc7d8c4" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/entr.rb b/Formula/entr.rb index 93cb8e0ad77d5..d4df5f8ba94cc 100644 --- a/Formula/entr.rb +++ b/Formula/entr.rb @@ -10,6 +10,7 @@ class Entr < Formula sha256 "2b4d9fac8d479903227ae181d1d1d7e403d7a6ebef7848be4365ad80e8e7e380" => :catalina sha256 "b83f3bd4f30ebcd65d22516f04ad7aec3260c75151488cc6b3ae15829872d3ec" => :mojave sha256 "a08481646a0439de7643b26c41d100adc099ba573aabb8ca45723ce9fbfa97e2" => :high_sierra + sha256 "8b29a8205ae06ff6b3e4cd262347c9c089f684b68e360c3743119813b9f8aad7" => :x86_64_linux end def install diff --git a/Formula/envchain.rb b/Formula/envchain.rb index e948571297465..72198246cfa03 100644 --- a/Formula/envchain.rb +++ b/Formula/envchain.rb @@ -14,6 +14,7 @@ class Envchain < Formula sha256 "4e34971c35ec6a716995a5e8d491970809bb5ce6c5651676f70d757b4044c834" => :el_capitan sha256 "1de7c8c17e489b1f832078d3e5c403133accd187f2e666b44bb4da5d1d74f9f7" => :yosemite sha256 "97f5160a1a9ec028afbaf25416de61f976ef7d74031a55c0f265d158627d4afd" => :mavericks + sha256 "f24f674a86e50307c6b42796f5850925c193fe8e7aaaa1219061f747397ed7a6" => :x86_64_linux end on_linux do diff --git a/Formula/envconsul.rb b/Formula/envconsul.rb index 3e9188ca73e3c..5cecae864dcc4 100644 --- a/Formula/envconsul.rb +++ b/Formula/envconsul.rb @@ -10,6 +10,7 @@ class Envconsul < Formula sha256 "54aca2b7ad236dfadfe9b2c8db6df755ba16de8c458f74dd71e994f6aab976ca" => :catalina sha256 "a27ce0e1775134b40891dc746ff36c2f046a96e3ab57a6aed20f805ba7d88db2" => :mojave sha256 "f92ba9326c7ac451e91b35bc692ffb461691ade89df336afb1ef1931d4de644f" => :high_sierra + sha256 "8d4c66734fdd1a925f1f4f8d1b442beee74ba6983ef500520a12ad73cd7d8441" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/envv.rb b/Formula/envv.rb index 1fa72228e9c43..35582a7fcbf5d 100644 --- a/Formula/envv.rb +++ b/Formula/envv.rb @@ -13,6 +13,7 @@ class Envv < Formula sha256 "3b2fb0b35749280461b3982797ceea34bfa42d63cb5c6547986cf106669ee744" => :el_capitan sha256 "90a718606ec61e5a0e494d3e41b7d87048de803567f4ba2c65231fe41880bd97" => :yosemite sha256 "9ac7617d6475a67c60604fcd72d0ae1a5515df331944e8fb2c2a9223c16e3504" => :mavericks + sha256 "a0a41dd85fcad3f2f279709f1c68436744f87801a7ded771c775c3032a56cc96" => :x86_64_linux end def install diff --git a/Formula/eot-utils.rb b/Formula/eot-utils.rb index 34d297a6b5c35..de4f144c6270d 100644 --- a/Formula/eot-utils.rb +++ b/Formula/eot-utils.rb @@ -13,6 +13,7 @@ class EotUtils < Formula sha256 "b2a4e0f385fa861baf54ac3c483f5599bc96994b3797fe00430653f1a5c28ba4" => :el_capitan sha256 "3276e755d84fda54851733b693e56922ddb597f1ac4f14792f4221ce794832da" => :yosemite sha256 "d22988bd2c4ba4bb945a80d997fb06532579a09a3bc0c8be86c832f7bbc57a42" => :mavericks + sha256 "b5b6c465872f4fc93b590a8b06db5b964d8d8549d78ac79ab13918dee2245efd" => :x86_64_linux end resource "eot" do diff --git a/Formula/ephemeralpg.rb b/Formula/ephemeralpg.rb index 4e90a296c375c..c8c3c34ee8df4 100644 --- a/Formula/ephemeralpg.rb +++ b/Formula/ephemeralpg.rb @@ -9,6 +9,7 @@ class Ephemeralpg < Formula sha256 "c57037299f11da6b4560707c9380bfdbb8708f379bf8fccae6bf0069d4dedd8a" => :catalina sha256 "61a09eb4b62f4fd794ceb1af70f21198840598cd859a40c59c0be8799132ff86" => :mojave sha256 "6889ddcf36023c982fe421ea8660445b416989968cc9a64b0a5156dd9f01cdfe" => :high_sierra + sha256 "1fd5173fb46fc849c899d39f444759c461bb43feb2ebb5c18a707f02b8eb3700" => :x86_64_linux end depends_on "postgresql" diff --git a/Formula/eprover.rb b/Formula/eprover.rb index 6daeb50ba370d..9052c7f211d3d 100644 --- a/Formula/eprover.rb +++ b/Formula/eprover.rb @@ -9,6 +9,7 @@ class Eprover < Formula sha256 "fc6c6e87ee95f0cfd0f0f0a838fd40bf2f9613f7e78b1a5c9f0b33bc7ca7b094" => :catalina sha256 "fd14ba20a1ed8799a668e6f521ddbd8c1fac8ff43ac1f14bb6c9346ee7980cf3" => :mojave sha256 "5db8b8088c46bde8355a4742572d63db7ccea5885b37c401e05579762271559f" => :high_sierra + sha256 "a81fe5fd66d9bbf5a78c6d3e0de63e85cfc3cd2f05665d00f0306966b1e5bf22" => :x86_64_linux end def install diff --git a/Formula/epsilon.rb b/Formula/epsilon.rb index be90cfeb897ae..9db11d02cb4f9 100644 --- a/Formula/epsilon.rb +++ b/Formula/epsilon.rb @@ -13,6 +13,7 @@ class Epsilon < Formula sha256 "10da057d558d4d9df8c503135b53f7c23778258f7c66d3b39229bf70d9a887f1" => :el_capitan sha256 "2811209670e68ab4316e6d177bc1376cb28462cad9b696b4a782deff4074a9ce" => :yosemite sha256 "606cb80be8eebf2df61c726ac3e1d91abda3bc49d3c73ca5d07f85b59734069e" => :mavericks + sha256 "62ec89adcb2f2b7f2d40d0b8a0bdf333d9e887cb6b2716d2653d6d38a281f874" => :x86_64_linux end depends_on "popt" diff --git a/Formula/epstool.rb b/Formula/epstool.rb index 97421fc058f3c..e46559aaa012d 100644 --- a/Formula/epstool.rb +++ b/Formula/epstool.rb @@ -10,11 +10,14 @@ class Epstool < Formula sha256 "3ef026d6cc575da86e43741df6a9f5419269bea22e8db6c6296811112678c690" => :catalina sha256 "497608077aea90c569aab7929a8a9ea19d91ba70f4743d982bcb63c1d3a48d7b" => :mojave sha256 "47ab226f0e5d93a3b91b43d519de370d046410946e280958ef9106fdbc4ef115" => :high_sierra + sha256 "2cfb5dcc505aedf5e1882bd9f0307b772d5d6eb1033856709470bf81c201372c" => :x86_64_linux end depends_on "ghostscript" + fails_with :gcc => "4.8" def install + ENV.deparallelize system "make", "install", "EPSTOOL_ROOT=#{prefix}", "EPSTOOL_MANDIR=#{man}", diff --git a/Formula/erlang.rb b/Formula/erlang.rb index 655746492535e..e533ea810a9d3 100644 --- a/Formula/erlang.rb +++ b/Formula/erlang.rb @@ -11,6 +11,7 @@ class Erlang < Formula sha256 "26f1fc19d139fe6d54e748abea071c2283b6262bb3583a0855d225bdfdb9f74b" => :catalina sha256 "64da31473e7668d3742cdbcf4ef815955665708a74d27e7b64f697a3f0f5f62b" => :mojave sha256 "644de29d8c3b4739a2bf1cf01b3c3042cbc3b8434fcaab869ecfdf9cdef1dc59" => :high_sierra + sha256 "7541471e9059fc79fc3dfa6e4126304fd522c3709a249b93a87de4869600eb36" => :x86_64_linux end depends_on "autoconf" => :build @@ -54,11 +55,13 @@ def install --enable-wx --with-ssl=#{Formula["openssl@1.1"].opt_prefix} --without-javac - --enable-darwin-64bit ] - args << "--enable-kernel-poll" if MacOS.version > :el_capitan - args << "--with-dynamic-trace=dtrace" if MacOS::CLT.installed? + if OS.mac? + args << "--enable-darwin-64bit" + args << "--enable-kernel-poll" if MacOS.version > :el_capitan + args << "--with-dynamic-trace=dtrace" if MacOS::CLT.installed? + end system "./configure", *args system "make" diff --git a/Formula/erlang@20.rb b/Formula/erlang@20.rb index 0bef0ed4d4e2d..7738aebd33ff2 100644 --- a/Formula/erlang@20.rb +++ b/Formula/erlang@20.rb @@ -10,6 +10,7 @@ class ErlangAT20 < Formula sha256 "130019a8e459654a92e7267b60932867c8c27957d5bd5b791e358407e6d2755b" => :catalina sha256 "5e1003bf97321f4cf5cd57b062b752c2d92bcbb457ab5e992309790b7827fd1f" => :mojave sha256 "a401feb22927ecc0e649f3f2f7aeba331725b6390985f826ed5639d59732ee6a" => :high_sierra + sha256 "97ecb6ce73d469360e859be66f428b9aacba41403fb8e3214bf6a031d694f96e" => :x86_64_linux end keg_only :versioned_formula @@ -18,7 +19,7 @@ class ErlangAT20 < Formula depends_on "automake" => :build depends_on "libtool" => :build depends_on "openssl@1.1" - depends_on "wxmac" + depends_on "wxmac" # for GUI apps like observer uses_from_macos "m4" => :build @@ -52,7 +53,6 @@ def install --prefix=#{prefix} --enable-dynamic-ssl-lib --enable-hipe - --enable-kernel-poll --enable-sctp --enable-shared-zlib --enable-smp-support @@ -60,10 +60,13 @@ def install --enable-wx --with-ssl=#{Formula["openssl@1.1"].opt_prefix} --without-javac - --enable-darwin-64bit ] - args << "--with-dynamic-trace=dtrace" if MacOS::CLT.installed? + if OS.mac? + args << "--enable-darwin-64bit" + args << "--enable-kernel-poll" if MacOS.version > :el_capitan + args << "--with-dynamic-trace=dtrace" if MacOS::CLT.installed? + end system "./configure", *args system "make" diff --git a/Formula/erlang@21.rb b/Formula/erlang@21.rb index 3034f98f7e668..164d13d2a18f3 100644 --- a/Formula/erlang@21.rb +++ b/Formula/erlang@21.rb @@ -10,6 +10,7 @@ class ErlangAT21 < Formula sha256 "b0ac96279d0751a92970e88d1fc8df0f377c26286b368777768d5e2cb9a92a02" => :catalina sha256 "adef740e560aa08ae90dd1ae229dbfbe442af68257331d3e2b705fe2b7f44a7b" => :mojave sha256 "147640e3bfc26b99b9f29d53a7ce46827fec0d5bbe27fa958e35d54d0a12194d" => :high_sierra + sha256 "9b05959822ee44b5b58648b8f6a7b417657ed380efd2861e3227e6cb8e6b34bf" => :x86_64_linux end keg_only :versioned_formula @@ -65,11 +66,13 @@ def install --enable-wx --with-ssl=#{Formula["openssl@1.1"].opt_prefix} --without-javac - --enable-darwin-64bit ] - args << "--enable-kernel-poll" if MacOS.version > :el_capitan - args << "--with-dynamic-trace=dtrace" if MacOS::CLT.installed? + if OS.mac? + args << "--enable-darwin-64bit" + args << "--enable-kernel-poll" if MacOS.version > :el_capitan + args << "--with-dynamic-trace=dtrace" if MacOS::CLT.installed? + end system "./configure", *args system "make" diff --git a/Formula/erlang@22.rb b/Formula/erlang@22.rb index 6235cba915f98..503b6e28cf8c0 100644 --- a/Formula/erlang@22.rb +++ b/Formula/erlang@22.rb @@ -55,11 +55,13 @@ def install --enable-wx --with-ssl=#{Formula["openssl@1.1"].opt_prefix} --without-javac - --enable-darwin-64bit ] - args << "--enable-kernel-poll" if MacOS.version > :el_capitan - args << "--with-dynamic-trace=dtrace" if MacOS::CLT.installed? + if OS.mac? + args << "--enable-darwin-64bit" + args << "--enable-kernel-poll" if MacOS.version > :el_capitan + args << "--with-dynamic-trace=dtrace" if MacOS::CLT.installed? + end system "./configure", *args system "make" diff --git a/Formula/es.rb b/Formula/es.rb index 190bda360a7a9..2ee03796ce84f 100644 --- a/Formula/es.rb +++ b/Formula/es.rb @@ -14,6 +14,7 @@ class Es < Formula sha256 "53f0c0654ddecc62b99135fb96722b6467593248d884c1506ea93681367c611d" => :el_capitan sha256 "bceadf8a0ef4d3231d149f30cc53d2c7fe686cd8fdd0dafe83ceaabc35151d5e" => :yosemite sha256 "14f203383d01f581bdb63e7240ff57d1174553467314351d49ea41d3052148f9" => :mavericks + sha256 "47eb9c54542fdc1f05144632e4d0cb93a50d8ddea973d452b98ad4de527b2d25" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/eslint.rb b/Formula/eslint.rb index 35deb10e35851..84739b86116b8 100644 --- a/Formula/eslint.rb +++ b/Formula/eslint.rb @@ -11,6 +11,7 @@ class Eslint < Formula sha256 "bfc5722e476c25133342dcf5dd32db3446f76abf2218b1ecfb9451aa81a130f2" => :catalina sha256 "80ad8022413a2283c06d986ec73ba60c1b6fa8cc59735ea8b3a05226922a83e6" => :mojave sha256 "f0d2132b186ab9255a67a47fc2c5f6ba116f680210313f5356aea6c3a91827aa" => :high_sierra + sha256 "addefe5d2d21bcc56d8a0ca49a5c250f2b7a9eb33724d5cd41509a2bff82333e" => :x86_64_linux end depends_on "node" diff --git a/Formula/esptool.rb b/Formula/esptool.rb index 5a90b7a34dbdd..547aa962893b4 100644 --- a/Formula/esptool.rb +++ b/Formula/esptool.rb @@ -5,13 +5,14 @@ class Esptool < Formula homepage "https://github.com/espressif/esptool" url "https://github.com/espressif/esptool/archive/v2.8.tar.gz" sha256 "f6187ab0467e05bff6ef4e777bde5ee8eb57a74154865d30491ebb42b228c617" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "76e3c103172aca7021c785f9cfa3c5832353b439b7d1fa16db134f529c3ae331" => :catalina sha256 "00903c838ed3185dad44f25793111f1298824df11ba5864820e3c7224f7080f4" => :mojave sha256 "48cbb59cf7b2af574997ee6c9afe9d0c4dab75617179f66cce07030059941d4d" => :high_sierra + sha256 "f432059434b715df570c1b7fe4cc0ea9d9bfbefa7e19c3e5078e6886b734b9e1" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/etcd.rb b/Formula/etcd.rb index 4772464c8df7d..264fa86dcf31a 100644 --- a/Formula/etcd.rb +++ b/Formula/etcd.rb @@ -11,6 +11,7 @@ class Etcd < Formula sha256 "603a74caf79959bbd42d482f81822a83eee9a7fa4a1614c989515649972d7743" => :catalina sha256 "d6d3304e5f3259a8299cbf79c369b86afe8a369ec293221611811dc716c4bca0" => :mojave sha256 "cf18cb41e9ee41ec20d5598a14756d231a2013c447b5406d1995e31d18137742" => :high_sierra + sha256 "00c1650996721bddc91df20f1cdcb44d69905070412d5e4495c34ae8c2336381" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ethereum.rb b/Formula/ethereum.rb index a2eca85225359..4935377dccfa5 100644 --- a/Formula/ethereum.rb +++ b/Formula/ethereum.rb @@ -10,11 +10,13 @@ class Ethereum < Formula sha256 "2f1d5e71008da3e3b306ea1fa8ff7c17d755ae2b070f2739e84c9e1fffb31539" => :catalina sha256 "5d8d5010770b8955b93ee47085b0f7a6167431d26d34c7b95b8d5110742f1c57" => :mojave sha256 "74dcb4d34eb330406b425af319598f3066f19ee3af7cece2b809459cc70d5e36" => :high_sierra + sha256 "1d27c3678faf3bd9ab6a6cf450f5b55400bd49eb83e2e9254516c19a5afb2cce" => :x86_64_linux end depends_on "go" => :build def install + ENV.O0 unless OS.mac? # See https://github.com/golang/go/issues/26487 system "make", "all" bin.install Dir["build/bin/*"] end diff --git a/Formula/etl.rb b/Formula/etl.rb index fcf1c27701736..4ef4856cb08ee 100644 --- a/Formula/etl.rb +++ b/Formula/etl.rb @@ -10,6 +10,7 @@ class Etl < Formula sha256 "b775dfeb3634c3b4ff3828239250394328b5c971e472cb775a0590d94bcdc6f8" => :mojave sha256 "b775dfeb3634c3b4ff3828239250394328b5c971e472cb775a0590d94bcdc6f8" => :high_sierra sha256 "507d4f4b35d0e075869446600e36e0f9f382014e99bf16a07d77f2c256cbc594" => :sierra + sha256 "33e312b94923dd3f375fa0135f250773c4dcc004e1a569a434d4e2fd5170bb3e" => :x86_64_linux end def install diff --git a/Formula/euler-py.rb b/Formula/euler-py.rb index c4400d45ebc67..b54fc7826aba1 100644 --- a/Formula/euler-py.rb +++ b/Formula/euler-py.rb @@ -10,6 +10,7 @@ class EulerPy < Formula sha256 "e6bdba6e4de38fad5949439b3699fd81784f51c6e7ef211697e04c805e9a1264" => :catalina sha256 "e6bdba6e4de38fad5949439b3699fd81784f51c6e7ef211697e04c805e9a1264" => :mojave sha256 "e6bdba6e4de38fad5949439b3699fd81784f51c6e7ef211697e04c805e9a1264" => :high_sierra + sha256 "b1cca05cf81de6f3dd99eebe981c14638a6ad97e15d6c9b673e009b40a35355c" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/eureka.rb b/Formula/eureka.rb index a9db4c5a76b11..15482c548ef7e 100644 --- a/Formula/eureka.rb +++ b/Formula/eureka.rb @@ -10,6 +10,7 @@ class Eureka < Formula sha256 "78923a432ed0b00a266aba6680ad1b1c948e7c31a74b32babad1ffe45bc7dc20" => :catalina sha256 "88b2371865f81cf092a3ab85c757bba880a3e3aef9c379ef880972fb75f80d93" => :mojave sha256 "ef7f1bde80157ad17a9a789028bd0b0fee6e62f93f66b545a15c8bd753a58767" => :high_sierra + sha256 "0b8830ebb9cf3815d340ea455923e529c176166395016c7841467ff5a9bd8366" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/eva.rb b/Formula/eva.rb index 2210c09db5a24..0d6f1cea637d3 100644 --- a/Formula/eva.rb +++ b/Formula/eva.rb @@ -10,6 +10,7 @@ class Eva < Formula sha256 "351a6e7946aa8597d3c321b47aec89d487f49261146dc1f04cdaadb380f5021a" => :catalina sha256 "efed876746895ddcf247f4c90d7b90f1333129d8cc8f789789555045047e1260" => :mojave sha256 "706a6ad7ac61b8e8e1247fe1b52ead8c6c5b7b76fe750148a6a38904f3a4ef23" => :high_sierra + sha256 "29d6536630c6698e13f646b858b852be6941b20c510754f25077cfb1285720ef" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/eventlog.rb b/Formula/eventlog.rb index 66801a18703ac..e23cbc93fd2fc 100644 --- a/Formula/eventlog.rb +++ b/Formula/eventlog.rb @@ -14,6 +14,7 @@ class Eventlog < Formula sha256 "9073fb11ae9c20375295c36b5bb6845639ea1f9c17a677c1d93ff206075ff871" => :el_capitan sha256 "2bdc1f762ea05e79f486e7e78b8a173ea99a5a76b4bedd28a03a1c8912f39925" => :yosemite sha256 "9d747019f60dfa8fc13472815c18c20c46c2cb2cd53dd754a99e8029afb85cbf" => :mavericks + sha256 "dafbd7123de97b0a29ca89c6e965a2123664ec34851c815b8bd1a616397dc525" => :x86_64_linux end def install diff --git a/Formula/exa.rb b/Formula/exa.rb index c89d6de5ab99d..be99fca5ece3d 100644 --- a/Formula/exa.rb +++ b/Formula/exa.rb @@ -11,6 +11,7 @@ class Exa < Formula sha256 "bc80009ad845d914c08e6de1c39c97e0f4f180ef4f077b3ef1957cab519d6743" => :mojave sha256 "7382b758899c756f94c4c99440f71075945d333e302e53139e423fb1798c852e" => :high_sierra sha256 "9499359da5f5fffbd8b22c8cb8e78f0fdf99594c4d2b06e7ba58eb21afbcb582" => :sierra + sha256 "1c80107383679c8bfd048b196cc27683ec1a3628d13d98d17397e752bfce5d80" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/exempi.rb b/Formula/exempi.rb index 1e70b2546b5ab..79a9a8b767340 100644 --- a/Formula/exempi.rb +++ b/Formula/exempi.rb @@ -9,6 +9,7 @@ class Exempi < Formula sha256 "3ef58fd5cbd177ac785cfab9b58f813ce24320a507243d9d7b6c940fd463564f" => :catalina sha256 "189bb3c57e78845c33678353cb877ad7cdedd665087c0a4525397f32088abc39" => :mojave sha256 "0843f9bc589fd3c9ed0f5dfd724ba60eea4832410a0b6ff831bdb22c6563eafd" => :high_sierra + sha256 "178e85b9647be2f5a484c03075c98982a0a3695fab4486f0d1f08750cd406c8c" => :x86_64_linux end depends_on "boost" diff --git a/Formula/exercism.rb b/Formula/exercism.rb index 01cd7ff46f297..91e231e22a4ee 100644 --- a/Formula/exercism.rb +++ b/Formula/exercism.rb @@ -11,6 +11,7 @@ class Exercism < Formula sha256 "9a4080f7e35f37dc4eb15e733692314cec32cba7e0f76e8f58eb99850f708cb1" => :catalina sha256 "7319920cfd6779984dfabbecdf3e15a37603f6bfbecfc1121bfa2a044fb8ed17" => :mojave sha256 "b094a8441575b02f312f04760589f94d9f2b1d76330c07a67f7d07a40ad561a9" => :high_sierra + sha256 "8ff44fc535ac7f7ab9acc6e52aafbeac8f159d4e5e3a53823324048af3daa33b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/exif.rb b/Formula/exif.rb index cdf63d4c73e4b..f72a3727b28d1 100644 --- a/Formula/exif.rb +++ b/Formula/exif.rb @@ -3,12 +3,14 @@ class Exif < Formula homepage "https://libexif.sourceforge.io/" url "https://github.com/libexif/exif/releases/download/exif-0_6_22-release/exif-0.6.22.tar.xz" sha256 "0fe268736e0ca0538d4af941022761a438854a64c8024a4175e57bf0418117b9" + revision 1 unless OS.mac? bottle do cellar :any sha256 "3d4f3d7c86e7c112f9164970cb5e283a96d82235c1633f15de6683b04ec7df87" => :catalina sha256 "a600fdec30f561aaf97184c57ef77697cb617dd19795cb89201f9851646e9fad" => :mojave sha256 "f8978e60a9eedc21fe0da30fa0a6bf900635635a5b1fa827473881b25c12d542" => :high_sierra + sha256 "8438f2222826401362f27847816d58636ee07b0e3374847f12407ee28a3ed7f3" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/exiftags.rb b/Formula/exiftags.rb index 7cf057f0f78b9..665eac87add31 100644 --- a/Formula/exiftags.rb +++ b/Formula/exiftags.rb @@ -13,6 +13,7 @@ class Exiftags < Formula sha256 "47d75e83f89d0db4a54d779d9c9820fbb788c102738824e86b83a441d9a60af8" => :el_capitan sha256 "23a94f2c2694d52ef393e751e23a01c4ed23c0ca7004b6597546047310e73f53" => :yosemite sha256 "2ca339b45b3ea518ca5b39262b4c68cc54187a2bfca7d7a52eded5685c81b3c9" => :mavericks + sha256 "6d68e876ce5bcc06fb0f58b639e4d340127e126bc4cd49a324985122e6f4e9c8" => :x86_64_linux end def install diff --git a/Formula/exiftool.rb b/Formula/exiftool.rb index 9719f50f11f61..50fd24ea4ac1d 100644 --- a/Formula/exiftool.rb +++ b/Formula/exiftool.rb @@ -11,6 +11,7 @@ class Exiftool < Formula sha256 "d0d05e8e55257a5132ffbc91bc4789d2828912f8df54ebbfbbe120d9c808d0c9" => :catalina sha256 "d0d05e8e55257a5132ffbc91bc4789d2828912f8df54ebbfbbe120d9c808d0c9" => :mojave sha256 "5c2ce26400d6ac9b6b678dfeb845dda3654d8a35be01c1270d8a0216bcb3dd56" => :high_sierra + sha256 "b457a0d161b0e76848da576c624bfb2cdc4d81b1a68be05338033083a4259584" => :x86_64_linux end def install @@ -22,7 +23,7 @@ def install libexec.install "lib" bin.install "exiftool" doc.install Dir["html/*"] - man1.install "blib/man1/exiftool.1" + man1.install "blib/man1/exiftool.1#{OS.mac? ? "" : "p"}" man3.install Dir["blib/man3/*"] end diff --git a/Formula/exiv2.rb b/Formula/exiv2.rb index c357405a6be40..ec54cfa1b3e55 100644 --- a/Formula/exiv2.rb +++ b/Formula/exiv2.rb @@ -11,6 +11,7 @@ class Exiv2 < Formula sha256 "3b78b8fbffcc6d62685bc4a9a0a51855f5ccf6fe7fabc866f0970e1a12ced0b4" => :mojave sha256 "8a4e65d47307247b11127c00cdad18626425eafb271faaeb1c076beb57298e12" => :high_sierra sha256 "fe386bc9bfe7270655a6b3163f8e33a6fc6e6f36512e6ac6e6a49a1650a6a485" => :sierra + sha256 "e834faba285e924231a879189df53310f5d1c2c321207b84e525561f451ab022" => :x86_64_linux end depends_on "cmake" => :build @@ -23,6 +24,7 @@ class Exiv2 < Formula def install args = std_cmake_args + so = OS.mac? ? "dylib" : "so" args += %W[ -DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_VIDEO=ON @@ -35,7 +37,7 @@ def install -DEXIV2_ENABLE_CURL=ON -DEXIV2_ENABLE_SSH=ON -DEXIV2_BUILD_SAMPLES=OFF - -DSSH_LIBRARY=#{Formula["libssh"].opt_lib}/libssh.dylib + -DSSH_LIBRARY=#{Formula["libssh"].opt_lib}/libssh.#{so} -DSSH_INCLUDE_DIR=#{Formula["libssh"].opt_include} .. ] diff --git a/Formula/exomizer.rb b/Formula/exomizer.rb index 3e4bdab2e6207..b50612e2c09b9 100644 --- a/Formula/exomizer.rb +++ b/Formula/exomizer.rb @@ -10,6 +10,7 @@ class Exomizer < Formula sha256 "653ce86b30882fae1deae16bbf40b50f9b46b7f4f3f51e1952a988121e4fd5dc" => :mojave sha256 "46b2f9b190847344ab7a16c94eb4b2bad48009a8f08e5463427af75c9eb67409" => :high_sierra sha256 "6c6389b18ce3be2c7ffdb919e79273ecc8e26b9067bd06b29474d37c9e162e83" => :sierra + sha256 "b4b63981c014d8978621e8125dd54efd3f8435a92fa8b7a654d28e24a012793e" => :x86_64_linux end def install diff --git a/Formula/expat.rb b/Formula/expat.rb index 472e3e47c93a4..e18bc0ddbfe54 100644 --- a/Formula/expat.rb +++ b/Formula/expat.rb @@ -9,6 +9,7 @@ class Expat < Formula sha256 "202ebb6d7a1eb01066263128fe34ebbbc806e5ee35b283510fa1074b674c3739" => :catalina sha256 "7440c3d35a2bd7d27bb6364a5d8c2f206509d6ebe09bd507039b701c133bb45d" => :mojave sha256 "5c51e4a42af80a11bf3f2c697a36aedc6df21b03bed3b51c3127472660b042b3" => :high_sierra + sha256 "5d0281695b1febb80cb2dc3c64d61e586ebe1870202d4f763650ab127d2b9f01" => :x86_64_linux end head do @@ -21,11 +22,15 @@ class Expat < Formula keg_only :provided_by_macos + # On Ubuntu 14, fix the error: You do not have support for any sources of high quality entropy + depends_on "libbsd" unless OS.mac? + def install cd "expat" if build.head? system "autoreconf", "-fiv" if build.head? args = ["--prefix=#{prefix}", "--mandir=#{man}"] args << "--with-docbook" if build.head? + args << "--with-libbsd" unless OS.mac? system "./configure", *args system "make", "install" end diff --git a/Formula/expect.rb b/Formula/expect.rb index 78ddf0c36999f..1f28127ee99ae 100644 --- a/Formula/expect.rb +++ b/Formula/expect.rb @@ -3,6 +3,7 @@ class Expect < Formula homepage "https://expect.sourceforge.io/" url "https://downloads.sourceforge.net/project/expect/Expect/5.45.4/expect5.45.4.tar.gz" sha256 "49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34" + revision 1 unless OS.mac? bottle do rebuild 1 @@ -11,6 +12,7 @@ class Expect < Formula sha256 "a0c6ffe797dc0bbe512b628819acee67a7a9b00573b6433fe0672285d41a9df1" => :high_sierra sha256 "fc9ad781caaf8d45f47a87d4303645faa2e600852c73fd5432f0be2e588e95f2" => :sierra sha256 "4fcb163b1b1e7e209b632c43ba03106ca1c4e4d6a745260b813d28a803581e58" => :el_capitan + sha256 "4a1ea3e8596eb22117974c366094466eeef973e6d2a55e13fa50ace7af19830b" => :x86_64_linux end # Autotools are introduced here to regenerate configure script. Remove @@ -18,6 +20,7 @@ class Expect < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build + uses_from_macos "tcl-tk" def install @@ -27,11 +30,15 @@ def install --mandir=#{man} --enable-shared --enable-64bit - --with-tcl=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework ] - ENV.prepend "CFLAGS", - "-I#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework/Versions/8.5/Headers/tcl-private" + if OS.mac? + args << "--with-tcl=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework" + ENV.prepend "CFLAGS", + "-I#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework/Versions/8.5/Headers/tcl-private" + else + args << "--with-tcl=#{Formula["tcl-tk"].opt_lib}" + end # Regenerate configure script. Remove after patch applied in newer # releases. diff --git a/Formula/eye-d3.rb b/Formula/eye-d3.rb index 32ef67d77d89a..fa8eac8d4e55a 100644 --- a/Formula/eye-d3.rb +++ b/Formula/eye-d3.rb @@ -5,13 +5,14 @@ class EyeD3 < Formula homepage "https://eyed3.nicfit.net/" url "https://eyed3.nicfit.net/releases/eyeD3-0.9.5.tar.gz" sha256 "faf5806197f2093e82c2830d41f2378f07b3a9da07a16fafb14fc6fbdebac50a" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any_skip_relocation sha256 "e6e2679d03c1f68674d39a5ba1b590432f1a8e7ea5660b8c40c7da18bc3d6621" => :catalina sha256 "d5c1f8bf92732fc14a16b94ae62f97dda8ee5b74251842a12f85be97712a0463" => :mojave sha256 "643842f3f4a5d4f2598765ad8b4ec44180ecd530d9f91f606c9dc182ca264116" => :high_sierra + sha256 "7ecc7c75556c2ec7a4aa113a3275a1a3fbc7ac4c9e92d14522ff2996ed865ab0" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/faac.rb b/Formula/faac.rb index f02d8a7aae268..c14de97301c72 100644 --- a/Formula/faac.rb +++ b/Formula/faac.rb @@ -11,6 +11,7 @@ class Faac < Formula sha256 "73e02bf58df497bf2c35e8374c000fc8ed989c167b559b9efe2f5874687fe849" => :high_sierra sha256 "9ed007e0aaeaddb47d284a81f2783c6ddcf9af86e0ed1da1a9b94aa84dfd1a34" => :sierra sha256 "4dd46a72ce3a5355efa42038df34b9bfda51ae6265be89eb09f1b8957ef3653d" => :el_capitan + sha256 "654894e3819f2f0e209112b191d96c966bcf9b55f98e68b15eba1e22c44e3bbc" => :x86_64_linux end def install diff --git a/Formula/faad2.rb b/Formula/faad2.rb index aeae7510b42df..d6fa8a94f235d 100644 --- a/Formula/faad2.rb +++ b/Formula/faad2.rb @@ -11,6 +11,7 @@ class Faad2 < Formula sha256 "e8872363a2fda9a3c9872ef697e517c638e54e2af5238d9e94b30e34ecdc505e" => :high_sierra sha256 "f05989cbd9630fc37c962fc28ff29ec48a5fa7b71fe4ff9e520db6add1d0f09e" => :sierra sha256 "94205432c0187c2ccef411b05934b8db57512bd80b53c8f9c00f3792ee478684" => :el_capitan + sha256 "3260a6a8b8ed3927015b1f05247dcf55f1a128d9afd8151c4703b4d4f1280cf6" => :x86_64_linux end def install diff --git a/Formula/faas-cli.rb b/Formula/faas-cli.rb index 6d1596eea7302..634f12236700b 100644 --- a/Formula/faas-cli.rb +++ b/Formula/faas-cli.rb @@ -10,6 +10,7 @@ class FaasCli < Formula sha256 "56a5425a22805c215fa040e46afa9c8fe3aa024944a21db282ba7daeefb9a09a" => :catalina sha256 "42635614ca80ef6121f96b8fea9bbaf8cf73afeb0f752be5c3b5d3617b5adbab" => :mojave sha256 "02e57db92a1cb20c264b2d5109ffc9a24ed851694a191d5f37fc4af94011c57a" => :high_sierra + sha256 "ba18ed2dd760e7b3887ddcef532fb1ec1ca01285e20afb8eb665aefb58f909d3" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/fabio.rb b/Formula/fabio.rb index 7b8c5c936150f..6ac861038b8a8 100644 --- a/Formula/fabio.rb +++ b/Formula/fabio.rb @@ -11,6 +11,7 @@ class Fabio < Formula sha256 "9ed48161ee4b2c5bcf0ce9ce520c2506bec689b2d21735d1eb4f3a3cb470fb57" => :catalina sha256 "3fe400520ea3af9c28baef9b376f14d8a96c88d6c79bc057f0949e15ea9c0efe" => :mojave sha256 "41ae1110be9335004d77846ab554cb5ecf45f6c48f83942b95bd752c243dcc14" => :high_sierra + sha256 "9522496b8878a1a2e9a21174334b436e0de4290ee834f29713110cc8fca2084b" => :x86_64_linux end depends_on "go" => :build @@ -54,7 +55,12 @@ def port_open?(ip_address, port, seconds = 1) end sleep 10 assert_equal true, port_open?(LOCALHOST_IP, FABIO_DEFAULT_PORT) - system "killall", "fabio" # fabio forks off from the fork... + if OS.mac? + system "killall", "fabio" # fabio forks off from the fork... + else + # killall may not be installed on Linux + system "kill -9 $(pgrep fabio)" + end system "consul", "leave" else puts "Fabio already running or Consul not available or starting fabio failed." diff --git a/Formula/fades.rb b/Formula/fades.rb index 528558f8c02aa..a4b2301557b69 100644 --- a/Formula/fades.rb +++ b/Formula/fades.rb @@ -10,6 +10,7 @@ class Fades < Formula sha256 "89d1989f379c15d5ad71b60fdb11422da663f371e6353028ec36df258d2aca72" => :catalina sha256 "89d1989f379c15d5ad71b60fdb11422da663f371e6353028ec36df258d2aca72" => :mojave sha256 "89d1989f379c15d5ad71b60fdb11422da663f371e6353028ec36df258d2aca72" => :high_sierra + sha256 "1f25c877004686a4fcd0eff1daae91e88102932c1d29cf4f84d6a96fd0e6492d" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/fail2ban.rb b/Formula/fail2ban.rb index 596faf6461191..4e13712202dc3 100644 --- a/Formula/fail2ban.rb +++ b/Formula/fail2ban.rb @@ -9,6 +9,7 @@ class Fail2ban < Formula sha256 "74818c094f3afe181c5f6870331822d4bb32d99258f31f2dc30cfea89d111051" => :catalina sha256 "01c86b6a7c231710a39884494ab6cca4f1568724bcb3abc3edade9c56207d236" => :mojave sha256 "336d82f86f30d90847910f8ba414b6326104f1109fe7fad3fab1af3d62331be4" => :high_sierra + sha256 "fe97afc210b33fa4db5716f36e9982d67bed1410e0fd1326b40160e1fd35ec1c" => :x86_64_linux end depends_on "help2man" => :build diff --git a/Formula/fairymax.rb b/Formula/fairymax.rb index 72810c4057337..8047a08157719 100644 --- a/Formula/fairymax.rb +++ b/Formula/fairymax.rb @@ -8,10 +8,10 @@ class Fairymax < Formula head "http://hgm.nubati.net/git/fairymax.git" bottle do - cellar :any_skip_relocation sha256 "8dad1d34ed2ce478abebc9ac986bbf5d7d0bf7af5f8326839da735d8fb3d11c6" => :catalina sha256 "5c4d837d9726fd83661fac0703cda7829f2c81e48f69ac98016915f97dad15cf" => :mojave sha256 "7da2c1f0d3c9f8cdfd5729c22b16bb3a0c81e0189988e4afe43ccaa69518beda" => :high_sierra + sha256 "35ac685db112aea1b99ddba941788d83904f40a8429495fa5d1b9964b9085998" => :x86_64_linux end def install diff --git a/Formula/faiss.rb b/Formula/faiss.rb index 84cc007e31927..a47cc2f0203ed 100644 --- a/Formula/faiss.rb +++ b/Formula/faiss.rb @@ -9,9 +9,11 @@ class Faiss < Formula sha256 "457e410d8e5b009bf12cb1b5881485f03461646ef18ff8afb69dbbc7113519b4" => :catalina sha256 "b3eb242ff373017f8d7ba621fde32d745a6d7d6c5c7ca5de888b7f8087e94776" => :mojave sha256 "03b95260a4fdd6cceaa69bb4e7168939aadf2b608f998079f7511aec6171f2d1" => :high_sierra + sha256 "3a94aedbc0e8eb9d2b6fb04a1265caab884b7af351b5d96d815f5a373782b40b" => :x86_64_linux end depends_on "libomp" + depends_on "openblas" unless OS.mac? on_linux do depends_on "openblas" diff --git a/Formula/fakeroot.rb b/Formula/fakeroot.rb index a2d3df46467b9..a824dff9051f7 100644 --- a/Formula/fakeroot.rb +++ b/Formula/fakeroot.rb @@ -9,8 +9,11 @@ class Fakeroot < Formula sha256 "c72ae187158b6cce73311fee527ba8bf8d2f0e18340bd66eef57b50b3d45c275" => :catalina sha256 "6c23e4c601af569c2de802cac685de5d18e6ebafcb53e6c53107aa3feb3d1527" => :mojave sha256 "df9be392f3579464893be013744b5aa40a7e4e91e01155bd1547e4104d381640" => :high_sierra + sha256 "418aeb02f20803d77d5bbbdaaea068b8ffc2a89cc2ab7b824845bc82d1a68cb8" => :x86_64_linux end + depends_on "libcap" unless OS.mac? + # Compile is broken. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766649 # Patches submitted upstream on 24/10/2014, but no reply from maintainer thus far. patch do @@ -40,26 +43,28 @@ def install # have to patch the generated file after it is generated. # Patch has been submitted with detailed explanation to # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766649 - system "make", "wraptmpf.h" - (buildpath/"patch-for-wraptmpf-h").write <<~EOS - diff --git a/wraptmpf.h b/wraptmpf.h - index dbfccc9..0e04771 100644 - --- a/wraptmpf.h - +++ b/wraptmpf.h - @@ -575,6 +575,10 @@ static __inline__ int next_mkdirat (int dir_fd, const char *pathname, mode_t mod - #endif /* HAVE_MKDIRAT */ - #ifdef HAVE_OPENAT - extern int openat (int dir_fd, const char *pathname, int flags, ...); - +static __inline__ int next_openat (int dir_fd, const char *pathname, int flags, mode_t mode) __attribute__((always_inline)); - +static __inline__ int next_openat (int dir_fd, const char *pathname, int flags, mode_t mode) { - + return openat (dir_fd, pathname, flags, mode); - +} + if OS.mac? + system "make", "wraptmpf.h" + (buildpath/"patch-for-wraptmpf-h").write <<~EOS + diff --git a/wraptmpf.h b/wraptmpf.h + index dbfccc9..0e04771 100644 + --- a/wraptmpf.h + +++ b/wraptmpf.h + @@ -575,6 +575,10 @@ static __inline__ int next_mkdirat (int dir_fd, const char *pathname, mode_t mod + #endif /* HAVE_MKDIRAT */ + #ifdef HAVE_OPENAT + extern int openat (int dir_fd, const char *pathname, int flags, ...); + +static __inline__ int next_openat (int dir_fd, const char *pathname, int flags, mode_t mode) __attribute__((always_inline)); + +static __inline__ int next_openat (int dir_fd, const char *pathname, int flags, mode_t mode) { + + return openat (dir_fd, pathname, flags, mode); + +} - #endif /* HAVE_OPENAT */ - #ifdef HAVE_RENAMEAT - EOS + #endif /* HAVE_OPENAT */ + #ifdef HAVE_RENAMEAT + EOS - system "patch < patch-for-wraptmpf-h" + system "patch < patch-for-wraptmpf-h" + end system "make" system "make", "install" diff --git a/Formula/fastjar.rb b/Formula/fastjar.rb index bceef00c374e6..46fe8e1390b09 100644 --- a/Formula/fastjar.rb +++ b/Formula/fastjar.rb @@ -10,6 +10,7 @@ class Fastjar < Formula sha256 "2dba61ec801db3d83692b9c9dd26eab247cb4bb6a6d6afc27f059bb6ba6052e5" => :mojave sha256 "87b2c870895191b309b595481f73346e763b87c661e64ef35b821e54395d5cc1" => :high_sierra sha256 "35230e788987e3a3c63d126af24c634bcbf58c0a320223d61f0eae69f6cbcc00" => :sierra + sha256 "105475ad7537803166b4808b58228839264d19bb73310fc846bba85ad56b3c05" => :x86_64_linux end def install diff --git a/Formula/fastlane.rb b/Formula/fastlane.rb index 4e82312bbc6e7..8d0a70163baed 100644 --- a/Formula/fastlane.rb +++ b/Formula/fastlane.rb @@ -10,6 +10,7 @@ class Fastlane < Formula sha256 "4bddf85fb7ccec66eaa235990df2fee36ea95cfcf409b74fd03d4361ff237f58" => :catalina sha256 "11adcc526b8488c0f9f94f043617ab27cf02caf32e81da261c9ba2a65a378063" => :mojave sha256 "38fcd34fbe5497c1ddd350536ce06371a15a40eade20d5e82a9716b8acd2bb04" => :high_sierra + sha256 "4ba4cceb43f507ef241bb541523fbdc45934ec9cfbce5793a25a87510102989c" => :x86_64_linux end depends_on "ruby@2.5" diff --git a/Formula/fastme.rb b/Formula/fastme.rb index bb57dc1b4707f..9a1a5f0521b22 100644 --- a/Formula/fastme.rb +++ b/Formula/fastme.rb @@ -11,6 +11,7 @@ class Fastme < Formula sha256 "65bfd93ee6bdc21881fe342dd289a4c0808a3eb0abb1e04e174c32fd43a0bc77" => :mojave sha256 "eac83026ed4ce4b30511c1f7b79ff032e9c3c607a52d63881951937e210d663c" => :high_sierra sha256 "1a04d48b4a33ad3c854a4d45724f339438455f47e20d870c265b070ec75db08b" => :sierra + sha256 "cc2ce4c3b9a60a297413e8b13f8eeb4a0945ce730594b336df44bc8f07420816" => :x86_64_linux end depends_on "gcc" diff --git a/Formula/fastmod.rb b/Formula/fastmod.rb index c3eddebef7f67..1c2da723eb8d3 100644 --- a/Formula/fastmod.rb +++ b/Formula/fastmod.rb @@ -9,6 +9,7 @@ class Fastmod < Formula sha256 "73a07dacd6f2c4e2151a848ab7903d12eb8de8328b8f5b796d9c2faeee66e259" => :catalina sha256 "9154f2bf4a78aaa4a40f3c93fd73fc39a385560b996ad927e0bcd8cf363a5308" => :mojave sha256 "ac5cf2b03b103422096feeb6693d252058772c7e06f54442918d48750f54f7e7" => :high_sierra + sha256 "ab644bf10edaed631b6fb87286cac42b022915a3453d6be84f99eeee01a9641f" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/fasttext.rb b/Formula/fasttext.rb index 5f4a46b39225a..cf71c7e906a25 100644 --- a/Formula/fasttext.rb +++ b/Formula/fasttext.rb @@ -10,6 +10,7 @@ class Fasttext < Formula sha256 "ec085551ced1f55b863a65aa60ad8f31d796002702b7effaaaafbf1490df867f" => :catalina sha256 "79f08167fb55b478829434be84d919c08c888563e0abbdeb66bc19cd3e82457f" => :mojave sha256 "4602a32c2a373ed97de8fd36bf1e998299682d45e465af39026a32a3a06fe574" => :high_sierra + sha256 "d4fd7acfc3a9124e638070c4dca7baa43bc4092da9cb237d5467355560695f26" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/fatsort.rb b/Formula/fatsort.rb index 8932c1d8851b4..704eee2f57eee 100644 --- a/Formula/fatsort.rb +++ b/Formula/fatsort.rb @@ -11,6 +11,7 @@ class Fatsort < Formula sha256 "30317b1edc9c062183ca98bf20baca935bf129405e15fc89056659968e33a83b" => :mojave sha256 "d9e23a82a00b9747f24e78e2fc11f40ea8bebadfafa41fa7d5c2e6838d6514b7" => :high_sierra sha256 "fd941f1bc940edcd9d23860ce723355be2249e330ecc8bbab4c5713525c78963" => :sierra + sha256 "24dd654d86a9b55bedc1a1d6681f8e2efc7ee9002781a3f32155882885aff43f" => :x86_64_linux end depends_on "help2man" diff --git a/Formula/faust.rb b/Formula/faust.rb index 479b14560b34e..896ad07a41e2c 100644 --- a/Formula/faust.rb +++ b/Formula/faust.rb @@ -2,13 +2,14 @@ class Faust < Formula desc "Functional programming language for real time signal processing" homepage "https://faust.grame.fr" url "https://github.com/grame-cncm/faust/releases/download/2.20.2/faust-2.20.2.tar.gz" - sha256 "bea8675446c5e5ef4ac4ba1fb1d64b3a2af99f5f293be0492ccaf32baf7fcb5c" + sha256 "c32588ee60d0f7ca25034d3d5436def6b35495f4d3beb3b02208d48684bcfbe9" bottle do cellar :any sha256 "48f36d87c5d99c94dd5480fd24aacf1d12f7a1e0910c7c51d1486d00c732ead7" => :catalina sha256 "1e1c7d96ce8b9aae9742fa9933e3b9f400a0396fb37f1acc493b7af99cee53fe" => :mojave sha256 "a304cdfea4858109db24f99a54f16b95ad451804fd569d1b601bb4ba01921452" => :high_sierra + sha256 "619e69eb5469a228aa4d674dfc833955e790d8c8e7fa620c4fab37c8c88810c8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/fb-client.rb b/Formula/fb-client.rb index 806666c962531..8b738f6288bef 100644 --- a/Formula/fb-client.rb +++ b/Formula/fb-client.rb @@ -11,6 +11,7 @@ class FbClient < Formula sha256 "45db897c3f383834be56906412e419c2d203f3fd8ce1ce2d6077358890c7116e" => :catalina sha256 "b0d14486e7eb0927ac5b41f45f6effd6bb0999aa1c9ce50628fabd3090b5a2ab" => :mojave sha256 "f5456a27456904c7262ceb81fdfe12efcf01619ea85a67c8e3048189ecee720e" => :high_sierra + sha256 "2d7edaac39f72de825018ca6fb740f823fbb6ba153d6f35ec0b84839567705c7" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/fbi-servefiles.rb b/Formula/fbi-servefiles.rb index 08ae97746955e..e1c0737f1c957 100644 --- a/Formula/fbi-servefiles.rb +++ b/Formula/fbi-servefiles.rb @@ -5,13 +5,14 @@ class FbiServefiles < Formula homepage "https://github.com/Steveice10/FBI" url "https://github.com/Steveice10/FBI/archive/2.6.0.tar.gz" sha256 "4948d4c53d754cc411b51edbf35c609ba514ae21d9d0e8f4b66a26d5c666be68" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any_skip_relocation sha256 "d04625bf981ccec4ad79cc872fa7eefcd2cadbdf4b62b09f6d5e4e692325b2d5" => :catalina sha256 "2654398f6f8d65a5f24371a32c9f11f1bb5b02ce309056b9e9a13d38dbac2fc0" => :mojave sha256 "b0aae581bf9247f6e282df341dfcffed362587539e7a443433d376319837961f" => :high_sierra + sha256 "afa6e5f4beee99202f766f705301fd9e89b6c559e4483d1487874305cb3a631d" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/fcgi.rb b/Formula/fcgi.rb index b103272383a78..a279678daa518 100644 --- a/Formula/fcgi.rb +++ b/Formula/fcgi.rb @@ -10,6 +10,7 @@ class Fcgi < Formula sha256 "3905f7f3dec32a296b831f224a4f2cc75089c60b8a0137ce0b25e37466ffba8a" => :catalina sha256 "a43c52588cc652fcc1d9be4d89393212875732349bd4dbdda4068f985db10628" => :mojave sha256 "3ee3183f46dd8f38eee932f685e8d6a52fd0c0c2a1797bb25d62ad973b1405ed" => :high_sierra + sha256 "34b4284647f1a97bf53cf1d039a20bf326f77885e8b1d4c39e62bdf8c7e88d4e" => :x86_64_linux end depends_on "autoconf" => :build @@ -17,9 +18,12 @@ class Fcgi < Formula depends_on "libtool" => :build def install + ENV.deparallelize unless OS.mac? + system "./autogen.sh" system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}" + system "make" system "make", "install" end diff --git a/Formula/fcgiwrap.rb b/Formula/fcgiwrap.rb index 84e8ce9ed3269..9955cd1069709 100644 --- a/Formula/fcgiwrap.rb +++ b/Formula/fcgiwrap.rb @@ -12,6 +12,7 @@ class Fcgiwrap < Formula sha256 "c0a70c3cc726788dfac52d8b23c79c1a4ef31a8c7e1418ac335cfe182b94f05d" => :el_capitan sha256 "ea03eeafcd71e07c2e608bc974a00cf642b253de24eb7bd587155c89db2fffad" => :yosemite sha256 "15a4dc62dba901bdc25f8d898674069b8cad09b3d2c00458900f31c143305a4e" => :mavericks + sha256 "085d05ae121ccf4e9fbd71acafb4687b44648b878628780c5bfeed3d8f6101ee" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/fcitx-remote-for-osx.rb b/Formula/fcitx-remote-for-osx.rb index b9185a66725b6..4d4013ed6f6d0 100644 --- a/Formula/fcitx-remote-for-osx.rb +++ b/Formula/fcitx-remote-for-osx.rb @@ -13,6 +13,8 @@ class FcitxRemoteForOsx < Formula sha256 "16efcc3f2a5ac6fd63bfea3d85286fac823cc7b21520d85f46d0b3c066668671" => :sierra end + depends_on :macos + def install system "./build.py", "build", "general" bin.install "fcitx-remote-general" diff --git a/Formula/fcl.rb b/Formula/fcl.rb index 89ad1866775a4..ec4de377ce8f0 100644 --- a/Formula/fcl.rb +++ b/Formula/fcl.rb @@ -8,6 +8,7 @@ class Fcl < Formula sha256 "05a5dfa094009376e5915ad14289490fa370462153102eb43e402d50663a23f4" => :catalina sha256 "7fc28b6f1bd196e83873f61617e590af68ebf861cfc76af9d892c8ef40b25601" => :mojave sha256 "625f6117a551777a1f12eba3253886a441a5a00e2759218b9566d40bb9f3ab2c" => :high_sierra + sha256 "a4893b2dff93aba4c97dc4a6efa19406b0c276e5491c0ba0a6c1768ad057b986" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/fd.rb b/Formula/fd.rb index 0960264b70c55..0b185d8830c59 100644 --- a/Formula/fd.rb +++ b/Formula/fd.rb @@ -10,6 +10,7 @@ class Fd < Formula sha256 "4625e56da438b94dfe331a2fe1df759b140931241af097df91f29d8ac314f2d3" => :catalina sha256 "d002e8d8de192b6fad189ff7830d4fe9fc7d4ca9e81aa5ac66bb5200c590703a" => :mojave sha256 "c269bbc76090614e7262c81e1b21d784050a71a51a5921686845f0d3c0855400" => :high_sierra + sha256 "253bd0d8662ebc8e176dea1db9863bb8b236b6c7e3909e77febcd7153c1c88f3" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/fdclone.rb b/Formula/fdclone.rb index fa414420b712e..e0c65b59dcb18 100644 --- a/Formula/fdclone.rb +++ b/Formula/fdclone.rb @@ -8,6 +8,7 @@ class Fdclone < Formula sha256 "6272d033132a7a2c355ab19629241021087c606de3114e2ebe4aa301e6bee840" => :catalina sha256 "b3a56f6b62622696f4da6554a487557a57c0875c2aba28705e300b7207f6a8ce" => :mojave sha256 "f894bed33d254c5c48341485e835f945b60e632a0ecbf484c818f12c61350122" => :high_sierra + sha256 "601dadcaa9134081a7d633f89c3d26824db65f2260a9b31ae374ba98dd13cf4f" => :x86_64_linux end depends_on "nkf" => :build diff --git a/Formula/fdk-aac-encoder.rb b/Formula/fdk-aac-encoder.rb index 7a9a2746f9b97..f6c149762a2c2 100644 --- a/Formula/fdk-aac-encoder.rb +++ b/Formula/fdk-aac-encoder.rb @@ -11,6 +11,7 @@ class FdkAacEncoder < Formula sha256 "62a592acbd1e83e55f2b3c98a6272abff8c55033f916170f540fec8b3b115ccc" => :mojave sha256 "46e9211c5a31c852cef7183dc57bc1ca3f9136faf37db908fe8f1e4e1edaa6c6" => :high_sierra sha256 "0fc99599503b40879fe422b95ccd25dc892e306da831cfaccf9f7fbdf1d73912" => :sierra + sha256 "66472b985c8258567ba1dc3d4d4f311c9084a6c62fece9e83207f2253b7cd790" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/fdk-aac.rb b/Formula/fdk-aac.rb index 295648826cc00..fd8f1af319823 100644 --- a/Formula/fdk-aac.rb +++ b/Formula/fdk-aac.rb @@ -9,6 +9,7 @@ class FdkAac < Formula sha256 "526c83a79b7f208f07e8d04ad5ce47c8104d90a76034e42422d124fba128ba3c" => :catalina sha256 "9353da38e4b43913964f9cdc5fc2a28c4b6c0a19ceef4e2a58db62ba3fdb4d49" => :mojave sha256 "a8812e355f28272c7d8153bcda0e48a58c0bd0a880ed0256a2bc460143d1df78" => :high_sierra + sha256 "ec48ea6db2520cdbf9a2c594a81710caa4b064dc2d5fca77b2300a78b411a466" => :x86_64_linux end head do diff --git a/Formula/fdroidserver.rb b/Formula/fdroidserver.rb index 168473ef0ad92..b91ab592691f0 100644 --- a/Formula/fdroidserver.rb +++ b/Formula/fdroidserver.rb @@ -11,6 +11,7 @@ class Fdroidserver < Formula sha256 "b6c78f576d5efc31e4094e61c13fb2ad8d374aa76a458e1bd309040f197c0526" => :catalina sha256 "b662c1a4d1eeba40e43243e91b499605ab1e1758321beab10f9a3848e50c9d40" => :mojave sha256 "7202bafc628326f0b4951ec1d13c3803dc3385abc2b9683fcf45db4248b87f9b" => :high_sierra + sha256 "82fa826d3ec20fabc5fa51844561e78a342dca29f5c8772e2a991e5f74904981" => :x86_64_linux end depends_on "pkg-config" => :build @@ -36,9 +37,11 @@ class Fdroidserver < Formula sha256 "bbb858e045ba5e06d61632c08b9828625766aae30ff4fe727f2bee598c9048ac" end - resource "appnope" do - url "https://files.pythonhosted.org/packages/26/34/0f3a5efac31f27fabce64645f8c609de9d925fe2915304d1a40f544cff0e/appnope-0.1.0.tar.gz" - sha256 "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" + if OS.mac? + resource "appnope" do + url "https://files.pythonhosted.org/packages/26/34/0f3a5efac31f27fabce64645f8c609de9d925fe2915304d1a40f544cff0e/appnope-0.1.0.tar.gz" + sha256 "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" + end end resource "args" do @@ -332,28 +335,32 @@ def install resource("Pillow").stage do inreplace "setup.py" do |s| - sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" + zlib = Formula["zlib"].opt_prefix + jpeg = Formula["jpeg"].opt_prefix + freetype = Formula["freetype"].opt_prefix + if OS.mac? + sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" if OS.mac? + s.gsub! "ZLIB_ROOT = None", "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + else + s.gsub! "ZLIB_ROOT = None", "ZLIB_ROOT = ('#{zlib}/lib', '#{zlib}/include')" + end s.gsub! "openjpeg.h", "probably_not_a_header_called_this_eh.h" - s.gsub! "xcb.h", "probably_not_a_header_called_this_eh.h" - s.gsub! "ZLIB_ROOT = None", - "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" - s.gsub! "JPEG_ROOT = None", - "JPEG_ROOT = ('#{Formula["jpeg"].opt_prefix}/lib', '#{Formula["jpeg"].opt_prefix}/include')" - s.gsub! "FREETYPE_ROOT = None", - "FREETYPE_ROOT = ('#{Formula["freetype"].opt_prefix}/lib', " \ - "'#{Formula["freetype"].opt_prefix}/include')" + s.gsub! "JPEG_ROOT = None", "JPEG_ROOT = ('#{jpeg}/lib', '#{jpeg}/include')" + s.gsub! "FREETYPE_ROOT = None", "FREETYPE_ROOT = ('#{freetype}/lib', '#{freetype}/include')" end # avoid triggering "helpful" distutils code that doesn't recognize Xcode 7 .tbd stubs ENV.delete "SDKROOT" - unless MacOS::CLT.installed? + if OS.mac? && !MacOS::CLT.installed? ENV.append "CFLAGS", "-I#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers" end venv.pip_install Pathname.pwd end # Fix "ld: file not found: /usr/lib/system/libsystem_darwin.dylib" for lxml - ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra + if OS.mac? + ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra + end venv.pip_install resource("lxml") ENV.delete "SDKROOT" # avoid matplotlib build failure on 10.12 diff --git a/Formula/fdupes.rb b/Formula/fdupes.rb index f68b50b0436e7..5c939ee1b0542 100644 --- a/Formula/fdupes.rb +++ b/Formula/fdupes.rb @@ -6,10 +6,11 @@ class Fdupes < Formula version_scheme 1 bottle do - cellar :any + cellar :any_skip_relocation sha256 "f23e032f6c62aabb8a3a5935286363f4b5f805a2e9126612c551f6e8bf9c4105" => :catalina sha256 "b8729a91b857ff0f5b314350471434dcad1918a1bb6bd555b6fe41cb1a355ab7" => :mojave sha256 "44f3f184a04ac478d4b49e25886a50f24853f9ef52058d94f331ee6a71006727" => :high_sierra + sha256 "e4083fa6f4c518c063317f690dd7628033ee01a543bcd04484e2b70bbaf79f3b" => :x86_64_linux end depends_on "pcre2" diff --git a/Formula/fetch-crl.rb b/Formula/fetch-crl.rb index 2578a9357bb39..0365c3f45e817 100644 --- a/Formula/fetch-crl.rb +++ b/Formula/fetch-crl.rb @@ -9,10 +9,52 @@ class FetchCrl < Formula sha256 "7c4aedc9178b36cf45d9a05ed4213c5c2ede584dc1c2754f2370b91f42a1efe3" => :catalina sha256 "7c4aedc9178b36cf45d9a05ed4213c5c2ede584dc1c2754f2370b91f42a1efe3" => :mojave sha256 "7c4aedc9178b36cf45d9a05ed4213c5c2ede584dc1c2754f2370b91f42a1efe3" => :high_sierra + sha256 "a78a25752c9674989dfb237cd291422a30d115e7f21f7945600d5807de0a6e87" => :x86_64_linux + end + + unless OS.mac? + resource "LWP" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz" + sha256 "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d" + end + + resource "HTTP::Request" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz" + sha256 "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112" + end + + resource "URI" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/URI-1.76.tar.gz" + sha256 "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e" + end + + resource "HTTP::Date" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz" + sha256 "365d6294dfbd37ebc51def8b65b81eb79b3934ecbc95a2ec2d4d827efe6a922b" + end + + resource "Try::Tiny" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Try-Tiny-0.28.tar.gz" + sha256 "f1d166be8aa19942c4504c9111dade7aacb981bc5b3a2a5c5f6019646db8c146" + end end def install + unless OS.mac? + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + resources.each do |r| + r.stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + end + end + end + system "make", "install", "PREFIX=#{prefix}", "ETC=#{etc}", "CACHE=#{var}/cache" + + bin.env_script_all_files libexec/"bin", :PERL5LIB => ENV["PERL5LIB"] unless OS.mac? + sbin.env_script_all_files libexec/"sbin", :PERL5LIB => ENV["PERL5LIB"] unless OS.mac? end test do diff --git a/Formula/ffmpeg.rb b/Formula/ffmpeg.rb index ee82953bd7a83..8382402db3fe5 100644 --- a/Formula/ffmpeg.rb +++ b/Formula/ffmpeg.rb @@ -10,6 +10,7 @@ class Ffmpeg < Formula sha256 "5dccea5f0d7ff92fc94e8564d8717f59766ee0db5b8df8a60996e27c57ef3dfc" => :catalina sha256 "75b4d5c0639f24f4a49226e7d3d49be35f80ec3680a6d0fdd7d2da4544d366b2" => :mojave sha256 "f4817a0d1cc8675d8785c13a5ea055ff296b241fb1d8a8a1eb301f6a075565b3" => :high_sierra + sha256 "9a7e9f13ade5aa1af448be25d5b60184d1b5ae7be1e0e27db579317e1726d4af" => :x86_64_linux end depends_on "nasm" => :build @@ -45,6 +46,7 @@ class Ffmpeg < Formula depends_on "x265" depends_on "xvid" depends_on "xz" + depends_on "linuxbrew/xorg/libxv" unless OS.mac? uses_from_macos "bzip2" uses_from_macos "zlib" @@ -91,11 +93,12 @@ def install --enable-librtmp --enable-libspeex --enable-libsoxr - --enable-videotoolbox --disable-libjack --disable-indev=jack ] + args << "--enable-videotoolbox" if OS.mac? + system "./configure", *args system "make", "install" diff --git a/Formula/ffmpegthumbnailer.rb b/Formula/ffmpegthumbnailer.rb index eba443503fc90..1ea83eefe1410 100644 --- a/Formula/ffmpegthumbnailer.rb +++ b/Formula/ffmpegthumbnailer.rb @@ -11,6 +11,7 @@ class Ffmpegthumbnailer < Formula sha256 "28a278ef88da9c423a719558dfc138e8ff15d89559b04250b143e8e0840b1bcd" => :catalina sha256 "66868572e40f91a49b363a8943eeeb9066eb0b8dd510a719070f3997f50b2ea8" => :mojave sha256 "71cea969bdeeb648b9788736e1aea0904bba274df17ecc42ec21cd8c21b18539" => :high_sierra + sha256 "db00d81b8657a44d6f0c5a0f240865d9da67a499793434f430dbb82fa244ee82" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ffms2.rb b/Formula/ffms2.rb index b68bf6d320f87..a36744ebd6164 100644 --- a/Formula/ffms2.rb +++ b/Formula/ffms2.rb @@ -11,6 +11,7 @@ class Ffms2 < Formula sha256 "b6495a6e71b67427d075abbf334d41179593fd1576ab230f7a7da1f02f329500" => :catalina sha256 "4e445388ec5eadeec544cc4f6dc119bd2c321194c1d7628ca61413d9ebdbe749" => :mojave sha256 "8ff0f417a1455cc0c6f823ebb916c3be18f0a4cf8edecfda6970351060c07665" => :high_sierra + sha256 "66ac700c7660eabcd9dcf37410e8b411bb5163ad77c8c1f1134599868f7e6b72" => :x86_64_linux end head do diff --git a/Formula/ffsend.rb b/Formula/ffsend.rb index 1e0546e2cfb0c..16aaf3bb1b605 100644 --- a/Formula/ffsend.rb +++ b/Formula/ffsend.rb @@ -5,13 +5,18 @@ class Ffsend < Formula sha256 "bb4c435e864cd543075b3a35a9d6af62d51c7a1a1859e381518da0a52c073e99" bottle do - cellar :any_skip_relocation + cellar :any sha256 "c15cd573b7db56f64cd020bfa2395d95468c265c6d9f0601daae87a0ab0362ac" => :catalina sha256 "f036ede55acf203ae062f862dbb6d08d244a205ca564e8401aaeb6b0885ecffb" => :mojave sha256 "624fe915583462af9d73f826d6e36211a627c6565052fc438524878f982611c9" => :high_sierra + sha256 "739819481baa573b6436850c0a4c5d024f348c9e88f6fff3630594725f4e3965" => :x86_64_linux end depends_on "rust" => :build + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "openssl@1.1" + end on_linux do depends_on "pkg-config" => :build diff --git a/Formula/fftw.rb b/Formula/fftw.rb index c86a9d5fc2a85..6df9a4d12faf9 100644 --- a/Formula/fftw.rb +++ b/Formula/fftw.rb @@ -11,6 +11,7 @@ class Fftw < Formula sha256 "fafc0d1b43619cf3ac63946a4380782747903378dfb4f7b21387c40131ad2d59" => :mojave sha256 "da4329aec211bdc19e9404b35318517d8a3d029dde6e0e28dac646330a7554c4" => :high_sierra sha256 "eb140060084d40bc484f8e7048b516b7afe92902c6da04f9e283bfa83f271551" => :sierra + sha256 "f4d30e8d43d1d9e49c8d2c9a8d908be9d935c5b23ebbbfa28d8e79dc9c10ec0a" => :x86_64_linux end depends_on "gcc" diff --git a/Formula/ffuf.rb b/Formula/ffuf.rb index 4dfb52e7c3e4f..ea0ba82f15c5f 100644 --- a/Formula/ffuf.rb +++ b/Formula/ffuf.rb @@ -9,6 +9,7 @@ class Ffuf < Formula sha256 "aa49f4d4ecfdeea7175978aa738aa5447505c590171c9002a2abee72eae9a9f6" => :catalina sha256 "0029f7f2024bbc1e0702af2d3616f2a74dc0903bed53c4b0c50cfcec20c899bb" => :mojave sha256 "8c24d59bb3c7c9e8cdc4699c966f4a8a2affe5e88a5f96a7d08754261e6613e9" => :high_sierra + sha256 "6e85510003a35a2f5f8bbc0f57d13ebed8e16d7ef39fb3922a7a5570983c50fd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/fibjs.rb b/Formula/fibjs.rb index a183a5fc79145..33ee52542978f 100644 --- a/Formula/fibjs.rb +++ b/Formula/fibjs.rb @@ -10,9 +10,13 @@ class Fibjs < Formula sha256 "5c123ec4d010a5f4912b5dccb3af1d83aed12f1678c9314360c08208aef8655b" => :catalina sha256 "014db4fa7314f35b7ba0ea76a0d77c6d6ca59d00e7ffd9e22cab12f7cad2993b" => :mojave sha256 "8830b25d963bed8bebab3e2be4024ed925c702ef4e28d1c5679ca9304f73f266" => :high_sierra + sha256 "cde35c9ea42b5d238e13f4a5d58b02c6f646e7ea927b1877f480b77a340de67a" => :x86_64_linux end depends_on "cmake" => :build + depends_on :macos => :sierra # fibjs requires >= Xcode 8.3 (or equivalent CLT) + + depends_on "llvm" => :build unless OS.mac? def install # the build script breaks when CI is set by Homebrew @@ -23,7 +27,7 @@ def install ENV["CI"] = env_ci end - bin.install "bin/Darwin_amd64_release/fibjs" + bin.install "bin/#{OS.mac? ? "Darwin" : "Linux"}_amd64_release/fibjs" end test do diff --git a/Formula/ficy.rb b/Formula/ficy.rb index 0b56d4c9f50e9..facfc47b36100 100644 --- a/Formula/ficy.rb +++ b/Formula/ficy.rb @@ -13,6 +13,7 @@ class Ficy < Formula sha256 "c8e04a4eb2cf74a46ed02c14c18bb13b06dcdc8703f5913744e904492efe64d8" => :sierra sha256 "b3230fe854623e9ef87868b028a7c3cdfa7b08cdd749def59312cbc47c510bec" => :el_capitan sha256 "ba35c8e07903b74a37daf9131f26a578320f79252aa95e9ca7a5921065cd2a51" => :yosemite + sha256 "818316812d71c46fe4e720204382cc1bdd8e5b5ee02f5e1f9589e6487eeecf71" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/fig2dev.rb b/Formula/fig2dev.rb index 1f47b61956d6c..fc304eb432675 100644 --- a/Formula/fig2dev.rb +++ b/Formula/fig2dev.rb @@ -8,6 +8,7 @@ class Fig2dev < Formula sha256 "0ffe4d06ce3f489b724facdae111d0358ac5a902733f5c2ccedab8f4f3759893" => :catalina sha256 "f640a65192bbae6f8801e6f07d57ff8d24ffda78ea471dacaa1b33684a7858ae" => :mojave sha256 "1020f0333374fbfcb88d3bf2b2ca89b40c83f7863968f4d28dad1654ff9905df" => :high_sierra + sha256 "a2c9c525b1270bae10c6fa9357348554600453818d2b3034ef32155d3c1e8abb" => :x86_64_linux end depends_on "ghostscript" diff --git a/Formula/figlet.rb b/Formula/figlet.rb index 05d50e72c3755..fc076b31a9f75 100644 --- a/Formula/figlet.rb +++ b/Formula/figlet.rb @@ -13,6 +13,7 @@ class Figlet < Formula sha256 "943067dae95de58518b20334aec401cf5fd24866ff77315c0d7bd8b5d4ab0011" => :el_capitan sha256 "0a1b051fb0143dbfca1da36c83eca8580c215ff155e0dc755a924ce1f53a4b46" => :yosemite sha256 "3d33cf3ee819346dc431c37f07e2051c9f92d222cb35d330a41ca88bd5153e2d" => :mavericks + sha256 "55586b322feb481ec8f54d51e8aad4ed27f3fabdc21e79193f801155db50fa1d" => :x86_64_linux end resource "contrib" do diff --git a/Formula/file-formula.rb b/Formula/file-formula.rb index 5bf58860e2ef5..051b8b3393e6a 100644 --- a/Formula/file-formula.rb +++ b/Formula/file-formula.rb @@ -11,6 +11,7 @@ class FileFormula < Formula sha256 "f2f1368f08ffec7eb4056fef921d34c589315ab84ea99efd5e7694aede331f3c" => :catalina sha256 "b7072798695086db4bf5e931f6b663615bdfa1bab83f87f72ac1c9c0d4e5afb5" => :mojave sha256 "ec92f8fb7f27696078f40a5a28ef12694acad52b55cac406124444b1527adee8" => :high_sierra + sha256 "b7b86781e67918f5b6651f4e730197f2e2d33ef7de358e2807341e0326137775" => :x86_64_linux end keg_only :provided_by_macos @@ -21,6 +22,7 @@ class FileFormula < Formula def install ENV.prepend "LDFLAGS", "-L#{Formula["libmagic"].opt_lib} -lmagic" + ENV.prepend "CPPFLAGS", "-I#{Formula["libmagic"].opt_include}" unless OS.mac? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" diff --git a/Formula/file-roller.rb b/Formula/file-roller.rb index 7763acaed4c90..f032186020ebc 100644 --- a/Formula/file-roller.rb +++ b/Formula/file-roller.rb @@ -9,6 +9,7 @@ class FileRoller < Formula sha256 "1f40f32ba82ba12527c78cd3d4657a15b7b0aa6baface98da837de70630d9e26" => :catalina sha256 "da9e2dea4e80b26ed582ad5cd1516b29dbc0cd9929b0cd0a796ba1d8df140157" => :mojave sha256 "2c1df7ce4eb84dfcedbb9b92d05d4a44462ace1910cd7b20f5de252624ac9fd2" => :high_sierra + sha256 "bd64e5a569649ee092663974bd3ca44a807799d48f481510cdd6de2f2f5f9cda" => :x86_64_linux end depends_on "itstool" => :build diff --git a/Formula/filebeat.rb b/Formula/filebeat.rb index 974c6d5c405e8..2dc343a1e3417 100644 --- a/Formula/filebeat.rb +++ b/Formula/filebeat.rb @@ -15,6 +15,7 @@ class Filebeat < Formula depends_on "go" => :build depends_on "python@3.8" => :build + depends_on "rsync" => :build unless OS.mac? resource "virtualenv" do url "https://files.pythonhosted.org/packages/b1/72/2d70c5a1de409ceb3a27ff2ec007ecdd5cc52239e7c74990e32af57affe9/virtualenv-15.2.0.tar.gz" diff --git a/Formula/fileicon.rb b/Formula/fileicon.rb index cb2e996d52b14..9925baa76f44b 100644 --- a/Formula/fileicon.rb +++ b/Formula/fileicon.rb @@ -11,6 +11,8 @@ class Fileicon < Formula sha256 "154c80c94f29f209b78252e71d914647a8300c66c02acda672b8574e8e704e92" => :high_sierra end + depends_on :macos + def install bin.install "bin/fileicon" man1.install "man/fileicon.1" diff --git a/Formula/findent.rb b/Formula/findent.rb index 443eaccb02431..88425afdb1ca4 100644 --- a/Formula/findent.rb +++ b/Formula/findent.rb @@ -9,6 +9,7 @@ class Findent < Formula sha256 "da0eefdb70f76e0f31443b510725d483941a0ba58c7a7c2bd85e2934ab8ed04e" => :catalina sha256 "bf2e8d595feae56fd6a8568abb08c3d3b9d6e7d7da2a1e0126a8bfa39eff7ad0" => :mojave sha256 "93181b8b1f49db914b56caf888313bbba6223f9d9dffa39e12c2985bebce0f55" => :high_sierra + sha256 "53b8ed9fc824c499e6e98fc26dae654d91f9315df8d3152b063bef3f542ad22c" => :x86_64_linux end def install diff --git a/Formula/findutils.rb b/Formula/findutils.rb index 15c15ddd32ff8..61c1a889b8ebd 100644 --- a/Formula/findutils.rb +++ b/Formula/findutils.rb @@ -11,6 +11,7 @@ class Findutils < Formula sha256 "3c609b729a1dc859459282a856ff6c164cd8388e531dad4e58c8d4c7acb670fb" => :mojave sha256 "996a9fe2b1829fdf7b7257bead0ef0c4315832e9ba21b149779abeb59dcbde30" => :high_sierra sha256 "4b66ce398f2d5f5c65bf0b05fcc55334398e75cb965a17d781d7c3a15a4bba61" => :sierra + sha256 "373ecec09e509de06e24005db583ea93d32ad1b9229f7148697c85dc8608d3d0" => :x86_64_linux end def install @@ -27,29 +28,30 @@ def install --localstatedir=#{var}/locate --disable-dependency-tracking --disable-debug - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? # Work around a gnulib issue with macOS Catalina args << "gl_cv_func_ftello_works=yes" - system "./configure", *args system "make", "install" - # https://savannah.gnu.org/bugs/index.php?46846 - # https://github.com/Homebrew/homebrew/issues/47791 - (libexec/"bin").install bin/"gupdatedb" - (bin/"gupdatedb").write <<~EOS - #!/bin/sh - export LC_ALL='C' - exec "#{libexec}/bin/gupdatedb" "$@" - EOS + if OS.mac? + # https://savannah.gnu.org/bugs/index.php?46846 + # https://github.com/Homebrew/homebrew/issues/47791 + (libexec/"bin").install bin/"gupdatedb" + (bin/"gupdatedb").write <<~EOS + #!/bin/sh + export LC_ALL='C' + exec "#{libexec}/bin/gupdatedb" "$@" + EOS - [[prefix, bin], [share, man/"*"]].each do |base, path| - Dir[path/"g*"].each do |p| - f = Pathname.new(p) - gnupath = "gnu" + f.relative_path_from(base).dirname - (libexec/gnupath).install_symlink f => f.basename.sub(/^g/, "") + [[prefix, bin], [share, man/"*"]].each do |base, path| + Dir[path/"g*"].each do |p| + f = Pathname.new(p) + gnupath = "gnu" + f.relative_path_from(base).dirname + (libexec/gnupath).install_symlink f => f.basename.sub(/^g/, "") + end end end @@ -61,6 +63,8 @@ def post_install end def caveats + return unless OS.mac? + <<~EOS All commands have been installed with the prefix "g". If you need to use these commands with their normal names, you @@ -71,7 +75,11 @@ def caveats test do touch "HOMEBREW" - assert_match "HOMEBREW", shell_output("#{bin}/gfind .") - assert_match "HOMEBREW", shell_output("#{opt_libexec}/gnubin/find .") + if OS.mac? + assert_match "HOMEBREW", shell_output("#{bin}/gfind .") + assert_match "HOMEBREW", shell_output("#{opt_libexec}/gnubin/find .") + end + + assert_match "HOMEBREW", shell_output("#{bin}/find .") unless OS.mac? end end diff --git a/Formula/fio.rb b/Formula/fio.rb index 4815b956ac297..ba41ed319bc18 100644 --- a/Formula/fio.rb +++ b/Formula/fio.rb @@ -9,6 +9,7 @@ class Fio < Formula sha256 "252dd7cba1c767568b9ecb13fbbd891e1ffe47f590ed126cfea8214ff20333f5" => :catalina sha256 "2b4b3372f9ad040eb974ba38ecdde11c08b0328fae71d785e5d0b88c77ecffc3" => :mojave sha256 "89e47c70a1cca2e1acf29b97720da6b968348ea93a5e417fdca7ad86d670114d" => :high_sierra + sha256 "36e4581c322b86af955360a9986647ed433cff09029e47e67450d65dc9a95766" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/firebase-cli.rb b/Formula/firebase-cli.rb index d01c0e414d7a1..61135bcb8209a 100644 --- a/Formula/firebase-cli.rb +++ b/Formula/firebase-cli.rb @@ -12,6 +12,7 @@ class FirebaseCli < Formula sha256 "e71455e8731176b665232fd3ff9f6062bf957a778375af9fe58b24feac4bf64c" => :catalina sha256 "362209bf313f7726f729490cbfe072342db22cd08d86490c08046c4110aacc39" => :mojave sha256 "cedd7722b0fad1de5e8c9d9f4eb5081f42ba97c95983a1874bdea9c0ef85d2d7" => :high_sierra + sha256 "82ba9b3bfebd55b2195f1841c79e007456d303a1b578bba957801481b2a76173" => :x86_64_linux end depends_on "node" diff --git a/Formula/fish.rb b/Formula/fish.rb index 56bbe878e22ae..51791f3c2acf0 100644 --- a/Formula/fish.rb +++ b/Formula/fish.rb @@ -9,6 +9,7 @@ class Fish < Formula sha256 "b158b7f8640feb7c622ff3ca92b1bd88565f274f3e761499f5926bb124eeff7d" => :catalina sha256 "6797636eaba364d0cbbc0459103a8767598e985f01846cca6cb57c986dfee7b8" => :mojave sha256 "2609577a0d9f6b661331adccf5d1d8e010662ffe128869757e0af9a6760e26fb" => :high_sierra + sha256 "0a16a290b3de72d04400f5471e5d4912e0415efcf792b4315e0221d5dc61e08b" => :x86_64_linux end head do @@ -29,8 +30,8 @@ def install -Dextra_functionsdir=#{HOMEBREW_PREFIX}/share/fish/vendor_functions.d -Dextra_completionsdir=#{HOMEBREW_PREFIX}/share/fish/vendor_completions.d -Dextra_confdir=#{HOMEBREW_PREFIX}/share/fish/vendor_conf.d - -DSED=/usr/bin/sed ] + args << "-DSED=/usr/bin/sed" if OS.mac? system "cmake", ".", *std_cmake_args, *args system "make", "install" end diff --git a/Formula/fizsh.rb b/Formula/fizsh.rb index caaf7689edad6..4f2aa6a32a077 100644 --- a/Formula/fizsh.rb +++ b/Formula/fizsh.rb @@ -13,6 +13,7 @@ class Fizsh < Formula sha256 "334ceff9d649e87f87be9d3f561ee38221f8c87712a3b506b145191dc51fc4bd" => :sierra sha256 "334ceff9d649e87f87be9d3f561ee38221f8c87712a3b506b145191dc51fc4bd" => :el_capitan sha256 "334ceff9d649e87f87be9d3f561ee38221f8c87712a3b506b145191dc51fc4bd" => :yosemite + sha256 "d25f3467f58d11b38efac3595c9e9244fcd558823d2d2e64a0a6744c8330099a" => :x86_64_linux # glibc 2.19 end depends_on "zsh" diff --git a/Formula/flac.rb b/Formula/flac.rb index 90c9a648d4e10..299384f396252 100644 --- a/Formula/flac.rb +++ b/Formula/flac.rb @@ -10,6 +10,7 @@ class Flac < Formula sha256 "3d33119f1e513ad58f20722e41498fc23315d756a834d8b346cee6842f45fea1" => :catalina sha256 "ffadc5a1825acd43aee92ea2523a1b46b3c63820f5cf59f61ee2972571454755" => :mojave sha256 "53562e93cd58b45d15fb5303938b1718298d69101a53612fd53075e881cbfc95" => :high_sierra + sha256 "3f9d8dec51f88267ccfcb02ee151e109fe70db894212dac029a4b3902517c91d" => :x86_64_linux end head do diff --git a/Formula/flake.rb b/Formula/flake.rb index e9ac2312c5b0d..1d34f616a02a5 100644 --- a/Formula/flake.rb +++ b/Formula/flake.rb @@ -12,6 +12,7 @@ class Flake < Formula sha256 "e521dae57260b2a71f161f16609530c854ff8ebee4252b0addf3c16b5abc982c" => :el_capitan sha256 "af8e2e83dd3c82e8cc26be91ca64e24571b34185d4f8f007725b54d37f38e2b1" => :yosemite sha256 "caae2cab90e1e392a93d47b88c5c9a9242c3740ca95e767bca61d9d267f337f9" => :mavericks + sha256 "8aa028b1632bae1f3d4365ec813e9cb4e908cfd0edaa8b55080f902ec9a28b81" => :x86_64_linux end def install diff --git a/Formula/flake8.rb b/Formula/flake8.rb index 7b26698b8e9e4..c09a8ebd7032d 100644 --- a/Formula/flake8.rb +++ b/Formula/flake8.rb @@ -12,6 +12,7 @@ class Flake8 < Formula sha256 "c69d45f5fc4c8d4626968bb9df56ee0f3bdfe746b61e527f373952ee8225992e" => :catalina sha256 "eb9d1de4ade2c8ba850b44bd8a3d8d02c04aa51b021737c61d8498a0d41c404f" => :mojave sha256 "d6c5a8a1a2ea74a8d296777d4adb4d916bae7e5ce75852b22690fe3a7c14b894" => :high_sierra + sha256 "886b6c63a0e43f3e326b3cd6027c92088790f4747dd31ba4a13a81ca14383ad7" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/flann.rb b/Formula/flann.rb index 56c4a0216a328..e04d498da248f 100644 --- a/Formula/flann.rb +++ b/Formula/flann.rb @@ -10,11 +10,21 @@ class Flann < Formula sha256 "8bee2438249ae71560fb12fd9d2b7b8a63f09d29f09d11628f8603a4c3f14d8d" => :catalina sha256 "234f35c606e1d5a6420a8ad8b26ef40234497caf757358063a71dd672d0436da" => :mojave sha256 "f23d114ea25d8dcf60d14a829d79293b6bc1b868900c8a0abae25c0c45a68bba" => :high_sierra + sha256 "1ad42e0bed47f735ed67d437ce37ee9e6898a5d95ed5761ee3496e1464d1547b" => :x86_64_linux end depends_on "cmake" => :build depends_on "hdf5" + # Fix for Linux build: https://bugs.gentoo.org/652594 + # Not yet fixed upstream: https://github.com/mariusmuja/flann/issues/369 + unless OS.mac? + patch do + url "https://raw.githubusercontent.com/buildroot/buildroot/0c469478f64d0ddaf72c0622a1830d855306d51c/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch" + sha256 "aa181d0731d4e9a266f7fcaf5423e7a6b783f400cc040a3ef0fef77930ecf680" + end + end + resource("dataset.dat") do url "https://www.cs.ubc.ca/research/flann/uploads/FLANN/datasets/dataset.dat" sha256 "dcbf0268a7ff9acd7c3972623e9da722a8788f5e474ae478b888c255ff73d981" diff --git a/Formula/flashrom.rb b/Formula/flashrom.rb index f600d31bfb695..c88b2dd1de0d1 100644 --- a/Formula/flashrom.rb +++ b/Formula/flashrom.rb @@ -10,6 +10,7 @@ class Flashrom < Formula sha256 "5770ff2e0ed9a94ee73da1ddd682405a557acc7d62dc204b6df9f996baea99dc" => :catalina sha256 "50874146b4fb2d1acd735eb3cd0fdf2cfcb5ce900b6870aa4ff3d1414c53812f" => :mojave sha256 "8db77cb559d51f3fae3c2cd75ecd64b51bb2d70a7d268676a5b6ad21b8b839f9" => :high_sierra + sha256 "e5ce5f05dcea90c0fc602b37c3c583322a8738c4c56bdbddfcf353dc2e7c0590" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/flatbuffers.rb b/Formula/flatbuffers.rb index fce88c1e0c496..2101c8e020725 100644 --- a/Formula/flatbuffers.rb +++ b/Formula/flatbuffers.rb @@ -10,6 +10,7 @@ class Flatbuffers < Formula sha256 "6af7ac37134539beb7c1003bd2cf8d1e530606cac616239acf4d2b1df31b0dbc" => :catalina sha256 "270bebda4048754554cd587d48db10ee5fe1a2795ef6e881cafd1b8f90c7af78" => :mojave sha256 "f45982e6ca71b10e59c607b9d984108e1b18fc84b8c52dd23325b6b9211e407f" => :high_sierra + sha256 "2f65e689ae162bb02cac080cc1f9ceccbbb6ed252073b1d72e2fc627937e6c3f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/flatcc.rb b/Formula/flatcc.rb index 81e53467798a6..7148abca00e78 100644 --- a/Formula/flatcc.rb +++ b/Formula/flatcc.rb @@ -10,6 +10,7 @@ class Flatcc < Formula sha256 "f1f1cd7532305f48b008fb1f3687d9369a88f184902a8992fd77789410841b4e" => :catalina sha256 "74651142d2c732bfbe671d78cdcf3357189c9b3d3cb7078bf9e882ad9ca6b053" => :mojave sha256 "9e37511cd8069fb56ff15e72f0184d1908f9d4948ebd57d2b430c760cac60aa6" => :high_sierra + sha256 "b55d64dac3320448532d11b0d073ac536d7c9532d3c82828fd71638727cc92f9" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/flawfinder.rb b/Formula/flawfinder.rb index 6b0c4dbfb38cd..7eec9ea3e6fe7 100644 --- a/Formula/flawfinder.rb +++ b/Formula/flawfinder.rb @@ -11,14 +11,18 @@ class Flawfinder < Formula sha256 "db9c5f0ba0292c17e40eafb1b26f8ec45aa56265797a6af6b23242c5f81f538e" => :catalina sha256 "db9c5f0ba0292c17e40eafb1b26f8ec45aa56265797a6af6b23242c5f81f538e" => :mojave sha256 "db9c5f0ba0292c17e40eafb1b26f8ec45aa56265797a6af6b23242c5f81f538e" => :high_sierra + sha256 "e015e43006ca2cd317c2bbc9199b80afa4f0594528b4adbe8612e46fec7dd697" => :x86_64_linux end + depends_on "python@3.8" unless OS.mac? + resource "flaws" do url "https://www.dwheeler.com/flawfinder/test.c" sha256 "4a9687a091b87eed864d3e35a864146a85a3467eb2ae0800a72e330496f0aec3" end def install + inreplace "flawfinder", "#!/usr/bin/env python", "#!#{Formula["python@3.8"].opt_bin/"python3"}" unless OS.mac? system "make", "prefix=#{prefix}", "install" end diff --git a/Formula/fleetctl.rb b/Formula/fleetctl.rb index 85aaeb52f0ada..f4a8f698f7f2a 100644 --- a/Formula/fleetctl.rb +++ b/Formula/fleetctl.rb @@ -14,6 +14,7 @@ class Fleetctl < Formula sha256 "217f22406b9a249f6101b40605b020766547b00bb24e8c005cbdecc099251a80" => :sierra sha256 "a51e7c700bb0074445e0a0ccea938592841a49f9c858051f6ec97170e30eccd0" => :el_capitan sha256 "09492b0c1dc6af381bb22bec46b51c585db9068cda51f290dc5d2c46d91d6c48" => :yosemite + sha256 "bd2846fe30e681c787b0a01870f1f9aea290af07c137afc9ce0e53fd2c49b012" => :x86_64_linux # glibc 2.19 end depends_on "go" => :build diff --git a/Formula/flex.rb b/Formula/flex.rb index 102ad3d83001a..3007af1142257 100644 --- a/Formula/flex.rb +++ b/Formula/flex.rb @@ -10,6 +10,7 @@ class Flex < Formula sha256 "2051ed8f0de322732b111f2cc82069e82f6dfd4d839e6d098bbebcd7f92220e6" => :mojave sha256 "9c224c27a3d40a53b6f778a6b825f8b4f14654080b144e50f1bec9cc608c757d" => :high_sierra sha256 "a958106ee0895b21c7577478b847ecdbc601ce6a723543c5da455bfe0eee5f8f" => :sierra + sha256 "d96d0062e78529ae5a0ff049eeaf1216df4a5e47f2fbda680473b48b15f59d1a" => :x86_64_linux end head do @@ -44,6 +45,7 @@ def install "--enable-shared", "--prefix=#{prefix}" system "make", "install" + bin.install_symlink "flex" => "lex" unless OS.mac? end test do diff --git a/Formula/flickcurl.rb b/Formula/flickcurl.rb index d567d726e22b4..699929d1abd4b 100644 --- a/Formula/flickcurl.rb +++ b/Formula/flickcurl.rb @@ -13,10 +13,14 @@ class Flickcurl < Formula sha256 "01886ddb800167eed18495d780baa81bac793243a54d452ad9a34a06e876e4d2" => :el_capitan sha256 "64c7a8f7d2bcc90063f926724fd1bd9277f783f3aca3c83e53684222f3d1d1c3" => :yosemite sha256 "e6950b0011dce7207b3ae5c7d42a7cce71c6d6c6a35461d2f8a5423be6415184" => :mavericks + sha256 "6c86b32a14f619047b098012b44d8499b0e067a0e702c36140b71ceb2314562d" => :x86_64_linux end depends_on "pkg-config" => :build + uses_from_macos "curl" + uses_from_macos "libxml2" + def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" diff --git a/Formula/flif.rb b/Formula/flif.rb index 6535f064fd5b4..03fc3c7654f84 100644 --- a/Formula/flif.rb +++ b/Formula/flif.rb @@ -14,6 +14,7 @@ class Flif < Formula sha256 "756f685e55f7c798743756723815fb3f39d82ef92f5cc78eb175d8cea52498a3" => :sierra sha256 "3fd4e69366470a6810815d111a8e0188c627fe7d50375cd93c0da00ad6617fb2" => :el_capitan sha256 "bbd4e35f6947e3b304469031f42c3720a94c10d9fb7540eed9e7b08bef6ee319" => :yosemite + sha256 "3aa9b634a54ea22b761782b0d29bbc5a306dccbb1d194e67a26e3dfe92a01f5b" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/flint-checker.rb b/Formula/flint-checker.rb index a5fa28ab617bd..e411f120f62fa 100644 --- a/Formula/flint-checker.rb +++ b/Formula/flint-checker.rb @@ -12,6 +12,7 @@ class FlintChecker < Formula sha256 "0d246b741b5a09fcb7aa0641ba2322e55db92eb98b755f6528171e0ce82c782e" => :sierra sha256 "be77f701f14ecabf655ddbf92eb132aa0cca9413196343783032a665ce2b33c0" => :el_capitan sha256 "5dcce77a6426af8579cd283a120f6bb3b8cce384f6d4934c995dc7b23779bc51" => :yosemite + sha256 "e86502681a601784297e43b9a6e2e659b27dc191f13553faeb75bbe81fa3d907" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/flint.rb b/Formula/flint.rb index a8c137b8aafd7..002d68b5f75b8 100644 --- a/Formula/flint.rb +++ b/Formula/flint.rb @@ -10,6 +10,7 @@ class Flint < Formula sha256 "41b01ee2208f8d0218a460621bc0c7abf3191b66593148570b2c8eb471fdf5e3" => :catalina sha256 "6a28c66f7966de0a3eb2c8ce590164f3ddacfca7b7152221bd266262f682fe7d" => :mojave sha256 "0759d28fbb6175c70d6ccddc9bb9f38a38284eb28ebe2d76ddcca6d4c5ed13ec" => :high_sierra + sha256 "d9123f31984ee545ba19b593e33e6e88d3112f9edbd5489bdb95d6df036733f6" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/flow-tools.rb b/Formula/flow-tools.rb index 2af4eba2dbde4..813bda8123e6d 100644 --- a/Formula/flow-tools.rb +++ b/Formula/flow-tools.rb @@ -12,6 +12,7 @@ class FlowTools < Formula sha256 "2b41c1415b50e7123c5268dce7c656aba825a16c061691ee8eaf06e39d622cec" => :el_capitan sha256 "0d3814f50d6bc8d06c808176bc0b6f725f429b231a21eabe49fadf6729a7d27b" => :yosemite sha256 "dc15779397a7f60c67b20c314b4513133c0883a5eafb3e972e744b8a70ca1060" => :mavericks + sha256 "770f9937b332e71c017cccc37968ce979eeb90a20177d0a091187b0c55d1a344" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/flow.rb b/Formula/flow.rb index 13152bf63f5c9..3b0878bab8e87 100644 --- a/Formula/flow.rb +++ b/Formula/flow.rb @@ -10,10 +10,18 @@ class Flow < Formula sha256 "868560f0b7a49b5147c8d6a18f5f2e38bcf84ccc6a62ef98b6687b4dbbe17f22" => :catalina sha256 "c17d69ef32637f3d7bf872f436c6696562137a98f6f81070b8fb2eb04a1e5a5d" => :mojave sha256 "516210a13a585f01357021c41fa02efb54df60d21a5b600ef5d764bc51fb8ac7" => :high_sierra + sha256 "2e710aa39dec5c54a387fcdc4c210c8ebee659ef8189f9d092c5f70007a4b233" => :x86_64_linux end depends_on "ocaml" => :build depends_on "opam" => :build + unless OS.mac? + depends_on "rsync" => :build + depends_on "elfutils" + end + + uses_from_macos "m4" => :build + uses_from_macos "unzip" => :build def install system "make", "all-homebrew" diff --git a/Formula/fltk.rb b/Formula/fltk.rb index e147c32a77cbc..d6a3bc4b31d5c 100644 --- a/Formula/fltk.rb +++ b/Formula/fltk.rb @@ -4,16 +4,22 @@ class Fltk < Formula url "https://www.fltk.org/pub/fltk/1.3.5/fltk-1.3.5-source.tar.gz" mirror "https://dl.bintray.com/homebrew/mirror/fltk-1.3.5.tar.gz" sha256 "8729b2a055f38c1636ba20f749de0853384c1d3e9d1a6b8d4d1305143e115702" + revision 1 unless OS.mac? bottle do sha256 "d0ff3728a8da506e399b094b0e2a94ffef5a32805308d73fd2fb5fd0e402c88b" => :catalina sha256 "3ea6ccc2fec9151f3ed0f20761794b9fe0477d168dbc4e83ba88b3f3d16c530b" => :mojave sha256 "6edac0b91f19783376ec95c84819405a6f029d7d2bf8ac636d421682fc064e34" => :high_sierra sha256 "e2bd28a348c8fbf948f2400d3df29ba786a2ca9cc3f87b3727477fb49ebf57f0" => :sierra + sha256 "583f088d721b39ddb7fb790aaf64e705f9148488e65a4ee6ff120c4acd9c0ac9" => :x86_64_linux end depends_on "jpeg" depends_on "libpng" + unless OS.mac? + depends_on "linuxbrew/xorg/xorg" + depends_on "mesa" + end def install system "./configure", "--prefix=#{prefix}", diff --git a/Formula/fluent-bit.rb b/Formula/fluent-bit.rb index d1aef9ece57b7..af48c1b1a0f20 100644 --- a/Formula/fluent-bit.rb +++ b/Formula/fluent-bit.rb @@ -10,6 +10,7 @@ class FluentBit < Formula sha256 "a7e1c21fca506273c4c55803069f356767c3a761f88b4e6aad31af50f338852c" => :catalina sha256 "f1a7202594bce8b54583ad45972784d31fe6f076caa1dd3c14c74157def88198" => :mojave sha256 "e1ade0ab0cca8cf718836fb0d1cd72bfed7a669e493b41b488c09816eafcc20c" => :high_sierra + sha256 "8f22ddafe7ee2957228fbeddc3cd4362d9ebf3c548f1610daf23d4ac8ecf7838" => :x86_64_linux end depends_on "bison" => :build @@ -19,6 +20,9 @@ class FluentBit < Formula conflicts_with "mbedtls", :because => "fluent-bit includes mbedtls libraries." conflicts_with "msgpack", :because => "fluent-bit includes msgpack libraries." + # Don't install service files + patch :DATA unless OS.mac? + def install # Work around Xcode 11 clang bug ENV.append_to_cflags "-fno-stack-check" if DevelopmentTools.clang_build_version >= 1010 @@ -37,3 +41,36 @@ def install assert_equal "Fluent Bit v#{version}", output end end +__END__ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 54b3b291..72fd1088 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -316,27 +316,6 @@ if(FLB_BINARY) + ENABLE_EXPORTS ON) + install(TARGETS fluent-bit-bin RUNTIME DESTINATION ${FLB_INSTALL_BINDIR}) + +- # Detect init system, install upstart, systemd or init.d script +- if(IS_DIRECTORY /lib/systemd/system) +- set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") +- configure_file( +- "${PROJECT_SOURCE_DIR}/init/systemd.in" +- ${FLB_SYSTEMD_SCRIPT} +- ) +- install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) +- install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) +- elseif(IS_DIRECTORY /usr/share/upstart) +- set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") +- configure_file( +- "${PROJECT_SOURCE_DIR}/init/upstart.in" +- ${FLB_UPSTART_SCRIPT} +- ) +- install(FILES ${FLB_UPSTART_SCRIPT} DESTINATION /etc/init) +- install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) +- else() +- # FIXME: should we support Sysv init script ? +- endif() +- + install(FILES + "${PROJECT_SOURCE_DIR}/conf/fluent-bit.conf" + DESTINATION ${FLB_INSTALL_CONFDIR} diff --git a/Formula/fluid-synth.rb b/Formula/fluid-synth.rb index 3e1aa8e37ccf1..e43f7d84a14c9 100644 --- a/Formula/fluid-synth.rb +++ b/Formula/fluid-synth.rb @@ -10,6 +10,7 @@ class FluidSynth < Formula sha256 "20b95c9a3233fb35ea30f4942e7bd9d9c5eb560ff471bece810aa9b0b753615a" => :catalina sha256 "4bb28e3e5539e606f6fa41267a483b3cad254918ecf4859402a30d524a9598b7" => :mojave sha256 "8f55c689efeaf1dd86b761bb8c026bb87f71262411686d8bdb00cd068405c19a" => :high_sierra + sha256 "77ec5d9f51fca6989f6de6c082c99a54830d0d0d0cf18129dea9d48875d69415" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/fluxctl.rb b/Formula/fluxctl.rb index 916d60fa87e5d..f381e2e010ece 100644 --- a/Formula/fluxctl.rb +++ b/Formula/fluxctl.rb @@ -10,6 +10,7 @@ class Fluxctl < Formula sha256 "da417f17fc62357716eb3030f0661531ebbcc3abf65a627d555ff05541968109" => :catalina sha256 "6b57426d070a0049ec7578fe1aeb7a2cb90863c76019a7056ad406d67e731b9b" => :mojave sha256 "de762c286e68c2870a6eb1d93bd8dcfb4f85c9d294efb469c7c09a2e0c3b7807" => :high_sierra + sha256 "6ea303cdec22eb8a982305bb7c21f2e23cdfcb55bfaeb3e9a69426adc81bdd9c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/flvmeta.rb b/Formula/flvmeta.rb index 2d6ed39d277c5..aebbb907d0841 100644 --- a/Formula/flvmeta.rb +++ b/Formula/flvmeta.rb @@ -10,6 +10,7 @@ class Flvmeta < Formula sha256 "bb16f5006d22ffaebba50c0d9c5cc962cf73dfcf1ca51d1e69735908ef9aa8cd" => :catalina sha256 "176a5edcfbe2da366e27f67590c45870b59ad250cc7f2a51d7a8d0a18f12632b" => :mojave sha256 "2ef376486588157dc4e17914ab8ba62a1689aaf92fe101613f93fd0d05018fee" => :high_sierra + sha256 "b05b75b94edc1a9590e8a7994bae81372ff4aa2b11f77d7261801d35e0aa4950" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/flvstreamer.rb b/Formula/flvstreamer.rb index b718e61ea517b..dba9052f27be6 100644 --- a/Formula/flvstreamer.rb +++ b/Formula/flvstreamer.rb @@ -14,6 +14,7 @@ class Flvstreamer < Formula sha256 "5a4b649ce0f2c32bca4091f4867a37cca0e8ae2a292d4ef29aa2949530bdd651" => :el_capitan sha256 "243e6ce44b77212ff84e3a739bf2b203c687bdcdd36b17ba24daa5335bf0a151" => :yosemite sha256 "26ba92a604070dd27301456d120121618865108b33089191cd7ddcee78fbc465" => :mavericks + sha256 "23dcc8826feee8b48a0161f1d8a88a18c3f8312effb91cf8459cd0aa4bcd2ad6" => :x86_64_linux end conflicts_with "rtmpdump", :because => "both install 'rtmpsrv', 'rtmpsuck' and 'streams' binary" diff --git a/Formula/fmdiff.rb b/Formula/fmdiff.rb index 5dc273845cd99..d2dd5cc15912d 100644 --- a/Formula/fmdiff.rb +++ b/Formula/fmdiff.rb @@ -16,6 +16,7 @@ class Fmdiff < Formula sha256 "59d9c9d8a8759531a2f715619cfb2bce404fc7378235cf416ea5a426eb8d967f" => :yosemite end + depends_on :macos # Needs FileMerge.app, which is part of Xcode. depends_on :xcode diff --git a/Formula/fmsx.rb b/Formula/fmsx.rb index 3275f8f34b8c9..515f4532c8ce9 100644 --- a/Formula/fmsx.rb +++ b/Formula/fmsx.rb @@ -12,10 +12,15 @@ class Fmsx < Formula sha256 "888f28e2d549ffcd8507c126c18047c64f36670a0d6d86d9469bceb47245c0e3" => :high_sierra sha256 "dd7617947a4e85063cc5d41fc82eabdd54a3d456475533ad65431d1f2fd6338a" => :sierra sha256 "f17025b7856d7e9fc17d58361a8686bd6d27b4182e28632b0e9d797d0fcf22f9" => :el_capitan + sha256 "971ab144eb143004d31676ed8912a0b5a6d5d5e8702933a85a0c10488377f7c7" => :x86_64_linux end depends_on "pulseaudio" - depends_on :x11 + if OS.mac? + depends_on :x11 + else + depends_on "linuxbrew/xorg/xorg" + end resource "msx-rom" do url "https://fms.komkon.org/fMSX/src/MSX.ROM" diff --git a/Formula/fmt.rb b/Formula/fmt.rb index 774c269090adb..e9d6d5744bab6 100644 --- a/Formula/fmt.rb +++ b/Formula/fmt.rb @@ -6,10 +6,11 @@ class Fmt < Formula revision 2 bottle do - cellar :any + cellar :any_skip_relocation sha256 "ab53db378762d5a7744f96ffb3e6fc9d44703b4423298cfeebcdc26cc288f5f9" => :catalina sha256 "8874900fa95b68d911ee47ce094f8912f553a1dd44f9c4859f0aeddd15ece3c8" => :mojave sha256 "2e3f82778b491b5178d21d0f22addc28fdccc59e140fe319ea7d7da73134f728" => :high_sierra + sha256 "7715bd46b7124624237a3224e77fab07d309709e8113e9f749f385c048fa2825" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/fn.rb b/Formula/fn.rb index 1ec608abbf2bd..2de0079cd8779 100644 --- a/Formula/fn.rb +++ b/Formula/fn.rb @@ -9,6 +9,7 @@ class Fn < Formula sha256 "5eb21502246114af81fe5f67ec417f2189462f48835a98fdedac7743d8f95f1d" => :catalina sha256 "d7024599378ea5ecc58c37ddb0997a637eeae3dfc53fab38b6463763b4f5ec5f" => :mojave sha256 "ed17e209a661f02aae3054da392abb343fea763362b7db07cc75a68b2df621be" => :high_sierra + sha256 "6f4da47b84f5046863a7e3aa39da39780177e46a737c6009809aa287bd1e4235" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/folly.rb b/Formula/folly.rb index dcddb8bf9eef1..8ea4103c6e044 100644 --- a/Formula/folly.rb +++ b/Formula/folly.rb @@ -22,19 +22,23 @@ class Folly < Formula depends_on "libevent" depends_on "lz4" # https://github.com/facebook/folly/issues/966 - depends_on :macos => :high_sierra + depends_on :macos => :high_sierra if OS.mac? + depends_on "openssl@1.1" depends_on "snappy" depends_on "xz" depends_on "zstd" + unless OS.mac? + depends_on "jemalloc" + depends_on "python" + end def install mkdir "_build" do - args = std_cmake_args + %w[ - -DFOLLY_USE_JEMALLOC=OFF - ] + args = std_cmake_args + args << "-DFOLLY_USE_JEMALLOC=#{OS.mac? ? "OFF" : "ON"}" - system "cmake", "..", *args, "-DBUILD_SHARED_LIBS=ON" + system "cmake", "..", *args, "-DBUILD_SHARED_LIBS=ON", ("-DCMAKE_POSITION_INDEPENDENT_CODE=ON" unless OS.mac?) system "make" system "make", "install" diff --git a/Formula/foma.rb b/Formula/foma.rb index 5a7c573a04816..ef9cf306c1f85 100644 --- a/Formula/foma.rb +++ b/Formula/foma.rb @@ -3,6 +3,7 @@ class Foma < Formula homepage "https://code.google.com/p/foma/" url "https://bitbucket.org/mhulden/foma/downloads/foma-0.9.18.tar.gz" sha256 "cb380f43e86fc7b3d4e43186db3e7cff8f2417e18ea69cc991e466a3907d8cbd" + revision 1 unless OS.mac? bottle do cellar :any @@ -13,6 +14,12 @@ class Foma < Formula sha256 "d50dfd48bb3418d809c7c95d6046a59f550e2089d7e6dbb80327015894f073e1" => :el_capitan sha256 "2113796151927413c1bc640f19d8a62083628a1a124657d5d6ca5c9e087b19dd" => :yosemite sha256 "19b54c8f060b5adf9e6a0c37a6e59dcf20017b6ae1fe642ea373f0ee0a03f01f" => :mavericks + sha256 "f7444994d9cf9a6f091c11b33850b5f9926d7eed7b4dca22795bca79c71e1e73" => :x86_64_linux + end + + unless OS.mac? + depends_on "readline" + depends_on "zlib" end uses_from_macos "zlib" diff --git a/Formula/fondu.rb b/Formula/fondu.rb index d0193a08dfc85..33c5af8a8d924 100644 --- a/Formula/fondu.rb +++ b/Formula/fondu.rb @@ -14,6 +14,7 @@ class Fondu < Formula sha256 "c4fadd6744370dc946b7dde1ec8329335146257ad60b829f9f4024912859d7db" => :el_capitan sha256 "dfeddb29a48dcf4db6aaf8170b54137fb329e216a4f83f47ddf262a984ab469e" => :yosemite sha256 "cc8bb3c5213b0b792929fa1658077da60717993f0dbdaa56c0fe6004930309f4" => :mavericks + sha256 "85493aec06ad2eefcb7ea6bd71425034258e345db7a05329876bf4bbc2793347" => :x86_64_linux # glibc 2.19 end conflicts_with "cspice", :because => "both install `tobin` binaries" diff --git a/Formula/fontconfig.rb b/Formula/fontconfig.rb index 4af0635bbc8b9..2a585d27b38c4 100644 --- a/Formula/fontconfig.rb +++ b/Formula/fontconfig.rb @@ -3,6 +3,7 @@ class Fontconfig < Formula homepage "https://wiki.freedesktop.org/www/Software/fontconfig/" url "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.1.tar.bz2" sha256 "f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741" + revision 1 unless OS.mac? bottle do sha256 "64ff208b28613dfe2a65b9d74fd9b0129f3ca7e423db78329144cdaf51b36f70" => :catalina @@ -10,13 +11,14 @@ class Fontconfig < Formula sha256 "3b763143a4d6e3c74b3a8b237d2e5a383696347ea3599d07957f73a3f6521d23" => :high_sierra sha256 "631531c4eb502bd97e4a5bef30760d1eef87dd50306ef2defb9460ac3338cfe1" => :sierra sha256 "40d70137a970e257de5cf1251b10d56d7db835faee88a9f4c020b4a4e4f82eb1" => :el_capitan + sha256 "2aa79674e60e88f1afc613ed65d8e6e0e32f9b19eee7df7afb394b6357555caf" => :x86_64_linux end pour_bottle? do - reason "The bottle needs to be installed into /usr/local." + reason "The bottle needs to be installed into #{Homebrew::DEFAULT_PREFIX}." # c.f. the identical hack in lua # https://github.com/Homebrew/homebrew/issues/47173 - satisfy { HOMEBREW_PREFIX.to_s == "/usr/local" } + satisfy { HOMEBREW_PREFIX.to_s == Homebrew::DEFAULT_PREFIX } end head do @@ -30,6 +32,12 @@ class Fontconfig < Formula depends_on "pkg-config" => :build depends_on "freetype" + unless OS.mac? + depends_on "gperf" => :build + depends_on "gettext" => :build + depends_on "json-c" => :build + depends_on "util-linux" # for libuuid + end uses_from_macos "bzip2" uses_from_macos "expat" @@ -48,6 +56,7 @@ def install font_dirs << Dir["/System/Library/Assets{,V2}/com_apple_MobileAsset_Font*"].max if MacOS.version >= :sierra system "autoreconf", "-iv" if build.head? + ENV["UUID_CFLAGS"] = "-I#{Formula["util-linux"].include}" unless OS.mac? system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", "--enable-static", diff --git a/Formula/fontforge.rb b/Formula/fontforge.rb index f58baf9595c06..a8caa987d488d 100644 --- a/Formula/fontforge.rb +++ b/Formula/fontforge.rb @@ -9,6 +9,7 @@ class Fontforge < Formula sha256 "6d2000c43d84a3353e7e27923c62ced0e5892338e69c6d341e61194cc70c1b4a" => :catalina sha256 "3c94c039f0524bdf6e4748f65b7677c9d73ecd07718221dbc8eb1c143fe236d1" => :mojave sha256 "1252f93604edae781fd5035ba5c367d820e341c13eec155bb24cf9ad5499dc4a" => :high_sierra + sha256 "4663ac9aa9d38b3c458463e4cb2f0e8bee8c47e117018796e31f02e18a55bb1e" => :x86_64_linux end depends_on "cmake" => :build @@ -39,6 +40,13 @@ class Fontforge < Formula sha256 "3deed4d79a1fdf5fb6de2fca7da8ffe14301acbeb015441574a7a28e902561f5" end + unless OS.mac? + patch do + url "https://github.com/fontforge/fontforge/commit/297ee9b5d6db5970ca17ebe5305189e79a1520a1.patch?full_index=1" + sha256 "36efb35aa54b4286ef05b2047e716c19027aac0633ef5284a614f76d43e48eec" + end + end + def install mkdir "build" do system "cmake", "..", @@ -55,6 +63,8 @@ def install end def caveats + return unless OS.mac? + <<~EOS This formula only installs the command line utilities. diff --git a/Formula/fonttools.rb b/Formula/fonttools.rb index 20c941668416b..cd328525d7cd6 100644 --- a/Formula/fonttools.rb +++ b/Formula/fonttools.rb @@ -12,6 +12,7 @@ class Fonttools < Formula sha256 "3d30c6decd463bbdceb1475bdb555fd04d791867237dd6d05a428a4d719c842c" => :catalina sha256 "0aca64c1194c4a952f5bb30bd0c65c1ad5d2064346c7c20e6ae578543149213a" => :mojave sha256 "53971cbe63b47de282cbfd82b2155a78bb9c265a09c5b799f8a84b9b5bee525a" => :high_sierra + sha256 "1b681487f6d05f61af00264b4f0824a71039145c938d1a83776c47693c7042ed" => :x86_64_linux end depends_on "python@3.8" @@ -21,6 +22,10 @@ def install end test do + unless OS.mac? + assert_match "usage", shell_output("#{bin}/ttx -h") + return + end cp "/System/Library/Fonts/ZapfDingbats.ttf", testpath system bin/"ttx", "ZapfDingbats.ttf" end diff --git a/Formula/forcecli.rb b/Formula/forcecli.rb index 020cca9cd7b59..a48911706b483 100644 --- a/Formula/forcecli.rb +++ b/Formula/forcecli.rb @@ -10,6 +10,7 @@ class Forcecli < Formula sha256 "b4e2f2425b38eb74ed2cff1b2ab9bfb99210f5a527bc82f3c2abafbd4a21d94e" => :catalina sha256 "168945571441dec3ee1eece262ab3f8363e831a4ff585748355b31a59de24feb" => :mojave sha256 "6597c18df4c105cda4053a33da3536c16bb5560d46caeb28b0040c4e50fa3d75" => :high_sierra + sha256 "c4859dc2e6593ea29fa6ef1d30ad93a2ae9b72247d6a8d56366b5ac79ffdfbcc" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/forego.rb b/Formula/forego.rb index 34b3ff7724588..9b192f887ae27 100644 --- a/Formula/forego.rb +++ b/Formula/forego.rb @@ -12,6 +12,7 @@ class Forego < Formula sha256 "5a855ce2b4f4bd2349b6814c11ec85f788a9be510aff4f18df582141dbc15295" => :high_sierra sha256 "5a4b9261fb91507df08c7c840134a21effb2b407aa5e84474b2900f8d436f3ca" => :sierra sha256 "77720ca90705c26a92248cd822d4a3b0cef329c5b16e2da62a7815cfd61f0ce2" => :el_capitan + sha256 "6acb008c96279e493cbfff1de4a48115cb2e416ee09f542982010f6cbc578df7" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/foremost.rb b/Formula/foremost.rb index 79d5bfbad2a86..e86c483d47b88 100644 --- a/Formula/foremost.rb +++ b/Formula/foremost.rb @@ -10,6 +10,7 @@ class Foremost < Formula sha256 "3ce88077de06f1f58980822adeed92ca6db4b32bad5ed24aa3912dc8f0a1a47f" => :catalina sha256 "2255dbe5608916e081e46f1d332fcfc9b47265630827a472c4166daa061ea373" => :mojave sha256 "4411ec156c431a8715ba5d74f101c8f4e54793001424729dde2e305abf570558" => :high_sierra + sha256 "d53c33f12d60d6c5f3c193733f404a8ac4060da6ff8661ac1c536bda7b0d419e" => :x86_64_linux end def install @@ -19,7 +20,12 @@ def install s.change_make_var! "RAW_FLAGS", ENV.cflags end - system "make", "mac" + if OS.mac? + system "make", "mac" + else + inreplace "config.c", "/usr/local/etc/", "#{etc}/" + system "make" + end bin.install "foremost" man8.install "foremost.8.gz" diff --git a/Formula/fork-cleaner.rb b/Formula/fork-cleaner.rb index dcceff86076d6..044db1b60a7f3 100644 --- a/Formula/fork-cleaner.rb +++ b/Formula/fork-cleaner.rb @@ -9,6 +9,7 @@ class ForkCleaner < Formula sha256 "353d7a6cf72270b7b1b781a2a54d6c2988df13ad0d1bedbd7a4a95df57d3a80e" => :catalina sha256 "de0183023d54445aa5e7cd5820fdfb1330940d349e47f0dfb6dfbf78280f5e26" => :mojave sha256 "c9497f1b6cc8f4435cae83456ac2e5d605877345fb3dc05dbbc872eaeb0cc52b" => :high_sierra + sha256 "c4e2f919ebe646d1eeae9747aa1701178634e4eefef3f11d4c71d064980cf4fc" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/fortio.rb b/Formula/fortio.rb index 642d83229d75e..31fdbc299e64b 100644 --- a/Formula/fortio.rb +++ b/Formula/fortio.rb @@ -9,6 +9,7 @@ class Fortio < Formula sha256 "2cd5f952ee237726111ca74eabafe3fe8d6919c7cb80d88ccbc9b9fff3879005" => :catalina sha256 "ad39cabb8431d494e792b876cc5e65e0b2435017efde93f2f2377ecbd7aa0d17" => :mojave sha256 "7a2409781ec75daad59705b014a4357dd503c05037b02c18bd7b853a94eeea75" => :high_sierra + sha256 "5b089e8bc6a4ddb255c8b82d54c3222e15179cbed6f330c8574f996cfbe030ae" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/fortune.rb b/Formula/fortune.rb index 4c9ffdc7524aa..b40b2e71262bb 100644 --- a/Formula/fortune.rb +++ b/Formula/fortune.rb @@ -11,6 +11,7 @@ class Fortune < Formula sha256 "f635d0fc0504922ba1bfae451f17b874ea96cffb85dead0913adb9da0669738e" => :mojave sha256 "b650a61e6b39e9f12179140e0d2b23c0c606e7f29e64851aac5df4e376d77130" => :high_sierra sha256 "c6fe1b893c31bc71b2c24de5bcc0a84fbd5025091d796250a7ef4ff6e406eea7" => :sierra + sha256 "6ff8724977c8a28f7c3ce511ea295cd6ad8d055d67c69984403b6db5a6c2d616" => :x86_64_linux end def install diff --git a/Formula/fossil.rb b/Formula/fossil.rb index 780c86e4efd43..2df94205b049d 100644 --- a/Formula/fossil.rb +++ b/Formula/fossil.rb @@ -10,9 +10,11 @@ class Fossil < Formula sha256 "186fcbf32d112fa6ae7f38c4f5c8ad3808bd3ae910a596fdecfa878ce6a98e75" => :catalina sha256 "16056fa1186ab2aa51b6e4d5cb1c29be8c8b70819f814a4e0f41015bd3c8794b" => :mojave sha256 "21e95d61a0ec2e904887063073a629cba63267658b0611abf4a6f1de64ec67b0" => :high_sierra + sha256 "92ad5ebeab397dcd0daa0b0d30d4ac0760990ca2f902084abbc353e6729e8784" => :x86_64_linux end depends_on "openssl@1.1" + uses_from_macos "zlib" def install @@ -24,7 +26,7 @@ def install "--disable-fusefs", ] - args << if MacOS.sdk_path_if_needed + args << if OS.mac? && MacOS.sdk_path_if_needed "--with-tcl=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework" else "--with-tcl-stubs" @@ -36,6 +38,9 @@ def install end test do - system "#{bin}/fossil", "init", "test" + # fix for CircleCI, where fossil cannot detect the user it is + # running as + args = %w[-A alice] unless ENV["USER"] + system "#{bin}/fossil", "init", *args, "test" end end diff --git a/Formula/fourstore.rb b/Formula/fourstore.rb index aa1eee8162c6f..197ca4190671f 100644 --- a/Formula/fourstore.rb +++ b/Formula/fourstore.rb @@ -10,6 +10,7 @@ class Fourstore < Formula sha256 "9743086b58984f5b97820b6c591edcbf551f60ae49c9f655c577f7ca50e3de23" => :mojave sha256 "abfb1051513308bda54e9e7a6c3e62dad74feafa46e6b739fb33405efb0153e4" => :high_sierra sha256 "7a89fcec9a355a501880289ab072d95219e760aad3102f9332a2e7310346155f" => :sierra + sha256 "9ccb65b284e0b3c48492686ee1fc200296c80a08aaa0fa57f5199fce9723cdb8" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/fplll.rb b/Formula/fplll.rb index 9acc8b5e95729..2ee89ea8a7b41 100644 --- a/Formula/fplll.rb +++ b/Formula/fplll.rb @@ -8,6 +8,7 @@ class Fplll < Formula sha256 "9201144fd0ef7be11fd0f2ee3f860fc62efa4202c46be0f47540198b11f8202a" => :catalina sha256 "099b4cc18fe92f4a19d0ba8113190524bd24814dc967addb6c149aca32ec90c7" => :mojave sha256 "6f73bbf1c544b88e525c1fbd17594d4a77c5dc10b283d5308b6f816fcac9cfc9" => :high_sierra + sha256 "873c68392f4ac1c20212b12f31cb7ab3047f2c24b478a97e78f3d62d18c0d422" => :x86_64_linux end depends_on "automake" => :build diff --git a/Formula/freedink.rb b/Formula/freedink.rb index 11b88beec3dd0..f8e59e4c8ba36 100644 --- a/Formula/freedink.rb +++ b/Formula/freedink.rb @@ -10,6 +10,7 @@ class Freedink < Formula sha256 "b971d9badc94cb0075963c341ed11c1872e3157b279def6d91fd088743b5e5e4" => :catalina sha256 "d44bcab516f79beec47a1ebdc8ec68b66071a34e17abb8556407a3656946d454" => :mojave sha256 "d022642338ba2979982088f1b65d6230ab71478fdaadfe4966372aa15b909182" => :high_sierra + sha256 "5a5a09f073341dce77b876a45529f1062f02d4b4d4d8564da6814c898321a8b3" => :x86_64_linux end depends_on "glm" => :build diff --git a/Formula/freeglut.rb b/Formula/freeglut.rb index b85f16ea7dbf0..c6deedf204e39 100644 --- a/Formula/freeglut.rb +++ b/Formula/freeglut.rb @@ -9,10 +9,15 @@ class Freeglut < Formula sha256 "48bb8108331861a7f4d1ce70472c53ee8a0f4aec75857f1bfc0ab56a59e53787" => :catalina sha256 "fdc12ba4122ba3128551768b8abddd4815287a5d5b4ffdc6e00008828c43dd43" => :mojave sha256 "c29f4c83e001ee7e6a751769f72b20e5096f30eccf287ca2c572088896e92833" => :high_sierra + sha256 "91a0e2c908e1393985e726adbe1fff0a25ce3f330f2f848422d9d2a8d949854f" => :x86_64_linux end depends_on "cmake" => :build - depends_on :x11 + depends_on :x11 if OS.mac? + unless OS.mac? + depends_on "linuxbrew/xorg/glu" + depends_on "linuxbrew/xorg/xorg" + end patch :DATA diff --git a/Formula/freeimage.rb b/Formula/freeimage.rb index 19fe8c63dc404..d6f6a815546bf 100644 --- a/Formula/freeimage.rb +++ b/Formula/freeimage.rb @@ -12,11 +12,17 @@ class Freeimage < Formula sha256 "f3372b5ce748afa7c99da67a593c3e1f112b5aa4b28b36da6a17ee4428158c68" => :high_sierra sha256 "24423414222aa7c629f53aadeef266a1e7f3aa50e4138f4a876eadaba634d6c6" => :sierra sha256 "cf6a38a128929d3202ffbca5443ee07268d2de2360126353449b698e56830e15" => :el_capitan + sha256 "62b5cf37deaf4cae92143839f28ae7265cc6966812853797723fb8554069c3e7" => :x86_64_linux end patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/4dcf528/freeimage/3.17.0.patch" - sha256 "8ef390fece4d2166d58e739df76b5e7996c879efbff777a8a94bcd1dd9a313e2" + if OS.mac? + url "https://raw.githubusercontent.com/Homebrew/formula-patches/4dcf528/freeimage/3.17.0.patch" + sha256 "8ef390fece4d2166d58e739df76b5e7996c879efbff777a8a94bcd1dd9a313e2" + else + url "https://gist.githubusercontent.com/davydden/5a4f348108d3c9110299/raw/3396840ff71c639d848ce552de9124462777ab97/freeimage.patch" + sha256 "537a4045d31a3ce1c3bab2736d17b979543758cf2081e97fff4d72786f1830dc" + end end def install diff --git a/Formula/freeradius-server.rb b/Formula/freeradius-server.rb index 1a015dbcc050d..bc3c643fdd45e 100644 --- a/Formula/freeradius-server.rb +++ b/Formula/freeradius-server.rb @@ -9,6 +9,7 @@ class FreeradiusServer < Formula sha256 "c3174a08eaeabce252f16224d93fcb1503584ac6b2d7733a6e80eb558cfefee5" => :catalina sha256 "4c4dc47fe8af598594c4dd24184f7b5400e383e7649c6f6aa98f1663997b04ec" => :mojave sha256 "2c8d33eddc1311f098175f2854173bbd4181d9f20fa0d1807950a84198fca6e1" => :high_sierra + sha256 "67907844fd264fccc9d4016ad6462f40b3e9b1c7389611c1a6ba9fb6ad8b678c" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/freerdp.rb b/Formula/freerdp.rb index b2f84e30f2003..e092e7a365876 100644 --- a/Formula/freerdp.rb +++ b/Formula/freerdp.rb @@ -8,25 +8,45 @@ class Freerdp < Formula sha256 "5aaaf5a31822a94384dbeed8f4ed04b66fb968861a1f5133051db887175e6c8f" => :catalina sha256 "7024bbfebf08a530f187f83dbec0529815457c6674cbb46fa95fc539228d2db3" => :mojave sha256 "1126a823dceca1dc64710bbad2d66f584a96abd53e29187e4a2620cd7c18e182" => :high_sierra + sha256 "24b53ace2f87dceb9fcf101a6c36742d587a2e28e3076f9efe4e67a0b5e40f78" => :x86_64_linux end head do url "https://github.com/FreeRDP/FreeRDP.git" - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? end depends_on "cmake" => :build depends_on "pkg-config" => :build depends_on "libusb" depends_on "openssl@1.1" - depends_on :x11 + depends_on :x11 if OS.mac? + unless OS.mac? + depends_on "alsa-lib" + depends_on "ffmpeg" + depends_on "glib" + depends_on "systemd" + depends_on "linuxbrew/xorg/xorg" + depends_on "linuxbrew/xorg/wayland" + end def install - system "cmake", ".", *std_cmake_args, "-DWITH_X11=ON", "-DBUILD_SHARED_LIBS=ON" + cmake_args = std_cmake_args + cmake_args << "-DWITH_X11=ON" << "-DBUILD_SHARED_LIBS=ON" + unless OS.mac? + cmake_args << "-DWITH_CUPS=OFF" + # cmake_args << "-DWITH_FFMPEG=OFF" + # cmake_args << "-DWITH_ALSA=OFF" + # cmake_args << "-DWITH_LIBSYSTEMD=OFF" + end + system "cmake", ".", *cmake_args system "make", "install" end test do + # failed to open display + return if ENV["CI"] + success = `#{bin}/xfreerdp --version` # not using system as expected non-zero exit code details = $CHILD_STATUS raise "Unexpected exit code #{$CHILD_STATUS} while running xfreerdp" if !success && details.exitstatus != 128 diff --git a/Formula/freeswitch.rb b/Formula/freeswitch.rb index 25e38a97a3a94..d6476ff6c2f41 100644 --- a/Formula/freeswitch.rb +++ b/Formula/freeswitch.rb @@ -39,6 +39,11 @@ class Freeswitch < Formula depends_on "util-linux" end + unless OS.mac? + depends_on "libedit" + depends_on "zlib" + end + # https://github.com/Homebrew/homebrew/issues/42865 #----------------------- Begin sound file resources ------------------------- diff --git a/Formula/freetds.rb b/Formula/freetds.rb index fd3ece8458611..eebec30d882da 100644 --- a/Formula/freetds.rb +++ b/Formula/freetds.rb @@ -8,6 +8,7 @@ class Freetds < Formula sha256 "bbfe11f4eaa9f314e19f4d6ae905070a09c3c4bb98d405515b199afcad00422d" => :catalina sha256 "91044a389fcb01cc7173d0ff888998a9836e91320f3f6f55a1a3d663cb03f229" => :mojave sha256 "bd498b68beba699326bb17fb2e4c518060cba0376da4bda5954a3613dda8aa3f" => :high_sierra + sha256 "89a7f33435a29f25c5895caaed602d06ff79820058a29d49f1d80f555242e459" => :x86_64_linux end head do diff --git a/Formula/freetype.rb b/Formula/freetype.rb index 5694f86f5a291..a4ca444715daa 100644 --- a/Formula/freetype.rb +++ b/Formula/freetype.rb @@ -10,6 +10,7 @@ class Freetype < Formula sha256 "16500bbd77b8bbeb9a4ad432c795df313c8ac108f31a28119b794000d2ba05f2" => :catalina sha256 "145f95e473addb0b3960a3d2b09ec7437bb6fc2e4083fc1161138c0be1a6921b" => :mojave sha256 "c1bca74eb0c7dea15bf7e1cc317560d002483acca010b60986c1eac92abbffbc" => :high_sierra + sha256 "201a7a42b1fdb315cebdb6b8fb9b49586fa712a892197499861a0e77234fc703" => :x86_64_linux end depends_on "libpng" diff --git a/Formula/freexl.rb b/Formula/freexl.rb index 14d939c683892..39e92af7b28ae 100644 --- a/Formula/freexl.rb +++ b/Formula/freexl.rb @@ -13,6 +13,7 @@ class Freexl < Formula sha256 "53fa9067f9cd0a809368ae614b198337f271bbe95fe0aed9fde7162b28bcbb46" => :high_sierra sha256 "876c7d693c24c6721da1a15869b3f2bf40a2ebe3d911780aaa97499ace91cad0" => :sierra sha256 "e4c2ed6d07840d5c4fb619048073eb349a8d31dbabc2f2a783fef1978c86b573" => :el_capitan + sha256 "8af0bf7289b908db95745aa98716e45bba242d2261265ba45d1a1338b11d0cea" => :x86_64_linux end depends_on "doxygen" => :build @@ -38,7 +39,11 @@ def install return 0; } EOS - system ENV.cc, "-L#{lib}", "-lfreexl", "test.c", "-o", "test" + if ENV.cc == "clang" + system ENV.cc, "-L#{lib}", "-lfreexl", "test.c", "-o", "test" + else + system ENV.cc, "test.c", "-L#{lib}", "-lfreexl", "-o", "test" + end assert_equal version.to_s, shell_output("./test") end end diff --git a/Formula/frei0r.rb b/Formula/frei0r.rb index 299b105e77fc8..2718a63014433 100644 --- a/Formula/frei0r.rb +++ b/Formula/frei0r.rb @@ -9,6 +9,7 @@ class Frei0r < Formula sha256 "5076041b5f3d76b94866ab2b97ad34523ee40cfa314e6f7d2bf460ce304de872" => :catalina sha256 "5e23b93a7ff4a2ee64c5a969b17bf6a52329e6da17c0612b46aa2ceec3fb5b39" => :mojave sha256 "a6a4648e1ff6263616f532a4648e1eb56e68d510d04e768becb2caf5ca961e3a" => :high_sierra + sha256 "f25f9922cf4e3f24143c87ab31a967485d0a1cf762144610102e2d44c3026554" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/fribidi.rb b/Formula/fribidi.rb index 951ec900141a2..027f247f50d19 100644 --- a/Formula/fribidi.rb +++ b/Formula/fribidi.rb @@ -9,6 +9,7 @@ class Fribidi < Formula sha256 "4064e6326b3ba81ba14ce6287231143295de208b47f448e9dc73c21a9c4ce513" => :catalina sha256 "ff1dc0448d33b1313bbc88915ed7fc21d15cda4991713d778ce72983bdd85335" => :mojave sha256 "3bf7f77c99b0c225610be974ccb3a3a1d364914eba7ced0ba450584e543a621c" => :high_sierra + sha256 "e8e424016943dc2a8b3c4eacdbdc42042aaa495c95ed91a119fae96f7750b76a" => :x86_64_linux end def install diff --git a/Formula/frobtads.rb b/Formula/frobtads.rb index 987e9966db7ad..80b5ad392dd97 100644 --- a/Formula/frobtads.rb +++ b/Formula/frobtads.rb @@ -10,6 +10,7 @@ class Frobtads < Formula sha256 "af5706f2616c0be86e6cfbed57ba560fa2bbdcb8b59c769c0c3e800552d51829" => :high_sierra sha256 "d3c660cd331b2a35ef36f55210e50e05e98d06fe3e5d606205ba63d226625f2b" => :sierra sha256 "cff84f9389281d4ca9c9aae8ece93384aec506ea9601e1c3d637df82776afce3" => :el_capitan + sha256 "159a06d3a2af0fa484998319a7430adcc57faea74a8524c7f7b5a7d441eca6ba" => :x86_64_linux end uses_from_macos "curl" => :build diff --git a/Formula/frpc.rb b/Formula/frpc.rb index 456d9eb64b265..4a0438e3d71af 100644 --- a/Formula/frpc.rb +++ b/Formula/frpc.rb @@ -11,6 +11,7 @@ class Frpc < Formula sha256 "364fb599b44ce0ec8d69ab3e1f788bed1ecc771997ba40e1a20d4eb3d5351979" => :catalina sha256 "1b034a2edf0aa6b0615d708647b41a59829947d767df0370bb1ee5228b8b0cd3" => :mojave sha256 "f29aa3756a8e0ba9f9fb4812b3a3828df97168dc78128daea1888e579b78d76b" => :high_sierra + sha256 "749b6fd1bc23c17220a055e81088c73be8520d792d57d84af88228260ef5d185" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/frps.rb b/Formula/frps.rb index e8ff4c3db04b6..154fa22ff9777 100644 --- a/Formula/frps.rb +++ b/Formula/frps.rb @@ -11,6 +11,7 @@ class Frps < Formula sha256 "ebc86082a21c9c7050154c679dc0f55b6e397fb05142fe11b0ec14093cf716ed" => :catalina sha256 "e128a70843505b72e81e63e1bb4dfb9615755257127c4c260836c94e648d00b1" => :mojave sha256 "11a0d53a68c156d0b9761f94f1a4a8710af73978fb33f808f2c70b02ddb5999a" => :high_sierra + sha256 "c5f75652f74b66b760253e8f93c2003707bd8a44eba0a356f9b8139e1b360b6e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/frugal.rb b/Formula/frugal.rb index 578966cc1498d..520088c9d73d2 100644 --- a/Formula/frugal.rb +++ b/Formula/frugal.rb @@ -9,6 +9,7 @@ class Frugal < Formula sha256 "6e380e2ee5e23581867d98c86cf59cbec97b345a458d1db580b7c964721145c6" => :catalina sha256 "5610bad316949a4874474e4f634207f2033c9bb2a7ae95bf825a80b91bb97987" => :mojave sha256 "4a0bce17838c38a83a264f2decada3f673eb1f4ded42e9ebb782c70ea1780e09" => :high_sierra + sha256 "1afee724f336e7055b12f1d9f42fd52f51173797f8c6a990570379043221ee63" => :x86_64_linux end depends_on "glide" => :build diff --git a/Formula/fruit.rb b/Formula/fruit.rb index 4eb3f92cba7fa..8ad6019a3f272 100644 --- a/Formula/fruit.rb +++ b/Formula/fruit.rb @@ -9,6 +9,7 @@ class Fruit < Formula sha256 "ce25f8c98746ff3d17da1f0c594cbdbbc8cb212647dde4ca3ea6d8e3943f51dd" => :catalina sha256 "88f0ff518dc1322730d89565ecc2a1dbc2bbe2f8048008429a48c44652695516" => :mojave sha256 "61eb9de4c90462f2feda154f0a08297d461ccf7f7875269aca04824180135c22" => :high_sierra + sha256 "335730d1483b07a3122250411c346d0e07e324f7007d9cd0625291ec36d0b834" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/fselect.rb b/Formula/fselect.rb index 52252ecd0dd0f..c7d3977636534 100644 --- a/Formula/fselect.rb +++ b/Formula/fselect.rb @@ -9,6 +9,7 @@ class Fselect < Formula sha256 "7efd5dc19e81217d688b06223c7803892cd95a906e842ab2000c0992ddf42ca1" => :catalina sha256 "020cb9b7a9a051042deae41ed35583e44af1e00602646a665418e5127f6a3011" => :mojave sha256 "2f25c750b2dbbf58ceddf122cbf681eb9368201bca13ed8f5664978f1eedd22b" => :high_sierra + sha256 "ce6706926cdde93889640a0193d0f9b720c4c46f00f30db889f8bed7e62288d2" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/fsevent_watch.rb b/Formula/fsevent_watch.rb index d1499e8edaa9e..49ca741a56367 100644 --- a/Formula/fsevent_watch.rb +++ b/Formula/fsevent_watch.rb @@ -16,6 +16,9 @@ class FseventWatch < Formula sha256 "900dff7d67ce9b31c9e1a3884315d8ed407cbd89358aed68fda283f7782ff2c6" => :mavericks end + # The FSEvents API is macOS-exclusive + depends_on :macos + def install bin.mkpath system "make", "install", "PREFIX=#{prefix}", "CFLAGS=-DCLI_VERSION=\\\"#{version}\\\"" diff --git a/Formula/fsevents-tools.rb b/Formula/fsevents-tools.rb index d8df82dc3de91..08a2e03c73981 100644 --- a/Formula/fsevents-tools.rb +++ b/Formula/fsevents-tools.rb @@ -23,6 +23,9 @@ class FseventsTools < Formula depends_on "pkg-config" => :build end + # The FSEvents API is macOS-exclusive + depends_on :macos + def install system "./autogen.sh" if build.head? system "./configure", "--disable-dependency-tracking", diff --git a/Formula/fsql.rb b/Formula/fsql.rb index 531cd0f1d99da..5d75c4596e344 100644 --- a/Formula/fsql.rb +++ b/Formula/fsql.rb @@ -11,6 +11,7 @@ class Fsql < Formula sha256 "7cb63d8939e7af0391938aea8a138daccbaddce50b42802d32e510772e004b9a" => :mojave sha256 "7b4353a346425e4db5d14419c4dbacf6038606778a7ce2b98ddd0fdb7c2ca233" => :high_sierra sha256 "f651c7c2dad44ee6b6f32aa699df223bd427421990f2c2c170d0928b1a31ef87" => :sierra + sha256 "34c27b72ead6d99a86b1bb575f5b3c239a0c575ba36b8fa3f66e8eaaa4efa444" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/fstrm.rb b/Formula/fstrm.rb index d7fff81726dba..c8d53afc394fb 100644 --- a/Formula/fstrm.rb +++ b/Formula/fstrm.rb @@ -9,6 +9,7 @@ class Fstrm < Formula sha256 "e84d0b8f2c27683c16e0d168a94b355cc2dcdfae2b118b943b3853579f85a829" => :catalina sha256 "d20520e5164f271d97214c4645186996ee926c3847d59e8236e6dd643edec13b" => :mojave sha256 "8a373443cef458c2384efa537867eba87a19f58a413f052dcf0ee4c6636a379b" => :high_sierra + sha256 "fb7c2b300e805d6f51999a6d76140e87bc8ea59821bdacd82bfc727a63ffa94a" => :x86_64_linux end head do diff --git a/Formula/fswatch.rb b/Formula/fswatch.rb index 9f315a1497e14..aea9d304c5cee 100644 --- a/Formula/fswatch.rb +++ b/Formula/fswatch.rb @@ -10,6 +10,7 @@ class Fswatch < Formula sha256 "7310f4dbbbdeed582cb713b3d08bf982553747cbda75eb76d2dfe00f309ed3f7" => :mojave sha256 "68cfeb10ae04d00cc90e0d87d48a61c7c22b38f386410dbf2eb6c004200ddc8a" => :high_sierra sha256 "9362bc3b3321bf0238fa70d2f2825e4118e18deb2207af3a2633b6772bb33666" => :sierra + sha256 "bff1f34b6757e0be00671d0e0c3b5d44f506243db338115da4d07e5a114b772e" => :x86_64_linux end def install diff --git a/Formula/ftgl.rb b/Formula/ftgl.rb index 4275b3da34441..e0c2f56345290 100644 --- a/Formula/ftgl.rb +++ b/Formula/ftgl.rb @@ -13,9 +13,11 @@ class Ftgl < Formula sha256 "6462eb0b97ab120639f1a191f6e3a39419bbb813abd71f5c741303dbf0aed7fb" => :el_capitan sha256 "26db05485600adfb7ead23d04fae9b1ee1d1a4b7ac304e1453ad83b4b2c39f64" => :yosemite sha256 "50a41f3c95a363b52bc367abf4b5b9dc272d71c8b35fe8e63f058c7cf7162225" => :mavericks + sha256 "6eea160488d9acf34d539e8efd45276df9171351c9b5a380eafa43919d3ed578" => :x86_64_linux # glibc 2.19 end depends_on "freetype" + depends_on "linuxbrew/xorg/glu" unless OS.mac? def install # If doxygen is installed, the docs may still fail to build. @@ -27,7 +29,8 @@ def install "--disable-freetypetest", # Skip building the example program by failing to find GLUT (MacPorts) "--with-glut-inc=/dev/null", - "--with-glut-lib=/dev/null" + "--with-glut-lib=/dev/null", + OS.mac? ? "" : "--with-gl-inc=#{Formula["linuxbrew/xorg/glu"].opt_include}" system "make", "install" end diff --git a/Formula/ftjam.rb b/Formula/ftjam.rb index d6ebed745a9d7..8c0c8684a6a23 100644 --- a/Formula/ftjam.rb +++ b/Formula/ftjam.rb @@ -13,6 +13,7 @@ class Ftjam < Formula sha256 "f94287203827dea6ac5031e695c217a48b1b69e939dcd68a489c8477b4100447" => :el_capitan sha256 "95490ead99e537713d8c26d1c1bea72b31ea06153a405867ffe83c044593caa0" => :yosemite sha256 "554e527a1e52be6ebd9f5f1fbae4e8f648f750a179936e329238dee32b32520a" => :mavericks + sha256 "08838169b289f6867243ec61ee4aa954abc316317c2c6b2a7ae2fdc243b614cc" => :x86_64_linux # glibc 2.19 end conflicts_with "jam", :because => "both install a `jam` binary" diff --git a/Formula/fuse-emulator.rb b/Formula/fuse-emulator.rb index f060bea62bc9f..0289c8045d20f 100644 --- a/Formula/fuse-emulator.rb +++ b/Formula/fuse-emulator.rb @@ -8,6 +8,7 @@ class FuseEmulator < Formula sha256 "53310374faf051b906a38e8cabac72c9b68d1c671f1c33161dee0e4b44263e16" => :mojave sha256 "007c73a4b5bd3a79b3fa49683e12672afdcc6456d0d89c53de672ec308741555" => :high_sierra sha256 "f61e728e1a3bd5c89e8f9f887f15d5d18ab37cc0af6a857547eff7314d297305" => :sierra + sha256 "643c01366b4b6022eaee9f20f71fab52e97e3c17c30176c2d44e6df9e76cfb0f" => :x86_64_linux end head do diff --git a/Formula/fuzzy-find.rb b/Formula/fuzzy-find.rb index e4331a218106b..f599542282cd7 100644 --- a/Formula/fuzzy-find.rb +++ b/Formula/fuzzy-find.rb @@ -15,6 +15,8 @@ class FuzzyFind < Formula sha256 "7db1b187adfcb7ce37842891ffca5eec3ca25bed5441944cbeb1e08bc6d52a66" => :el_capitan sha256 "1b447f73c929866935af122bec4c15390f0001f049a0c737880fcfd4d7bafdb2" => :yosemite sha256 "75aa5bedb0bd3e2869f24f1363b02ddf88f7612549c97b8f93f5d7aae0e42e63" => :mavericks + sha256 "8262f63ca68495d17b24aa74e3bad1b1f1b4c538375cc05e02639685f3942f51" => :mountain_lion + sha256 "4e08ef4ee1babfa0d28d9b541b565b5866541b5e14f92e1fcf88876cbd3362ca" => :x86_64_linux end def install diff --git a/Formula/fwup.rb b/Formula/fwup.rb index 3f30450178200..b68a157fda8e8 100644 --- a/Formula/fwup.rb +++ b/Formula/fwup.rb @@ -9,6 +9,7 @@ class Fwup < Formula sha256 "613a60321d95e32435c2522a4e29982bef728e6538490759155536c8ba4b8ec6" => :catalina sha256 "5fb03657d9139079a57cf03b1e4b51bf5259e33988f6d3ed7cd3dffad5838fb2" => :mojave sha256 "e4bbe839f3d3367e9a3c7be541ebd0825d8b7abcbee5e07dee6edee95ef054d4" => :high_sierra + sha256 "4c5327be042bb9b61540583d54e50c06bb431f45fe2a189ffa4c71ef35f7eed8" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/fx.rb b/Formula/fx.rb index da0ab1eaaa82e..23d4f616f564e 100644 --- a/Formula/fx.rb +++ b/Formula/fx.rb @@ -11,6 +11,7 @@ class Fx < Formula sha256 "578129a00faa6be9ba743f231a2ca413b5e0071da074e7e240caa95ec950c215" => :catalina sha256 "374f6c150bf3693a44d4a350e6c7c906f9cbc599b20e8865a11d516ad777fe50" => :mojave sha256 "957ee908264b5ad9c9efbd5d3f298c6eb58c4a563f7f78faa12d2ab3cd72e74a" => :high_sierra + sha256 "3b5c0abbd11b6d60b05d2f96d647099f37761b9d70ee137b0aa80a3b397cf1cd" => :x86_64_linux end depends_on "node" diff --git a/Formula/fzf.rb b/Formula/fzf.rb index 4f1d7237dba84..c42c86027dc84 100644 --- a/Formula/fzf.rb +++ b/Formula/fzf.rb @@ -10,6 +10,7 @@ class Fzf < Formula sha256 "733f79496c3246979ca05eeb5677a5fd9e8ec532e69e8b2012102cacddba8ae6" => :catalina sha256 "3c03bb9715be153a0f776d06cf4acd436ad4faa4266f7bd875a0d37594291516" => :mojave sha256 "d15a616156eb92071f1cfc50f10366532af92ca1635d309162141ad67f785865" => :high_sierra + sha256 "721f698eb50a02d7d435cb9b81099e5f0a7abfec284adbbbd48f4e5848ad28cd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/fzy.rb b/Formula/fzy.rb index e326f44c1f064..e10bce35d3108 100644 --- a/Formula/fzy.rb +++ b/Formula/fzy.rb @@ -11,6 +11,7 @@ class Fzy < Formula sha256 "2f7d67a61ad3cf284ec15d95e2f5eedaf1cf0ecb63ea2a8994df9733160b3a2b" => :mojave sha256 "fb173da3b703940c9dd8c942ced0db3c068f544be59fb01ccfe835f566d13cef" => :high_sierra sha256 "b478e2604e81faf0a2e7278afe2f811ff1739528f246fcf2556e05a81f1d3435" => :sierra + sha256 "367f83cce4f053488076a32ffbda3b5e60e072f619895dfc3b3d2e8ddb658caa" => :x86_64_linux end def install diff --git a/Formula/g2.rb b/Formula/g2.rb index e471b39d350fd..7d97fa0bc6089 100644 --- a/Formula/g2.rb +++ b/Formula/g2.rb @@ -14,6 +14,7 @@ class G2 < Formula sha256 "45c2029c3fc914866ba32966a78cba39b8415ba7f191cd1eaaf604db798b6d3f" => :el_capitan sha256 "5645b9c9401aa9f047082612de0e7bbd119ff7fd9fd49d94d45ce2adfbbfb69a" => :yosemite sha256 "41f5cd09949d53b4d46dfab4a17d5f3d77f65978ebb5e04e3433f9386d7846b4" => :mavericks + sha256 "3eff4144410ec431690c432060ec69c06e4a610f4e5e8a7159ca0d1fffd6d850" => :x86_64_linux end def install diff --git a/Formula/g3log.rb b/Formula/g3log.rb index 4b012e8b86700..374082c889a5a 100644 --- a/Formula/g3log.rb +++ b/Formula/g3log.rb @@ -9,6 +9,7 @@ class G3log < Formula sha256 "b819589f20ba980113593517ca9d54109a9a7cec22f756126021e2276a56bca4" => :catalina sha256 "1b95598a1e31c627a40d9a2b67edd10a35209dc1c426849163ee297ca05e2bc6" => :mojave sha256 "ac0ea62242bf04f640a7bd2cdd56a0ab585cef139748e47fe4d3ec118510dfd0" => :high_sierra + sha256 "fb0a95939bd2ba482c47a18a31fbf7f1ba0cfe64a79c91fc1683529c813f6eab" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/gaffitter.rb b/Formula/gaffitter.rb index cd955d9479f79..0bdad0331fb6a 100644 --- a/Formula/gaffitter.rb +++ b/Formula/gaffitter.rb @@ -13,6 +13,7 @@ class Gaffitter < Formula sha256 "1ca49d04fb786415d210d04e59c9e7ab74ada5ed6e2d429eb5793a3f34ba3562" => :el_capitan sha256 "66332311c91a27aaf93d9bfa9d8d7c7c373aad98eb80ff53efebd3b9a0c51ff7" => :yosemite sha256 "be06c31a5074d00dbf23ef22f515a8f42855aebdf0f9ee1a592c0a2581ff8279" => :mavericks + sha256 "ebc63568d08747b45fe806def9dae712185e2d9305bf641583e4fb0a233015af" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/gambit-scheme.rb b/Formula/gambit-scheme.rb index 321704e9ad196..db8bcaffaccee 100644 --- a/Formula/gambit-scheme.rb +++ b/Formula/gambit-scheme.rb @@ -9,6 +9,7 @@ class GambitScheme < Formula sha256 "cc4d0841423822b27fd424f7eba3a0482f01266ef61c25ec4b1d49d211d6c50e" => :catalina sha256 "9fc086d950cb20c99d1d24947a0599fab72525c8a2dbd2d448f94791a5a8f481" => :mojave sha256 "8af81a5c228d029402bc150331cb03dc0695eeee8dd5a58ce497a7a49a19fa47" => :high_sierra + sha256 "357ae44c4b40b7f10966151026fbd9c547b007b6487bb75f605534cc5aed46c3" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/gambit.rb b/Formula/gambit.rb index a9ae0eab6f954..bcd6cdb97ac5a 100644 --- a/Formula/gambit.rb +++ b/Formula/gambit.rb @@ -9,6 +9,7 @@ class Gambit < Formula sha256 "c1bf628cb87dbed50a0bd5299b3921545a001999af7a061343caf6aa75784cf5" => :catalina sha256 "849760c07650bf6d240e3d488ed984ef3f1520976cc402ec1afe215ac881aa08" => :mojave sha256 "f5d187618279c18de8e290151ba7683a5b68e4b96203db1a05600eb84002d391" => :high_sierra + sha256 "e4596df74b88e2d582ed9672effe84a90c6932718bd124457f691f4cb5e8406c" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/gammu.rb b/Formula/gammu.rb index 1ac8f0535946a..53a2e27096763 100644 --- a/Formula/gammu.rb +++ b/Formula/gammu.rb @@ -9,6 +9,7 @@ class Gammu < Formula sha256 "31de777eebd433187faa9f4c903e9adee6f1fc7376764819e88bf6564dec7095" => :catalina sha256 "e9436fa704b9bb1008b95f742b59f830a7fd717c24c97565f71989273a6eef58" => :mojave sha256 "fb23d0dd21c8a5f48155b3ea71f445d99ea86ce7f5c968266782fa52990a6267" => :high_sierra + sha256 "ea5fec21cd1ce78bcde5503c96e1139f43eb555a9a0c09a14e910bef6eca9ad9" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/gandi.cli.rb b/Formula/gandi.cli.rb index a89c5e6c7b47f..7067ccdfc5122 100644 --- a/Formula/gandi.cli.rb +++ b/Formula/gandi.cli.rb @@ -5,13 +5,14 @@ class GandiCli < Formula homepage "https://cli.gandi.net/" url "https://files.pythonhosted.org/packages/75/6d/ff2097a1b8f0142034394ca6832abade773a36efa0916500522b7d190264/gandi.cli-1.5.tar.gz" sha256 "a575be04fd373d4798ae16f6cbe03e8ed16255043788fb3de13bebfe7e621c84" - revision 2 + revision OS.mac? ? 2 : 3 bottle do - cellar :any + cellar :any_skip_relocation sha256 "22779ab21e92c826c99ade2c24c9a8ebd7b8ab952fcf70b7c3ddd312e0419ee7" => :catalina sha256 "4a0a55dbe51a2c20328b95fc90b8a89f6d4fc6c3118579e78d1a526a0712b351" => :mojave sha256 "987991ebd9c8be956e4e2a358e5bc1310a18f98be561b8ce007b5582d033ba3b" => :high_sierra + sha256 "8fad9e363cbe8fb2701d048cecebf8a0d478fe137b969ef95c208e3e8f25c8e1" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/garmintools.rb b/Formula/garmintools.rb index ed1036c35f6fc..b68129a226467 100644 --- a/Formula/garmintools.rb +++ b/Formula/garmintools.rb @@ -13,6 +13,7 @@ class Garmintools < Formula sha256 "dd86a8e306d3c4ebb9b94ddd4aaf60fdb79aa06fc7eb56ca95942248db33924e" => :el_capitan sha256 "62d2b45ae3d7ef7de9a8deaa658e12021f16b14008f1a91e8c747f84b0e803d3" => :yosemite sha256 "bdd96fdc8cf79cde06b330855d7899539816d08cc3b815a0ee115289cac6e30b" => :mavericks + sha256 "d45e1122bd8a9cb96000b52d911606459ed88b548c419448936687199409a6cb" => :x86_64_linux end depends_on "libusb-compat" diff --git a/Formula/gatsby-cli.rb b/Formula/gatsby-cli.rb index 4e9ea94e7bea8..bcd8175495225 100644 --- a/Formula/gatsby-cli.rb +++ b/Formula/gatsby-cli.rb @@ -11,10 +11,15 @@ class GatsbyCli < Formula sha256 "e9c0cdee15aaf6416ef7ea5837c8ce7fed8a2ee1effc1406a9a9ca2da5f2153c" => :catalina sha256 "e70ccc502aa46a029c4155244bbe2dbbbb82be975858dd7f5983f56506447726" => :mojave sha256 "41988d184bfddb66326303a2463079647692906a5a348a2ac74539c7204625a4" => :high_sierra + sha256 "eca43ea1d165106de2b53ec9b334f25f32f5ccf5ef276a78c8a6a6952d16f5dd" => :x86_64_linux end depends_on "node" + on_linux do + depends_on "linuxbrew/xorg/xorg" + end + def install system "npm", "install", *Language::Node.std_npm_install_args(libexec) bin.install_symlink Dir["#{libexec}/bin/*"] @@ -24,6 +29,8 @@ def install end test do + return if Process.uid.zero? + system bin/"gatsby", "new", "hello-world", "https://github.com/gatsbyjs/gatsby-starter-hello-world" assert_predicate testpath/"hello-world/package.json", :exist?, "package.json was not cloned" end diff --git a/Formula/gau.rb b/Formula/gau.rb index 4744d99562c6f..ee731ed760720 100644 --- a/Formula/gau.rb +++ b/Formula/gau.rb @@ -9,6 +9,7 @@ class Gau < Formula sha256 "8fbfdf238dd7408adf09c159338c48e67ee9030f80f129a3b20683a960ab4531" => :catalina sha256 "d24c1d256af7be9370ec0d12d5deddabde47885d8d2b387ce5bfb6eb0a36e05c" => :mojave sha256 "67ece09c592ad7cdab9ec296e8fbff86fb23410a149aa9bb8f7a295d55661ab7" => :high_sierra + sha256 "306ecf62ff965e5091dd7992d9f94b2021443f17925d422feb212568b5d4e82e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gaul.rb b/Formula/gaul.rb index 9b4d317457385..5f7f6d43650d3 100644 --- a/Formula/gaul.rb +++ b/Formula/gaul.rb @@ -13,6 +13,7 @@ class Gaul < Formula sha256 "0a6fb9c8ae17bb0785cc9c9da0fa0b3bf5fd6ca69b1ef8516b800d0d28d77360" => :el_capitan sha256 "8b0cb8b79f456faf4b7a8f9af2c788290b3e2eb1785f120875f2b72b4159fbf5" => :yosemite sha256 "2ce7947353b3ea8e9be3925b1e516c92cbcca5602039d91ebe729c6fb96f5a37" => :mavericks + sha256 "d409a5a6346617544ee710aa5c6178b30d182c867deedb338dcb09c16f1a0f8e" => :x86_64_linux end def install diff --git a/Formula/gawk.rb b/Formula/gawk.rb index 96df78081c109..28138559a14ad 100644 --- a/Formula/gawk.rb +++ b/Formula/gawk.rb @@ -9,6 +9,7 @@ class Gawk < Formula sha256 "581b48f781104f0c3233edc30c47628f4eec8c2f1f2e191151f367ce26ec538a" => :catalina sha256 "ddbb56c56d66f375147769a27301e2ffd099abdc07f5dfc16389af22028e185b" => :mojave sha256 "eac1b8c97c682c32a1b6c589818aa8ffb8f09630258ed6f215c882368540713e" => :high_sierra + sha256 "0f922d5a95472db2e7d5eb067b263d7cd67e03ffba20a47264b2d0c8d01bbab0" => :x86_64_linux end depends_on "gettext" @@ -23,7 +24,11 @@ def install "gl_cv_func_ftello_works=yes" # Work around a gnulib issue with macOS Catalina system "make" - system "make", "check" + if which "cmp" + system "make", "check" if OS.mac? + else + opoo "Skipping `make check` due to unavailable `cmp`" + end system "make", "install" (libexec/"gnubin").install_symlink bin/"gawk" => "awk" diff --git a/Formula/gbdfed.rb b/Formula/gbdfed.rb index 4224d49e789bf..c6b597a8998ca 100644 --- a/Formula/gbdfed.rb +++ b/Formula/gbdfed.rb @@ -11,6 +11,7 @@ class Gbdfed < Formula sha256 "00b2376a043f6e90d777bc9e5805d84da21c046f446c4dcd649b482a01cbc6cf" => :mojave sha256 "945fc3ffa7573224e7a387e6dec353ca7f3b46829f3e3728774a97c26fb0923a" => :high_sierra sha256 "e32f2b72805a1dbe768f85e33ea10c0b603789f9101b21e0fbc750ab077a12e5" => :sierra + sha256 "b94225ed5534f6560fcf757a1c4ed3c27e55d20c52e958610e9010dbd75f9a0f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/gcab.rb b/Formula/gcab.rb index c3a8373fe5df8..de73846b87422 100644 --- a/Formula/gcab.rb +++ b/Formula/gcab.rb @@ -9,6 +9,7 @@ class Gcab < Formula sha256 "7ed919ea9c7d4ec04f9d5f361f8628936e016318475fec26fdf6ef5ea56491cc" => :catalina sha256 "c9ef02142502a47b006db735b87fe7d55611d46ecc087c697d3142ce8bd9c27a" => :mojave sha256 "ca3d97d649c89be881528e7a7cf42f51c18c3a8e4c4b47c9a5fad29f355afd30" => :high_sierra + sha256 "160912613dfff2859dd1a54371147fa890094c440bd34769f4b3889634d9ac68" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -19,6 +20,11 @@ class Gcab < Formula depends_on "glib" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + + ENV.refurbish_args + mkdir "build" do system "meson", *std_meson_args, "-Ddocs=false", ".." system "ninja" diff --git a/Formula/gcc.rb b/Formula/gcc.rb index bcbc53c82b225..915665559f19e 100644 --- a/Formula/gcc.rb +++ b/Formula/gcc.rb @@ -1,29 +1,47 @@ +require "os/linux/glibc" + class Gcc < Formula desc "GNU compiler collection" homepage "https://gcc.gnu.org/" - url "https://ftp.gnu.org/gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz" - mirror "https://ftpmirror.gnu.org/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz" - sha256 "71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1" - revision 1 - head "https://gcc.gnu.org/git/gcc.git" + revision OS.mac? ? 1 : 7 + head "https://gcc.gnu.org/git/gcc.git" if OS.mac? + + if OS.mac? + url "https://ftp.gnu.org/gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz" + mirror "https://ftpmirror.gnu.org/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz" + sha256 "71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1" + head "https://gcc.gnu.org/git/gcc.git" + else + url "https://ftp.gnu.org/gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz" + mirror "https://ftpmirror.gnu.org/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz" + sha256 "530cea139d82fe542b358961130c69cfde8b3d14556370b65823d2f91f0ced87" + end + # gcc is designed to be portable. + # reminder: always add 'cellar :any' bottle do + cellar :any sha256 "57e53d66ad43fe05b5a2f93d6a7cfd472713ac03e9d9c9d0d0187cdc7a273153" => :catalina sha256 "de8319322428721741a0dc41dfdf2eece80e0215a7a4a861e0e206a9bfbca583" => :mojave sha256 "e50b9cfee063619515a8f164485b3f730077f21b49b7bb30cc5a600ddf577a83" => :high_sierra + sha256 "8cae5e1f1e2074f46bfeda826313afb7b823879d190f27dbcd6b00fbfd8daedd" => :x86_64_linux end # The bottles are built on systems with the CLT installed, and do not work # out of the box on Xcode-only systems due to an incorrect sysroot. pour_bottle? do - reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + reason "The bottle needs the Xcode CLT to be installed and to be installed into #{Homebrew::DEFAULT_PREFIX}." + satisfy { !OS.mac? || (MacOS::CLT.installed? && HOMEBREW_PREFIX.to_s == Homebrew::DEFAULT_PREFIX) } end depends_on "gmp" - depends_on "isl" + depends_on "isl" if OS.mac? depends_on "libmpc" depends_on "mpfr" + unless OS.mac? + depends_on "binutils" + depends_on "isl@0.18" + end uses_from_macos "zlib" @@ -42,48 +60,78 @@ def install # GCC will suffer build errors if forced to use a particular linker. ENV.delete "LD" - # We avoiding building: - # - Ada, which requires a pre-existing GCC Ada compiler to bootstrap - # - Go, currently not supported on macOS - # - BRIG + # Everything but Ada, which requires a pre-existing GCC Ada compiler + # (gnat) to bootstrap. GCC 4.6.0 adds go as a language option, but it is + # currently only compilable on Linux. languages = %w[c c++ objc obj-c++ fortran] - osmajor = `uname -r`.split(".").first pkgversion = "Homebrew GCC #{pkg_version} #{build.used_options*" "}".strip - args = %W[ - --build=x86_64-apple-darwin#{osmajor} - --prefix=#{prefix} - --libdir=#{lib}/gcc/#{version_suffix} - --disable-nls - --enable-checking=release - --enable-languages=#{languages.join(",")} - --program-suffix=-#{version_suffix} - --with-gmp=#{Formula["gmp"].opt_prefix} - --with-mpfr=#{Formula["mpfr"].opt_prefix} - --with-mpc=#{Formula["libmpc"].opt_prefix} - --with-isl=#{Formula["isl"].opt_prefix} - --with-system-zlib - --with-pkgversion=#{pkgversion} - --with-bugurl=https://github.com/Homebrew/homebrew-core/issues + args = [ + "--prefix=#{prefix}", + "--disable-nls", + "--enable-checking=release", + "--enable-languages=#{languages.join(",")}", + "--program-suffix=-#{version_suffix}", + "--with-gmp=#{Formula["gmp"].opt_prefix}", + "--with-mpfr=#{Formula["mpfr"].opt_prefix}", + "--with-mpc=#{Formula["libmpc"].opt_prefix}", + "--with-pkgversion=#{pkgversion}", ] - # Xcode 10 dropped 32-bit support - args << "--disable-multilib" if DevelopmentTools.clang_build_version >= 1000 + if OS.mac? + osmajor = `uname -r`.split(".").first + args += [ + "--build=x86_64-apple-darwin#{osmajor}", + "--libdir=#{lib}/gcc/#{version_suffix}", + "--with-isl=#{Formula["isl"].opt_prefix}", + "--with-system-zlib", + "--with-bugurl=https://github.com/Homebrew/homebrew/issues", + ] + else + args += [ + "--with-isl=#{Formula["isl@0.18"].opt_prefix}", + "--with-bugurl=https://github.com/Homebrew/linuxbrew-core/issues", + ] + + # Change the default directory name for 64-bit libraries to `lib` + # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html + inreplace "gcc/config/i386/t-linux64", "m64=../lib64", "m64=" + + # Fix for system gccs that do not support -static-libstdc++ + # gengenrtl: error while loading shared libraries: libstdc++.so.6 + mkdir_p lib + ln_s Utils.safe_popen_read(ENV.cc, "-print-file-name=libstdc++.so.6").strip, lib + ln_s Utils.safe_popen_read(ENV.cc, "-print-file-name=libgcc_s.so.1").strip, lib - # System headers may not be in /usr/include - sdk = MacOS.sdk_path_if_needed - if sdk - args << "--with-native-system-header-dir=/usr/include" - args << "--with-sysroot=#{sdk}" + # Set the search path for glibc libraries and objects, using the system's glibc + # Fix the error: ld: cannot find crti.o: No such file or directory + ENV.prepend_path "LIBRARY_PATH", Pathname.new(Utils.safe_popen_read(ENV.cc, "-print-file-name=crti.o")).parent end - # Avoid reference to sed shim - args << "SED=/usr/bin/sed" + # Fix cc1: error while loading shared libraries: libisl.so.15 + args << "--with-boot-ldflags=-static-libstdc++ -static-libgcc #{ENV["LDFLAGS"]}" unless OS.mac? + + # Xcode 10 dropped 32-bit support + args << "--disable-multilib" if OS.linux? || DevelopmentTools.clang_build_version >= 1000 + + if OS.mac? + # System headers may not be in /usr/include + sdk = MacOS.sdk_path_if_needed + if sdk + args << "--with-native-system-header-dir=/usr/include" + args << "--with-sysroot=#{sdk}" + end + + # Avoid reference to sed shim + args << "SED=/usr/bin/sed" + end # Ensure correct install names when linking against libgcc_s; # see discussion in https://github.com/Homebrew/legacy-homebrew/pull/34303 - inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + if OS.mac? + inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + end mkdir "build" do system "../configure", *args @@ -92,16 +140,25 @@ def install # otherwise updated load commands won't fit in the Mach-O header. # This is needed because `gcc` avoids the superenv shim. system "make", "BOOT_LDFLAGS=-Wl,-headerpad_max_install_names" - system "make", "install" + system "make", OS.mac? ? "install" : "install-strip" bin.install_symlink bin/"gfortran-#{version_suffix}" => "gfortran" + + unless OS.mac? + # Create cpp, gcc and g++ symlinks + bin.install_symlink "cpp-#{version_suffix}" => "cpp" + bin.install_symlink "gcc-#{version_suffix}" => "gcc" + bin.install_symlink "g++-#{version_suffix}" => "g++" + end end # Handle conflicts between GCC formulae and avoid interfering # with system compilers. + # Since GCC 4.8 libffi stuff are no longer shipped. # Rename man7. Dir.glob(man7/"*.7") { |file| add_suffix file, version_suffix } - # Even when we disable building info pages some are still installed. + # Even when suffixes are appended, the info pages conflict when + # install-info is run. TODO fix this. info.rmtree end @@ -112,6 +169,82 @@ def add_suffix(file, suffix) File.rename file, "#{dir}/#{base}-#{suffix}#{ext}" end + def post_install + unless OS.mac? + # Create cc and c++ symlinks, unless they already exist + homebrew_bin = Pathname.new "#{HOMEBREW_PREFIX}/bin" + homebrew_bin.install_symlink "gcc" => "cc" unless (homebrew_bin/"cc").exist? + homebrew_bin.install_symlink "g++" => "c++" unless (homebrew_bin/"c++").exist? + + gcc = "#{bin}/gcc-#{version_suffix}" + libgcc = Pathname.new(Utils.safe_popen_read(gcc, "-print-libgcc-file-name")).parent + raise "command failed: #{gcc} -print-libgcc-file-name" if $CHILD_STATUS.exitstatus.nonzero? + + glibc = Formula["glibc"] + glibc_installed = glibc.any_version_installed? + + # Symlink crt1.o and friends where gcc can find it. + crtdir = if glibc_installed + glibc.opt_lib + else + Pathname.new(Utils.safe_popen_read("/usr/bin/cc", "-print-file-name=crti.o")).parent + end + ln_sf Dir[crtdir/"*crt?.o"], libgcc + + # Create the GCC specs file + # See https://gcc.gnu.org/onlinedocs/gcc/Spec-Files.html + + # Locate the specs file + specs = libgcc/"specs" + ohai "Creating the GCC specs file: #{specs}" + specs_orig = Pathname.new("#{specs}.orig") + rm_f [specs_orig, specs] + + system_header_dirs = ["#{HOMEBREW_PREFIX}/include"] + + # Locate the native system header dirs if user uses system glibc + unless glibc_installed + target = Utils.safe_popen_read(gcc, "-print-multiarch").chomp + raise "command failed: #{gcc} -print-multiarch" if $CHILD_STATUS.exitstatus.nonzero? + + system_header_dirs += ["/usr/include/#{target}", "/usr/include"] + end + + # Save a backup of the default specs file + specs_string = Utils.safe_popen_read(gcc, "-dumpspecs") + raise "command failed: #{gcc} -dumpspecs" if $CHILD_STATUS.exitstatus.nonzero? + + specs_orig.write specs_string + + # Set the library search path + # For include path: + # * `-isysroot #{HOMEBREW_PREFIX}/nonexistent` prevents gcc searching built-in + # system header files. + # * `-idirafter ` instructs gcc to search system header + # files after gcc internal header files. + # For libraries: + # * `-nostdlib -L#{libgcc}` instructs gcc to use brewed glibc + # if applied. + # * `-L#{HOMEBREW_PREFIX}/lib` instructs gcc to find the rest + # brew libraries. + specs.write specs_string + <<~EOS + *cpp_unique_options: + + -isysroot #{HOMEBREW_PREFIX}/nonexistent #{system_header_dirs.map { |p| "-idirafter #{p}" }.join(" ")} + + *link_libgcc: + #{glibc_installed ? "-nostdlib -L#{libgcc}" : "+"} -L#{HOMEBREW_PREFIX}/lib + + *link: + + --dynamic-linker #{HOMEBREW_PREFIX}/lib/ld.so -rpath #{HOMEBREW_PREFIX}/lib + + EOS + + # Symlink ligcc_s.so.1 where glibc can find it. + # Fix the error: libgcc_s.so.1 must be installed for pthread_cancel to work + ln_sf opt_lib/"libgcc_s.so.1", glibc.opt_lib if glibc_installed + end + end + test do (testpath/"hello-c.c").write <<~EOS #include diff --git a/Formula/gcc@4.9.rb b/Formula/gcc@4.9.rb index 685b968136cca..0d2f9e52b2f26 100644 --- a/Formula/gcc@4.9.rb +++ b/Formula/gcc@4.9.rb @@ -10,15 +10,18 @@ def osmajor sha256 "6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092" revision 2 + # gcc is designed to be portable. bottle do + cellar :any sha256 "cb153d98245bcbe4809dc19adf688f642285154b19fe907c7de3cb71652b0ec6" => :high_sierra + sha256 "9d6f97e68f4bf869afcdc773a5ddcc705e14bb6742e0f2932c5b2c3d4bdb5548" => :x86_64_linux end # The bottles are built on systems with the CLT installed, and do not work # out of the box on Xcode-only systems due to an incorrect sysroot. pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end depends_on :maximum_macos => [:high_sierra, :build] @@ -26,6 +29,11 @@ def osmajor # GCC bootstraps itself, so it is OK to have an incompatible C++ stdlib cxxstdlib_check :skip + unless OS.mac? + depends_on "binutils" + depends_on "zlib" + end + resource "gmp" do url "https://ftp.gnu.org/gnu/gmp/gmp-4.3.2.tar.bz2" mirror "https://ftpmirror.gnu.org/gmp/gmp-4.3.2.tar.bz2" @@ -88,14 +96,26 @@ def install version_suffix = version.to_s.slice(/\d\.\d/) + args = [] + if OS.mac? + args += [ + "--build=#{arch}-apple-darwin#{osmajor}", + "--with-system-zlib", + "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", + ] + else + args << "--with-bugurl=https://github.com/Homebrew/linuxbrew-core/issues" + + # Change the default directory name for 64-bit libraries to `lib` + # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html + inreplace "gcc/config/i386/t-linux64", "m64=../lib64", "m64=." + end args = [ - "--build=x86_64-apple-darwin#{osmajor}", "--prefix=#{prefix}", "--libdir=#{lib}/gcc/#{version_suffix}", "--enable-languages=c,c++,fortran,objc,obj-c++", # Make most executables versioned to avoid conflicts. "--program-suffix=-#{version_suffix}", - "--with-system-zlib", "--enable-libstdcxx-time=yes", "--enable-stage1-checking", "--enable-checking=release", @@ -108,23 +128,30 @@ def install # raise errors. But still a good idea to include. "--disable-werror", "--with-pkgversion=Homebrew GCC #{pkg_version} #{build.used_options*" "}".strip, - "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", # Even when suffixes are appended, the info pages conflict when # install-info is run. "MAKEINFO=missing", "--disable-nls", - "--enable-multilib", ] - # System headers may not be in /usr/include - sdk = MacOS.sdk_path_if_needed - if sdk - args << "--with-native-system-header-dir=/usr/include" - args << "--with-sysroot=#{sdk}" + if OS.mac? + args << "--build=x86_64-apple-darwin#{osmajor}" + args << "--enable-multilib" + + # System headers may not be in /usr/include + sdk = MacOS.sdk_path_if_needed + if sdk + args << "--with-native-system-header-dir=/usr/include" + args << "--with-sysroot=#{sdk}" + end + + # Avoid reference to sed shim + args << "SED=/usr/bin/sed" + else + args << "--disable-multilib" end - # Avoid reference to sed shim - args << "SED=/usr/bin/sed" + ENV["CPPFLAGS"] = "-I#{Formula["zlib"].include}" unless OS.mac? # Ensure correct install names when linking against libgcc_s; # see discussion in https://github.com/Homebrew/homebrew/pull/34303 @@ -144,6 +171,14 @@ def install Dir.glob(man7/"*.7") { |file| add_suffix file, version_suffix } # Even when we disable building info pages some are still installed. info.rmtree + + unless OS.mac? + # Strip the binaries to reduce their size. + system("strip", "--strip-unneeded", "--preserve-dates", *Dir[prefix/"**/*"].select do |f| + f = Pathname.new(f) + f.file? && (f.elf? || f.extname == ".a") + end) + end end def add_suffix(file, suffix) @@ -153,6 +188,78 @@ def add_suffix(file, suffix) File.rename file, "#{dir}/#{base}-#{suffix}#{ext}" end + def post_install + unless OS.mac? + gcc = bin/"gcc-4.9" + libgcc = Pathname.new(Utils.safe_popen_read(gcc, "-print-libgcc-file-name")).parent + raise "command failed: #{gcc} -print-libgcc-file-name" if $CHILD_STATUS.exitstatus.nonzero? + + glibc = Formula["glibc"] + glibc_installed = glibc.any_version_installed? + + # Symlink crt1.o and friends where gcc can find it. + crtdir = if glibc_installed + glibc.opt_lib + else + Pathname.new(Utils.safe_popen_read("/usr/bin/cc", "-print-file-name=crti.o")).parent + end + ln_sf Dir[crtdir/"*crt?.o"], libgcc + + # Create the GCC specs file + # See https://gcc.gnu.org/onlinedocs/gcc/Spec-Files.html + + # Locate the specs file + specs = libgcc/"specs" + ohai "Creating the GCC specs file: #{specs}" + specs_orig = Pathname.new("#{specs}.orig") + rm_f [specs_orig, specs] + + system_header_dirs = ["#{HOMEBREW_PREFIX}/include"] + + # Locate the native system header dirs if user uses system glibc + unless glibc_installed + target = Utils.safe_popen_read(gcc, "-print-multiarch").chomp + raise "command failed: #{gcc} -print-multiarch" if $CHILD_STATUS.exitstatus.nonzero? + + system_header_dirs += ["/usr/include/#{target}", "/usr/include"] + end + + # Save a backup of the default specs file + specs_string = Utils.safe_popen_read(gcc, "-dumpspecs") + raise "command failed: #{gcc} -dumpspecs" if $CHILD_STATUS.exitstatus.nonzero? + + specs_orig.write specs_string + + # Set the library search path + # For include path: + # * `-isysroot #{HOMEBREW_PREFIX}/nonexistent` prevents gcc searching built-in + # system header files. + # * `-idirafter ` instructs gcc to search system header + # files after gcc internal header files. + # For libraries: + # * `-nostdlib -L#{libgcc}` instructs gcc to use brewed glibc + # if applied. + # * `-L#{libdir}` instructs gcc to find the corresponding gcc + # libraries. It is essential if there are multiple brewed gcc + # with different versions installed. + # Noted that it should only be passed for the `gcc@*` formulae. + # * `-L#{HOMEBREW_PREFIX}/lib` instructs gcc to find the rest + # brew libraries. + libdir = HOMEBREW_PREFIX/"lib/gcc/4.9" + specs.write specs_string + <<~EOS + *cpp_unique_options: + + -isysroot #{HOMEBREW_PREFIX}/nonexistent #{system_header_dirs.map { |p| "-idirafter #{p}" }.join(" ")} + + *link_libgcc: + #{glibc_installed ? "-nostdlib -L#{libgcc}" : "+"} -L#{libdir} -L#{HOMEBREW_PREFIX}/lib + + *link: + + --dynamic-linker #{HOMEBREW_PREFIX}/lib/ld.so -rpath #{libdir} -rpath #{HOMEBREW_PREFIX}/lib + + EOS + end + end + test do (testpath/"hello-c.c").write <<~EOS #include diff --git a/Formula/gcc@5.rb b/Formula/gcc@5.rb index 29ea761c98520..91b5e38e75e32 100644 --- a/Formula/gcc@5.rb +++ b/Formula/gcc@5.rb @@ -1,3 +1,5 @@ +require "os/linux/glibc" + class GccAT5 < Formula def osmajor `uname -r`.chomp @@ -10,15 +12,18 @@ def osmajor sha256 "530cea139d82fe542b358961130c69cfde8b3d14556370b65823d2f91f0ced87" revision 4 + # gcc is designed to be portable. bottle do + cellar :any sha256 "7fc31bed73398ba401db3107151a3b0ae301ddc60e017a45bd3d69ac1b400235" => :high_sierra + sha256 "c2083636a45129a71c8ba9aba51f7536e976aa8a031eb899ec396c310dc6ec43" => :x86_64_linux end # The bottles are built on systems with the CLT installed, and do not work # out of the box on Xcode-only systems due to an incorrect sysroot. pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end depends_on :maximum_macos => [:high_sierra, :build] @@ -27,6 +32,12 @@ def osmajor depends_on "libmpc" depends_on "mpfr" + unless OS.mac? + depends_on "isl@0.18" + depends_on "zlib" + depends_on "binutils" + end + # GCC bootstraps itself, so it is OK to have an incompatible C++ stdlib cxxstdlib_check :skip @@ -38,7 +49,7 @@ def osmajor # Fix build with Xcode 9 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82091 - if DevelopmentTools.clang_build_version >= 900 + if OS.mac? && DevelopmentTools.clang_build_version >= 900 patch do url "https://raw.githubusercontent.com/Homebrew/formula-patches/078797f1b9/gcc%405/xcode9.patch" sha256 "e1546823630c516679371856338abcbab381efaf9bd99511ceedcce3cf7c0199" @@ -48,7 +59,7 @@ def osmajor # Fix Apple headers, otherwise they trigger a build failure in libsanitizer # GCC bug report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83531 # Apple radar 36176941 - if MacOS.version == :high_sierra + if OS.mac? && MacOS.version == :high_sierra patch do url "https://raw.githubusercontent.com/Homebrew/formula-patches/413cfac6/gcc%405/10.13_headers.patch" sha256 "94aaec20c8c7bfd3c41ef8fb7725bd524b1c0392d11a411742303a3465d18d09" @@ -58,7 +69,7 @@ def osmajor # Patch for Xcode bug, taken from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89864#c43 # This should be removed in the next release of GCC if fixed by apple; this is an xcode bug, # but this patch is a work around committed to GCC trunk - if MacOS::Xcode.version >= "10.2" + if OS.mac? && MacOS::Xcode.version >= "10.2" patch do url "https://raw.githubusercontent.com/Homebrew/formula-patches/91d57ebe88e17255965fa88b53541335ef16f64a/gcc%405/gcc5-xcode10.2.patch" sha256 "6834bec30c54ab1cae645679e908713102f376ea0fc2ee993b3c19995832fe56" @@ -70,7 +81,7 @@ def install ENV.delete "LD" # Build ISL 0.14 from source during bootstrap - resource("isl").stage buildpath/"isl" + resource("isl").stage buildpath/"isl" if OS.mac? # C, C++, ObjC and Fortran compilers are always built languages = %w[c c++ fortran objc obj-c++] @@ -82,8 +93,8 @@ def install # to prevent their build. ENV["gcc_cv_prog_makeinfo_modern"] = "no" + osmajor = `uname -r`.chomp args = [ - "--build=x86_64-apple-darwin#{osmajor}", "--prefix=#{prefix}", "--libdir=#{lib}/gcc/#{version_suffix}", "--enable-languages=#{languages.join(",")}", @@ -92,8 +103,6 @@ def install "--with-gmp=#{Formula["gmp"].opt_prefix}", "--with-mpfr=#{Formula["mpfr"].opt_prefix}", "--with-mpc=#{Formula["libmpc"].opt_prefix}", - "--with-system-zlib", - "--enable-libstdcxx-time=yes", "--enable-stage1-checking", "--enable-checking=release", "--enable-lto", @@ -103,23 +112,49 @@ def install "--disable-werror", "--disable-nls", "--with-pkgversion=Homebrew GCC #{pkg_version} #{build.used_options*" "}".strip, - "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", - "--enable-multilib", ] - # System headers may not be in /usr/include - sdk = MacOS.sdk_path_if_needed - if sdk - args << "--with-native-system-header-dir=/usr/include" - args << "--with-sysroot=#{sdk}" + unless OS.mac? + args += [ + "--with-isl=#{Formula["isl@0.18"].opt_prefix}", + "--with-bugurl=https://github.com/Homebrew/linuxbrew-core/issues", + # Fix cc1: error while loading shared libraries: libisl.so.15 + "--with-boot-ldflags=-static-libstdc++ -static-libgcc #{ENV["LDFLAGS"]}", + ] + + # Change the default directory name for 64-bit libraries to `lib` + # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html + inreplace "gcc/config/i386/t-linux64", "m64=../lib64", "m64=" + + # Set the search path for glibc libraries and objects, using the system's glibc + # Fix the error: ld: cannot find crti.o: No such file or directory + ENV.prepend_path "LIBRARY_PATH", Pathname.new(Utils.safe_popen_read(ENV.cc, "-print-file-name=crti.o")).parent end - # Avoid reference to sed shim - args << "SED=/usr/bin/sed" + # Fix Linux error: gnu/stubs-32.h: No such file or directory. + if OS.mac? + args << "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues" + args << "--enable-multilib" + args << "--build=x86_64-apple-darwin#{osmajor}" + + # System headers may not be in /usr/include + sdk = MacOS.sdk_path_if_needed + if sdk + args << "--with-native-system-header-dir=/usr/include" + args << "--with-sysroot=#{sdk}" + end + + # Avoid reference to sed shim + args << "SED=/usr/bin/sed" + else + args << "--disable-multilib" + end # Ensure correct install names when linking against libgcc_s; # see discussion in https://github.com/Homebrew/homebrew/pull/34303 - inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + if OS.mac? + inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + end mkdir "build" do system "../configure", *args @@ -127,7 +162,7 @@ def install # At this point `make check` could be invoked to run the testsuite. The # deja-gnu and autogen formulae must be installed in order to do this. - system "make", "install" + system "make", OS.mac? ? "install" : "install-strip" end # Handle conflicts between GCC formulae. @@ -144,6 +179,78 @@ def add_suffix(file, suffix) File.rename file, "#{dir}/#{base}-#{suffix}#{ext}" end + def post_install + unless OS.mac? + gcc = bin/"gcc-5" + libgcc = Pathname.new(Utils.safe_popen_read(gcc, "-print-libgcc-file-name")).parent + raise "command failed: #{gcc} -print-libgcc-file-name" if $CHILD_STATUS.exitstatus.nonzero? + + glibc = Formula["glibc"] + glibc_installed = glibc.any_version_installed? + + # Symlink crt1.o and friends where gcc can find it. + crtdir = if glibc_installed + glibc.opt_lib + else + Pathname.new(Utils.safe_popen_read("/usr/bin/cc", "-print-file-name=crti.o")).parent + end + ln_sf Dir[crtdir/"*crt?.o"], libgcc + + # Create the GCC specs file + # See https://gcc.gnu.org/onlinedocs/gcc/Spec-Files.html + + # Locate the specs file + specs = libgcc/"specs" + ohai "Creating the GCC specs file: #{specs}" + specs_orig = Pathname.new("#{specs}.orig") + rm_f [specs_orig, specs] + + system_header_dirs = ["#{HOMEBREW_PREFIX}/include"] + + # Locate the native system header dirs if user uses system glibc + unless glibc_installed + target = Utils.safe_popen_read(gcc, "-print-multiarch").chomp + raise "command failed: #{gcc} -print-multiarch" if $CHILD_STATUS.exitstatus.nonzero? + + system_header_dirs += ["/usr/include/#{target}", "/usr/include"] + end + + # Save a backup of the default specs file + specs_string = Utils.safe_popen_read(gcc, "-dumpspecs") + raise "command failed: #{gcc} -dumpspecs" if $CHILD_STATUS.exitstatus.nonzero? + + specs_orig.write specs_string + + # Set the library search path + # For include path: + # * `-isysroot #{HOMEBREW_PREFIX}/nonexistent` prevents gcc searching built-in + # system header files. + # * `-idirafter ` instructs gcc to search system header + # files after gcc internal header files. + # For libraries: + # * `-nostdlib -L#{libgcc}` instructs gcc to use brewed glibc + # if applied. + # * `-L#{libdir}` instructs gcc to find the corresponding gcc + # libraries. It is essential if there are multiple brewed gcc + # with different versions installed. + # Noted that it should only be passed for the `gcc@*` formulae. + # * `-L#{HOMEBREW_PREFIX}/lib` instructs gcc to find the rest + # brew libraries. + libdir = HOMEBREW_PREFIX/"lib/gcc/5" + specs.write specs_string + <<~EOS + *cpp_unique_options: + + -isysroot #{HOMEBREW_PREFIX}/nonexistent #{system_header_dirs.map { |p| "-idirafter #{p}" }.join(" ")} + + *link_libgcc: + #{glibc_installed ? "-nostdlib -L#{libgcc}" : "+"} -L#{libdir} -L#{HOMEBREW_PREFIX}/lib + + *link: + + --dynamic-linker #{HOMEBREW_PREFIX}/lib/ld.so -rpath #{libdir} -rpath #{HOMEBREW_PREFIX}/lib + + EOS + end + end + test do (testpath/"hello-c.c").write <<~EOS #include diff --git a/Formula/gcc@6.rb b/Formula/gcc@6.rb index 19288bab1a431..a3cccd96bcade 100644 --- a/Formula/gcc@6.rb +++ b/Formula/gcc@6.rb @@ -1,3 +1,5 @@ +require "os/linux/glibc" + class GccAT6 < Formula desc "GNU compiler collection" homepage "https://gcc.gnu.org" @@ -6,17 +8,21 @@ class GccAT6 < Formula sha256 "7ef1796ce497e89479183702635b14bb7a46b53249209a5e0f999bebf4740945" revision 5 + # gcc is designed to be portable. + # reminder: always add 'cellar :any' bottle do + cellar :any sha256 "59e24c6441d4ebd6e6462406d07a4722f765b81aa96b0c81117376cf342641b0" => :catalina sha256 "2280bb37e05ca20d3d797a4b75695ea6d57196c2f4b4003d43ba191883558073" => :mojave sha256 "e3ab3cd2f05c00351825fb0a6bf2b4e57e959400d8f7931d47b9c81a3e5b6ad3" => :high_sierra + sha256 "43508774d3ddc6d40b5513ef716ac568a4ac7b9bc120f070c810bf08c469c018" => :x86_64_linux end # The bottles are built on systems with the CLT installed, and do not work # out of the box on Xcode-only systems due to an incorrect sysroot. pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end depends_on "gmp" @@ -24,13 +30,18 @@ class GccAT6 < Formula depends_on "libmpc" depends_on "mpfr" + unless OS.mac? + depends_on "zlib" + depends_on "binutils" + end + # GCC bootstraps itself, so it is OK to have an incompatible C++ stdlib cxxstdlib_check :skip # Patch for Xcode bug, taken from https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89864#c43 # This should be removed in the next release of GCC if fixed by apple; this is an xcode bug, # but this patch is a work around committed to GCC trunk - if MacOS::Xcode.version >= "10.2" + if OS.mac? && MacOS::Xcode.version >= "10.2" patch do url "https://raw.githubusercontent.com/Homebrew/formula-patches/91d57ebe88e17255965fa88b53541335ef16f64a/gcc%406/gcc6-xcode10.2.patch" sha256 "0f091e8b260bcfa36a537fad76823654be3ee8462512473e0b63ed83ead18085" @@ -51,10 +62,36 @@ def install # to prevent their build. ENV["gcc_cv_prog_makeinfo_modern"] = "no" - osmajor = `uname -r`.chomp + args = [] + + if OS.mac? + osmajor = `uname -r`.chomp + arch = MacOS.prefer_64_bit? ? "x86_64" : "i686" + args += [ + "--build=#{arch}-apple-darwin#{osmajor}", + "--with-system-zlib", + "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", + ] + + # The pre-Mavericks toolchain requires the older DWARF-2 debugging data + # format to avoid failure during the stage 3 comparison of object files. + # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=45248 + args << "--with-dwarf2" if MacOS.version <= :mountain_lion + else + args += [ + "--with-bugurl=https://github.com/Homebrew/linuxbrew-core/issues", + ] + + # Change the default directory name for 64-bit libraries to `lib` + # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html + inreplace "gcc/config/i386/t-linux64", "m64=../lib64", "m64=" + + # Set the search path for glibc libraries and objects, using the system's glibc + # Fix the error: ld: cannot find crti.o: No such file or directory + ENV.prepend_path "LIBRARY_PATH", Pathname.new(Utils.safe_popen_read(ENV.cc, "-print-file-name=crti.o")).parent + end - args = [ - "--build=x86_64-apple-darwin#{osmajor}", + args += [ "--prefix=#{prefix}", "--libdir=#{lib}/gcc/#{version_suffix}", "--enable-languages=#{languages.join(",")}", @@ -64,7 +101,6 @@ def install "--with-mpfr=#{Formula["mpfr"].opt_prefix}", "--with-mpc=#{Formula["libmpc"].opt_prefix}", "--with-isl=#{Formula["isl"].opt_prefix}", - "--with-system-zlib", "--enable-stage1-checking", "--enable-checking=release", "--enable-lto", @@ -73,31 +109,37 @@ def install "--with-build-config=bootstrap-debug", "--disable-werror", "--with-pkgversion=Homebrew GCC #{pkg_version} #{build.used_options*" "}".strip, - "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", "--disable-nls", ] + # Fix Linux error: gnu/stubs-32.h: No such file or directory. + args << "--disable-multilib" unless OS.mac? + # Xcode 10 dropped 32-bit support - args << "--disable-multilib" if DevelopmentTools.clang_build_version >= 1000 + args << "--disable-multilib" if OS.mac? && DevelopmentTools.clang_build_version >= 1000 - # System headers may not be in /usr/include - sdk = MacOS.sdk_path_if_needed - if sdk - args << "--with-native-system-header-dir=/usr/include" - args << "--with-sysroot=#{sdk}" - end + if OS.mac? + # System headers may not be in /usr/include + sdk = MacOS.sdk_path_if_needed + if sdk + args << "--with-native-system-header-dir=/usr/include" + args << "--with-sysroot=#{sdk}" + end - # Avoid reference to sed shim - args << "SED=/usr/bin/sed" + # Avoid reference to sed shim + args << "SED=/usr/bin/sed" + end # Ensure correct install names when linking against libgcc_s; # see discussion in https://github.com/Homebrew/homebrew/pull/34303 - inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + if OS.mac? + inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + end mkdir "build" do system "../configure", *args system "make", "bootstrap" - system "make", "install" + system "make", OS.mac? ? "install" : "install-strip" end # Handle conflicts between GCC formulae and avoid interfering @@ -115,6 +157,81 @@ def add_suffix(file, suffix) File.rename file, "#{dir}/#{base}-#{suffix}#{ext}" end + def post_install + unless OS.mac? + gcc = bin/"gcc-6" + libgcc = Pathname.new(Utils.safe_popen_read(gcc, "-print-libgcc-file-name")).parent + raise "command failed: #{gcc} -print-libgcc-file-name" if $CHILD_STATUS.exitstatus.nonzero? + + glibc = Formula["glibc"] + glibc_installed = glibc.any_version_installed? + + # Symlink crt1.o and friends where gcc can find it. + crtdir = if glibc_installed + glibc.opt_lib + else + Pathname.new(Utils.safe_popen_read("/usr/bin/cc", "-print-file-name=crti.o")).parent + end + ln_sf Dir[crtdir/"*crt?.o"], libgcc + + # Create the GCC specs file + # See https://gcc.gnu.org/onlinedocs/gcc/Spec-Files.html + + # Locate the specs file + specs = libgcc/"specs" + ohai "Creating the GCC specs file: #{specs}" + specs_orig = Pathname.new("#{specs}.orig") + rm_f [specs_orig, specs] + + system_header_dirs = ["#{HOMEBREW_PREFIX}/include"] + + if glibc_installed + # https://github.com/Linuxbrew/brew/issues/724 + system_header_dirs << glibc.opt_include + else + # Locate the native system header dirs if user uses system glibc + target = Utils.safe_popen_read(gcc, "-print-multiarch").chomp + raise "command failed: #{gcc} -print-multiarch" if $CHILD_STATUS.exitstatus.nonzero? + + system_header_dirs += ["/usr/include/#{target}", "/usr/include"] + end + + # Save a backup of the default specs file + specs_string = Utils.safe_popen_read(gcc, "-dumpspecs") + raise "command failed: #{gcc} -dumpspecs" if $CHILD_STATUS.exitstatus.nonzero? + + specs_orig.write specs_string + + # Set the library search path + # For include path: + # * `-isysroot #{HOMEBREW_PREFIX}/nonexistent` prevents gcc searching built-in + # system header files. + # * `-idirafter ` instructs gcc to search system header + # files after gcc internal header files. + # For libraries: + # * `-nostdlib -L#{libgcc}` instructs gcc to use brewed glibc + # if applied. + # * `-L#{libdir}` instructs gcc to find the corresponding gcc + # libraries. It is essential if there are multiple brewed gcc + # with different versions installed. + # Noted that it should only be passed for the `gcc@*` formulae. + # * `-L#{HOMEBREW_PREFIX}/lib` instructs gcc to find the rest + # brew libraries. + libdir = HOMEBREW_PREFIX/"lib/gcc/6" + specs.write specs_string + <<~EOS + *cpp_unique_options: + + -isysroot #{HOMEBREW_PREFIX}/nonexistent #{system_header_dirs.map { |p| "-idirafter #{p}" }.join(" ")} + + *link_libgcc: + #{glibc_installed ? "-nostdlib -L#{libgcc}" : "+"} -L#{libdir} -L#{HOMEBREW_PREFIX}/lib + + *link: + + --dynamic-linker #{HOMEBREW_PREFIX}/lib/ld.so -rpath #{libdir} -rpath #{HOMEBREW_PREFIX}/lib + + EOS + end + end + test do (testpath/"hello-c.c").write <<~EOS #include diff --git a/Formula/gcc@7.rb b/Formula/gcc@7.rb index a4c035c304d9e..1ffa74f1c5c2e 100644 --- a/Formula/gcc@7.rb +++ b/Formula/gcc@7.rb @@ -1,3 +1,5 @@ +require "os/linux/glibc" + class GccAT7 < Formula desc "GNU compiler collection" homepage "https://gcc.gnu.org/" @@ -6,17 +8,20 @@ class GccAT7 < Formula sha256 "b81946e7f01f90528a1f7352ab08cc602b9ccc05d4e44da4bd501c5a189ee661" revision 2 + # gcc is designed to be portable. bottle do + cellar :any sha256 "4dca3b07173bffba262e003b345970119626a4d60a25c167d6bc216c46f1d83e" => :catalina sha256 "5d4086421866078dc4d9bfe623a38160dbcf04ff88b4d0284dee9da66ff50f4c" => :mojave sha256 "3c2135fc0b1c7f0ce048c1f610d2131a237911bdbd66d8bff731bbf9c6d84bcc" => :high_sierra + sha256 "6437a3ac47e16db165b34c81eb9baffd9615821ba62cf038db14a4bb64da9183" => :x86_64_linux end # The bottles are built on systems with the CLT installed, and do not work # out of the box on Xcode-only systems due to an incorrect sysroot. pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end depends_on "gmp" @@ -24,6 +29,11 @@ class GccAT7 < Formula depends_on "libmpc" depends_on "mpfr" + unless OS.mac? + depends_on "zlib" + depends_on "binutils" + end + # GCC bootstraps itself, so it is OK to have an incompatible C++ stdlib cxxstdlib_check :skip @@ -44,10 +54,32 @@ def install # - BRIG languages = %w[c c++ objc obj-c++ fortran] - osmajor = `uname -r`.chomp + args = [] + + if OS.mac? + osmajor = `uname -r`.chomp + args += [ + "--build=x86_64-apple-darwin#{osmajor}", + "--with-system-zlib", + "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", + ] + else + args += [ + "--with-bugurl=https://github.com/Homebrew/linuxbrew-core/issues", + # Fix Linux error: gnu/stubs-32.h: No such file or directory. + "--disable-multilib", + ] + + # Change the default directory name for 64-bit libraries to `lib` + # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html + inreplace "gcc/config/i386/t-linux64", "m64=../lib64", "m64=" + + # Set the search path for glibc libraries and objects, using the system's glibc + # Fix the error: ld: cannot find crti.o: No such file or directory + ENV.prepend_path "LIBRARY_PATH", Pathname.new(Utils.safe_popen_read(ENV.cc, "-print-file-name=crti.o")).parent + end - args = [ - "--build=x86_64-apple-darwin#{osmajor}", + args += [ "--prefix=#{prefix}", "--libdir=#{lib}/gcc/#{version_suffix}", "--enable-languages=#{languages.join(",")}", @@ -57,35 +89,37 @@ def install "--with-mpfr=#{Formula["mpfr"].opt_prefix}", "--with-mpc=#{Formula["libmpc"].opt_prefix}", "--with-isl=#{Formula["isl"].opt_prefix}", - "--with-system-zlib", "--enable-checking=release", "--with-pkgversion=Homebrew GCC #{pkg_version} #{build.used_options*" "}".strip, - "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", "--disable-nls", ] # Xcode 10 dropped 32-bit support - args << "--disable-multilib" if DevelopmentTools.clang_build_version >= 1000 + args << "--disable-multilib" if OS.mac? && DevelopmentTools.clang_build_version >= 1000 + + if OS.mac? + # System headers may not be in /usr/include + sdk = MacOS.sdk_path_if_needed + if sdk + args << "--with-native-system-header-dir=/usr/include" + args << "--with-sysroot=#{sdk}" + end - # System headers may not be in /usr/include - sdk = MacOS.sdk_path_if_needed - if sdk - args << "--with-native-system-header-dir=/usr/include" - args << "--with-sysroot=#{sdk}" + # Avoid reference to sed shim + args << "SED=/usr/bin/sed" end - # Avoid reference to sed shim - args << "SED=/usr/bin/sed" - # Ensure correct install names when linking against libgcc_s; # see discussion in https://github.com/Homebrew/homebrew/pull/34303 - inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + if OS.mac? + inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + end mkdir "build" do system "../configure", *args system "make" - system "make", "install" + system "make", OS.mac? ? "install" : "install-strip" end # Handle conflicts between GCC formulae and avoid interfering @@ -103,6 +137,81 @@ def add_suffix(file, suffix) File.rename file, "#{dir}/#{base}-#{suffix}#{ext}" end + def post_install + unless OS.mac? + gcc = bin/"gcc-7" + libgcc = Pathname.new(Utils.safe_popen_read(gcc, "-print-libgcc-file-name")).parent + raise "command failed: #{gcc} -print-libgcc-file-name" if $CHILD_STATUS.exitstatus.nonzero? + + glibc = Formula["glibc"] + glibc_installed = glibc.any_version_installed? + + # Symlink crt1.o and friends where gcc can find it. + crtdir = if glibc_installed + glibc.opt_lib + else + Pathname.new(Utils.safe_popen_read("/usr/bin/cc", "-print-file-name=crti.o")).parent + end + ln_sf Dir[crtdir/"*crt?.o"], libgcc + + # Create the GCC specs file + # See https://gcc.gnu.org/onlinedocs/gcc/Spec-Files.html + + # Locate the specs file + specs = libgcc/"specs" + ohai "Creating the GCC specs file: #{specs}" + specs_orig = Pathname.new("#{specs}.orig") + rm_f [specs_orig, specs] + + system_header_dirs = ["#{HOMEBREW_PREFIX}/include"] + + if glibc_installed + # https://github.com/Linuxbrew/brew/issues/724 + system_header_dirs << glibc.opt_include + else + # Locate the native system header dirs if user uses system glibc + target = Utils.safe_popen_read(gcc, "-print-multiarch").chomp + raise "command failed: #{gcc} -print-multiarch" if $CHILD_STATUS.exitstatus.nonzero? + + system_header_dirs += ["/usr/include/#{target}", "/usr/include"] + end + + # Save a backup of the default specs file + specs_string = Utils.safe_popen_read(gcc, "-dumpspecs") + raise "command failed: #{gcc} -dumpspecs" if $CHILD_STATUS.exitstatus.nonzero? + + specs_orig.write specs_string + + # Set the library search path + # For include path: + # * `-isysroot #{HOMEBREW_PREFIX}/nonexistent` prevents gcc searching built-in + # system header files. + # * `-idirafter ` instructs gcc to search system header + # files after gcc internal header files. + # For libraries: + # * `-nostdlib -L#{libgcc}` instructs gcc to use brewed glibc + # if applied. + # * `-L#{libdir}` instructs gcc to find the corresponding gcc + # libraries. It is essential if there are multiple brewed gcc + # with different versions installed. + # Noted that it should only be passed for the `gcc@*` formulae. + # * `-L#{HOMEBREW_PREFIX}/lib` instructs gcc to find the rest + # brew libraries. + libdir = HOMEBREW_PREFIX/"lib/gcc/7" + specs.write specs_string + <<~EOS + *cpp_unique_options: + + -isysroot #{HOMEBREW_PREFIX}/nonexistent #{system_header_dirs.map { |p| "-idirafter #{p}" }.join(" ")} + + *link_libgcc: + #{glibc_installed ? "-nostdlib -L#{libgcc}" : "+"} -L#{libdir} -L#{HOMEBREW_PREFIX}/lib + + *link: + + --dynamic-linker #{HOMEBREW_PREFIX}/lib/ld.so -rpath #{libdir} -rpath #{HOMEBREW_PREFIX}/lib + + EOS + end + end + test do (testpath/"hello-c.c").write <<~EOS #include diff --git a/Formula/gcc@8.rb b/Formula/gcc@8.rb index 9a42c212b5a8f..0e5dda520925d 100644 --- a/Formula/gcc@8.rb +++ b/Formula/gcc@8.rb @@ -1,3 +1,5 @@ +require "os/linux/glibc" + class GccAT8 < Formula desc "GNU compiler collection" homepage "https://gcc.gnu.org/" @@ -6,17 +8,21 @@ class GccAT8 < Formula sha256 "e30a6e52d10e1f27ed55104ad233c30bd1e99cfb5ff98ab022dc941edd1b2dd4" revision 1 + # gcc is designed to be portable. + # reminder: always add 'cellar :any' bottle do + cellar :any sha256 "55525171b1a90425dab69799f3730492cd3f04b2755242340472925794104962" => :catalina sha256 "3321d929ae429e3ccf8b4c4e265e20e6302d361d5c444f4b7a5217771b8d0b01" => :mojave sha256 "80b73e0a1679e7ca9e098de1e82e19e312d159098b3355607b76a3673b80c2ee" => :high_sierra + sha256 "75adcf873c1cc4ad95a9d417eec1a1490546a500775b11c0750f8d6a69ce842b" => :x86_64_linux end # The bottles are built on systems with the CLT installed, and do not work # out of the box on Xcode-only systems due to an incorrect sysroot. pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end depends_on "gmp" @@ -24,6 +30,11 @@ class GccAT8 < Formula depends_on "libmpc" depends_on "mpfr" + unless OS.mac? + depends_on "zlib" + depends_on "binutils" + end + # GCC bootstraps itself, so it is OK to have an incompatible C++ stdlib cxxstdlib_check :skip @@ -44,51 +55,74 @@ def install # - BRIG languages = %w[c c++ objc obj-c++ fortran] - osmajor = `uname -r`.split(".").first - pkgversion = "Homebrew GCC #{pkg_version} #{build.used_options*" "}".strip - - args = %W[ - --build=x86_64-apple-darwin#{osmajor} - --prefix=#{prefix} - --libdir=#{lib}/gcc/#{version_suffix} - --disable-nls - --enable-checking=release - --enable-languages=#{languages.join(",")} - --program-suffix=-#{version_suffix} - --with-gmp=#{Formula["gmp"].opt_prefix} - --with-mpfr=#{Formula["mpfr"].opt_prefix} - --with-mpc=#{Formula["libmpc"].opt_prefix} - --with-isl=#{Formula["isl"].opt_prefix} - --with-system-zlib - --with-pkgversion=#{pkgversion} - --with-bugurl=https://github.com/Homebrew/homebrew-core/issues + args = [] + + if OS.mac? + osmajor = `uname -r`.chomp + args += [ + "--build=x86_64-apple-darwin#{osmajor}", + "--with-system-zlib", + "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", + ] + else + args += [ + "--with-bugurl=https://github.com/Homebrew/linuxbrew-core/issues", + # Fix Linux error: gnu/stubs-32.h: No such file or directory. + "--disable-multilib", + ] + + # Change the default directory name for 64-bit libraries to `lib` + # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html + inreplace "gcc/config/i386/t-linux64", "m64=../lib64", "m64=" + + # Set the search path for glibc libraries and objects, using the system's glibc + # Fix the error: ld: cannot find crti.o: No such file or directory + ENV.prepend_path "LIBRARY_PATH", Pathname.new(Utils.safe_popen_read(ENV.cc, "-print-file-name=crti.o")).parent + end + + args += [ + "--prefix=#{prefix}", + "--libdir=#{lib}/gcc/#{version_suffix}", + "--enable-checking=release", + "--disable-nls", + "--enable-languages=#{languages.join(",")}", + # Make most executables versioned to avoid conflicts. + "--program-suffix=-#{version_suffix}", + "--with-gmp=#{Formula["gmp"].opt_prefix}", + "--with-mpfr=#{Formula["mpfr"].opt_prefix}", + "--with-mpc=#{Formula["libmpc"].opt_prefix}", + "--with-isl=#{Formula["isl"].opt_prefix}", + "--with-pkgversion=Homebrew GCC #{pkg_version} #{build.used_options*" "}".strip, ] - # Xcode 10 dropped 32-bit support - args << "--disable-multilib" if DevelopmentTools.clang_build_version >= 1000 + if OS.mac? + # System headers may not be in /usr/include + sdk = MacOS.sdk_path_if_needed + if sdk + args << "--with-native-system-header-dir=/usr/include" + args << "--with-sysroot=#{sdk}" + end - # System headers may not be in /usr/include - sdk = MacOS.sdk_path_if_needed - if sdk - args << "--with-native-system-header-dir=/usr/include" - args << "--with-sysroot=#{sdk}" + # Avoid reference to sed shim + args << "SED=/usr/bin/sed" end - # Avoid reference to sed shim - args << "SED=/usr/bin/sed" - # Ensure correct install names when linking against libgcc_s; - # see discussion in https://github.com/Homebrew/legacy-homebrew/pull/34303 - inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + # see discussion in https://github.com/Homebrew/homebrew/pull/34303 + if OS.mac? + inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + end mkdir "build" do system "../configure", *args + make_args = [] # Use -headerpad_max_install_names in the build, - # otherwise updated load commands won't fit in the Mach-O header. - # This is needed because `gcc` avoids the superenv shim. - system "make", "BOOT_LDFLAGS=-Wl,-headerpad_max_install_names" - system "make", "install" + # otherwise lto1 load commands cannot be edited on El Capitan + make_args << "BOOT_LDFLAGS=-Wl,-headerpad_max_install_names" if OS.mac? + + system "make", *make_args + system "make", OS.mac? ? "install" : "install-strip" end # Handle conflicts between GCC formulae and avoid interfering @@ -106,6 +140,81 @@ def add_suffix(file, suffix) File.rename file, "#{dir}/#{base}-#{suffix}#{ext}" end + def post_install + unless OS.mac? + gcc = bin/"gcc-8" + libgcc = Pathname.new(Utils.safe_popen_read(gcc, "-print-libgcc-file-name")).parent + raise "command failed: #{gcc} -print-libgcc-file-name" if $CHILD_STATUS.exitstatus.nonzero? + + glibc = Formula["glibc"] + glibc_installed = glibc.any_version_installed? + + # Symlink crt1.o and friends where gcc can find it. + crtdir = if glibc_installed + glibc.opt_lib + else + Pathname.new(Utils.safe_popen_read("/usr/bin/cc", "-print-file-name=crti.o")).parent + end + ln_sf Dir[crtdir/"*crt?.o"], libgcc + + # Create the GCC specs file + # See https://gcc.gnu.org/onlinedocs/gcc/Spec-Files.html + + # Locate the specs file + specs = libgcc/"specs" + ohai "Creating the GCC specs file: #{specs}" + specs_orig = Pathname.new("#{specs}.orig") + rm_f [specs_orig, specs] + + system_header_dirs = ["#{HOMEBREW_PREFIX}/include"] + + if glibc_installed + # https://github.com/Linuxbrew/brew/issues/724 + system_header_dirs << glibc.opt_include + else + # Locate the native system header dirs if user uses system glibc + target = Utils.safe_popen_read(gcc, "-print-multiarch").chomp + raise "command failed: #{gcc} -print-multiarch" if $CHILD_STATUS.exitstatus.nonzero? + + system_header_dirs += ["/usr/include/#{target}", "/usr/include"] + end + + # Save a backup of the default specs file + specs_string = Utils.safe_popen_read(gcc, "-dumpspecs") + raise "command failed: #{gcc} -dumpspecs" if $CHILD_STATUS.exitstatus.nonzero? + + specs_orig.write specs_string + + # Set the library search path + # For include path: + # * `-isysroot #{HOMEBREW_PREFIX}/nonexistent` prevents gcc searching built-in + # system header files. + # * `-idirafter ` instructs gcc to search system header + # files after gcc internal header files. + # For libraries: + # * `-nostdlib -L#{libgcc}` instructs gcc to use brewed glibc + # if applied. + # * `-L#{libdir}` instructs gcc to find the corresponding gcc + # libraries. It is essential if there are multiple brewed gcc + # with different versions installed. + # Noted that it should only be passed for the `gcc@*` formulae. + # * `-L#{HOMEBREW_PREFIX}/lib` instructs gcc to find the rest + # brew libraries. + libdir = HOMEBREW_PREFIX/"lib/gcc/8" + specs.write specs_string + <<~EOS + *cpp_unique_options: + + -isysroot #{HOMEBREW_PREFIX}/nonexistent #{system_header_dirs.map { |p| "-idirafter #{p}" }.join(" ")} + + *link_libgcc: + #{glibc_installed ? "-nostdlib -L#{libgcc}" : "+"} -L#{libdir} -L#{HOMEBREW_PREFIX}/lib + + *link: + + --dynamic-linker #{HOMEBREW_PREFIX}/lib/ld.so -rpath #{libdir} -rpath #{HOMEBREW_PREFIX}/lib + + EOS + end + end + test do (testpath/"hello-c.c").write <<~EOS #include diff --git a/Formula/gcc@9.rb b/Formula/gcc@9.rb new file mode 100644 index 0000000000000..e5a3d06769f49 --- /dev/null +++ b/Formula/gcc@9.rb @@ -0,0 +1,248 @@ +require "os/linux/glibc" + +class GccAT9 < Formula + desc "GNU compiler collection" + homepage "https://gcc.gnu.org/" + url "https://ftp.gnu.org/gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz" + mirror "https://ftpmirror.gnu.org/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz" + sha256 "ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206" + revision 1 + + # gcc is designed to be portable. + bottle do + cellar :any + sha256 "fe3b621da4b37c5b3982789f6dc24e7b535ccf3885e89e0e3233d8de3ef9fa52" => :x86_64_linux + end + + # The bottles are built on systems with the CLT installed, and do not work + # out of the box on Xcode-only systems due to an incorrect sysroot. + pour_bottle? do + reason "The bottle needs the Xcode CLT to be installed." + satisfy { !OS.mac? || MacOS::CLT.installed? } + end + + depends_on "gmp" + depends_on "isl" + depends_on "libmpc" + depends_on :linux + depends_on "mpfr" + + unless OS.mac? + depends_on "zlib" + depends_on "binutils" + end + + # GCC bootstraps itself, so it is OK to have an incompatible C++ stdlib + cxxstdlib_check :skip + + def version_suffix + if build.head? + "HEAD" + else + version.to_s.slice(/\d/) + end + end + + def install + # GCC will suffer build errors if forced to use a particular linker. + ENV.delete "LD" + + # We avoiding building: + # - Ada, which requires a pre-existing GCC Ada compiler to bootstrap + # - Go, currently not supported on macOS + # - BRIG + languages = %w[c c++ objc obj-c++ fortran] + + args = [] + + if OS.mac? + osmajor = `uname -r`.chomp + args += [ + "--build=x86_64-apple-darwin#{osmajor}", + "--with-system-zlib", + "--with-bugurl=https://github.com/Homebrew/homebrew-core/issues", + ] + else + args += [ + "--with-bugurl=https://github.com/Homebrew/linuxbrew-core/issues", + # Fix Linux error: gnu/stubs-32.h: No such file or directory. + "--disable-multilib", + ] + + # Change the default directory name for 64-bit libraries to `lib` + # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html + inreplace "gcc/config/i386/t-linux64", "m64=../lib64", "m64=" + + # Set the search path for glibc libraries and objects, using the system's glibc + # Fix the error: ld: cannot find crti.o: No such file or directory + ENV.prepend_path "LIBRARY_PATH", Pathname.new(Utils.safe_popen_read(ENV.cc, "-print-file-name=crti.o")).parent + end + + args += [ + "--prefix=#{prefix}", + "--libdir=#{lib}/gcc/#{version_suffix}", + "--enable-languages=#{languages.join(",")}", + "--disable-nls", + "--enable-checking=release", + # Make most executables versioned to avoid conflicts. + "--program-suffix=-#{version_suffix}", + "--with-gmp=#{Formula["gmp"].opt_prefix}", + "--with-mpfr=#{Formula["mpfr"].opt_prefix}", + "--with-mpc=#{Formula["libmpc"].opt_prefix}", + "--with-isl=#{Formula["isl"].opt_prefix}", + "--with-pkgversion=Homebrew GCC #{pkg_version} #{build.used_options*" "}".strip, + ] + + # Ensure correct install names when linking against libgcc_s; + # see discussion in https://github.com/Homebrew/homebrew/pull/34303 + if OS.mac? + inreplace "libgcc/config/t-slibgcc-darwin", "@shlib_slibdir@", "#{HOMEBREW_PREFIX}/lib/gcc/#{version_suffix}" + end + + mkdir "build" do + if OS.mac? && !MacOS::CLT.installed? + # For Xcode-only systems, we need to tell the sysroot path. + # "native-system-headers" will be appended + args << "--with-native-system-header-dir=/usr/include" + args << "--with-sysroot=#{MacOS.sdk_path}" + end + + system "../configure", *args + + make_args = [] + # Use -headerpad_max_install_names in the build, + # otherwise lto1 load commands cannot be edited on El Capitan + make_args << "BOOT_LDFLAGS=-Wl,-headerpad_max_install_names" if MacOS.version == :el_capitan + + system "make", *make_args + system "make", OS.mac? ? "install" : "install-strip" + end + + # Handle conflicts between GCC formulae and avoid interfering + # with system compilers. + # Rename man7. + Dir.glob(man7/"*.7") { |file| add_suffix file, version_suffix } + # Even when we disable building info pages some are still installed. + info.rmtree + end + + def add_suffix(file, suffix) + dir = File.dirname(file) + ext = File.extname(file) + base = File.basename(file, ext) + File.rename file, "#{dir}/#{base}-#{suffix}#{ext}" + end + + def post_install + unless OS.mac? + gcc = bin/"gcc-#{version_suffix}" + libgcc = Pathname.new(Utils.safe_popen_read(gcc, "-print-libgcc-file-name")).parent + raise "command failed: #{gcc} -print-libgcc-file-name" if $CHILD_STATUS.exitstatus.nonzero? + + glibc = Formula["glibc"] + glibc_installed = glibc.any_version_installed? + + # Symlink crt1.o and friends where gcc can find it. + crtdir = if glibc_installed + glibc.opt_lib + else + Pathname.new(Utils.safe_popen_read("/usr/bin/cc", "-print-file-name=crti.o")).parent + end + ln_sf Dir[crtdir/"*crt?.o"], libgcc + + # Create the GCC specs file + # See https://gcc.gnu.org/onlinedocs/gcc/Spec-Files.html + + # Locate the specs file + specs = libgcc/"specs" + ohai "Creating the GCC specs file: #{specs}" + specs_orig = Pathname.new("#{specs}.orig") + rm_f [specs_orig, specs] + + system_header_dirs = ["#{HOMEBREW_PREFIX}/include"] + + if glibc_installed + # https://github.com/Linuxbrew/brew/issues/724 + system_header_dirs << glibc.opt_include + else + # Locate the native system header dirs if user uses system glibc + target = Utils.safe_popen_read(gcc, "-print-multiarch").chomp + raise "command failed: #{gcc} -print-multiarch" if $CHILD_STATUS.exitstatus.nonzero? + + system_header_dirs += ["/usr/include/#{target}", "/usr/include"] + end + + # Save a backup of the default specs file + specs_string = Utils.safe_popen_read(gcc, "-dumpspecs") + raise "command failed: #{gcc} -dumpspecs" if $CHILD_STATUS.exitstatus.nonzero? + + specs_orig.write specs_string + + # Set the library search path + # For include path: + # * `-isysroot #{HOMEBREW_PREFIX}/nonexistent` prevents gcc searching built-in + # system header files. + # * `-idirafter ` instructs gcc to search system header + # files after gcc internal header files. + # For libraries: + # * `-nostdlib -L#{libgcc}` instructs gcc to use brewed glibc + # if applied. + # * `-L#{libdir}` instructs gcc to find the corresponding gcc + # libraries. It is essential if there are multiple brewed gcc + # with different versions installed. + # Noted that it should only be passed for the `gcc@*` formulae. + # * `-L#{HOMEBREW_PREFIX}/lib` instructs gcc to find the rest + # brew libraries. + libdir = HOMEBREW_PREFIX/"lib/gcc/#{version_suffix}" + specs.write specs_string + <<~EOS + *cpp_unique_options: + + -isysroot #{HOMEBREW_PREFIX}/nonexistent #{system_header_dirs.map { |p| "-idirafter #{p}" }.join(" ")} + + *link_libgcc: + #{glibc_installed ? "-nostdlib -L#{libgcc}" : "+"} -L#{libdir} -L#{HOMEBREW_PREFIX}/lib + + *link: + + --dynamic-linker #{HOMEBREW_PREFIX}/lib/ld.so -rpath #{libdir} -rpath #{HOMEBREW_PREFIX}/lib + + EOS + end + end + + test do + (testpath/"hello-c.c").write <<~EOS + #include + int main() + { + puts("Hello, world!"); + return 0; + } + EOS + system "#{bin}/gcc-#{version_suffix}", "-o", "hello-c", "hello-c.c" + assert_equal "Hello, world!\n", `./hello-c` + + (testpath/"hello-cc.cc").write <<~EOS + #include + int main() + { + std::cout << "Hello, world!" << std::endl; + return 0; + } + EOS + system "#{bin}/g++-#{version_suffix}", "-o", "hello-cc", "hello-cc.cc" + assert_equal "Hello, world!\n", `./hello-cc` + + (testpath/"test.f90").write <<~EOS + integer,parameter::m=10000 + real::a(m), b(m) + real::fact=0.5 + + do concurrent (i=1:m) + a(i) = a(i) + fact*b(i) + end do + write(*,"(A)") "Done" + end + EOS + system "#{bin}/gfortran-#{version_suffix}", "-o", "test", "test.f90" + assert_equal "Done\n", `./test` + end +end diff --git a/Formula/gconf.rb b/Formula/gconf.rb index dd17aaa0b7766..998bec898aada 100644 --- a/Formula/gconf.rb +++ b/Formula/gconf.rb @@ -12,6 +12,7 @@ class Gconf < Formula sha256 "e810083f15d5ebb027c92071ea67c5960abf4d0b19c5e7809a71d026a78ae34a" => :el_capitan sha256 "85f809fb483b3c78b283d3e7b681b133d106d991717d361c0bdd9596a81178ea" => :yosemite sha256 "91bbb172f214d7fc407f20eef91a6d4dcf0140da4e91d99f4e0c2fd1e902815d" => :mavericks + sha256 "80d45dd84ef10113ee297fcecada53bd07f103bc591f24c45800151f9ff1477d" => :x86_64_linux end depends_on "intltool" => :build @@ -25,6 +26,9 @@ class Gconf < Formula uses_from_macos "libxml2" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + system "./configure", "--disable-debug", "--disable-dependency-tracking", "--disable-silent-rules", "--prefix=#{prefix}", "--sysconfdir=#{etc}" diff --git a/Formula/gcovr.rb b/Formula/gcovr.rb index ef945691afcc9..ed5ab82086686 100644 --- a/Formula/gcovr.rb +++ b/Formula/gcovr.rb @@ -10,6 +10,7 @@ class Gcovr < Formula sha256 "64f2de6af39af65e2da0fe0622cf72005110bdafcaecdfb71abd6253dc4cf9d5" => :catalina sha256 "6a25bff0607c3ec6e8442a541dfae012678b046e5a1023efc22c5a5063300e1d" => :mojave sha256 "182bbf76588334f06561c759dfdd7ded755f913293eb5da0fa2d7a9b53e6ee86" => :high_sierra + sha256 "85e875ada9dec8dc356e0f70c6ea4e977b5e400ed4b3283d61cd1e70b90b2bc5" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/gcsfuse.rb b/Formula/gcsfuse.rb index 72168a0927ec4..51e0d303eaee0 100644 --- a/Formula/gcsfuse.rb +++ b/Formula/gcsfuse.rb @@ -10,10 +10,15 @@ class Gcsfuse < Formula sha256 "0f77f535e3f254ee258ff0fc2789c3e3cbdcd5ae82752f20ba4b9d81f08b9784" => :catalina sha256 "34f2669361a227f30c00f70aa0e8787a049c845ef4ad010a5adcd98fecf3db34" => :mojave sha256 "6edf61db4afc7f42c57b2dd4867e8ca80224b5c924c5d1e8d5bfea9b24abf4a3" => :high_sierra + sha256 "65e0a734d15177412a9a9620b87bac30cbc04e5a870106d5efe9449421af96a6" => :x86_64_linux end depends_on "go" => :build - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end def install # Build the build_gcsfuse tool. Ensure that it doesn't pick up any @@ -33,6 +38,6 @@ def install test do system "#{bin}/gcsfuse", "--help" - system "#{sbin}/mount_gcsfuse", "--help" + system "#{sbin}/mount#{OS.mac? ? "_" : "."}gcsfuse", "--help" end end diff --git a/Formula/gd.rb b/Formula/gd.rb index 45e7dc01c43ff..8708499ed441d 100644 --- a/Formula/gd.rb +++ b/Formula/gd.rb @@ -9,6 +9,7 @@ class Gd < Formula sha256 "ebc4192da4580942545084cf2f5c36dc4645a5c83244224905e01dee4e50837e" => :catalina sha256 "c014efe5f692b3146a4416c0acdaad3c632064d50aad2c18598cfb32fb31ee69" => :mojave sha256 "0bd97ae0be0bfaa7554d0628a69b5fd8cba27de7ff5bde0533d4a1b6445be614" => :high_sierra + sha256 "e5f575fb7f72b3568d51f38285b3b729a4a45567620f1fa0d0c6c4f0aead278f" => :x86_64_linux end head do diff --git a/Formula/gdal.rb b/Formula/gdal.rb index d994401f74a56..7d10649aa493f 100644 --- a/Formula/gdal.rb +++ b/Formula/gdal.rb @@ -47,9 +47,24 @@ class Gdal < Formula depends_on "xz" # get liblzma compression algorithm library from XZutils depends_on "zstd" + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "bash-completion" + end + conflicts_with "cpl", :because => "both install cpl_error.h" def install + # Fixes: error: inlining failed in call to always_inline __m128i _mm_shuffle_epi8 + ENV.append_to_cflags "-msse4.1" if ENV["CI"] + + unless OS.mac? + # The python build needs libgdal.so, which is located in .libs + ENV.append "LDFLAGS", "-L#{buildpath}/.libs" + # The python build needs gnm headers, which are located in the gnm folder + ENV.append "CFLAGS", "-I#{buildpath}/gnm" + end + args = [ # Base configuration "--prefix=#{prefix}", @@ -57,7 +72,6 @@ def install "--disable-debug", "--with-libtool", "--with-local=#{prefix}", - "--with-opencl", "--with-threads", # GDAL native backends @@ -68,7 +82,6 @@ def install "--with-pcraster=internal", # Homebrew backends - "--with-curl=/usr/bin/curl-config", "--with-expat=#{Formula["expat"].prefix}", "--with-freexl=#{Formula["freexl"].opt_prefix}", "--with-geos=#{Formula["geos"].opt_prefix}/bin/geos-config", @@ -104,7 +117,6 @@ def install "--without-mysql", "--without-perl", "--without-python", - # Unsupported backends are either proprietary or have no compatible version # in Homebrew. Podofo is disabled because Poppler provides the same # functionality and then some. @@ -129,6 +141,13 @@ def install "--without-sosi", ] + if OS.mac? + args << "--with-curl=/usr/bin/curl-config" + else + args << "--with-curl=#{Formula["curl"].opt_bin}/curl-config" + args << "--with-libz=#{Formula["zlib"].opt_prefix}" + end + # Work around "error: no member named 'signbit' in the global namespace" # Remove once support for macOS 10.12 Sierra is dropped if DevelopmentTools.clang_build_version >= 900 diff --git a/Formula/gdb.rb b/Formula/gdb.rb index 9ebd90d84d446..e99bc07d6b7ee 100644 --- a/Formula/gdb.rb +++ b/Formula/gdb.rb @@ -10,12 +10,14 @@ class Gdb < Formula sha256 "9ad6c9a4147783a50f9e67a8d683c6dc070c738da06bfe8e2bf5cdd7bdfb5763" => :catalina sha256 "4908f6954fbcccf317e4297e42f6b85ebcab003ff9d96f00f25023616782c0c1" => :mojave sha256 "ac2a55847a2cf167e05e639003813606b32827e5f05995ff3544530e49b09d7a" => :high_sierra + sha256 "edbe6eca8692baa0c0f4ff13fb8aa30593975a53a4084d48b98e2d6fec56c051" => :x86_64_linux end depends_on "guile" depends_on "python@3.8" depends_on "xz" # required for lzma support + uses_from_macos "texinfo" => :build uses_from_macos "expat" uses_from_macos "ncurses" @@ -44,6 +46,8 @@ def install --disable-binutils ] + ENV.append "CPPFLAGS", "-I#{Formula["python"].opt_libexec}" unless OS.mac? + mkdir "build" do system "../configure", *args system "make" diff --git a/Formula/gdbm.rb b/Formula/gdbm.rb index 17705018945df..690f96fa68505 100644 --- a/Formula/gdbm.rb +++ b/Formula/gdbm.rb @@ -6,12 +6,12 @@ class Gdbm < Formula sha256 "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc" bottle do - cellar :any rebuild 1 sha256 "b20854a82cf1285c3be2c0890e45fa532bf2f5a9d9465694439c4a4c4310e528" => :catalina sha256 "2168d58856917ca996d12dedaa930643529c66046103fe55018afc51f2bc1fcb" => :mojave sha256 "ac688d571f9c00e09670440d67d2869a34dab0fb897ba0b183ed84fceffdbc9c" => :high_sierra sha256 "89d6db4fbffbe2184b4531faaebf0432a4b01e1ed92678ce6bd2f95c69dc9803" => :sierra + sha256 "80fc4bdfef26e3df4c1f7390e1169d32935faa69f00888318bf0ed8321798aad" => :x86_64_linux end # Use --without-readline because readline detection is broken in 1.13 @@ -24,6 +24,17 @@ def install --prefix=#{prefix} ] + args << "--enable-libgdbm-compat" unless OS.mac? + + # GDBM uses some non-standard GNU extensions, + # enabled with -D_GNU_SOURCE. See: + # https://patchwork.ozlabs.org/patch/771300/ + # https://stackoverflow.com/questions/5582211 + # https://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html + # + # Fix error: unknown type name 'blksize_t' + args << "CPPFLAGS=-D_GNU_SOURCE" unless OS.mac? || build.bottle? + system "./configure", *args system "make", "install" end diff --git a/Formula/gdcm.rb b/Formula/gdcm.rb index 56965e9b3fc5c..b3cb2e79af3c1 100644 --- a/Formula/gdcm.rb +++ b/Formula/gdcm.rb @@ -48,7 +48,7 @@ def install ] mkdir "build" do - ENV.append "LDFLAGS", "-undefined dynamic_lookup" + ENV.append "LDFLAGS", "-undefined dynamic_lookup" if OS.mac? system "cmake", "..", *args system "ninja" diff --git a/Formula/gdk-pixbuf.rb b/Formula/gdk-pixbuf.rb index 610af67cae757..0a05dcd92323d 100644 --- a/Formula/gdk-pixbuf.rb +++ b/Formula/gdk-pixbuf.rb @@ -9,10 +9,15 @@ class GdkPixbuf < Formula sha256 "d70823971bb0c34d1ca997233471c9727dc7fe487ffbda050fad35a873a2b909" => :catalina sha256 "e2599d42eb2cdf08f3784575778ea782e9bd5dfefbf15f7aea5408d8f653a6be" => :mojave sha256 "3e95bd4ea1b357022809c86a104e0e971a264ffc69888026f261d74507abea00" => :high_sierra + sha256 "15afae31f494840b402e13da981a6a9ed272f9e969e1df85a0a934bc1b131f73" => :x86_64_linux end depends_on "gobject-introspection" => :build - depends_on "meson" => :build + if OS.mac? + depends_on "meson" => :build + else + depends_on "meson-internal" => :build + end depends_on "ninja" => :build depends_on "pkg-config" => :build depends_on "glib" @@ -47,13 +52,19 @@ def install -Dgir=true -Drelocatable=false -Dnative_windows_loaders=false - -Dinstalled_tests=false -Dman=false ] + args << "-Dinstalled_tests=false" if OS.mac? + args << "--libdir=#{lib}" unless OS.mac? + ENV["DESTDIR"] = "/" mkdir "build" do - system "meson", *args, ".." + if OS.mac? + system "meson", *args, ".." + else + system "#{Formula["meson-internal"].bin}/meson", *args, ".." + end system "ninja", "-v" system "ninja", "install" end @@ -106,8 +117,8 @@ def post_install -lgdk_pixbuf-2.0 -lglib-2.0 -lgobject-2.0 - -lintl ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gdl.rb b/Formula/gdl.rb index a3752814111b5..058a459393000 100644 --- a/Formula/gdl.rb +++ b/Formula/gdl.rb @@ -18,6 +18,9 @@ class Gdl < Formula depends_on "libxml2" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", "--prefix=#{prefix}" @@ -83,10 +86,10 @@ def install -lglib-2.0 -lgobject-2.0 -lgtk-3 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gdm.rb b/Formula/gdm.rb index 713bb763fd85d..7453b83d0c7f7 100644 --- a/Formula/gdm.rb +++ b/Formula/gdm.rb @@ -16,6 +16,7 @@ class Gdm < Formula sha256 "b3f081076a078f90f6a534ff30ff268c89baec38bd02ff11c9e02804755c8c33" => :el_capitan sha256 "03f2d8cbcee0c4e41a00ec222f56b7d3204290b075afafe28afe6ced3458ebd8" => :yosemite sha256 "a5b111a00c19c74400787394eead8b5a209f9ee64125a5365eae97fa3d78d38a" => :mavericks + sha256 "728da93a2b68dfc522a68e1292bf1cf06e14887bea9491db726c6dacfd00fbe5" => :x86_64_linux end depends_on "go" diff --git a/Formula/gdrive.rb b/Formula/gdrive.rb index 5a6b335fa2db6..ada1183b3533e 100644 --- a/Formula/gdrive.rb +++ b/Formula/gdrive.rb @@ -12,6 +12,7 @@ class Gdrive < Formula sha256 "e26ef4bec660913f42aa735c28f58393912d2d0293bf98a351fa2b27a1baee01" => :mojave sha256 "8fc5917762cd0b7622d35053931b41315606be97ba38ae34c9a67bf7ff87a1d3" => :high_sierra sha256 "b03e82ba9bb723b7f6225607b3127b9d515f0d79271f76b375b74324aecfb057" => :sierra + sha256 "d5117e17733b88f11f7783f1417079a604f9d0a867018f1f6e13e95e7f7f4a64" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/geckodriver.rb b/Formula/geckodriver.rb index 03b01cc149a6e..5fc23d633a557 100644 --- a/Formula/geckodriver.rb +++ b/Formula/geckodriver.rb @@ -32,6 +32,7 @@ class Geckodriver < Formula sha256 "2b9a2eb29b8199df3f0c8e3a4395337fcdd1ae00cea28970df0add10a36b94ce" => :catalina sha256 "13dd973454d187da00ccd4ab24f72987ea47f4984caa2e1fa5b3c36273d96bfa" => :mojave sha256 "2e57ba33554f7b0180873d49dc8dc1b1587e9c8d637d8f50146395dcb923afea" => :high_sierra + sha256 "2d0592ea9094f166613edf8950dabfaba3431b771bc7899cb956932b90cab933" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/gecode.rb b/Formula/gecode.rb index 52079d3ae2a46..6ea25d6dd6df0 100644 --- a/Formula/gecode.rb +++ b/Formula/gecode.rb @@ -10,6 +10,7 @@ class Gecode < Formula sha256 "525b7649d716a0ccb5f47f29e93a07f1677cbe531c9c978656b04826ad1cb678" => :mojave sha256 "763d0d5da64075f5f64c3b7aee49a604680c266b1b6e4eeb8ffcfdb9e0d9ca0d" => :high_sierra sha256 "1bb46e60636f1431cc5bf4b9aed1a2f038da1fef0eaeb1c3130a9252924efd54" => :sierra + sha256 "ef39c4958d2d599eb73e996cdc2a7a3f13fe1a884846c9903b39ec33f3cea49d" => :x86_64_linux end def install diff --git a/Formula/gedit.rb b/Formula/gedit.rb index 1e9b98816a0d9..23939d173a35a 100644 --- a/Formula/gedit.rb +++ b/Formula/gedit.rb @@ -92,7 +92,7 @@ def post_install -I#{gtksourceview4.opt_include}/gtksourceview-4 -I#{gtkx3.opt_include}/gtk-3.0 -I#{harfbuzz.opt_include}/harfbuzz - -I#{include}/gedit-3.36 + -I#{OS.mac? ? include : opt_include}/gedit-3.36 -I#{libepoxy.opt_include} -I#{libffi.opt_lib}/libffi-3.0.13/include -I#{libpeas.opt_include}/libpeas-1.0 @@ -103,14 +103,14 @@ def post_install -L#{atk.opt_lib} -L#{cairo.opt_lib} -L#{gdk_pixbuf.opt_lib} - -L#{lib}/gedit + -L#{OS.mac? ? lib : opt_lib}/gedit -L#{gettext.opt_lib} -L#{glib.opt_lib} -L#{gobject_introspection.opt_lib} -L#{gtksourceview4.opt_lib} -L#{gtkx3.opt_lib} -L#{libpeas.opt_lib} - -L#{lib} + -L#{OS.mac? ? lib : opt_lib} -L#{pango.opt_lib} -latk-1.0 -lcairo @@ -124,13 +124,13 @@ def post_install -lgmodule-2.0 -lgobject-2.0 -lgtk-3 - -lgtksourceview-4.0 - -lintl + -lgtksourceview-#{OS.mac? ? "4.0" : "4"} -lpango-1.0 -lpangocairo-1.0 -lpeas-1.0 -lpeas-gtk-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gegl.rb b/Formula/gegl.rb index 80c7ec7584eae..e958d6191ef30 100644 --- a/Formula/gegl.rb +++ b/Formula/gegl.rb @@ -8,6 +8,7 @@ class Gegl < Formula sha256 "2067ee4af3b1ddc40a49765e5612bcd23f0724ce2702db200f2ed7fc28792df5" => :catalina sha256 "8163a17103afaaaadfaee1e509847278929365b4a8aac049f5912536e6b8b169" => :mojave sha256 "35b5da2793a47b04b659a152e33dd520d28dfd42e9267288c28a0898d4098a3b" => :high_sierra + sha256 "f47824301983b8f5e1834e82c3838526cd60752b13218c372217333da6924fb9" => :x86_64_linux end head do @@ -26,6 +27,7 @@ class Gegl < Formula depends_on "jpeg" depends_on "json-glib" depends_on "libpng" + depends_on "cairo" unless OS.mac? on_linux do depends_on "cairo" @@ -69,12 +71,15 @@ def install return 0; } EOS - system ENV.cc, "-I#{include}/gegl-0.4", "-L#{lib}", "-lgegl-0.4", + flags = "-I#{include}/gegl-0.4", "-L#{lib}", "-lgegl-0.4" + system ENV.cc, *(flags if OS.mac?), "-I#{Formula["babl"].opt_include}/babl-0.1", "-I#{Formula["glib"].opt_include}/glib-2.0", "-I#{Formula["glib"].opt_lib}/glib-2.0/include", "-L#{Formula["glib"].opt_lib}", "-lgobject-2.0", "-lglib-2.0", - testpath/"test.c", "-o", testpath/"test" + testpath/"test.c", + *(flags unless OS.mac?), + "-o", testpath/"test" system "./test" end end diff --git a/Formula/genact.rb b/Formula/genact.rb index b97e6193850be..e7244c3a12108 100644 --- a/Formula/genact.rb +++ b/Formula/genact.rb @@ -10,6 +10,7 @@ class Genact < Formula sha256 "38ba680b756939cbf698a3bb4e135613663e5d7778f15cf03c8cd2fb19abdad7" => :catalina sha256 "da6e18f5cbe7a84c8ad3c4a3d079d7ca0deaded383d98ce72afed4f770a02aed" => :mojave sha256 "2c962de62551fce95f18b2e46cc9b1140256daa10fcd5555d5cfc2e3999df340" => :high_sierra + sha256 "146f2f9615674286beab74f5d9918a12e04720347c60b9d6c85e608d8f5c1c29" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/generate-json-schema.rb b/Formula/generate-json-schema.rb index be0d4f2c60f96..1c5a5fb7f6db6 100644 --- a/Formula/generate-json-schema.rb +++ b/Formula/generate-json-schema.rb @@ -14,6 +14,7 @@ class GenerateJsonSchema < Formula sha256 "3461301c038b8bb6e15b8e183661976e95ea7b7e0659d57f0f21ea2c0eb4e67c" => :high_sierra sha256 "a6ff075810774d44030a59a12032d302c64834d03c7aabeb32efb8dc86d276de" => :sierra sha256 "5a5b34d8e233d9b75648c39f8edada5077c8f6c6466bd3358f3f661062ccbe83" => :el_capitan + sha256 "603a75d4ae2557499f867cfbb968bbc01006e65fc9e361fac84632d9558f6151" => :x86_64_linux end depends_on "node" diff --git a/Formula/gengetopt.rb b/Formula/gengetopt.rb index 2e10b1b450203..aa2cf707d0294 100644 --- a/Formula/gengetopt.rb +++ b/Formula/gengetopt.rb @@ -11,8 +11,11 @@ class Gengetopt < Formula sha256 "2ae5eeef439a6abc4d1f65965e1bafa9ac5ad0620cb4ef5e9444a4b2dbef1872" => :mojave sha256 "00f2578e7697c01d060a422e1be0ce8f4c6d23b365967ff7b5501d5cd6306dd1" => :high_sierra sha256 "57acd0ca20988a1b4f0f16383edb985549597b8a5266316e3a314b7775bab3c0" => :sierra + sha256 "23b4bfb4be143ee387849515276205a351fd8ef55c4b083d26d69942e6a2355d" => :x86_64_linux end + uses_from_macos "texinfo" + def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", diff --git a/Formula/genometools.rb b/Formula/genometools.rb index fb1a3da434cee..1f4bc94de5543 100644 --- a/Formula/genometools.rb +++ b/Formula/genometools.rb @@ -12,12 +12,14 @@ class Genometools < Formula sha256 "2c49e8ae31d2e3d26e90c174bb4fb1e8e007f36bd9b9508220ff321ca3520d05" => :catalina sha256 "c6509a3719aaa5e946f2e395c1ddcbe73c36ca8e1e965edb76136b00a3565c71" => :mojave sha256 "89448e5e80e60f6d62ad7cc30892ae6d67fbc7af83e8ee7ce71e232884fe6721" => :high_sierra + sha256 "498ffb5e06a3146339e6323c4a362bc8ae9b6b4ce1ca178d8486c84b60b0c477" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "cairo" depends_on "pango" depends_on "python@3.8" + depends_on "linuxbrew/xorg/libpthread-stubs" => :build unless OS.mac? conflicts_with "libslax", :because => "both install `bin/gt`" diff --git a/Formula/genstats.rb b/Formula/genstats.rb index 0b16300d77131..dc0987eb50d48 100644 --- a/Formula/genstats.rb +++ b/Formula/genstats.rb @@ -13,6 +13,7 @@ class Genstats < Formula sha256 "44502f7a2dfcb1355336db69267d6363d6e8b8767b47628b0d3099743513ed5f" => :el_capitan sha256 "91737ec825ed346716fddcedc4e075b195f214dfb22586a33d46f7ec5ea3a17e" => :yosemite sha256 "d46142a806e13029120bfb1a038805b07dc88b191aed1cd41340f5f868168f92" => :mavericks + sha256 "b532a53713cc8fafb4a544bf1d07ab75a5d70436f0fb15d1eaa52d1d11235fad" => :x86_64_linux end def install diff --git a/Formula/geocode-glib.rb b/Formula/geocode-glib.rb index 7a68555d3a53f..f81b1fb249a87 100644 --- a/Formula/geocode-glib.rb +++ b/Formula/geocode-glib.rb @@ -5,7 +5,6 @@ class GeocodeGlib < Formula sha256 "01fe84cfa0be50c6e401147a2bc5e2f1574326e2293b55c69879be3e82030fd1" bottle do - cellar :any sha256 "0e79392bb60a588eaa86cbf4e756cad668cbf6ac6fd86606827874415e3e89fb" => :catalina sha256 "ba3f2db7d23a1985abbcf09871cb98991fbc65f1935711dd6a2bc4d90bddeb10" => :mojave sha256 "0ab0e0ed8f43285b66a27ccb0309fa719887298a9bcc95c8178ee07c84441a09" => :high_sierra @@ -55,8 +54,8 @@ def post_install -lgio-2.0 -lglib-2.0 -lgobject-2.0 - -lintl ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/geographiclib.rb b/Formula/geographiclib.rb index 171944e1d3693..e7b9f4e88d100 100644 --- a/Formula/geographiclib.rb +++ b/Formula/geographiclib.rb @@ -9,13 +9,16 @@ class Geographiclib < Formula sha256 "02ab2c5d659b1a1a2feb99cdf37635a20abc6747aadb25c5849dcb2f41563274" => :catalina sha256 "3ae437ffb71cebfb80137603de10c69c33ba9ea9ba820fb00a1c136b66c158dc" => :mojave sha256 "aeaf0148b41ba77b5f91221f0058326e6ca6be3de569966fe2d593e1200b451a" => :high_sierra + sha256 "225a8d56c85b76f273c33c8b2d7534146f63e97fffc46552e992544aea965447" => :x86_64_linux end depends_on "cmake" => :build def install mkdir "build" do - system "cmake", "..", "-DCMAKE_OSX_SYSROOT=#{MacOS.sdk_path}", *std_cmake_args + args = std_cmake_args + args << "-DCMAKE_OSX_SYSROOT=#{MacOS.sdk_path}" if OS.mac? + system "cmake", "..", *args system "make", "install" end end diff --git a/Formula/geoip.rb b/Formula/geoip.rb index 067d798cf216c..e36f4a96a3af6 100644 --- a/Formula/geoip.rb +++ b/Formula/geoip.rb @@ -6,12 +6,13 @@ class Geoip < Formula head "https://github.com/maxmind/geoip-api-c.git" bottle do - cellar :any + cellar :any_skip_relocation rebuild 1 sha256 "8cac6d2fe351dbae2398e8c18906b06cd01d4b5db20c6a886f0551eee358d785" => :catalina sha256 "311704d07adf7fa502e60bd0e462ba26f6830838c09461f8bbac38ccb5da77f1" => :mojave sha256 "17db912ce8ffcd831d775f22c1ea428faf55d7ecb4dd19cdba6ab3234874417c" => :high_sierra sha256 "166b2195350b830ddcaea41a24dbdbcea48b9d42f96673088dd3d51b8d5774d7" => :sierra + sha256 "07e5d2f3dd364b50dab82960a8192f2b6fe22774ff7ffcf2c377e723c09d4681" => :x86_64_linux end resource "database" do diff --git a/Formula/geoipupdate.rb b/Formula/geoipupdate.rb index bd156b3e190b3..79c6c3a4cc14f 100644 --- a/Formula/geoipupdate.rb +++ b/Formula/geoipupdate.rb @@ -9,6 +9,7 @@ class Geoipupdate < Formula sha256 "8e03cdb8795a6a0dbd1a35a12c50e2021fee969926f6498369b0b04ea097c942" => :catalina sha256 "710a53cf245d180e66f8b4626ff22cb2587912a8e8cd17b9cb34b6d5ffcc3174" => :mojave sha256 "99a8bc8e63c1c8949e52fdd0fe04a27e1c2d973f2d2e9959fda52795bb7d01ed" => :high_sierra + sha256 "71af5bb70564b340390bb9dbc681ecfcf63533f13f911207f94e014415aa9eab" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/geos.rb b/Formula/geos.rb index 09651ab86baa1..be8b0392ee0e5 100644 --- a/Formula/geos.rb +++ b/Formula/geos.rb @@ -10,6 +10,7 @@ class Geos < Formula sha256 "96668ef5d3512c74d8b9c029d36d52171e1d26e90935f4a108f51101c34df313" => :catalina sha256 "32ad6e55282b63e933ca43309989943da06bd34eb151b8ca2f81ca70eb4ef146" => :mojave sha256 "f17377d259393a9c0a7dd2ce41b7af6a09c2f4c137afe267ed7650adccc86c3f" => :high_sierra + sha256 "5f73859cf9de9e00e38fbe125e1726d582c9501a619f511b8867a3625477480c" => :x86_64_linux end depends_on "swig" => :build @@ -19,7 +20,14 @@ def install # https://trac.osgeo.org/geos/ticket/771 inreplace "configure" do |s| s.gsub! /PYTHON_CPPFLAGS=.*/, %Q(PYTHON_CPPFLAGS="#{`python3-config --includes`.strip}") - s.gsub! /PYTHON_LDFLAGS=.*/, 'PYTHON_LDFLAGS="-Wl,-undefined,dynamic_lookup"' + s.gsub! /PYTHON_LDFLAGS=.*/, 'PYTHON_LDFLAGS="-Wl,-undefined,dynamic_lookup"' if OS.mac? + end + + # Fixes "cannot find Python library path" + unless OS.mac? + inreplace "configure", "$base_python_path/lib/python$PYTHON_VERSION/config/", "$base_python_path/lib/" + inreplace "configure", "libpython$PYTHON_VERSION.*", "libpython3.so" + inreplace "configure", "-lpython$PYTHON_VERSION", "-lpython3" end system "./configure", "--disable-dependency-tracking", diff --git a/Formula/get-flash-videos.rb b/Formula/get-flash-videos.rb index bf41254b90b00..b992042a1ff37 100644 --- a/Formula/get-flash-videos.rb +++ b/Formula/get-flash-videos.rb @@ -11,6 +11,7 @@ class GetFlashVideos < Formula sha256 "10e25788bbd00ffd0f0a5281c9c4c493c2957947ba4690cf92460c98aa72dc1b" => :high_sierra sha256 "6c6e60aff2308881f4ef896b5a5c2dd1b05db9146d224be024793f042534dc6d" => :sierra sha256 "0b7edca9b6518af848a6cb5f84bb34014cd017391279398ea9d796dc89ea7a57" => :el_capitan + sha256 "00d5ca2a5f48c1d41c8b207ee3dac89720599f828e0d2ed0291a3ac7593717e0" => :x86_64_linux end depends_on "rtmpdump" @@ -50,6 +51,23 @@ class GetFlashVideos < Formula sha256 "cd7209a6dfe0a3dc8caffe1aa2233b0e6effec7572d76a7a93feefffe636214e" end + unless OS.mac? + resource "Module::Find" do + url "https://cpan.metacpan.org/authors/id/C/CR/CRENZ/Module-Find-0.13.tar.gz" + sha256 "4a47862072ca4962fa69796907476049dc60176003e946cf4b68a6b669f18568" + end + + resource "Try::Tiny" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Try-Tiny-0.28.tar.gz" + sha256 "f1d166be8aa19942c4504c9111dade7aacb981bc5b3a2a5c5f6019646db8c146" + end + + resource "XML::Simple" do + url "https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-Simple-2.24.tar.gz" + sha256 "9a14819fd17c75fbb90adcec0446ceab356cab0ccaff870f2e1659205dc2424f" + end + end + def install ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" resources.each do |r| diff --git a/Formula/get_iplayer.rb b/Formula/get_iplayer.rb index 4d6c4b57a0f41..253d3b4f41ca9 100644 --- a/Formula/get_iplayer.rb +++ b/Formula/get_iplayer.rb @@ -10,6 +10,7 @@ class GetIplayer < Formula sha256 "a3e2df4c8d889ff6230f0ef2bdace24455d15de97a0442b19139f7b8502dbf28" => :catalina sha256 "574a33ef3208092d42fb8640da5ec55dd33b8114207f871329dfdd04813f77e1" => :mojave sha256 "7cb313cecc47bd886b3fa782cc90d790ba75af34567b6bd29af84a218abcec40" => :high_sierra + sha256 "4b0577177c74dd55816562ad857b76025b034458416407ee8d6195c50fd6e58f" => :x86_64_linux end depends_on "atomicparsley" @@ -38,9 +39,77 @@ class GetIplayer < Formula sha256 "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406" end + unless OS.mac? + resource "Try-Tiny" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz" + sha256 "da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b" + end + + resource "Path:Class" do + url "https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/Path-Class-0.33.tar.gz" + sha256 "cd8cc6a68e2099eeb6099df6af83b4585eb0ddf6c77490d6fa97eadb09d0c677" + end + + resource "Net::HTTP" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/Net-HTTP-6.18.tar.gz" + sha256 "7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c" + end + + resource "Net::SSLeay" do + url "https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz" + sha256 "2000da483c8471a0b61e06959e92a6fca7b9e40586d5c828de977d3d2081cfdd" + end + + resource "HTML::Entities" do + url "https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz" + sha256 "ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b" + end + + resource "HTTP::Cookies" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz" + sha256 "0cc7f079079dcad8293fea36875ef58dd1bfd75ce1a6c244cd73ed9523eb13d4" + end + + resource "HTTP::Date" do + url "https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz" + sha256 "e8b9941da0f9f0c9c01068401a5e81341f0e3707d1c754f8e11f42a7e629e333" + end + + resource "HTML::Headers" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz" + sha256 "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112" + end + + resource "LWP::ConnCache" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/libwww-perl-6.20.tar.gz" + sha256 "3cf4d1bdade592fc9dd7710403255ef2eebb075b7365cbe52fcdfc579d79b2b0" + end + + resource "LWP::Protocol::https" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz" + sha256 "522cc946cf84a1776304a5737a54b8822ec9e79b264d0ba0722a70473dbfb9e7" + end + + resource "URI" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/URI-1.74.tar.gz" + sha256 "a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d" + end + + resource "XML-LibXML" do + url "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0132.tar.gz" + sha256 "721452e3103ca188f5968ab06d5ba29fe8e00e49f4767790882095050312d476" + end + + resource "XML::SAX::Exception" do + url "https://cpan.metacpan.org/authors/id/K/KH/KHAMPTON/XML-SAX-Base-1.02.tar.gz" + sha256 "c541861df7e70f83950afedf2058148aa9d4bd733929a869829c97833ad1600b" + end + end + def install ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" ENV["NO_NETWORK_TESTING"] = "1" + ENV["PERL_MM_USE_DEFAULT"] = "1" unless OS.mac? resources.each do |r| r.stage do @@ -51,7 +120,7 @@ def install inreplace ["get_iplayer", "get_iplayer.cgi"] do |s| s.gsub!(/^(my \$version_text);/i, "\\1 = \"#{pkg_version}-homebrew\";") - s.gsub! "#!/usr/bin/env perl", "#!/usr/bin/perl" + s.gsub! "#!/usr/bin/env perl", "#!/usr/bin/perl" if OS.mac? end bin.install "get_iplayer", "get_iplayer.cgi" diff --git a/Formula/getdns.rb b/Formula/getdns.rb index 973c83b2dc260..9a61e83f9758f 100644 --- a/Formula/getdns.rb +++ b/Formula/getdns.rb @@ -10,6 +10,7 @@ class Getdns < Formula sha256 "e921bc22b5d49af0cf93a3daf035828b286cf28faf4e3916c863214c58cb100d" => :catalina sha256 "dddc38b808f9901c02b56755838005ff9f04cb665f40d7145709838e8e38ef99" => :mojave sha256 "431361fe29326a2c2b8ecb57b87f8a09c26fc21b5e3170c74bfe61b9ce6b1864" => :high_sierra + sha256 "6179060eae173ee58e6674ba59ed49e2dd1ff0ae7d5339d0225b8edaaaa456ef" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/getmail.rb b/Formula/getmail.rb index a4421d2dd6a88..0b24c45ec371b 100644 --- a/Formula/getmail.rb +++ b/Formula/getmail.rb @@ -10,6 +10,7 @@ class Getmail < Formula sha256 "bc414cc8a0f41c10adea2fe326d90567ed5fb143db7a4030db72c40c94f816d5" => :mojave sha256 "bc414cc8a0f41c10adea2fe326d90567ed5fb143db7a4030db72c40c94f816d5" => :high_sierra sha256 "d6a5a3c48f35d407c0a221da9c94e5ca8a92beac14c26aa13d4d355dfd64c923" => :sierra + sha256 "5831ea59e991a117a04bdefeedc5a0df51c2caf115191ea2dc1dd941561c1cc5" => :x86_64_linux end def install diff --git a/Formula/gettext.rb b/Formula/gettext.rb index ea18a7cf0fb21..4f6c10c7811aa 100644 --- a/Formula/gettext.rb +++ b/Formula/gettext.rb @@ -10,6 +10,7 @@ class Gettext < Formula sha256 "71f4ded03e8258b5e6896eebb00d26ed48307fbebece1a884b17ca3fb40e3121" => :catalina sha256 "52067198cab528f05fdc0b06f7b9711f7614f60a7361f1e764c4f46d3342ff22" => :mojave sha256 "4a999c75dcc53cbc711e3ac6545db69ab3aeca6c29c1cb6b21c353f237342457" => :high_sierra + sha256 "ac517401cf31345f810e16b902a4c1aecce4028bfcfc4cf66e811da253d531aa" => :x86_64_linux end uses_from_macos "ncurses" @@ -19,9 +20,9 @@ def install "--disable-silent-rules", "--disable-debug", "--prefix=#{prefix}", - "--with-included-gettext", + ("--with-included-gettext" if OS.mac?), # Work around a gnulib issue with macOS Catalina - "gl_cv_func_ftello_works=yes", + ("gl_cv_func_ftello_works=yes" if OS.mac?), "--with-included-glib", "--with-included-libcroco", "--with-included-libunistring", @@ -32,7 +33,11 @@ def install # Don't use VCS systems to create these archives "--without-git", "--without-cvs", - "--without-xz" + "--without-xz", + # Use vendored libxml2 to break a cyclic dependency: + # python -> tcl-tk -> xorg -> libxpm -> gettext -> libxml2 -> python + ("--with-included-libxml" unless OS.mac?), + ("--with-libxml2-prefix=#{Formula["libxml2"].opt_prefix}" if OS.mac?) system "make" ENV.deparallelize # install doesn't support multiple make jobs system "make", "install" diff --git a/Formula/getxbook.rb b/Formula/getxbook.rb index a8640a9b05afe..889387576a2eb 100644 --- a/Formula/getxbook.rb +++ b/Formula/getxbook.rb @@ -11,6 +11,7 @@ class Getxbook < Formula sha256 "68f7f76c607807315d1e8305830eaa94d04e1c87f1ea1382fb00bd7ec74f2886" => :mojave sha256 "dce13d6e7d9f5f0eb79064858dca9dc3d62b274ba1f07b2ceaca3bf06e4effed" => :high_sierra sha256 "d4b7500ecfbcf0b0d4ff905b01589a546aa53da5c1c465878305c8b6ee2c363c" => :sierra + sha256 "396adb655d51e1e1b79952a8c38cdbdd2b0185ac4eb9b08c1e16da4f04f9c58f" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/gexiv2.rb b/Formula/gexiv2.rb index d879c36e0bfa1..706f64b6fd2de 100644 --- a/Formula/gexiv2.rb +++ b/Formula/gexiv2.rb @@ -5,10 +5,10 @@ class Gexiv2 < Formula sha256 "8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77" bottle do - cellar :any sha256 "1f8d42d1bb3e9ca58311b3a08b0576993007cb0d580e8740663e7ad4a055fb52" => :catalina sha256 "7d97c40bab30a98f845560e0e6d12ea514ecceee3aab447f9a06664474d2ba10" => :mojave sha256 "98515f671493f424a126e54ed940358f87a26d1bb049051735014b7c8a070900" => :high_sierra + sha256 "c93601e8e58ce6f7f75dbe8d2323ab788647360d137bfd7a6c37983ef4149239" => :x86_64_linux end depends_on "gobject-introspection" => :build diff --git a/Formula/gf-complete.rb b/Formula/gf-complete.rb index bf4fde9960530..c80bc75f6b080 100644 --- a/Formula/gf-complete.rb +++ b/Formula/gf-complete.rb @@ -13,6 +13,7 @@ class GfComplete < Formula sha256 "7a00f4c71d8f2173a4a21f1638010ee149d927dfb0f95a901036290f9b6529b5" => :el_capitan sha256 "fd9172068e361c01e87a7a696e2ad6e7cee18f473cdd878a249e7df99e6cdf4a" => :yosemite sha256 "9f82edf4ac3d0207b91075dbc7656ab21f6ab82b7df12053bdbcbf9886109cd3" => :mavericks + sha256 "ac444508581c82a6d1879deab09897c70015d724f5c0f12f4c24820195236665" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/gflags.rb b/Formula/gflags.rb index b7c1b4c47132b..76a1c6556d559 100644 --- a/Formula/gflags.rb +++ b/Formula/gflags.rb @@ -11,6 +11,7 @@ class Gflags < Formula sha256 "e3176e449321b1e2070a9fabc796e6820f2f0f1f4db1c3916f58e6cdd52e510e" => :mojave sha256 "4beffa84f47bdfd9a1a90d9e591d9af4616db464d63046018ef0c58936d58366" => :high_sierra sha256 "6f06466ca55f2174daecbc935e0bca1f2aed9bfb94a92f21d52fb4db1e07cd4a" => :sierra + sha256 "cc58b21d997acc3a83f13d98c6211d97adb5301565ab9a2e2f2e1de4c1136aa1" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/gh.rb b/Formula/gh.rb index fa51b1ce288ae..22cc20a340a9a 100644 --- a/Formula/gh.rb +++ b/Formula/gh.rb @@ -9,6 +9,7 @@ class Gh < Formula sha256 "210cce26348d4b91860f6fd9cf2037d6f316474bd318ecf58bc2923037c9b456" => :catalina sha256 "1b56352a37dc5e336a93602cd0db37c58b8a8dfdec3e56d5bce8f4ff435f4ad4" => :mojave sha256 "fcaab84b4e5a4e08d045348b42bd431412a169d6d117ed7af76f483970b2ebc2" => :high_sierra + sha256 "5c9839ffe6003613b08e5a12e2143414584497a347d33ffba1f0a01a8b61f98e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ghc.rb b/Formula/ghc.rb index 77de11e5622ab..b3c7219914fc3 100644 --- a/Formula/ghc.rb +++ b/Formula/ghc.rb @@ -12,6 +12,7 @@ class Ghc < Formula sha256 "0771a43a5fd75ac8f3814367e0b99b27881b6730ced580eca109516aa250be4a" => :catalina sha256 "12b0bfdf7570a348bda4ff916f3319a30c8cd82957725a78ba0ef25a1e42fdcc" => :mojave sha256 "ab8ed6381773c90a5687843743b67e80ea7305cbebf056d0c1cceedb0ecc3490" => :high_sierra + sha256 "52efa3e137afcbfaa95a70046a0d488451f9593b99f2e5f1572273c8203f8b16" => :x86_64_linux end head do @@ -30,6 +31,14 @@ class Ghc < Formula depends_on "python@3.8" => :build depends_on "sphinx-doc" => :build + unless OS.mac? + depends_on "m4" => :build + depends_on "ncurses" + + # This dependency is needed for the bootstrap executables. + depends_on "gmp" => :build + end + resource "gmp" do url "https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz" mirror "https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz" @@ -41,8 +50,13 @@ class Ghc < Formula # "This is a distribution for Mac OS X, 10.7 or later." # A binary of ghc is needed to bootstrap ghc resource "binary" do - url "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-apple-darwin.tar.xz" - sha256 "65b1ca361093de4804a7e40b3e68178e1ef720f84f743641ec8d95e56a45b3a8" + if OS.linux? + url "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-deb9-linux.tar.xz" + sha256 "d1cf7886f27af070f3b7dbe1975a78b43ef2d32b86362cbe953e79464fe70761" + else + url "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-apple-darwin.tar.xz" + sha256 "65b1ca361093de4804a7e40b3e68178e1ef720f84f743641ec8d95e56a45b3a8" + end end def install @@ -61,8 +75,13 @@ def install # GMP *does not* use PIC by default without shared libs so --with-pic # is mandatory or else you'll get "illegal text relocs" errors. resource("gmp").stage do + args = if OS.mac? + "--build=#{Hardware.oldest_cpu}-apple-darwin#{`uname -r`.to_i}" + else + "--build=core2-linux-gnu" + end system "./configure", "--prefix=#{gmp}", "--with-pic", "--disable-shared", - "--build=#{Hardware.oldest_cpu}-apple-darwin#{`uname -r`.to_i}" + *args system "make" system "make", "install" end @@ -70,6 +89,20 @@ def install args = ["--with-gmp-includes=#{gmp}/include", "--with-gmp-libraries=#{gmp}/lib"] + unless OS.mac? + # Fix error while loading shared libraries: libgmp.so.10 + ln_s Formula["gmp"].lib/"libgmp.so", gmp/"lib/libgmp.so.10" + ENV.prepend_path "LD_LIBRARY_PATH", gmp/"lib" + # Fix /usr/bin/ld: cannot find -lgmp + ENV.prepend_path "LIBRARY_PATH", gmp/"lib" + # Fix ghc-stage2: error while loading shared libraries: libncursesw.so.5 + ln_s Formula["ncurses"].lib/"libncursesw.so", gmp/"lib/libncursesw.so.5" + # Fix ghc-stage2: error while loading shared libraries: libtinfo.so.5 + ln_s Formula["ncurses"].lib/"libtinfo.so", gmp/"lib/libtinfo.so.5" + # Fix ghc-pkg: error while loading shared libraries: libncursesw.so.6 + ENV.prepend_path "LD_LIBRARY_PATH", Formula["ncurses"].lib + end + # As of Xcode 7.3 (and the corresponding CLT) `nm` is a symlink to `llvm-nm` # and the old `nm` is renamed `nm-classic`. Building with the new `nm`, a # segfault occurs with the following error: @@ -86,6 +119,16 @@ def install end resource("binary").stage do + # Change the dynamic linker and RPATH of the binary executables. + if OS.linux? && Formula["glibc"].any_version_installed? + keg = Keg.new(prefix) + ["ghc/stage2/build/tmp/ghc-stage2"].concat(Dir["libraries/*/dist-install/build/*.so", + "rts/dist/build/*.so*", "utils/*/dist*/build/tmp/*"]).each do |s| + file = Pathname.new(s) + keg.change_rpath(file, Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s) if file.dynamic_elf? + end + end + binary = buildpath/"binary" system "./configure", "--prefix=#{binary}", *args diff --git a/Formula/ghc@8.6.rb b/Formula/ghc@8.6.rb index 04eb51dcc3750..a295c922659c3 100644 --- a/Formula/ghc@8.6.rb +++ b/Formula/ghc@8.6.rb @@ -10,10 +10,12 @@ class GhcAT86 < Formula revision 1 bottle do + cellar :any_skip_relocation rebuild 1 sha256 "3c2e2f8d8e4661dd7e53ad5af08489e926bec111e0d16a12397bb22a73b12997" => :catalina sha256 "831a6537953f467724c4c3c45b16cc3e5ff944aa02f1e9b3b77e9bdbfcdfb9d2" => :mojave sha256 "945069d9d94b4fb657e6d9c3a2d516ec551aea7535824b029c8c0632329f40cf" => :high_sierra + sha256 "d5ad66580ebf15df5c29f0e14cf03ce7d48c16ea914ce8a93a1a86169ac91d9b" => :x86_64_linux end keg_only :versioned_formula @@ -21,6 +23,14 @@ class GhcAT86 < Formula depends_on "python@3.8" => :build depends_on "sphinx-doc" => :build + unless OS.mac? + depends_on "m4" => :build + depends_on "ncurses" + + # This dependency is needed for the bootstrap executables. + depends_on "gmp" => :build + end + resource "gmp" do url "https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz" mirror "https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz" @@ -31,8 +41,13 @@ class GhcAT86 < Formula # https://www.haskell.org/ghc/download_ghc_8_6_5#macosx_x86_64 # "This is a distribution for Mac OS X, 10.7 or later." resource "binary" do - url "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-apple-darwin.tar.xz" - sha256 "dfc1bdb1d303a87a8552aa17f5b080e61351f2823c2b99071ec23d0837422169" + if OS.mac? + url "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-apple-darwin.tar.xz" + sha256 "dfc1bdb1d303a87a8552aa17f5b080e61351f2823c2b99071ec23d0837422169" + else + url "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-deb8-linux.tar.xz" + sha256 "c419fd0aa9065fe4d2eb9a248e323860c696ddf3859749ca96a84938aee49107" + end end # Fix for Catalina compatibility https://gitlab.haskell.org/ghc/ghc/issues/17353 @@ -50,8 +65,13 @@ def install # GMP *does not* use PIC by default without shared libs so --with-pic # is mandatory or else you'll get "illegal text relocs" errors. resource("gmp").stage do + args = if OS.mac? + "--build=#{Hardware.oldest_cpu}-apple-darwin#{`uname -r`.to_i}" + else + "--build=core2-linux-gnu" + end system "./configure", "--prefix=#{gmp}", "--with-pic", "--disable-shared", - "--build=#{Hardware.oldest_cpu}-apple-darwin#{`uname -r`.to_i}" + *args system "make" system "make", "install" end @@ -59,6 +79,20 @@ def install args = ["--with-gmp-includes=#{gmp}/include", "--with-gmp-libraries=#{gmp}/lib"] + unless OS.mac? + # Fix error while loading shared libraries: libgmp.so.10 + ln_s Formula["gmp"].lib/"libgmp.so", gmp/"lib/libgmp.so.10" + ENV.prepend_path "LD_LIBRARY_PATH", gmp/"lib" + # Fix /usr/bin/ld: cannot find -lgmp + ENV.prepend_path "LIBRARY_PATH", gmp/"lib" + # Fix ghc-stage2: error while loading shared libraries: libncursesw.so.5 + ln_s Formula["ncurses"].lib/"libncursesw.so", gmp/"lib/libncursesw.so.5" + # Fix ghc-stage2: error while loading shared libraries: libtinfo.so.5 + ln_s Formula["ncurses"].lib/"libtinfo.so", gmp/"lib/libtinfo.so.5" + # Fix ghc-pkg: error while loading shared libraries: libncursesw.so.6 + ENV.prepend_path "LD_LIBRARY_PATH", Formula["ncurses"].lib + end + # As of Xcode 7.3 (and the corresponding CLT) `nm` is a symlink to `llvm-nm` # and the old `nm` is renamed `nm-classic`. Building with the new `nm`, a # segfault occurs with the following error: @@ -75,6 +109,16 @@ def install end resource("binary").stage do + # Change the dynamic linker and RPATH of the binary executables. + if OS.linux? && Formula["glibc"].any_version_installed? + keg = Keg.new(prefix) + ["ghc/stage2/build/tmp/ghc-stage2"].concat(Dir["libraries/*/dist-install/build/*.so", + "rts/dist/build/*.so*", "utils/*/dist*/build/tmp/*"]).each do |s| + file = Pathname.new(s) + keg.change_rpath(file, Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s) if file.dynamic_elf? + end + end + binary = buildpath/"binary" system "./configure", "--prefix=#{binary}", *args diff --git a/Formula/ghc@8.8.rb b/Formula/ghc@8.8.rb index d0ad6ed1a362a..9943ddec3a419 100644 --- a/Formula/ghc@8.8.rb +++ b/Formula/ghc@8.8.rb @@ -12,6 +12,7 @@ class GhcAT88 < Formula sha256 "7968d8e75b49c4b4177aeec21bc09dc62dd039d973cfe5be6432ad54bd44ee38" => :catalina sha256 "25ea38aa4d2e3089518f52af08083f7715843fdfda2637f92f478e3b4cc5540d" => :mojave sha256 "de3fad18e3656100e3e57411281bedd903d1aae583b046c6b2916b2d29800acc" => :high_sierra + sha256 "6a7c493e0d9df4e43c8623a3b10bd32613bc7baaa27af03520c89d6f5149e4a6" => :x86_64_linux end keg_only :versioned_formula @@ -19,6 +20,14 @@ class GhcAT88 < Formula depends_on "python@3.8" => :build depends_on "sphinx-doc" => :build + unless OS.mac? + depends_on "m4" => :build + depends_on "ncurses" + + # This dependency is needed for the bootstrap executables. + depends_on "gmp" => :build + end + resource "gmp" do url "https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz" mirror "https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz" @@ -30,8 +39,13 @@ class GhcAT88 < Formula # "This is a distribution for Mac OS X, 10.7 or later." # A binary of ghc is needed to bootstrap ghc resource "binary" do - url "https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-apple-darwin.tar.xz" - sha256 "7016de90dd226b06fc79d0759c5d4c83c2ab01d8c678905442c28bd948dbb782" + if OS.linux? + url "https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-deb8-linux.tar.xz" + sha256 "92b9fadc442976968d2c190c14e000d737240a7d721581cda8d8741b7bd402f0" + else + url "https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-apple-darwin.tar.xz" + sha256 "7016de90dd226b06fc79d0759c5d4c83c2ab01d8c678905442c28bd948dbb782" + end end def install @@ -45,8 +59,13 @@ def install # GMP *does not* use PIC by default without shared libs so --with-pic # is mandatory or else you'll get "illegal text relocs" errors. resource("gmp").stage do + args = if OS.mac? + "--build=#{Hardware.oldest_cpu}-apple-darwin#{`uname -r`.to_i}" + else + "--build=core2-linux-gnu" + end system "./configure", "--prefix=#{gmp}", "--with-pic", "--disable-shared", - "--build=#{Hardware.oldest_cpu}-apple-darwin#{`uname -r`.to_i}" + *args system "make" system "make", "install" end @@ -54,6 +73,20 @@ def install args = ["--with-gmp-includes=#{gmp}/include", "--with-gmp-libraries=#{gmp}/lib"] + unless OS.mac? + # Fix error while loading shared libraries: libgmp.so.10 + ln_s Formula["gmp"].lib/"libgmp.so", gmp/"lib/libgmp.so.10" + ENV.prepend_path "LD_LIBRARY_PATH", gmp/"lib" + # Fix /usr/bin/ld: cannot find -lgmp + ENV.prepend_path "LIBRARY_PATH", gmp/"lib" + # Fix ghc-stage2: error while loading shared libraries: libncursesw.so.5 + ln_s Formula["ncurses"].lib/"libncursesw.so", gmp/"lib/libncursesw.so.5" + # Fix ghc-stage2: error while loading shared libraries: libtinfo.so.5 + ln_s Formula["ncurses"].lib/"libtinfo.so", gmp/"lib/libtinfo.so.5" + # Fix ghc-pkg: error while loading shared libraries: libncursesw.so.6 + ENV.prepend_path "LD_LIBRARY_PATH", Formula["ncurses"].lib + end + # As of Xcode 7.3 (and the corresponding CLT) `nm` is a symlink to `llvm-nm` # and the old `nm` is renamed `nm-classic`. Building with the new `nm`, a # segfault occurs with the following error: @@ -70,6 +103,16 @@ def install end resource("binary").stage do + # Change the dynamic linker and RPATH of the binary executables. + if OS.linux? && Formula["glibc"].installed? + keg = Keg.new(prefix) + ["ghc/stage2/build/tmp/ghc-stage2"].concat(Dir["libraries/*/dist-install/build/*.so", + "rts/dist/build/*.so*", "utils/*/dist*/build/tmp/*"]).each do |s| + file = Pathname.new(s) + keg.change_rpath(file, Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s) if file.dynamic_elf? + end + end + binary = buildpath/"binary" system "./configure", "--prefix=#{binary}", *args diff --git a/Formula/ghex.rb b/Formula/ghex.rb index 9116794e358b0..83aa085755453 100644 --- a/Formula/ghex.rb +++ b/Formula/ghex.rb @@ -9,6 +9,7 @@ class Ghex < Formula sha256 "b152b5f03f5bc0d7a50a834fef582ea7fb477dd7560afb4a0b1f4df88e229970" => :catalina sha256 "c2e68caac31470d6dbc66050b2dc42333b3dfc6956ee7453fba9032b5cf894a4" => :mojave sha256 "4de4a0a7ee3f81c7f7b36d7368380b2ff2a063c5d444302cd5979ee33727fb1c" => :high_sierra + sha256 "4280b78f52e9e14de3a03a28a72cf891a50fbf54e0b11cbb8bfebb2eb05ac610" => :x86_64_linux end depends_on "itstool" => :build diff --git a/Formula/ghi.rb b/Formula/ghi.rb index 75a74c3e06592..90e82285cdc90 100644 --- a/Formula/ghi.rb +++ b/Formula/ghi.rb @@ -13,6 +13,7 @@ class Ghi < Formula sha256 "9289e061f8a249130950ec212042e3d9adfaa96e3591f0eb2d6038c28ff0e6d6" => :high_sierra sha256 "d2b59c4b0326bd4d4b2de6da0310e1d5228cc63d57adb9eb37c5f5c5a9471131" => :sierra sha256 "d2b59c4b0326bd4d4b2de6da0310e1d5228cc63d57adb9eb37c5f5c5a9471131" => :el_capitan + sha256 "9a6ddc8d9c63ba0fe0d6417dae8cbf6b7f53fec7ded853799dcfa6579c1d8961" => :x86_64_linux end uses_from_macos "ruby" diff --git a/Formula/ghostscript.rb b/Formula/ghostscript.rb index c62cb4da6d96c..912f6adfdbc83 100644 --- a/Formula/ghostscript.rb +++ b/Formula/ghostscript.rb @@ -3,11 +3,13 @@ class Ghostscript < Formula homepage "https://www.ghostscript.com/" url "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/ghostpdl-9.52.tar.gz" sha256 "8f6e48325c106ae033bbae3e55e6c0b9ee5c6b57e54f7cd24fb80a716a93b06a" + revision 1 unless OS.mac? bottle do sha256 "8cd0efa1e5525f849be3ee1e50e1635b99667cb4d1eb6c3002a45378346882f4" => :catalina sha256 "8906a4dbf2513963a4710f351e3426622c259bd888c760e4c08a9436860b4014" => :mojave sha256 "cd5e55d0429d7e88ba2d580e79934c157d5bd2981d71a7f40db4573abe79af67" => :high_sierra + sha256 "f4d0834796b16e67a5565aa0ac5c7a682f2f8e6e3789f3da15479ceb8574a633" => :x86_64_linux end head do @@ -22,15 +24,23 @@ class Ghostscript < Formula depends_on "pkg-config" => :build depends_on "libtiff" + unless OS.mac? + depends_on "libidn" + depends_on "fontconfig" + end + # https://sourceforge.net/projects/gs-fonts/ resource "fonts" do url "https://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz" sha256 "0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401" end - patch :DATA # Uncomment macOS-specific make vars + patch :DATA if OS.mac? # Uncomment macOS-specific make vars def install + # Fixes: ./soobj/dxmainc.o: file not recognized: File truncated + ENV.deparallelize + args = %W[ --prefix=#{prefix} --disable-cups diff --git a/Formula/ghq.rb b/Formula/ghq.rb index da6dd5ae8fe64..ee393397f9bcc 100644 --- a/Formula/ghq.rb +++ b/Formula/ghq.rb @@ -11,6 +11,7 @@ class Ghq < Formula sha256 "8b50baf86d4bab90bf650a450fbbb3dc4e5f3132fe47207d68bf6681bee57f26" => :catalina sha256 "517f67f0c52fec93f32c7d327baaf2062e8c16ca644560710c59a88f415d174f" => :mojave sha256 "b908d0c46b72a968487f3a4d68e3397314d9277b09f89bab9c8c1af412703816" => :high_sierra + sha256 "5f5873b3371422c251c69e22128130171ef9440fb0629d7ec978930712b52abb" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ghr.rb b/Formula/ghr.rb index c5995924bddbb..ae5acf284c78c 100644 --- a/Formula/ghr.rb +++ b/Formula/ghr.rb @@ -10,6 +10,7 @@ class Ghr < Formula sha256 "7fd9ae651a7adbedd46e266e04260fa221c84cf1595c04e644f3e720f8f76a48" => :catalina sha256 "322df199f2e51c91d348638c3d7baed79c8e542755fe51634cc2c06ea99150a9" => :mojave sha256 "941dce22c70f320d75f5e961c3cfc33f837f6ee113a5a06c445e57cbdcfa34fb" => :high_sierra + sha256 "59ed3caeab4e63c4934a8ee8b5cd01705ad76f288b2f63ba04ae088c000535df" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gif2png.rb b/Formula/gif2png.rb index ff393d919f748..824aa59106ede 100644 --- a/Formula/gif2png.rb +++ b/Formula/gif2png.rb @@ -10,6 +10,7 @@ class Gif2png < Formula sha256 "95c85cb74a70b1f217c3db5f4f6f6bab2b9871755435a25301bc4215015f1341" => :mojave sha256 "fd15459a5000f08952b7609ef743d80c84749710e30b7bfbe02d68e7ccc27ed7" => :high_sierra sha256 "25aa7ef95b5ca8e7a79bf884fa8e9c8eafb21f2887caabc3ffb40de5fda2ab26" => :sierra + sha256 "6e56f9b8b442870d44877d51f23a824821c39926ce909faed2375cfb3f84e830" => :x86_64_linux end depends_on "libpng" diff --git a/Formula/giflib.rb b/Formula/giflib.rb index 78352c827823a..e881323b50ba1 100644 --- a/Formula/giflib.rb +++ b/Formula/giflib.rb @@ -9,6 +9,7 @@ class Giflib < Formula sha256 "ad97d175fa77f7afb4a1c215538d8ae9eff30435de7feaa6a5d2e29fca7fef4d" => :catalina sha256 "42d2f8a6e9dbf9d4c22a2e64581c7170cc7dcb2a0e66df383efc67b7bc96238d" => :mojave sha256 "e1a30a20ad93cd9ec003027d7fba43a7e04ced0bff4156614818cccfc9dec6c9" => :high_sierra + sha256 "80582fd62562b57282e1bb1262fc9246a767b7669bd3fc0afd3ccb52196e8d35" => :x86_64_linux end # Upstream has stripped out the previous autotools-based build system and their diff --git a/Formula/giflossy.rb b/Formula/giflossy.rb index 28589e8383a4e..b2ebe1ec386e0 100644 --- a/Formula/giflossy.rb +++ b/Formula/giflossy.rb @@ -13,6 +13,7 @@ class Giflossy < Formula sha256 "492ddf714381465db00b10689af119d8c225ca5138304d8f1e6c946b9cf67e76" => :high_sierra sha256 "464798aef709d62f6bfb4cefd3cb9d084e3aced492766e63b113762f15347d19" => :sierra sha256 "50e8538008faf1bb05e8d44801cacd6e8f41fbf392ed23b639c7d05d36b5c8d8" => :el_capitan + sha256 "c11eccc51f6a2468673f000757ae6293d2d4c498f85c2bbdbd344bc28568988b" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/gifsicle.rb b/Formula/gifsicle.rb index 8ffd90d71fa56..4556ccc1454e4 100644 --- a/Formula/gifsicle.rb +++ b/Formula/gifsicle.rb @@ -10,6 +10,7 @@ class Gifsicle < Formula sha256 "52be1cd49246909777199147dcbbeb6f490580558615138ae063b6149cfbe53c" => :mojave sha256 "a7cfb607906023c5bdb56a49f8a75ce0b3e2c76a971266bb530d04ed29be74f9" => :high_sierra sha256 "746d071f268950c6af18704590b981f5f965d35e2adf6c202aa3df0f13e943e9" => :sierra + sha256 "7de864ee8eb9008c77e9ab7dd28b5a1f64864e7aacb36a15eb00a0cddf3cf3cd" => :x86_64_linux end head do @@ -19,6 +20,8 @@ class Gifsicle < Formula depends_on "automake" => :build end + depends_on "linuxbrew/xorg/xorg" unless OS.mac? + conflicts_with "giflossy", :because => "both install an `gifsicle` binary" diff --git a/Formula/gifski.rb b/Formula/gifski.rb index 6a8dad32a9b6c..1ec62a5dd294e 100644 --- a/Formula/gifski.rb +++ b/Formula/gifski.rb @@ -9,6 +9,7 @@ class Gifski < Formula sha256 "e00f209f81a6ae5e7b5f75427480776298d8cf4f9d8b5261e7c1a38e19858076" => :catalina sha256 "a654fc60bf8ff9e29499f3514c4ab85227886380cd9126591cfd1c1afb137dfa" => :mojave sha256 "a9e6089442617d5df7aa8b6e0baf11e5a5152adff89bb3d6cb018b61a8e3d387" => :high_sierra + sha256 "1f315592a189bb8243ecf660d01149c4e0e645e7448282ea0fd323b3714bce88" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/gimme-aws-creds.rb b/Formula/gimme-aws-creds.rb index 6880e3c78f801..9dc31f4a7024e 100644 --- a/Formula/gimme-aws-creds.rb +++ b/Formula/gimme-aws-creds.rb @@ -5,13 +5,14 @@ class GimmeAwsCreds < Formula homepage "https://github.com/Nike-Inc/gimme-aws-creds" url "https://files.pythonhosted.org/packages/e2/a7/53d5f021a1b41a680d5c558c683e37e3000085c1a4132695e3378e4b477d/gimme%20aws%20creds-2.3.3.tar.gz" sha256 "b7bc10cd09faf995e44063bb6125b910ee85cf2f3e95ddb2908afade4bbd3973" - revision 1 + revision OS.mac? ? 1 : 3 bottle do cellar :any sha256 "eacd3675525424d7037ba47d81f7b4082cda80d7fefea63f85152a4ea0302530" => :catalina sha256 "373d17d151ae4f43ab99dee2f6b89a20076e85a320fcc1bdbf8ce9aeba929a6c" => :mojave sha256 "6a715fe2a9ac1f4def3bbd19b9d6ccadf0c26a146360992c2d7eeb542f85e88d" => :high_sierra + sha256 "0b5f69d0629e195a41983d0db6949397e8f2cfd351fa3b6e1fa5fd79a5811b1b" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/ginac.rb b/Formula/ginac.rb index 90dc80f7b68a2..70923355481cc 100644 --- a/Formula/ginac.rb +++ b/Formula/ginac.rb @@ -9,6 +9,7 @@ class Ginac < Formula sha256 "8cca55fc95511ccc59a7fad241b9359954ac105f74332058773ac4aa5dc8028a" => :catalina sha256 "603c9d1e9b2e3bce8ac26887b78319a428f8a066a576ab3ac1ac2ae603ee67b4" => :mojave sha256 "689107e33f99de6bbec419a1f252861258d8737d536dc2f62732e74bae8211ba" => :high_sierra + sha256 "7a925c15b31a301c2144ea331166ce8af7183750b81972b7e80027ce0ea1435f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/gist.rb b/Formula/gist.rb index 5d99f26022ba8..abd31252468f1 100644 --- a/Formula/gist.rb +++ b/Formula/gist.rb @@ -10,9 +10,10 @@ class Gist < Formula sha256 "7eb37c0514203306a3e5be9176acca230014a30e07d43d0e9ba72afcc3dc3203" => :catalina sha256 "7eb37c0514203306a3e5be9176acca230014a30e07d43d0e9ba72afcc3dc3203" => :mojave sha256 "7eb37c0514203306a3e5be9176acca230014a30e07d43d0e9ba72afcc3dc3203" => :high_sierra + sha256 "099dfa1c3dd3e0a78d3392a0dbfe1125c240bf53ae5df442e55cdea8f040ea2e" => :x86_64_linux end - depends_on "ruby" if MacOS.version <= :sierra + depends_on "ruby" if !OS.mac? || MacOS.version <= :sierra def install system "rake", "install", "prefix=#{prefix}" diff --git a/Formula/git-absorb.rb b/Formula/git-absorb.rb index 29dcb1363da73..0c66689bb2091 100644 --- a/Formula/git-absorb.rb +++ b/Formula/git-absorb.rb @@ -9,6 +9,7 @@ class GitAbsorb < Formula sha256 "bdf7c3b57f49dc9ccd83d9fed9f089f994f20c3591c6f18900f4e70ee80627e6" => :catalina sha256 "63d50725c92837dbd25b63560ee2b8061c8b335288230c9f3f5976b94aed6248" => :mojave sha256 "c6dc732ac254cc9d5aa2ebfe5ecc4e65c95b6ed860efc22b443c1911911099f4" => :high_sierra + sha256 "869fb1633f40d57e92678e11ed168d9c613c5260f39e90a320c13d3c35d1dcdf" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/git-annex.rb b/Formula/git-annex.rb index b2006e3222c14..ac277215ea4b2 100644 --- a/Formula/git-annex.rb +++ b/Formula/git-annex.rb @@ -14,6 +14,7 @@ class GitAnnex < Formula sha256 "5ef94fd462e9543ff6983aa32b26cf702d7d47cef83c6418410e3681b76cab34" => :catalina sha256 "fa7cd4ceb2123f5570b5b9c0c9384011eab4cb382ad73afbccfd5a1fea9c2f2f" => :mojave sha256 "21fba174494bc17c5592aa0c5493e21a76d49f988e3a0795c91e6c49d3e4afc2" => :high_sierra + sha256 "82b9879e8efaa9d84d82b9eec538e84811d2ea2f263fb72a1170494fff8b3bc2" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/git-appraise.rb b/Formula/git-appraise.rb index d1d1015e59c01..0ef389ea34cf8 100644 --- a/Formula/git-appraise.rb +++ b/Formula/git-appraise.rb @@ -12,6 +12,7 @@ class GitAppraise < Formula sha256 "e515979b703cef062e19829399ddb441c91d835e25814614c938af36764fc0d4" => :high_sierra sha256 "c048f2cce708e7c85c74d18758e47d3959cce29e2f8e70bca021b1564e65092d" => :sierra sha256 "e12ce185286565f4f07f48f1deb2fd4a19043bcafb337de94b9ba7148291b91b" => :el_capitan + sha256 "c32da22cd50d604799065ab2e1a48921d55f78fb2278f5ba78a9b85c86e85229" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/git-archive-all.rb b/Formula/git-archive-all.rb index dd9313910a707..a6e4d4862f172 100644 --- a/Formula/git-archive-all.rb +++ b/Formula/git-archive-all.rb @@ -10,9 +10,20 @@ class GitArchiveAll < Formula sha256 "74c509f8ce278c1b12ef694749c5fedc9d056614f14ce4d6a01de1bb3803680f" => :catalina sha256 "74c509f8ce278c1b12ef694749c5fedc9d056614f14ce4d6a01de1bb3803680f" => :mojave sha256 "74c509f8ce278c1b12ef694749c5fedc9d056614f14ce4d6a01de1bb3803680f" => :high_sierra + sha256 "925f6267d351584198068e3cbafceef1dabaadcbf5c3bcfb00f555f34095a79d" => :x86_64_linux end + depends_on "python@3.8" unless OS.mac? + def install + unless OS.mac? + Dir["*.py"].each do |file| + next unless File.read(file).include?("/usr/bin/env python") + + inreplace file, %r{#! ?/usr/bin/env python}, "#!#{Formula["python@3.8"].opt_bin/"python3"}" + end + end + system "make", "prefix=#{prefix}", "install" end diff --git a/Formula/git-bug.rb b/Formula/git-bug.rb index 0094024fe4247..81a9c6a02a674 100644 --- a/Formula/git-bug.rb +++ b/Formula/git-bug.rb @@ -11,6 +11,7 @@ class GitBug < Formula sha256 "6b22d352d4f7ac655ab3544593cbdbcb1d1ad6e2f87dd0f7066e31a9319aa97b" => :catalina sha256 "c5a308416b902fbd59bd1df0bd17074f5bc9d8de594a07573b8d074889cb45fd" => :mojave sha256 "0617df6821ac81888aa4ba8b38102031b17fb64b6b25b20554a454e3e4a1fd60" => :high_sierra + sha256 "1f8113daac2c7f44130d4b7df8dfb8103a2bfb70842da653945e39c55f2bacf1" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/git-crypt.rb b/Formula/git-crypt.rb index 577932e9242c8..26b1abdd2cc6d 100644 --- a/Formula/git-crypt.rb +++ b/Formula/git-crypt.rb @@ -11,6 +11,7 @@ class GitCrypt < Formula sha256 "89d2058a4dd5afc565696707c8e93621fd644f9ab303fe378727ae999783d156" => :mojave sha256 "0d2cf3c93ab2ca4059163f8da8a3ab845b566b13debf5e1b43a734dc86138a18" => :high_sierra sha256 "6b2c2773e5c327282d461f5d49600928ae97d432e5f4d8b7acfcaaa6e6d1ef68" => :sierra + sha256 "372004fabdc4dd18a4fb615f9b4619e4cc64665e39b3303c6b417b7d3a5c2d78" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/git-delta.rb b/Formula/git-delta.rb index 6a2ae5dc8f534..893728bbf6203 100644 --- a/Formula/git-delta.rb +++ b/Formula/git-delta.rb @@ -10,10 +10,11 @@ class GitDelta < Formula sha256 "2c934142464323e5b0061b633f964acd0fe3b9f87787693c086e3109c24cf4dc" => :catalina sha256 "da93a1dd32a32cf39ef98baedabcc83f041bdb7b0d4721e5304b175dacea4b10" => :mojave sha256 "9c88edbe0c662fcd99c16789c0de39d25e5537edb74cff26f1929785fb7b70fd" => :high_sierra + sha256 "fc3382227be1dcc77327294d7e2b0796fa190e0b6a31d97e0f355fb19fce5e8e" => :x86_64_linux end depends_on "rust" => :build - uses_from_macos "llvm" + depends_on "llvm" => :build unless OS.mac? conflicts_with "delta", :because => "both install a `delta` binary" diff --git a/Formula/git-extras.rb b/Formula/git-extras.rb index 90a42e2c78200..3a2c5508836bc 100644 --- a/Formula/git-extras.rb +++ b/Formula/git-extras.rb @@ -11,8 +11,11 @@ class GitExtras < Formula sha256 "6bec6d92d79cabaac6e99d15c8bf1542cf97dcb190b7e77ad4eaa8e381cff055" => :catalina sha256 "6bec6d92d79cabaac6e99d15c8bf1542cf97dcb190b7e77ad4eaa8e381cff055" => :mojave sha256 "6bec6d92d79cabaac6e99d15c8bf1542cf97dcb190b7e77ad4eaa8e381cff055" => :high_sierra + sha256 "a3a68b43efd6453e8dd7292b63e712143bedf015b6cd9339035c3b51a6269843" => :x86_64_linux end + depends_on "bsdmainutils" => :build unless OS.mac? + conflicts_with "git-utils", :because => "both install a `git-pull-request` script" diff --git a/Formula/git-flow-avh.rb b/Formula/git-flow-avh.rb index 65a8d44fd2a07..be27de19d4855 100644 --- a/Formula/git-flow-avh.rb +++ b/Formula/git-flow-avh.rb @@ -18,6 +18,7 @@ class GitFlowAvh < Formula sha256 "945e9ba05a169b32c86f5bd347542e803625791cf9a4b50a4a42fafb5e0b9c85" => :mojave sha256 "945e9ba05a169b32c86f5bd347542e803625791cf9a4b50a4a42fafb5e0b9c85" => :high_sierra sha256 "0e68b196dd24d9d41f9b0c5545d115c9ca8327dd799facbed2e619f8ceea221b" => :sierra + sha256 "030e370e7cb1ef9df85712bfb1e2f13202727d0ddd29bc99a395f8d1f93768cb" => :x86_64_linux end head do @@ -49,6 +50,10 @@ def install test do system "git", "init" + unless OS.mac? + system "git", "config", "--global", "user.email", "\"you@example.com\"" + system "git", "config", "--global", "user.name", "\"Your Name\"" + end system "#{bin}/git-flow", "init", "-d" system "#{bin}/git-flow", "config" assert_equal "develop", shell_output("git symbolic-ref --short HEAD").chomp diff --git a/Formula/git-flow.rb b/Formula/git-flow.rb index a593f14a35d29..dc8ecfdde1185 100644 --- a/Formula/git-flow.rb +++ b/Formula/git-flow.rb @@ -23,6 +23,7 @@ class GitFlow < Formula sha256 "56826b30d91ffb54829f4792f88c673b1c3e748aa662bef5806e4a6f5d0ee015" => :el_capitan sha256 "a5e97d4d5c082194b36c18e7b051c43b2d5b37366b2ac56c5ea9407f6315685b" => :yosemite sha256 "8e931605a0d12cffa282db7244e0041cc14f8a7692e184a6bc1975800be2dac0" => :mavericks + sha256 "ae350c42764f62938a932b475f71c37eb75db4c884b7e14642e55fd467fac494" => :x86_64_linux # glibc 2.19 end head do diff --git a/Formula/git-ftp.rb b/Formula/git-ftp.rb index 7c1ece5f8c351..e84c05a33c4ae 100644 --- a/Formula/git-ftp.rb +++ b/Formula/git-ftp.rb @@ -10,6 +10,7 @@ class GitFtp < Formula sha256 "0a61ca11e69370dfecfd3c82d6d03aeec377bf9db660658403556ea71b84bae0" => :catalina sha256 "f878c4015697794bb8b2c3f034a167b750d3871c0d320d903536128f01880ca2" => :mojave sha256 "63c8b94fd89eb635d8c2056efdf933de45dca7fdb04793b620750f8b338fbb88" => :high_sierra + sha256 "80d507de96861546cf465d4bc2042c936bbbd3b7873fb34e43954751ce54f10c" => :x86_64_linux end depends_on "pandoc" => :build diff --git a/Formula/git-gui.rb b/Formula/git-gui.rb index 981321d434f87..7f6d6bf79a185 100644 --- a/Formula/git-gui.rb +++ b/Formula/git-gui.rb @@ -11,6 +11,7 @@ class GitGui < Formula sha256 "9f8ccbd87f6c1e3328134e6ae400d763133165f2c0797047afd58c904fc7dcf8" => :catalina sha256 "9f8ccbd87f6c1e3328134e6ae400d763133165f2c0797047afd58c904fc7dcf8" => :mojave sha256 "9f8ccbd87f6c1e3328134e6ae400d763133165f2c0797047afd58c904fc7dcf8" => :high_sierra + sha256 "3cd2174a6a645830db18e0a6f801d8c51431533f4f3e1d7b0dfdc45bb07696b3" => :x86_64_linux end depends_on "tcl-tk" diff --git a/Formula/git-hooks.rb b/Formula/git-hooks.rb index 1ed1fa79c8da2..64a622dc7d473 100644 --- a/Formula/git-hooks.rb +++ b/Formula/git-hooks.rb @@ -20,6 +20,7 @@ class GitHooks < Formula sha256 "bdfffb820e5a7574169b91113ed59c578ebe88bcea8c890166a33fb9af17c0ce" => :el_capitan sha256 "d4c5fba7f1b80e8e68762356a2f64ac216bf4e9f3151cf2f236c92a9524b97ed" => :yosemite sha256 "ace6acaff04ef09795d26e6034bf411a89c9f348287dd95f756c82068cea123d" => :mavericks + sha256 "d752497286961e018f332e0e0be3a342473645c553c3542b72d1debe9f0054f8" => :x86_64_linux end def install diff --git a/Formula/git-imerge.rb b/Formula/git-imerge.rb index 8554916117a29..71b36713a1ffc 100644 --- a/Formula/git-imerge.rb +++ b/Formula/git-imerge.rb @@ -12,6 +12,7 @@ class GitImerge < Formula sha256 "76aee24eeb5e7615e4cfbd7aaf3aacac8d8729dfcee79d8542a84cbd9b663459" => :high_sierra sha256 "76aee24eeb5e7615e4cfbd7aaf3aacac8d8729dfcee79d8542a84cbd9b663459" => :sierra sha256 "76aee24eeb5e7615e4cfbd7aaf3aacac8d8729dfcee79d8542a84cbd9b663459" => :el_capitan + sha256 "b55716121b1650d60aa9fc4063a4397d09fcb6c74c724368d15cb31378069ae5" => :x86_64_linux end def install diff --git a/Formula/git-interactive-rebase-tool.rb b/Formula/git-interactive-rebase-tool.rb index 8680a46e27046..ab08154a86469 100644 --- a/Formula/git-interactive-rebase-tool.rb +++ b/Formula/git-interactive-rebase-tool.rb @@ -9,6 +9,7 @@ class GitInteractiveRebaseTool < Formula sha256 "ab2feae40a1c22695f88383fc0d25bd1ce90499cf74004719fbaf7540a673f09" => :catalina sha256 "50a7e6d5e3b6e0cdb75f9dd83fde8c9d473a632c8f22f575591fe4b5469a19bf" => :mojave sha256 "530ae677663e9773d05a17878a1e28e91e8751d9b9ac8cffdb0acaad7a7d1e8b" => :high_sierra + sha256 "f1cd9eceb7b054cd42567bb39666177feedc7da72b74accfc9fa040c19a970d2" => :x86_64_linux end depends_on "rust" => :build @@ -21,7 +22,11 @@ def install end test do + # Errno::EIO: Input/output error @ io_fread - /dev/pts/0 + return if ENV["CI"] + require "pty" # required for interactivity + mkdir testpath/"repo" do system "git", "init" touch "FILE1" diff --git a/Formula/git-lfs.rb b/Formula/git-lfs.rb index c6726b3f82a6f..0476a2922a3a1 100644 --- a/Formula/git-lfs.rb +++ b/Formula/git-lfs.rb @@ -9,6 +9,7 @@ class GitLfs < Formula sha256 "351d2d6cb168249b9b7b0d55628574126b9787eab1441861dfd324b952057651" => :catalina sha256 "adbf311076f64920e0f621640d251e6ef44ad8fc9022f287118be5644c4095d4" => :mojave sha256 "0c231fb0f6edab306f9b58f08fb8c075860f688d6efe4190b6377c661e36d18c" => :high_sierra + sha256 "fafc971371c79a19d5a412beb03919f859e2e65cb35cb2757b864ae5d8909f0d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/git-now.rb b/Formula/git-now.rb index 3b231403673a3..48fc2691da3d0 100644 --- a/Formula/git-now.rb +++ b/Formula/git-now.rb @@ -15,11 +15,15 @@ class GitNow < Formula sha256 "7126e867e543659b9750041412e737407fb94f9dbb38fea1edf16cec8027aa64" => :el_capitan sha256 "748cd8691ad94b407f892ffa7f8e12c183b7326208efd9ac6dafbe1b8fda9565" => :yosemite sha256 "c19eda078da8974bde40ee07eac5701e9295d56bd59a6d18ea21c3d337b50e02" => :mavericks + sha256 "df4b4b7da7d3f0dd563858b126bece61cd99ed697521000b5c593c47753d7a54" => :x86_64_linux # glibc 2.19 end depends_on "gnu-getopt" def install + # Fix bashism in git-now-add when executed by git-now + inreplace "git-now", "#!/bin/sh", "#!/bin/bash" + system "make", "prefix=#{libexec}", "install" (bin/"git-now").write <<~EOS diff --git a/Formula/git-number.rb b/Formula/git-number.rb index f56e1f3fb0de7..53e914cfdf85c 100644 --- a/Formula/git-number.rb +++ b/Formula/git-number.rb @@ -11,6 +11,7 @@ class GitNumber < Formula sha256 "d71548120a8d5d9db4b9b9ae71be947303c6a415e35380d0d8e36551765b827f" => :high_sierra sha256 "d71548120a8d5d9db4b9b9ae71be947303c6a415e35380d0d8e36551765b827f" => :sierra sha256 "d71548120a8d5d9db4b9b9ae71be947303c6a415e35380d0d8e36551765b827f" => :el_capitan + sha256 "f52280def083a53bfb74863077bbe4248513307f76d06952558336bf4b980822" => :x86_64_linux end def install diff --git a/Formula/git-plus.rb b/Formula/git-plus.rb index 91f0bcfbae583..9848aacfad1c5 100644 --- a/Formula/git-plus.rb +++ b/Formula/git-plus.rb @@ -12,6 +12,7 @@ class GitPlus < Formula sha256 "8004d2a502eaad6e616b140359d5a5af426dd767dad54477672b6f6ca8993b4f" => :catalina sha256 "8d35fc4e02f5587e140428e5546d36d76f33c3e4c13210b4e4257ecf723cf6ad" => :mojave sha256 "3b9f87989868d3042e0d62fe091c0c8529f34eeeefd73a6f58ffe2c9e233c36a" => :high_sierra + sha256 "c4928ccb207a4d121db9ea4981bef3d7d50b431a0bae669dea3d88fab4ce22fd" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/git-remote-hg.rb b/Formula/git-remote-hg.rb index e4b2ce093ac24..c8f674efe9926 100644 --- a/Formula/git-remote-hg.rb +++ b/Formula/git-remote-hg.rb @@ -5,7 +5,7 @@ class GitRemoteHg < Formula homepage "https://github.com/felipec/git-remote-hg" url "https://github.com/felipec/git-remote-hg/archive/v0.4.tar.gz" sha256 "916072d134cde65b7ffa7d1da1acaabb0f29b65c017d0560e907e7a94063d1b1" - revision 2 + revision OS.mac? ? 2 : 3 head "https://github.com/felipec/git-remote-hg.git" bottle do diff --git a/Formula/git-review.rb b/Formula/git-review.rb index 254f65a48c607..9ffe26e0239d4 100644 --- a/Formula/git-review.rb +++ b/Formula/git-review.rb @@ -5,7 +5,7 @@ class GitReview < Formula homepage "https://opendev.org/opendev/git-review" url "https://files.pythonhosted.org/packages/2c/e6/e4f1b999af2493a5cc5e050f0869b29f30914f94016abf48c77c6307745b/git-review-1.28.0.tar.gz" sha256 "8e3aabb7b9484063e49c2504d137609401e32ad5128ff2a5cf43e98d5d3dc15a" - revision 2 + revision OS.mac? ? 2 : 3 head "https://opendev.org/opendev/git-review.git" bottle do @@ -13,6 +13,7 @@ class GitReview < Formula sha256 "8bb267cb74c37af45200381f60f84dc49af52a0d2eed65c23db6e582d0d407b9" => :catalina sha256 "acd209ffed9affc75582b7ef94e3232abc0f2ab6490b634fc9abcb53a2e0f08d" => :mojave sha256 "cb9721c5b767816de394884dbb83a7274b43fcb495015d445253d3820ac07b32" => :high_sierra + sha256 "75cb10f326d9793dfec06077b141a65f68e780b4c845fec6a5c9fb86c5a3ce49" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/git-revise.rb b/Formula/git-revise.rb index adaec8689a570..8f98ffc180c8b 100644 --- a/Formula/git-revise.rb +++ b/Formula/git-revise.rb @@ -12,6 +12,7 @@ class GitRevise < Formula sha256 "644bd8885dfc27b0cb84294b7195a296b1c1d56af5b870db7af109a93d80e2a0" => :catalina sha256 "a9a61b083fc459b407488d8ef7e2439059702e89eaa19c9a5a8c0e1fb8f1a7c7" => :mojave sha256 "1d15213e6e0220d5e97dd8991b4545d0789a3b907fff1a0996255ea675a1a94b" => :high_sierra + sha256 "ee7329fdff58943c5d080cae3a9d45050f32cf529799e5e8de94077581a1bd6e" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/git-secret.rb b/Formula/git-secret.rb index 204fb345ba6a4..c1f55a0b8c0e5 100644 --- a/Formula/git-secret.rb +++ b/Formula/git-secret.rb @@ -13,6 +13,7 @@ class GitSecret < Formula sha256 "2fb53e4162baa1e614c3d73dbb24257604cf8b7864f73deeba21c784c6434193" => :catalina sha256 "2fb53e4162baa1e614c3d73dbb24257604cf8b7864f73deeba21c784c6434193" => :mojave sha256 "2fb53e4162baa1e614c3d73dbb24257604cf8b7864f73deeba21c784c6434193" => :high_sierra + sha256 "2576f845239fe032af7097c453f81acfe9c067b10bb645a6366fd9694c60cfab" => :x86_64_linux end depends_on "gawk" diff --git a/Formula/git-series.rb b/Formula/git-series.rb index 11518d6be5999..21667890b447d 100644 --- a/Formula/git-series.rb +++ b/Formula/git-series.rb @@ -10,6 +10,7 @@ class GitSeries < Formula sha256 "29b2137b70b357be519ea871f44be18286547f1fd1e86ac9d2c0b5ba2f046fc2" => :catalina sha256 "9a30242b1878ddca0dcbb05aae2fade5bbef945563c4a8c64912263e3c31cf5f" => :mojave sha256 "7e57cc878bd7619f8585e5577ec25c51372af77d4189d2c43b520402b3b33447" => :high_sierra + sha256 "170c315785440d4af489cabde3696caec57ca85da3066d97fd23ce79a4801fe6" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/git-sh.rb b/Formula/git-sh.rb index 9effc5b253d82..52b3119733d99 100644 --- a/Formula/git-sh.rb +++ b/Formula/git-sh.rb @@ -14,6 +14,7 @@ class GitSh < Formula sha256 "e30e7836919a5d79712e3fd51a118279b412c44da909053b9b185eb48963323f" => :el_capitan sha256 "cdbc6fc62300722f613f314e2859422edcf938c6807a3039bcf476e02fbe222c" => :yosemite sha256 "1b9aa141f32145516db62304dda799611e1fc35ec57275ee75bf566325a6bfa5" => :mavericks + sha256 "4a90e6f44bb3e10c770b7d374534b91299159f8cfdd4fb5a407aa2461d27390c" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/git-sizer.rb b/Formula/git-sizer.rb index 57683b2d41de0..82abe472305ab 100644 --- a/Formula/git-sizer.rb +++ b/Formula/git-sizer.rb @@ -10,6 +10,7 @@ class GitSizer < Formula sha256 "4d4e1b47018c1b5efe0ae71996e1dad3f7b0ec4f9616793121463b1c092b03af" => :mojave sha256 "add468f96d564f1046a0908cc1f553c73a2ac672973f3c7a7bca47c12fd72867" => :high_sierra sha256 "b0a6d0757c623e8e6b1f2ed6e9fb05496b29dd6f615df72e615a7a6a8fb45e3e" => :sierra + sha256 "7d68faabc6a09bd0d16db5f57f512bea68922dbcf91e021e15292b6170a03ff1" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/git-standup.rb b/Formula/git-standup.rb index 49b46b1405aa3..9588b9d25edb9 100644 --- a/Formula/git-standup.rb +++ b/Formula/git-standup.rb @@ -10,6 +10,7 @@ class GitStandup < Formula sha256 "0a75c65615d92237a59492ac00867d12ab4a23865d85d5cb464d9deb1f6d8ee8" => :catalina sha256 "0a75c65615d92237a59492ac00867d12ab4a23865d85d5cb464d9deb1f6d8ee8" => :mojave sha256 "0a75c65615d92237a59492ac00867d12ab4a23865d85d5cb464d9deb1f6d8ee8" => :high_sierra + sha256 "27a1f93f4e66e7f25f1fcbc33687d9cab72d45b3a557f1132ece60adc5e7be47" => :x86_64_linux end def install diff --git a/Formula/git-town.rb b/Formula/git-town.rb index 025b6ad9f6d72..743c85fed98f7 100644 --- a/Formula/git-town.rb +++ b/Formula/git-town.rb @@ -9,6 +9,7 @@ class GitTown < Formula sha256 "1b0264cc230c3b3ccc7c45ddc933b6e295edb6ffb3211472da78d1677aa220b2" => :catalina sha256 "69cebc1178ee59ff060e306577396c760320e285e7fcbe3ae2367bea5a90da10" => :mojave sha256 "0e30581afbe2b9ef24fbb0f9ab655d4e8ab0590e0870cf197fa61d9012bc0a51" => :high_sierra + sha256 "6f7834a8ed272ea70a2d43fbb2be29eccbd8afdbff8424adf91b4cef99514bfc" => :x86_64_linux end depends_on "go" => :build @@ -23,6 +24,10 @@ def install test do system "git", "init" + unless OS.mac? + system "git", "config", "user.email", "you@example.com" + system "git", "config", "user.name", "Your Name" + end touch "testing.txt" system "git", "add", "testing.txt" system "git", "commit", "-m", "Testing!" diff --git a/Formula/git-trim.rb b/Formula/git-trim.rb index 0314a94352374..287e4e6128a99 100644 --- a/Formula/git-trim.rb +++ b/Formula/git-trim.rb @@ -9,6 +9,7 @@ class GitTrim < Formula sha256 "291284c8fc2191487bcc55ea41a0de621e705b3ae141f91226cb843b5be408af" => :catalina sha256 "a41fdd1acd98185e906be41cb1ca658e50e32fc3461a9d5ef5d10a1aed9c7e11" => :mojave sha256 "e0c2c87d6d4aad24751f3dded41c6e8f68300eaef2a9721eea92508bb9ccc32c" => :high_sierra + sha256 "d850eb8d5a7b14ab154dbd313339c81dc9c4b00e7705d443ac25b44b1778b13c" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/git-vendor.rb b/Formula/git-vendor.rb index 28caed5a5f0ca..88bb48b14b3d7 100644 --- a/Formula/git-vendor.rb +++ b/Formula/git-vendor.rb @@ -14,6 +14,7 @@ class GitVendor < Formula sha256 "9461c5ce8f0b418d4ab1180c1fff22ef847b0d0af740489b3553d1715a8dc8c0" => :el_capitan sha256 "62a8d29afff9e7e99c93917cfee92a68495443234346a72f16c8167d6310126a" => :yosemite sha256 "962f05607dbd8ea0669f081039ce2fad01cddcdbfe53859b57c9ef69d89cde45" => :mavericks + sha256 "5794acbb86d9552b8432437c88bfa4b924c1c07349f0da61beb3fdb737a4b4d2" => :x86_64_linux end def install diff --git a/Formula/git.rb b/Formula/git.rb index f4ac2ed0ffbfd..ab5072b1a02c1 100644 --- a/Formula/git.rb +++ b/Formula/git.rb @@ -11,11 +11,20 @@ class Git < Formula sha256 "731a77dd23d63ca8a0a5ba5c990218e37f1c8d9313fa1f9e58771cf5abd97bef" => :catalina sha256 "a752212149e96e67fd8c42e1d68d7612de94bc67f06ffdc13ed7236aa33debf4" => :mojave sha256 "c9b1c7d3686fac0f7006b13b1afd46e38f2d6c73dd72049d9e8fc49b1bb34599" => :high_sierra + sha256 "2028a5775f97ccc078bc6451be5f7af8505ce648bf6122b0605892cf515ec9e2" => :x86_64_linux end depends_on "gettext" depends_on "pcre2" + on_linux do + depends_on "curl" + depends_on "expat" + depends_on "linux-headers" + depends_on "openssl@1.1" + depends_on "zlib" + end + resource "html" do url "https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.27.0.tar.xz" sha256 "ffa91681b6a8f558745924b1dbb76d604c9e52b27c525c6bd470c0123f7f4af3" @@ -44,13 +53,15 @@ def install perl_version = Utils.safe_popen_read("perl", "--version")[/v(\d+\.\d+)(?:\.\d+)?/, 1] - ENV["PERLLIB_EXTRA"] = %W[ - #{MacOS.active_developer_dir} - /Library/Developer/CommandLineTools - /Applications/Xcode.app/Contents/Developer - ].uniq.map do |p| - "#{p}/Library/Perl/#{perl_version}/darwin-thread-multi-2level" - end.join(":") + if OS.mac? + ENV["PERLLIB_EXTRA"] = %W[ + #{MacOS.active_developer_dir} + /Library/Developer/CommandLineTools + /Applications/Xcode.app/Contents/Developer + ].uniq.map do |p| + "#{p}/Library/Perl/#{perl_version}/darwin-thread-multi-2level" + end.join(":") + end # Ensure we are using the correct system headers (for curl) to workaround # mismatched Xcode/CLT versions: @@ -72,7 +83,7 @@ def install NO_TCLTK=1 ] - if MacOS.version < :yosemite + if !OS.mac? && MacOS.version < :yosemite openssl_prefix = Formula["openssl@1.1"].opt_prefix args += %W[NO_APPLE_COMMON_CRYPTO=1 OPENSSLDIR=#{openssl_prefix}] else @@ -84,12 +95,14 @@ def install git_core = libexec/"git-core" # Install the macOS keychain credential helper - cd "contrib/credential/osxkeychain" do - system "make", "CC=#{ENV.cc}", - "CFLAGS=#{ENV.cflags}", - "LDFLAGS=#{ENV.ldflags}" - git_core.install "git-credential-osxkeychain" - system "make", "clean" + if OS.mac? + cd "contrib/credential/osxkeychain" do + system "make", "CC=#{ENV.cc}", + "CFLAGS=#{ENV.cflags}", + "LDFLAGS=#{ENV.ldflags}" + git_core.install "git-credential-osxkeychain" + system "make", "clean" + end end # Generate diff-highlight perl script executable @@ -140,13 +153,20 @@ def install # only contains the perllocal.pod installation file. rm_rf prefix/"Library/Perl" + pod = Dir[lib/"*/*/perllocal.pod"][0] + unless pod.nil? + # Remove perllocal.pod, which conflicts with the perl formula. + # I don't know why this issue doesn't affect Mac. + rm_r Pathname.new(pod).dirname.dirname + end + # Set the macOS keychain credential helper by default # (as Apple's CLT's git also does this). (buildpath/"gitconfig").write <<~EOS [credential] \thelper = osxkeychain EOS - etc.install "gitconfig" + etc.install "gitconfig" if OS.mac? end def caveats @@ -158,20 +178,27 @@ def caveats test do system bin/"git", "init" %w[haunted house].each { |f| touch testpath/f } + + # Test environment has no git configuration, which prevents commiting + system bin/"git", "config", "user.email", "you@example.com" + system bin/"git", "config", "user.name", "Your Name" + system bin/"git", "add", "haunted", "house" system bin/"git", "config", "user.name", "'A U Thor'" system bin/"git", "config", "user.email", "author@example.com" system bin/"git", "commit", "-a", "-m", "Initial Commit" assert_equal "haunted\nhouse", shell_output("#{bin}/git ls-files").strip - # Check Net::SMTP::SSL was installed correctly. - %w[foo bar].each { |f| touch testpath/f } - system bin/"git", "add", "foo", "bar" - system bin/"git", "commit", "-a", "-m", "Second Commit" - assert_match "Authentication Required", pipe_output( - "#{bin}/git send-email --from=test@example.com --to=dev@null.com " \ - "--smtp-server=smtp.gmail.com --smtp-server-port=587 " \ - "--smtp-encryption=tls --confirm=never HEAD^ 2>&1", - ) + if OS.mac? + # Check Net::SMTP::SSL was installed correctly. + %w[foo bar].each { |f| touch testpath/f } + system bin/"git", "add", "foo", "bar" + system bin/"git", "commit", "-a", "-m", "Second Commit" + assert_match "Authentication Required", pipe_output( + "#{bin}/git send-email --from=test@example.com --to=dev@null.com " \ + "--smtp-server=smtp.gmail.com --smtp-server-port=587 " \ + "--smtp-encryption=tls --confirm=never HEAD^ 2>&1", + ) + end end end diff --git a/Formula/gitbatch.rb b/Formula/gitbatch.rb index f2efa15289c80..64a47e56edea3 100644 --- a/Formula/gitbatch.rb +++ b/Formula/gitbatch.rb @@ -9,6 +9,7 @@ class Gitbatch < Formula sha256 "58b204bd1779e99cade465f98457ec14cadaee9a3b65afe099245faba640da0c" => :catalina sha256 "31d8b72293ceacef7d44beb203887ff80628cb5cd3b56a9f0b467704d153b261" => :mojave sha256 "73fc219e77776b78635c672111736a1ce26f6f1afe0df4ce7c571341578cd1e9" => :high_sierra + sha256 "11b14438381986b8202dea1849759f07241a3a7193f5db67638eb3ef013b1018" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gitfs.rb b/Formula/gitfs.rb index 1a14a6166aa86..b6e939d9e880c 100644 --- a/Formula/gitfs.rb +++ b/Formula/gitfs.rb @@ -5,7 +5,7 @@ class Gitfs < Formula homepage "https://www.presslabs.com/gitfs" url "https://github.com/presslabs/gitfs/archive/0.5.2.tar.gz" sha256 "921e24311e3b8ea3a5448d698a11a747618ee8dd62d5d43a85801de0b111cbf3" - revision 3 + revision OS.mac? ? 3 : 5 head "https://github.com/presslabs/gitfs.git" bottle do @@ -13,10 +13,15 @@ class Gitfs < Formula sha256 "a2bafe9a8ff3d0b0600c8b1cfc580646f0bf058db47655e0f708efd3c3b36583" => :catalina sha256 "a1817085b653a485019f22acc6457b6ea858fba6209558991ef6efa72ce34f8d" => :mojave sha256 "c35d61dcf4f5145067b88526b47c12363f794c30f414db0a56f3ff4251a5708e" => :high_sierra + sha256 "c705383f2dd05e387e4619663bb10fb5a22b07660b26b2d40b4ee4f3a1ecb164" => :x86_64_linux end depends_on "libgit2" - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end depends_on "python@3.8" uses_from_macos "libffi" diff --git a/Formula/github-markdown-toc.rb b/Formula/github-markdown-toc.rb index 015b5ede09509..e9588f639af3f 100644 --- a/Formula/github-markdown-toc.rb +++ b/Formula/github-markdown-toc.rb @@ -10,6 +10,7 @@ class GithubMarkdownToc < Formula sha256 "b4f9d659136a64866c45db6175dd57c366a05b99228e59c889714ae07810a9d9" => :catalina sha256 "599edae04915747981605739964b0f496e22d434005be54cc7102ff64e592ba7" => :mojave sha256 "44e9a44b52c69571064b4d316f99b1b0ba9b87ac0453e2f0e69a8da65513c9f7" => :high_sierra + sha256 "41c6396acd9dec8dc6cc7575c8bcd34692aa14532f1fd2d8abffc1d9ceaf2076" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/github-release.rb b/Formula/github-release.rb index 5360f05b4a972..e2a10a5b7b153 100644 --- a/Formula/github-release.rb +++ b/Formula/github-release.rb @@ -10,6 +10,7 @@ class GithubRelease < Formula sha256 "67399d81e62c8b1fb7d5b26ebea79de5d806757cd194d2055dcd5dc8935167e2" => :catalina sha256 "3640960eb97bed10dfe75237cc61b3e8fb36f526c9d50c6820cd07c841432842" => :mojave sha256 "53b5ef103a6190a891f53a5c52019ab2e12e31f15f4f97775cb2cb169befefa1" => :high_sierra + sha256 "38dab5ce6e77b7f10cae06c1020dc5ca5c994edb9dffe237403dbba7b6c2f759" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gitlab-gem.rb b/Formula/gitlab-gem.rb index 784fd4d9ff853..f8c7dace542b7 100644 --- a/Formula/gitlab-gem.rb +++ b/Formula/gitlab-gem.rb @@ -9,6 +9,7 @@ class GitlabGem < Formula sha256 "2a41f838c6b4c01bd88573bd2a0dc3d7ebfbac30a184a205c9f1ebed0d97b47a" => :catalina sha256 "1f62b1370f402910440d06723da59ada32cfb064ffa7dcff253a6c3740299f80" => :mojave sha256 "004e1b420646231af5ca551812a0c52499fcfe5b794761c6416712140a451679" => :high_sierra + sha256 "15f8b82dea3aa1c9d6f45cc2ed7fcf34bdb8c4a1f0a06f580f04540b20c44856" => :x86_64_linux end uses_from_macos "ruby", :since => :catalina diff --git a/Formula/gitlab-runner.rb b/Formula/gitlab-runner.rb index 7a58a12272b77..281dc01bdd046 100644 --- a/Formula/gitlab-runner.rb +++ b/Formula/gitlab-runner.rb @@ -11,6 +11,7 @@ class GitlabRunner < Formula sha256 "3a91a0ef04cf878b0e98d0897ce58888b3872e4844f820adc7dfcfa9204653a0" => :catalina sha256 "c30a9bff71c9148659bc9893231782aeb10e33b7c368e00325032dbaa8027cec" => :mojave sha256 "7395fd0fc8f8344bf51a4a0bc78374f8e4131a98c5fd3308674cfddcac40ea8a" => :high_sierra + sha256 "40e6024b198a2fe37c4e040f874e5c5686684d8a4bab784efe7a69f54e4608e8" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gitleaks.rb b/Formula/gitleaks.rb index c1390dacbdacc..04b590f341e13 100644 --- a/Formula/gitleaks.rb +++ b/Formula/gitleaks.rb @@ -9,6 +9,7 @@ class Gitleaks < Formula sha256 "bd93e118160563e46825ee86bfbcedc8894e8799b20a400fe47b4412243f8f12" => :catalina sha256 "857d0fcf0420198d43a76ff555a2afb893662aae808711e8deb7d0c7604f873d" => :mojave sha256 "678cd5b4d9e592985bb56e4e20a5f675010eb623b7f61aede5290a72137f640c" => :high_sierra + sha256 "1493d087badd0049dce21662fc41688fbf5280e3d01e4c5a556e345f1485334f" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gitless.rb b/Formula/gitless.rb index 0ff7cca4483f9..08d7c8c2c34a3 100644 --- a/Formula/gitless.rb +++ b/Formula/gitless.rb @@ -5,13 +5,14 @@ class Gitless < Formula homepage "https://gitless.com/" url "https://github.com/gitless-vcs/gitless/archive/v0.8.8.tar.gz" sha256 "470aab13d51baec2ab54d7ceb6d12b9a2937f72d840516affa0cb34a6360523c" - revision 4 + revision OS.mac? ? 4 : 6 bottle do cellar :any sha256 "c0ffed9f5228aecb14175929167812114176ac2df5b9583161c4f3c0f7785da0" => :catalina sha256 "f72efc4323f531adcb1a38c8d864a4bd464b4a7d67400623479f05d37a4332cd" => :mojave sha256 "aa526af3aaa79be5c7d86d4265589194e331766ba138e5b74894ad8037224c5c" => :high_sierra + sha256 "a1bbe8d0dc0774668218689e89431c852f33cdbdf2bba73f565bf1e4c3dec973" => :x86_64_linux end depends_on "libgit2" diff --git a/Formula/gitmoji.rb b/Formula/gitmoji.rb index af38228b14f95..f18f0235c41eb 100644 --- a/Formula/gitmoji.rb +++ b/Formula/gitmoji.rb @@ -11,6 +11,7 @@ class Gitmoji < Formula sha256 "625e829cad6317c55ba225ad7429bdc44b5f2f0e8542913150fdbcf995f72cda" => :catalina sha256 "0a9e423e8d354c7a1b5dac4cc8aee6455c54081bc5a6f81fdf1d987afc0a1dd1" => :mojave sha256 "61f3bfbad5458f75bbaf554eeca5d6840a0aaa1e27702ef210a6ec3aed81013f" => :high_sierra + sha256 "dd2120004c1a4ce3b139e925a8f66e5af838df7dc03fbce1852070f67c3e9412" => :x86_64_linux end depends_on "node" diff --git a/Formula/gitter-cli.rb b/Formula/gitter-cli.rb index 5930ede9cd223..b3cd21da0ed81 100644 --- a/Formula/gitter-cli.rb +++ b/Formula/gitter-cli.rb @@ -14,6 +14,7 @@ class GitterCli < Formula sha256 "6b0c1af334ab94692271f4e88b3f3b44adb8f2e7738cd68cdc20719dbb4f315f" => :sierra sha256 "4503b65ec4122d7cb51e8173168dc41dc4e57f978f4246697f9a3bf768f8c9cb" => :el_capitan sha256 "d4b1a539db31e5a04e05fc982c6b9961bde7eae94de06d1addc2dc4346f696e9" => :yosemite + sha256 "8047349306dfe211793fb6c1c12cb343744da59a81b9fe9447f5666ad27c933e" => :x86_64_linux end depends_on "node" diff --git a/Formula/gitup.rb b/Formula/gitup.rb index 2295f6ef20073..513b36d69a448 100644 --- a/Formula/gitup.rb +++ b/Formula/gitup.rb @@ -6,13 +6,14 @@ class Gitup < Formula url "https://github.com/earwig/git-repo-updater.git", :tag => "v0.5.1", :revision => "b502b2eaa46a6a10d9db228209f984bb235444a7" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "61b9abe9e481e9fa3a86074756d065f48f92cf71420e6855e95ad1ecdc92cecb" => :catalina sha256 "2e1fb0d6519682a80737b73136fd6cf1c81928d993e88e835cb053725ff40bf2" => :mojave sha256 "63c2169d68aed5aca9a91bba014cdb96238b61316267691dd7c63ef566b89fc8" => :high_sierra + sha256 "5dd964faad1ad46151104b5eeb6f700c844e482f33eb45c0a1a51e0b18b7b4af" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/gitversion.rb b/Formula/gitversion.rb index 814271591d860..a62b64620f138 100644 --- a/Formula/gitversion.rb +++ b/Formula/gitversion.rb @@ -25,6 +25,10 @@ def install (testpath/"test.txt").write("test") system "git", "init" system "git", "add", "test.txt" + unless OS.mac? + system "git", "config", "user.email", "you@example.com" + system "git", "config", "user.name", "Your Name" + end system "git", "commit", "-q", "--author='Test '", "--message='Test'" assert_match '"FullSemVer":"0.1.0+0"', shell_output("#{bin}/gitversion -output json") end diff --git a/Formula/gl2ps.rb b/Formula/gl2ps.rb index 66d6c3cd43a73..f3f44ec99a3d2 100644 --- a/Formula/gl2ps.rb +++ b/Formula/gl2ps.rb @@ -9,6 +9,7 @@ class Gl2ps < Formula sha256 "dbdfe5d8458e1224941d6e5707b725ab6872333112dc408dbf35202eddbc8d15" => :catalina sha256 "bc857ec44c73448acf748dea7a699e1018a874196dec19659a63aa70a7b5e970" => :mojave sha256 "6c36dc780b0579f44057cadddb9e1a2e369e2ba9205b68d6c81ebd79defc45b4" => :high_sierra + sha256 "0c30fbb5197067a5d5de6d491a4ed79e8457e6a91eaed031cd3d1a1737fc7f04" => :x86_64_linux end depends_on "cmake" => :build @@ -24,13 +25,15 @@ def install # https://www.geuz.org/pipermail/gl2ps/2016/000433.html # Reported to cmake's bug tracker, as well (1st April 2016) # https://public.kitware.com/Bug/view.php?id=16045 - system "cmake", ".", "-DGLUT_glut_LIBRARY=/System/Library/Frameworks/GLUT.framework", *std_cmake_args + args = std_cmake_args + args << "-DGLUT_glut_LIBRARY=/System/Library/Frameworks/GLUT.framework" if OS.mac? + system "cmake", ".", *args system "make", "install" end test do (testpath/"test.c").write <<~EOS - #include + #include <#{OS.mac? ? "GLUT" : "GL"}/glut.h> #include int main(int argc, char *argv[]) @@ -59,8 +62,14 @@ def install return 0; } EOS - system ENV.cc, "-L#{lib}", "-lgl2ps", "-framework", "OpenGL", "-framework", "GLUT", - "-framework", "Cocoa", "test.c", "-o", "test" + if OS.mac? + system ENV.cc, "-L#{lib}", "-lgl2ps", "-framework", "OpenGL", "-framework", + "GLUT", "-framework", "Cocoa", "test.c", "-o", "test" + else + system ENV.cc, "test.c", "-o", "test", "-L#{lib}", "-lgl2ps", "-lglut", "-lGL" + # Fails without an X11 display: freeglut (./test): failed to open display '' + return if ENV["CI"] + end system "./test" assert_predicate testpath/"test.eps", :exist? assert_predicate File.size("test.eps"), :positive? diff --git a/Formula/glade.rb b/Formula/glade.rb index 39a90699fbab2..fdeefcf4b5cd8 100644 --- a/Formula/glade.rb +++ b/Formula/glade.rb @@ -14,11 +14,12 @@ class Glade < Formula depends_on "docbook-xsl" => :build depends_on "gobject-introspection" => :build depends_on "itstool" => :build + depends_on "libxslt" => :build depends_on "pkg-config" => :build depends_on "adwaita-icon-theme" depends_on "gettext" depends_on "gtk+3" - depends_on "gtk-mac-integration" + depends_on "gtk-mac-integration" if OS.mac? depends_on "hicolor-icon-theme" depends_on "libxml2" @@ -108,11 +109,11 @@ def post_install -lglib-2.0 -lgobject-2.0 -lgtk-3 - -lintl -lpango-1.0 -lpangocairo-1.0 -lxml2 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/glances.rb b/Formula/glances.rb index b2f9f727a433f..a0f4990bbcfe9 100644 --- a/Formula/glances.rb +++ b/Formula/glances.rb @@ -9,6 +9,7 @@ class Glances < Formula sha256 "3bc1dc122d7ed7542795ac6b390dea5e7645528439295d29f8f127148425b5c2" => :catalina sha256 "4f1c3d51bf77bb95586c81bdf5170f5fd2b53d544f06a311d9152c00f4abb038" => :mojave sha256 "27db703a8a6fd3decc1d96ebed0c0d991c41a74e5a25d1c708a843671be072fd" => :high_sierra + sha256 "06bfce814bf4652ab0cb2d8cebc2002ee111b427ef36991da9ea5a8ed7cfc27f" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/gleam.rb b/Formula/gleam.rb index 5acfab8e2aad2..934f916f7da85 100644 --- a/Formula/gleam.rb +++ b/Formula/gleam.rb @@ -9,6 +9,7 @@ class Gleam < Formula sha256 "70777be1c8558f699d379114b7105b1666855ee95b3fd69b7af439a44038d0bd" => :catalina sha256 "2d8c0593e9f1a7435f126687b16422eb5f1e5edd7d0c4132c332fdd16a6c3108" => :mojave sha256 "e95b247a6e79610200134cdad6754663bedacad6a06efaac808a4d4e22f1e8c1" => :high_sierra + sha256 "2a488208b5404a6600f5b534f459df98136c243a371b6f7bb3fef37d40f6d476" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/glew.rb b/Formula/glew.rb index 5bec10b453aab..e9f38d792cbd6 100644 --- a/Formula/glew.rb +++ b/Formula/glew.rb @@ -3,7 +3,7 @@ class Glew < Formula homepage "https://glew.sourceforge.io/" url "https://downloads.sourceforge.net/project/glew/glew/2.1.0/glew-2.1.0.tgz" sha256 "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" - revision 1 + revision OS.mac? ? 1 : 3 head "https://github.com/nigels-com/glew.git" bottle do @@ -11,9 +11,15 @@ class Glew < Formula sha256 "590c10bf98e6263d8e573720e5521584d836f28c52f30f97840614e97c16ccfd" => :catalina sha256 "66638564b5b9d2d915b97841ef1cc117f701c7ec34707734fa1ce11919c28821" => :mojave sha256 "1d3b4e7938d3c1fc7e16f78a506163046da105b443498b7ca1a3cca78f232739" => :high_sierra + sha256 "238fc7acb38a8677e5a7aad6cd57e4934e4ee00289f6aefdc565846d21c22f80" => :x86_64_linux end depends_on "cmake" => :build + unless OS.mac? + depends_on "freeglut" => :test + depends_on "linuxbrew/xorg/glu" + depends_on "mesa" + end def install cd "build" do @@ -25,9 +31,13 @@ def install end test do + if ENV["DISPLAY"].nil? + ohai "Can not test without a display." + return true + end (testpath/"test.c").write <<~EOS #include - #include + #include <#{OS.mac? ? "GLUT" : "GL"}/glut.h> int main(int argc, char** argv) { glutInit(&argc, argv); @@ -39,8 +49,13 @@ def install return 0; } EOS - system ENV.cc, testpath/"test.c", "-o", "test", "-L#{lib}", "-lGLEW", - "-framework", "GLUT" + flags = %W[-L#{lib} -lGLEW] + if OS.mac? + flags << "-framework" << "GLUT" + else + flags << "-lglut" + end + system ENV.cc, testpath/"test.c", "-o", "test", *flags system "./test" end end diff --git a/Formula/glfw.rb b/Formula/glfw.rb index d51ec955f7da6..93dd1cf1bf155 100644 --- a/Formula/glfw.rb +++ b/Formula/glfw.rb @@ -3,6 +3,7 @@ class Glfw < Formula homepage "https://www.glfw.org/" url "https://github.com/glfw/glfw/archive/3.3.2.tar.gz" sha256 "98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537" + revision 1 unless OS.mac? head "https://github.com/glfw/glfw.git" bottle do @@ -10,10 +11,21 @@ class Glfw < Formula sha256 "deaf1b20e9fc336d5f0c9a927bc07f2c509fc63538c39e4ab3a024ca7c6170d8" => :catalina sha256 "0c0de277c23273346d703004279d92d17a8962f4d62bf01f76021beea3c3f20a" => :mojave sha256 "c6a198383ef979823c1e0071e65771ed9059626071390f2dc5b84b218dc565c3" => :high_sierra + sha256 "e773566038a5c495c49a93c128984eaeb29111ff8af7a2a3d7df0a478caff85a" => :x86_64_linux end depends_on "cmake" => :build + unless OS.mac? + depends_on "freeglut" + depends_on "linuxbrew/xorg/libx11" + depends_on "linuxbrew/xorg/libxcursor" + depends_on "linuxbrew/xorg/libxi" + depends_on "linuxbrew/xorg/libxinerama" + depends_on "linuxbrew/xorg/libxrandr" + depends_on "mesa" + end + def install args = std_cmake_args + %w[ -DGLFW_USE_CHDIR=TRUE @@ -26,6 +38,9 @@ def install end test do + # glfw doesn't work in headless mode + return if !OS.mac? && ENV["CI"] + (testpath/"test.c").write <<~EOS #define GLFW_INCLUDE_GLU #include diff --git a/Formula/glib-networking.rb b/Formula/glib-networking.rb index f3f4a231e3fc0..0990f8f2d7298 100644 --- a/Formula/glib-networking.rb +++ b/Formula/glib-networking.rb @@ -8,6 +8,7 @@ class GlibNetworking < Formula sha256 "52991dae042721d0bc9af98a7a777435b76fd6ef3a66ce8bf89928fd549537ee" => :catalina sha256 "1c26ff7e2f3dfc8b5fec714aef7c35a3c1a8b89228b8e62c8311a2e942ceec22" => :mojave sha256 "1a5a55a81cc7c844af35a53ad39ad6babb56de8f901ad300959e978a0542ce1c" => :high_sierra + sha256 "a1ac1c65f186ba059e716a09e23b99c159650c020fe12235c4b0a8fe8d85b677" => :x86_64_linux end depends_on "meson" => :build @@ -16,6 +17,7 @@ class GlibNetworking < Formula depends_on "glib" depends_on "gnutls" depends_on "gsettings-desktop-schemas" + depends_on "libidn" unless OS.mac? on_linux do depends_on "libidn" diff --git a/Formula/glib-openssl.rb b/Formula/glib-openssl.rb index 37583e5c68cd1..e6bca566cd160 100644 --- a/Formula/glib-openssl.rb +++ b/Formula/glib-openssl.rb @@ -9,6 +9,7 @@ class GlibOpenssl < Formula sha256 "d3e3d452515afbf8ab39555e7c9e4add50f28aa89252321bee6ca021c7cb88a9" => :catalina sha256 "10b207a9c340bc6710e1df7f47ef4a0dba5a941c0cdb3330255718cf1884276c" => :mojave sha256 "04107ac3e021e4dd11feb50a3ac4024f3c73dd2b805f171ccfc22c1d7e3a665e" => :high_sierra + sha256 "7eacd90ccefeda996c5e0d05d0ba1de4b1b4d5dc37b3b40aab888b273aa980cb" => :x86_64_linux end depends_on "pkg-config" => :build @@ -61,8 +62,8 @@ def post_install -lgio-2.0 -lgobject-2.0 -lglib-2.0 - -lintl ] + flags << "-lintl" if OS.mac? system ENV.cc, "gtls-test.c", "-o", "gtls-test", *flags system "./gtls-test" end diff --git a/Formula/glib.rb b/Formula/glib.rb index a7a49a6e939f0..e80e82b25d6b2 100644 --- a/Formula/glib.rb +++ b/Formula/glib.rb @@ -8,6 +8,7 @@ class Glib < Formula sha256 "c7259832a3bf3fe8093962473718a2ca030a94c54f21cbdc46369974d6e80be8" => :catalina sha256 "47d4a4666df88be5c56def3cb5d8e7c0e3ee6baf431584c40783d98a063fb943" => :mojave sha256 "1e5fadb54980899f293ea99796c33f25109c72ad745b9bc5583a1f86f02bee06" => :high_sierra + sha256 "6a7412f10251d67ad3671a64b659bd971f9789856532f335c7e306233baeea56" => :x86_64_linux end depends_on "meson" => :build @@ -44,6 +45,10 @@ def install -Ddtrace=false ] + args << "-Diconv=native" if OS.mac? + # Prevent meson to use lib64 on centos + args << "--libdir=#{lib}" unless OS.mac? + mkdir "build" do system "meson", *args, ".." system "ninja", "-v" @@ -62,9 +67,10 @@ def install # `pkg-config --libs glib-2.0` includes -lintl, and gettext itself does not # have a pkgconfig file, so we add gettext lib and include paths here. gettext = Formula["gettext"].opt_prefix + lintl = OS.mac? ? " -lintl": "" inreplace lib+"pkgconfig/glib-2.0.pc" do |s| - s.gsub! "Libs: -L${libdir} -lglib-2.0 -lintl", - "Libs: -L${libdir} -lglib-2.0 -L#{gettext}/lib -lintl" + s.gsub! "Libs:#{lintl} -L${libdir} -lglib-2.0", + "Libs: -L${libdir} -lglib-2.0 -L#{gettext}/lib#{lintl}" s.gsub! "Cflags:-I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include", "Cflags:-I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I#{gettext}/include" end diff --git a/Formula/glibc.rb b/Formula/glibc.rb new file mode 100644 index 0000000000000..0e802469fd776 --- /dev/null +++ b/Formula/glibc.rb @@ -0,0 +1,175 @@ +require "os/linux/glibc" + +class BrewedGlibcNotOlderRequirement < Requirement + fatal true + + satisfy(:build_env => false) do + Glibc.version >= OS::Linux::Glibc.system_version + end + + def message + <<~EOS + Your system's glibc version is #{OS::Linux::Glibc.system_version}, and Homebrew's glibc version is #{Glibc.version}. + Installing a version of glibc that is older than your system's can break formulae installed from source. + EOS + end +end + +class GawkRequirement < Requirement + fatal true + + satisfy(:build_env => false) do + # Returning which("gawk") causes a cyclic dependency. + !which("gawk").nil? + end + + def message + <<~EOS + gawk is required to build glibc. + Install gawk with your host package manager if you have sudo access. + sudo apt-get install gawk + sudo yum install gawk + EOS + end +end + +class LinuxKernelRequirement < Requirement + fatal true + + MINIMUM_LINUX_KERNEL_VERSION = "2.6.32".freeze + + def linux_kernel_version + @linux_kernel_version ||= Version.new Utils.safe_popen_read("uname -r") + end + + satisfy(:build_env => false) do + linux_kernel_version >= MINIMUM_LINUX_KERNEL_VERSION + end + + def message + <<~EOS + Linux kernel version #{MINIMUM_LINUX_KERNEL_VERSION} or greater is required by glibc. + Your system has Linux kernel version #{linux_kernel_version}. + EOS + end +end + +class Glibc < Formula + desc "The GNU C Library" + homepage "https://www.gnu.org/software/libc/" + url "https://ftp.gnu.org/gnu/glibc/glibc-2.23.tar.gz" + sha256 "2bd08abb24811cda62e17e61e9972f091f02a697df550e2e44ddcfb2255269d2" + + bottle do + sha256 "654794e9e18c2401f1101a3fcf0a85eda448b4b969e9a99782a3f4f4659feda4" => :x86_64_linux + end + + depends_on "binutils" => :build # binutils 2.20 or later is required + depends_on GawkRequirement => :build + depends_on "linux-headers" => :build # Linux kernel headers 2.6.19 or later are required + depends_on BrewedGlibcNotOlderRequirement + depends_on :linux + depends_on LinuxKernelRequirement + + # GCC 4.7 or later is required. + fails_with :gcc => "4.3" + fails_with :gcc => "4.4" + fails_with :gcc => "4.5" + fails_with :gcc => "4.6" + + def install + # Fix Error: `loc1@GLIBC_2.2.5' can't be versioned to common symbol 'loc1' + # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869717 + inreplace "misc/regexp.c", /^(char \*loc[12s]);$/, "\\1 __attribute__ ((nocommon));" + + # Setting RPATH breaks glibc. + %w[ + LDFLAGS LD_LIBRARY_PATH LD_RUN_PATH LIBRARY_PATH + HOMEBREW_DYNAMIC_LINKER HOMEBREW_LIBRARY_PATHS HOMEBREW_RPATH_PATHS + ].each { |x| ENV.delete x } + + gcc_keg = begin + Keg.for HOMEBREW_PREFIX/"bin"/ENV.cc + rescue Errno::ENOENT, NotAKegError + nil + end + if gcc_keg + # Use the original GCC specs file. + specs = Pathname.new(Utils.safe_popen_read(ENV.cc, "-print-file-name=specs.orig").chomp) + raise "The original GCC specs file is missing: #{specs}" unless specs.readable? + + ENV["LDFLAGS"] = "-specs=#{specs}" + + # Fix error ld: cannot find -lc when upgrading glibc and compiling with a brewed gcc. + ENV["BUILD_LDFLAGS"] = "-L#{opt_lib}" if opt_lib.directory? + end + + # -Os confuses valgrind. + ENV.O2 + + # Use brewed ld.so.preload rather than the hotst's /etc/ld.so.preload + inreplace "elf/rtld.c", '= "/etc/ld.so.preload";', '= SYSCONFDIR "/ld.so.preload";' + + mkdir "build" do + args = [ + "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}", + "--enable-obsolete-rpc", + # Fix error: selinux/selinux.h: No such file or directory + "--without-selinux", + ] + args << "--with-binutils=#{Formula["binutils"].bin}" + args << "--with-headers=#{Formula["linux-headers"].include}" + system "../configure", *args + + system "make" # Fix No rule to make target libdl.so.2 needed by sprof + system "make", "install" + prefix.install_symlink "lib" => "lib64" + end + end + + def post_install + # Fix permissions + chmod 0755, [lib/"ld-#{version}.so", lib/"libc-#{version}.so"] + + # Install ld.so symlink. + ln_sf lib/"ld-linux-x86-64.so.2", HOMEBREW_PREFIX/"lib/ld.so" + + # Symlink ligcc_s.so.1 where glibc can find it. + # Fix the error: libgcc_s.so.1 must be installed for pthread_cancel to work + ln_sf Formula["gcc"].opt_lib/"libgcc_s.so.1", lib if Formula["gcc"].installed? + + # Compile locale definition files + mkdir_p lib/"locale" + locales = ENV.map { |k, v| v if k[/^LANG$|^LC_/] && v != "C" }.compact + # en_US.UTF-8 is required by gawk make check + locales = (locales + ["en_US.UTF-8"]).sort.uniq + ohai "Installing locale data for #{locales.join(" ")}" + locales.each do |locale| + lang, charmap = locale.split(".", 2) + if !charmap.nil? + system bin/"localedef", "-i", lang, "-f", charmap, locale + else + system bin/"localedef", "-i", lang, locale + end + end + + # Set the local time zone + sys_localtime = Pathname.new "/etc/localtime" + brew_localtime = Pathname.new prefix/"etc/localtime" + (prefix/"etc").install_symlink sys_localtime if sys_localtime.exist? && !brew_localtime.exist? + + # Set zoneinfo correctly using the system installed zoneinfo + sys_zoneinfo = Pathname.new "/usr/share/zoneinfo" + brew_zoneinfo = Pathname.new share/"zoneinfo" + share.install_symlink sys_zoneinfo if sys_zoneinfo.exist? && !brew_zoneinfo.exist? + end + + test do + system "#{lib}/ld-#{version}.so 2>&1 |grep Usage" + system "#{lib}/libc-#{version}.so", "--version" + system "#{bin}/locale", "--version" + end +end diff --git a/Formula/glibmm.rb b/Formula/glibmm.rb index e23c4fa9c9ce1..b0fffcb7101f2 100644 --- a/Formula/glibmm.rb +++ b/Formula/glibmm.rb @@ -9,6 +9,7 @@ class Glibmm < Formula sha256 "8b39f15570f8ec9281554ec8db93e4011ad2e13a1248047c18c7f8570a548d53" => :catalina sha256 "316a5f0f84491a62cf1c48a12cd4f8d9b7f7de9aa8092f72256f5114aa8730d3" => :mojave sha256 "7d224a2283e08715a1f7f286fcdc3e1c5cc277101bb3e2cc4bce488ec776cc02" => :high_sierra + sha256 "0c4cc228b4fdcb78f2f96726c0413c8fa7c22d0bed11e346fa9f3b1d62e212c0" => :x86_64_linux end depends_on "pkg-config" => :build @@ -18,6 +19,17 @@ class Glibmm < Formula def install ENV.cxx11 + # see https://bugzilla.gnome.org/show_bug.cgi?id=781947 + # Note that desktopappinfo.h is not installed on Linux + # if these changes are made. + if OS.mac? + inreplace "gio/giomm/Makefile.in" do |s| + s.gsub! "OS_COCOA_TRUE", "OS_COCOA_TEMP" + s.gsub! "OS_COCOA_FALSE", "OS_COCOA_TRUE" + s.gsub! "OS_COCOA_TEMP", "OS_COCOA_FALSE" + end + end + system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" end @@ -50,9 +62,9 @@ def install -lglib-2.0 -lglibmm-2.4 -lgobject-2.0 - -lintl -lsigc-2.0 ] + flags << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/glide.rb b/Formula/glide.rb index eff46de011174..319746250023f 100644 --- a/Formula/glide.rb +++ b/Formula/glide.rb @@ -11,6 +11,7 @@ class Glide < Formula sha256 "795f7f533f050b5356846b3ed2a9db88a51ef74b929e28ea0473c83f630b03c3" => :mojave sha256 "45c35a6adf13bc732a827669e4ffb19dcfa710180c2b2930435d4217802313d6" => :high_sierra sha256 "d665d8221c75985ffde8357c5ebfd53c2cb3398ac699a1afc1ebf8000e5206cc" => :sierra + sha256 "ba268e6084c6309f1c9fd06d9e6cd9a144f22e2f00d4c54abdc4e950036f2d7a" => :x86_64_linux end depends_on "go" diff --git a/Formula/glm.rb b/Formula/glm.rb index a4bb78ca37aa2..7de30e934229c 100644 --- a/Formula/glm.rb +++ b/Formula/glm.rb @@ -10,6 +10,7 @@ class Glm < Formula sha256 "9b661be1f704c2e946dbd4d4f96d58ae82427824ef88d7dd9f0f0cfc3fae2233" => :catalina sha256 "7210910c6f106de4c22874f3977b1457cea3db6bb03269ea6831ffae861bb80e" => :mojave sha256 "ea41bb7f8f195c22d6f7834c57684412d752e2c72ff795b9056dd90aaebf9d84" => :high_sierra + sha256 "c93e76e1625623a3b6a0255661c5fc12fbbf2b7480aa1a62227973fbba294964" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/global.rb b/Formula/global.rb index e5d172f730ece..dc7507b0bb0d4 100644 --- a/Formula/global.rb +++ b/Formula/global.rb @@ -10,6 +10,7 @@ class Global < Formula sha256 "748524c4b316196e41e0f54df683117c61f7dfdbab1c3e641c36ae4eed7f1013" => :catalina sha256 "848b4e78c1f507bc4356b285164368641125194e730accf46c540af5806a600f" => :mojave sha256 "ba9cdd8c988ca4aff95538b8d30cb9f97c99dd6f5e91e296db121c8b53459cf0" => :high_sierra + sha256 "35fb50e301ca735d1ba3fe2322b0f973b7c3001ffb868500fcced65da65eeb79" => :x86_64_linux end head do @@ -19,12 +20,13 @@ class Global < Formula depends_on "automake" => :build depends_on "bison" => :build depends_on "flex" => :build - ## gperf is provided by OSX Command Line Tools. depends_on "libtool" => :build end depends_on "ctags" + depends_on "gperf" depends_on "python@3.8" + depends_on "libtool" unless OS.mac? uses_from_macos "ncurses" @@ -40,6 +42,11 @@ class Global < Formula end def install + unless OS.mac? + inreplace "plugin-factory/pygments_parser.py", "#!/usr/bin/env python", "#!/usr/bin/env python3" + inreplace "plugin-factory/pygments_parser.py.in", "#!/usr/bin/env python", "#!/usr/bin/env python3" + end + system "sh", "reconf.sh" if build.head? xy = Language::Python.major_minor_version "python3" diff --git a/Formula/globe.rb b/Formula/globe.rb index 77c3d978d5186..75ceb4fec28d3 100644 --- a/Formula/globe.rb +++ b/Formula/globe.rb @@ -14,6 +14,7 @@ class Globe < Formula sha256 "11acded7be5d1ba22260d039e3daf4fdc4cac49ebcd234c879da655a1532c22f" => :el_capitan sha256 "a3ccdf74813e704ab1c8d50bb32f3f9b3f62110c8a6a143e3df85eb6ab7ecd7d" => :yosemite sha256 "8ff4dd96c5ab3c846ac61ff66c866e3d4969560611405db6e20436ff75494715" => :mavericks + sha256 "c37aa4067f2d9ce7b5fbed7246e67164d04e500bfbc193a4a1e19fdba741be85" => :mountain_lion end def install diff --git a/Formula/glog.rb b/Formula/glog.rb index 5debcb3065de8..cb5bb22dfd553 100644 --- a/Formula/glog.rb +++ b/Formula/glog.rb @@ -4,6 +4,7 @@ class Glog < Formula url "https://github.com/google/glog/archive/v0.4.0.tar.gz" sha256 "f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c" head "https://github.com/google/glog.git" + revision 1 unless OS.mac? bottle do cellar :any @@ -11,6 +12,7 @@ class Glog < Formula sha256 "034a4d2272b48fd7655b467b92c78eebfb11efb33cc6cd31f7b13ee085b7169b" => :mojave sha256 "bbe6c4138b5fe8cd58d269a39644176f640fa62e694ffac36337f87661cacc69" => :high_sierra sha256 "08408127c37122614811eae2d925d940912c2cb29eb0fb300116ee4813d50095" => :sierra + sha256 "2ec0688648139e68ad94c4478f1f46ed2a623bbefa4daaaed1d79b26d44521ae" => :x86_64_linux end depends_on "cmake" => :build @@ -20,6 +22,16 @@ def install mkdir "cmake-build" do system "cmake", "..", "-DBUILD_SHARED_LIBS=ON", *std_cmake_args system "make", "install" + + unless OS.mac? + # Move lib64/* to lib/ on Linuxbrew + lib64 = Pathname.new "#{lib}64" + if lib64.directory? + mkdir_p lib + mv lib64, lib + rmdir lib64 + end + end end # Upstream PR from 30 Aug 2017 "Produce pkg-config file under cmake" diff --git a/Formula/glooctl.rb b/Formula/glooctl.rb index f995d5f8478e5..08638cf0d3b3a 100644 --- a/Formula/glooctl.rb +++ b/Formula/glooctl.rb @@ -11,6 +11,7 @@ class Glooctl < Formula sha256 "8177a8144948901cd3e21d0db8b57f13c0b2fc0f0370978a01c8324e8944f076" => :catalina sha256 "a1ecfb9ce99ba819b4e2449a98dac401b81aa3d9a537a31aafdcc0ceedebe454" => :mojave sha256 "027d0f62fae779d0913f57115eaf141f27ff5387aed4afc3885cdec087fcc2d2" => :high_sierra + sha256 "3de16999c3a643cf535bbe39f3c9aba3c6d6ab7c178b017dfe93e1eaabf3a97e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gloox.rb b/Formula/gloox.rb index 1fedd6ce2a1df..25e9a82e1165b 100644 --- a/Formula/gloox.rb +++ b/Formula/gloox.rb @@ -9,6 +9,7 @@ class Gloox < Formula sha256 "ae614fa73c886d568e4bb6916438affd3b081bccfc4904fef4a4110417f41e9d" => :catalina sha256 "eea355a755180f72c719f06d0eae5c7b03223c35f39aae6379a007f0a6333ffe" => :mojave sha256 "730858e264fc531556d60fd93f971614e9ce22ee1db1391f651a8fba2b257198" => :high_sierra + sha256 "f84625906d2eb5acfb3fe33436807eca8844970fc28d36a4bb01901a7fbb652e" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/glow.rb b/Formula/glow.rb index 767b6389f3c1b..a4a71cade35be 100644 --- a/Formula/glow.rb +++ b/Formula/glow.rb @@ -9,6 +9,7 @@ class Glow < Formula sha256 "1c21088d72f2e0e7f41b64c74b0b5c4b0494570ccde672998bf62f920dacdb7c" => :catalina sha256 "65d2045f3ecb6368b018706e65a32093651dcedf5aa6b0fab15bd60278452742" => :mojave sha256 "8cdd087d6817dde487cd09c3378048728cf492ab4e94188f76bf3bdbe4a1c168" => :high_sierra + sha256 "49c046bcf3512be6e955fa20618776f8552d578d019fd3f5791c0acec841a2bd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/glpk.rb b/Formula/glpk.rb index 5757dbf2e81f2..14225b1e5d6b8 100644 --- a/Formula/glpk.rb +++ b/Formula/glpk.rb @@ -12,6 +12,7 @@ class Glpk < Formula sha256 "5c0b4a34749c6e60bf9aa39f175ca907bab774f89a1b8a1697f3f5d02d493f2a" => :high_sierra sha256 "3cbe0b40e3852414560a4929da0ee050fc8fa424b56b3ea756f853ce274b9a3a" => :sierra sha256 "90ba265eb683981e612faae96318b662558e828a99a89200a29df93006d34084" => :el_capitan + sha256 "33696fd8f068b0b3e009701ce41f2eb0a49af48070d1e1aa296223e14aab5c19" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/glslang.rb b/Formula/glslang.rb index 1883279870183..cd1f8046008ec 100644 --- a/Formula/glslang.rb +++ b/Formula/glslang.rb @@ -10,6 +10,7 @@ class Glslang < Formula sha256 "9db9f4d0af3d3945270e3fcfbb2e502f377f15d76810facf80862093a18b7a5d" => :catalina sha256 "24e6cb49dac7d598a0d12e055a67cd036196eb8cfb7f688b58240219e1a144b9" => :mojave sha256 "02af3328d6edf389d340d0c106c4366f575e5abf8db478e6b5c6fc99111b2c2c" => :high_sierra + sha256 "07a762e9f5dadc061c754bfedd4deedb1fefcc0b09ab615f39f1a88e8ce793a7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/glui.rb b/Formula/glui.rb index 339ccca82ad44..578db96c54856 100644 --- a/Formula/glui.rb +++ b/Formula/glui.rb @@ -3,6 +3,7 @@ class Glui < Formula homepage "https://glui.sourceforge.io/" url "https://github.com/libglui/glui/archive/2.37.tar.gz" sha256 "f7f6983f7410fe8dfaa032b2b7b1aac2232ec6a400a142b73f680683dad795f8" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -10,6 +11,7 @@ class Glui < Formula sha256 "24c323dbaa5f6f1b01fbf8f837c379ef503d323a448d2bb3d673c31ced622f0d" => :mojave sha256 "7cd9b9d6bffa3b6b6ff806c4041f495d5a7ef40296cb50097db25d17eb616265" => :high_sierra sha256 "c087de27b46b86a14d583904e0a9d293428af37d8710b521ae7aeeb5174fc8fd" => :sierra + sha256 "ad4477be4bf85e37d3d86d803df4c277682c7b66c4e4898d8e379d8e74610a23" => :x86_64_linux end # Fix compiler warnings in glui.h. Merged into master on November 28, 2016. @@ -18,6 +20,12 @@ class Glui < Formula sha256 "b1afada854f920692ab7cb6b6292034f3488936c4332e3e996798ee494a3fdd7" end + unless OS.mac? + depends_on "freeglut" + depends_on "linuxbrew/xorg/glu" + depends_on "mesa" + end + def install system "make", "setup" system "make", "lib/libglui.a" @@ -26,17 +34,37 @@ def install end test do - (testpath/"test.cpp").write <<~EOS - #include - #include - int main() { - GLUI *glui = GLUI_Master.create_glui("GLUI"); - assert(glui != nullptr); - return 0; - } - EOS - system ENV.cxx, "-framework", "GLUT", "-framework", "OpenGL", "-I#{include}", - "-L#{lib}", "-lglui", "-std=c++11", "test.cpp" - system "./a.out" + if OS.mac? + (testpath/"test.cpp").write <<~EOS + #include + #include + int main() { + GLUI *glui = GLUI_Master.create_glui("GLUI"); + assert(glui != nullptr); + return 0; + } + EOS + system ENV.cxx, "-framework", "GLUT", "-framework", "OpenGL", "-I#{include}", + "-L#{lib}", "-lglui", "-std=c++11", "test.cpp" + system "./a.out" + else + (testpath/"test.cpp").write <<~EOS + #include + #include + #include + int main(int argc, char **argv) { + glutInit(&argc, argv); + GLUI *glui = GLUI_Master.create_glui("GLUI"); + assert(glui != nullptr); + return 0; + } + EOS + system ENV.cxx, "-I#{include}", "-std=c++11", "test.cpp", + "-L#{lib}", "-lglui", "-lglut", "-lGLU", "-lGL" + if ENV["DISPLAY"] + # Fails without X display: freeglut (./a.out): failed to open display '' + system "./a.out" + end + end end end diff --git a/Formula/gmime.rb b/Formula/gmime.rb index 36a8c177d0103..f63087dbc8906 100644 --- a/Formula/gmime.rb +++ b/Formula/gmime.rb @@ -5,9 +5,11 @@ class Gmime < Formula sha256 "2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44" bottle do + cellar :any_skip_relocation sha256 "877f2024cc0d97bc94f559ad992f87bdf6fdc23f9a1acc7b5bb13f0711b734c3" => :catalina sha256 "7a0bda5bca906bc62e3ab24fc39752e2858fce861ba759040fc864928ab18d96" => :mojave sha256 "0bb48841eae316695037bcd793673d518d0f2be20968a115a81c92824fb77ac0" => :high_sierra + sha256 "8fcc99c96339f108fa0a3a3861ebdbc602a1d8048c178b639bd65852c84c6c8f" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -62,8 +64,8 @@ def install -lglib-2.0 -lgmime-3.0 -lgobject-2.0 - -lintl ] + flags << "-lintl" if OS.mac? system ENV.cc, "-o", "test", "test.c", *flags system "./test" end diff --git a/Formula/gmp.rb b/Formula/gmp.rb index 7be716b29f30e..f167cdd8159fd 100644 --- a/Formula/gmp.rb +++ b/Formula/gmp.rb @@ -10,6 +10,7 @@ class Gmp < Formula sha256 "2e6acd6e62d1b8ef0800061e113aea30a63f56b32b99c010234c0420fd6d3ecf" => :catalina sha256 "1bbea4983a4c883c8eb8b7e19df9fab52f0575be8a34b629fc7df79895f48937" => :mojave sha256 "63f220c9ac4ebc386711c8c4c5e1f955cfb0a784bdc41bfd6c701dc789be7fcc" => :high_sierra + sha256 "8a83606f4070c86ec0cc4c642817cf5bd3c6695943da85bed413d99c433e007c" => :x86_64_linux end uses_from_macos "m4" => :build @@ -21,7 +22,14 @@ def install # Enable --with-pic to avoid linking issues with the static library args = %W[--prefix=#{prefix} --enable-cxx --with-pic] - args << "--build=#{Hardware.oldest_cpu}-apple-darwin#{`uname -r`.to_i}" + + if OS.mac? + args << "--build=#{Hardware.oldest_cpu}-apple-darwin#{`uname -r`.to_i}" + elsif !OS.mac? && Hardware::CPU.intel? + args << "--build=core2-linux-gnu" + args << "ABI=32" if Hardware::CPU.is_32_bit? + end + system "./configure", *args system "make" system "make", "check" diff --git a/Formula/gnirehtet.rb b/Formula/gnirehtet.rb index 12e6897059100..4ead2308e3429 100644 --- a/Formula/gnirehtet.rb +++ b/Formula/gnirehtet.rb @@ -10,6 +10,7 @@ class Gnirehtet < Formula sha256 "8f2c4797209bc261df8b2b9ba75d2719070c1c3e587c392d941aac7b18e9da8e" => :catalina sha256 "879106aecceb430220e20e3224e906cb2cbe1fdf92febed03c6f319fb668592d" => :mojave sha256 "86843aab81fac7df1b3fe9c92c47ea6be7367fecefa90398dd2a9d322160455a" => :high_sierra + sha256 "769cd736a3ed9be440b8022917617099e4eec03c082242d53348efdb9da7f26f" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/gnome-common.rb b/Formula/gnome-common.rb index 7f2bdded2e16b..afb711e7df268 100644 --- a/Formula/gnome-common.rb +++ b/Formula/gnome-common.rb @@ -13,6 +13,7 @@ class GnomeCommon < Formula sha256 "a5ad22711bdc05e9dbe4c4891ad06f146bc81b4d0d7d737d582f32e36f4e6fc7" => :el_capitan sha256 "7e3512e3a7c39f759ab9f3642831961b355f3f83ae6e19a26fdaf91739870e23" => :yosemite sha256 "a96e5dedc2888b6caa326da0abd8eb7d3f1426407e8bef82a6ba0f41adb7016a" => :mavericks + sha256 "b8256d52c330d2b70a505bba4df870cc7efe1b8b4f534f38f598d74a2ae2626b" => :x86_64_linux end def install diff --git a/Formula/gnome-themes-standard.rb b/Formula/gnome-themes-standard.rb index 4ff1d24284afd..a4fdd69c4b0c2 100644 --- a/Formula/gnome-themes-standard.rb +++ b/Formula/gnome-themes-standard.rb @@ -11,6 +11,7 @@ class GnomeThemesStandard < Formula sha256 "0275e08061a7fc1c641729075add70362499309548d9f82a65f30397fe756073" => :mojave sha256 "7c871fcd54d59a07719e5b1f22ca003921e479548ee9d13c5910af482b47891e" => :high_sierra sha256 "7e5bfe5894c0498b6b9325a782e4ea1c756b042d527815547cba6e6f411095a2" => :sierra + sha256 "f942924775fa9036498f9efa56c69e6857d13a4e5a6546420d04f34710c9c0c0" => :x86_64_linux end depends_on "gettext" => :build @@ -19,6 +20,9 @@ class GnomeThemesStandard < Formula depends_on "gtk+" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", "--prefix=#{prefix}", diff --git a/Formula/gnu-apl.rb b/Formula/gnu-apl.rb index 07b2a84090141..af8da39b09f43 100644 --- a/Formula/gnu-apl.rb +++ b/Formula/gnu-apl.rb @@ -10,6 +10,7 @@ class GnuApl < Formula sha256 "9df4d2bfcfda74e10451b132d0c274265bb1e550a9d7829402913d7798a83c46" => :mojave sha256 "d1d035cef7cb23ecde90146a8eae564fbbeba3546228618dc250581d5611a4ab" => :high_sierra sha256 "cbb8043b314e3141b2a9e6e3121b7c797ca68298374d9c50f6d07447e5ea7ca5" => :sierra + sha256 "8695fcec7097d63deae5f3119b4f575ddc71dc454c4a34a1e684f0e8e123c1e9" => :x86_64_linux end head do diff --git a/Formula/gnu-barcode.rb b/Formula/gnu-barcode.rb index 60d8af1e2a2a9..f1928446e5d65 100644 --- a/Formula/gnu-barcode.rb +++ b/Formula/gnu-barcode.rb @@ -14,6 +14,7 @@ class GnuBarcode < Formula sha256 "1885abad5bc70c2e9952e131307ca7282d851856ebdea58dadc69f0e125a7c22" => :el_capitan sha256 "819af5d364f041397c7c6b768829df7fcbd617f86194a1656b5523eeaed9415a" => :yosemite sha256 "285a9fa2833e843765087545f778aeadc670555bcac38193788c866826a88d42" => :mavericks + sha256 "4f84c80e5b937cf0962d10d67fe9358205cc5555876aa50cf4de9169a4eccf3e" => :x86_64_linux end # Patch and ac_cv_func_calloc_0_nonnull config addresses the following issue: diff --git a/Formula/gnu-chess.rb b/Formula/gnu-chess.rb index 2e722fb60e775..ebc55244ae3c6 100644 --- a/Formula/gnu-chess.rb +++ b/Formula/gnu-chess.rb @@ -9,6 +9,7 @@ class GnuChess < Formula sha256 "85423112485c7dbe474c99c93008b8a7a7a8c9a9737bbda3e372fde8674cbef1" => :catalina sha256 "4bc514e190844faa459fbbc204c7bdd4699cb6cd09011811ae0999429343f0da" => :mojave sha256 "81883d1506513bdb4feff2617b492237aef06a2f17f3bd4eb81e68142c4d73af" => :high_sierra + sha256 "5ca8e427ba137ed7427eb0042f9af61c4052c38799e10458d23057886489770d" => :x86_64_linux end head do diff --git a/Formula/gnu-complexity.rb b/Formula/gnu-complexity.rb index d14e23d4e4ab8..1c8250ad1e5a9 100644 --- a/Formula/gnu-complexity.rb +++ b/Formula/gnu-complexity.rb @@ -13,6 +13,7 @@ class GnuComplexity < Formula sha256 "3ea1d968a1eaa2ce6655fa8e33b721af3cd631075f960c6595ca68aecd0972c7" => :sierra sha256 "89b7043d1f51fc6ff7a1e96f8ed23bbac73bbb7196a04851a2cf29475b0803f7" => :el_capitan sha256 "35a8ac468a12565af95b82c75d6b45c9c55c27fa769244f0bd87ec69b10742b1" => :yosemite + sha256 "2fe81d7aa28f2192f62ce3aa6bab412778576e421847fdbc523267428baa53d1" => :x86_64_linux end depends_on "autogen" diff --git a/Formula/gnu-getopt.rb b/Formula/gnu-getopt.rb index 69d73824f6e0d..7b6587f72b825 100644 --- a/Formula/gnu-getopt.rb +++ b/Formula/gnu-getopt.rb @@ -9,9 +9,10 @@ class GnuGetopt < Formula sha256 "4eda655b18149121dd39d19928b64b63f7310469ad1d64a232996b61afb5016c" => :catalina sha256 "ff402c05420ff975374689ce0f185c8d9f9578f3e9113e935cf3030f0743c31c" => :mojave sha256 "a9c00a4e5483a0636b9a8dc6def5cc73c53f7b6ef16a476af5d470d4d6e1e5c4" => :high_sierra + sha256 "5f070c1fc35679873e9c2e9a63ffded1bbb1f56fc4449128ec6881bc7eddc133" => :x86_64_linux end - keg_only :provided_by_macos + keg_only (OS.mac? ? :provided_by_macos : "this formula conflicts with util-linux") def install system "./configure", "--disable-dependency-tracking", diff --git a/Formula/gnu-go.rb b/Formula/gnu-go.rb index 047f733315a03..ff79460bbcbc8 100644 --- a/Formula/gnu-go.rb +++ b/Formula/gnu-go.rb @@ -15,6 +15,7 @@ class GnuGo < Formula sha256 "25fa92bd5c129cb655ec06c441523ada5cbc90a560111c32f5b1246c8f7d124c" => :sierra sha256 "f845be5a48a89cf0e46322b4d3a64a86b9fd4793f6b98fee0c45de5e8e5eda69" => :el_capitan sha256 "57731f2cb8dcb2959e85baebdb779989390688a70447b923b9d5c1ce8575da44" => :yosemite + sha256 "ed00c34cc100eb97c2332a96cdde6faac2437bd75ed5fde8c88e3351a2a30694" => :x86_64_linux end def install diff --git a/Formula/gnu-indent.rb b/Formula/gnu-indent.rb index 20f38ef97a7ab..767af796ff1fe 100644 --- a/Formula/gnu-indent.rb +++ b/Formula/gnu-indent.rb @@ -11,29 +11,36 @@ class GnuIndent < Formula sha256 "e960e3f35f6a77daef487f54158953522f58a27caf27e39e0c17702754718ee1" => :mojave sha256 "3280e6e9fc0c5cc895367291fc328dccae5f2e36606dd503b5721d449bc33eb8" => :high_sierra sha256 "98bcdee2e49d7e165a07ce6468d2c1a3030db7205472d015ba516e43f5a1e0fd" => :sierra + sha256 "e9298e04acf0130485f44dc103928bb5e1ea7db7413160fb99864232e98ec514" => :x86_64_linux end depends_on "gettext" + uses_from_macos "texinfo" => :build + def install args = %W[ --disable-debug --disable-dependency-tracking --prefix=#{prefix} --mandir=#{man} - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? system "./configure", *args system "make", "install" - (libexec/"gnubin").install_symlink bin/"gindent" => "indent" - (libexec/"gnuman/man1").install_symlink man1/"gindent.1" => "indent.1" + if OS.mac? + (libexec/"gnubin").install_symlink bin/"gindent" => "indent" + (libexec/"gnuman/man1").install_symlink man1/"gindent.1" => "indent.1" + end libexec.install_symlink "gnuman" => "man" end def caveats + return unless OS.mac? + <<~EOS GNU "indent" has been installed as "gindent". If you need to use it as "indent", you can add a "gnubin" directory @@ -45,7 +52,8 @@ def caveats test do (testpath/"test.c").write("int main(){ return 0; }") - system "#{bin}/gindent", "test.c" + system "#{bin}/gindent", "test.c" if OS.mac? + system "#{bin}/indent", "test.c" unless OS.mac? assert_equal File.read("test.c"), <<~EOS int main () diff --git a/Formula/gnu-prolog.rb b/Formula/gnu-prolog.rb index 2188c17aac925..b8262a55dc19c 100644 --- a/Formula/gnu-prolog.rb +++ b/Formula/gnu-prolog.rb @@ -11,6 +11,7 @@ class GnuProlog < Formula sha256 "21072ba374c5426f89448664738eea6e331c0e9da452ca7945d709901b72eda4" => :high_sierra sha256 "957d8a1d72f338cb94765a82f88d5154bb0611e938db765de2b8120fc8e8f0db" => :sierra sha256 "4437bfce43e947a2ae48b50963b9cda18c257b3dbe202f49dde1da8f615d54e2" => :el_capitan + sha256 "bc50d6c133bb75ffae0e9a12f3c669e8ef5411fc04edfd2a0b45be61c1aef069" => :x86_64_linux end def install diff --git a/Formula/gnu-sed.rb b/Formula/gnu-sed.rb index 19fbc66d02b72..4ad304d39b82e 100644 --- a/Formula/gnu-sed.rb +++ b/Formula/gnu-sed.rb @@ -6,10 +6,10 @@ class GnuSed < Formula sha256 "f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" bottle do - cellar :any_skip_relocation sha256 "726be75d6d7155820b408a10e5c1a5ba1406374a7fc167af62524a4f4bbbc099" => :catalina sha256 "093f16752e7dfb115c055f20aed090108b94edd47c40f5e50878d961359251b2" => :mojave sha256 "865abe618c67037a4a419a05e0df2c6814fb3abdd6f631ea546aeba0aaf8eb78" => :high_sierra + sha256 "0ddd750074b40c2fa24f81ec6057ead7eca21b76ca9191fe292da13afdc5a274" => :x86_64_linux end conflicts_with "ssed", :because => "both install share/info/sed.info" @@ -18,22 +18,27 @@ def install args = %W[ --prefix=#{prefix} --disable-dependency-tracking - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? + args << "--without-selinux" unless OS.mac? # Work around a gnulib issue with macOS Catalina - args << "gl_cv_func_ftello_works=yes" + args << "gl_cv_func_ftello_works=yes" if OS.mac? system "./configure", *args system "make", "install" - (libexec/"gnubin").install_symlink bin/"gsed" =>"sed" - (libexec/"gnuman/man1").install_symlink man1/"gsed.1" => "sed.1" + if OS.mac? + (libexec/"gnubin").install_symlink bin/"gsed" =>"sed" + (libexec/"gnuman/man1").install_symlink man1/"gsed.1" => "sed.1" + end libexec.install_symlink "gnuman" => "man" end def caveats + return unless OS.mac? + <<~EOS GNU "sed" has been installed as "gsed". If you need to use it as "sed", you can add a "gnubin" directory @@ -45,10 +50,17 @@ def caveats test do (testpath/"test.txt").write "Hello world!" - system "#{bin}/gsed", "-i", "s/world/World/g", "test.txt" - assert_match /Hello World!/, File.read("test.txt") + if OS.mac? + system "#{bin}/gsed", "-i", "s/world/World/g", "test.txt" + assert_match /Hello World!/, File.read("test.txt") + + system "#{opt_libexec}/gnubin/sed", "-i", "s/world/World/g", "test.txt" + assert_match /Hello World!/, File.read("test.txt") + end - system "#{opt_libexec}/gnubin/sed", "-i", "s/world/World/g", "test.txt" - assert_match /Hello World!/, File.read("test.txt") + unless OS.mac? + system "#{bin}/sed", "-i", "s/world/World/g", "test.txt" + assert_match /Hello World!/, File.read("test.txt") + end end end diff --git a/Formula/gnu-shogi.rb b/Formula/gnu-shogi.rb index db0cd9eed7bfe..a259dc8e12dc3 100644 --- a/Formula/gnu-shogi.rb +++ b/Formula/gnu-shogi.rb @@ -12,6 +12,7 @@ class GnuShogi < Formula sha256 "677531c9eb7bdd01f22862c24d5ab144f7b78bd672223854fc169d103a9924e2" => :sierra sha256 "49ff431036e172362b24dc7eca426a638ec2953ea014c67e4cae239e9175bf27" => :el_capitan sha256 "1fbc9bf567ea4c50c5bb12fda953e18ce8617298d474ed8a56ca2b9dd24b2726" => :yosemite + sha256 "336a04422baf73ef1f8d3da3ff4616335d644a1bb116b40445999352a06bdc05" => :x86_64_linux end def install diff --git a/Formula/gnu-tar.rb b/Formula/gnu-tar.rb index 3288370dcb9e4..4316f97fa669d 100644 --- a/Formula/gnu-tar.rb +++ b/Formula/gnu-tar.rb @@ -6,11 +6,11 @@ class GnuTar < Formula sha256 "b59549594d91d84ee00c99cf2541a3330fed3a42c440503326dab767f2fbb96c" bottle do - cellar :any_skip_relocation rebuild 1 sha256 "158cb67ea9e02435d671013b4d0d7369822758d9f7ff400ce2512a03f2f7f4e4" => :catalina sha256 "1034894e78bb22b0fcf0c8114666d4dc3eb82345a5ca83797ca3bda367d998ac" => :mojave sha256 "3771cead286229786d9d92a7697bc6e0de576ec9cae1f881017884ceb3e24f17" => :high_sierra + sha256 "337b86b55d802758502ecd73d46c46a76f4aa36c1bbb9615c0b07989ee0eee56" => :x86_64_linux end head do @@ -30,27 +30,34 @@ def install # https://lists.gnu.org/archive/html/bug-tar/2015-10/msg00017.html ENV["gl_cv_func_getcwd_abort_bug"] = "no" if MacOS.version == :el_capitan + # Fix configure: error: you should not run configure as root + ENV["FORCE_UNSAFE_CONFIGURE"] = "1" unless ENV["CI"] + args = %W[ --prefix=#{prefix} --mandir=#{man} - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? # Work around a gnulib issue with macOS Catalina - args << "gl_cv_func_ftello_works=yes" + args << "gl_cv_func_ftello_works=yes" if OS.mac? system "./bootstrap" if build.head? system "./configure", *args system "make", "install" - # Symlink the executable into libexec/gnubin as "tar" - (libexec/"gnubin").install_symlink bin/"gtar" =>"tar" - (libexec/"gnuman/man1").install_symlink man1/"gtar.1" => "tar.1" + if OS.mac? + # Symlink the executable into libexec/gnubin as "tar" + (libexec/"gnubin").install_symlink bin/"gtar" =>"tar" + (libexec/"gnuman/man1").install_symlink man1/"gtar.1" => "tar.1" + end libexec.install_symlink "gnuman" => "man" end def caveats + return unless OS.mac? + <<~EOS GNU "tar" has been installed as "gtar". If you need to use it as "tar", you can add a "gnubin" directory @@ -62,9 +69,15 @@ def caveats test do (testpath/"test").write("test") - system bin/"gtar", "-czvf", "test.tar.gz", "test" - assert_match /test/, shell_output("#{bin}/gtar -xOzf test.tar.gz") + if OS.mac? + system bin/"gtar", "-czvf", "test.tar.gz", "test" + assert_match /test/, shell_output("#{bin}/gtar -xOzf test.tar.gz") + assert_match /test/, shell_output("#{opt_libexec}/gnubin/tar -xOzf test.tar.gz") + end - assert_match /test/, shell_output("#{opt_libexec}/gnubin/tar -xOzf test.tar.gz") + unless OS.mac? + system bin/"tar", "-czvf", "test.tar.gz", "test" + assert_match /test/, shell_output("#{bin}/tar -xOzf test.tar.gz") + end end end diff --git a/Formula/gnu-time.rb b/Formula/gnu-time.rb index 1f026371f67e6..ce0fe3f42b2a2 100644 --- a/Formula/gnu-time.rb +++ b/Formula/gnu-time.rb @@ -12,22 +12,27 @@ class GnuTime < Formula sha256 "dc007b95e2f9fb0df3380da55d3c9337529b1a4a3cd762972eb88512f567ea1c" => :mojave sha256 "ad5d776c38e43f16fad8976770eeaa18e40562c166fa65fdaa12af61981c7b90" => :high_sierra sha256 "d51ef948a5a87281175fef771cb28469cbdb3085e3c51ad325d780ff921cc013" => :sierra + sha256 "413f9b0ff0050c2bdd9bd4cbbd581078e44f5f7aec43ac20958a89a1200d26fe" => :x86_64_linux end + depends_on "ruby" => :test + def install args = %W[ --prefix=#{prefix} --info=#{info} - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? system "./configure", *args system "make", "install" - (libexec/"gnubin").install_symlink bin/"gtime" => "time" + (libexec/"gnubin").install_symlink bin/"gtime" => "time" if OS.mac? end def caveats + return unless OS.mac? + <<~EOS GNU "time" has been installed as "gtime". If you need to use it as "time", you can add a "gnubin" directory @@ -38,7 +43,11 @@ def caveats end test do - system bin/"gtime", "ruby", "--version" - system opt_libexec/"gnubin/time", "ruby", "--version" + if OS.mac? + system bin/"gtime", "ruby", "--version" + system opt_libexec/"gnubin/time", "ruby", "--version" + end + + system bin/"time", "ruby", "--version" unless OS.mac? end end diff --git a/Formula/gnu-typist.rb b/Formula/gnu-typist.rb index f2bd1c02dfc90..6ab50f94fe3a8 100644 --- a/Formula/gnu-typist.rb +++ b/Formula/gnu-typist.rb @@ -11,6 +11,7 @@ class GnuTypist < Formula sha256 "9f0fcdd42b9a041408b132882778db2eb479749a7169b82f2caf1f4fd486b599" => :mojave sha256 "72503afd4efafe7a8485ea22332819937008263976a6f5f5b42818565d59edbf" => :high_sierra sha256 "d32708d6e8a640101ac618ceac23be6b9d1a6a4caa127c5fd12a44b4e57c09e9" => :sierra + sha256 "96f7d1fe80ea3c8e5a6687b0a2e7ce519d97b933cd42219cb9ef6837150ce8c5" => :x86_64_linux end depends_on "gettext" @@ -24,7 +25,7 @@ class GnuTypist < Formula def install # libiconv is not linked properly without this - ENV.append "LDFLAGS", "-liconv" + ENV.append "LDFLAGS", "-liconv" if OS.mac? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", diff --git a/Formula/gnu-units.rb b/Formula/gnu-units.rb index 0d7b4f070553f..070bd1dd2a5ff 100644 --- a/Formula/gnu-units.rb +++ b/Formula/gnu-units.rb @@ -10,6 +10,7 @@ class GnuUnits < Formula sha256 "ea90fe5d92832bd8491f3adcb5f01c67cd12eba112485f8e03b252909a019a68" => :mojave sha256 "43db4b67478cb35f0639fb616f4c4cf04c717a61dafe56c9d36adda921b90da0" => :high_sierra sha256 "5704a3d37c2790c482bbefc4290f3ffd589ab071e400f2e9610b267ea0f5a3dd" => :sierra + sha256 "f91482d6f83578d8cac9ddd20834b8da3896ef81acf996cad02575d1af83124c" => :x86_64_linux end depends_on "readline" @@ -18,20 +19,23 @@ def install args = %W[ --prefix=#{prefix} --with-installed-readline - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? system "./configure", *args system "make", "install" - (libexec/"gnubin").install_symlink bin/"gunits" => "units" - (libexec/"gnubin").install_symlink bin/"gunits_cur" => "units_cur" - (libexec/"gnuman/man1").install_symlink man1/"gunits.1" => "units.1" - + if OS.mac? + (libexec/"gnubin").install_symlink bin/"gunits" => "units" + (libexec/"gnubin").install_symlink bin/"gunits_cur" => "units_cur" + (libexec/"gnuman/man1").install_symlink man1/"gunits.1" => "units.1" + end libexec.install_symlink "gnuman" => "man" end def caveats + return unless OS.mac? + <<~EOS All commands have been installed with the prefix "g". If you need to use these commands with their normal names, you @@ -41,7 +45,11 @@ def caveats end test do - assert_equal "* 18288", shell_output("#{bin}/gunits '600 feet' 'cm' -1").strip - assert_equal "* 18288", shell_output("#{opt_libexec}/gnubin/units '600 feet' 'cm' -1").strip + if OS.mac? + assert_equal "* 18288", shell_output("#{bin}/gunits '600 feet' 'cm' -1").strip + assert_equal "* 18288", shell_output("#{opt_libexec}/gnubin/units '600 feet' 'cm' -1").strip + end + + assert_equal "* 18288", shell_output("#{bin}/units '600 feet' 'cm' -1").strip unless OS.mac? end end diff --git a/Formula/gnu-which.rb b/Formula/gnu-which.rb index a9d877a9458ce..a0a00450074bc 100644 --- a/Formula/gnu-which.rb +++ b/Formula/gnu-which.rb @@ -13,25 +13,30 @@ class GnuWhich < Formula sha256 "170008e80a4cc5f1e45b3445f9fb6f099d7700aa6dd825602f6d32316c27735b" => :mojave sha256 "66446416b0dc367076ab38cfc9775d8c201fc571b1a2cd2fc0197daa6b83882a" => :high_sierra sha256 "68ea3522ec318c9b25d711ce4405b4cd6a41edca20b7df008adc499ab794c4fa" => :sierra + sha256 "b7db4c00f1aecc18dfb1c76e4d8e023d7be33cc1dc11dbd59dbced3f13e6a6bd" => :x86_64_linux end def install args = %W[ --prefix=#{prefix} --disable-dependency-tracking - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? system "./configure", *args system "make", "install" - (libexec/"gnubin").install_symlink bin/"gwhich" => "which" - (libexec/"gnuman/man1").install_symlink man1/"gwhich.1" => "which.1" + if OS.mac? + (libexec/"gnubin").install_symlink bin/"gwhich" => "which" + (libexec/"gnuman/man1").install_symlink man1/"gwhich.1" => "which.1" + end libexec.install_symlink "gnuman" => "man" end def caveats + return unless OS.mac? + <<~EOS GNU "which" has been installed as "gwhich". If you need to use it as "which", you can add a "gnubin" directory @@ -42,7 +47,11 @@ def caveats end test do - system "#{bin}/gwhich", "gcc" - system "#{opt_libexec}/gnubin/which", "gcc" + if OS.mac? + system "#{bin}/gwhich", "gcc" + system "#{opt_libexec}/gnubin/which", "gcc" + end + + system "#{bin}/which", "gcc" unless OS.mac? end end diff --git a/Formula/gnunet.rb b/Formula/gnunet.rb index a883a22e879f5..398381c4ff925 100644 --- a/Formula/gnunet.rb +++ b/Formula/gnunet.rb @@ -9,6 +9,7 @@ class Gnunet < Formula sha256 "31a8219cf9008c4f14b9bbbf962bcc9ab1ae2a3225b83257a3a2534d993e0d4c" => :catalina sha256 "4bc0298e1059a8da833a8cc73b01fd3705fef61931b1be30f7132180f9083fbc" => :mojave sha256 "113d1a55a25b57615189749651a3d69b6573d587baf06000beb0d8733f9d62fa" => :high_sierra + sha256 "5befa27563830875d746ea79c96defca0f11bb9dad7c37d256090ddac0730ab1" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/gnupg-pkcs11-scd.rb b/Formula/gnupg-pkcs11-scd.rb index 17b4cc6c67b0f..88d784e0d7af3 100644 --- a/Formula/gnupg-pkcs11-scd.rb +++ b/Formula/gnupg-pkcs11-scd.rb @@ -11,6 +11,7 @@ class GnupgPkcs11Scd < Formula sha256 "78537d1ee3285a604aae1d683db56da1b9ec76bf71262ff234e758efda63f885" => :mojave sha256 "1f4264ac76b36c453a3c5a000d1b1269f331e88420efc5591274ccbb8dc8b85c" => :high_sierra sha256 "83748a14d87233e8a2cf4744d0353c01176536b5cd9e1b317f741f824416453f" => :sierra + sha256 "a524acf8fe53b0cea32ecfb0c896df58e8cfed56f301f366b296e04d179f5b2c" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/gnupg.rb b/Formula/gnupg.rb index c1c9a27e5d442..fc5c35d421f26 100644 --- a/Formula/gnupg.rb +++ b/Formula/gnupg.rb @@ -8,6 +8,7 @@ class Gnupg < Formula sha256 "527ac31afe998a9931a6648c6fcc7288462ae73d6e6e8b84ecf46561c82d50ec" => :catalina sha256 "e826cf4b1764da749eba007097be8077f433e52d8f96405044e57a384b114942" => :mojave sha256 "179b68a29fe9f6731a294a674fbd439623acf22c1997c68b6358808adc83b763" => :high_sierra + sha256 "9875f425d36059289ebc8d81ff117dbe15e0fd2069621ca09d6392c5f6d53517" => :x86_64_linux end depends_on "pkg-config" => :build @@ -22,6 +23,11 @@ class Gnupg < Formula depends_on "npth" depends_on "pinentry" + on_linux do + depends_on "sqlite" => :build + depends_on "libidn" + end + def install system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", diff --git a/Formula/gnupg@1.4.rb b/Formula/gnupg@1.4.rb index e8ea704f286cc..0a2255f350622 100644 --- a/Formula/gnupg@1.4.rb +++ b/Formula/gnupg@1.4.rb @@ -12,6 +12,7 @@ class GnupgAT14 < Formula sha256 "dbd43b52f11e65c2bb6dadf3adbf8ccf7f740af33b56e4d8c8b037611840f127" => :high_sierra sha256 "abc1e142397fbe833f2f7c5f71409d925ce690506d77296f7f3d41656a0791f2" => :sierra sha256 "397c92b88bd189ef61dfb01d5fe2e27e0477a63de64a713ffb883eb799dcbb87" => :el_capitan + sha256 "6903320fde85f5a381381d906ad3fda31ad8f036056b0f48b7a2dd9e40f1c0bf" => :x86_64_linux end def install diff --git a/Formula/gnuradio.rb b/Formula/gnuradio.rb index 7a0583fcf4738..e747cc6abfa16 100644 --- a/Formula/gnuradio.rb +++ b/Formula/gnuradio.rb @@ -20,7 +20,7 @@ class Gnuradio < Formula depends_on "boost" depends_on "fftw" depends_on "gsl" - depends_on :macos # Due to Python 2 + depends_on :macos # Due to Python 2 (does not support Python 3) depends_on "numpy@1.16" depends_on "portaudio" depends_on "uhd" diff --git a/Formula/gnustep-make.rb b/Formula/gnustep-make.rb index 90603a2592873..1fb340c5124e3 100644 --- a/Formula/gnustep-make.rb +++ b/Formula/gnustep-make.rb @@ -9,6 +9,7 @@ class GnustepMake < Formula sha256 "0112f9b5cc350a2e8efc7eff2ea1b3e0b13e62877ce02592eac34052b33de00f" => :catalina sha256 "4025644721c7902db42e5f63a1d8980056b809bdab7237289b92381e82492cca" => :mojave sha256 "ff2edab383602c3449f074284f992567b0d072a3a442be898be21da0d484d3c3" => :high_sierra + sha256 "30b493f23248b8712a525441827638fd302e7fcb77492e17ba7d7ee8a5eaf4d4" => :x86_64_linux end def install @@ -19,6 +20,10 @@ def install end test do - assert_match shell_output("#{libexec}/gnustep-config --variable=CC").chomp, ENV.cc + if OS.mac? + assert_match shell_output("#{libexec}/gnustep-config --variable=CC").chomp, ENV.cc + else + assert_match shell_output("#{libexec}/gnustep-config --variable=CC").chomp, "gcc-5" + end end end diff --git a/Formula/gnutls.rb b/Formula/gnutls.rb index 7cd32fadf1e0c..0adf5c61cd385 100644 --- a/Formula/gnutls.rb +++ b/Formula/gnutls.rb @@ -9,6 +9,7 @@ class Gnutls < Formula sha256 "ed76b5d22e195a797c2d01ab2f4a8e769a023b056b17e86f11cb6b9af200babe" => :catalina sha256 "d57c7537ca0565e8c8fdf13beb4b082548f87a0df2295469596f1cfe3067faae" => :mojave sha256 "2773c249c2a71f299261889185bda3950ed15150ff09529a71f88c30d68ff26f" => :high_sierra + sha256 "a235ce1ddf8a8d8dbd0c8798020d82226b6952e4700e82843b09ee0be63f1a3f" => :x86_64_linux end depends_on "autoconf" => :build @@ -21,6 +22,7 @@ class Gnutls < Formula depends_on "nettle" depends_on "p11-kit" depends_on "unbound" + depends_on "autogen" unless OS.mac? on_linux do depends_on "autogen" => :build @@ -53,6 +55,8 @@ def install end def post_install + return unless OS.mac? + keychains = %w[ /System/Library/Keychains/SystemRootCertificates.keychain ] diff --git a/Formula/go-bindata.rb b/Formula/go-bindata.rb index cb2755618cec8..0ad52b8773214 100644 --- a/Formula/go-bindata.rb +++ b/Formula/go-bindata.rb @@ -9,6 +9,7 @@ class GoBindata < Formula sha256 "2b83e2976473f2310d488db6c3b20c27c844ce0eae86d2787fb1f5081da7fc98" => :catalina sha256 "658b8c27208d0e31241c811ea52fde269354d79804e95db8fc6bf9b9dd5f89c5" => :mojave sha256 "e2c10e8a03c3393d7500bd085e2a9f36285ccd75cd38a989517c2aaba55f5586" => :high_sierra + sha256 "bd947656acb1d50643f87a7c6fc374e7779ee9ce0879e3005a34af7b5eaba7cc" => :x86_64_linux end depends_on "go" diff --git a/Formula/go-jira.rb b/Formula/go-jira.rb index 4b388f9c73b18..dbe56be853890 100644 --- a/Formula/go-jira.rb +++ b/Formula/go-jira.rb @@ -9,6 +9,7 @@ class GoJira < Formula sha256 "77a16e13c81b90fb7a7cb90ce607531b1bb932a31e2db1aedfdb6d85d7986f1d" => :catalina sha256 "f165d25aa98ec17d4da66fa9c3b727c1b99723043ad4b259f01b6aa3e8c80bfd" => :mojave sha256 "a4d50f8c0376b0bef991ee3d7e9c50621dfae151e9bdb0e5ed143649de49a283" => :high_sierra + sha256 "1101c26895f5aa9ef6763d30486f43584b76f27f8a7b080e9c6833f70b7ec971" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/go-md2man.rb b/Formula/go-md2man.rb index f0aa2829e2aaa..aedc73ffa186e 100644 --- a/Formula/go-md2man.rb +++ b/Formula/go-md2man.rb @@ -11,6 +11,7 @@ class GoMd2man < Formula sha256 "1ff2123c31e56bc183a1b9b0e270c01ee31e16efc34c060e0d4ecbde87d9e16e" => :catalina sha256 "1ff2123c31e56bc183a1b9b0e270c01ee31e16efc34c060e0d4ecbde87d9e16e" => :mojave sha256 "1ff2123c31e56bc183a1b9b0e270c01ee31e16efc34c060e0d4ecbde87d9e16e" => :high_sierra + sha256 "3a2e3a047f3b7ccc60c518a8e1f617aac3395c7325176f35535c782a20fe03cd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/go-statik.rb b/Formula/go-statik.rb index 1d0e3d4418438..45664e08ca732 100644 --- a/Formula/go-statik.rb +++ b/Formula/go-statik.rb @@ -9,6 +9,7 @@ class GoStatik < Formula sha256 "923729f442bef89c09fc9818c4f2ff1689a099b7519285372d7f5448e5b88fcc" => :catalina sha256 "3834b8aa037b4e5b84caaa68aa6170f482869e73098af131f0a93b0e4dba3454" => :mojave sha256 "79b923320dfeb847b229ee880cd8aa1c11a77026d6070bb33ebaee1d76b67198" => :high_sierra + sha256 "4145ac4e53df5a059490bfeada7c7503752780ffd68f217902255d44651c209c" => :x86_64_linux end depends_on "go" => :build @@ -27,7 +28,8 @@ def install test do font_name = (MacOS.version >= :catalina) ? "Arial Unicode.ttf" : "Arial.ttf" - system bin/"statik", "-src", "/Library/Fonts/#{font_name}" + font_path = OS.mac? ? "/Library/Fonts/#{font_name}" : "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf" + system bin/"statik", "-src", font_path assert_predicate testpath/"statik/statik.go", :exist? refute_predicate (testpath/"statik/statik.go").size, :zero? end diff --git a/Formula/go.rb b/Formula/go.rb index a41e5d6ffd424..136010bbb13bb 100644 --- a/Formula/go.rb +++ b/Formula/go.rb @@ -18,6 +18,7 @@ class Go < Formula sha256 "935214ab166d8da148af812614545a25778e4ee11c2ea5cfd332bff72ec4046e" => :catalina sha256 "f1ef93181b0c4c97617b74d787ced8e18ceca12ee52d9559a8db0f21eb84fa43" => :mojave sha256 "4b5e79d15f4bb768bc0cefe54a670a525f21257f2532697df76d44c8cc0e8a7a" => :high_sierra + sha256 "194271695ef8571978eacd37f0763008562dd8ecd86efc39b31ddc51cef2884e" => :x86_64_linux end head do @@ -44,12 +45,18 @@ class Go < Formula end def install + # Fixes: Error: Failure while executing: ../bin/ldd ../line-clang.elf: Permission denied + unless OS.mac? + chmod "+x", Dir.glob("src/debug/dwarf/testdata/*.elf") + chmod "+x", Dir.glob("src/debug/elf/testdata/*-exec") + end + (buildpath/"gobootstrap").install resource("gobootstrap") ENV["GOROOT_BOOTSTRAP"] = buildpath/"gobootstrap" cd "src" do ENV["GOROOT_FINAL"] = libexec - ENV["GOOS"] = "darwin" + ENV["GOOS"] = OS.mac? ? "darwin" : "linux" system "./make.bash", "--no-clean" end diff --git a/Formula/go@1.10.rb b/Formula/go@1.10.rb index b051cd46e804b..b8d65624a3136 100644 --- a/Formula/go@1.10.rb +++ b/Formula/go@1.10.rb @@ -10,6 +10,7 @@ class GoAT110 < Formula sha256 "fa6f1fcd01302191009869886cf56208a42224ad86e201ebd98be6346f72f4a3" => :catalina sha256 "b00703a47e9352ee299c81d269c66209edca69605d06b2ce031b9754b8da56e6" => :mojave sha256 "395dcfc97f048bf95efedcf084206d730dba4ba59391075869b6cbae8d4ad0c1" => :high_sierra + sha256 "08fa6cf0d981eae70c386a19c4928fc3cda16d3efa6e111cf6b5a460a06b3ae7" => :x86_64_linux end keg_only :versioned_formula @@ -43,12 +44,18 @@ class GoAT110 < Formula end def install + # Fixes: Error: Failure while executing: ../bin/ldd ../line-clang.elf: Permission denied + unless OS.mac? + chmod "+x", Dir.glob("src/debug/dwarf/testdata/*.elf") + chmod "+x", Dir.glob("src/debug/elf/testdata/*-exec") + end + (buildpath/"gobootstrap").install resource("gobootstrap") ENV["GOROOT_BOOTSTRAP"] = buildpath/"gobootstrap" cd "go/src" do ENV["GOROOT_FINAL"] = libexec - ENV["GOOS"] = "darwin" + ENV["GOOS"] = OS.mac? ? "darwin" : "linux" system "./make.bash", "--no-clean" end diff --git a/Formula/go@1.11.rb b/Formula/go@1.11.rb index aa16339de84ba..6c6b6b424b2dd 100644 --- a/Formula/go@1.11.rb +++ b/Formula/go@1.11.rb @@ -10,6 +10,7 @@ class GoAT111 < Formula sha256 "077ca87532424c95f5072fa0d6cb0aa316fb6c6309ba9ad8d158556ddf264792" => :catalina sha256 "8f9794052cd1e44eedd34c5a28fd7614cb21e1c67d54a8c4b5733115f04978c8" => :mojave sha256 "c42368b27f9f70e02a858a3bbf07f73e41295512191d8b7b524a474b8157e91a" => :high_sierra + sha256 "54304544009d7e38589e94cfde1a301a165e2e39d1839f27dd65c100d720a5ad" => :x86_64_linux end keg_only :versioned_formula @@ -35,12 +36,13 @@ class GoAT111 < Formula end def install + ENV["CGO_ENABLED"] = "1" unless OS.mac? (buildpath/"gobootstrap").install resource("gobootstrap") ENV["GOROOT_BOOTSTRAP"] = buildpath/"gobootstrap" cd "src" do ENV["GOROOT_FINAL"] = libexec - ENV["GOOS"] = "darwin" + ENV["GOOS"] = OS.mac? ? "darwin" : "linux" system "./make.bash", "--no-clean" end diff --git a/Formula/go@1.12.rb b/Formula/go@1.12.rb index 50959b963d8f9..e11101612ddbe 100644 --- a/Formula/go@1.12.rb +++ b/Formula/go@1.12.rb @@ -10,6 +10,7 @@ class GoAT112 < Formula sha256 "44d6c83a39c231cae86af05b3689cb2ec03be389562c1cc5e84a9f68ed09af80" => :catalina sha256 "dc3b90a9ba13c31928c92227957d530656bab53d5ca3a35bfab02038118a964e" => :mojave sha256 "e42c02a42a4d2df97cba11e80729e8439e7476745548bd7ee23d72858c22a3f1" => :high_sierra + sha256 "c7e6efda32a76006aa9caa222311d6926896b6fad320f0e7d33ffc3c1b51e347" => :x86_64_linux end keg_only :versioned_formula @@ -35,12 +36,13 @@ class GoAT112 < Formula end def install + ENV["CGO_ENABLED"] = "1" unless OS.mac? (buildpath/"gobootstrap").install resource("gobootstrap") ENV["GOROOT_BOOTSTRAP"] = buildpath/"gobootstrap" cd "src" do ENV["GOROOT_FINAL"] = libexec - ENV["GOOS"] = "darwin" + ENV["GOOS"] = OS.mac? ? "darwin" : "linux" system "./make.bash", "--no-clean" end diff --git a/Formula/go@1.13.rb b/Formula/go@1.13.rb index 10e503b0862e0..d20cdec9c992a 100644 --- a/Formula/go@1.13.rb +++ b/Formula/go@1.13.rb @@ -9,6 +9,7 @@ class GoAT113 < Formula sha256 "1e2aff4b727a0dec15ecdc2d97c1aa8e77fff21ad07a800917c80371b3812243" => :catalina sha256 "41e5aee4bc93775ee229b79330e80bf14d50825f5f48f4cdb0cfe8bcccc5b5f0" => :mojave sha256 "1f0c88622d5c804013c3e80cdc5fd482f28fcc8df3a7e7f4069d0035e35853c5" => :high_sierra + sha256 "f5339b3f96176829c4de1ef0b2bb78bdb7a6eef924b69d767dde32b4ff379e33" => :x86_64_linux end keg_only :versioned_formula @@ -39,7 +40,7 @@ def install cd "src" do ENV["GOROOT_FINAL"] = libexec - ENV["GOOS"] = "darwin" + ENV["GOOS"] = OS.mac? ? "darwin" : "linux" system "./make.bash", "--no-clean" end diff --git a/Formula/go@1.9.rb b/Formula/go@1.9.rb index 1621aaa99b9ed..81bb951c542e6 100644 --- a/Formula/go@1.9.rb +++ b/Formula/go@1.9.rb @@ -10,6 +10,7 @@ class GoAT19 < Formula sha256 "c34c669ba94287eb0485513ad03416d531f0d4fb58908df4984ed85fd2c41b1e" => :catalina sha256 "358e06f98931f9f9f2238e59c9ec40a4cc8526e518b8828c8b72543f6d40d9b0" => :mojave sha256 "be1bd13af09e6bf2ee698f98d80fbd99ac86858337d90fce6e2e86ecfd67b19f" => :high_sierra + sha256 "455f710d0d7476169aba974c0d097394b6e95b2bd1abeb11d8a47b98f61295d2" => :x86_64_linux end keg_only :versioned_formula @@ -50,12 +51,18 @@ class GoAT19 < Formula end def install + # Fixes: Error: Failure while executing: ../bin/ldd ../line-clang.elf: Permission denied + unless OS.mac? + chmod "+x", Dir.glob("src/debug/dwarf/testdata/*.elf") + chmod "+x", Dir.glob("src/debug/elf/testdata/*-exec") + end + (buildpath/"gobootstrap").install resource("gobootstrap") ENV["GOROOT_BOOTSTRAP"] = buildpath/"gobootstrap" cd "src" do ENV["GOROOT_FINAL"] = libexec - ENV["GOOS"] = "darwin" + ENV["GOOS"] = OS.mac? ? "darwin" : "linux" system "./make.bash", "--no-clean" end diff --git a/Formula/goad.rb b/Formula/goad.rb index 1d3eee00bc557..e404cd9404fc2 100644 --- a/Formula/goad.rb +++ b/Formula/goad.rb @@ -13,10 +13,12 @@ class Goad < Formula sha256 "3a87755d9b4b48b07a7fecd9be72df574d5866fe39d4dc0c60d6a88da40c5081" => :high_sierra sha256 "b10fb1177f1f3548b2a497cb56ce9f10620a06175adec6a1d452b0e136981d1e" => :sierra sha256 "f0c6400909fbe194400717025ad64cba2ccd63b1db9cba5ec7a9195274614b41" => :el_capitan + sha256 "9678004ba4e2fb543e7fd9ce570948130810fc4ad7315fbb443531b2f57afd81" => :x86_64_linux end depends_on "go" => :build depends_on "go-bindata" => :build + depends_on "zip" => :build unless OS.mac? def install ENV["GOPATH"] = buildpath diff --git a/Formula/gobby.rb b/Formula/gobby.rb index 98eeab341393e..10eb0e98e89e8 100644 --- a/Formula/gobby.rb +++ b/Formula/gobby.rb @@ -10,6 +10,7 @@ class Gobby < Formula sha256 "5e2914adc88813352b11d1db5e69d2aa9b4612b7fb4ae05443a18b9426a0f26d" => :catalina sha256 "d55e74b24f3d03968afa85eff7473316e8c0816a137d82e26e24e089b42cc3b4" => :mojave sha256 "76ec450b768f0d27bb032cfb34e337002ee9f45a547a07c01e03b73e03413ad0" => :high_sierra + sha256 "269f0eb42f5996fbbb5a0ca8c5e46c3abc63167f044811951e33e38e589346be" => :x86_64_linux end depends_on "intltool" => :build @@ -35,12 +36,18 @@ class Gobby < Formula def install ENV.cxx11 + + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--with-gtk3" system "make", "install" end test do + return if !OS.mac? && ENV["CI"] + # executable (GUI) system bin/"gobby-0.5", "--version" end diff --git a/Formula/gobject-introspection.rb b/Formula/gobject-introspection.rb index 76766ee1a987e..1a49eb12a8b43 100644 --- a/Formula/gobject-introspection.rb +++ b/Formula/gobject-introspection.rb @@ -11,6 +11,7 @@ class GobjectIntrospection < Formula sha256 "4715d7cb549501fa75101266f6c49fe656666cb071a6e8f111b08cb3b74a2b15" => :catalina sha256 "e6f0eacacdda25019941d42dd600c478f22de8c57a8975b2e26c4a5cfb8f367c" => :mojave sha256 "b54f973af9b413e20a7b6485315da882f73e623c61f3573325a434d47e5b011a" => :high_sierra + sha256 "954285439d31d19397c6ebfdcc55d56007ef178499dec7ddec95b508f69d76d4" => :x86_64_linux end depends_on "bison" => :build diff --git a/Formula/gobuster.rb b/Formula/gobuster.rb index e0b755cac2e1b..f9153c1e8411f 100644 --- a/Formula/gobuster.rb +++ b/Formula/gobuster.rb @@ -11,6 +11,7 @@ class Gobuster < Formula sha256 "d6616ba0e64ee406559414e2c6325f46b0ddc16fc20dde42cad3e3fc7d3df223" => :catalina sha256 "068251847cb8be7e495f093d86468eec1d6459f9a4daa0ba6b7936b49cc14735" => :mojave sha256 "98d0266e847077f64dbff9bac8db93e0d3044425efc4992374be23ddb94d7d3d" => :high_sierra + sha256 "b47139a0e16d1cd721263df7e181aabfec1f8a4dcd325fe751b3442e46bacc62" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gocloc.rb b/Formula/gocloc.rb index cab7bf7069885..008dd0ac934f9 100644 --- a/Formula/gocloc.rb +++ b/Formula/gocloc.rb @@ -10,6 +10,7 @@ class Gocloc < Formula sha256 "a6dc5fa859f29d07e0668c169dfc4d240dbd46a8e79fbc63c31261cdf4f6a79b" => :catalina sha256 "a6dc5fa859f29d07e0668c169dfc4d240dbd46a8e79fbc63c31261cdf4f6a79b" => :mojave sha256 "a6dc5fa859f29d07e0668c169dfc4d240dbd46a8e79fbc63c31261cdf4f6a79b" => :high_sierra + sha256 "e4a95f92cafb4c3b3e73dc3f14694edd56d9def873d3eee328bee5a27eefdf0f" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gocr.rb b/Formula/gocr.rb index 3cddc852e814e..bce682200ed1f 100644 --- a/Formula/gocr.rb +++ b/Formula/gocr.rb @@ -10,6 +10,7 @@ class Gocr < Formula sha256 "d0408f223b941c6d81c0edd843ab5916475a4ea4b94892b548da6403e4c3af2a" => :catalina sha256 "d173d60e8d8f139b4e7e310b84d1bfc56e406eb026c51beba9d4b2facaac3ae1" => :mojave sha256 "2a5cfa5a815706b2ecb11658ad9132bba21de5304e4541118d8d061a5bb7779a" => :high_sierra + sha256 "a272a1edb6c30560b8b4ed0ce44968f1d01c3f66615bce816c9f4ae598f25803" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/gocryptfs.rb b/Formula/gocryptfs.rb index 9108abc92fa27..5406c850f2289 100644 --- a/Formula/gocryptfs.rb +++ b/Formula/gocryptfs.rb @@ -14,7 +14,11 @@ class Gocryptfs < Formula depends_on "go" => :build depends_on "pkg-config" => :build depends_on "openssl@1.1" - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end def install ENV["GOPATH"] = buildpath diff --git a/Formula/godep.rb b/Formula/godep.rb index 2cc87b0d302e2..0a714b03d3d75 100644 --- a/Formula/godep.rb +++ b/Formula/godep.rb @@ -11,6 +11,7 @@ class Godep < Formula sha256 "b75f52e4b6ff4f29c6ee086b14e973595408edcba02027acf47206a6b1cdf748" => :catalina sha256 "65fac648f744fe78ac382e7dda5cdc1774be69d83c77a0c07eb34493cef8fe48" => :mojave sha256 "d8125aec91095023ff641181d442dd10c303b7e0b618c5d1a93c471202ccb087" => :high_sierra + sha256 "576ee104dbcefa71db335c2e094d32f7460ebf5f70b9e27d53cd0e47e171abfd" => :x86_64_linux end depends_on "go" diff --git a/Formula/gofabric8.rb b/Formula/gofabric8.rb index 76256572998d8..243b95685d683 100644 --- a/Formula/gofabric8.rb +++ b/Formula/gofabric8.rb @@ -11,6 +11,7 @@ class Gofabric8 < Formula sha256 "5835f2a6b6dd8e030b75bd7b8d5b28852011c23fb41864d54cb5af8b1a9af8d7" => :high_sierra sha256 "4e5c9251203ad5c0d80959d881551231159ba4782346c5619fa6a521d3dc86c2" => :sierra sha256 "b727813219f939d47303e0ed627d778747ba890456d7f571675e6caf79b92ea1" => :el_capitan + sha256 "e58d1c26f96e7ed1fbb8036c611f596019e5f2ad74dd13a41e022bc52404af52" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/goffice.rb b/Formula/goffice.rb index 0bfff983963d9..8f6a8ed4c64f7 100644 --- a/Formula/goffice.rb +++ b/Formula/goffice.rb @@ -9,6 +9,7 @@ class Goffice < Formula sha256 "983c0ffa880b04fff6e29283a5d02fa089a08c86f0e203abff977e1dae1d9468" => :catalina sha256 "c33d7ef544bec3d218f80d43998e6e5b80583699f9f6066b78c39fd21c87b5f6" => :mojave sha256 "25961ad399e8d8e0bdde62ad3cfbed0ec2926ae39f8eb4facc6f9ad303a1487e" => :high_sierra + sha256 "9a2aa69b9750b749e05b39896f65395bff60e09f976e5ba0c90b31ec212e0054" => :x86_64_linux end head do @@ -34,6 +35,9 @@ class Goffice < Formula uses_from_macos "libxslt" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + args = %W[--disable-dependency-tracking --prefix=#{prefix}] if build.head? system "./autogen.sh", *args @@ -55,12 +59,13 @@ def install return 0; } EOS + libxml2 = OS.mac? ? "#{MacOS.sdk_path}/usr/include/libxml2" : "#{Formula["libxml2"].opt_include}/libxml2" system ENV.cc, "-I#{include}/libgoffice-0.10", "-I#{Formula["glib"].opt_include}/glib-2.0", "-I#{Formula["glib"].opt_lib}/glib-2.0/include", "-I#{Formula["harfbuzz"].opt_include}/harfbuzz", "-I#{Formula["libgsf"].opt_include}/libgsf-1", - "-I#{MacOS.sdk_path}/usr/include/libxml2", + "-I#{libxml2}", "-I#{Formula["gtk+3"].opt_include}/gtk-3.0", "-I#{Formula["pango"].opt_include}/pango-1.0", "-I#{Formula["cairo"].opt_include}/cairo", diff --git a/Formula/golang-migrate.rb b/Formula/golang-migrate.rb index 9697415edce03..b82333b962360 100644 --- a/Formula/golang-migrate.rb +++ b/Formula/golang-migrate.rb @@ -9,6 +9,7 @@ class GolangMigrate < Formula sha256 "53c9f1c0dfdf5dabb05feaed6b379e4d9c57dbbd8ead10392f125edd8b17c72b" => :catalina sha256 "790bd0091cfd117a99f6e8dd5e9991d74891c1915ac183dccc5a8dd9a4de7896" => :mojave sha256 "0b86ead888e2b925dc81ebc21ef871fd3bfe038fb2dd3f4f8c34a62d4c2d3d0f" => :high_sierra + sha256 "61c8cb023af75ff74b63a5e6e1d5388b88fd6b1133e7ce40510f86d699f422db" => :x86_64_linux end depends_on "go" => :build @@ -20,7 +21,7 @@ def install # Build and install CLI as "migrate" cd "src/github.com/golang-migrate/migrate" do system "make", "build-cli", "VERSION=v#{version}" - bin.install "cli/build/migrate.darwin-amd64" => "migrate" + bin.install "cli/build/migrate.#{OS.mac? ? "darwin" : "linux"}-amd64" => "migrate" prefix.install_metafiles end end diff --git a/Formula/gollum.rb b/Formula/gollum.rb index 32d4b9e0083f4..5c4a6ea31041e 100644 --- a/Formula/gollum.rb +++ b/Formula/gollum.rb @@ -11,6 +11,7 @@ class Gollum < Formula sha256 "d2d022b779e4290e98d0783232b00c79bf46fc08d9ad3bea0dd352071e2995f3" => :mojave sha256 "afaf112d706150eeb5f8e5152a7b88ef18fc944fdd01dc8a46357a3c8ce13f8b" => :high_sierra sha256 "9e82aadccabe2a1224658cc824536e061d617355bb7f7eda5a889e117c3bb472" => :sierra + sha256 "9006ed179fe9c6f20209b923d1b4cc926e19a07725dd86f3f3c79b75d6fa5fb4" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gom.rb b/Formula/gom.rb index 5154464d9be28..0c3be35a69a50 100644 --- a/Formula/gom.rb +++ b/Formula/gom.rb @@ -6,10 +6,10 @@ class Gom < Formula revision 1 bottle do - cellar :any sha256 "2d41e90512e737bfd112ba64278fda9c0dbaf1ab7dbd00732ed6ebb644da31e0" => :catalina sha256 "619f71c318e02d8c33e4d827aedfaad09d6f349d92408bb9a40097dba99eb65e" => :mojave sha256 "7566dd0ded406861960ebd556ce0d7f7e6e48eac4e72ab88aa9934d554ad638b" => :high_sierra + sha256 "c5455a6035a88623ef30ed945616512b55da83e3db0f30b169e8155ba0c37792" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -53,8 +53,8 @@ def install -lglib-2.0 -lgobject-2.0 -lgom-1.0 - -lintl ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gomplate.rb b/Formula/gomplate.rb index 8760f16447cf3..3bb5a1aed9e38 100644 --- a/Formula/gomplate.rb +++ b/Formula/gomplate.rb @@ -10,6 +10,7 @@ class Gomplate < Formula sha256 "88cf5acdba5d5558ce1432c00c63969a2832a47459eac91d8854ba6655479892" => :catalina sha256 "91f6db91eb3d9a33801b48612c4b5b8b3525eb60373081bea7bef213553a807c" => :mojave sha256 "b1bd2ca2cba7b66040780f5284b280dc5b02f589ef7f238afc1777c9e547a3a2" => :high_sierra + sha256 "838b0d007f850627fc36f4b8833d863edf805a70ba226a410d03593237e24535" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/goocanvas.rb b/Formula/goocanvas.rb index 922194f0805e6..63f8655c1de4a 100644 --- a/Formula/goocanvas.rb +++ b/Formula/goocanvas.rb @@ -10,6 +10,7 @@ class Goocanvas < Formula sha256 "b9d36364339793b428077bbc7735981f8cd33e681971653806dc574236382778" => :mojave sha256 "6822fe0a452809ce94bc1fd70fb32b024ad52702a56878db381b7dad2e05aa28" => :high_sierra sha256 "44b1bd9f058cd4fe112cd1022a0ad2daa93c7f849257ae57bc6d10f9c33e57de" => :sierra + sha256 "128ca78ced485aab93ad7b9e996c9b7f9838ea3b7d2d88d92b027b116137a29c" => :x86_64_linux end depends_on "gobject-introspection" => :build diff --git a/Formula/goofys.rb b/Formula/goofys.rb index c04418a88f666..27d66d9c292f0 100644 --- a/Formula/goofys.rb +++ b/Formula/goofys.rb @@ -11,10 +11,15 @@ class Goofys < Formula sha256 "4b7ebc820dd0ee1cb37195baf2c6b7774c22e4dac29f7ec049a025400c4b0f35" => :catalina sha256 "fc40b7665dc7f0f7c1c990995027913bdac95d12255e8ed25183e42eee14c966" => :mojave sha256 "0ca4cbb28a7dc528cc58f0d64ea4bb64d732d83448f4db6b3dfa9d1ade6ac100" => :high_sierra + sha256 "4c2632f197a131139ce7a35e75853089b87cf3dfa9c7329fb7aa28ecf7c92ed4" => :x86_64_linux end depends_on "go" => :build - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end def install contents = Dir["*"] diff --git a/Formula/google-authenticator-libpam.rb b/Formula/google-authenticator-libpam.rb index ecbb2e086b553..0d3e430d9c54f 100644 --- a/Formula/google-authenticator-libpam.rb +++ b/Formula/google-authenticator-libpam.rb @@ -9,12 +9,14 @@ class GoogleAuthenticatorLibpam < Formula sha256 "4ed85644559250923d4b21f5b99643cad08eb8bbb63afc3827d7ac225b4581d7" => :catalina sha256 "d62c1f21ec88406788b314bd7a06c0e37e7ab9dad4237f6832441f235723d3cb" => :mojave sha256 "33fa28d290cb0068a67c288d4889967180de64aa895f0ac1a3aedcc38d6a7d7a" => :high_sierra + sha256 "3781720c9ad0b3ffebd54ce46f5cc6fb9c59d25ad555a164aac55d41c4b36006" => :x86_64_linux end depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build depends_on "qrencode" + depends_on "linux-pam" unless OS.mac? def install system "./bootstrap.sh" diff --git a/Formula/google-benchmark.rb b/Formula/google-benchmark.rb index ac495e6b4378d..08cbb37eb5edb 100644 --- a/Formula/google-benchmark.rb +++ b/Formula/google-benchmark.rb @@ -10,6 +10,7 @@ class GoogleBenchmark < Formula sha256 "d81d77c351b590b574869d88e22203aa3728410bc1d775f10bec672bf947e0af" => :catalina sha256 "ec80102ba3d26ce496a543a5270b4958c25cac3fc72c23f1daceff49bfafc467" => :mojave sha256 "407dfc8c6995f34fc9b6fd7da02747d538326462402e744e2318a2db5e3e86ed" => :high_sierra + sha256 "624bd758002c1a758fce0c2ac07298b237b1bffef348965cd7fa38b608c8da23" => :x86_64_linux end depends_on "cmake" => :build @@ -31,7 +32,11 @@ def install BENCHMARK(BM_StringCreation); BENCHMARK_MAIN(); EOS - flags = ["-stdlib=libc++", "-I#{include}", "-L#{lib}", "-lbenchmark"] + ENV.cflags.to_s.split + flags = [*("-stdlib=libc++" if OS.mac?), + "-I#{include}", + "-L#{lib}", + "-lbenchmark", + *("-pthread" unless OS.mac?)] + ENV.cflags.to_s.split system ENV.cxx, "-o", "test", "test.cpp", *flags system "./test" end diff --git a/Formula/google-java-format.rb b/Formula/google-java-format.rb index c4004cdca03b8..9392123641025 100644 --- a/Formula/google-java-format.rb +++ b/Formula/google-java-format.rb @@ -10,6 +10,7 @@ class GoogleJavaFormat < Formula sha256 "bb1fcc168016355d6f847b858018f6c5b188f41e9461aa956a1541e609406d93" => :mojave sha256 "c8f23d50f6512d56d4402cb0b2325d7e01563625104579f4ea52a1f47e7f2802" => :high_sierra sha256 "fdd74a17bb5743a854e81d1d163f020f12d469d278bcddd1e8527c12a3752bad" => :sierra + sha256 "5ec7f13b43f2f3d8445bbc9d8b005a0ea7d3a0bc1025b12799083f5aeac091fa" => :x86_64_linux end depends_on "maven" => :build diff --git a/Formula/google-sparsehash.rb b/Formula/google-sparsehash.rb index 63c01c01a0197..daa32644a5182 100644 --- a/Formula/google-sparsehash.rb +++ b/Formula/google-sparsehash.rb @@ -3,6 +3,7 @@ class GoogleSparsehash < Formula homepage "https://github.com/sparsehash/sparsehash" url "https://github.com/sparsehash/sparsehash/archive/sparsehash-2.0.3.tar.gz" sha256 "05e986a5c7327796dad742182b2d10805a8d4f511ad090da0490f146c1ff7a8c" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -13,6 +14,7 @@ class GoogleSparsehash < Formula sha256 "8655e0c3b4f4c69e46d8823eef0d8ae2b1397cd2aa01bda3340eb3a84d647b89" => :el_capitan sha256 "b8e55b96aa3016ed2ab5a8d53a4bb39b44773885355ec75e80c9d9ef57c3e8b1" => :yosemite sha256 "570c4d250a4fe18d99f11167653a501a1d8a82ff74d2413336a85bc7fa8cbb81" => :mavericks + sha256 "7b59ab353073ab88845a20e4f326bc92a560fdc3c0b26c9de058c30ed33712a0" => :x86_64_linux end def install diff --git a/Formula/googler.rb b/Formula/googler.rb index acc8831920616..91ad4bcc099f3 100644 --- a/Formula/googler.rb +++ b/Formula/googler.rb @@ -12,6 +12,7 @@ class Googler < Formula sha256 "f61c5b26c1384e2f7a8e41245b2d9e6c0e006c8dc5f507c2153410ee4a72f7a3" => :catalina sha256 "f61c5b26c1384e2f7a8e41245b2d9e6c0e006c8dc5f507c2153410ee4a72f7a3" => :mojave sha256 "f61c5b26c1384e2f7a8e41245b2d9e6c0e006c8dc5f507c2153410ee4a72f7a3" => :high_sierra + sha256 "ce50798b294c6e27de7e7996c1c973fe4b3efc7f74cae0afa6ad1a3664539b24" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/goolabs.rb b/Formula/goolabs.rb index 0f9aefbfe2bf2..1df5b9b63493f 100644 --- a/Formula/goolabs.rb +++ b/Formula/goolabs.rb @@ -5,13 +5,14 @@ class Goolabs < Formula homepage "https://pypi.python.org/pypi/goolabs" url "https://files.pythonhosted.org/packages/ce/86/2d3b5bd85311ee3a7ae7a661b3619095431503cd0cae03048c646b700cad/goolabs-0.4.0.tar.gz" sha256 "4f768a5b98960c507f5ba4e1ca14d45e3139388669148a2750d415c312281527" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "c784f76b536c01324365eae262d9fb1b6feff9eeb39173f5ea0269eae3b3d73c" => :catalina sha256 "1b1fe110089fe56dbb9db0d11eb28dbe57629462c8274eb33a2fe7f9198b482d" => :mojave sha256 "1705b23fe27ee59062383dc353dbf34770d1aef2378a3740e77b02c71724f001" => :high_sierra + sha256 "1885cbe04d2751d2e20df30154127768ce5682c39033e2859552e66c533120aa" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/goose.rb b/Formula/goose.rb index 51f8585a071cd..02a523bd422af 100644 --- a/Formula/goose.rb +++ b/Formula/goose.rb @@ -9,6 +9,7 @@ class Goose < Formula sha256 "c61983ec470b8ca810e5f4d084ed1c03518281290e0e0f873efd0a703fdd3657" => :catalina sha256 "121541b4371c54909eb3d0e3c20c99d60166ce4eab54521e6e8e2a42f0c4e71e" => :mojave sha256 "0e8c6ed483b244eac2370dad2d7fa59a6a7f1075305577553aac66463c7b0062" => :high_sierra + sha256 "c8de282b2486ea10080e3a21c15c909facd38a77069f907e835a1721d06ac8bb" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/goreleaser.rb b/Formula/goreleaser.rb index 29a1e9fcfa7ec..ce9e00ddc43d5 100644 --- a/Formula/goreleaser.rb +++ b/Formula/goreleaser.rb @@ -10,6 +10,7 @@ class Goreleaser < Formula sha256 "2e453855ddf3b987db54566d87dbd3ea6b2972c28a838179bff6002b06722ae7" => :catalina sha256 "de95155dbc61c4a28c9004eb7354be935a1bc8e19c9097f4aeb93c9f4144d207" => :mojave sha256 "8f198df37a0ff0cd007f19482b9868c5876464b37e98025c1a44ca2c486e7f77" => :high_sierra + sha256 "64a9d9dd7f272649d4b92b10e336f3d64450faea6eb974f5322c4c73ae4ec5df" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/goreman.rb b/Formula/goreman.rb index b7f2e3e81ca29..dacd15622631e 100644 --- a/Formula/goreman.rb +++ b/Formula/goreman.rb @@ -10,6 +10,7 @@ class Goreman < Formula sha256 "8a7091a9c750d499f4b7857d606f3ce762bd4901b715ce1e4c0a45196487615f" => :catalina sha256 "1d38d14fa4f2a7e7f77f7d2609bf1b289fcea8622f23829f4e35da2a499a3d35" => :mojave sha256 "44a066817f8aedad724ff2e2bdf9be53fbacaf1f8939462d6e5dc89bd7f3fab0" => :high_sierra + sha256 "f87106591f3d8c8f31150e2a6b34aef22555da3ec07d15f5a0e1025e9337bc50" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gotags.rb b/Formula/gotags.rb index 270cdd61035e1..ee42a06777f8f 100644 --- a/Formula/gotags.rb +++ b/Formula/gotags.rb @@ -11,6 +11,7 @@ class Gotags < Formula sha256 "c1b5430e2c3544fc021bc9bbc35c33a1f2c4482a30dbbc8d4977c1f0ee5638a1" => :catalina sha256 "4413278c3b7f4d8783b9009a986dc91a2a5d3749430105a4297f2cec960a5344" => :mojave sha256 "095f81ef736207a6806af1613a7ab5a0ba3837b4f94f85260aa1bceba3535fea" => :high_sierra + sha256 "49656bbbedc59f596f7d2db582337d646a31cd4b33f09641d7c9752a82b8edef" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gotop.rb b/Formula/gotop.rb index 51326cca5f02c..041223609a4c6 100644 --- a/Formula/gotop.rb +++ b/Formula/gotop.rb @@ -9,6 +9,7 @@ class Gotop < Formula sha256 "5a61acb05457b28a32d342fc75376785873ec8f9fd73209f079550051851ea54" => :catalina sha256 "c758b1001a0de9af2572871c05cd3ec78341e31e2e870a9a147cea493f85baa6" => :mojave sha256 "194a6ee2f9ab9922b23a91d8868ac7802f611f238d56d10c79da4c9263a9afa4" => :high_sierra + sha256 "729149385d029d17a0a713d28c20bb9f4426e24ff3bd63d98379822704bbca1b" => :x86_64_linux end depends_on "go" => :build @@ -23,6 +24,7 @@ def install assert_match version.to_s, shell_output("#{bin}/gotop --version").chomp system bin/"gotop", "--write-config" - assert_predicate testpath/"Library/Application Support/gotop/gotop.conf", :exist? + path = OS.mac? ? "Library/Application Support/gotop": ".config/gotop" + assert_predicate testpath/"#{path}/gotop.conf", :exist? end end diff --git a/Formula/govc.rb b/Formula/govc.rb index a4f4570a1c7ef..42bdeae430a9b 100644 --- a/Formula/govc.rb +++ b/Formula/govc.rb @@ -9,6 +9,7 @@ class Govc < Formula sha256 "0619f67c0287b822ed10ed641519084f814b979841f5c5b2803fe4f179574d22" => :catalina sha256 "bb5b9c0c3ac7b74db7783e0e4ce409f49d6d484df3624fb6bfa874860bbdc01b" => :mojave sha256 "ba609f775f5bb406024cd3f0c73419ea2b73601116c221738a3f125116dadb1f" => :high_sierra + sha256 "346461b3ca422fe526c72bcd7a2238cdbffc9af238fcabf87e5714a52db6bd99" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/govendor.rb b/Formula/govendor.rb index e70e2a9b786b2..8d62554c76fb4 100644 --- a/Formula/govendor.rb +++ b/Formula/govendor.rb @@ -12,13 +12,14 @@ class Govendor < Formula sha256 "38df7324a3a5292636a57c8c17cbdda94a0d529fa42f2e446f372a49b5697f26" => :high_sierra sha256 "5708cee7e053271235d433cc1f7450f10540129810016095db622652621dc528" => :sierra sha256 "52e2dd5debbd16a4da952ce16dd37d2697e16ba8509ff1e9a9551e7303ec6949" => :el_capitan + sha256 "c12b5a5d9cd1c2feeb18347040d44db6dbc51d954ca9982754fd53645907e400" => :x86_64_linux end depends_on "go" def install ENV["GOPATH"] = buildpath - ENV["GOOS"] = "darwin" + ENV["GOOS"] = "darwin" if OS.mac? ENV["GOARCH"] = "amd64" (buildpath/"src/github.com/kardianos/").mkpath diff --git a/Formula/gowsdl.rb b/Formula/gowsdl.rb index f3499e81179d8..cb6acc26093cc 100644 --- a/Formula/gowsdl.rb +++ b/Formula/gowsdl.rb @@ -12,6 +12,7 @@ class Gowsdl < Formula sha256 "5fd404e38c1b998c6984f06c4ac9cafe14003d532966b06c089fa6e769d11d67" => :catalina sha256 "b31f125e412680a97253faa4faf56b83f56fc3dc0ceec2eaca6bfdac5d2eb41a" => :mojave sha256 "4d2525b76e187e99b69b11237bd0bb5125559815b4041b177ced99eed0b87a8f" => :high_sierra + sha256 "6ab3132d3b9488265bb6650ce778d98b4621077fc16bdbc93a18ffea0557abba" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gox.rb b/Formula/gox.rb index ae04e3a3568f6..8581b828b4a63 100644 --- a/Formula/gox.rb +++ b/Formula/gox.rb @@ -11,6 +11,7 @@ class Gox < Formula sha256 "008ec56acef96c3ad3117bcde87f1998fcf4ef9c93f82ae363ed6ac39914a95d" => :mojave sha256 "c2d77e6fadb6c7585a5df89eb91aaf1f41f6b88829e1a647efb4ebbc70277b3b" => :high_sierra sha256 "1d48879bdbbd84d2406aeaf5f052c51ed2f0b8f9484508ad6085bf537be6f5f6" => :sierra + sha256 "bda9de3c8d267ae18fbcca0942784c4a4401b130b0bd83fdee7c4df8f199b50c" => :x86_64_linux end depends_on "go" diff --git a/Formula/gpa.rb b/Formula/gpa.rb index db4722760de44..8f09b476019b1 100644 --- a/Formula/gpa.rb +++ b/Formula/gpa.rb @@ -11,6 +11,7 @@ class Gpa < Formula sha256 "183d889ae94650931d7ed470ec643a9e5b02843e037a97de2669f2d48076e996" => :mojave sha256 "dc9d49486a627330931c0d2caeb6af4629e3871bdbff840ae33e5afb97c087ba" => :high_sierra sha256 "73e3e3c27b72b36ed733b01435dd4eb9538f036cf1a817d48a171e58b70de395" => :sierra + sha256 "5fc081444bf7c54311bf70c976c3a32d6bc0372cdf6f5251dc97169e8124edf8" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/gpatch.rb b/Formula/gpatch.rb index 63576cb98465e..387620f9cb0e9 100644 --- a/Formula/gpatch.rb +++ b/Formula/gpatch.rb @@ -12,6 +12,7 @@ class Gpatch < Formula sha256 "418d7ea9c3948a5d70bdca202bd56e5554eef7f105fc25449f041331db7f4f96" => :high_sierra sha256 "81e0fb63928b01d60b9d7a1f0bdbf262679888556bd055fd02f4f57a70cb87ad" => :sierra sha256 "bd67af8b9c24fa785a2da2a1d3475305593dbc183331aed657313e4066de3259" => :el_capitan + sha256 "70df1fb356ca7ccccd277110fcf467ea9fd0dc7337c93ad8ecd39848b081f95c" => :x86_64_linux end def install diff --git a/Formula/gperf.rb b/Formula/gperf.rb index df4c09210c39e..91ea1b4b23842 100644 --- a/Formula/gperf.rb +++ b/Formula/gperf.rb @@ -13,6 +13,7 @@ class Gperf < Formula sha256 "3cbaa18692ac53ce98a754d46e07e89d6dddca4bef3bbb312e762abf5a30093d" => :sierra sha256 "27f661ef9546ff113279654e92c08bb8d8ab837f7dc8b308c1a2beeafdcebc76" => :el_capitan sha256 "263440c302dddec69c2140e8df2e4c00a76b76137243e712e8e8756140e0eaf5" => :yosemite + sha256 "901587d856ef1e6c4d58ce9259eb9a3f85bfa29635b6a3d0fa3c68ad8e8a2b1c" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/gperftools.rb b/Formula/gperftools.rb index 21feb981eb675..acb06c903d9dc 100644 --- a/Formula/gperftools.rb +++ b/Formula/gperftools.rb @@ -4,6 +4,17 @@ class Gperftools < Formula url "https://github.com/gperftools/gperftools/releases/download/gperftools-2.7/gperftools-2.7.tar.gz" sha256 "1ee8c8699a0eff6b6a203e59b43330536b22bbcbe6448f54c7091e5efb0763c9" + unless OS.mac? + # libunwind is strongly recommended for Linux x86_64 + # https://github.com/gperftools/gperftools/blob/master/INSTALL + depends_on "xz" + + resource "libunwind" do + url "https://download.savannah.gnu.org/releases/libunwind/libunwind-1.2.1.tar.gz" + sha256 "3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb" + end + end + bottle do cellar :any sha256 "5a3c26d487216682867033e5a54f098978ff376b0ec4b5a2cdfc13ce10243c5b" => :catalina @@ -11,6 +22,7 @@ class Gperftools < Formula sha256 "cd47308eb2e44e527b749b392bebfa17613afacd202285e95954fa00590f44d7" => :high_sierra sha256 "214a23363df0fe8d64260af6e86a891d3fb01452dbd2522f6c9451b21ab6e451" => :sierra sha256 "a1f10be5627404a571fa448e7f3f15f522348f89f642e097ba04cd0c584d2b3b" => :el_capitan + sha256 "497563efccf2f3ac79873d70058f8558c2d7eeb5b8af0cf670df9089b1c971cc" => :x86_64_linux end head do @@ -25,11 +37,30 @@ def install # Fix "error: unknown type name 'mach_port_t'" ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra - ENV.append_to_cflags "-D_XOPEN_SOURCE" + if OS.mac? + ENV.append_to_cflags "-D_XOPEN_SOURCE" + else + resource("libunwind").stage do + system "./configure", + "--prefix=#{libexec}/libunwind", + "--disable-debug", + "--disable-dependency-tracking" + system "make", "install" + end + + ENV.append_to_cflags "-I#{libexec}/libunwind/include" + ENV["LDFLAGS"] = "-L#{libexec}/libunwind/lib" + end system "autoreconf", "-fiv" if build.head? - system "./configure", "--disable-dependency-tracking", - "--prefix=#{prefix}" + if OS.mac? + system "./configure", "--disable-dependency-tracking", + "--prefix=#{prefix}" + else + system "./configure", "--disable-dependency-tracking", + "--prefix=#{prefix}", + "--enable-libunwind" + end system "make" system "make", "install" end diff --git a/Formula/gpgme.rb b/Formula/gpgme.rb index f8967915d56f3..227f8de94fa3e 100644 --- a/Formula/gpgme.rb +++ b/Formula/gpgme.rb @@ -3,13 +3,14 @@ class Gpgme < Formula homepage "https://www.gnupg.org/related_software/gpgme/" url "https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.13.1.tar.bz2" sha256 "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any sha256 "85e3bca3de90a091853a056a40fc22778d3a75abb4297064edae1fc07eaefdee" => :catalina sha256 "b49b55062ab1ba7a6994ac8506aeec65ba5acd512fabfa696148dd7b08acb1d9" => :mojave sha256 "c4bc2011b6afe87a0f3d76c43c50c117c1640eaa848c7a4f7be0f92e261017a7" => :high_sierra + sha256 "28fc72e730fb3e23b6feb79470e21a1564db4ed45aa21de90394fa0a8ec15717" => :x86_64_linux end depends_on "python@3.8" => [:build, :test] diff --git a/Formula/gphoto2.rb b/Formula/gphoto2.rb index 996570fdd2002..bf789430fafb5 100644 --- a/Formula/gphoto2.rb +++ b/Formula/gphoto2.rb @@ -10,6 +10,7 @@ class Gphoto2 < Formula sha256 "da5cc508f296a7830b969ac4689ed9decb2242f1f2ce847bbffa76bc4ee535db" => :mojave sha256 "5d8185b94ff870dbea0947367b66b839a48523be64eef5b351e67d94fb3d3587" => :high_sierra sha256 "058a04c33c80cfaad20f5bf35f1afee9624c390cf163e96df60f6c9c0c06f7e3" => :sierra + sha256 "59637dab8de37a902c3eacaddd4130b94dd3b468472cdad0e3bc7db166010e73" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/gplcver.rb b/Formula/gplcver.rb index 3755411a594d0..1f85fc3bb5765 100644 --- a/Formula/gplcver.rb +++ b/Formula/gplcver.rb @@ -13,6 +13,7 @@ class Gplcver < Formula sha256 "a094d355a75148ed611e9668841a33810a1a1226bc6651b8d0c5e4868867e7fd" => :el_capitan sha256 "fc4f5fc0f1bb13139740ae6f2966bd4e3adb57c7a9803b84f946d95fcb40dd2a" => :yosemite sha256 "0fc13b457839ee25fc9d0b35338ada6af67d07c8e3fb4ea1ac6f7d454f13475c" => :mavericks + sha256 "ad06c2e786a951441517368741d1b785ebb4fcfc9444aee9d6dd626c3d797ca5" => :x86_64_linux end def install diff --git a/Formula/gpm.rb b/Formula/gpm.rb index e793ce06a12e0..d96f363106cf6 100644 --- a/Formula/gpm.rb +++ b/Formula/gpm.rb @@ -14,6 +14,7 @@ class Gpm < Formula sha256 "ba26a6b34e92b4333d636ae3d9e54d726f6bd3bbabdabbfbdd9c3fec569e10fe" => :el_capitan sha256 "0ed200c92c086eebf306065403c6a18db6e55e6d2764904cbd53f442f3043179" => :yosemite sha256 "87cf43901daa271a5d27fbea5e6f103c15e287318152f02f0ef14bd77d51cb63" => :mavericks + sha256 "5b6a05fae07ddd0d354188079121f2320db1528cd86007e6a57a11f5a083a1ee" => :x86_64_linux end depends_on "go" diff --git a/Formula/gpp.rb b/Formula/gpp.rb index e6e06014042d8..966e3b2e2fb09 100644 --- a/Formula/gpp.rb +++ b/Formula/gpp.rb @@ -9,6 +9,7 @@ class Gpp < Formula sha256 "7b18d4755835ab3cad89e5d90b459475dd499695d461a6c8ac4df35f07a11b1b" => :catalina sha256 "d83bbb08210bd763f300a44c9cae8cf8bad7070fcd0e8064e2c81f6c385937b8" => :mojave sha256 "c45c620602411620fa60c1b780a0a9b6172606f9f03c9e7d18e31e9c1276b172" => :high_sierra + sha256 "e11d64d9facd5bbe0db2ad12af8b0e54dcebe0e0ecb3a9f6a4827f76f26853a5" => :x86_64_linux end def install diff --git a/Formula/gpredict.rb b/Formula/gpredict.rb index 869aa4ce3cdd5..e7015678e9096 100644 --- a/Formula/gpredict.rb +++ b/Formula/gpredict.rb @@ -10,6 +10,7 @@ class Gpredict < Formula sha256 "952941a2ecdb5f75805888dfd020acce48c4f1b29a9c2e3ec8742d35fcd9c829" => :mojave sha256 "189249444c490bc7984506a3d041de1d057fff671ff774871f549f6b32efa042" => :high_sierra sha256 "9a0a4b0e63b3b1f84830f508d60ee3fc5b5fd0b9a5731241873168baa88209cf" => :sierra + sha256 "b9a416e14c31f933546523efe91db3655f899af4478e3d5f7af27960627b15cb" => :x86_64_linux end depends_on "intltool" => :build @@ -24,12 +25,17 @@ class Gpredict < Formula uses_from_macos "curl" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" end test do + return if !OS.mac? && ENV["CI"] + assert_match "real-time", shell_output("#{bin}/gpredict -h") end end diff --git a/Formula/gprof2dot.rb b/Formula/gprof2dot.rb index 1bbc18a41740a..c1b3f0ded25c8 100644 --- a/Formula/gprof2dot.rb +++ b/Formula/gprof2dot.rb @@ -5,7 +5,7 @@ class Gprof2dot < Formula homepage "https://github.com/jrfonseca/gprof2dot" url "https://files.pythonhosted.org/packages/fd/77/3158821acc45cc26d5815d4250275d03c254572ff53c0388af8df168ce78/gprof2dot-2019.11.30.tar.gz" sha256 "b43fe04ebb3dfe181a612bbfc69e90555b8957022ad6a466f0308ed9c7f22e99" - revision 1 + revision OS.mac? ? 2 : 3 head "https://github.com/jrfonseca/gprof2dot.git" bottle do @@ -13,10 +13,12 @@ class Gprof2dot < Formula sha256 "974b8737cdc5d07b94c0292b27e015085ab8475757ea95b6cb42067fcafd5418" => :catalina sha256 "c7ff44d15b136ccc9618d0f1e2363a75983bc6587924826e00fb283099edf235" => :mojave sha256 "5626ffada5afc1e44178f1da5a4e041d733f6abe684e666de9679a791247d224" => :high_sierra + sha256 "c35ecf522c1c7d33980e2d1ca43f3b88b7635eafb506e308f7dd8ddea9e86830" => :x86_64_linux end depends_on "graphviz" depends_on "python@3.8" + depends_on "linuxbrew/xorg/libx11" unless OS.mac? def install virtualenv_install_with_resources diff --git a/Formula/gpsbabel.rb b/Formula/gpsbabel.rb index ac44597039b77..3755f6c9a1e50 100644 --- a/Formula/gpsbabel.rb +++ b/Formula/gpsbabel.rb @@ -5,6 +5,7 @@ class Gpsbabel < Formula sha256 "ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090" bottle do + cellar :any_skip_relocation sha256 "685947e84880f27a16a442c10456990f9ede1efa8adf723fa217ba7ac5123ff7" => :catalina sha256 "0d5fa17f760e4ff0ebf88bf4b461c1fba6498278edd57ab77caee7576f5c4609" => :mojave sha256 "e147b5217a57fdf32a8073f53718e6423f227e967f9d495cb3a0bc38b5e2ad3a" => :high_sierra diff --git a/Formula/gpsd.rb b/Formula/gpsd.rb index f41c6ed99335b..a7ef7ac7012f6 100644 --- a/Formula/gpsd.rb +++ b/Formula/gpsd.rb @@ -10,6 +10,7 @@ class Gpsd < Formula sha256 "e73790ec49d1c4f079e0584596d2126447422c3f569281eb092afc77ece1bc3a" => :catalina sha256 "cf9997d1456a9ec3fa49fee4cbc189af1a60cbeb0afb1abfb59c75ede967864c" => :mojave sha256 "0e4110bedb2dd77d37e116fc32f1c45775f387df1a3eb21fc870f0a86ce04262" => :high_sierra + sha256 "6e5339ef744fb26030bc28d75dfd72112ec0b5f6ceb0ea0234a7b6a31660a06c" => :x86_64_linux end depends_on "scons" => :build diff --git a/Formula/gpsim.rb b/Formula/gpsim.rb index 339a8dbb5280b..036f8b6b3dce5 100644 --- a/Formula/gpsim.rb +++ b/Formula/gpsim.rb @@ -11,6 +11,7 @@ class Gpsim < Formula sha256 "00c585480ada4e552a32ee3f0e11bc68142ce4f6671eeb14badc51007d07be9f" => :mojave sha256 "612ce9c2f03a5c6464aee9b9bdcd6884e434e457f515bbbc2adceb8417f1c6d1" => :high_sierra sha256 "5a366b0dccfe1ff92aaed6d29f9bd5ca66806471b17e8941206e985f6bd8817a" => :sierra + sha256 "9974da000b4b1951f9a4516c178250fa13468eeda2f9825482edf2a71b25fda8" => :x86_64_linux end depends_on "gputils" => :build diff --git a/Formula/gptsync.rb b/Formula/gptsync.rb index 8a057bcf0ada8..e6c22b0573822 100644 --- a/Formula/gptsync.rb +++ b/Formula/gptsync.rb @@ -13,6 +13,7 @@ class Gptsync < Formula sha256 "d355de7bea36e310d22ed1109a34574ab93859bfe9e44b9493ebe75cfe429c33" => :el_capitan sha256 "34756250a7bbd8470dd98401c86c65d9886cfac802adb2371bf0a23fa9351f7f" => :yosemite sha256 "77233898efcd0dee5ec73bf8a11294bd5f6c64f5f7d34136c792d1e96ef13d61" => :mavericks + sha256 "7d7a463576f3fc3f18278aedf5aeae3358a1924f439899d32279ed8bdb0e6e31" => :x86_64_linux end def install diff --git a/Formula/gputils.rb b/Formula/gputils.rb index 563733a507861..c4d664a44f678 100644 --- a/Formula/gputils.rb +++ b/Formula/gputils.rb @@ -11,6 +11,7 @@ class Gputils < Formula sha256 "aba5cb544582e26bdb212f9782f911b0e9d36c5049d0aed3928c48ae9b74a6e9" => :sierra sha256 "ad3a6688ca0dac1da0a10db36d9119d9bedcd8d0f389920a45832cc0676c67a3" => :el_capitan sha256 "dd69717c349e405ed04eebc07fc86dcc09d3763f892488514528b328a725a3f9" => :yosemite + sha256 "a2fcb94b0bf77013278493e47b32c59c4b8279a9452def369ef1c03278ecef63" => :x86_64_linux end def install diff --git a/Formula/gpx.rb b/Formula/gpx.rb index 4b89e065fb303..8e464af453680 100644 --- a/Formula/gpx.rb +++ b/Formula/gpx.rb @@ -14,6 +14,7 @@ class Gpx < Formula sha256 "29621a041a78876e963bdd922c6ea5203f102dbbcd87038d3ade22eca6bafb29" => :el_capitan sha256 "451eab6ecaf8a42858ae0d71cfa141bc14fd3d0608285bc1a677422fcc8a662e" => :yosemite sha256 "d1fdd06431d4efa1043c364c34d1e2f1fd0d904aa58047829ec0beda4aa47340" => :mavericks + sha256 "a33f6b008b7e2f3751f367836e005dd88f01d6186d4b75e8f103990c66d209db" => :x86_64_linux end def install diff --git a/Formula/gqlplus.rb b/Formula/gqlplus.rb index ca9e066d0d8d8..30b1dfa8c34c5 100644 --- a/Formula/gqlplus.rb +++ b/Formula/gqlplus.rb @@ -11,6 +11,7 @@ class Gqlplus < Formula sha256 "014190ba5c0c8e5bc88b0d434f6a05d4c26ab0b6e40b96d6fa00f37f02ee078a" => :mojave sha256 "324544d5383507812e0cc14a6e085697661944588ee1fe56477c67e2bc1c009d" => :high_sierra sha256 "9ad645ec60442256a86ad9bcd081b7adffd4d6ad4cdb47f10814020b53f3200d" => :sierra + sha256 "47ec82883bc3dc546d011ab7cbcff24b957edabcec628e9131db99402f3977be" => :x86_64_linux end depends_on "readline" diff --git a/Formula/grafana.rb b/Formula/grafana.rb index 2780e941b13d6..5a87b5c412983 100644 --- a/Formula/grafana.rb +++ b/Formula/grafana.rb @@ -15,12 +15,19 @@ class Grafana < Formula depends_on "go" => :build depends_on "node" => :build depends_on "yarn" => :build + unless OS.mac? + depends_on "fontconfig" + depends_on "freetype" + depends_on "zlib" + end def install ENV["GOPATH"] = buildpath grafana_path = buildpath/"src/github.com/grafana/grafana" grafana_path.install buildpath.children + os = OS.mac? ? "darwin" : "linux" + cd grafana_path do system "go", "run", "build.go", "build" @@ -28,8 +35,8 @@ def install system "node_modules/grunt-cli/bin/grunt", "build" - bin.install "bin/darwin-amd64/grafana-cli" - bin.install "bin/darwin-amd64/grafana-server" + bin.install "bin/#{os}-amd64/grafana-cli" + bin.install "bin/#{os}-amd64/grafana-server" (etc/"grafana").mkpath cp("conf/sample.ini", "conf/grafana.ini.example") etc.install "conf/sample.ini" => "grafana/grafana.ini" diff --git a/Formula/graphene.rb b/Formula/graphene.rb index d88744c403edc..c22182addd4bd 100644 --- a/Formula/graphene.rb +++ b/Formula/graphene.rb @@ -5,10 +5,10 @@ class Graphene < Formula sha256 "e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6" bottle do - cellar :any sha256 "d8519d2811ee796969121cd0b087fb7a5e96c2952c69bb2dfe206f3efc299e31" => :catalina sha256 "0e7e238034cfcd390b8bd0e49bd6ba3c23dcdbff7c9a1cea5e626b34a3381acb" => :mojave sha256 "7bcd5ab83e1509ddeec6b710ba2a69c99bb92438344694423b1c886346fd44c2" => :high_sierra + sha256 "f02fe924f78f9a1889b2a6a3fc33793c01e8fe74925d5e3269f345b0962e139f" => :x86_64_linux end depends_on "gobject-introspection" => :build diff --git a/Formula/graphicsmagick.rb b/Formula/graphicsmagick.rb index e985655b0bb99..3cd5cdb0d4614 100644 --- a/Formula/graphicsmagick.rb +++ b/Formula/graphicsmagick.rb @@ -9,6 +9,7 @@ class Graphicsmagick < Formula sha256 "e5517b416b979debeafdf4fc7a408e09f77c2a8f93b76051d6707f2a6750d0c2" => :catalina sha256 "26ba769c14c9ab3b4de02afcb3735b4f1256f23e822166934152c68939508245" => :mojave sha256 "8d27e0e2ee2ce56c77a65d691ae893b1ac4ec38e62ee78111964023800756ac5" => :high_sierra + sha256 "cd37d2f3fa038958b2d09f03a730227b3ece95df338c415f1e56054665d8ee37" => :x86_64_linux end depends_on "pkg-config" => :build @@ -20,6 +21,7 @@ class Graphicsmagick < Formula depends_on "libtool" depends_on "little-cms2" depends_on "webp" + depends_on "linuxbrew/xorg/xorg" unless OS.mac? uses_from_macos "bzip2" uses_from_macos "libxml2" diff --git a/Formula/graphite2.rb b/Formula/graphite2.rb index 9ab3501b16ef2..ef9507a82a91e 100644 --- a/Formula/graphite2.rb +++ b/Formula/graphite2.rb @@ -10,9 +10,11 @@ class Graphite2 < Formula sha256 "0831f474c920b66bbeab3f93a91fa019b82bfffcdd40e369fdab76372700e980" => :catalina sha256 "2f3abb971be03141e9eea54b87c6861d72865bd76fde73ae3161d64c40d51cd9" => :mojave sha256 "62e39dce0ae0440ac164edaab6e1351520bc5414ad509fc0b8d5c890500785bd" => :high_sierra + sha256 "b2e120e5486b9c0b3c2eb5c2597e324d890319f502d2475fabdad1f4080f4e67" => :x86_64_linux end depends_on "cmake" => :build + depends_on "freetype" => :build unless OS.mac? resource "testfont" do url "https://scripts.sil.org/pub/woff/fonts/Simple-Graphite-Font.ttf" diff --git a/Formula/graphviz.rb b/Formula/graphviz.rb index 30c1e400f2dc0..440894d4a57b1 100644 --- a/Formula/graphviz.rb +++ b/Formula/graphviz.rb @@ -19,6 +19,7 @@ class Graphviz < Formula sha256 "b7622910804f75702b6124ed0a376f7d4f1c8aaa8dde38601549bb4c9a84589b" => :catalina sha256 "cadbefa8657abfbc63d66827ca1492226d10fc6fdba9276f41e62be3b9434ba2" => :mojave sha256 "c3b0269db2fb418c0e1b7413f10e0bec2d4f69485cfda484e8acf99cb1b86a54" => :high_sierra + sha256 "37b26f831a8f521febf0f575a1acdbadcbbb0820d5e75fce84084fac5f462cda" => :x86_64_linux end head do @@ -35,6 +36,7 @@ class Graphviz < Formula depends_on "libpng" depends_on "libtool" depends_on "pango" + depends_on "byacc" => :build unless OS.mac? uses_from_macos "flex" => :build @@ -69,6 +71,6 @@ def install } EOS - system "#{bin}/dot", "-Tpdf", "-o", "sample.pdf", "sample.dot" + system "#{bin}/dot", "-Tpng", "-o", "sample.png", "sample.dot" end end diff --git a/Formula/gravity.rb b/Formula/gravity.rb index 0d6188623a28a..661fb377b7d52 100644 --- a/Formula/gravity.rb +++ b/Formula/gravity.rb @@ -9,6 +9,7 @@ class Gravity < Formula sha256 "a98efa44c0d6442beabb0b95efb8d404d81b982d5f6cd41225bbf64dede0f5be" => :catalina sha256 "05f4fba3adf2677631c67980a296f0d43c733221532853f42daef08348627bcb" => :mojave sha256 "3ee168dfc2cf1397868dbd520bf2b89f04286394f354a86dad602e58c4d9f15a" => :high_sierra + sha256 "4889f4a7639262cf64b7400b870a2edea94f2099b894a23dbb28201a0c89a465" => :x86_64_linux end def install diff --git a/Formula/grep.rb b/Formula/grep.rb index 75f32a5d41938..9bfc4f5d5f8d4 100644 --- a/Formula/grep.rb +++ b/Formula/grep.rb @@ -10,6 +10,7 @@ class Grep < Formula sha256 "52fb744dfc1f2766b41d90bc4126bc6101663d12c3e31446719ef723b7883266" => :catalina sha256 "cbce0c10ed3edc352347287ec36a8a199bb7649892943a6948e4dbe4127e83ac" => :mojave sha256 "bcc9802f916e1db94b2879ff66b058d42142b391bfbc2002fd1fb13fd9e4c8ca" => :high_sierra + sha256 "e9085dfde4534662328a63c2a15d333db06517eff1f8b12112e0ce9b94b770e3" => :x86_64_linux end depends_on "pkg-config" => :build @@ -23,9 +24,9 @@ def install --infodir=#{info} --mandir=#{man} --with-packager=Homebrew - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? system "./configure", *args system "make" system "make", "install" @@ -39,6 +40,8 @@ def install end def caveats + return unless OS.mac? + <<~EOS All commands have been installed with the prefix "g". If you need to use these commands with their normal names, you @@ -51,10 +54,17 @@ def caveats text_file = testpath/"file.txt" text_file.write "This line should be matched" - grepped = shell_output("#{bin}/ggrep match #{text_file}") - assert_match "should be matched", grepped + if OS.mac? + grepped = shell_output("#{bin}/ggrep match #{text_file}") + assert_match "should be matched", grepped + + grepped = shell_output("#{opt_libexec}/gnubin/grep match #{text_file}") + assert_match "should be matched", grepped + end - grepped = shell_output("#{opt_libexec}/gnubin/grep match #{text_file}") - assert_match "should be matched", grepped + unless OS.mac? + grepped = shell_output("#{bin}/grep match #{text_file}") + assert_match "should be matched", grepped + end end end diff --git a/Formula/grepcidr.rb b/Formula/grepcidr.rb index f1aa5cc3082eb..a40136f0aa7ab 100644 --- a/Formula/grepcidr.rb +++ b/Formula/grepcidr.rb @@ -13,6 +13,7 @@ class Grepcidr < Formula sha256 "31ccf6792cab3c5022530ef4576ea53e6dedd4855b939d11212fea0d7fa294dc" => :el_capitan sha256 "d0024b81610b4a698de415aef87958e2a61f74a9f1f2b7acf875f2f3d50ecc05" => :yosemite sha256 "c4ed3ba91b4acd41f51850b143ea9826275b221fc8f041098dfe5f5a429a0289" => :mavericks + sha256 "b7e58d61f306f9da90413cc6b95746dcb46fc94ac937216955d7ef42dd45dccc" => :x86_64_linux end def install diff --git a/Formula/grex.rb b/Formula/grex.rb index 4cc61b0884846..e2e9a57ccbe75 100644 --- a/Formula/grex.rb +++ b/Formula/grex.rb @@ -9,6 +9,7 @@ class Grex < Formula sha256 "a6a2e903b81404d8637492fdbdea4bd2bafc5b9e2ead89e565ed64ca27a8a9ad" => :catalina sha256 "add77eeff9facb30f56b579ab893bcfafcae43699e629b3780f67b560fb59ad2" => :mojave sha256 "b09e46aabadbb7742e60b942386f994795fcfca48a2834b2dbc4bc7fdb500dcc" => :high_sierra + sha256 "34b7c6ababdee02dffd512e5354a7fb3de93c76866ad158e4477867ba3898ce6" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/grip.rb b/Formula/grip.rb index 24653fe25e02c..e104ff50b1ea3 100644 --- a/Formula/grip.rb +++ b/Formula/grip.rb @@ -5,13 +5,14 @@ class Grip < Formula homepage "https://github.com/joeyespo/grip" url "https://files.pythonhosted.org/packages/3c/ea/2a475ed37e1b6476182e71223c98667f51704bdbc919608372b203c7ea04/grip-4.5.2.tar.gz" sha256 "048b7e5c738ed80bee345bd10840f27eb31687eb67132b40f2473dc1cf67aa0f" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "f3af5ab0c40d11f8fcbd2dec4dcbadca3b24d0eef5c3626484601ec8d98ddb20" => :catalina sha256 "4f3bef6a20d2693b4a816dba62d2bba912f8d92163a65b0aadbf68479627f040" => :mojave sha256 "820f10c78b49556e81eb7680fa9c0129b666a76bdc8316bbeab14f40a71601ca" => :high_sierra + sha256 "68f24ef16e0413184dd7b22318ff74091a28e68ef301b0721c4ef3b92e2cf9ea" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/groff.rb b/Formula/groff.rb index d8b61a6da22a7..d790931e52fe5 100644 --- a/Formula/groff.rb +++ b/Formula/groff.rb @@ -10,8 +10,11 @@ class Groff < Formula sha256 "1ee2ce419f4d59f098f0804e1dea42524ef72a88b69ce891c42f13d5f19be5f9" => :mojave sha256 "24fac4b672946970b70c6e308311e87a6686fed50d4d0909228afb252531065d" => :high_sierra sha256 "2966f4b562c30eb6679d6940b43f4b99b2b625433e6a218489f160eb76c7c360" => :sierra + sha256 "d31274339f07f31fa1a710f04120927f11c8ad03d780ddd3e39363ca3a5d5fe3" => :x86_64_linux end + depends_on "texinfo" => :build + def install system "./configure", "--prefix=#{prefix}", "--without-x" system "make" # Separate steps required diff --git a/Formula/gromacs.rb b/Formula/gromacs.rb index a737bedfc51cb..e8700b61f7e90 100644 --- a/Formula/gromacs.rb +++ b/Formula/gromacs.rb @@ -12,8 +12,10 @@ class Gromacs < Formula depends_on "cmake" => :build depends_on "fftw" - depends_on "gcc" # for OpenMP + depends_on "gcc" + depends_on "gsl" # for OpenMP depends_on "openblas" + depends_on "linuxbrew/xorg/xorg" unless OS.mac? def install # Non-executable GMXRC files should be installed in DATADIR diff --git a/Formula/gron.rb b/Formula/gron.rb index 42112984f6081..69971c317dc3c 100644 --- a/Formula/gron.rb +++ b/Formula/gron.rb @@ -14,6 +14,7 @@ class Gron < Formula sha256 "7838ab1c751a11027f31b7b4dac4f7a83402b04a7eef522edeb15735846dfd81" => :high_sierra sha256 "fa5310f4ac25091387f24e5dd4bb0364db432ebc9f3273da371cbd35116af09e" => :sierra sha256 "23c3378ea69d5936b6966608942a0769c4adad0cdeabb9575e8b811b9b6c3a26" => :el_capitan + sha256 "01ff1741b72af7f46ccb056487f3f38d1aac50f5f70bc80ef845b4da6bdcbbbe" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/groonga.rb b/Formula/groonga.rb index e2928169d9165..8bde5ee74e3ea 100644 --- a/Formula/groonga.rb +++ b/Formula/groonga.rb @@ -8,6 +8,7 @@ class Groonga < Formula sha256 "68d49909d9cdc88a23eb50dc4e5e02d7d646b99f609a5f98e5d71685df38ad8c" => :catalina sha256 "8d5c63880dda507eecf1affccd11082c79b062605fa3166859a36b24755e3636" => :mojave sha256 "28e2ff2fd38e7cb84ad05a1872ad646d8783aa48663de3d5d7702ac70ae3dd58" => :high_sierra + sha256 "629f2f67c811a685574912eb5dfe1176d9a324449c62467ef2824f15592f883a" => :x86_64_linux end head do diff --git a/Formula/grpc.rb b/Formula/grpc.rb index 543376a257557..02349ab5c85d0 100644 --- a/Formula/grpc.rb +++ b/Formula/grpc.rb @@ -11,6 +11,7 @@ class Grpc < Formula sha256 "8f3212ca72a09d11787864d33503116d0527478565f36f666b68b10f6e286173" => :catalina sha256 "eb609a63758d89d676d8e41e6f2b4a1d9eef0c5e2aeeffa85dc883728c9c79ae" => :mojave sha256 "990d0b3fa57618f5b19d5ea719bbe1817f8fc17e51e05a8709b097e4acdaa18e" => :high_sierra + sha256 "1168e15a139918f539db0b49ecd12e1292b2a38dd0a574c82d55af29f8f68abc" => :x86_64_linux end depends_on "autoconf" => :build @@ -45,7 +46,8 @@ def install return GRPC_STATUS_OK; } EOS - system ENV.cc, "test.cpp", "-I#{include}", "-L#{lib}", "-lgrpc", "-o", "test" + system ENV.cc, "test.cpp", "-I#{include}", "-L#{lib}", "-lgrpc", + *("-Wl,-rpath=#{lib}" unless OS.mac?), "-o", "test" system "./test" end end diff --git a/Formula/grpcurl.rb b/Formula/grpcurl.rb index aa2412649f0a1..86f040db43f2d 100644 --- a/Formula/grpcurl.rb +++ b/Formula/grpcurl.rb @@ -9,6 +9,7 @@ class Grpcurl < Formula sha256 "39d8535ec12e81fb2243eaa28a2bff15c5f1022ed709918eb8d23547ebf11e78" => :catalina sha256 "38fe5e2ed21bdcbf75aae000c84204a9223ad771e1077873085f6d95b9e6c876" => :mojave sha256 "3790eff7e7a9d67280e21a243b021e8ca95788076bbc555ef0db0589aa723eea" => :high_sierra + sha256 "f1793cc7a6b3e5a88573d6ab989a7a5718e77f5531377affa2f9dc8bee1a8d8c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/grunt-cli.rb b/Formula/grunt-cli.rb index af8d09625f91d..13a124c329d61 100644 --- a/Formula/grunt-cli.rb +++ b/Formula/grunt-cli.rb @@ -12,6 +12,7 @@ class GruntCli < Formula sha256 "738d87cf6f7eb5a0b554980f1e77dc349fa092d34ef20b2f41583442d9249348" => :mojave sha256 "7df2a65c82959d478c0d384ad5e51046186750e0f744beea06916c663c4ca4eb" => :high_sierra sha256 "677a92a25a3f7d1a8e6ceeb6b869e4f4d784bbd10a32e37d7f32aa122c1176a4" => :sierra + sha256 "572ea977195137ed0dd300a1be859f3499b07a82b0ac3c2c43b5efab20d140b1" => :x86_64_linux end depends_on "node" diff --git a/Formula/grv.rb b/Formula/grv.rb index e1d2df94cd074..d50317e11b731 100644 --- a/Formula/grv.rb +++ b/Formula/grv.rb @@ -11,6 +11,7 @@ class Grv < Formula sha256 "2f223f7ca56ee01201a05e8660c219a2f70d7ead2c5e4f0dac65f4a9b8cd5941" => :mojave sha256 "d51249eec72ee11cc90b0d5b4c06e10b77eec0bd7ddf8b53df6d0a0d8a291605" => :high_sierra sha256 "19f2e8bedb458d0b339160b275e196add00abcca7db92ba141aaccae255bb973" => :sierra + sha256 "84ec8581649a0367f502b39d1803f4e70bce7b4837ddc5e7c61886d2af5d00a7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/gsar.rb b/Formula/gsar.rb index 44738b0c585b4..221ff01c5540e 100644 --- a/Formula/gsar.rb +++ b/Formula/gsar.rb @@ -14,6 +14,7 @@ class Gsar < Formula sha256 "5cf3fe6d772f95378e2802a6208b8f06524a81b4d881343571dd3af201b69e98" => :el_capitan sha256 "6e138e63b868dfbd4d16109cabe60f50dc600fd65cbf14cd3926b1b8c2f3e2dc" => :yosemite sha256 "3911e63bccd5deae4101c7c38a84954ad7e205bda69b3eefcee61a4d46e1df8d" => :mavericks + sha256 "3e0cdee67e5f45f98f759b505f691b9ea7b6b25dd770fa4d58cc630a54f7a5de" => :x86_64_linux end def install diff --git a/Formula/gsasl.rb b/Formula/gsasl.rb index d3f9011c6f642..41c5184d7cc2b 100644 --- a/Formula/gsasl.rb +++ b/Formula/gsasl.rb @@ -6,10 +6,10 @@ class Gsasl < Formula sha256 "4dda162a511976bfef14ad1fecd7733719dfd9c361b5d09dc8414ea9d472d8d2" bottle do - cellar :any sha256 "964ad480f7fafd04051fe76a288b5f109766ae39e4329b00f1a268b5082b316e" => :catalina sha256 "ac8236d918eea76cb15f196f5a571aab775ba1381e33d2c222a98114a2d391f6" => :mojave sha256 "d79efee531f43ebd0019d68f2066fb02f0ab9009ea3b78bddda231b6ddda5a7a" => :high_sierra + sha256 "fbd676fc4cb9bb119eb13ab3cea43cf1ea2bd7548368a067cd9f3208a09d520f" => :x86_64_linux end depends_on "libgcrypt" diff --git a/Formula/gsettings-desktop-schemas.rb b/Formula/gsettings-desktop-schemas.rb index 2a8b835b800ea..29bfeae974ec1 100644 --- a/Formula/gsettings-desktop-schemas.rb +++ b/Formula/gsettings-desktop-schemas.rb @@ -10,6 +10,7 @@ class GsettingsDesktopSchemas < Formula sha256 "ca79e0409fb9d658c9ab2f9e3ecde89e10ef305121b9fa71c909cf3cb098a82a" => :catalina sha256 "ca79e0409fb9d658c9ab2f9e3ecde89e10ef305121b9fa71c909cf3cb098a82a" => :mojave sha256 "ca79e0409fb9d658c9ab2f9e3ecde89e10ef305121b9fa71c909cf3cb098a82a" => :high_sierra + sha256 "acf4c5089014f8b36ea87faf5aea48c53616a4f3035f5852beb3f1c1d46ef115" => :x86_64_linux end depends_on "gobject-introspection" => :build diff --git a/Formula/gsl.rb b/Formula/gsl.rb index 5ffa7b9f92fea..4681e55cb824c 100644 --- a/Formula/gsl.rb +++ b/Formula/gsl.rb @@ -11,6 +11,7 @@ class Gsl < Formula sha256 "6c88a066c85f76c93a20f6e3256fb9022d6e7db828d184be5b42fd0b322ca7b8" => :mojave sha256 "8213b1a73d038e499223ccae6d04afe6eb2d9455e327d9558351cf47a0431b84" => :high_sierra sha256 "8515f26e5a06a99097e87dc9b88ee79787b95448ab67f09b449aee4b0d67bdba" => :sierra + sha256 "afe8e13b6a156ffa43fa58c9f3a9187d5c7f4a1d8eff8c92a7112ff13ffc536d" => :x86_64_linux end def install diff --git a/Formula/gsmartcontrol.rb b/Formula/gsmartcontrol.rb index ff6c0e3758a8a..ffe3ee8173146 100644 --- a/Formula/gsmartcontrol.rb +++ b/Formula/gsmartcontrol.rb @@ -9,6 +9,7 @@ class Gsmartcontrol < Formula sha256 "f013a063bc125ddf0eb174d8893edc7eea8433aac4ba910b0ed3a11337171fd4" => :catalina sha256 "f07ac44ce8d76f469f2bd02da3476f41151416dacb64569a03cf936d8b50697f" => :mojave sha256 "67fa6b9c4b3f203916bb66ca3b5b67c2171cbd2d0fd26886746408e09243577f" => :high_sierra + sha256 "649d8f6661e7ca1e533844374658606031ba6f39865703e5c4a32654c013c4ab" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/gsoap.rb b/Formula/gsoap.rb index 040cea66040c9..fa3eb3bd8464d 100644 --- a/Formula/gsoap.rb +++ b/Formula/gsoap.rb @@ -8,6 +8,7 @@ class Gsoap < Formula sha256 "6721742878f94c04756d18ca5d4555d43cfbae6d33add3a1afb4c0f20c0c3684" => :catalina sha256 "a6c9a0b6057e9117b678a0f9232d33f88770cf838365fbdbc628b7d9fc92b8bb" => :mojave sha256 "0baeffa7065bfafc8572ff3bb23cd85cf82b49aa1fe9f25f3b02171d1f1100dc" => :high_sierra + sha256 "a3a6282eb0fbbe248d743e5e2974642efcdc97da58d6fe7e333e6368759375be" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/gspell.rb b/Formula/gspell.rb index 2ad66c60f0a45..550b30a73339e 100644 --- a/Formula/gspell.rb +++ b/Formula/gspell.rb @@ -18,10 +18,12 @@ class Gspell < Formula depends_on "pkg-config" => :build depends_on "enchant" depends_on "gtk+3" - depends_on "gtk-mac-integration" + depends_on "gtk-mac-integration" if OS.mac? depends_on "iso-codes" depends_on "vala" + uses_from_macos "libffi" + patch :DATA def install @@ -50,7 +52,7 @@ def install gettext = Formula["gettext"] glib = Formula["glib"] gtkx3 = Formula["gtk+3"] - gtk_mac_integration = Formula["gtk-mac-integration"] + gtk_mac_integration = Formula["gtk-mac-integration"] if OS.mac? harfbuzz = Formula["harfbuzz"] libepoxy = Formula["libepoxy"] libpng = Formula["libpng"] @@ -67,7 +69,9 @@ def install -I#{glib.opt_include}/gio-unix-2.0/ -I#{glib.opt_include}/glib-2.0 -I#{glib.opt_lib}/glib-2.0/include - -I#{gtk_mac_integration.opt_include}/gtkmacintegration + ] + flags << "-I#{gtk_mac_integration.opt_include}/gtkmacintegration" if OS.mac? + flags += %W[ -I#{gtkx3.opt_include}/gtk-3.0 -I#{harfbuzz.opt_include}/harfbuzz -I#{include}/gspell-1 @@ -95,10 +99,10 @@ def install -lgobject-2.0 -lgspell-1 -lgtk-3 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags ENV["G_DEBUG"] = "fatal-warnings" diff --git a/Formula/gssdp.rb b/Formula/gssdp.rb index 7925b112fe7dc..852803b0889de 100644 --- a/Formula/gssdp.rb +++ b/Formula/gssdp.rb @@ -5,7 +5,6 @@ class Gssdp < Formula sha256 "a263dcb6730e3b3dc4bbbff80cf3fab4cd364021981d419db6dd5a8e148aa7e8" bottle do - cellar :any sha256 "22865104f953a59e6fbf2d2159a18d4c0d59e9398ba490effb0988c919704229" => :catalina sha256 "2ecafed662cc94896bd9a36c34024141a67d1773649e9841c595dbf938e3c837" => :mojave sha256 "3591386e88d6df3df51173c64c9e86680e128e01d6876344f537b45df901ee8f" => :high_sierra diff --git a/Formula/gssh.rb b/Formula/gssh.rb index d36d69d54d2b4..29cb7214a21a5 100644 --- a/Formula/gssh.rb +++ b/Formula/gssh.rb @@ -10,6 +10,7 @@ class Gssh < Formula sha256 "81d9d04f30ae5f158b18a3749f4e655d25374bc069292e22b47e5c0250ccea3d" => :mojave sha256 "4d9d09ec57af0639e794cbed732c12050fca8fe3d43d6e5d3e1de0e473eb5b0a" => :high_sierra sha256 "ef0becf43b6bfe4a1c1a3cffc27c5c01f338348273f66c7f4e3355e05f55b508" => :sierra + sha256 "52a16a70c5c6fdc4dbcb6e94d65006a172ce699971fc5bff3f6ae4563278730c" => :x86_64_linux end depends_on :java => "1.8" diff --git a/Formula/gst-libav.rb b/Formula/gst-libav.rb index 0844c2e4a68ad..33eae51ee1887 100644 --- a/Formula/gst-libav.rb +++ b/Formula/gst-libav.rb @@ -9,6 +9,7 @@ class GstLibav < Formula sha256 "dce5e4261059fa2fc2e14eb4db2f43cfdf749eee11140539b3f1c3c74af25198" => :catalina sha256 "999e32d952de88b5578a3906fe922b135827738ac9b16afcd542bc9ba01d2d21" => :mojave sha256 "281dc5fd5d4a0f558b653d7054303fbd30308feb73d2c4e37811d8389d28b6ad" => :high_sierra + sha256 "0ab41eb8f4fa2e7b0049d4454d75b2e361fe5d3ac4ec8e98509663d7fb29109c" => :x86_64_linux end head do diff --git a/Formula/gst-plugins-base.rb b/Formula/gst-plugins-base.rb index e0980b9dab115..d7a532211d8f0 100644 --- a/Formula/gst-plugins-base.rb +++ b/Formula/gst-plugins-base.rb @@ -8,6 +8,7 @@ class GstPluginsBase < Formula sha256 "64e4395ec1d40677cfc8b21eaf6815296f44660aab0b4a125735f266552dad95" => :catalina sha256 "5a4245b5251ec3c8ef12a8278101c84c4db8a8892114a53e6a3304569571caba" => :mojave sha256 "d9144e2a0c20e479c341167a8aa9ecc87e65a9c7c9515a62a855785cb1d42252" => :high_sierra + sha256 "3d8e05d1aa81b7fd22580ff65344d1bc1f5eee7d9ee2fc4f0f097cf41bc5e820" => :x86_64_linux end head do diff --git a/Formula/gst-plugins-good.rb b/Formula/gst-plugins-good.rb index 031487fc277ae..4f915d0a52eec 100644 --- a/Formula/gst-plugins-good.rb +++ b/Formula/gst-plugins-good.rb @@ -11,6 +11,7 @@ class GstPluginsGood < Formula sha256 "4ea6d0ea1dcc6c20afbd0976006a84d57067b83926aa74bd28a0d21b4afa1aa9" => :catalina sha256 "5bab7c207014dad9b950247148d930251fba89458f97527b9fb076a1a5a843ca" => :mojave sha256 "0af59390678c89f8a5c396afcd63e5b1d95d84dad217c61860db6adc3f8c2539" => :high_sierra + sha256 "66b16d35317570d2a493b3d525de491e94f6ba338940482d52cf0b32bbbc7577" => :x86_64_linux end head do diff --git a/Formula/gst-rtsp-server.rb b/Formula/gst-rtsp-server.rb index 08272138c7768..c0a94f8a03147 100644 --- a/Formula/gst-rtsp-server.rb +++ b/Formula/gst-rtsp-server.rb @@ -8,6 +8,7 @@ class GstRtspServer < Formula sha256 "30d213fe81eece2d6a566c7d53ea36f9f3ee24219aa7b0be4edf15d46559cc03" => :catalina sha256 "fc5d1f94602dc377f2d6938ed5f97e1a104958fbfeb26e48598e18c0dd0ca9ca" => :mojave sha256 "94e6f9c451be9c5f2e3b3a92d7450b730b3cea49c85f1e03cd8348943385a311" => :high_sierra + sha256 "0fa4eceb2609270ae4e606dac40f883ab0669d078b9579891191aa27ab6876b4" => :x86_64_linux end depends_on "gobject-introspection" => :build diff --git a/Formula/gst-validate.rb b/Formula/gst-validate.rb index 29777de71718e..084210a0ec2a7 100644 --- a/Formula/gst-validate.rb +++ b/Formula/gst-validate.rb @@ -11,6 +11,7 @@ class GstValidate < Formula sha256 "44ac302a258e77061adf3b5e87542ef2c2d1e6a4399554198f8e54c16a501491" => :catalina sha256 "602b5e8cfc4749ead0dba6866b12487742488de6cc59555758284c1c8bc9f4b0" => :mojave sha256 "675669b40f30a05ab4c4c32bb92245753890419a8d4f5a649efc9441d200ed28" => :high_sierra + sha256 "9a274aa3dce77d0032efe2234906d6f2f34f45fc122341352aa4c7a590159b53" => :x86_64_linux end head do diff --git a/Formula/gstreamer.rb b/Formula/gstreamer.rb index 600e8793edab1..43bd31ef61003 100644 --- a/Formula/gstreamer.rb +++ b/Formula/gstreamer.rb @@ -8,6 +8,7 @@ class Gstreamer < Formula sha256 "3473eef6aadd51a378f722c08a399922c4b401f38d8d5bffe7e2cb0ba845f919" => :catalina sha256 "6427cd64ac1c541d35fc57f869dd1290e57aab8a2a9f5589b79f6e078e4432d5" => :mojave sha256 "b1a6cbfbac2bb152ce023fbe283ef38ec371ceccff48ae1545cdeac1a36933ba" => :high_sierra + sha256 "4c88f59e0cf8f5d7993bc99effde5d6db098c6828f55152761cc830a5a5700ae" => :x86_64_linux end head do diff --git a/Formula/gstreamermm.rb b/Formula/gstreamermm.rb index 67750e49e9cf2..72c1f4362fe3f 100644 --- a/Formula/gstreamermm.rb +++ b/Formula/gstreamermm.rb @@ -85,9 +85,9 @@ def install -lgstsdp-1.0 -lgsttag-1.0 -lgstvideo-1.0 - -lintl -lsigc-2.0 ] + flags << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/gti.rb b/Formula/gti.rb index e326031239909..1c82dfc899c51 100644 --- a/Formula/gti.rb +++ b/Formula/gti.rb @@ -10,6 +10,7 @@ class Gti < Formula sha256 "dc2f7bf9b442294a044b782321689783cd3fd93a465a9604db606b2b420e4443" => :catalina sha256 "2e1f996a67020a9bd842b41d0ac7d6e5ef0791fbc7fd57ffe3e9b7aacc1ee6de" => :mojave sha256 "9d46e56c0f79ba9d81e40bc1edc7b4ff1a9c9eeb4dbcb087827dec5b84c4f82b" => :high_sierra + sha256 "08890282aae29a1ca51af8526a6487763fd94e5a98269d5a348f0c295af677b0" => :x86_64_linux end def install diff --git a/Formula/gtk+.rb b/Formula/gtk+.rb index ca6884537258f..db18b0c33871b 100644 --- a/Formula/gtk+.rb +++ b/Formula/gtk+.rb @@ -14,6 +14,7 @@ class Gtkx < Formula sha256 "cec64106c085533a58f8d436f029b2d7199a14cd15af9ece086814396ba48b0e" => :mojave sha256 "30ce8d0a4062200196f8d802ae75769d8e05d530c338619d290704c46a7d317b" => :high_sierra sha256 "a1324b85f6749111c3eb598c6d3ed231eaa8281b60fc2eb13d48a5f342da3efc" => :sierra + sha256 "c3af1c4b634e6fbcf019f632b93a1b795a661be72a46473b0783afa24b3c3f7a" => :x86_64_linux end head do @@ -31,6 +32,15 @@ class Gtkx < Formula depends_on "gdk-pixbuf" depends_on "hicolor-icon-theme" depends_on "pango" + unless OS.mac? + depends_on "cairo" + depends_on "linuxbrew/xorg/libxinerama" + depends_on "linuxbrew/xorg/libxcomposite" + depends_on "linuxbrew/xorg/libxcursor" + depends_on "linuxbrew/xorg/libxdamage" + depends_on "linuxbrew/xorg/libxfixes" + depends_on "linuxbrew/xorg/libxrandr" + end # Patch to allow Eiffel Studio to run in Cocoa / non-X11 mode, as well as Freeciv's freeciv-gtk2 client # See: @@ -50,9 +60,12 @@ def install "--enable-static", "--disable-glibtest", "--enable-introspection=yes", - "--with-gdktarget=quartz", + "--with-gdktarget=#{OS.mac? ? "quartz" : "x11"}", "--disable-visibility"] + # temporarily disable cups until linuxbrew/homebrew-core#495 is merged + args << "--disable-cups" unless OS.mac? + if build.head? inreplace "autogen.sh", "libtoolize", "glibtoolize" ENV["NOCONFIGURE"] = "yes" @@ -84,7 +97,9 @@ def install libpng = Formula["libpng"] pango = Formula["pango"] pixman = Formula["pixman"] - flags = %W[ + backend = OS.mac? ? "quartz" : "x11" + flags = (ENV.cflags || "").split + (ENV.cppflags || "").split + (ENV.ldflags || "").split + flags += %W[ -I#{atk.opt_include}/atk-1.0 -I#{cairo.opt_include}/cairo -I#{fontconfig.opt_include} @@ -109,16 +124,16 @@ def install -L#{pango.opt_lib} -latk-1.0 -lcairo - -lgdk-quartz-2.0 + -lgdk-#{backend}-2.0 -lgdk_pixbuf-2.0 -lgio-2.0 -lglib-2.0 -lgobject-2.0 - -lgtk-quartz-2.0 - -lintl + -lgtk-#{backend}-2.0 -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gtk+3.rb b/Formula/gtk+3.rb index de06b98c97dcb..56728b513ad86 100644 --- a/Formula/gtk+3.rb +++ b/Formula/gtk+3.rb @@ -8,6 +8,7 @@ class Gtkx3 < Formula sha256 "d0db8f581501a4046ba74ca0f3666f96a1c211f39961395b83375edb17247f43" => :catalina sha256 "4ee0638ebd51d281f71b42fbb3db48d5888877d08399d8c8226e3f87c9ee4ec3" => :mojave sha256 "b3aba62ebbae85a9a3686e099f4cfaa1e81d5d4a52de3dbf783740bd6be47764" => :high_sierra + sha256 "df1455ddd9069aea3a33bd5daeb0901e449bfd929e33de67c5eaf932da526515" => :x86_64_linux end depends_on "docbook" => :build @@ -23,18 +24,33 @@ class Gtkx3 < Formula depends_on "hicolor-icon-theme" depends_on "libepoxy" depends_on "pango" + unless OS.mac? + depends_on "cmake" + depends_on "at-spi2-atk" + depends_on "cairo" + depends_on "iso-codes" + depends_on "libxkbcommon" + depends_on "linuxbrew/xorg/wayland-protocols" + depends_on "linuxbrew/xorg/xorgproto" + end uses_from_macos "libxslt" => :build # for xsltproc def install args = std_meson_args + %w[ - -Dx11_backend=false - -Dquartz_backend=true -Dgtk_doc=false -Dman=true -Dintrospection=true ] + if OS.mac? + args << "-Dquartz_backend=true" + args << "-Dx11_backend=false" + else + args << "-Dquartz_backend=false" + args << "-Dx11_backend=true" + end + # ensure that we don't run the meson post install script ENV["DESTDIR"] = "/" @@ -112,10 +128,10 @@ def post_install -lglib-2.0 -lgobject-2.0 -lgtk-3 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" # include a version check for the pkg-config files diff --git a/Formula/gtk-doc.rb b/Formula/gtk-doc.rb index 9be7dcc6447ad..1a85bf4ca2d1f 100644 --- a/Formula/gtk-doc.rb +++ b/Formula/gtk-doc.rb @@ -10,6 +10,7 @@ class GtkDoc < Formula sha256 "2e0c508a1f6fe8ab48a03ab83f8471c3153ce937099437dad6bbbd1dd36a42ce" => :catalina sha256 "2e0c508a1f6fe8ab48a03ab83f8471c3153ce937099437dad6bbbd1dd36a42ce" => :mojave sha256 "2e0c508a1f6fe8ab48a03ab83f8471c3153ce937099437dad6bbbd1dd36a42ce" => :high_sierra + sha256 "bac3153dfa38abb8abbab88feebdbbc911d9509f5f5380e69b11b8a8b9cd45f5" => :x86_64_linux end depends_on "itstool" => :build diff --git a/Formula/gtk-mac-integration.rb b/Formula/gtk-mac-integration.rb index d078dd710695b..943453b77efef 100644 --- a/Formula/gtk-mac-integration.rb +++ b/Formula/gtk-mac-integration.rb @@ -25,6 +25,7 @@ class GtkMacIntegration < Formula depends_on "gettext" depends_on "gtk+" depends_on "gtk+3" + depends_on :macos def install args = %W[ diff --git a/Formula/gtk-vnc.rb b/Formula/gtk-vnc.rb index 4ca0f75930289..279cee9469071 100644 --- a/Formula/gtk-vnc.rb +++ b/Formula/gtk-vnc.rb @@ -9,6 +9,7 @@ class GtkVnc < Formula sha256 "1e932ef0f54e09e9cf107c6ef386ff49e1b1cfd107eca77e4d1c5569da71909d" => :mojave sha256 "efb82f38076361165896bbf906881331c349082464fa8fc0b6b81f4c58b52f0a" => :high_sierra sha256 "c244ffda67d3e559172ba2b9e2b1015011733630232c203f733f259d8a6dd485" => :sierra + sha256 "417c7bce95c729cdf1af2a58b1da7586d1e5a14af06a041f6981db7fdcfc9515" => :x86_64_linux end depends_on "gettext" => :build diff --git a/Formula/gtkdatabox.rb b/Formula/gtkdatabox.rb index c28917b135b63..00793e96e0ed1 100644 --- a/Formula/gtkdatabox.rb +++ b/Formula/gtkdatabox.rb @@ -9,6 +9,7 @@ class Gtkdatabox < Formula sha256 "e85124ef7180c8803f8700e9269a47d3b5841c1cdace25e6914a50a0b7389dd1" => :catalina sha256 "bfb185bdad65010d94e7ec0d343f11dafb0135adecf0480a43b705a54b062ff1" => :mojave sha256 "f0b09b52354b68f4bc4e2d01dcd970f5f5f6f549141dd75af3734a9b3c1f0b2f" => :high_sierra + sha256 "39f592833789c71432dcbf913363f2fd96212ef4f90dbbaae53455254ae3fac0" => :x86_64_linux end depends_on "pkg-config" => :build @@ -68,17 +69,17 @@ def install -L#{pango.opt_lib} -latk-1.0 -lcairo - -lgdk-quartz-2.0 + -lgdk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lgdk_pixbuf-2.0 -lgio-2.0 -lglib-2.0 -lgobject-2.0 - -lgtk-quartz-2.0 + -lgtk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lgtkdatabox - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gtkextra.rb b/Formula/gtkextra.rb index 3cf10662872f0..b0b9b8c4ce760 100644 --- a/Formula/gtkextra.rb +++ b/Formula/gtkextra.rb @@ -12,6 +12,7 @@ class Gtkextra < Formula sha256 "c38010856fc21985142ce72c0b07be8aba4d8b2d24e7a29fee497383d131efbc" => :mojave sha256 "a18ed1a1fe359d9572ac5f334b522b175c0309168dbe1274f25884f9d062282e" => :high_sierra sha256 "021592c075825331cf707f79c010fa75f1e688f821acfe167543236f8cdcc556" => :sierra + sha256 "cc74372f074fcc08530dcf52dcbfdb7f9250a5f1596a6907dd820bd7f222062d" => :x86_64_linux end depends_on "pkg-config" => :build @@ -47,6 +48,7 @@ def install libpng = Formula["libpng"] pango = Formula["pango"] pixman = Formula["pixman"] + backend = OS.mac? ? "quartz" : "x11" flags = %W[ -I#{atk.opt_include}/atk-1.0 -I#{cairo.opt_include}/cairo @@ -74,17 +76,17 @@ def install -L#{pango.opt_lib} -latk-1.0 -lcairo - -lgdk-quartz-2.0 + -lgdk-#{backend}-2.0 -lgdk_pixbuf-2.0 -lgio-2.0 -lglib-2.0 -lgobject-2.0 - -lgtk-quartz-2.0 - -lgtkextra-quartz-3.0 - -lintl + -lgtk-#{backend}-2.0 + -lgtkextra-#{backend}-3.0 -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gtkmm.rb b/Formula/gtkmm.rb index 87f45ce8d4199..51477c2f6568f 100644 --- a/Formula/gtkmm.rb +++ b/Formula/gtkmm.rb @@ -3,7 +3,7 @@ class Gtkmm < Formula homepage "https://www.gtkmm.org/" url "https://download.gnome.org/sources/gtkmm/2.24/gtkmm-2.24.5.tar.xz" sha256 "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72" - revision 3 + revision OS.mac? ? 3 : 4 bottle do cellar :any @@ -11,6 +11,7 @@ class Gtkmm < Formula sha256 "bfa9c862a46b1ca66466e30ba6dfcb74bf69a345089aba76f6620f6aa28b69dc" => :mojave sha256 "160a917c60ae9f41117f297a3bc8933fffb0084edccb6113fc7510798ad01d3e" => :high_sierra sha256 "d525d513745bb81d43bcd3b43fc7067f64a8425640c9e1a959e94bd2c7d4eee9" => :sierra + sha256 "1ee94f81279e7a67d339e6879370fff9fe7b83fb6bed6147ed4a12a8ec9831c1" => :x86_64_linux end depends_on "pkg-config" => :build @@ -102,7 +103,7 @@ def install -latkmm-1.6 -lcairo -lcairomm-1.0 - -lgdk-quartz-2.0 + -lgdk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lgdk_pixbuf-2.0 -lgdkmm-2.4 -lgio-2.0 @@ -110,14 +111,14 @@ def install -lglib-2.0 -lglibmm-2.4 -lgobject-2.0 - -lgtk-quartz-2.0 + -lgtk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lgtkmm-2.4 - -lintl -lpango-1.0 -lpangocairo-1.0 -lpangomm-1.4 -lsigc-2.0 ] + flags << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/gtkmm3.rb b/Formula/gtkmm3.rb index ddca04b5d7566..addbeec9af989 100644 --- a/Formula/gtkmm3.rb +++ b/Formula/gtkmm3.rb @@ -10,6 +10,7 @@ class Gtkmm3 < Formula sha256 "c656b3844e5e94f34556e5b8b0b6ee3099e7a2c1b96c839229bbc9997c18218d" => :catalina sha256 "12efd715a1422f80321a2af07a6d82d1e95772b4c23dea90d8138e3a22475886" => :mojave sha256 "2183abaf056161d4d13d8bd86fc5795b3e32caf3db7c1a4b8a44eba320104402" => :high_sierra + sha256 "67b2cca725f348e93704e5308f771debbc8401d4d78e4d0753b364ae909d0e3c" => :x86_64_linux end depends_on "pkg-config" => :build @@ -114,12 +115,12 @@ class MyLabel : public Gtk::Label { -lgobject-2.0 -lgtk-3 -lgtkmm-3.0 - -lintl -lpango-1.0 -lpangocairo-1.0 -lpangomm-1.4 -lsigc-2.0 ] + flags << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/gtksourceview3.rb b/Formula/gtksourceview3.rb index 64ea449859489..7eeadae42cc22 100644 --- a/Formula/gtksourceview3.rb +++ b/Formula/gtksourceview3.rb @@ -9,6 +9,7 @@ class Gtksourceview3 < Formula sha256 "b34db76dca1649cd3ecb7a0e62904c093381902199b427d444e5974f3017c8ed" => :catalina sha256 "fdd26532623b2ab2f6333c51ea0bb2addca737ab79b74c18ea4e5d49d687ce89" => :mojave sha256 "310d80ce58f5e77fa2b3ca1867e081a1c03c2da31d7560faf8e0f218378e5a17" => :high_sierra + sha256 "8ca9c66d98f11802343958badf29c2987640831e80c125b9c6a171dea13d1004" => :x86_64_linux end depends_on "autoconf" => :build @@ -89,10 +90,10 @@ def install -lgobject-2.0 -lgtk-3 -lgtksourceview-3.0 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gtksourceview4.rb b/Formula/gtksourceview4.rb index 0b434a5cfbce1..03c96f7f28a8c 100644 --- a/Formula/gtksourceview4.rb +++ b/Formula/gtksourceview4.rb @@ -89,11 +89,14 @@ def install -lglib-2.0 -lgobject-2.0 -lgtk-3 - -lgtksourceview-4.0 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << if OS.mac? + "-lintl -lgtksourceview-4.0" + else + "-lgtksourceview-4" + end system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gts.rb b/Formula/gts.rb index 3d562f8e5d4d1..fa663d387fe66 100644 --- a/Formula/gts.rb +++ b/Formula/gts.rb @@ -10,6 +10,7 @@ class Gts < Formula sha256 "8a0c9b4f60a2cbea2e2e3469880284c2373843e676aaf58c1ff28d1e31c2ccb9" => :catalina sha256 "e0ba5b2700ba2a0c88a6345117a699c08f47738d3e727dbc64d815d1a3b7492b" => :mojave sha256 "5aa85562ed3d0aad446825d7c4e3cc717f8044a2c638bbdcdd0e18bc0f366e81" => :high_sierra + sha256 "ff29fd6a36942373d22015728231bf839d98416950cb235816d2a59b9e95c31a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/guetzli.rb b/Formula/guetzli.rb index fcd58beba7847..6defc4a0dd8dc 100644 --- a/Formula/guetzli.rb +++ b/Formula/guetzli.rb @@ -13,6 +13,7 @@ class Guetzli < Formula sha256 "c059346fa601885f550b50752d6d1a23eced66388b18e1c1db5169a0951dcad6" => :sierra sha256 "a77327b3964a88a84879943171e0d10d6661cc72c5ceaa12ee2091f02930da1a" => :el_capitan sha256 "04864f5c52c77f2d382247a57bf082052599a2bc9bd8fa28592ab17657342b08" => :yosemite + sha256 "8773230c14dd93f68486caef52e012299873c447a4203a652499dbf469528a52" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/guile.rb b/Formula/guile.rb index 142d7a4d8e72e..3b7b7ee617783 100644 --- a/Formula/guile.rb +++ b/Formula/guile.rb @@ -10,6 +10,7 @@ class Guile < Formula sha256 "82d5ae8de3a1c8bf11e35b53487d6dbd14536376d04b9939df052f2eac66f0f0" => :catalina sha256 "ed3f5ae6d9331860184d93c8e4d3e230c4b1558a330a9a23042115aef17c7ed5" => :mojave sha256 "1e02fde47f568f75a58911b9c14ba60169c77ed09bdddb9038a4b89adc153b9d" => :high_sierra + sha256 "fac6ec8e9c85c353a290b702f78c4f8ed74deb442bc329d5fec1c8d2dd43ac17" => :x86_64_linux end head do diff --git a/Formula/guile@2.rb b/Formula/guile@2.rb index fe1e5cf82a7f9..78994cf8d9c5e 100644 --- a/Formula/guile@2.rb +++ b/Formula/guile@2.rb @@ -9,6 +9,7 @@ class GuileAT2 < Formula sha256 "2821f055df7815abc7467a42f1bd90a09672261a9aad4ce994111a59a2ce6dbe" => :catalina sha256 "78e5fd69581a54b8d7c701e1fc03d96660b80a2699d7dad701cdd2865a5f2442" => :mojave sha256 "2832668210b0ef94ae0596c7e27aca846f76453719df6a9103e34af9e885d031" => :high_sierra + sha256 "e0aff41c400d7ccf470e4fe9e6491c914a32c727aa8c51a682f3aca707c9c2f1" => :x86_64_linux end keg_only :versioned_formula diff --git a/Formula/gumbo-parser.rb b/Formula/gumbo-parser.rb index a593d6ec889e6..33eddd3601233 100644 --- a/Formula/gumbo-parser.rb +++ b/Formula/gumbo-parser.rb @@ -13,6 +13,7 @@ class GumboParser < Formula sha256 "56f5446eb431b628655748659a8a7479466e00addf7d90070464364a3f3cafa9" => :el_capitan sha256 "02169cdaafcf9343bacf98e0e34b1f7383eb0b1b89385965d81796e110f8c38f" => :yosemite sha256 "efc9658f05e6543d7faed663ef7106c5720e72a86672d7ef000372babade1e43" => :mavericks + sha256 "d390b6bfc3e61e87253117d04ef1c324e7ae18c7347d540ee413392e120316ef" => :x86_64_linux # glibc 2.19 end depends_on "autoconf" => :build diff --git a/Formula/gupnp.rb b/Formula/gupnp.rb index 3d9f5308bf78f..cc487dbe95898 100644 --- a/Formula/gupnp.rb +++ b/Formula/gupnp.rb @@ -7,7 +7,6 @@ class Gupnp < Formula sha256 "d447e54d88e4a8fab84ad1766070e9208e21166fc7e2ce95df6e33e49e8d29b1" bottle do - cellar :any sha256 "c3293403d47e51ae9ae4bec506dc3ca54209769165fd98c6807f0876825d8195" => :catalina sha256 "c06a3a4c5ffe1b21b2c362e1dcb08d063e2bab5a54eaa3f78f72a0ef39c7b5a4" => :mojave sha256 "db6c7a1a1f48689266050b0e8e71329fd9d5aaec68090c61c22b9475e6a75e24" => :high_sierra @@ -59,6 +58,12 @@ def install return 0; } EOS + linker_flags = %W[ + -L#{lib} + -lgupnp-1.2 + -lglib-2.0 + -lgobject-2.0 + ] system ENV.cc, "-I#{include}/gupnp-1.2", "-L#{lib}", "-lgupnp-1.2", "-I#{Formula["gssdp"].opt_include}/gssdp-1.2", "-L#{Formula["gssdp"].opt_lib}", "-lgssdp-1.2", @@ -67,8 +72,8 @@ def install "-L#{Formula["glib"].opt_lib}", "-lglib-2.0", "-lgobject-2.0", "-I#{Formula["libsoup"].opt_include}/libsoup-2.4", - "-I#{MacOS.sdk_path}/usr/include/libxml2", - testpath/"test.c", "-o", testpath/"test" + "-I" + (OS.mac? ? "#{MacOS.sdk_path}/usr/include/libxml2" : Formula["libxml2"].include/"libxml2"), + testpath/"test.c", *(linker_flags unless OS.mac?), "-o", testpath/"test" system "./test" end end diff --git a/Formula/gvp.rb b/Formula/gvp.rb index a2b02994e44d0..ecad2dd885806 100644 --- a/Formula/gvp.rb +++ b/Formula/gvp.rb @@ -13,6 +13,7 @@ class Gvp < Formula sha256 "ddd00ded9d21c3ecfe23e807619d3ab1b3011bc586db0d7d4aa8d5d87e3689c6" => :el_capitan sha256 "5e63da6d9c8d065277491db1658fee5c53089f7dd1bf1180e5d9e7172b376cde" => :yosemite sha256 "afbe7d649883c750c182976a7c09035fe30f4d56b1b5859c8d214c01334874f7" => :mavericks + sha256 "2148b0df9c6a4b3f9531641da815b9e060a4bfe4c5719cb89e8317affed7be2f" => :x86_64_linux end # Upstream fix for "syntax error near unexpected token `;'" diff --git a/Formula/gwenhywfar.rb b/Formula/gwenhywfar.rb index de5217fb57c91..799556d228622 100644 --- a/Formula/gwenhywfar.rb +++ b/Formula/gwenhywfar.rb @@ -16,13 +16,14 @@ class Gwenhywfar < Formula depends_on "gnutls" depends_on "libgcrypt" depends_on "openssl@1.1" + depends_on "qt" unless OS.mac? def install + args = %W[--disable-debug --disable-dependency-tracking --prefix=#{prefix}] + args << (OS.mac? ? "--with-guis=cocoa" : "--with-guis=qt5") + system "autoreconf", "-fiv" if build.head? - system "./configure", "--disable-debug", - "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--with-guis=cocoa" + system "./configure", *args system "make", "install" end diff --git a/Formula/gwyddion.rb b/Formula/gwyddion.rb index dbd73d5c70ad1..3455b398b823a 100644 --- a/Formula/gwyddion.rb +++ b/Formula/gwyddion.rb @@ -13,7 +13,7 @@ class Gwyddion < Formula depends_on "pkg-config" => :build depends_on "fftw" depends_on "gtk+" - depends_on "gtk-mac-integration" + depends_on "gtk-mac-integration" if OS.mac? depends_on "gtkglext" depends_on "gtksourceview" depends_on "libxml2" diff --git a/Formula/gx-go.rb b/Formula/gx-go.rb index 96e44ad7d86d2..77c7d0b22b80e 100644 --- a/Formula/gx-go.rb +++ b/Formula/gx-go.rb @@ -13,6 +13,7 @@ class GxGo < Formula sha256 "8c86c8465cde5c6189e67f2d3b758604ef579d064f398cd48eff6ab6ce092bdb" => :mojave sha256 "57eb4c948ce99ebca79f938539c1b5e096aef6c16554c30f5744b4e1fc93016d" => :high_sierra sha256 "7eb7a89b575a1cb12464f1a0a4d14c5983333a79fb6e4fbb9c5b5240e540020d" => :sierra + sha256 "0e3a67318fa773982935149507745ad0dc1d01d53498b0737589366a249db4e9" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gx.rb b/Formula/gx.rb index fa7dfd2708514..bc993627466a0 100644 --- a/Formula/gx.rb +++ b/Formula/gx.rb @@ -10,6 +10,7 @@ class Gx < Formula sha256 "f737f5829c0e1ce2ff58c56515e77f3797c30d614a53ebbf663985d5564c62db" => :catalina sha256 "bd03f428c3e52561caefaa09c6abc92b21faa226ad02abeeb6c74217ca1dfbbf" => :mojave sha256 "e6634c1b68abcb48984a7d681248393ca26824a81496c567ef23029ff9a892f5" => :high_sierra + sha256 "2bb95886ac055c55d980e3ac8bb4b080da5fd24ece8d63eb74b68cfd450ac835" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/gxml.rb b/Formula/gxml.rb index 966a4256b1785..235aa3e8e5cc5 100644 --- a/Formula/gxml.rb +++ b/Formula/gxml.rb @@ -9,6 +9,7 @@ class Gxml < Formula sha256 "b9bb621d776f10dc1c3a9bde25964bd26847bf49cdee49ada1c0407f5fb14dbb" => :mojave sha256 "4253e9a1bd9ce221e2287e5d53d39342c65fd06aa63028aa56effae2514854b4" => :high_sierra sha256 "47042a94c013db905170cc0c373b8f7000d77e9c75d2d17dbacad6cd658e6b56" => :sierra + sha256 "028ba6efc562f813b9bda5be0e812ff3f89a3d8dbb261c76d21e57f67b0eca46" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -59,9 +60,9 @@ def install -lglib-2.0 -lgobject-2.0 -lgxml-0.18 - -lintl -lxml2 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/gzip.rb b/Formula/gzip.rb index e13ea525ca0b4..3232bf26abcfe 100644 --- a/Formula/gzip.rb +++ b/Formula/gzip.rb @@ -11,6 +11,7 @@ class Gzip < Formula sha256 "9391f27b1cf04c20abb2320ba55e1f8ac186db22b7c07bf51ebccfab073f85dd" => :mojave sha256 "d639fe5a95eb7c0e12aa1577ca9b230cdbbd31b0ef51794d57415f9a9fa68f08" => :high_sierra sha256 "bfd50566283402c72d15cd87670a3fd8ea122ebbaf583bc8cfafc552340ecf70" => :sierra + sha256 "bb1f268ebdd22f0920bcee62522058f34c28b3b85f69ad084ab7a3e9b78d9d08" => :x86_64_linux end def install diff --git a/Formula/h264bitstream.rb b/Formula/h264bitstream.rb index ed4b70541de42..07d8611b3cc7a 100644 --- a/Formula/h264bitstream.rb +++ b/Formula/h264bitstream.rb @@ -9,6 +9,7 @@ class H264bitstream < Formula sha256 "ac1f452b4c4d4d90310ec1f3cd9ec45271665604844dca55df3f7a91885d28d7" => :catalina sha256 "ebe66ef0a10e2afacf2b418eb15aa57ed873c6df73d6da71b6252efce8c15a5e" => :mojave sha256 "191acedb64e2ab618696fe16c55b81cdadb9819a0b0fc594235d31a28a1cdf96" => :high_sierra + sha256 "2f09eb5070490d75ecee489f88dbd510b2dea24437586702bd7fcc7c7cc7e2ca" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/h2o.rb b/Formula/h2o.rb index b999457f20c61..7aa82ea035af2 100644 --- a/Formula/h2o.rb +++ b/Formula/h2o.rb @@ -10,6 +10,7 @@ class H2o < Formula sha256 "4f8f5c326d24dcfc95faf48849ae89721f1e19a407968cfa67efbc99dba33f76" => :mojave sha256 "80eac6a05ba27ce57142ad1a9211495fa3b044433623438b6319109e2852eb55" => :high_sierra sha256 "049e412820e6495cfb0906101cb00cea928543583cfc1b6986e0a52d1d215d0c" => :sierra + sha256 "ab2cbe25feaff76cfdebac56aa6430d112059280dd120d31b9a01cf3e2c97711" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/h3.rb b/Formula/h3.rb index fc8871a70d808..7ad465360475e 100644 --- a/Formula/h3.rb +++ b/Formula/h3.rb @@ -5,7 +5,7 @@ class H3 < Formula sha256 "b80c2eee2b3e645de77893e27ca149e63d3bb6bf95d33e3a384e3f390e2681bb" bottle do - cellar :any + cellar :any_skip_relocation sha256 "17f1a0f774f7b5a25f1b02fcd19d9edd6fbe2a994aba9ad8bd3e6c964f84ddda" => :catalina sha256 "a100aa0c3fc2a23d01aa4b9524d89a3a457b098563df19ae7b8499b43e2eddca" => :mojave sha256 "67f1d3f546bbea83339951e7b4428a14852453d2049d9d5c24acf894abdd5ad0" => :high_sierra diff --git a/Formula/hackrf.rb b/Formula/hackrf.rb index f394a77883833..f0e4001442d73 100644 --- a/Formula/hackrf.rb +++ b/Formula/hackrf.rb @@ -12,6 +12,7 @@ class Hackrf < Formula sha256 "430173362cc05912520a38f41ce465a0966f1c8d849fd492f0b40074425c3f88" => :high_sierra sha256 "f33bc6bde41e6522d587bc574c01e1402ccbde6759dec5e9d1a1e5f593e189b3" => :sierra sha256 "909a5a9aca6f81cbab08bb7c063f3ee0e666bb5b44af86ebbec62cbdaf3e3b33" => :el_capitan + sha256 "424592f91e9c431fe5580e9051d1ce9f9d56af2185b6ae928be83553e936833d" => :x86_64_linux end depends_on "cmake" => :build @@ -21,7 +22,12 @@ class Hackrf < Formula def install cd "host" do - system "cmake", ".", *std_cmake_args + args = std_cmake_args + unless OS.mac? + args << "-DUDEV_RULES_GROUP=plugdev" + args << "-DUDEV_RULES_PATH=#{lib}/udev/rules.d" + end + system "cmake", ".", *args system "make", "install" end end diff --git a/Formula/hadolint.rb b/Formula/hadolint.rb index 1f4a7c1a9cfcf..cde02f1258dd9 100644 --- a/Formula/hadolint.rb +++ b/Formula/hadolint.rb @@ -13,6 +13,7 @@ class Hadolint < Formula sha256 "63418b66810e1792249522adb0ec5a4b952e4bef34a5425525ca2d7eccbc69ee" => :catalina sha256 "519d3abecbff0d2cc2aaead01027d18e3b061c45dd63de429c4baab0c677b1ed" => :mojave sha256 "bc87517a3a30252c0477e4862146ac33604b355a8c900f566bfaa1f404a284ad" => :high_sierra + sha256 "a868185b4115999f81aa072623e67a81b8bd08dfc0b42ed4f5e12eeaa39a11e8" => :x86_64_linux end depends_on "haskell-stack" => :build @@ -24,6 +25,12 @@ class Hadolint < Formula end def install + unless OS.mac? + gmp = Formula["gmp"] + ENV.prepend_path "LD_LIBRARY_PATH", gmp.lib + ENV.prepend_path "LIBRARY_PATH", gmp.lib + end + # Let `stack` handle its own parallelization jobs = ENV.make_jobs ENV.deparallelize diff --git a/Formula/halibut.rb b/Formula/halibut.rb index 2e6c3019cde0a..daeb4795698d9 100644 --- a/Formula/halibut.rb +++ b/Formula/halibut.rb @@ -11,6 +11,7 @@ class Halibut < Formula sha256 "e9bd74c1ab130f4abc824906bf1f73f910032a4c7c0938798f7fbab2f1346020" => :catalina sha256 "05f0236c180aeab690979615812fb72642e7cdeaccb35ebb865a53aadb35e7c6" => :mojave sha256 "fe74b9670ae0d996a17de4a70a140365d057a83a643125dcbd16b33dacad9f6a" => :high_sierra + sha256 "c09ef61b23b831ec7cec22bef92cb0fba57267d2851e5ca0b72e64e61dc2521c" => :x86_64_linux end def install diff --git a/Formula/hamlib.rb b/Formula/hamlib.rb index e475a51395bce..fe483d614050f 100644 --- a/Formula/hamlib.rb +++ b/Formula/hamlib.rb @@ -10,6 +10,7 @@ class Hamlib < Formula sha256 "cef1ba3b5dcb592c43686f76e9167ee60c19331672164bae5186620d6db7d382" => :mojave sha256 "1a347bc581ea06ee93d2c2ddf955f54a6997484b91aabd304fdc077bd70936b9" => :high_sierra sha256 "eb3ce94a8e752ab792dd306221b74d0a254695d64bd818fbb841ef068b6b7600" => :sierra + sha256 "832cdc1aff6e01179072db578a58637d2378daf8f0ee84fd6dccd0ae462810bc" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/haproxy.rb b/Formula/haproxy.rb index 5bdfc452c478c..4385835aec917 100644 --- a/Formula/haproxy.rb +++ b/Formula/haproxy.rb @@ -9,15 +9,15 @@ class Haproxy < Formula sha256 "3cd36aef002be0bd1bb943592806e33197e0e91dbe95f93663da2ab66a62718a" => :catalina sha256 "6219e88216218b2f1eeca1d84165efa7f1a8806ea8eea34295ec65413a982e14" => :mojave sha256 "42b7cab6acf7112d5baa7c0aeede0626d10827b5cc0b3f960ac58771a3299711" => :high_sierra + sha256 "eaa5a8af157ae30390074302974a4b89ad4bbfd932d92846fb6dd29c14f2594c" => :x86_64_linux end depends_on "openssl@1.1" depends_on "pcre" def install - args = %w[ - TARGET=generic - USE_KQUEUE=1 + args = %W[ + TARGET=#{OS.mac? ? "generic" : "linux-glibc"} USE_POLL=1 USE_PCRE=1 USE_OPENSSL=1 @@ -25,6 +25,7 @@ def install USE_ZLIB=1 ADDLIB=-lcrypto ] + args << "USE_KQUEUE=1" if OS.mac? # We build generic since the Makefile.osx doesn't appear to work system "make", "CC=#{ENV.cc}", "CFLAGS=#{ENV.cflags}", "LDFLAGS=#{ENV.ldflags}", *args diff --git a/Formula/hardlink.rb b/Formula/hardlink.rb index ca4450c282b7d..a22f02ec59729 100644 --- a/Formula/hardlink.rb +++ b/Formula/hardlink.rb @@ -13,9 +13,11 @@ class Hardlink < Formula sha256 "d8b6e2d26d8f49a207c5082a97f1e5c31b35041bcfbc17a217a1c2ad4ff68551" => :el_capitan sha256 "36c30ed90a3d2b9d2d4d07cb182c2838dfba276a05c22d022a42e16043e86f02" => :yosemite sha256 "cba1b82474c668bbb36e2e56cf7b36685924592d291dc05067d7c4a605686084" => :mavericks + sha256 "10427db60f2e993fa3cc0711b493bffff4da377b29d11564a8df1c520cd85372" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build + depends_on "attr" if OS.linux? depends_on "gnu-getopt" depends_on "pcre" diff --git a/Formula/harfbuzz.rb b/Formula/harfbuzz.rb index a4374243c7948..4acf27e10ab6d 100644 --- a/Formula/harfbuzz.rb +++ b/Formula/harfbuzz.rb @@ -9,6 +9,7 @@ class Harfbuzz < Formula sha256 "895c050d4c7cf989e3fd212e88ab904db5d91900b3e7455ff2f026574923042b" => :catalina sha256 "2e8462507d2501793c335f4c7aff91dd8d2e38beb060fc416af7d9bf577158a9" => :mojave sha256 "9ca4eaac80b2db11439e865f977d6b7b330b2bd5ca8f558e23be49acda67b23e" => :high_sierra + sha256 "a00d74acb32149639beba6fab99ae0bb1d19966ea7c12e65a618996cde986f8f" => :x86_64_linux end head do @@ -40,7 +41,7 @@ def install --enable-introspection=yes --enable-static --with-cairo=yes - --with-coretext=yes + --with-coretext=#{OS.mac? ? "yes" : "no"} --with-freetype=yes --with-glib=yes --with-gobject=yes diff --git a/Formula/hashcash.rb b/Formula/hashcash.rb index 67209d488bef7..d64ecd71455c4 100644 --- a/Formula/hashcash.rb +++ b/Formula/hashcash.rb @@ -13,6 +13,7 @@ class Hashcash < Formula sha256 "b9ab067b3001c71dc5cfa3085bfcd204cb4837fd6c87f5ce722bd77b8a629850" => :el_capitan sha256 "b9e7653e9f2c14aad3d4f3589bed6de036e78b766bc01be5ae9f24be0d9696c4" => :yosemite sha256 "5b34b5d7a14ec55622545d823d7a707fcb7b736a88cc531e82799ef85ff8f494" => :mavericks + sha256 "5f36d00d696205be5f23cf4bd7968c7fa07f0d4375d00ef5ead2f5232ffcbb1e" => :x86_64_linux end def install diff --git a/Formula/hashpump.rb b/Formula/hashpump.rb index c1e88a345b5cb..9859436bad9e4 100644 --- a/Formula/hashpump.rb +++ b/Formula/hashpump.rb @@ -10,6 +10,7 @@ class Hashpump < Formula sha256 "117ca0966fcc664caacd251d564dbebde369b0a5b6c9a35242c898f5b12f232e" => :catalina sha256 "71b04dff8cc052944d44566bd79385236db3af53fea647381e587d13503bb148" => :mojave sha256 "e7dc1492f0177f7e186deebccb47428861cd2525bbb352959a2b69608f86de3f" => :high_sierra + sha256 "8603d8275f16d90df42b9402970cf2a1605494684c27a951eb533f4eb29d7049" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/haskell-stack.rb b/Formula/haskell-stack.rb index 62ab26a96080f..9f08f83667b8b 100644 --- a/Formula/haskell-stack.rb +++ b/Formula/haskell-stack.rb @@ -14,6 +14,7 @@ class HaskellStack < Formula sha256 "de6d561271fd1a422e4b4e85e9d71fd0cd87870d524e984aec3caab4762753ed" => :catalina sha256 "bffb38f057df538f22407b0c7e62cf224f60851b4845f8ef3cd7ee603f030fed" => :mojave sha256 "00038523c213ac96e759c01108a9867a55afc6ba3ea32646962493f29667b702" => :high_sierra + sha256 "f642874c842e39813d0557c78a2c0d6aa1478b882247742a33108c3f4dc64a7a" => :x86_64_linux end depends_on "cabal-install" => :build @@ -52,6 +53,12 @@ class HaskellStack < Formula end def install + unless OS.mac? + gmp = Formula["gmp"] + ENV.prepend_path "LD_LIBRARY_PATH", gmp.lib + ENV.prepend_path "LIBRARY_PATH", gmp.lib + end + (buildpath/"bootstrap-stack").install resource("bootstrap-stack") ENV.append_path "PATH", "#{buildpath}/bootstrap-stack" diff --git a/Formula/haste-client.rb b/Formula/haste-client.rb index 44547c3daa1e8..54a9e963c913c 100644 --- a/Formula/haste-client.rb +++ b/Formula/haste-client.rb @@ -22,9 +22,10 @@ class HasteClient < Formula sha256 "c38551ce841f7a3cd825e1ae20b774836aba13fe6e129c1539eadde9b9e64a02" => :mojave sha256 "a97b7aaf38ec730bffa45ffc073ccf4921b4e5714069a21bf63e682a9d21527e" => :high_sierra sha256 "746af59be7c010e6e13b67d1f98766c0237061eabca601e5f0cad935e1c648bf" => :sierra + sha256 "5598d125cd66482f558d0bb7200b535752ac5d999fafa567916c98042a7a9d28" => :x86_64_linux end - depends_on "ruby" if MacOS.version <= :sierra + depends_on "ruby" if !OS.mac? || MacOS.version <= :sierra resource "faraday" do url "https://rubygems.org/gems/faraday-0.12.2.gem" diff --git a/Formula/haxe.rb b/Formula/haxe.rb index 2a97dd6751532..ebe18dd858aaf 100644 --- a/Formula/haxe.rb +++ b/Formula/haxe.rb @@ -20,6 +20,10 @@ class Haxe < Formula depends_on "mbedtls" depends_on "neko" depends_on "pcre" + unless OS.mac? + depends_on "m4" + depends_on "unzip" + end uses_from_macos "m4" => :build uses_from_macos "unzip" => :build diff --git a/Formula/hayai.rb b/Formula/hayai.rb index 5b3c2266bc0d1..fc7b8f588a863 100644 --- a/Formula/hayai.rb +++ b/Formula/hayai.rb @@ -11,6 +11,7 @@ class Hayai < Formula sha256 "c28fb50fbaed6281dafa6b8ec7b2cafc45fe3255bcc57a6678dbac5da67e4dca" => :high_sierra sha256 "d2702e169ba0c8a8b79f3df6f83fc2268b95b0b0d2c2c4d11387ea99011800f4" => :sierra sha256 "0a9089377b36a1f719966add1fcd01780e27e250db062affb818236e9b8161c6" => :el_capitan + sha256 "321c19da0e0431910e97953db3e2034bee4241e3c87291187118d7e5d01d11a9" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/hbase.rb b/Formula/hbase.rb index 315f8f0f35f77..416472fcfcbe1 100644 --- a/Formula/hbase.rb +++ b/Formula/hbase.rb @@ -20,6 +20,7 @@ class Hbase < Formula depends_on :arch => :x86_64 depends_on :java => "1.8" depends_on "lzo" + depends_on "gcc" => :build unless OS.mac? resource "hadoop-lzo" do url "https://github.com/cloudera/hadoop-lzo/archive/0.4.14.tar.gz" @@ -44,7 +45,11 @@ def install ENV["CLASSPATH"] = Dir["#{libexec}/lib/hadoop-common-*.jar"].first ENV["CFLAGS"] = "-m64" ENV["CXXFLAGS"] = "-m64" - ENV["CPPFLAGS"] = "-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers" + ENV["CPPFLAGS"] = if OS.mac? + "-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers" + else + "-I#{Formula["jdk"].opt_include}" + end system "ant", "compile-native", "tar" (libexec/"lib").install Dir["build/hadoop-lzo-*/hadoop-lzo-*.jar"] (libexec/"lib/native").install Dir["build/hadoop-lzo-*/lib/native/*"] diff --git a/Formula/hcloud.rb b/Formula/hcloud.rb index 43dd9675934f4..33716c1f9fdfe 100644 --- a/Formula/hcloud.rb +++ b/Formula/hcloud.rb @@ -9,6 +9,7 @@ class Hcloud < Formula sha256 "debfe78e08032ec00f3e6148436448ffaa582250403bf5b25187d12cfa089d6b" => :catalina sha256 "1b09fa77e68369fbf6645ca893a17a968a6ae993b1db606a3b5051ba26fcf212" => :mojave sha256 "db71a37915f37e6403b68f2adea77c88f2e5c150e29b544abc8eee2a71a95a4c" => :high_sierra + sha256 "e6c2ad4693b6ffca70207328baaf5cc52d1218b355a02d129f84d9da7dee8eba" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/hdf5.rb b/Formula/hdf5.rb index 7b4e002a90ab4..9d778bfdee104 100644 --- a/Formula/hdf5.rb +++ b/Formula/hdf5.rb @@ -5,10 +5,11 @@ class Hdf5 < Formula sha256 "97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61" bottle do - cellar :any + cellar :any_skip_relocation sha256 "6c68f33613e960a0c9efec780d07d34c2ce9c0795d723af7027ee6b88219abbf" => :catalina sha256 "77cf2db15c52c69da64ca5535eb03e44ec2bd953cbb2166996580739db467241" => :mojave sha256 "88a4048d5d26ccea95574726fd874d8b69409301ed6a0f36d9c695168b3fc144" => :high_sierra + sha256 "54866f1dc9588683a76e513f16769ccb4b217b4a915dbb6abbe3d57841451394" => :x86_64_linux end depends_on "autoconf" => :build @@ -39,6 +40,7 @@ def install --enable-fortran --enable-cxx ] + args << "--with-zlib=#{Formula["zlib"].opt_prefix}" unless OS.mac? system "./configure", *args system "make", "install" diff --git a/Formula/hdf5@1.8.rb b/Formula/hdf5@1.8.rb index 5ddd4c2018d0c..76c2668e317e3 100644 --- a/Formula/hdf5@1.8.rb +++ b/Formula/hdf5@1.8.rb @@ -6,11 +6,12 @@ class Hdf5AT18 < Formula revision 1 bottle do - cellar :any + cellar :any_skip_relocation sha256 "0c2c48212b24bc407e6ee83a640dcc35348eed417d7ca0f8742701af4f6975b1" => :catalina sha256 "1485cae9d86cf8858cbad57558e7fe5c87092df6558cf89781daf10abad1af5f" => :mojave sha256 "ec5ff75dd845f8718f816e2729ede6cb163866e86c16a9a206eea7a243846f94" => :high_sierra sha256 "3830625c54aa43948efd6bf23a84caee2be2427bf1345183b7b08075c32e7d3d" => :sierra + sha256 "bd203c55e5405a9b492bd4f9e9baf4eaea8e9528d60bd9146a653ab2dbb2b878" => :x86_64_linux end keg_only :versioned_formula diff --git a/Formula/heatshrink.rb b/Formula/heatshrink.rb index b176322579726..bbb4aa1978c1e 100644 --- a/Formula/heatshrink.rb +++ b/Formula/heatshrink.rb @@ -10,6 +10,7 @@ class Heatshrink < Formula sha256 "504b4b64164343217c6852509b59858494ba38ad9b63e7a9b3bb247290833582" => :mojave sha256 "865d11380a3e586a962a5dec0069def43e777f20626bdc5396735d003d90d20b" => :high_sierra sha256 "3965350f672040dfec9d2e07ac5f26aa16b324f59d2a762a4faac0930d2de684" => :sierra + sha256 "e123eeaf3cb1a91fee75c354d7655e81a3f1352d9dae4f4b5797cf7dbe3d00f9" => :x86_64_linux end def install diff --git a/Formula/hebcal.rb b/Formula/hebcal.rb index c3a49f490bb7d..30d6f3c332013 100644 --- a/Formula/hebcal.rb +++ b/Formula/hebcal.rb @@ -9,6 +9,7 @@ class Hebcal < Formula sha256 "ce90a45b81d9339bcc51c84905d58b406b489d0a52ab5c1ad250ae75822ec7c2" => :catalina sha256 "38f782313236f406e78c8cfd8c65145da3bfce221580b1c5f5d26cdc1655d23c" => :mojave sha256 "76cf4ff0475218d4d51e4fbbf1a8ee36df7b5e64c8d9cde524083b35b5e4e4a3" => :high_sierra + sha256 "ad58269750b24f4ce2befc1c3644f21e90a45f49c1ff7c77a6cdd7cbfb27c49c" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/hello.rb b/Formula/hello.rb index 472c6362a1e31..bcc8a6d66193b 100644 --- a/Formula/hello.rb +++ b/Formula/hello.rb @@ -13,6 +13,7 @@ class Hello < Formula sha256 "54ac46b692fcca2abe77aeeca41976172a2dc24a6762f84a47fabcaba336df89" => :el_capitan sha256 "f81a305402e8f8b6cf11a17dac81f604b6f48d940909886a6733cf4f6a64c05f" => :yosemite sha256 "c80495cb6d1ad8f2c3a64c22c9dcee9d0117ca25fa6426f20a6acca275cd6c56" => :mavericks + sha256 "f81d7c0a3eee9fd62ebdecf685fbc5284e40d4a61c372d554fd45719e52a43cc" => :x86_64_linux # glibc 2.19 end conflicts_with "perkeep", :because => "both install `hello` binaries" diff --git a/Formula/helm.rb b/Formula/helm.rb index 5d5d0baee3c82..6ecee3f958560 100644 --- a/Formula/helm.rb +++ b/Formula/helm.rb @@ -12,6 +12,7 @@ class Helm < Formula sha256 "ef144157585daf829c63c3a8fe35563b743f5783b92671f6707970b138e9dc06" => :catalina sha256 "4d2f7c76c460765302cac696913707ad0b4ab7b2491f1cae4879f44c1f2e114f" => :mojave sha256 "3a09f9884497cd0c9de782913a1c6c44b31a93945ee72bbf377fac00411d670c" => :high_sierra + sha256 "a72b084aa72cbe3c8771599d5778f147d7e9419777f3ba92f7a3e3ea0b72e9c5" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/helm@2.rb b/Formula/helm@2.rb index 2a487a2723f88..e77ef9e0ad7d3 100644 --- a/Formula/helm@2.rb +++ b/Formula/helm@2.rb @@ -10,6 +10,7 @@ class HelmAT2 < Formula sha256 "949b1de3c0b2a99db03e6836cd58e8747c8114ff8d2c051ddb8dccfd86365bcc" => :catalina sha256 "8a527e486b748d271e08f5de2a11ba3d00e431c84c11972cb05da025dad6df2d" => :mojave sha256 "2a03856a9bc1736b0ebb5c9d274519c330870c5fc36d6e1bc34aa1aecc61d15d" => :high_sierra + sha256 "dbeee23b4e75c9868c73714ce4d449ee4eb02b243c18644ce8be9983eb8740fc" => :x86_64_linux end keg_only :versioned_formula diff --git a/Formula/helmfile.rb b/Formula/helmfile.rb index f2992c4063cb7..d1f7473282451 100644 --- a/Formula/helmfile.rb +++ b/Formula/helmfile.rb @@ -9,6 +9,7 @@ class Helmfile < Formula sha256 "17ac042654a94fe48a948771bc7ed00f767edc37f9c435e57359b3d18051764e" => :catalina sha256 "5a805095c66e495cef31dc1073dccd64b195850743f7227e11391c644174c99d" => :mojave sha256 "8ad2372905a87d32a47bc6580edc811dceb8ffb283a53d8b8172b65b4549852a" => :high_sierra + sha256 "2a61550448709e9328b9f8f53b267a96ff761c1f11ccc1c0f09c5c25e91d73be" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/helmsman.rb b/Formula/helmsman.rb index 78f6efbb7623f..e67c8d81e836d 100644 --- a/Formula/helmsman.rb +++ b/Formula/helmsman.rb @@ -10,6 +10,7 @@ class Helmsman < Formula sha256 "124144b8d17651350350433fe6e65dcb6025146b27919c171fd6d4c6d37a7cf7" => :catalina sha256 "6b279f354d6c1b1ba6d9340750fca9b7809823354f892f4f941a8fcbd3f10d82" => :mojave sha256 "a7a21e2b4f07b283c989f0ce373ecbfe805788025656bdcfbbe3d74f9114419d" => :high_sierra + sha256 "d04b27ed705364ebb00acd8d80a4a72717b361cc4be65ab8445777217522e908" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/help2man.rb b/Formula/help2man.rb index 46860f9f14e7c..78db500a024e0 100644 --- a/Formula/help2man.rb +++ b/Formula/help2man.rb @@ -10,6 +10,7 @@ class Help2man < Formula sha256 "cba0670fe0e53aea5168c16650daf10871a3c0590341097d5a7ca18bedb4bcb8" => :catalina sha256 "cba0670fe0e53aea5168c16650daf10871a3c0590341097d5a7ca18bedb4bcb8" => :mojave sha256 "cba0670fe0e53aea5168c16650daf10871a3c0590341097d5a7ca18bedb4bcb8" => :high_sierra + sha256 "93f5c1d8f0d05ee6be19259f0af279bf7151eb4a50078030af0952c75c57af61" => :x86_64_linux end def install diff --git a/Formula/hesiod.rb b/Formula/hesiod.rb index 4b75a50e21c1e..b205f37094ac8 100644 --- a/Formula/hesiod.rb +++ b/Formula/hesiod.rb @@ -6,11 +6,12 @@ class Hesiod < Formula revision 1 bottle do - cellar :any + cellar :any_skip_relocation rebuild 1 sha256 "2e077b355ca0ed9f0bbadfc7b54ef681fc11f58c324ce19d3131fb61b99f15d2" => :catalina sha256 "76748e285f22aed694c2933e4cd3a1469398ea254671755e6f89ad07e76b7f73" => :mojave sha256 "de927a6526209db3673aa9e426d7e32f53b7a278798f07d6dc1c5069e816d09a" => :high_sierra + sha256 "0d9ae63a2b02aec55126fb87cde0bd50c4032f6f644f78fc2d1a17c99ea7f292" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/hevea.rb b/Formula/hevea.rb index 3cbdbd9200740..bd79b4f29a475 100644 --- a/Formula/hevea.rb +++ b/Formula/hevea.rb @@ -8,6 +8,7 @@ class Hevea < Formula sha256 "34fd968c75f335330d256da9ad1b3e39b65b4286deb36810f898a6a729794b41" => :catalina sha256 "780ecfdaaac0985d9d9a6ef2b92c966d101144637bb65c41880f9b71c27c3c13" => :mojave sha256 "851ce38d9468eee9b2548f303e1e9d029e863dadcf90caa68039b8615b5acf07" => :high_sierra + sha256 "b65ce0574a034d175dc408c4d50845875e26d63222424fc9a35e43ca5993fb78" => :x86_64_linux end depends_on "ocamlbuild" => :build diff --git a/Formula/hexedit.rb b/Formula/hexedit.rb index 1b4a1491979e0..16ed8dcb23c01 100644 --- a/Formula/hexedit.rb +++ b/Formula/hexedit.rb @@ -12,6 +12,7 @@ class Hexedit < Formula sha256 "9a6c6e290d26d793c2e2b85a1cc1ef0147ea70d957859228d5a363c8ebb3fb4f" => :high_sierra sha256 "c93767f4bec81f4d372d4af42a7505131f61ce4992b2549210aa464ee5b309ce" => :sierra sha256 "8939412f612cb0b5a8fd49fc1045bdd9dee9f729cf741fba2421ed28deeadc82" => :el_capitan + sha256 "fbdf1a49a8ab54301abb8ac9df6a5ff10190bae5f2d6c976cc61ea86e0fa411a" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/hexyl.rb b/Formula/hexyl.rb index 0125c5f860ddc..ad2e440ec4632 100644 --- a/Formula/hexyl.rb +++ b/Formula/hexyl.rb @@ -9,6 +9,7 @@ class Hexyl < Formula sha256 "2443b91247ef98143863f23724ab1ffe3b192aa65471d2198ab02ffa72936ce9" => :catalina sha256 "465474b8dd2b6344efda4d611341a0d40c46965fabce4e3446bb3bc0a45c2392" => :mojave sha256 "8805fb02b8cc13ffe9ca11663140f502dfbcbe5a4cbdf1262bd88758bc88167f" => :high_sierra + sha256 "e05d4c3583ba9f0b2baf281051dd5f3b051502d49075f903b704b30f3602efac" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/hey.rb b/Formula/hey.rb index 2bb395d2729bd..6813c6a246cfc 100644 --- a/Formula/hey.rb +++ b/Formula/hey.rb @@ -10,6 +10,7 @@ class Hey < Formula sha256 "833f09f5322dd41cc3438f9880d557941652073d02acc2971181aa1c5b4f6a7d" => :catalina sha256 "902d975f8dbc7f27890d56eed1a377bd880225b6860e2e7db6fed4f03e58c077" => :mojave sha256 "2111023b9742683d7beb4c1383f59daff60fe019ffcf5fbc91d9e3f68386dc5f" => :high_sierra + sha256 "bf990ec4a12d1d422967561409f41f0bd1fec17ff3e4474ae7f315b6cd1d9b79" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/hfstospell.rb b/Formula/hfstospell.rb index 4970a8c8c35e9..69d80d4fe3b9f 100644 --- a/Formula/hfstospell.rb +++ b/Formula/hfstospell.rb @@ -10,6 +10,7 @@ class Hfstospell < Formula sha256 "82553e62189a1eeb0a759f5a0dddc57c21c6545ee35f1b59338c3fb0efca765f" => :catalina sha256 "4ed2a4a266fad9dd113fe2221bff23b460c9e50bb956b1eba5b8ba15fb756626" => :mojave sha256 "f5ebd7bb299f5e660c8b559bed232bc6fc6ec4ea98691384d385f3afcf4a6c96" => :high_sierra + sha256 "5b6eadbac05120a94ff99c9157f6691303baf7dc8459efc50d1a5fe881a305d2" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/hfsutils.rb b/Formula/hfsutils.rb index 575294f99a97d..c4d5301058230 100644 --- a/Formula/hfsutils.rb +++ b/Formula/hfsutils.rb @@ -15,6 +15,7 @@ class Hfsutils < Formula sha256 "61847361f9dac3c719ae8fb464fb9e45d7b64054c7d3c2ff23b37a698546f63d" => :el_capitan sha256 "2d0997b77b2bc7b3a0454c552c6ebd3b24c6efc01bc9e4814781f7971c8802f9" => :yosemite sha256 "06dddcb4d540a24b63b389213724b828f99bfc7c32272be1a9e4ca4472409c93" => :mavericks + sha256 "9ca489587e4b4c411a86ffe28276e31893afdb40e12a22903fbd108ab5cc9b10" => :x86_64_linux end def install diff --git a/Formula/hicolor-icon-theme.rb b/Formula/hicolor-icon-theme.rb index fe5d1cdbb4658..75908515d35bd 100644 --- a/Formula/hicolor-icon-theme.rb +++ b/Formula/hicolor-icon-theme.rb @@ -12,6 +12,7 @@ class HicolorIconTheme < Formula sha256 "cd8699f3944eb87b76fc89e4ca69f19df5d66aa8a4c89d636660d299e807f5b0" => :sierra sha256 "cd8699f3944eb87b76fc89e4ca69f19df5d66aa8a4c89d636660d299e807f5b0" => :el_capitan sha256 "cd8699f3944eb87b76fc89e4ca69f19df5d66aa8a4c89d636660d299e807f5b0" => :yosemite + sha256 "05712571f085c9c1f4624dacc8a0c1d98aa2b5ba8db0d61640b41ca3198cee06" => :x86_64_linux end head do diff --git a/Formula/hidapi.rb b/Formula/hidapi.rb index 47b77757df176..a8c5348eafd9e 100644 --- a/Formula/hidapi.rb +++ b/Formula/hidapi.rb @@ -11,6 +11,7 @@ class Hidapi < Formula sha256 "8e4c1959c227e51e8bc8e45532838dff3fd5c58aff90a03eb1e19d9cd51f7160" => :mojave sha256 "0b972366a1dc78445d448b40892ef7885fb682eb2042e41723274d2e50388732" => :high_sierra sha256 "befada3ffe32de1d7363d0a958aec534b248d8cd45111c4f30a6f46bb0ac401b" => :sierra + sha256 "0bb8f5c921e50973382a869091c068dc973c5fe17510cf4a55bcea8ef0783428" => :x86_64_linux end depends_on "autoconf" => :build @@ -18,11 +19,17 @@ class Hidapi < Formula depends_on "libtool" => :build depends_on "pkg-config" => :build + unless OS.mac? + depends_on "systemd" # for libudev + depends_on "libusb" + end + def install system "./bootstrap" system "./configure", "--prefix=#{prefix}" system "make", "install" - bin.install "hidtest/.libs/hidtest" + # hidtest/.libs/hidtest does not exist for Linux, do not install it + bin.install "hidtest/.libs/hidtest" if OS.mac? end test do @@ -34,7 +41,7 @@ def install } EOS - flags = ["-I#{include}/hidapi", "-L#{lib}", "-lhidapi"] + ENV.cflags.to_s.split + flags = ["-I#{include}/hidapi", "-L#{lib}", OS.mac? ? "-lhidapi" : "-lhidapi-hidraw"] + ENV.cflags.to_s.split system ENV.cc, "-o", "test", "test.c", *flags system "./test" end diff --git a/Formula/highlight.rb b/Formula/highlight.rb index 164b970bbb2cd..4105eeced6b20 100644 --- a/Formula/highlight.rb +++ b/Formula/highlight.rb @@ -9,6 +9,7 @@ class Highlight < Formula sha256 "243c2078603d4f83e931300382e2aaa21972251a99ebe50b822e673bd358a502" => :catalina sha256 "6030a1c16c514c91897d6ab538f5ec6f41efffbecfe836df7e7edda555f15b2e" => :mojave sha256 "cc27431c8f13763d6c75b377345e324f16060eebdd1687fbf40b0b2331ea1c89" => :high_sierra + sha256 "3a25d725a3972334f35de9062eb1beb933798cf6ddc8f939f5c6c04bc976e43c" => :x86_64_linux end depends_on "boost" => :build diff --git a/Formula/hiredis.rb b/Formula/hiredis.rb index fd45582745559..ab5cdea117dae 100644 --- a/Formula/hiredis.rb +++ b/Formula/hiredis.rb @@ -11,6 +11,7 @@ class Hiredis < Formula sha256 "4b089bee868b4fe533bea75917f21a42a11a9e04d5b396ec5a94d5623372ec0b" => :catalina sha256 "8974f8bacac7ce018f6f238915c6c5f07751c5183283337634a1715624d344b8" => :mojave sha256 "5ed94f51e6dbe91f7d195be5a5d085c7929f82bafeecba8645dd2315a94dad8d" => :high_sierra + sha256 "485e1830b65f243acfed9989791282f7973625b50b781cbd722ec27dbf3bb322" => :x86_64_linux end def install @@ -21,8 +22,8 @@ def install test do # running `./test` requires a database to connect to, so just make # sure it compiles - system ENV.cc, "-I#{include}/hiredis", "-L#{lib}", "-lhiredis", - pkgshare/"examples/example.c", "-o", testpath/"test" + system ENV.cc, "-I#{include}/hiredis", "-L#{lib}", + pkgshare/"examples/example.c", "-o", testpath/"test", "-lhiredis" assert_predicate testpath/"test", :exist? end end diff --git a/Formula/hivemind.rb b/Formula/hivemind.rb index 35dce1a841b2c..302afa647d375 100644 --- a/Formula/hivemind.rb +++ b/Formula/hivemind.rb @@ -11,6 +11,7 @@ class Hivemind < Formula sha256 "8e6f70ca5e0c8eb1e42d47bee207ec5333b453660d808103a36d53c51a7fb59a" => :mojave sha256 "7a89018774693681975cea22dcdebe35df043507476d1318f195e6d194978693" => :high_sierra sha256 "4aa25b52b5c7fd3dc7ae29ab31cf19eeddde4e7685fd7e9838be0ea8cf09f3c1" => :sierra + sha256 "e74b7949bb598fe11915c409c0028787bf0d97a7dc915df165dac884077a372b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/hledger.rb b/Formula/hledger.rb index 7698885061ce2..99c9807a57249 100644 --- a/Formula/hledger.rb +++ b/Formula/hledger.rb @@ -9,6 +9,7 @@ class Hledger < Formula sha256 "d3a0849f59d9db817166c2d029d5ea25d9a95d62f8a9b4f9db2bda443d4d2aaa" => :catalina sha256 "64cda6dc29ef5bc5fe65f6c3669a1738076849798a030bc8819166001b13ec62" => :mojave sha256 "702f4abb102cb59528c4f33a6d6a6aa48c7a12cf0db0008e493cef429e62060a" => :high_sierra + sha256 "fee85c06bf26dcf4a423fbf12ecc60552827ce0132fe9facd95e648d294436bf" => :x86_64_linux end depends_on "ghc@8.8" => :build diff --git a/Formula/hlint.rb b/Formula/hlint.rb index 8b2483ffdfe56..8a731efce395a 100644 --- a/Formula/hlint.rb +++ b/Formula/hlint.rb @@ -10,10 +10,10 @@ class Hlint < Formula head "https://github.com/ndmitchell/hlint.git" bottle do - cellar :any_skip_relocation sha256 "a385bc86bdad4e1e59180e844b1f6371577ca05e17039094988d2c404ba9b769" => :catalina sha256 "3e395a8ccaded15d81e5e970b4347a2484669e9cdd5ab27373f224297af090aa" => :mojave sha256 "cba025cfb5157f42fec2fdb4e3ef6fb798f44e9daca5e1a860a722931a5c5f6b" => :high_sierra + sha256 "981a226def5994936407d59ebde3fd92a27d31c09191c5943ad220df88786940" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/hmmer.rb b/Formula/hmmer.rb index aeabcb86acf21..2db2112d732df 100644 --- a/Formula/hmmer.rb +++ b/Formula/hmmer.rb @@ -9,6 +9,7 @@ class Hmmer < Formula sha256 "6cafc97dbddaa66d9e353f161ce402786d887aea8a88f52be3323ffc4cf5733b" => :catalina sha256 "544c93b2fc808d5176ac562689afb59785f24ef29f3198b8ca24adf2c5fab422" => :mojave sha256 "aac6c2a8264ae6192bff7dd02c57cfe5000e830a0991c9e5be8c0fc27b0daded" => :high_sierra + sha256 "9caf124b1d99aaf51490be0c56d06e798b83fa6c4d004037d53ed45def34de17" => :x86_64_linux end def install diff --git a/Formula/hoedown.rb b/Formula/hoedown.rb index 864c2f04b023e..44f5f84fccb3e 100644 --- a/Formula/hoedown.rb +++ b/Formula/hoedown.rb @@ -13,6 +13,7 @@ class Hoedown < Formula sha256 "7076f6f7c091919a3619a5a5655270d79dab42fdb6d7dfdc3f1324318ca4ec6d" => :el_capitan sha256 "fc37aa79feca395a49b3e15348d8156721ba1713dfb740622c57a696d1ec5e58" => :yosemite sha256 "9940929bd2ede20f973f29fdac888c6b664188bf29e9a1f7c8eba0eeb42e6206" => :mavericks + sha256 "8d0e90be87359409d4e3fe2b71b694ecff20deeff2ff01398c6d9691f894c428" => :x86_64_linux end def install diff --git a/Formula/homeassistant-cli.rb b/Formula/homeassistant-cli.rb index 41d8e87e11ed9..143dc0691f063 100644 --- a/Formula/homeassistant-cli.rb +++ b/Formula/homeassistant-cli.rb @@ -12,6 +12,7 @@ class HomeassistantCli < Formula sha256 "147e080fb5b9377766c8788a371ac336da5568e960b6857468a94c2410d8ff15" => :catalina sha256 "70ebba0eb012d61f1d523ecbb72cb95ec411d63a358c06d881f0c50599919d11" => :mojave sha256 "a7d4301ca443bc0e0a2761d4592515e027e1bfa964a07de6752bb0f714e0f2bf" => :high_sierra + sha256 "d3349dabfdf43f07f9865312b4298b4ed411ae5313e6f96e927d9f1c68e8cb03" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/homebank.rb b/Formula/homebank.rb index c13c86095bd3e..0c4b5067e625d 100644 --- a/Formula/homebank.rb +++ b/Formula/homebank.rb @@ -23,6 +23,9 @@ class Homebank < Formula depends_on "libsoup" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--with-ofx" chmod 0755, "./install-sh" diff --git a/Formula/homeworlds.rb b/Formula/homeworlds.rb index 1fa8a3a33fe67..e727bab361957 100644 --- a/Formula/homeworlds.rb +++ b/Formula/homeworlds.rb @@ -13,6 +13,7 @@ class Homeworlds < Formula sha256 "499e9a94e24c8965b9a31902ab2a14a021c780756451b82ac2313c7c86ac5756" => :sierra sha256 "2665c0ed4da2eb399314d044699385250ca5db54e6f8c22287222b7877881d22" => :el_capitan sha256 "47251f13fa79c98b3c41d45cafade044bded134256f56e6ee1a118f67eb325d8" => :yosemite + sha256 "1711c3c72acb7a7950fb2a79e117ca8dacfbdad7cd3b5652d0d0bfba2bcbd5b4" => :x86_64_linux end depends_on "wxmac" diff --git a/Formula/honcho.rb b/Formula/honcho.rb index 6005396f074d5..bb295e96b3aed 100644 --- a/Formula/honcho.rb +++ b/Formula/honcho.rb @@ -10,6 +10,7 @@ class Honcho < Formula sha256 "986c98221b9bb025b0c8fa8c1f4ca150ee1853488f6060b603c54aa7e02c8be1" => :catalina sha256 "986c98221b9bb025b0c8fa8c1f4ca150ee1853488f6060b603c54aa7e02c8be1" => :mojave sha256 "986c98221b9bb025b0c8fa8c1f4ca150ee1853488f6060b603c54aa7e02c8be1" => :high_sierra + sha256 "ba51fe77254a7d8bdef58fb819c8a659c2d7db9afcd26bb165288a08925a2380" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/hostess.rb b/Formula/hostess.rb index d70a0dc6dd710..7d37648b49677 100644 --- a/Formula/hostess.rb +++ b/Formula/hostess.rb @@ -10,14 +10,12 @@ class Hostess < Formula sha256 "80480773a167fdcad3fadb3feeb298b51aeb89aec5863204f512f941af7271da" => :catalina sha256 "f3f06881067507c0d115209d515e6ebbe4090d7aa8fcff7bc685027c49ea6479" => :mojave sha256 "15050f5b2f5936fe74e47937323c8a872ec12b75ed639b3df2c6eac11cf7da6f" => :high_sierra + sha256 "515ef98b1abb5cc9acacf89d6771636147886668af0b7fa6eff01e2dc0d91ae4" => :x86_64_linux end depends_on "go" => :build def install - ENV["GOOS"] = "darwin" - ENV["GOARCH"] = "amd64" - system "go", "build", "-ldflags", "-s -w -X main.version=#{version}", "-o", bin/"hostess" end diff --git a/Formula/howard-hinnant-date.rb b/Formula/howard-hinnant-date.rb index 80ad6f8e5de29..3dbc6acd97835 100644 --- a/Formula/howard-hinnant-date.rb +++ b/Formula/howard-hinnant-date.rb @@ -9,6 +9,7 @@ class HowardHinnantDate < Formula sha256 "336157e546ea77db5ec3c0360b4e873e8c6ec265aa6dedb2fe19d45a6df207fb" => :catalina sha256 "20a35158d9c478a553baae673544620546db6f31825f9e052a0bbf07086e773e" => :mojave sha256 "f23b72ea88d5c0bc12f2e93dff65ba6a9867d88831294fc5c770f2d0a39762fa" => :high_sierra + sha256 "22c1c286e4ca22f4aef885239fa19ce328d683bd6a0d53ae8b06add94b26c5b5" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/howdoi.rb b/Formula/howdoi.rb index 450b7acd539b5..7cc40fe07b20d 100644 --- a/Formula/howdoi.rb +++ b/Formula/howdoi.rb @@ -5,13 +5,14 @@ class Howdoi < Formula homepage "https://github.com/gleitz/howdoi" url "https://files.pythonhosted.org/packages/03/db/c9b5bb64adac16b0feab7924fb1134ce88bc38f7af4e74aca27c48de26df/howdoi-1.2.1.tar.gz" sha256 "3b322668606d29d8a841c3b28c0574851f512b55c33a7ceb982b6a98d82fa3e3" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "b2a140c27beb5eb6cf0828112a4c90983014d36d50c66096a68773b0d47410a8" => :catalina sha256 "eba1481a04f930805a0033c3213ae837464c600d6bc4f7bf3a3db4d17e328ae2" => :mojave sha256 "bb5109a1450ea626cfaacae8001b086495ba7b33a14e7ea6b27dcb243f2421be" => :high_sierra + sha256 "21c5f70f0b5e7e87a468f1873bbf5c97c3e5fcf9cf1df1d5ffbeb72f2c2ea1e4" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/hss.rb b/Formula/hss.rb index 7fb3d1a5743c0..5ae2c9b57acf5 100644 --- a/Formula/hss.rb +++ b/Formula/hss.rb @@ -10,6 +10,7 @@ class Hss < Formula sha256 "bc7f0e8a54effd65cae855164b7ea0d287af079ceec01accebb74f476e04c863" => :mojave sha256 "e6b884c0c3f45c0365c39d65f644281c0079899b96d7835ad7fdab6e2e67c338" => :high_sierra sha256 "4d23f98a3af8e2facd71c61616a207bb7c990bb2b9c5c52ca9a772cc6aecd0be" => :sierra + sha256 "6cff00cde752aa5af09131c5f6cded34d828b826f02ba3199caed87a50567af1" => :x86_64_linux end depends_on "readline" diff --git a/Formula/hstr.rb b/Formula/hstr.rb index 55096c61735d6..e45642dabfcc5 100644 --- a/Formula/hstr.rb +++ b/Formula/hstr.rb @@ -9,6 +9,7 @@ class Hstr < Formula sha256 "5b3c9395c5d63b3a75bad4ef78ec8eb7d1e359fd72904feab750bf9d162f44ec" => :catalina sha256 "99916c805fb5e557e366c1c0cff89d160148607f0a401084fd555c4ba6619c4d" => :mojave sha256 "a8477c9cd9c66f9d9045328615941f0d1366441cf282c2011f71c4f7061302ba" => :high_sierra + sha256 "e317274c7c5423b74e298e7418783225fe1e673f967da4d4ac9ca1dc46dc222e" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/ht.rb b/Formula/ht.rb index fb92fb9e9b39a..867fdf9d9c67d 100644 --- a/Formula/ht.rb +++ b/Formula/ht.rb @@ -12,6 +12,7 @@ class Ht < Formula sha256 "8c604066c63fa1eba3bb547626bbc280ea4446bb2961cb54e8b4fc7b829af5c4" => :high_sierra sha256 "197a62339202dd45529bbf42b67addc35939dbae43cc9704ff15d75e5ad62d01" => :sierra sha256 "4556713b40bfd3846c7c03a02c174bff2a771fba4084721b6faed88437c3c1a2" => :el_capitan + sha256 "3c250d340329c3b7061546a92dd70fa740ef8b3c651f44e88fc011cdeeec829e" => :x86_64_linux end depends_on "lzo" diff --git a/Formula/html-xml-utils.rb b/Formula/html-xml-utils.rb index e4e7edb099547..c992032d4642d 100644 --- a/Formula/html-xml-utils.rb +++ b/Formula/html-xml-utils.rb @@ -9,6 +9,7 @@ class HtmlXmlUtils < Formula sha256 "28e913a33a61be2662a9aeedb18afd3e61f7ff31f533221e2382fc16845984a2" => :catalina sha256 "8e290495b957bc609598e4a2e6fb26512011e0c433a5058d807d86e406a406ab" => :mojave sha256 "2aa00ada9b366c012d149ff28c99d0054a7b166d2088700482e6118e16580358" => :high_sierra + sha256 "0b9e9da446aee0a0f8c826b11f192bd6ea419b04e73ca17c0f370177b8e358ca" => :x86_64_linux end def install diff --git a/Formula/html2text.rb b/Formula/html2text.rb index 43ad8528477ca..f834b10286a9a 100644 --- a/Formula/html2text.rb +++ b/Formula/html2text.rb @@ -13,6 +13,7 @@ class Html2text < Formula sha256 "766f16608d01f0fdf581e64e96a92d311cf96589b938cd87957d0543bb7fd1df" => :el_capitan sha256 "103d5c3d14bb0b13b2c6fe20f9889ea1269d276a6d294dd058c7c75ea78bf7ae" => :yosemite sha256 "b691a4fa679e2ae4562afe36d216b13ecaf2355167d4142bdb0f697f753eac19" => :mavericks + sha256 "b607d11bdc5d7c003bab8d693697cd8f4e087afcc3751e864a224beea271b8e1" => :x86_64_linux end # Patch provided by author. See: diff --git a/Formula/htmlcxx.rb b/Formula/htmlcxx.rb index 572d6e3fc9914..bfc846373cafa 100644 --- a/Formula/htmlcxx.rb +++ b/Formula/htmlcxx.rb @@ -9,6 +9,7 @@ class Htmlcxx < Formula sha256 "e910595c43c028e25e0e0a44203e3c95b229162ea89678721b4a7f6e22974aca" => :mojave sha256 "062a4b1629ab6f28e59ef0ea15c257c8bfd9e3646f3342fbfe14268727be7649" => :high_sierra sha256 "4407cb1a50e8d629db9b93bdbbbf2a0892967611f7e579c49c0d084769f8a5ca" => :sierra + sha256 "d666adb3eb7e4df1b46006f93b790fdaed21e086e95efc4595af6ec0c6368de6" => :x86_64_linux end def install diff --git a/Formula/htmldoc.rb b/Formula/htmldoc.rb index 847786f059c7d..098e62dfe5a41 100644 --- a/Formula/htmldoc.rb +++ b/Formula/htmldoc.rb @@ -9,6 +9,7 @@ class Htmldoc < Formula sha256 "f79c834310ae1d6b00c91f3ad8fe52a74e24c99c034f858df603e38be03f04d6" => :catalina sha256 "4a836bef89bfad7066df20527ed7b1ff59bc82738d13fdb6e5220bdb9e64b3c1" => :mojave sha256 "0e2d12668674dce9db320db8feb3468f897af6551f94ddf0e12231b8ecceb398" => :high_sierra + sha256 "d496951cc82abde0be074e0b28435027f104228783dd0bfe9cdf1cb2a3226a37" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/htop.rb b/Formula/htop.rb index 4a5f71b34adf5..d4adf36725911 100644 --- a/Formula/htop.rb +++ b/Formula/htop.rb @@ -3,14 +3,15 @@ class Htop < Formula homepage "https://hisham.hm/htop/" url "https://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz" sha256 "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" - revision 1 + revision OS.mac? ? 1 : 2 bottle do - cellar :any + cellar :any_skip_relocation sha256 "c06ff60960f64f5c8395f53d7419cbcce2a22ee87f0cb0138352c8a88111d21c" => :catalina sha256 "77aa302765353b4085dcad52356d3264183e06310dda8d5bac64642299ea2902" => :mojave sha256 "0ebfb655b91566ba31f8effc94d642a43305ff95bdc9b30b46fadc132e2ced0c" => :high_sierra sha256 "ed93b86f011de155c5d261b8c9cc9cb81fd0017667bf3ebe26ee090716bcd650" => :sierra + sha256 "ff4f21ca883cb69101331f0071b5c6e479d16b6bd53fdc04da398a9c41497fc0" => :x86_64_linux end head do @@ -23,8 +24,11 @@ class Htop < Formula depends_on "pkg-config" => :build depends_on "ncurses" # enables mouse scroll + depends_on "python@3.8" => :build unless OS.mac? def install + ENV.prepend_path "PATH", Formula["python@3.8"].opt_libexec/"bin" unless OS.mac? + system "./autogen.sh" if build.head? system "./configure", "--prefix=#{prefix}" system "make", "install" diff --git a/Formula/htpdate.rb b/Formula/htpdate.rb index 3e53ec694ada3..7489c2b0173ed 100644 --- a/Formula/htpdate.rb +++ b/Formula/htpdate.rb @@ -9,6 +9,7 @@ class Htpdate < Formula sha256 "ed41231b1e7d1760603e39f3e161be7cf817abc978f70c0dcbaec3bb206d9d8d" => :catalina sha256 "4da5825b9f51a83c7de24d289719f0d341b79685a7e1580f2de867e53941934a" => :mojave sha256 "437b8823d451f79f1ad8e2420387a3f50c3dc5919ef19717d41c437a88b77247" => :high_sierra + sha256 "78dcbfa60dd8e130a501b828bfa1409352b453031613bd1ec28c1d03eb3ba901" => :x86_64_linux end depends_on :macos => :high_sierra # needs diff --git a/Formula/htslib.rb b/Formula/htslib.rb index 6e88baeed81ad..6264a9db28510 100644 --- a/Formula/htslib.rb +++ b/Formula/htslib.rb @@ -9,6 +9,7 @@ class Htslib < Formula sha256 "4db003ad760c84dbe70dfcd866a32066a4d93980eab12526f69f53e0052d84a6" => :catalina sha256 "b4282ee3f330a894e68a0141b13b7fc1327d92a5319a95f5a8107a401e57ece5" => :mojave sha256 "507db470fc6cb7d97b06f0efff270fe2063d25143bdc09623135c4876474b3c3" => :high_sierra + sha256 "e23b394cd0384d8827932c8074a0d5d3a144c0204fd5fbe8a67303b429376821" => :x86_64_linux end depends_on "xz" diff --git a/Formula/http-parser.rb b/Formula/http-parser.rb index 22a86f856d39d..6b0a4209b2cfa 100644 --- a/Formula/http-parser.rb +++ b/Formula/http-parser.rb @@ -9,6 +9,7 @@ class HttpParser < Formula sha256 "f03615a5ecb9e65d4bd7b302a8429ba9130012b092f3f42e0afd85df2bf47453" => :catalina sha256 "b36ae811b2b72823cea4c7ab445ee2a5f628255aa169f0bc453fda1d3d520fbb" => :mojave sha256 "0c6b69289fa4a8dd7ad532fcefb0848af229dcb5a64df981c03e99af2ce3acd8" => :high_sierra + sha256 "46f21c3eb750edef6c569bf57e42107f2fb33417e1ca5f590977b1983d26db72" => :x86_64_linux end depends_on "coreutils" => :build diff --git a/Formula/http-server.rb b/Formula/http-server.rb index e34fc42117eaf..4b8e90bff17ac 100644 --- a/Formula/http-server.rb +++ b/Formula/http-server.rb @@ -12,6 +12,7 @@ class HttpServer < Formula sha256 "11f0b3f7fc0975e2eb7c911fe1555c13527f75ea5468215e6d6340e11bf36f33" => :catalina sha256 "fcc2086b4000cc47077413c116c09ee4b60fe9b064f7d95ff7c19c966a181d4f" => :mojave sha256 "1b3f5212bc710e5ae053bbd9fb3bd279d763ad03e6c550425ab95534e309a9ef" => :high_sierra + sha256 "695211b38640b76aafc49f610b604ca7db5a77592badd34d12388f7059f86739" => :x86_64_linux end depends_on "node" diff --git a/Formula/http_load.rb b/Formula/http_load.rb index 7f06065e416df..e448df1b9de84 100644 --- a/Formula/http_load.rb +++ b/Formula/http_load.rb @@ -12,6 +12,7 @@ class HttpLoad < Formula sha256 "d0d672723564b758fc3ef0721239e108ec063a395e183db033071200d5d9ee48" => :mojave sha256 "22e21275c49121c174024104f9b99c5f55d37e032ff7cae42bba89746c26bd88" => :high_sierra sha256 "a949ed2040faf49c7cdb6bf0110dfbbff465641c811e78a035998a4160170a05" => :sierra + sha256 "30aacd4e7c9db8332f96f490a653b0955aaeaddfe35fcde7aa1218187c044803" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/httpd.rb b/Formula/httpd.rb index fafcd02330d58..bb996b8337e6a 100644 --- a/Formula/httpd.rb +++ b/Formula/httpd.rb @@ -9,6 +9,7 @@ class Httpd < Formula sha256 "016ec294067375e0a0080d1c06812e4323b9d834452e937057e3c84387c44f02" => :catalina sha256 "628617d2cc60534dc6cb78cc971de32b9724757498f194dc900ad5e5d1e6f56a" => :mojave sha256 "71ab239430eb1709ff16ecc0a991e6e10f8bdd320889515f5ba88cf018f91255" => :high_sierra + sha256 "c536aaa2b1b0396f6c80d22b4923ae03dbd182c500028dfc61ba8f92162f2a44" => :x86_64_linux end depends_on "apr" @@ -61,15 +62,18 @@ def install "--with-apr=#{Formula["apr"].opt_prefix}", "--with-apr-util=#{Formula["apr-util"].opt_prefix}", "--with-brotli=#{Formula["brotli"].opt_prefix}", - "--with-libxml2=#{MacOS.sdk_path_if_needed}/usr", + *("--with-libxml2=#{MacOS.sdk_path_if_needed}/usr" if OS.mac?), "--with-mpm=prefork", "--with-nghttp2=#{Formula["nghttp2"].opt_prefix}", "--with-ssl=#{Formula["openssl@1.1"].opt_prefix}", "--with-pcre=#{Formula["pcre"].opt_prefix}", - "--with-z=#{MacOS.sdk_path_if_needed}/usr", + *("--with-libxml2=#{Formula["libxml2"].opt_prefix}" unless OS.mac?), + *("--with-z=#{MacOS.sdk_path_if_needed}/usr" if OS.mac?), + *("--with-z=#{Formula["zlib"].opt_prefix}" unless OS.mac?), "--disable-lua", "--disable-luajit" system "make" + ENV.deparallelize unless OS.mac? system "make", "install" # suexec does not install without root diff --git a/Formula/httpdiff.rb b/Formula/httpdiff.rb index 460cb842abd74..6e8a2eff28975 100644 --- a/Formula/httpdiff.rb +++ b/Formula/httpdiff.rb @@ -13,6 +13,7 @@ class Httpdiff < Formula sha256 "39a0d685904aba4c3e55ff22b4d231b8890c022a1eb0366dc264bbabc410a117" => :sierra sha256 "59b46605118f8789c10facd53e9d4ce4c9f54c8de85611d423984c4316a169eb" => :el_capitan sha256 "d5919069e31192cfd6f7d33dd4ff80d2142a8c36d23b50291e914c158d91ffac" => :yosemite + sha256 "8028f7c507a2705d47916db827b7a8a42e7f1fdec83c63bb3096af514e661a6d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/httperf.rb b/Formula/httperf.rb index 22086083a8710..6c577e1a7e796 100644 --- a/Formula/httperf.rb +++ b/Formula/httperf.rb @@ -11,6 +11,7 @@ class Httperf < Formula sha256 "390d46278c9e7bd0f58003ba49bc1a0ab110ab24864029d6ae9fd8d3f491b57c" => :mojave sha256 "5c049e4bfc272313e7c1051da7430bc09e712d5a70f1593c5ecf08ac94b3b238" => :high_sierra sha256 "015d2ce99b57fa808ae284f44904ca209e11603bf66085bf64a8270c45203490" => :sierra + sha256 "6e2c233325a56d3f77a7077072a6cbc2bb2027ff69cfea7cb2a16a4c7b2cac52" => :x86_64_linux end head do diff --git a/Formula/httpie.rb b/Formula/httpie.rb index 5a380b55c7d45..371e98bbb4c6c 100644 --- a/Formula/httpie.rb +++ b/Formula/httpie.rb @@ -12,6 +12,7 @@ class Httpie < Formula sha256 "443726f066b0dfd2b6c69fd51ab3008965d0dfae8c35346e0607d92454716b4e" => :catalina sha256 "d0e7b6ce991c68d8a07a6387ec685cab4a912a6e9c6213f2f1b308b05b132e00" => :mojave sha256 "e638b750ffdce34252f3f6b361f588f210aad1850de84d85c34e8f1c34cfb670" => :high_sierra + sha256 "8a87f4c036a2285127f6fad67cabcda35441d26feb1b2f4a54eacde0622664e6" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/httptunnel.rb b/Formula/httptunnel.rb index aa513af751af2..d9e14d398d1a3 100644 --- a/Formula/httptunnel.rb +++ b/Formula/httptunnel.rb @@ -14,6 +14,7 @@ class Httptunnel < Formula sha256 "b328d4e1f1e2638764d3ac2ed32a4f4e06935e4e9ef83af281936df4ab805aa5" => :el_capitan sha256 "54fbed6b247d143f05c50c2202b5ff447f90504553431e7a143f6178893f148c" => :yosemite sha256 "dcec84a118e1e7246d29ccc12397b7aa0134e1a2a952aa83af7b4ba6745318ac" => :mavericks + sha256 "a7001ca3ece027907bec57de54311fe793d66952db303c86432d32e8950b8757" => :x86_64_linux end def install diff --git a/Formula/httrack.rb b/Formula/httrack.rb index 7f16dec173f1b..50cfe0cd1cc61 100644 --- a/Formula/httrack.rb +++ b/Formula/httrack.rb @@ -12,6 +12,7 @@ class Httrack < Formula sha256 "6e0d2265e15d103a37b6b594f7f10c85af82012f1e3c1e25fc436e7430502b2c" => :mojave sha256 "612d8c3f9ee15fd7c4f42dbca3c5e3b58e968d626aa15f916f85c8cdb44ea31f" => :high_sierra sha256 "842d48bdb72573623a478a97a2c2abcafe34fb4b0443229216e35d30552dd27f" => :sierra + sha256 "5f71e5ffdd78774959dcafa0c8eeaebc8411663c8d1ce02fa8596b2747205f46" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/hub.rb b/Formula/hub.rb index fcf9b406a79e6..561f11a7511a0 100644 --- a/Formula/hub.rb +++ b/Formula/hub.rb @@ -10,6 +10,7 @@ class Hub < Formula sha256 "fdf05855839a9d7ec6e7bee6796e3cb5fc473500cffc002366cf98c09a805b69" => :catalina sha256 "bcbae9c683d76f3395665467ba0f0c00c60c12c84022f72faba4b8981724b563" => :mojave sha256 "8800cda4532784bf764ea6116a06c81d8d90bb3d36d8ecf295e64f9dd647c4ad" => :high_sierra + sha256 "053297f7d1ea1c071dd74613d5140647a29f18c886aae9815c355ffa4c0eae60" => :x86_64_linux end depends_on "go" => :build @@ -33,6 +34,11 @@ def install test do system "git", "init" + + # Test environment has no git configuration, which prevents commiting + system "git", "config", "user.email", "you@example.com" + system "git", "config", "user.name", "Your Name" + %w[haunted house].each { |f| touch testpath/f } system "git", "add", "haunted", "house" system "git", "commit", "-a", "-m", "Initial Commit" diff --git a/Formula/hugo.rb b/Formula/hugo.rb index 27234d06309c5..24adc582a0b8a 100644 --- a/Formula/hugo.rb +++ b/Formula/hugo.rb @@ -10,6 +10,7 @@ class Hugo < Formula sha256 "173fee6f7220cdd918bafc73a89437ba4773fd1feef0834fdaa959ff2767382e" => :catalina sha256 "ffdb7c0c2612cff9551889405bb9d8ccd2de37516957ee7ca5e78af03ac9f315" => :mojave sha256 "0659e118aa3816c8c9c19c7399f3178f6557217f2d507f4e73f73907e045f244" => :high_sierra + sha256 "ede625da7ae5bdfb7380a0045dc8705e2a2fd4b689dcb7f3e33d439f61b2a67a" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/hunspell.rb b/Formula/hunspell.rb index 961f10475c07a..6225e22573ee1 100644 --- a/Formula/hunspell.rb +++ b/Formula/hunspell.rb @@ -11,6 +11,7 @@ class Hunspell < Formula sha256 "30927ed74597ba96c52ec0c1e9380aaaadee2adadf2e17414e1b494bfd8066b3" => :mojave sha256 "4ada0a39e041b9e6676b4cd68e95c6523725043088f3555d1cac1216c8f91944" => :high_sierra sha256 "65b1d0fc54a0de1fc7e8520aaee4dbe192a2f441757002c7b305b0fb93e3e341" => :sierra + sha256 "cdb73dcb8fe32f97beb7201c7ae7fc4884e15327804dc70cee7b3a3fa165f018" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/hwloc.rb b/Formula/hwloc.rb index 39c27bbe25483..de20b0c75dfe0 100644 --- a/Formula/hwloc.rb +++ b/Formula/hwloc.rb @@ -9,6 +9,7 @@ class Hwloc < Formula sha256 "dd1fcb52fa8c513dc264d359d2b71c847dfbc9c65d817ddc4254d2af97cf6e60" => :catalina sha256 "06104c9e69d96e85f4c914ef6bcae0a3275a0910a6a592b9d6ba1b20d2ad6301" => :mojave sha256 "05558ada03d18ac4e4a232ead53eb9f59ac5889a899dce4670cc3fe273438d10" => :high_sierra + sha256 "bca5d2a07166afe83a2a2d8e2d0b5d458c022ea2dd6ba98aae8f09a6202db069" => :x86_64_linux end head do diff --git a/Formula/hydra.rb b/Formula/hydra.rb index f427de67d4d10..fcf3012c2e1a7 100644 --- a/Formula/hydra.rb +++ b/Formula/hydra.rb @@ -11,6 +11,7 @@ class Hydra < Formula sha256 "c45914c437ca6bf8b969a88da0249b24045a713c3ef1f5c8d66c67cafd2505f8" => :catalina sha256 "72663c807cdbc3f18e0f0f69c2139e75a7bc11b73138aba9b58d3c75061bdd23" => :mojave sha256 "61c6734cca2ae64fa62747afd14eb05bd869bf521fee854079aff6861ac38992" => :high_sierra + sha256 "e08afabe65a3ef426e7a367ffcff7effa260c3163b0a03936f0a53b71480c7b7" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/hyperfine.rb b/Formula/hyperfine.rb index 557121c340a2d..60bd2aecad326 100644 --- a/Formula/hyperfine.rb +++ b/Formula/hyperfine.rb @@ -9,6 +9,7 @@ class Hyperfine < Formula sha256 "0442a6f327081df37ce855d91fdf7bdf2136b8ef4f2039313274820936314c2f" => :catalina sha256 "4922076ae457efd2423a728e543fc2c3546f6e035f475e2f65b2cbcb977d2d38" => :mojave sha256 "d489a6d7cb337646e3f9954bc888cc8c6f42af5181ab6c0c4da51c65e8e5efa6" => :high_sierra + sha256 "e67d0addc8268385075d08ab53f60be3b35db893119ce800dee09e2805be01bf" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/hypre.rb b/Formula/hypre.rb index b46b59fa3169e..06395bde66325 100644 --- a/Formula/hypre.rb +++ b/Formula/hypre.rb @@ -10,6 +10,7 @@ class Hypre < Formula sha256 "9bba59afd174afc5ebb884369445639d9aae27bf5894ecd65e8f113d33c4f89f" => :catalina sha256 "b8e38313cbf6a6a5ca0ad3605c51f70efea2687f9d8fa299e525b927b43544be" => :mojave sha256 "135e5998b03eb58b4f4a7363c01014a74362c93daad5b8720b9081b5a65caeb9" => :high_sierra + sha256 "be9cbc19a81caf750975003964b510469dca5deebfc0f2236647acfb4405527a" => :x86_64_linux end depends_on "gcc" # for gfortran @@ -32,7 +33,7 @@ def install } EOS - system ENV.cc, "test.cpp", "-o", "test" + system ENV.cxx, "test.cpp", "-o", "test" system "./test" end end diff --git a/Formula/i2util.rb b/Formula/i2util.rb index af4130f7fbdac..07b84b6d00bce 100644 --- a/Formula/i2util.rb +++ b/Formula/i2util.rb @@ -13,6 +13,7 @@ class I2util < Formula sha256 "44f87d48502ae3e34ebfc0882aa689a70e8c92d398247c5a53e2f4b7d7652b39" => :el_capitan sha256 "ad1821b2637c75638de2ecd2bd3127a0c8300fe4fbd72c18ae648a131b97b6f7" => :yosemite sha256 "b9a22dff1f4a26be02712d17de832a23fc3dbe5eee75ab62b72ffb5b18ecbd99" => :mavericks + sha256 "d6e4babf0dc0562a80d284611072e5ade20669dfeed167019e3824001935d821" => :x86_64_linux end def install diff --git a/Formula/iamy.rb b/Formula/iamy.rb index 7bcce463194d0..8865d15534431 100644 --- a/Formula/iamy.rb +++ b/Formula/iamy.rb @@ -11,6 +11,7 @@ class Iamy < Formula sha256 "d24e802f1fc572c7d49620531e57a5e143956b2ce1e1d05b2320167b09fbf875" => :mojave sha256 "aac8b68119dad48d8aca16a2355cc5c8605e8b1fe44b18e5eb8326216873d657" => :high_sierra sha256 "1d22caa158fea3cb67ca07ef5f0785dc9f8568470d0323a5958229ed1f650f6c" => :sierra + sha256 "dee372222a33f4899284601dac11ddbcdb27825752a3a6c54c28712e56e7b3d5" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/iat.rb b/Formula/iat.rb index 36bc357a415d4..69c54aa5a6d0a 100644 --- a/Formula/iat.rb +++ b/Formula/iat.rb @@ -13,6 +13,7 @@ class Iat < Formula sha256 "baadc7c40697b28b46c7541d617f65ee318b78efbdc4156c6527490616fd2dee" => :el_capitan sha256 "db517ebd84afdeabaf2e130faccb88f33f359d13eab3bfbb5e19013051ca7827" => :yosemite sha256 "31eb7a245b5ee29b983017b572bb6895abda8f32101b402889a96b0f316abe45" => :mavericks + sha256 "2149efe2c6da5e0a493d0bc19ca608663b87467d7312534357c681559597c99a" => :x86_64_linux end def install diff --git a/Formula/ibex.rb b/Formula/ibex.rb index da439f0b65a4e..9a3de222c4143 100644 --- a/Formula/ibex.rb +++ b/Formula/ibex.rb @@ -44,12 +44,14 @@ def install cp_r (pkgshare/"examples").children, testpath - # so that pkg-config can remain a build-time only dependency - inreplace %w[makefile slam/makefile] do |s| - s.gsub!(/CXXFLAGS.*pkg-config --cflags ibex./, - "CXXFLAGS := -I#{include} -I#{include}/ibex "\ - "-I#{include}/ibex/3rd") - s.gsub!(/LIBS.*pkg-config --libs ibex./, "LIBS := -L#{lib} -libex") + if OS.mac? + # so that pkg-config can remain a build-time only dependency + inreplace %w[makefile slam/makefile] do |s| + s.gsub!(/CXXFLAGS.*pkg-config --cflags ibex./, + "CXXFLAGS := -I#{include} -I#{include}/ibex "\ + "-I#{include}/ibex/3rd") + s.gsub!(/LIBS.*pkg-config --libs ibex./, "LIBS := -L#{lib} -libex") + end end (1..8).each do |n| diff --git a/Formula/ical-buddy.rb b/Formula/ical-buddy.rb index aafe0bfee3f88..eb573871ecef2 100644 --- a/Formula/ical-buddy.rb +++ b/Formula/ical-buddy.rb @@ -12,6 +12,8 @@ class IcalBuddy < Formula sha256 "4f621e8b12e2c2e5e7c9fdd97ee973b7d4b14ce58eb5a5f7a9db32243f0f99f1" => :high_sierra end + depends_on :macos + def install args = %W[icalBuddy icalBuddy.1 icalBuddyLocalization.1 icalBuddyConfig.1 COMPILER=#{ENV.cc}] diff --git a/Formula/icarus-verilog.rb b/Formula/icarus-verilog.rb index e027e63823e2d..2de5ae10d20f9 100644 --- a/Formula/icarus-verilog.rb +++ b/Formula/icarus-verilog.rb @@ -11,11 +11,16 @@ class IcarusVerilog < Formula sha256 "0237851e478bcb76567111f14c1e42fe79161a8cd28ca04127295fc40db14113" => :mojave sha256 "96a15af23212d29f9410e073418c9388447955245fa8c38cf3b27ccf8fabd178" => :high_sierra sha256 "ded40d14a1cd74f2b764d9cf667d48ee8b6c010e77d88ca47afc99188ace1255" => :sierra + sha256 "7454e7de194a151cf86970f7ec401344eb023c5314221ebaabe728048a51ee79" => :x86_64_linux end depends_on "autoconf" => :build # parser is subtly broken when processed with an old version of bison depends_on "bison" => :build + unless OS.mac? + depends_on "gperf" => :build + depends_on "readline" + end uses_from_macos "flex" => :build uses_from_macos "bzip2" diff --git a/Formula/icecast.rb b/Formula/icecast.rb index dd7c3beb018fa..0acebbd255a02 100644 --- a/Formula/icecast.rb +++ b/Formula/icecast.rb @@ -10,6 +10,7 @@ class Icecast < Formula sha256 "824f7d295c28fbdb17da3015b4e4d6ca76be536f6bf81e98d5312dd7b9a095cd" => :catalina sha256 "3fb3b8c1e995a9c39a56ecd91a42cc0187f3bb2541c1abb4d0b7fc922da9cb95" => :mojave sha256 "a498fdc056b3afbb14b3138586f5dca3b0c1bae523c909c0b9383d5c5f4b02ca" => :high_sierra + sha256 "98232faae6c7e3be7395e0193d401493d6cfcc410041e07a7357414061832f8c" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/icecream.rb b/Formula/icecream.rb index aac4443e0e44f..a2b495babc30d 100644 --- a/Formula/icecream.rb +++ b/Formula/icecream.rb @@ -8,6 +8,7 @@ class Icecream < Formula sha256 "666f827a6a686e6d2e81dc1d0eb5aae8374f01d7d1524ef6c695e3bf207c4af5" => :catalina sha256 "fb94b2d8e763469a2b0112523f89496f4a81e22ed9b7290f4280178f726853da" => :mojave sha256 "6cc11bcddd969e9aeb7e83692e9714d5891f0530bacbc1c52b019b298bce3d24" => :high_sierra + sha256 "61972acf33fce83d9ddc20a148cc4294b4d913e2de7c3ffb380b606504162b24" => :x86_64_linux end depends_on "autoconf" => :build @@ -17,6 +18,11 @@ class Icecream < Formula depends_on "libarchive" depends_on "lzo" depends_on "zstd" + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "llvm" => :test + depends_on "libcap-ng" + end def install args = %W[ diff --git a/Formula/icoutils.rb b/Formula/icoutils.rb index ba51140ea0fa7..d6d7fa4956c72 100644 --- a/Formula/icoutils.rb +++ b/Formula/icoutils.rb @@ -11,6 +11,7 @@ class Icoutils < Formula sha256 "50b8adff5f3364626026d19fba9a0c9fef8cf93104b8d6907bcbe8a5f4a136c2" => :high_sierra sha256 "1a3656f2fcf778aa32eb734a60dfceccd5e1a702fa6558b11b33cc6f44aeba99" => :sierra sha256 "fb93eb5cfa6b222e77ec07569f501fcc03143e9decf306ebd21e9d1c6d304bce" => :el_capitan + sha256 "1f6eb9f705d93df7297b9baef5fb06285efc05d70a39ad51ab8934c106a5815d" => :x86_64_linux end depends_on "libpng" diff --git a/Formula/icu4c.rb b/Formula/icu4c.rb index c6d2874732c07..30ae507c0cef5 100644 --- a/Formula/icu4c.rb +++ b/Formula/icu4c.rb @@ -10,6 +10,7 @@ class Icu4c < Formula sha256 "2d1e91b5127f66e7941790c004817c94c892725c88f84f1e4c37297fcbc0c72f" => :catalina sha256 "b6069459c78f18045ee922ce5cb5b235d4b479597d79c3c298d09e0de3d70794" => :mojave sha256 "0720bd47f020d5ca895ae79eb61623ed3c7de0d4c4f221613105f47147aec01f" => :high_sierra + sha256 "f941a4963851701801719bd9d5fa15cf41064dd74ea5e2d15349f0536b4442da" => :x86_64_linux end keg_only :provided_by_macos, "macOS provides libicucore.dylib (but nothing else)" @@ -20,9 +21,9 @@ def install --disable-samples --disable-tests --enable-static - --with-library-bits=64 ] + args << "--with-library-bits=64" if OS.mac? cd "source" do system "./configure", *args system "make" @@ -31,6 +32,11 @@ def install end test do - system "#{bin}/gendict", "--uchars", "/usr/share/dict/words", "dict" + if File.readable? "/usr/share/dict/words" + system "#{bin}/gendict", "--uchars", "/usr/share/dict/words", "dict" + else + (testpath/"hello").write "hello\nworld\n" + system "#{bin}/gendict", "--uchars", "hello", "dict" + end end end diff --git a/Formula/id3ed.rb b/Formula/id3ed.rb index fd8843af18ed4..f61b07cd588a5 100644 --- a/Formula/id3ed.rb +++ b/Formula/id3ed.rb @@ -13,6 +13,7 @@ class Id3ed < Formula sha256 "6448c8e19c8e0874ed5141193c7db06c443ac6c33ab2f6bbe8811098b063c0d1" => :el_capitan sha256 "8ca64da5c8c0cbbc7ec64af436fcf3a7ae457c8d8a8073887fc63ec4e89c98b9" => :yosemite sha256 "8dd4a14922e94245dd016a266aa23c7bcebb18a56e574c8179df83c2d68ff23c" => :mavericks + sha256 "050157cef994a66e202493f0d743ae55ede79191a54fdbe4beac1d8753ad150d" => :x86_64_linux end def install diff --git a/Formula/id3tool.rb b/Formula/id3tool.rb index 940982f357ce0..e1292f9fbec5a 100644 --- a/Formula/id3tool.rb +++ b/Formula/id3tool.rb @@ -13,6 +13,7 @@ class Id3tool < Formula sha256 "b5b4d49b4710a67df5200149873dd8c17131ef4a4eaac722a2095b1445d053ff" => :el_capitan sha256 "348a229d26dd699013d8e3372c5382da10b12d02d286304e61d9f2c71ed77101" => :yosemite sha256 "dd989abacf0c1113879b6864a5ca08a59ac766a320897b9c323e5f7eaeeb2e70" => :mavericks + sha256 "ce6d8be05ed1ca38d80493271f5a906577d1f0237f30d6de69031d0a764c0162" => :x86_64_linux end def install diff --git a/Formula/ideviceinstaller.rb b/Formula/ideviceinstaller.rb index 224d1ceae68c0..6c40f6824cd40 100644 --- a/Formula/ideviceinstaller.rb +++ b/Formula/ideviceinstaller.rb @@ -9,6 +9,7 @@ class Ideviceinstaller < Formula sha256 "6ee12db78e8c224c0eb0cf88eb4f43242eb1ba672eb006636273b99b75b02a87" => :catalina sha256 "6ed5e4f7ace33fd5f4d1b4c6b9f0fd519836080e170b981e63942087698351c6" => :mojave sha256 "0dfe944eaa47cad87ad22f70dbbcefdb6b27bbeb83ca1f7a229827c03054c07c" => :high_sierra + sha256 "c189692eaa026504af0410a6c8e50a7a94a6e316c5da2cdb8f70b4f9479d2e81" => :x86_64_linux end head do diff --git a/Formula/ifstat.rb b/Formula/ifstat.rb index 052531a2cd1b6..c2d1b61234b7b 100644 --- a/Formula/ifstat.rb +++ b/Formula/ifstat.rb @@ -13,6 +13,7 @@ class Ifstat < Formula sha256 "e3b3f843c9fba2770a49dd7abcdacc30aa6b5e57f06b5ed96f09d20ada58bd6f" => :el_capitan sha256 "ecce408a9ae1a82c7b2457e5a5263ec760096e7e0e71cf0da1ce98523787bcbc" => :yosemite sha256 "9107e6b49f17fc1a4eac3ded9e499d164fe73f1c8d9307146b9db00952a72de9" => :mavericks + sha256 "150252cd80cd61d27d984452b39b4c58f17f60cb626c4ccedf95e01864efbd33" => :x86_64_linux end # Fixes 32/64 bit incompatibility for snow leopard diff --git a/Formula/igraph.rb b/Formula/igraph.rb index 4d05774874b34..bfd6fcb60b98b 100644 --- a/Formula/igraph.rb +++ b/Formula/igraph.rb @@ -9,10 +9,14 @@ class Igraph < Formula sha256 "3005e637b6cb7cbed28b6dc997d480f8a1917c4118852a107ae0b59936d20698" => :catalina sha256 "81181b904e63af33766a9c967f5ae42a11dadc8e72ba80604804636e663414ce" => :mojave sha256 "40791d18478711af9cc497917ce7b34af179538bd719108d04be073faec57db9" => :high_sierra + sha256 "63a8c61f1be17fedcfb70646473f8f0d40f4089fdd2b570b5a57e6b02d2b119c" => :x86_64_linux end depends_on "glpk" depends_on "gmp" + depends_on "openblas" unless OS.mac? + + uses_from_macos "libxml2" on_linux do depends_on "openblas" diff --git a/Formula/ike-scan.rb b/Formula/ike-scan.rb index 1033a828e123a..cafc6f563ecac 100644 --- a/Formula/ike-scan.rb +++ b/Formula/ike-scan.rb @@ -12,6 +12,7 @@ class IkeScan < Formula sha256 "684cd449c88f873dec2719d9423f42732006631b923aec133c5c2a447895b241" => :mojave sha256 "9be05676d382198f99911601aa83008e5a27371669728c4d70cc98e9564bd2f3" => :high_sierra sha256 "cd6e8435040dd728e6dbd62c161d0c6b48d19e0f5fe69ce9bef48991cccb91f1" => :sierra + sha256 "edf47bd9786b16ccf098953b25a51201391f8f035e8c48433fcaad148014f6bb" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/ilmbase.rb b/Formula/ilmbase.rb index d7bb669a53a31..a5edd0e4da20a 100644 --- a/Formula/ilmbase.rb +++ b/Formula/ilmbase.rb @@ -8,6 +8,7 @@ class Ilmbase < Formula sha256 "13a8f951e15caa1f4f633ec718e4f5b9c19d741a6e8ec2c015f1c59d466f2005" => :catalina sha256 "f21663911237058c5c531d806456ebc23e30020f838145d8b13010515364647a" => :mojave sha256 "854208849e5fa1be263e25031ad21308582d57999c643baef67b8ec40d32cfb3" => :high_sierra + sha256 "5ad2d370198a62a04b628345820a05d325ced0358813a10a47619d8c12245ddc" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/imagemagick.rb b/Formula/imagemagick.rb index 2d24b2de94c0b..70694e15bc7ae 100644 --- a/Formula/imagemagick.rb +++ b/Formula/imagemagick.rb @@ -10,6 +10,7 @@ class Imagemagick < Formula sha256 "55a10c2792aea1c314f87c6e8fa2d6bdb89719ad702817c6d0f7b03b00bd3eae" => :catalina sha256 "1f59fee9f98390b0294e71690a2d064c0bdf144823ab65d640fd846b9e4a6a3a" => :mojave sha256 "ee9a39c6d7869ecce8f2ec2dc72b4b2a50af207bf84dff7281b9a56e7bbb9430" => :high_sierra + sha256 "b5056b66b068a5567d08a2b923399a371cbf93ef7dfdf454920124174174b677" => :x86_64_linux end depends_on "pkg-config" => :build @@ -31,6 +32,8 @@ class Imagemagick < Formula uses_from_macos "bzip2" uses_from_macos "libxml2" + depends_on "linuxbrew/xorg/xorg" unless OS.mac? + skip_clean :la def install diff --git a/Formula/imagemagick@6.rb b/Formula/imagemagick@6.rb index eddfc017aa978..d35247d14a860 100644 --- a/Formula/imagemagick@6.rb +++ b/Formula/imagemagick@6.rb @@ -13,6 +13,7 @@ class ImagemagickAT6 < Formula sha256 "029da8703ac729f12574c4a36aca6749258ba7eb6237994b60a5fc6812c08793" => :catalina sha256 "a948f626d0d8010e453c9d300e922258fc63bac501e26a942ee47a8d6c2e5223" => :mojave sha256 "ddedad3bbcbf1b5067972909619b46b48aed5b5d9fa657f9d9fc34aa3e26eb96" => :high_sierra + sha256 "e8e89838dab88629d8983d0783cc75cff46e05d3f7d44f3f634b44112a19cedd" => :x86_64_linux end keg_only :versioned_formula diff --git a/Formula/imagesnap.rb b/Formula/imagesnap.rb index 967cfb5a563cb..a1e99b5138a5a 100644 --- a/Formula/imagesnap.rb +++ b/Formula/imagesnap.rb @@ -14,7 +14,7 @@ class Imagesnap < Formula sha256 "bbe0115174e191a6eaeedcdb3136e4c9248e7bab649bb30ddd4e07d27ea4e553" => :el_capitan end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? # Fixes running on 10.13+: https://github.com/rharder/imagesnap/issues/16 # Merged into master, will be in the next release. diff --git a/Formula/imageworsener.rb b/Formula/imageworsener.rb index cf721f562b4a5..4f4b60b44b196 100644 --- a/Formula/imageworsener.rb +++ b/Formula/imageworsener.rb @@ -10,6 +10,7 @@ class Imageworsener < Formula sha256 "b5e6ce352f0e698cf10452d273ae0e61f50554565f77010de4e62a6fdddd911f" => :mojave sha256 "2332dd0ecedf78344ee5fbd3d00abb0eccc7b28b7e8609c9a18e8e6ab81669de" => :high_sierra sha256 "847f3211aba4095e280d589a87698234b7cd6e3ec77a6a50cf578a3fa6d0236e" => :sierra + sha256 "e906c48255668f9e6b15915c0bc31bafb062ba400e6259d51ed9e7194c7cf683" => :x86_64_linux end head do diff --git a/Formula/imapsync.rb b/Formula/imapsync.rb index 9c13308f7c037..205a62b2a953b 100644 --- a/Formula/imapsync.rb +++ b/Formula/imapsync.rb @@ -11,6 +11,7 @@ class Imapsync < Formula sha256 "6c1a1bed4c3ad926f34a5efe6b6bfe5d2776ed4ee0d000679b21679c47ff81cb" => :catalina sha256 "5b259d1a7096a887af61eef5a379122c8e94e71f912b2670a35031e6c159351c" => :mojave sha256 "fa0a19bf66b24d332f6e0f4f827b2abdff2b904b483c4927f2ed7d6d944ab261" => :high_sierra + sha256 "59d9df8bfe08a37a62a5195a787fb1fd5ef92e13acf9218d70fef66e05af0ae0" => :x86_64_linux end uses_from_macos "perl" @@ -70,6 +71,44 @@ class Imapsync < Formula sha256 "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c" end + # Must install before "Readonly" + unless OS.mac? + resource "Digest::HMAC_SHA1" do + url "https://cpan.metacpan.org/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz" + sha256 "3bc72c6d3ff144d73aefb90e9a78d33612d58cf1cd1631ecfb8985ba96da4a59" + end + + resource "IO::Socket::INET6" do + url "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz" + sha256 "85e020fa179284125fc1d08e60a9022af3ec1271077fe14b133c1785cdbf1ebb" + end + + resource "Socket6" do + url "https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/Socket6-0.29.tar.gz" + sha256 "468915fa3a04dcf6574fc957eff495915e24569434970c91ee8e4e1459fc9114" + end + + resource "IO::Socket::SSL" do + url "https://cpan.metacpan.org/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz" + sha256 "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd" + end + + resource "Net::SSLeay" do + url "https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz" + sha256 "2000da483c8471a0b61e06959e92a6fca7b9e40586d5c828de977d3d2081cfdd" + end + + resource "Term::ReadKey" do + url "https://cpan.metacpan.org/authors/id/J/JS/JSTOWE/TermReadKey-2.38.tar.gz" + sha256 "5a645878dc570ac33661581fbb090ff24ebce17d43ea53fd22e105a856a47290" + end + + resource "Regexp::Common" do + url "https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz" + sha256 "ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b" + end + end + resource "Readonly" do url "https://cpan.metacpan.org/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz" sha256 "4b23542491af010d44a5c7c861244738acc74ababae6b8838d354dfb19462b5e" @@ -115,7 +154,7 @@ def install system "perl", "-c", "imapsync" system "pod2man", "imapsync", "imapsync.1" - inreplace "imapsync", "#!/usr/bin/env perl", "#!/usr/bin/perl" + inreplace "imapsync", "#!/usr/bin/env perl", "#!/usr/bin/perl" if OS.mac? bin.install "imapsync" man1.install "imapsync.1" bin.env_script_all_files(libexec/"bin", :PERL5LIB => ENV["PERL5LIB"]) diff --git a/Formula/imessage-ruby.rb b/Formula/imessage-ruby.rb index 1f7f60e4f944f..1cfbc8f150250 100644 --- a/Formula/imessage-ruby.rb +++ b/Formula/imessage-ruby.rb @@ -16,6 +16,8 @@ class ImessageRuby < Formula sha256 "7b546ccf5cf13a7d474c635a57eebc8e74ff61ea6c7c3cdfefffe4c78737ab47" => :mavericks end + depends_on :macos + def install system "rake", "standalone:install", "prefix=#{prefix}" end diff --git a/Formula/imlib2.rb b/Formula/imlib2.rb index 57a728441977c..58a2a65e42928 100644 --- a/Formula/imlib2.rb +++ b/Formula/imlib2.rb @@ -8,6 +8,7 @@ class Imlib2 < Formula sha256 "3f02ff8333cfc8a046432fb078a7ede7d45f0bcda7b7b1dfb7726306eee91a13" => :catalina sha256 "5134d4a325c2af69112bd5f3b5408843b513a6546f32f4840671a3575deddb6a" => :mojave sha256 "8bf5d8afb1f8a34db501bc46301fd6bbbef3b3a3f9c9863dea180e8f1288f485" => :high_sierra + sha256 "2b31a6123d18abefae9c7f299a58c1c2cd647813b61b2cafacda9770552e3c2d" => :x86_64_linux end depends_on "pkg-config" => :build @@ -16,7 +17,8 @@ class Imlib2 < Formula depends_on "jpeg" depends_on "libpng" depends_on "libtiff" - depends_on :x11 + depends_on :x11 if OS.mac? + depends_on "linuxbrew/xorg/xorg" unless OS.mac? def install args = %W[ diff --git a/Formula/immortal.rb b/Formula/immortal.rb index 63da783c9e459..bd977d7b4b49a 100644 --- a/Formula/immortal.rb +++ b/Formula/immortal.rb @@ -10,6 +10,7 @@ class Immortal < Formula sha256 "4b1f289dbe2b0998f091ebf9fbf6df2894f0eb3d447df2b5840915a53cdb3c09" => :catalina sha256 "c35c0718289bac0d3557ac5d17af6895765557d2c5a7124f389653163b40bb36" => :mojave sha256 "702cb544d23450cf258ef7b9287e99925e8cf715e1708513694f9068233a5cba" => :high_sierra + sha256 "989ed6f49f91539e8c4c36c557b9d4c57595d722f37729f93df7470b5b48fe4b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/inadyn.rb b/Formula/inadyn.rb index 820a6d2fcce53..6187430e12c24 100644 --- a/Formula/inadyn.rb +++ b/Formula/inadyn.rb @@ -8,6 +8,7 @@ class Inadyn < Formula sha256 "15adb75ac20d48ad952fce27a06f8b8ce8728d5084b9e1b3632215aa7ed2fc64" => :catalina sha256 "0100708fe3e5bd57607af7168ba0a02e30d01a79e8af60f86be20717377b5153" => :mojave sha256 "892f0bb649feb54f000aa9b5c22a812aeff22b1530f5e54a8783896b88d9ced3" => :high_sierra + sha256 "a97da4110b4ef2adc932c52154770f4211e00551b0b49d38bd6a82f47e3f4165" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/include-what-you-use.rb b/Formula/include-what-you-use.rb index 307a9c32ebb51..8df94aa1d6cfe 100644 --- a/Formula/include-what-you-use.rb +++ b/Formula/include-what-you-use.rb @@ -8,6 +8,7 @@ class IncludeWhatYouUse < Formula sha256 "94a1fa82e1a198f0e7548cb7b4895303b52432eb83836ce84896cc5af6bd3340" => :catalina sha256 "0f91606b7d834d1969dea394674eafdd87c6ecbffb327a77c0d63c16574e89af" => :mojave sha256 "b7dbc7e9f3504f1902b9f63de1c802812729c2ae395c4d85b0dab5a10835bd60" => :high_sierra + sha256 "7035186ff6884f4966322d02e1a1f07ff99a6dc0134159499593264f8feb1486" => :x86_64_linux end depends_on "cmake" => :build @@ -15,6 +16,7 @@ class IncludeWhatYouUse < Formula uses_from_macos "ncurses" uses_from_macos "zlib" + depends_on "gcc" => :build unless OS.mac? # libstdc++ def install # We do not want to symlink clang or libc++ headers into HOMEBREW_PREFIX, @@ -45,7 +47,7 @@ def install cp_r Formula["llvm"].opt_lib/"clang/#{Formula["llvm"].version}/include", libexec/"lib/clang/#{Formula["llvm"].version}" mkdir_p libexec/"include" - cp_r Formula["llvm"].opt_include/"c++", libexec/"include" + cp_r Formula[OS.mac? ? "llvm" : "gcc"].opt_include/"c++", libexec/"include" end test do diff --git a/Formula/inetutils.rb b/Formula/inetutils.rb index b546c632b69fe..c49445c18e880 100644 --- a/Formula/inetutils.rb +++ b/Formula/inetutils.rb @@ -11,6 +11,7 @@ class Inetutils < Formula sha256 "cd8d9c2d67518442b03bd4c6573a22408136fbfa54822db89db9236dca9d31bb" => :mojave sha256 "52c3e2f7e4d62cf0e0c742e81c026f591b9c331a338d110619b285d02a9d8b2f" => :high_sierra sha256 "40fc6bf3589516e420a3452c7effc46cb9463150680ab08ceed27206ddfe0b2a" => :sierra + sha256 "a2baabd0f69457e29db87ca778188de98c9a59d986d15590c42243166803d616" => :x86_64_linux end depends_on "libidn" @@ -27,29 +28,30 @@ def install --disable-dependency-tracking --disable-silent-rules --prefix=#{prefix} - --program-prefix=g --with-idn ] + args << "--program-prefix=g" if OS.mac? system "./configure", *args system "make", "install" - # Binaries not shadowing macOS utils symlinked without 'g' prefix - noshadow.each do |cmd| - bin.install_symlink "g#{cmd}" => cmd - man1.install_symlink "g#{cmd}.1" => "#{cmd}.1" - end + if OS.mac? + # Binaries not shadowing macOS utils symlinked without 'g' prefix + noshadow.each do |cmd| + bin.install_symlink "g#{cmd}" => cmd + man1.install_symlink "g#{cmd}.1" => "#{cmd}.1" + end - # Symlink commands without 'g' prefix into libexec/gnubin and - # man pages into libexec/gnuman - bin.find.each do |path| - next unless File.executable?(path) && !File.directory?(path) + # Symlink commands without 'g' prefix into libexec/gnubin and + # man pages into libexec/gnuman + bin.find.each do |path| + next unless File.executable?(path) && !File.directory?(path) - cmd = path.basename.to_s.sub(/^g/, "") - (libexec/"gnubin").install_symlink bin/"g#{cmd}" => cmd - (libexec/"gnuman"/"man1").install_symlink man1/"g#{cmd}.1" => "#{cmd}.1" + cmd = path.basename.to_s.sub(/^g/, "") + (libexec/"gnubin").install_symlink bin/"g#{cmd}" => cmd + (libexec/"gnuman"/"man1").install_symlink man1/"g#{cmd}.1" => "#{cmd}.1" + end end - libexec.install_symlink "gnuman" => "man" end @@ -67,7 +69,8 @@ def caveats end test do - output = pipe_output("#{libexec}/gnubin/ftp -v", + path = OS.mac? ? "#{libexec}/gnubin/ftp" : "#{bin}/ftp" + output = pipe_output("#{path} -v", "open ftp.gnu.org\nanonymous\nls\nquit\n") assert_match "Connected to ftp.gnu.org.\n220 GNU FTP server ready", output end diff --git a/Formula/infer.rb b/Formula/infer.rb index 917f75877eaf9..e7e2abd0441fd 100644 --- a/Formula/infer.rb +++ b/Formula/infer.rb @@ -7,7 +7,6 @@ class Infer < Formula :revision => "99464c01da5809e7159ed1a75ef10f60d34506a4" bottle do - cellar :any rebuild 1 sha256 "1dc9c75c759611c8fe0efa8f63d7e55bbaa35d8dc2863f7a527069b11759f244" => :catalina sha256 "74b2dddff2bea362066395e28a797078d33514774511cc64771d0f89eea2466d" => :mojave @@ -32,6 +31,9 @@ class Infer < Formula uses_from_macos "m4" => :build uses_from_macos "unzip" => :build uses_from_macos "ncurses" + + depends_on "patchelf" => :build unless OS.mac? + uses_from_macos "xz" uses_from_macos "zlib" @@ -54,6 +56,7 @@ def install ENV["OPAMROOT"] = opamroot ENV["OPAMYES"] = "1" ENV["OPAMVERBOSE"] = "1" + ENV["PATCHELF"] = Formula["patchelf"].opt_bin/"patchelf" unless OS.mac? system "opam", "init", "--no-setup", "--disable-sandboxing" diff --git a/Formula/influxdb.rb b/Formula/influxdb.rb index 7000a55c54e1a..10f0ec8db190f 100644 --- a/Formula/influxdb.rb +++ b/Formula/influxdb.rb @@ -11,6 +11,7 @@ class Influxdb < Formula sha256 "79c4ceedc4829159bafc592b9363e33719ecbd105c681db0d49217a5d276e354" => :catalina sha256 "6393249a983631cde5bb524dfbf2f92c3b53e5984e88082ea38d157db54d32ad" => :mojave sha256 "7c8070708d95ed863c5fc37eefed541624410feb58ec3d20cc46f349528d9e8a" => :high_sierra + sha256 "a1ca8484dae255743e08fee3cbd8bd80b58cc1e4ee5315403592b4a2960a2eb3" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/iniparser.rb b/Formula/iniparser.rb index b4ec328cd68e0..c81dd4cdeca57 100644 --- a/Formula/iniparser.rb +++ b/Formula/iniparser.rb @@ -11,6 +11,7 @@ class Iniparser < Formula sha256 "69dde8e886645f5b89f83f36835c18449afe7f6c4f119d466d7f204e994952c7" => :mojave sha256 "cec20d33114e7a5811acb41f9f9a36a411ffd2eebb7d537167b9b541b03fff8d" => :high_sierra sha256 "7ad8eb3b8a66c08b78d2d9d3db18bd50e842d1c5962600ad0c9c8244d296dea8" => :sierra + sha256 "0ad7f484c703d421dbe3b974c5a8a0c63132fc34b8b9c34f7306a7d802b32961" => :x86_64_linux end conflicts_with "fastbit", :because => "Both install `include/dictionary.h`" diff --git a/Formula/inlets.rb b/Formula/inlets.rb index 0a2d846685078..a914d6b8becbc 100644 --- a/Formula/inlets.rb +++ b/Formula/inlets.rb @@ -70,7 +70,8 @@ def cleanup(name, pid) EOS mock_upstream_server_pid = fork do - exec "ruby mock_upstream_server.rb" + exec "ruby mock_upstream_server.rb" if OS.mac? + exec "#{Formula["ruby"].opt_bin}/ruby mock_upstream_server.rb" unless OS.mac? end begin diff --git a/Formula/insect.rb b/Formula/insect.rb index 4e87be83e8df0..adc4f7b4fd268 100644 --- a/Formula/insect.rb +++ b/Formula/insect.rb @@ -11,6 +11,7 @@ class Insect < Formula sha256 "1a7bbd56f97d661e4e236e8375db1614659cf2a35d2112feab11c258d437b054" => :catalina sha256 "8ba4c9bce3fa2fa0dc6546910d0ed7afff432f2e7938e63638c6494a197bba23" => :mojave sha256 "d0efc8426a611811210f093f7a91671fd3f741619709ca88f04274ce7f8e9c06" => :high_sierra + sha256 "342cf97027601fb236f4420e4292bb762406329f2024552a5c1d9102d4c0161f" => :x86_64_linux end depends_on "psc-package" => :build diff --git a/Formula/inspectrum.rb b/Formula/inspectrum.rb index c5d0734f98211..04e71ac412a10 100644 --- a/Formula/inspectrum.rb +++ b/Formula/inspectrum.rb @@ -26,6 +26,9 @@ def install end test do + return if ENV["CI"] + + # This test requires X11. assert_match "-r, --rate Set sample rate.", shell_output("#{bin}/inspectrum -h").strip end end diff --git a/Formula/instalooter.rb b/Formula/instalooter.rb index 829823fa8932c..98ca3860e28ec 100644 --- a/Formula/instalooter.rb +++ b/Formula/instalooter.rb @@ -11,6 +11,7 @@ class Instalooter < Formula sha256 "406c7f00325e2c57ea064d5e04356b6297a41576beb9a487c6d221d71d9cb47d" => :catalina sha256 "e0186165b707d32f738f4be750e41b01c15ee5f61de04099c3a7e9ef1354a0ed" => :mojave sha256 "8c3b6d15eb810012c5b14249ed2a04b423e40e1b7637292c2bdd000541da2bc2" => :high_sierra + sha256 "3c34bee5c6ec04e16c566fd2d8d26439976e79389a62f252a0c37c4b1bd599dc" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/instead.rb b/Formula/instead.rb index 1fc62344b58dc..abbcf75bcf9fb 100644 --- a/Formula/instead.rb +++ b/Formula/instead.rb @@ -8,6 +8,7 @@ class Instead < Formula sha256 "e447bee8716c692d07e6d58b337639a64334dfa921326810c5ae0d64b14fe72e" => :catalina sha256 "128a389655c4361f48dd8ee81344682a3d4433485cf91569a71961bed0885e06" => :mojave sha256 "e9029b89e6133d0f233a679a684e64d0195b283aabb6c55640f8a95ed1297f50" => :high_sierra + sha256 "0a6913b90f9c3d01b83d37cc3f467470c5e9982c5bffd9a7076ab6287aa44157" => :x86_64_linux end depends_on "cmake" => :build @@ -18,10 +19,16 @@ class Instead < Formula depends_on "sdl2_ttf" def install + libext = if OS.mac? + "dylib" + else + "so" + end + mkdir "build" do system "cmake", "..", "-DWITH_GTK2=OFF", "-DLUA_INCLUDE_DIR=#{Formula["lua"].opt_include}/lua", - "-DLUA_LIBRARY=#{Formula["lua"].opt_lib}/liblua.dylib", + "-DLUA_LIBRARY=#{Formula["lua"].opt_lib}/liblua.#{libext}", *std_cmake_args system "make", "install" end diff --git a/Formula/internetarchive.rb b/Formula/internetarchive.rb index 8cafe9535644d..5ded7b5ead719 100644 --- a/Formula/internetarchive.rb +++ b/Formula/internetarchive.rb @@ -11,6 +11,7 @@ class Internetarchive < Formula sha256 "29143e0646a76b758ab3c2237a2dff1cd3b3daec589fdffd78185b7d7a28ebb3" => :catalina sha256 "39083e62f37c3b06fb397601ede192d8c60dbbb65f11398933594e131242ab9c" => :mojave sha256 "32d59ff6566c18d997d4558aef73c9f6ae4ea076ec302fb8c8cfcd312b43d563" => :high_sierra + sha256 "244651b16fe3f63fe727de71ffef7476e0a5d0af2a95291056f188246d5978c2" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/intltool.rb b/Formula/intltool.rb index c1d0122b28e36..3fe9164ec18dc 100644 --- a/Formula/intltool.rb +++ b/Formula/intltool.rb @@ -3,6 +3,7 @@ class Intltool < Formula homepage "https://wiki.freedesktop.org/www/Software/intltool" url "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz" sha256 "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -13,12 +14,40 @@ class Intltool < Formula sha256 "14bb0680842b8b392cb1a5f5baf142e99a54a538d1a587f6d1158785b276ffc6" => :el_capitan sha256 "da6c24f1cc40fdf6ae286ec003ecd779d0f866fe850e36f5e5953786fa45a561" => :yosemite sha256 "5deeef3625d52f71d633e7510396d0028ec7b7ccf40c78b5d254bdf4214e6363" => :mavericks + sha256 "250734ea7e79dec10ea7914695614b9a5b5604dde1ccc2488663258bab5c10eb" => :x86_64_linux + end + + unless OS.mac? + depends_on "expat" + + resource "XML::Parser" do + url "https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz" + sha256 "1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216" + end end def install + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + + unless OS.mac? + resources.each do |res| + res.stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make", "PERL5LIB=#{ENV["PERL5LIB"]}" + system "make", "install" + end + end + end + system "./configure", "--prefix=#{prefix}", "--disable-silent-rules" system "make", "install" + unless OS.mac? + Dir[bin/"intltool-*"].each do |f| + inreplace f, %r{^#!/.*/perl -w}, "#!/usr/bin/env perl" + inreplace f, /^(use strict;)/, "\\1\nuse warnings;" + end + end end test do diff --git a/Formula/io.rb b/Formula/io.rb index a1ff721c25c8b..fe50e0a9a998a 100644 --- a/Formula/io.rb +++ b/Formula/io.rb @@ -3,13 +3,14 @@ class Io < Formula homepage "http://iolanguage.com/" url "https://github.com/IoLanguage/io/archive/2017.09.06.tar.gz" sha256 "9ac5cd94bbca65c989cd254be58a3a716f4e4f16480f0dc81070457aa353c217" - revision 1 - head "https://github.com/IoLanguage/io.git" + revision OS.mac? ? 1 : 2 + head "https://github.com/stevedekorte/io.git" bottle do sha256 "c4c862d20a8e4ddb1e6e588414a9e23ae2a17baa490e3beb621614aca7a8ca87" => :catalina sha256 "48c37d6f30d8b01d391e7f4ef777b5087425d89a9df0077414769a59333db420" => :mojave sha256 "a061482b97c1ada8eea9d658f13fe0cfbfa223d97762b51611c4cab2de4c0273" => :high_sierra + sha256 "8e703e9f0a2b23ee152a8bf9e6ebaa782b7e9b76bf99ed4e84bef586f943d775" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ioping.rb b/Formula/ioping.rb index 0501d66704746..94a367296b500 100644 --- a/Formula/ioping.rb +++ b/Formula/ioping.rb @@ -10,6 +10,7 @@ class Ioping < Formula sha256 "622678afe9bf88bae08cc264dece76f0abefc854915f5b3d5355cde767aa61e1" => :catalina sha256 "4c88038d68f17bbc405c5ed253542890e0fc1e44ece8650f1a68b6ff6df7fabf" => :mojave sha256 "9a5ee7cd526c89d70c75fe6fcf61d7b0a777d8bf3a823fe99348864a9838b6ff" => :high_sierra + sha256 "d3651d7376defc07620e47e689902f18f2ae7afb3ea7b02e16afc6b6af077f6c" => :x86_64_linux end def install diff --git a/Formula/ios-class-guard.rb b/Formula/ios-class-guard.rb index c3e00c2bed1c3..d68996222f93d 100644 --- a/Formula/ios-class-guard.rb +++ b/Formula/ios-class-guard.rb @@ -16,7 +16,7 @@ class IosClassGuard < Formula sha256 "4eddde784c843628cb8bcb8c971142683c5a17373058f5bda62356b432dec00a" => :mavericks end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? def install xcodebuild "-workspace", "ios-class-guard.xcworkspace", diff --git a/Formula/ios-deploy.rb b/Formula/ios-deploy.rb index 08eebb42fd237..acde7cf2261e7 100644 --- a/Formula/ios-deploy.rb +++ b/Formula/ios-deploy.rb @@ -13,7 +13,9 @@ class IosDeploy < Formula sha256 "f810b5465871c66bc706f06edef3fc1570b1c9e92c806d75742c4998f9c27ee6" => :high_sierra end - depends_on :xcode => :build + on_macos do + depends_on :xcode => :build + end def install xcodebuild "-configuration", "Release", "SYMROOT=build" diff --git a/Formula/ios-sim.rb b/Formula/ios-sim.rb index c2b89d1c1aeda..3ff1673c529c4 100644 --- a/Formula/ios-sim.rb +++ b/Formula/ios-sim.rb @@ -14,6 +14,7 @@ class IosSim < Formula sha256 "ddbe9d541710ab4dd219db3f766e878ff8698dcd88c25a247e5c44e165ea2773" => :high_sierra end + depends_on :macos depends_on "node" def install diff --git a/Formula/ios-webkit-debug-proxy.rb b/Formula/ios-webkit-debug-proxy.rb index 64785272efe9b..adde3e2c511a0 100644 --- a/Formula/ios-webkit-debug-proxy.rb +++ b/Formula/ios-webkit-debug-proxy.rb @@ -11,6 +11,7 @@ class IosWebkitDebugProxy < Formula sha256 "c04404ef94a5aa1182ff0550ad9d90525d7fcd9867e02b19731a2f687fe834d4" => :catalina sha256 "a777651644157942d777e594dc63f2ca5e8348d39453baf3513723026ab350e5" => :mojave sha256 "813bad7d3d7bb03e2da6f0db64efaeaa8070a2d4e44cfab52a12a3dd72f468e8" => :high_sierra + sha256 "6b64d9c2d62a3f92b9a5594096778008748ff95a310a863e7c71aa07e3ad2546" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/iozone.rb b/Formula/iozone.rb index e942cc0e2470b..1e6594ce6b294 100644 --- a/Formula/iozone.rb +++ b/Formula/iozone.rb @@ -9,11 +9,12 @@ class Iozone < Formula sha256 "01780007c0b535d058e5431c6cc42fc89f9c7caeb08b2a930e37618e3dacae30" => :catalina sha256 "2f1b2aa83dc4844aea07d2317da1e10c8649b1e654ef2a01e668f754db4ea0e0" => :mojave sha256 "665363653cd2fcee68332a8f872c4aa94bbe1a3b2b131a95a23f49833727dde6" => :high_sierra + sha256 "503000eda05d70eb0edfdbb5a8c90f609450f7a02e7ea66ed081ae3fdefd5510" => :x86_64_linux end def install cd "src/current" do - system "make", "macosx", "CC=#{ENV.cc}" + system "make", OS.mac? ? "macosx" : "linux", "CC=#{ENV.cc}" bin.install "iozone" pkgshare.install %w[Generate_Graphs client_list gengnuplot.sh gnu3d.dem gnuplot.dem gnuplotps.dem iozone_visualizer.pl diff --git a/Formula/ipbt.rb b/Formula/ipbt.rb index e00605da1d4d5..1a3a43341e1c4 100644 --- a/Formula/ipbt.rb +++ b/Formula/ipbt.rb @@ -10,6 +10,7 @@ class Ipbt < Formula sha256 "367536bc0020cd8b4313936070ec9539bcfe56de061a40b6bfc4aa0533d82a5a" => :catalina sha256 "e68f7a1286319ca19382bef65cbf2d80fd1f15bc46dc623cbe9b8f73b5d9d848" => :mojave sha256 "9ae5d95807ead91cb2bd746fb2f3d4fee82cb39dba42f67bdea9eede792b7261" => :high_sierra + sha256 "820e67f114bb781e14022a48ee5bfe52142cf9480231520472b33e55221b6502" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/iperf.rb b/Formula/iperf.rb index 29bde67b114de..a74c0cfb90fd1 100644 --- a/Formula/iperf.rb +++ b/Formula/iperf.rb @@ -10,6 +10,7 @@ class Iperf < Formula sha256 "8c24a0392dcda9d134c1d1121671875da4b67905321eb6e67053d6e965f92bee" => :mojave sha256 "7cee5824d4c70a302b3830eaf6615f52e5a1b41fdcbfbcabb46c5dd3ee00ec2c" => :high_sierra sha256 "4b29283a8f69c773d307501a5f89af2a0f5804ce62874b7bd2e6ea89145cf73a" => :sierra + sha256 "228b5781dbba6a5d4f66d47c024b7d4ef6032be6a9b02dc08bf3b0dea2cdfa04" => :x86_64_linux end def install diff --git a/Formula/iperf3.rb b/Formula/iperf3.rb index f3f73f209609a..6cfb4a374590c 100644 --- a/Formula/iperf3.rb +++ b/Formula/iperf3.rb @@ -11,6 +11,7 @@ class Iperf3 < Formula sha256 "b1d4d9506ebfb8ae48882cf4f810b6d52fbbd388211f372e5d56f08abaf61ad3" => :catalina sha256 "32763a4631055100f4c0e5787aedf3f5c73ebc8a9d238b3b08ba66f052a035a3" => :mojave sha256 "657bce37d98fbe976445e58f0ef70cd637c5a5223a1a580af3ab33508d07e8a7" => :high_sierra + sha256 "355c4561890b57b210a2d5d4b028ef01fade5ef7f50121bfa41a88cbb99f8928" => :x86_64_linux end head do diff --git a/Formula/ipfs.rb b/Formula/ipfs.rb index 8b4bcbe0b33d4..f9d9791a42e08 100644 --- a/Formula/ipfs.rb +++ b/Formula/ipfs.rb @@ -11,6 +11,7 @@ class Ipfs < Formula sha256 "e5c9d5a386a83e4e6a9893be6729625902c7eea07ec109fce83b6864a0512bbf" => :catalina sha256 "cbe22d6554e50f65e202e8b65d3bd41b1a18793cc6d33316397c062dd3ddcd79" => :mojave sha256 "7efd7e625d8eeb59c6d8ac3c4a582b77024c7f64f46809996404bb7fd9f2be5a" => :high_sierra + sha256 "34c1f000346740d8c021b5a7dd405fa9cab77453f7da3f19fb69ae790413e5fe" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ipinfo.rb b/Formula/ipinfo.rb index 1ca2d48f370a3..7ea4b5cef6380 100644 --- a/Formula/ipinfo.rb +++ b/Formula/ipinfo.rb @@ -13,6 +13,7 @@ class Ipinfo < Formula sha256 "ecb331ae035cf5963afc8e8adf371d80f936960bf0d5ba379b18761263a1b040" => :el_capitan sha256 "e1ce332c726d060521e97a5402746a60778d91beaf28704d9ce5bb6e17451fb3" => :yosemite sha256 "686fe99fef85ecbfdcc9c922f6cda898362d70bb9f5b9b7e1aeba8e30c284196" => :mavericks + sha256 "f3ddff03c21a8628ec0bab847802f2bbb5aeb16623b69982220c163d51d1762a" => :x86_64_linux end def install diff --git a/Formula/ipmitool.rb b/Formula/ipmitool.rb index c1d3bbc94b321..b2b1a7602a884 100644 --- a/Formula/ipmitool.rb +++ b/Formula/ipmitool.rb @@ -12,6 +12,7 @@ class Ipmitool < Formula sha256 "3bf8d00d62c2e1dc781493d448062ad365ac8e7c73010ee37ba2040a48513c10" => :mojave sha256 "04462f0b4129d34cbf7e8e5c72591360e89dd6d6cef20008567015d57ab611c4" => :high_sierra sha256 "f08f0e5717ff8ccf031ca738eb4995b39db5d37b802800b6e0b6c154f6fed830" => :sierra + sha256 "b8262f186dbb9cab277c76f441aee44b6a488ca522b2768beb75f195ff28a73d" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/ipmiutil.rb b/Formula/ipmiutil.rb index 9cdc8180e50a6..b6d6c9cedec37 100644 --- a/Formula/ipmiutil.rb +++ b/Formula/ipmiutil.rb @@ -9,6 +9,7 @@ class Ipmiutil < Formula sha256 "d9c1f45ad31e61093e3ba002c3494d61e762666733c6f5d03c53e6860e9aaf14" => :catalina sha256 "e1862f31ab6cc95f37dda09ff7250e8b7f84750b075428e517779d37066f3c01" => :mojave sha256 "e6d9bf95fd37500104f94fb640f6ac71d922227190b05b4ccbbf70abc942612c" => :high_sierra + sha256 "36fd47a5812d8fc9e7fa8dca7b339cebe683e735e47bebe37fc69a5ad29468ce" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/ipopt.rb b/Formula/ipopt.rb index 43d59be7cc359..a4cb7ac295035 100644 --- a/Formula/ipopt.rb +++ b/Formula/ipopt.rb @@ -11,6 +11,7 @@ class Ipopt < Formula sha256 "56da0a54b5c1eb644e881a508886601674c73105a29451f1ca50ba9f9fa9d517" => :catalina sha256 "b4c05741141600b85ee8b1ca5c075d8ffcd2c031804ef7830017f16fbb16fa26" => :mojave sha256 "d7d32a074eafdcb5e1b4c50e1b4c0cd76cfb09718eaf5ae8f7e5cecbded70b91" => :high_sierra + sha256 "37c0b0481fc650c580c5e2ad933f5b5c4c3efbc3d5c70c763c63a9c5e22a8f3f" => :x86_64_linux end depends_on "pkg-config" => [:build, :test] @@ -21,10 +22,17 @@ class Ipopt < Formula url "http://mumps.enseeiht.fr/MUMPS_5.2.1.tar.gz" sha256 "d988fc34dfc8f5eee0533e361052a972aa69cc39ab193e7f987178d24981744a" - # MUMPS does not provide a Makefile.inc customized for macOS. - patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/ab96a8b8e510a8a022808a9be77174179ac79e85/ipopt/mumps-makefile-inc-generic-seq.patch" - sha256 "0c570ee41299073ec2232ad089d8ee10a2010e6dfc9edc28f66912dae6999d75" + if OS.mac? + # MUMPS does not provide a Makefile.inc customized for macOS. + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/ab96a8b8e510a8a022808a9be77174179ac79e85/ipopt/mumps-makefile-inc-generic-seq.patch" + sha256 "0c570ee41299073ec2232ad089d8ee10a2010e6dfc9edc28f66912dae6999d75" + end + else + patch do + url "https://gist.githubusercontent.com/dawidd6/09f831daf608eb6e07cc80286b483030/raw/b5ab689dea5772e9b6a8b6d88676e8d76224c0cc/mumps-homebrew-linux.patch" + sha256 "13125be766a22aec395166bf015973f5e4d82cd3329c87895646f0aefda9e78e" + end end end @@ -33,14 +41,16 @@ def install ENV.delete("MPICXX") ENV.delete("MPIFC") + dylib = OS.mac? ? "dylib" : "so" + resource("mumps").stage do cp "Make.inc/Makefile.inc.generic.SEQ", "Makefile.inc" - inreplace "Makefile.inc", "@rpath/", "#{opt_lib}/" + inreplace "Makefile.inc", "@rpath/", "#{opt_lib}/" if OS.mac? ENV.deparallelize { system "make", "d" } (buildpath/"mumps_include").install Dir["include/*.h", "libseq/mpi.h"] - lib.install Dir["lib/*.dylib", "libseq/*.dylib", "PORD/lib/*.dylib"] + lib.install Dir["lib/*.#{dylib}", "libseq/*.#{dylib}", "PORD/lib/*.#{dylib}"] end args = [ diff --git a/Formula/ipv6calc.rb b/Formula/ipv6calc.rb index dc56ed4aad909..0c94ec04a9576 100644 --- a/Formula/ipv6calc.rb +++ b/Formula/ipv6calc.rb @@ -9,6 +9,7 @@ class Ipv6calc < Formula sha256 "f38b9f04ac49b301c599a497b2c4cbc562bc2fcfb73db76ba787fa10d185be76" => :catalina sha256 "df70a9f7bb60eb8c65ed1b7ef6d850f3c2d57321e9be3e814c2480edac3c89df" => :mojave sha256 "8e1168b64a282ce94ded17806bd16142920411f9515f17cd5bb7ed1eb272635c" => :high_sierra + sha256 "7eadf6fbcf96c53da24d40a49f01647b819d3ccf450614819a88a445587a62cc" => :x86_64_linux end def install diff --git a/Formula/ipython.rb b/Formula/ipython.rb index 2fe9725249e7a..91329d21a9a03 100644 --- a/Formula/ipython.rb +++ b/Formula/ipython.rb @@ -13,14 +13,17 @@ class Ipython < Formula sha256 "3e12e1f941eed205b363b5e2626e2ca881ecacd73876a7351a2a5cc637b09a51" => :catalina sha256 "f5cbc55fb480496e53fbdbf998ea6ddaa45b1fdeff7ed5413ee89b6aa7c13d4a" => :mojave sha256 "10590a404f23ac8772eb48f77ab40e4156303bd5fc9d9ac9fa2dc797bf42662b" => :high_sierra + sha256 "15e377e325c8ddff6e92db9d1fcabb3a822d7127152b5fb3db809bdb59bffedf" => :x86_64_linux end depends_on "python@3.8" depends_on "zeromq" - resource "appnope" do - url "https://files.pythonhosted.org/packages/26/34/0f3a5efac31f27fabce64645f8c609de9d925fe2915304d1a40f544cff0e/appnope-0.1.0.tar.gz" - sha256 "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" + if OS.mac? + resource "appnope" do + url "https://files.pythonhosted.org/packages/26/34/0f3a5efac31f27fabce64645f8c609de9d925fe2915304d1a40f544cff0e/appnope-0.1.0.tar.gz" + sha256 "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" + end end resource "backcall" do diff --git a/Formula/ircd-hybrid.rb b/Formula/ircd-hybrid.rb index 9cc1e5df0746e..c710a352358c1 100644 --- a/Formula/ircd-hybrid.rb +++ b/Formula/ircd-hybrid.rb @@ -8,6 +8,7 @@ class IrcdHybrid < Formula sha256 "547457f864424055dca2cea8503012e2b9847aebbc1ee21fda02100d357cef3e" => :catalina sha256 "abce429d77cb8c9949cd25f1c3560642eadf264906d05340779acea9e92c35dd" => :mojave sha256 "444b6c2610188e971e583200ed8f243ce1609682690cd8e1775b9b98321f2f48" => :high_sierra + sha256 "bcca11eea4897b4e45d6066b003881a4e89fa3b1926ffd5e61c8f1525a9f961e" => :x86_64_linux end depends_on "openssl@1.1" @@ -64,6 +65,9 @@ def plist end test do + # Won't run as root + return if Process.uid.zero? + system "#{bin}/ircd", "-version" end end diff --git a/Formula/ircd-irc2.rb b/Formula/ircd-irc2.rb index d29259f257dca..20304a68623aa 100644 --- a/Formula/ircd-irc2.rb +++ b/Formula/ircd-irc2.rb @@ -13,6 +13,7 @@ class IrcdIrc2 < Formula sha256 "259ddceb29a5d5e0705c3b0a130368053de98282ecec2036c17d30062bd6f9f4" => :el_capitan sha256 "af6c845d852e4a525d64f1cfbd551377c90da201c2ef3e521d48fc1513a58064" => :yosemite sha256 "9fd885d98218c6e570f16b238cb72546130f5ca1bbe2e06f260b7a672dba02e2" => :mavericks + sha256 "3c502310dbe2ac02eb4ce4d34fd9453c74b45eaab9802fb70a34974d6988deb3" => :x86_64_linux end def default_ircd_conf diff --git a/Formula/ired.rb b/Formula/ired.rb index d53fc263c5731..244c8139d4a4b 100644 --- a/Formula/ired.rb +++ b/Formula/ired.rb @@ -11,6 +11,7 @@ class Ired < Formula sha256 "f6af714455a74c02769c9726855a92832e43c37c79a0c589a0c7744beac8956c" => :high_sierra sha256 "5d10dfac87e4a4ca589a9fa76e8f9aff62625ef6358b6ab29360e79fe4a6dc35" => :sierra sha256 "4fc558225913b629b144661385841e63ebb167beb9900475fadb0c0e886b4997" => :el_capitan + sha256 "de7d82b64115f1e9f84b6bdcedf8d2bbff7730092d6f8df50e3c4613b0224608" => :x86_64_linux end def install diff --git a/Formula/ironcli.rb b/Formula/ironcli.rb index fccd8a2052180..813f20e12385c 100644 --- a/Formula/ironcli.rb +++ b/Formula/ironcli.rb @@ -11,6 +11,7 @@ class Ironcli < Formula sha256 "c4f4ad82734f93b32a2f64e1adaaf493fa38b4e34cbc9298fbbdc02851003343" => :high_sierra sha256 "14d4bcd4ac89e89fb09b27994ba372d1e25690724c99b7ffbfb0231466c01bca" => :sierra sha256 "62bed7f56cf23a148407527ff2b1234638ae0b365806ccc79c602ee081eed1dc" => :el_capitan + sha256 "1e21387baef4dc4421649413232a17313a831d80702018417ee56892216d05cf" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/irrlicht.rb b/Formula/irrlicht.rb index a72fb15a5fea9..7b299eb83aa06 100644 --- a/Formula/irrlicht.rb +++ b/Formula/irrlicht.rb @@ -14,7 +14,7 @@ class Irrlicht < Formula sha256 "d2236f351b11847d960909fa0e96d83ab0448228de30cd21014fea47a2c636a5" => :sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? def install # Fix "error: cannot initialize a parameter of type diff --git a/Formula/irssi.rb b/Formula/irssi.rb index b2ea17b23d586..3fa28e8110de9 100644 --- a/Formula/irssi.rb +++ b/Formula/irssi.rb @@ -11,6 +11,7 @@ class Irssi < Formula sha256 "e25efab5dc0b20925d920aca182f713fa54b3d781bbea7ff0ff98606a29e8553" => :mojave sha256 "92ce3e102445bc1248daf5404b9045088dde6a8f4e185c5f2a98982e692b4b26" => :high_sierra sha256 "5f2f66c2581189d52bab585f5a1731f2382a29d7125d782856b6b0944515b1bd" => :sierra + sha256 "4d0ee159658eab089348cf69df69df482be5a1bf953a6081e059060b57f40243" => :x86_64_linux end head do @@ -37,8 +38,8 @@ def install --with-bot --with-proxy --enable-true-color + --with-ncurses=#{OS.mac? ? MacOS.sdk_path/"usr" : Formula["ncurses"].prefix} --with-socks=no - --with-ncurses=#{MacOS.sdk_path}/usr --with-perl=yes --with-perl-lib=#{lib}/perl5/site_perl ] diff --git a/Formula/isc-dhcp.rb b/Formula/isc-dhcp.rb index 4368498bdd706..5376428dc7d28 100644 --- a/Formula/isc-dhcp.rb +++ b/Formula/isc-dhcp.rb @@ -8,6 +8,7 @@ class IscDhcp < Formula sha256 "26591c29130891dfe5a7ebe686c800bda76fdf5113885a801c3a30730a119130" => :catalina sha256 "0d61b17cc0bbac751ded99a66948e880c64fe6ba47a8d1613c470ee6c4e54fec" => :mojave sha256 "b0894db278d509c8615da4df71e26bce91daf300bba6380095f291bd2daa642c" => :high_sierra + sha256 "3d5e8f7f5ac90162337b8a6c6f988602fe14b8eb451f7f364ef4dc1e5505ab9b" => :x86_64_linux end def install diff --git a/Formula/isl.rb b/Formula/isl.rb index e30ef6f9a5200..fbea2e8c2db88 100644 --- a/Formula/isl.rb +++ b/Formula/isl.rb @@ -16,6 +16,7 @@ class Isl < Formula sha256 "b5319e3bbbb36ef3536d841999b7497b3dce4bf9e07fb04f6b0db716e087896d" => :catalina sha256 "29213891860c971e084d1e2a3d1ad00c92371140dea599aae2894e26ec0d6874" => :mojave sha256 "a1193c8b06c31abc4bf9c1ef9bb93c4879ff5ba4050b4a06c22c2a0048d3c87f" => :high_sierra + sha256 "f211005727b3ff0a59cbca6521f9a5aaaef54cfc801e3725a1b2708f9576fa0c" => :x86_64_linux end head do diff --git a/Formula/isl@0.18.rb b/Formula/isl@0.18.rb new file mode 100644 index 0000000000000..349ee372957c2 --- /dev/null +++ b/Formula/isl@0.18.rb @@ -0,0 +1,61 @@ +class IslAT018 < Formula + desc "Integer Set Library for the polyhedral model" + homepage "http://isl.gforge.inria.fr" + # Note: Always use tarball instead of git tag for stable version. + # + # Currently isl detects its version using source code directory name + # and update isl_version() function accordingly. All other names will + # result in isl_version() function returning "UNKNOWN" and hence break + # package detection. + url "http://isl.gforge.inria.fr/isl-0.18.tar.xz" + mirror "https://deb.debian.org/debian/pool/main/i/isl/isl_0.18.orig.tar.xz" + sha256 "0f35051cc030b87c673ac1f187de40e386a1482a0cfdf2c552dd6031b307ddc4" + + bottle do + cellar :any_skip_relocation + sha256 "e286024c142af0e968d8562e83745a05dd059dbe226c41fe6053c8fd481815fe" => :high_sierra + sha256 "23c7305a7f227e1749a15584eb203ec9f1f49f1f4312753a9ee360f89b71d304" => :sierra + sha256 "c00c85da652a572356e54cad1a6ff986f136f6088c142dfcdbfc166bd7144d1e" => :el_capitan + sha256 "3ef95686496676a3c73c57db6eee32a9f039e9c2b7ccf173c3b1941124ef6f78" => :x86_64_linux + end + + head do + url "http://repo.or.cz/r/isl.git" + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + end + + keg_only :versioned_formula + + depends_on "gmp" + depends_on :linux + + def install + system "./autogen.sh" if build.head? + system "./configure", "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}", + "--with-gmp=system", + "--with-gmp-prefix=#{Formula["gmp"].opt_prefix}" + system "make", "check" + system "make", "install" + (share/"gdb/auto-load").install Dir["#{lib}/*-gdb.py"] + end + + test do + (testpath/"test.c").write <<~EOS + #include + + int main() + { + isl_ctx* ctx = isl_ctx_alloc(); + isl_ctx_free(ctx); + return 0; + } + EOS + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lisl", "-o", "test" + system "./test" + end +end diff --git a/Formula/iso-codes.rb b/Formula/iso-codes.rb index 9762098ad5d15..c5079184ab80b 100644 --- a/Formula/iso-codes.rb +++ b/Formula/iso-codes.rb @@ -10,6 +10,7 @@ class IsoCodes < Formula sha256 "de9e461920f45e7a41272e45c365bc03fce3897a52b14b22b5953967d595e313" => :catalina sha256 "de9e461920f45e7a41272e45c365bc03fce3897a52b14b22b5953967d595e313" => :mojave sha256 "de9e461920f45e7a41272e45c365bc03fce3897a52b14b22b5953967d595e313" => :high_sierra + sha256 "adc279ff3b85e5d247f67effc657e561ceaf4119df5ec54caf338664764c34b3" => :x86_64_linux end depends_on "gettext" => :build diff --git a/Formula/ispell.rb b/Formula/ispell.rb index 804f229143980..0df9d6d14e106 100644 --- a/Formula/ispell.rb +++ b/Formula/ispell.rb @@ -13,6 +13,7 @@ class Ispell < Formula sha256 "81d9f6f9aca0f92ba3bece2ad22d0b0bca29c719304c6c5e8e59b02a3c8763da" => :el_capitan sha256 "ff46baf7aa6daf42fddde68897bd80dbb073922b4556c502e7b0072656b48498" => :yosemite sha256 "f1ee90dcc76682d17c2b758d2a896493448753acc0e556e9b0c8bf7ec0f552df" => :mavericks + sha256 "c8bbcdc12d3e90e63949f6f284d8e8ebc2c723ed53251fe4619d600896345bfb" => :x86_64_linux # glibc 2.19 end uses_from_macos "ncurses" diff --git a/Formula/istioctl.rb b/Formula/istioctl.rb index 47dacf4f1e779..c43593c1fc845 100644 --- a/Formula/istioctl.rb +++ b/Formula/istioctl.rb @@ -10,6 +10,7 @@ class Istioctl < Formula sha256 "4d8a3349751f06f8b9abca029719b9d3ce5bd475adb949d61efe97432dce12b5" => :catalina sha256 "4d8a3349751f06f8b9abca029719b9d3ce5bd475adb949d61efe97432dce12b5" => :mojave sha256 "4d8a3349751f06f8b9abca029719b9d3ce5bd475adb949d61efe97432dce12b5" => :high_sierra + sha256 "e13f3d9d38443d4e761a809fe20c48ebec5a6a7f982c80c0965b99356b68c262" => :x86_64_linux end depends_on "go" => :build @@ -23,7 +24,7 @@ def install ENV["BUILD_WITH_CONTAINER"] = "0" srcpath = buildpath/"src/istio.io/istio" - outpath = srcpath/"out/darwin_amd64" + outpath = OS.mac? ? srcpath/"out/darwin_amd64" : srcpath/"out/linux_amd64" srcpath.install buildpath.children cd srcpath do diff --git a/Formula/isync.rb b/Formula/isync.rb index b7ffe799d17dc..c4b9b4af1db78 100644 --- a/Formula/isync.rb +++ b/Formula/isync.rb @@ -18,6 +18,7 @@ class Isync < Formula sha256 "7863e1861cc119853fadc35ff6afe7f13bf1e420f22b70e77d0bb32997943329" => :mojave sha256 "2da1bd2fef7c6eb9af331a0536e02df8dd0bc9b0fc42eb534ec8499a87f8c197" => :high_sierra sha256 "a19f503aa9490146a19a4197e8e0190cffad685c7fdba0582544c44ee96f1fe5" => :sierra + sha256 "970bc89bc0e2bf3d0c0eda0b9aad32ce370a67abeb826c54c601c9421cc5e05a" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/itk.rb b/Formula/itk.rb index cc056dd283892..1d4cfcb6c6a96 100644 --- a/Formula/itk.rb +++ b/Formula/itk.rb @@ -19,6 +19,11 @@ class Itk < Formula depends_on "libpng" depends_on "libtiff" depends_on "vtk" + unless OS.mac? + depends_on "alsa-lib" + depends_on "glibc" + depends_on "unixodbc" + end def install args = std_cmake_args + %W[ @@ -44,9 +49,15 @@ def install -DModule_ITKLevelSetsv4Visualization=ON -DModule_ITKReview=ON -DModule_ITKVtkGlue=ON - -DITK_USE_GPU=ON ] + # Requires OpenCL on Linux which is not available in Homebrew + args << if OS.mac? + "-DITK_USE_GPU=ON" + else + "-DITK_USE_GPU=OFF" + end + # Avoid references to the Homebrew shims directory inreplace "Modules/Core/Common/src/CMakeLists.txt" do |s| s.gsub!(/MAKE_MAP_ENTRY\(\s*\\"CMAKE_C_COMPILER\\", @@ -80,14 +91,15 @@ def install EOS v = version.to_s.split(".")[0..1].join(".") + suffix = OS.mac? ? "#{v}.1.dylib" : "#{v}.so.1" # Build step system ENV.cxx, "-std=c++11", "-isystem", "#{include}/ITK-#{v}", "-o", "test.cxx.o", "-c", "test.cxx" # Linking step system ENV.cxx, "-std=c++11", "test.cxx.o", "-o", "test", - "#{lib}/libITKCommon-#{v}.1.dylib", - "#{lib}/libITKVNLInstantiation-#{v}.1.dylib", - "#{lib}/libitkvnl_algo-#{v}.1.dylib", - "#{lib}/libitkvnl-#{v}.1.dylib" + "#{lib}/libITKCommon-#{suffix}", + "#{lib}/libITKVNLInstantiation-#{suffix}", + "#{lib}/libitkvnl_algo-#{suffix}", + "#{lib}/libitkvnl-#{suffix}" system "./test" end end diff --git a/Formula/itpp.rb b/Formula/itpp.rb index 824bbc800dc1f..fac5eaf4f123d 100644 --- a/Formula/itpp.rb +++ b/Formula/itpp.rb @@ -14,6 +14,7 @@ class Itpp < Formula sha256 "c9f2f041dbdbea87029180a253fa0cd470aee6a2144a848b10f9fb5c40f01b8e" => :el_capitan sha256 "6e772c61104760fcf2c9500fa06fb2d032d4db1f53ef44d090e18aca54ee75f0" => :yosemite sha256 "c9e5ed1ab5febb67c61139b451ac70c501e6dd8fe656f7658d9e6aaa3f025e2a" => :mavericks + sha256 "ed6c554e6f70e20620eadcd814afdd201f9267fe7863a2616091dea0b8ab54d4" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/itstool.rb b/Formula/itstool.rb index d14f2949298ec..0d670b61ae277 100644 --- a/Formula/itstool.rb +++ b/Formula/itstool.rb @@ -11,6 +11,7 @@ class Itstool < Formula sha256 "73238debce4f4c1e9922427a22312161d0400d70f22b642137689b4431ba0a20" => :catalina sha256 "73238debce4f4c1e9922427a22312161d0400d70f22b642137689b4431ba0a20" => :mojave sha256 "73238debce4f4c1e9922427a22312161d0400d70f22b642137689b4431ba0a20" => :high_sierra + sha256 "98e3a52afa6e9be8dea0191dd0402ab09d5d3b0fe9c1bae01a210d0f45448e0f" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/ivykis.rb b/Formula/ivykis.rb index dfeaa6acf8473..45bb873a5f176 100644 --- a/Formula/ivykis.rb +++ b/Formula/ivykis.rb @@ -10,6 +10,7 @@ class Ivykis < Formula sha256 "5da36891f20e60db1a94b7eafeaf35605a0a4b18e833721aec01ab68399653a3" => :catalina sha256 "dd4fa86f2988dd4c913fc443131ce519ebf034ff492b4760f323ca663fb1744c" => :mojave sha256 "1409aa60298ac27959cf5370b70d158843524e5f5638e28e9607ac7e8783b11e" => :high_sierra + sha256 "29416c373dd9f32504a9f4c206026b0184922f5bfbf89d1d3f368ea8cc2cb849" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/jabba.rb b/Formula/jabba.rb index 68bef55681b93..e83d03e08e640 100644 --- a/Formula/jabba.rb +++ b/Formula/jabba.rb @@ -11,6 +11,7 @@ class Jabba < Formula sha256 "7eddb409c7bb2784db21756e624a18b19977bb4df53ab547eaedd8abe876651e" => :catalina sha256 "3101ea25ce49c3ed96b3c8595a5441fec3aeb536b56eca21c1dea56f6c1fd86b" => :mojave sha256 "8454f5aa9b8832908b1c889531118ea058b2e675ef7f7f37eeb282f454aeec1e" => :high_sierra + sha256 "237bab11bbcc4434a0b48c8d03a6f8634d12ec011f9357f26d8965f523fedad2" => :x86_64_linux end depends_on "glide" => :build @@ -34,6 +35,6 @@ def install system bin/"jabba", "install", "openjdk@1.14.0" jdk_path = shell_output("#{bin}/jabba which openjdk@1.14.0").strip assert_match 'openjdk version "14', - shell_output("#{jdk_path}/Contents/Home/bin/java -version 2>&1") + shell_output("#{jdk_path}#{OS.mac? ? "/Contents/Home/" : "/"}bin/java -version 2>&1") end end diff --git a/Formula/jack.rb b/Formula/jack.rb index 5c3298fd1caf8..ba2c2432ba615 100644 --- a/Formula/jack.rb +++ b/Formula/jack.rb @@ -19,6 +19,7 @@ class Jack < Formula sha256 "69f9c5215e993b4b6eee2b31b3585d4df92160ec162a433df76a4a66e9f72b71" => :catalina sha256 "fc489e40c89bfe3315b7d9f6dc1f243aeb03e57741faeb7b4b8f8adfc769c0a7" => :mojave sha256 "169ce5413c397a9cea4d346fd33d5120f1411d92105f39722b2ae8c9ebd881df" => :high_sierra + sha256 "c61ba8802f6e100c7562987842bb4a0912e46ab2d4a6bf0ac09053d39493ac41" => :x86_64_linux end depends_on "autoconf" => :build @@ -34,16 +35,18 @@ class Jack < Formula end def install - sdk = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" + if OS.mac? + sdk = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" - # Makefile hardcodes Carbon header location - inreplace Dir["drivers/coreaudio/Makefile.{am,in}"], - "/System/Library/Frameworks/Carbon.framework/Headers/Carbon.h", - "#{sdk}/System/Library/Frameworks/Carbon.framework/Headers/Carbon.h" + # Makefile hardcodes Carbon header location + inreplace Dir["drivers/coreaudio/Makefile.{am,in}"], + "/System/Library/Frameworks/Carbon.framework/Headers/Carbon.h", + "#{sdk}/System/Library/Frameworks/Carbon.framework/Headers/Carbon.h" - # https://github.com/jackaudio/jack1/issues/81 - inreplace "configure.ac", "-mmacosx-version-min=10.4", - "-mmacosx-version-min=#{MacOS.version}" + # https://github.com/jackaudio/jack1/issues/81 + inreplace "configure", "-mmacosx-version-min=10.4", + "-mmacosx-version-min=#{MacOS.version}" + end system "./autogen.sh" ENV["LINKFLAGS"] = ENV.ldflags diff --git a/Formula/jailkit.rb b/Formula/jailkit.rb index 71f2de9f00b1a..f4c19494b78cb 100644 --- a/Formula/jailkit.rb +++ b/Formula/jailkit.rb @@ -9,6 +9,7 @@ class Jailkit < Formula sha256 "1bdfd57d829a6b90286601b2b13660b53cc14fe6443d0d23fa15636171c79439" => :catalina sha256 "43811f3b792ddd4039767cf81882e0c46c2851ba95546c01d7c1a052c3e99f3e" => :mojave sha256 "dd348dd5721fc813bb1556f13b196b684f5ef805f3c03c2bab1e3df4eef41376" => :high_sierra + sha256 "e4cb72a70cefd633e651e3222937fbba0f45d83a0c317ebc0509beeb39df2f69" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/jam.rb b/Formula/jam.rb index 8903e8a71abaf..eaf80f2dbc879 100644 --- a/Formula/jam.rb +++ b/Formula/jam.rb @@ -9,6 +9,7 @@ class Jam < Formula sha256 "0f2f2b4cac48c2ef9b11d86867c4e9d941a41a582754bfc470da25a7174dde9f" => :catalina sha256 "c19a32cbe0ffa2e7d2d826ee542a74307ca29b34ba28dc5ec6aea7ff7a9127c1" => :mojave sha256 "2927cebface8a3cbc00a23e7badb9e1676fda9bae282e78a1772b99aafba5014" => :high_sierra + sha256 "65809672791ef02bb801fa26debd7020dde8f18d23f4fc4434c3d304bdae865b" => :x86_64_linux end conflicts_with "ftjam", :because => "both install a `jam` binary" diff --git a/Formula/janet.rb b/Formula/janet.rb index 0272f0903419a..2a188025cb8a1 100644 --- a/Formula/janet.rb +++ b/Formula/janet.rb @@ -10,6 +10,7 @@ class Janet < Formula sha256 "a766c0f5fa6d207c030813e03abf3b09ab13e8dcb6a5ce4bad3912017435685b" => :catalina sha256 "b6d8f7dd18cf760657d46121b6290402008d4ac21a03a1bac88ff6fb697976dd" => :mojave sha256 "6ab63abf4e3f1cd5d4c5bacb367c779bf776153c37c4bfad3c85cf02b52678dd" => :high_sierra + sha256 "531f762f93e7113f0d510a7702d18ba52d7970f60a21abd80e2bfad788fbaefd" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/jansson.rb b/Formula/jansson.rb index 9cc557e1dc854..881d917f94501 100644 --- a/Formula/jansson.rb +++ b/Formula/jansson.rb @@ -9,6 +9,7 @@ class Jansson < Formula sha256 "e6a942f77821fd65810d4bc20e6938364a5e40cd7c8510c4b090731573bd0088" => :catalina sha256 "587acdadd1ea8bcf22c316f55a32084f530280a7e24f0864e0e420718d0d1b7f" => :mojave sha256 "38085c147eb40d58df8a91a44e7544d4ceb248aa25f54bdd8a3b10c1a214d9e9" => :high_sierra + sha256 "743d1b06e991514968c94226924cf14a199d530fc63bd000972e04081d4a6063" => :x86_64_linux end def install diff --git a/Formula/jasper.rb b/Formula/jasper.rb index d2094b0259ec3..6af83e82ffd2a 100644 --- a/Formula/jasper.rb +++ b/Formula/jasper.rb @@ -6,10 +6,12 @@ class Jasper < Formula revision 1 bottle do + cellar :any_skip_relocation sha256 "eb5d0888be36aa8afb0eccc43957eeda99ded64ec5a5531240a4ec99450ba183" => :catalina sha256 "ed0856ff9b2429852401e658f4045c9e39cd05fa77b5ea7a6a3c2e21b4d8c460" => :mojave sha256 "630b86c544fda0a769815637e37b34e587a6d070b26d642b0d50401f609c744f" => :high_sierra sha256 "15ccd9ba448e5de3468d6be07c41106ed77e45d65adbea74a524c042e8791b06" => :sierra + sha256 "1d57491d2065e57574f3d0ca205d9a303bc8eb99c6a1dd7d5f22f75f05978b85" => :x86_64_linux end depends_on "cmake" => :build @@ -19,8 +21,8 @@ def install mkdir "build" do # Make sure macOS's GLUT.framework is used, not XQuartz or freeglut # Reported to CMake upstream 4 Apr 2016 https://gitlab.kitware.com/cmake/cmake/issues/16045 - glut_lib = "#{MacOS.sdk_path}/System/Library/Frameworks/GLUT.framework" - system "cmake", "..", "-DGLUT_glut_LIBRARY=#{glut_lib}", *std_cmake_args + glut_lib = "#{MacOS.sdk_path}/System/Library/Frameworks/GLUT.framework" if OS.mac? + system "cmake", "..", *("-DGLUT_glut_LIBRARY=#{glut_lib}" if OS.mac?), *std_cmake_args system "make" system "make", "test" system "make", "install" diff --git a/Formula/javacc.rb b/Formula/javacc.rb index d682990a41c9d..7cc4cfac82e0c 100644 --- a/Formula/javacc.rb +++ b/Formula/javacc.rb @@ -9,6 +9,7 @@ class Javacc < Formula sha256 "6eebc2e971b6ec0bd1fd0010541833623c24b4d6f2fb6f83026b927a209f0bc1" => :catalina sha256 "73510c8870303d486394d2ec540a2f1c48432da6ed795de25b13f2d4f079c16e" => :mojave sha256 "e1bd0b87cb040d9d7d07be29fc66b4c0b82a530cff669a620009d4bc739281d3" => :high_sierra + sha256 "9b6603230c30b417a9dec32b9845aaed1ac35638c7feed1cf3313ef60446cd43" => :x86_64_linux end depends_on "ant" => :build diff --git a/Formula/jbig2dec.rb b/Formula/jbig2dec.rb index 38da1ced6c74a..3c2989e6a657e 100644 --- a/Formula/jbig2dec.rb +++ b/Formula/jbig2dec.rb @@ -9,6 +9,7 @@ class Jbig2dec < Formula sha256 "fcf5e2f4d25c553c6cdada4364e37d08850eea59cda5e2177503d8eb7ecf0aef" => :catalina sha256 "e437d5f1391cb3b85a1f11246fa87ab9b3396ce10f3b25801d2a614b79d09cfc" => :mojave sha256 "7bbc9569c46647373ca333801e335d8839078eb61c94e36a3d53e1e2c323c58c" => :high_sierra + sha256 "a6d96cd6f8d2205e1df26417895801b5bb705472f6784dca5073ce7fd4528e09" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/jbig2enc.rb b/Formula/jbig2enc.rb index 740b9302578f8..55cbae080c13f 100644 --- a/Formula/jbig2enc.rb +++ b/Formula/jbig2enc.rb @@ -12,6 +12,7 @@ class Jbig2enc < Formula sha256 "7431e5b6cf8354ab27bbb7710b2133eb3d381f3c6a30b7143332fba5e7fe82f7" => :high_sierra sha256 "53d757dc93193756cc90f94a6ca2f4bad2b77610e5b93d5d74f95899019771be" => :sierra sha256 "f903109f6f2da89af11e576c8776f10e16eadb71c0a60edb9f35157b965edd98" => :el_capitan + sha256 "c4866faffc379de19928354c429ad603b74891c77db4289a6c4b2595cd08efb8" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/jbigkit.rb b/Formula/jbigkit.rb index a968b96190529..ddb618c3c2ebe 100644 --- a/Formula/jbigkit.rb +++ b/Formula/jbigkit.rb @@ -16,11 +16,15 @@ class Jbigkit < Formula sha256 "bdec08cd92dd59183b698c6bbd9072881fdfce64b4ecb6182e405e0f2ad26c00" => :el_capitan sha256 "764396342e87b84253aa06f5046f90c778cacca998ce970900cb2fdf1cfdc3fa" => :yosemite sha256 "0ce925915b984307d2e679622138143c5cc5baf832b0a16003fa1e6111a5df9f" => :mavericks + sha256 "d7b87245e8682383dc10c4730d5248fabfab9c7ae5b76662da50a24785c0a710" => :x86_64_linux # glibc 2.19 end conflicts_with "netpbm", :because => "both install `pbm.5` and `pgm.5` files" def install + # Fix fatal error: jbig.h: No such file or directory + inreplace "Makefile", "$(MAKE) -e", "$(MAKE)" unless OS.mac? + system "make", "CC=#{ENV.cc}", "CCFLAGS=#{ENV.cflags}" cd "pbmtools" do diff --git a/Formula/jd.rb b/Formula/jd.rb index 6b820584ba462..48218003fe3fb 100644 --- a/Formula/jd.rb +++ b/Formula/jd.rb @@ -9,6 +9,7 @@ class Jd < Formula sha256 "e096231d88fa92e9215345a34de8b5dceb5e3217a22681107f81b935b9090619" => :catalina sha256 "0a33823d7919a0218e895685903d718bc3013e13710166797cfa332895c6a4e1" => :mojave sha256 "fed5e72e199dd94ef0f34b506f689de867ac8f938641a9738e99dc8f4c27cbe6" => :high_sierra + sha256 "a78537e8a9230503485dcad6601d40a1df975ee61eca3118a27aca9326e3ea32" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/jdk.rb b/Formula/jdk.rb new file mode 100644 index 0000000000000..0854061543314 --- /dev/null +++ b/Formula/jdk.rb @@ -0,0 +1,45 @@ +class Jdk < Formula + desc "Java Platform, Standard Edition Development Kit (JDK)" + homepage "http://www.oracle.com/technetwork/java/javase/downloads/index.html" + + version "9.0.4" + version_scheme 1 + if OS.mac? + url "http://java.com/" + else + url "http://ftp.osuosl.org/pub/funtoo/distfiles/oracle-java/jdk-9.0.4_linux-x64_bin.tar.gz" + sha256 "90c4ea877e816e3440862cfa36341bc87d05373d53389ec0f2d54d4e8c95daa2" + end + + bottle :unneeded + + depends_on :linux + + def install + odie "Use 'brew cask install java' on Mac OS" if OS.mac? + prefix.install Dir["*"] + end + + def caveats + <<~EOS + By installing and using JDK you agree to the + Oracle Binary Code License Agreement for the Java SE Platform Products and JavaFX + http://www.oracle.com/technetwork/java/javase/terms/license/index.html + EOS + end + + test do + (testpath/"Hello.java").write <<~EOS + class Hello + { + public static void main(String[] args) + { + System.out.println("Hello Homebrew"); + } + } + EOS + system bin/"javac", "Hello.java" + assert_predicate testpath/"Hello.class", :exist?, "Failed to compile Java program!" + assert_equal "Hello Homebrew\n", shell_output("#{bin}/java Hello") + end +end diff --git a/Formula/jdk@7.rb b/Formula/jdk@7.rb new file mode 100644 index 0000000000000..6017b9810d574 --- /dev/null +++ b/Formula/jdk@7.rb @@ -0,0 +1,38 @@ +class JdkAT7 < Formula + desc "Java Platform, Standard Edition Development Kit (JDK)" + homepage "https://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html" + + version "1.7.0-80" + if OS.linux? + url "https://ftp.osuosl.org/pub/funtoo/distfiles/oracle-java/jdk-7u80-linux-x64.tar.gz" + sha256 "bad9a731639655118740bee119139c1ed019737ec802a630dd7ad7aab4309623" + elsif OS.mac? + url "https://java.com/" + end + + bottle :unneeded + + keg_only :versioned_formula + + depends_on :linux + + def install + odie "Use 'brew cask install Caskroom/versions/java7' on Mac OS" if OS.mac? + prefix.install Dir["*"] + share.mkdir + share.install prefix/"man" + end + + def caveats + <<~EOS + By installing and using JDK you agree to the + Oracle Binary Code License Agreement for the Java SE Platform Products and JavaFX + http://www.oracle.com/technetwork/java/javase/terms/license/index.html + EOS + end + + test do + system "#{bin}/java", "-version" + system "#{bin}/javac", "-version" + end +end diff --git a/Formula/jdk@8.rb b/Formula/jdk@8.rb new file mode 100644 index 0000000000000..29fb7d4cf3668 --- /dev/null +++ b/Formula/jdk@8.rb @@ -0,0 +1,51 @@ +class JdkAT8 < Formula + desc "Java Platform, Standard Edition Development Kit (JDK)" + homepage "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html" + + version "1.8.0-181" + if OS.mac? + url "http://java.com/" + else + url "http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.tar.gz", + :cookies => { + "oraclelicense" => "accept-securebackup-cookie", + } + sha256 "1845567095bfbfebd42ed0d09397939796d05456290fb20a83c476ba09f991d3" + end + + bottle :unneeded + + keg_only :versioned_formula + + depends_on :linux + + def install + odie "Use 'brew cask install java' on Mac OS" if OS.mac? + prefix.install Dir["*"] + share.mkdir + share.install prefix/"man" + end + + def caveats + <<~EOS + By installing and using JDK you agree to the + Oracle Binary Code License Agreement for the Java SE Platform Products and JavaFX + http://www.oracle.com/technetwork/java/javase/terms/license/index.html + EOS + end + + test do + (testpath/"Hello.java").write <<~EOS + class Hello + { + public static void main(String[] args) + { + System.out.println("Hello Homebrew"); + } + } + EOS + system bin/"javac", "Hello.java" + assert_predicate testpath/"Hello.class", :exist?, "Failed to compile Java program!" + assert_equal "Hello Homebrew\n", shell_output("#{bin}/java Hello") + end +end diff --git a/Formula/jdnssec-tools.rb b/Formula/jdnssec-tools.rb index d6fbe51025351..45f47100eb3b5 100644 --- a/Formula/jdnssec-tools.rb +++ b/Formula/jdnssec-tools.rb @@ -11,6 +11,7 @@ class JdnssecTools < Formula sha256 "c12eafadb12264e88ef14fe4e93cdb41f0afccbb24b8cff892e8747d8ad2d73b" => :catalina sha256 "c12eafadb12264e88ef14fe4e93cdb41f0afccbb24b8cff892e8747d8ad2d73b" => :mojave sha256 "c12eafadb12264e88ef14fe4e93cdb41f0afccbb24b8cff892e8747d8ad2d73b" => :high_sierra + sha256 "0173c0674b059271d0ca7e85705859a6015f4c10daa23fc39374057f54ad0571" => :x86_64_linux end depends_on "openjdk" diff --git a/Formula/jdupes.rb b/Formula/jdupes.rb index 89f83f44869e4..1e98dc0fd6127 100644 --- a/Formula/jdupes.rb +++ b/Formula/jdupes.rb @@ -9,6 +9,7 @@ class Jdupes < Formula sha256 "a5c2f627d9f5d754db93194602d00809fa51d42bbe099c90d1b958505857649f" => :catalina sha256 "227031566f85278bae1f371f2143833c384110a40ca17b59b54198dee74be2cc" => :mojave sha256 "89f552a562c2d099f6b4b4ac84146687d58ca7b38622f7e0665b31bc786bd468" => :high_sierra + sha256 "3536bcb23d81320107e4d2c65b43c5cc15e3248996fc27cb555a4030e5c6f4f9" => :x86_64_linux end def install diff --git a/Formula/jed.rb b/Formula/jed.rb index dfce17ed0a967..e267f7bcab83a 100644 --- a/Formula/jed.rb +++ b/Formula/jed.rb @@ -4,6 +4,7 @@ class Jed < Formula url "https://www.jedsoft.org/releases/jed/jed-0.99-19.tar.gz" mirror "https://deb.debian.org/debian/pool/main/j/jed/jed_0.99.19.orig.tar.gz" sha256 "5eed5fede7a95f18b33b7b32cb71be9d509c6babc1483dd5c58b1a169f2bdf52" + revision 1 unless OS.mac? bottle do rebuild 1 @@ -11,6 +12,7 @@ class Jed < Formula sha256 "74df74658f783e6de97ed841b1e2532ead3681c7816d55c52e56d4d5056050b9" => :mojave sha256 "b8e8f13a1936067960fd2040019d30fc3cedabba4f5c3c22712990f64e09c752" => :high_sierra sha256 "caa1269eeac2bd84b2287426c77d501956632f01f92c44605bf8b5d76ab7550a" => :sierra + sha256 "c5e7cd25f3620891873a45bae49516a0bca7a5397d803812397ef8ca3f728d45" => :x86_64_linux end head do diff --git a/Formula/jemalloc.rb b/Formula/jemalloc.rb index 0d705f6fd823b..deac0d75ea6ee 100644 --- a/Formula/jemalloc.rb +++ b/Formula/jemalloc.rb @@ -10,6 +10,7 @@ class Jemalloc < Formula sha256 "b1b211e5bead798c236d478dd74310a97a7b59470f607b608c07222648b08bf5" => :catalina sha256 "d3f6f85e74b08c8c97448e289734df484f884af35cd10ce9d9db43cf721fbf94" => :mojave sha256 "8080c98844153da08346431fe0a0592f6f718cb7a17525f9ffb909c395bc0b6d" => :high_sierra + sha256 "08def7a0bdddf9311aeca1d40b93f4ac1b8b0c13ded3c66dc8ec44e517cff233" => :x86_64_linux end head do @@ -63,7 +64,7 @@ def install malloc_stats_print(NULL, NULL, NULL); } EOS - system ENV.cc, "test.c", "-L#{lib}", "-ljemalloc", "-o", "test" + system ENV.cc, "test.c", "-L#{lib}", "-ljemalloc", "-o", "test", ("--std=c99" unless OS.mac?) system "./test" end end diff --git a/Formula/jenkins-job-builder.rb b/Formula/jenkins-job-builder.rb index 1e60b89c2a652..63e1b22268be9 100644 --- a/Formula/jenkins-job-builder.rb +++ b/Formula/jenkins-job-builder.rb @@ -9,6 +9,7 @@ class JenkinsJobBuilder < Formula sha256 "401635aba7c452a9a11df19f5643e29486ec94a99d0c77f4e17853bc5b19f913" => :catalina sha256 "15b76a21bc0d7eccf50a9a8865451e84c01e03021bda785eb1c07b555b7529ce" => :mojave sha256 "0628969ca2bc6f5c8bc17ff2b048572ca6e1ec85e940f9179bb060fa9ba1dd8f" => :high_sierra + sha256 "33a16f2bf1adf29dce61eb66503f3c5ca4734bb5dae52aaaf4edabc03140e66d" => :x86_64_linux end depends_on "python@3.8" @@ -105,6 +106,11 @@ def install end test do + assert_match "usage", shell_output("#{bin}/jenkins-jobs --help") + + # The following test requires that Jenkins is configured on this host. + return unless OS.mac? + assert_match("Managed by Jenkins Job Builder", pipe_output("#{bin}/jenkins-jobs test /dev/stdin", "- job:\n name: test-job\n\n", 0)) diff --git a/Formula/jerasure.rb b/Formula/jerasure.rb index 3d482ebbbb8c5..c724eb05b23f5 100644 --- a/Formula/jerasure.rb +++ b/Formula/jerasure.rb @@ -12,6 +12,7 @@ class Jerasure < Formula sha256 "8e63bf431836395466d91ef947126a39c8193b274ab22156cf421d6958508607" => :high_sierra sha256 "603646521f0255877f611df53e30ccbc071b07cba6e0f33025404332e9677ffa" => :sierra sha256 "1db6ef4631512bf3b155d614588689b2bacc911178cedf828db8f810d9e18d43" => :el_capitan + sha256 "790990c755e408f6ec7649fa6e2765666619a6122fb05ea6a57afbb1d289cc22" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/jerm.rb b/Formula/jerm.rb index 8b300c4a1bd68..a2a67dbfccf79 100644 --- a/Formula/jerm.rb +++ b/Formula/jerm.rb @@ -15,6 +15,7 @@ class Jerm < Formula sha256 "5c8409bfdeba7b55199659f4b82b8df9ec2ca8685435703bf1ddff29f9e027e5" => :el_capitan sha256 "bce73bc0790565d58c129116833c2bf6dab677c95287036f4b3717a02792da12" => :yosemite sha256 "e7a2ed29af497e459175ac4b7bf9d4e0b9a367c653ee3d7798b316a95d8e5cbe" => :mavericks + sha256 "879f68894bf7c8d8c88dd29e4b772e69d0c84eba09ecd43d988aae5edf8961e0" => :x86_64_linux end def install diff --git a/Formula/jfrog-cli.rb b/Formula/jfrog-cli.rb index 2c20f8f021b92..6f734c85f43a1 100644 --- a/Formula/jfrog-cli.rb +++ b/Formula/jfrog-cli.rb @@ -9,6 +9,7 @@ class JfrogCli < Formula sha256 "bfabac91df7c7ef240471c9abbbf64fdbb91a39ca7076fdbf0db5f39a242d08f" => :catalina sha256 "075d434d00e81a8baa9e531757f37ab37923ab0173e32baab3050ed2f8eebca2" => :mojave sha256 "c266c9d63c404e8fc550442eb24063a26d568aba27c8e58a1ac1df3c48a12a78" => :high_sierra + sha256 "b668bdadd8b613729530ac8586a41aa288dddf4d6c10572291a3ad779397b7c9" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/jhipster.rb b/Formula/jhipster.rb index c4d998434e8ae..77bb97b58cd39 100644 --- a/Formula/jhipster.rb +++ b/Formula/jhipster.rb @@ -11,6 +11,7 @@ class Jhipster < Formula sha256 "8c5827dea68f174ed0178d92b74a7fcd298bb10bec9a9aa2d89aba24ca17bae1" => :catalina sha256 "1a0def967d83fc1b19a5a9b1886eb8b205db4591c21a764edc26106f7b2d859d" => :mojave sha256 "ba0619071d3f6a43ddb33faa25b06af8e0eef3b2c8d3593a3ca95a111b08d47e" => :high_sierra + sha256 "0fb228f9a11bace6089970276e0dceb6e292f5a3e4a7fc3d2a187ad9ca1c9da1" => :x86_64_linux end depends_on "node" diff --git a/Formula/jid.rb b/Formula/jid.rb index 06b9bb8042504..c229d9b5287c0 100644 --- a/Formula/jid.rb +++ b/Formula/jid.rb @@ -10,6 +10,7 @@ class Jid < Formula sha256 "0b45fe9c59facbc6b2bbacf4b52927934b09d6e2050ad3a5b5a32434a4bd4751" => :catalina sha256 "2980bf16f4376b7bdfc27e0e6bbe45d9e1f8aca8a143f6f7b6fd939eb6892617" => :mojave sha256 "d429ac5400fd67dcee12e5fe962e84f535858c7ecb3235ee01f8a54dc44e7a9e" => :high_sierra + sha256 "a8fda694c17d6e1186fa50416922349cb02032332e27e623c0504260da5dce2b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/jinja2-cli.rb b/Formula/jinja2-cli.rb index f859d45cde59a..5a21020ff5166 100644 --- a/Formula/jinja2-cli.rb +++ b/Formula/jinja2-cli.rb @@ -5,13 +5,14 @@ class Jinja2Cli < Formula homepage "https://github.com/mattrobenolt/jinja2-cli" url "https://files.pythonhosted.org/packages/23/67/6f05f5f8a9fc108c58e4eac9b9b7876b400985d33149fe2faa87a9ca502b/jinja2-cli-0.7.0.tar.gz" sha256 "9ccd8d530dad5d031230afd968cf54637b49842a13ececa6e17c2f67f6e9336e" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "31848f994850d25890342ec76c1259e6b19738105cf7cb8d58eae1f3abb29252" => :catalina sha256 "c1f403a72668b4ffdc5da4e02d6d35cdb712a3b0cd8cf2b91a844b34e5b21370" => :mojave sha256 "972f68142054b8201968d19962ad237b29f9ab2d15b1f5b7b27d5798685db797" => :high_sierra + sha256 "9b77f8a468a1db3957744b6807c3dcbdbed4acd730e670a4966a0b8986c8fde7" => :x86_64_linux end depends_on "python@3.8" @@ -31,7 +32,11 @@ def install end test do - assert_match version.to_s, shell_output("script -q /dev/null #{bin}/jinja2 --version") + if OS.mac? + assert_match version.to_s, shell_output("script -q /dev/null #{bin}/jinja2 --version") + else + assert_match version.to_s, shell_output("script -q /dev/null -e -c \"#{bin}/jinja2 --version\"") + end expected_result = <<~EOS The Beatles: - Ringo Starr diff --git a/Formula/jlog.rb b/Formula/jlog.rb index 6c00449ff7959..46cd291536810 100644 --- a/Formula/jlog.rb +++ b/Formula/jlog.rb @@ -10,6 +10,7 @@ class Jlog < Formula sha256 "2db582029e1e911ae614e5b3ecd91269c68c1826da086a82c0d53a9b92ae5a0b" => :catalina sha256 "3703ad59209dd6753353d32a02c83a17f71103c524eb0080ca0472b71a1c2971" => :mojave sha256 "82fbc6c978b3bc35238f584fa161362cc5f77b5df23e8ff22ecebeda57e82a58" => :high_sierra + sha256 "e0b043f66b7e890ab89eef253faf2a6d84ea3ceb12d98949a1b88f1852445bdc" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/jo.rb b/Formula/jo.rb index f621a41741057..e0c0c8e0ce477 100644 --- a/Formula/jo.rb +++ b/Formula/jo.rb @@ -9,6 +9,7 @@ class Jo < Formula sha256 "7bbe7df2da77374b644e9909da0bbd356a8e8b2bbc49addf5593c2ee783c69e6" => :catalina sha256 "3003ca4f6f3650f6f67be5e4debadfb50d9e55ba41f792b9c37eaeb78a6241ab" => :mojave sha256 "ca189874bb16f024bc804fb167da2a8cfd0839fddd415aae964ee27ac112ba43" => :high_sierra + sha256 "5e70a48b2a6637157f8227317158ed2fcb53e1a91646108a4678b0dbbdcf7a03" => :x86_64_linux end head do @@ -21,6 +22,7 @@ class Jo < Formula def install system "autoreconf", "-i" if build.head? + ENV["bashcompdir"] = bash_completion unless OS.mac? system "./configure", "--disable-silent-rules", "--prefix=#{prefix}" system "make", "install" diff --git a/Formula/joe.rb b/Formula/joe.rb index 3714e071cb453..1fb544802cbfc 100644 --- a/Formula/joe.rb +++ b/Formula/joe.rb @@ -10,6 +10,7 @@ class Joe < Formula sha256 "02c1d1372565747bc21abe3b28ea7b3f2461068041e2d67037a9c1cbce12779d" => :high_sierra sha256 "f97df02a316a9e137e3391f42ff1118f67cd051008ef92c030fe54b5948a29bb" => :sierra sha256 "1d02a0b1f7df9846b0472bb3a5ea69aece88007fed4b32843318caa41cae3f9d" => :el_capitan + sha256 "40aa5a810f80fcfb51180c357a6c725d8a8a849962e9f4f77025c33f4062b67e" => :x86_64_linux end def install diff --git a/Formula/john.rb b/Formula/john.rb index 63c86d1d7bc82..ad8f9ee828b41 100644 --- a/Formula/john.rb +++ b/Formula/john.rb @@ -10,16 +10,17 @@ class John < Formula sha256 "3a5ccc4400712b8b3ceeb47ac563cc1fa3fa7b4bb60937d3c1d3218cf51f2e4a" => :mojave sha256 "7e7f9960b5594da1e110c16613c9271e428d035ca468c3ae48ec4231b45aa2f1" => :high_sierra sha256 "a92418e262ea3ca50d92e5677dd2755207d936a31c8042041955235a2907298d" => :sierra + sha256 "430b1df93c117f09bab285321968b00c1279183de5c0ddd197dd7a1c9ed5bbe0" => :x86_64_linux end conflicts_with "john-jumbo", :because => "both install the same binaries" - patch :DATA # Taken from MacPorts, tells john where to find runtime files + patch :DATA if OS.mac? # Taken from MacPorts, tells john where to find runtime files def install ENV.deparallelize - system "make", "-C", "src", "clean", "CC=#{ENV.cc}", "macosx-x86-64" + system "make", "-C", "src", "clean", "CC=#{ENV.cc}", (OS.mac? ? "macosx-x86-64" : "linux-x86-64") prefix.install "doc/README" doc.install Dir["doc/*"] diff --git a/Formula/jose.rb b/Formula/jose.rb index 28df4cbfdcdde..1c012e45e0372 100644 --- a/Formula/jose.rb +++ b/Formula/jose.rb @@ -11,6 +11,7 @@ class Jose < Formula sha256 "358a06afd49f1390ca917969dbb434a75a91bd0de3d8ac981d3eab969670cfe2" => :mojave sha256 "7a84bdaece281b98dc4a7b0a7fbf05976297126966d14ee2862e007521cdd4ea" => :high_sierra sha256 "1669bf780ac07ee9a7d216185139aaa6e5c44add352e6da25f02c079694e7ad1" => :sierra + sha256 "c25d394204f9e85075ca1e92d9bbf0fe3c619797f548233ea6b58ddd95045238" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/joshua.rb b/Formula/joshua.rb index 3bf0343514417..c1e7ff393b963 100644 --- a/Formula/joshua.rb +++ b/Formula/joshua.rb @@ -10,6 +10,7 @@ class Joshua < Formula sha256 "126f37758cb9f1ace827883911906cab4976bf5f211b200ed0e2f307fae87982" => :catalina sha256 "126f37758cb9f1ace827883911906cab4976bf5f211b200ed0e2f307fae87982" => :mojave sha256 "126f37758cb9f1ace827883911906cab4976bf5f211b200ed0e2f307fae87982" => :high_sierra + sha256 "e7acfaf7a26f9977cea0296e8d1efe3aa525683101a8a1da20cf2544735d287f" => :x86_64_linux end depends_on "openjdk" diff --git a/Formula/jp.rb b/Formula/jp.rb index 6dd92e26d20f3..70a5441125e30 100644 --- a/Formula/jp.rb +++ b/Formula/jp.rb @@ -10,6 +10,7 @@ class Jp < Formula sha256 "53127a663b20c7c0ac893d991330ca862a6eaa8f235586019e1b8ac33159bcf3" => :mojave sha256 "51045489ba9e8790a83a2a366709bd941d3a9e7c190f6c184bcf308b888496b3" => :high_sierra sha256 "b75e4ab3a48e2212babba26a4258645ae55eefa50a9ccac463991b05ce4c08d6" => :sierra + sha256 "bffd300b5cd7bc53cfba69c3ea387fc2bafccf612cf3630e7646a9c67f360cf1" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/jp2a.rb b/Formula/jp2a.rb index f0fea14a0e96d..3dc145f8465b8 100644 --- a/Formula/jp2a.rb +++ b/Formula/jp2a.rb @@ -16,6 +16,7 @@ class Jp2a < Formula sha256 "a9aa7c8893c63ad5621788af3813ed9758e09e0c79b9ba3a8262d5c17b2272f9" => :catalina sha256 "4e62b310889a384daf9058267ac0b1bdc73d2cb408f05b9e3d3072be52355bfd" => :mojave sha256 "8400fccf2a4459fe37ce0f3856459127f4f66ff002c356f36942462c0c9c3809" => :high_sierra + sha256 "61126fc10f0dc62d6028fb3a4d3673741570b7252c3f8233008646b324a2d0dc" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/jpeg-turbo.rb b/Formula/jpeg-turbo.rb index d1e1a6ef681a2..a1fd19440343f 100644 --- a/Formula/jpeg-turbo.rb +++ b/Formula/jpeg-turbo.rb @@ -6,9 +6,11 @@ class JpegTurbo < Formula head "https://github.com/libjpeg-turbo/libjpeg-turbo.git" bottle do + cellar :any_skip_relocation sha256 "8e5ea85c9b9e2c35badbae2ac326871779438d92d89caedf4a454ae31699c65f" => :catalina sha256 "705f3e434a0e2d28360ae63fe99cca55b552bee2e95eac737a49b825946b91dd" => :mojave sha256 "4d564fd7620edb99c656a964cdd53aeb3c93d9f61ff1a94c68bf568cce789f67" => :high_sierra + sha256 "4518eaa6ef7672e9d4833afb5dd295659050b4475e82cbc338c7009ee05c3297" => :x86_64_linux end keg_only "libjpeg-turbo is not linked to prevent conflicts with the standard libjpeg" diff --git a/Formula/jpeg.rb b/Formula/jpeg.rb index 77113cd8d8296..254b523f7ed7f 100644 --- a/Formula/jpeg.rb +++ b/Formula/jpeg.rb @@ -11,6 +11,7 @@ class Jpeg < Formula sha256 "8f7b82a952fb3937889c7f22da1403e5338cd320495917eb26b0c5b2e614791c" => :catalina sha256 "b931e7725c83275c56f962b51b83c10f31a01ac8d823c6722edaf16d893970b1" => :mojave sha256 "64286932634fbe1e0d07eacda334d2f4967b20bce0737424df56ec5eaa34ccca" => :high_sierra + sha256 "a5509c05cbd1e34d667bf1036b5d0ac11ed257faa46404032852921847dee4c6" => :x86_64_linux end def install diff --git a/Formula/jpeginfo.rb b/Formula/jpeginfo.rb index c49cc0896a425..653ab0f6a5275 100644 --- a/Formula/jpeginfo.rb +++ b/Formula/jpeginfo.rb @@ -13,6 +13,7 @@ class Jpeginfo < Formula sha256 "0ec9e97f1ce99e36c9e5d4de8be48ca6b5bfc2d807ee590115426a7c57e26d00" => :sierra sha256 "ca1548c5ed9e3f18cf2e013f49d22a00276c9ef0b3d829fd256ae48178ed9974" => :el_capitan sha256 "d28d3fcbf355139760d15d1869f57d180940e8114b150446214b18270275dcf8" => :yosemite + sha256 "224c92c7cdc2e14e4bda9f413a5fc1d9a6f96b0c4e0ab5bfb20c45832372ca4f" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/jpegoptim.rb b/Formula/jpegoptim.rb index 9b79720235ee5..b5de1a46018e7 100644 --- a/Formula/jpegoptim.rb +++ b/Formula/jpegoptim.rb @@ -12,6 +12,7 @@ class Jpegoptim < Formula sha256 "9588bffa63f2041939e480ff8dbce25a004ef2414fc7ea9d5b5177a38bfb8eaf" => :high_sierra sha256 "89b7f8465e95066c6bf19515affed14037841ea5d0a86b8c3d6cf026f507e938" => :sierra sha256 "cc6c60a27cba7bb5f0e1b4a7c8ae3567db4eeaf1e1384488b818da7a1409f837" => :el_capitan + sha256 "15cbdb13e2c707d908d16f2058ee3d201c325a6fa97e835c9ac353660b686c24" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/jq.rb b/Formula/jq.rb index c6db7b28f029f..5dfeb6dabeed2 100644 --- a/Formula/jq.rb +++ b/Formula/jq.rb @@ -11,6 +11,7 @@ class Jq < Formula sha256 "71f0e76c5b22e5088426c971d5e795fe67abee7af6c2c4ae0cf4c0eb98ed21ff" => :mojave sha256 "dffcffa4ea13e8f0f2b45c5121e529077e135ae9a47254c32182231662ee9b72" => :high_sierra sha256 "bb4d19dc026c2d72c53eed78eaa0ab982e9fcad2cd2acc6d13e7a12ff658e877" => :sierra + sha256 "d789e2534f6603eca9e5923c397e4f7e7a93856ad86bed2310f51b034e15f2a6" => :x86_64_linux end head do diff --git a/Formula/jrnl.rb b/Formula/jrnl.rb index dd4833f2b8d91..f0e41ab8b3956 100644 --- a/Formula/jrnl.rb +++ b/Formula/jrnl.rb @@ -7,10 +7,11 @@ class Jrnl < Formula sha256 "2e4b08973f4205e5d66cb1e0aac6f550c6aad2046cfe92be911d8699d4861652" bottle do - cellar :any + cellar :any_skip_relocation sha256 "b3f7dd1f487839f2273a0712ac0a9d657f7b48d3df3d738758cf0687553e02fa" => :catalina sha256 "ac70ed6ad6dce9b1a6b50e31044c1e61122c92ddf17ee94d79b3ddcb8615a426" => :mojave sha256 "510441890267a12380241808df81fd063ebda4d9328d01cc33e17b60b16d9b7c" => :high_sierra + sha256 "a21c202f18e2ad8815a7ee63fdc2ae0683564764ad2ed8e951a4d4e934a4bfd8" => :x86_64_linux end depends_on "python@3.8" @@ -101,6 +102,23 @@ class Jrnl < Formula sha256 "643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44" end + unless OS.mac? + resource "asn1crypto" do + url "https://files.pythonhosted.org/packages/9f/3d/8beae739ed8c1c8f00ceac0ab6b0e97299b42da869e24cf82851b27a9123/asn1crypto-1.3.0.tar.gz" + sha256 "5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d" + end + + resource "jeepney" do + url "https://files.pythonhosted.org/packages/74/24/9b720cc6b2a73c908896a0ed64cb49780dcfbf4964e23a725aa6323f4452/jeepney-0.4.3.tar.gz" + sha256 "3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e" + end + + resource "secretstorage" do + url "https://files.pythonhosted.org/packages/fd/9f/36197c75d9a09b1ab63f56cb985af6cd858ca3fc41fd9cd890ce69bae5b9/SecretStorage-3.1.2.tar.gz" + sha256 "15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6" + end + end + def install # Avoid error "ModuleNotFoundError: No module named 'clikit'", which is only used in Poetry build process rm_f "pyproject.toml" @@ -110,7 +128,7 @@ def install test do (testpath/"tests.sh").write <<~EOS - #!/usr/bin/expect -f + #{OS.mac? ? "#!/usr/bin/expect -f" : "#!/usr/bin/env expect"} set timeout 3 match_max 100000 diff --git a/Formula/jrtplib.rb b/Formula/jrtplib.rb index 560117eb36458..01e2460f77562 100644 --- a/Formula/jrtplib.rb +++ b/Formula/jrtplib.rb @@ -9,6 +9,7 @@ class Jrtplib < Formula sha256 "05fc5e0747f7d5f725f9dda22cf39d414e8ee751829d14e9c32fa12279834cfc" => :catalina sha256 "1b48b36e9011b4aa675f1d581e900c64bcad93ba15fc86d1e27db09ed2c75ce9" => :mojave sha256 "420016bd3f9981189dc8bf69dc7520da8d9cbde848147dde495792c1a5a984fa" => :high_sierra + sha256 "43260e27fd5b6abdd0b2ed5d7a6628a490a6fd7dd0e492a731e30fb117c22384" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/jsdoc3.rb b/Formula/jsdoc3.rb index e1cda982499fd..a7b6977b771b6 100644 --- a/Formula/jsdoc3.rb +++ b/Formula/jsdoc3.rb @@ -12,6 +12,7 @@ class Jsdoc3 < Formula sha256 "8f873274000b4e3d0959b91bfc67e7019861171d980194e65bdeec2295f6699c" => :catalina sha256 "55423238074c5cef313aee63947353a5f785af4fba129ab26c21d49654c81b43" => :mojave sha256 "babfa75687211cb6aa6e7d9466bed814eb43b25ef0f5c6ada5352e5179a7eae2" => :high_sierra + sha256 "49c5cce9e07ddcb5cefad75b50a273f6568fede3de6fd9e38a4c12107fdf9f57" => :x86_64_linux end depends_on "node" diff --git a/Formula/jshon.rb b/Formula/jshon.rb index 847c5b848d497..02d252bc00602 100644 --- a/Formula/jshon.rb +++ b/Formula/jshon.rb @@ -12,6 +12,7 @@ class Jshon < Formula sha256 "3215b76a79af85c6ae21b7de4e2eff0eb83098c0c5e1ae5b8c870d912498ed13" => :sierra sha256 "bab45017500667c7f8cf3b73c513f043cd04da04610cb2dc8a117ad5c9a5b99a" => :el_capitan sha256 "a97e9310af44fae5cdd60a0bcbae2bc0190c4d773d6290db3b5e970cd9999395" => :yosemite + sha256 "e71418c6697d75918b055c8987d7e06a4c7ed96b578653a43f9bb93a72616f57" => :x86_64_linux end depends_on "jansson" diff --git a/Formula/jsmin.rb b/Formula/jsmin.rb index 3cd681c178301..923b126b2e67b 100644 --- a/Formula/jsmin.rb +++ b/Formula/jsmin.rb @@ -14,6 +14,7 @@ class Jsmin < Formula sha256 "7672c92faa52fbc0684808da9803ebfa8883df0e0243e63a9a0b7c6441218b85" => :el_capitan sha256 "92ce35c390c8a2723e7b7cef8655e61ab9373f274c719ab4c04256cab1c42d1d" => :yosemite sha256 "248da380666e6e08f25b75588c32d1dcad3952978e31d2a08c59c99756946bb4" => :mavericks + sha256 "aa7847591ab3aefeea8460860f551a9d3267681d6ab0c9d10ed66cb942e6f317" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/json-c.rb b/Formula/json-c.rb index 5eb8bf0272327..b52890d3a20b3 100644 --- a/Formula/json-c.rb +++ b/Formula/json-c.rb @@ -12,6 +12,7 @@ class JsonC < Formula sha256 "4f51e5ad713e467d1df189c8b594c7e9ae279ed4fc2b0a8d1b328a3c258135d7" => :high_sierra sha256 "279d88326f2f6aff9faf0c593ae4173c058e07ba0523f73107dfcbef3b54bd45" => :sierra sha256 "724bffe043ecc73611fb4e7b2fcefbe35cb8b3a64aabf5cec92d43938b8e02d3" => :el_capitan + sha256 "3094e72c250a7ddda3ff07ed6a52a198ffa809f840c2cf38a5d5105bef079285" => :x86_64_linux end head do diff --git a/Formula/json-fortran.rb b/Formula/json-fortran.rb index 939d7d23447e9..d899c9d9e31b2 100644 --- a/Formula/json-fortran.rb +++ b/Formula/json-fortran.rb @@ -10,12 +10,15 @@ class JsonFortran < Formula sha256 "b75cc1817090b77c80cbd63b4f4c7ce2afd57c96f9e19c0ab7ea5822a62e7f6b" => :catalina sha256 "a68f3a882de03929152856d8797dc6e934b77e3087b0cdb93644157e8d00d2bd" => :mojave sha256 "6775de35be3202c26f4a9b8719791bd4bf8dfb9c349ddf0fa72d0862d71ebeae" => :high_sierra + sha256 "b8d1bc24dfbe0d2250c082393d27f524e05779f0da3e57817b586ea651c01e0f" => :x86_64_linux end depends_on "cmake" => :build depends_on "ford" => :build depends_on "gcc" # for gfortran + depends_on "linuxbrew/xorg/libx11" unless OS.mac? + def install mkdir "build" do system "cmake", "..", *std_cmake_args, diff --git a/Formula/json-glib.rb b/Formula/json-glib.rb index e8a2675aab82b..185f9163644f1 100644 --- a/Formula/json-glib.rb +++ b/Formula/json-glib.rb @@ -10,6 +10,7 @@ class JsonGlib < Formula sha256 "223b5472cc71a1eea8efc818d66fa8e6ff05a4aff45d60d4deccba54f82d39dd" => :mojave sha256 "ad30f6f204dd27504d70e9ac22dcfdd482975a5e97879c0b4095527bde68d985" => :high_sierra sha256 "08dbbf2bcef7fdeccfbcd7a0391c4eafa67f914ba0f021c8a41298a6359f7c24" => :sierra + sha256 "19bdfb31bf40ddba74d76e4f0f3b5570dc6ed214665d6ba31162c28b68acc03f" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -53,9 +54,9 @@ def install -lgio-2.0 -lglib-2.0 -lgobject-2.0 - -lintl -ljson-glib-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/json-table.rb b/Formula/json-table.rb index 256bc18fc4975..d70e2cf31a10b 100644 --- a/Formula/json-table.rb +++ b/Formula/json-table.rb @@ -12,6 +12,7 @@ class JsonTable < Formula sha256 "2afef9b965070bcde986759dbd03cfd8fe3e77aec5a12158fb4aa189626ab977" => :high_sierra sha256 "e5ed8ece1e10ede4417f347703f1e62bb417c65a11f6cac5f10915d44359eb5b" => :sierra sha256 "3240813838be9e797fd443e5f51d6bb53fc56a8d958dd361cbc865de003619bd" => :el_capitan + sha256 "ecff6ae31141bf53b9bf2189e38cd23adc69ed679776750aa6a08bdf0a787aeb" => :x86_64_linux end def install diff --git a/Formula/json_spirit.rb b/Formula/json_spirit.rb index e9f65f6833167..a83624e3666bb 100644 --- a/Formula/json_spirit.rb +++ b/Formula/json_spirit.rb @@ -13,6 +13,7 @@ class JsonSpirit < Formula sha256 "2cec376e843919e2f3693e73be0e3a2c6a6f3b283e503b51d42108c5471e8091" => :mojave sha256 "55299a7931b4bbbcf1ee5c576fe35283373279cc95b3b5126696ad5741f3d072" => :high_sierra sha256 "0dc2370a736a065b47f6f83f8ed292209fc978005a720de8653e32cc1c568cce" => :sierra + sha256 "ff88d4988fbd8700c64dd0089616f267fb76e3c92ffec66eb115a42179621925" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/jsoncpp.rb b/Formula/jsoncpp.rb index a9b29715fef3e..d5dba1765c84d 100644 --- a/Formula/jsoncpp.rb +++ b/Formula/jsoncpp.rb @@ -10,6 +10,7 @@ class Jsoncpp < Formula sha256 "0e937647ccad5ed68b70aa059027e367f120f7b6ad8657bfbd17ab4835a134a8" => :catalina sha256 "c235548c34fbf5359a780f292b20c13e17ff6a4f2de02ec5cb2116bff2b6cbf1" => :mojave sha256 "a31ea936169d1e199425e5125cea17ff5d61467e3825ce988a610adec0cc027b" => :high_sierra + sha256 "eac77f889b698124d2f434eccceeccd8f21c499e99db5a22a452bfc094257b55" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/jsonlint.rb b/Formula/jsonlint.rb index 978ae8894d472..a14c8dc666eb2 100644 --- a/Formula/jsonlint.rb +++ b/Formula/jsonlint.rb @@ -14,6 +14,7 @@ class Jsonlint < Formula sha256 "4ad85c01eba9de2051b70abdef8c1ba6b922725da2663681ad37e3594ff66768" => :sierra sha256 "20de901256ea772ee7bb13745f797e94ad3c9376e2031165c40acf4af747cec5" => :el_capitan sha256 "c8ea1b10f689263798806fa33d2f004000490b9014393f2a472b0cc76d6e9ac3" => :yosemite + sha256 "11cc82660c3bb24e535077ee513d0dc16e2931303585de38ea7f8953f2af4b87" => :x86_64_linux end depends_on "node" diff --git a/Formula/jsonnet.rb b/Formula/jsonnet.rb index d6a3b9a3af009..cf7b02afdcf97 100644 --- a/Formula/jsonnet.rb +++ b/Formula/jsonnet.rb @@ -10,6 +10,7 @@ class Jsonnet < Formula sha256 "af01487239fc6947ef6c27d9b4b18772d2b7773393d7e48704001bf09d380e5b" => :catalina sha256 "2255443d01048798797696161de2ddf435565348d7a246647a37b5ec0919dc2b" => :mojave sha256 "7cc0ca007b2d56160e93437779f7214f44caef1a76b0647c911b1ca6ac6ab4c5" => :high_sierra + sha256 "15c6be0821e2daacf0415eb0a01f64d92d4fc5e5a54d4c8405c1d0f193deef1c" => :x86_64_linux end def install diff --git a/Formula/jsonpp.rb b/Formula/jsonpp.rb index c4ba9e3d7a1ac..d6f680f00073b 100644 --- a/Formula/jsonpp.rb +++ b/Formula/jsonpp.rb @@ -12,6 +12,7 @@ class Jsonpp < Formula sha256 "d81995103192bb58f66d7089939eb6682f117a7044d3a84804db62b4c31a3c81" => :high_sierra sha256 "219f8a6bfdf1d0e8435fa1c1fdf0cc22b91cae8ec7d62581d312927fabcf9388" => :sierra sha256 "3161f55711eea589c5036078fbf3a5df47484767f025adda7c0692d4dda5f2b4" => :el_capitan + sha256 "f6b0ca281c47061e910fda6992e548196ec11e3e5147a80467b6da48479f4097" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/jsonrpc-glib.rb b/Formula/jsonrpc-glib.rb index f1bcd4449490b..5f844957eb675 100644 --- a/Formula/jsonrpc-glib.rb +++ b/Formula/jsonrpc-glib.rb @@ -6,10 +6,10 @@ class JsonrpcGlib < Formula revision 1 bottle do - cellar :any sha256 "a51dd608adcefb9e3514534e49a5db64ad1e38b407b8d9349df7f3eb08bc5fe7" => :catalina sha256 "b0ef1160532600a75471bb0e4cc3f48e7f092111ffa7d494534e46db43accabc" => :mojave sha256 "298d4a37194ab19bc753bb4f7022ec0d34d12a30dd4860806582cda4406b62ec" => :high_sierra + sha256 "f9a00cf5f3f45d3d78d16fee1ccb012aa437eaede1d2510b13904bf94df69450" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -57,12 +57,15 @@ def install -lgio-2.0 -lglib-2.0 -lgobject-2.0 - -lintl -ljson-glib-1.0 -ljsonrpc-glib-1.0 - -Wl,-framework - -Wl,CoreFoundation ] + if OS.mac? + flags << "-lintl" + flags << "-Wl,-framework" + flags << "-Wl,CoreFoundation" + end + system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/jsvc.rb b/Formula/jsvc.rb index 2444dae07ed2e..44862ea4ba579 100644 --- a/Formula/jsvc.rb +++ b/Formula/jsvc.rb @@ -11,6 +11,7 @@ class Jsvc < Formula sha256 "d394dda87f296a36c2e39b8954db0f8496285dfdf94cd07bf236fec7df1edf3d" => :catalina sha256 "bea286d1d134d91bc5e7a8596cbf015f29c09e6ba4bef9f356e51dfa8777fb9d" => :mojave sha256 "73b144be1f0b0dabfabb254515d250ce310405ca8c975e072109c75e5f6debd5" => :high_sierra + sha256 "03b0358e4160d06669d1951e2857079811e5317c3f741414bc5359576885556b" => :x86_64_linux end depends_on "openjdk" diff --git a/Formula/jthread.rb b/Formula/jthread.rb index 4f0ddd43143d2..81181592f1cd8 100644 --- a/Formula/jthread.rb +++ b/Formula/jthread.rb @@ -11,6 +11,7 @@ class Jthread < Formula sha256 "2d9c8a2d9e52f9419cd1015d982e06d58963e29c43a44f7ddfbbf6f149e20cc0" => :high_sierra sha256 "099b841458d4d6f4ac3f5e7b453d4ec5b2a50f4dd1a6ccac9614ac72a1c1c90f" => :sierra sha256 "0e846e47e0350f6dc4ca15f5eb6f9e9d2cf7345c115476bc93fc78ac2cb056af" => :el_capitan + sha256 "d18833e5f2e9b0885b9d82c353372165a332e09c896fdab2cedaa01712cee1fa" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/juju-wait.rb b/Formula/juju-wait.rb index 91aa06e42b2ad..d02c3d8dc42f0 100644 --- a/Formula/juju-wait.rb +++ b/Formula/juju-wait.rb @@ -5,13 +5,14 @@ class JujuWait < Formula homepage "https://launchpad.net/juju-wait" url "https://files.pythonhosted.org/packages/d6/01/381cc24aabf820ff306b738a01b11aed5ac365a6438d46792f9fee2fe5f8/juju-wait-2.7.0.tar.gz" sha256 "1e00cb75934defa50a2cc404574d4b633049f1fa011a197dfac33e3071840e98" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any sha256 "a969b35744d3fad4f45802d53bf1dd5da96eed56ae01e0ba6d246ea4b4a89a32" => :catalina sha256 "88d585b8cf738d97549f138d0fc49195d78e55ce4eaa4e2596e8e7af19827e68" => :mojave sha256 "d7b4c5a6f83f55f5f5084d6a2c58d8119923ee203f2770fb4affa3cebeefe96e" => :high_sierra + sha256 "d240aab65582f21d11c1c2848092944ec66ed277470d826b4db8a5d26c0f25b4" => :x86_64_linux end depends_on "juju" diff --git a/Formula/juju.rb b/Formula/juju.rb index 91e21d5d7d642..c52ad2969e609 100644 --- a/Formula/juju.rb +++ b/Formula/juju.rb @@ -10,6 +10,7 @@ class Juju < Formula sha256 "ecc6b26468cd3d3989e08e7336d65bb2ec22e267abe8e26214db4f10518ac1bb" => :catalina sha256 "b727f2ede77becd56eae969f5c9d9993ee3c35e1cc28b3e7bc5ecb19ef6b593d" => :mojave sha256 "5fa27b607fc8f995d7d4f661973454d0a83d9c9020b57583bb3e2c8dc25b802f" => :high_sierra + sha256 "9471477703f9594af5b26f926c7e823c93f23a3d1c0cb3ad916c55f2e6c11dbd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/jumanpp.rb b/Formula/jumanpp.rb index 87763ea1390bb..41cfd13d3c768 100644 --- a/Formula/jumanpp.rb +++ b/Formula/jumanpp.rb @@ -11,6 +11,7 @@ class Jumanpp < Formula sha256 "afddd3445d86fa1969611b413d0ae460fdaa7b106cdf5edf6ce0bf9d14689a49" => :sierra sha256 "4b4dd5ca55ba7d380a9a6bc7dda462c3825aa8650e9dc6b131e53fadbf64dc63" => :el_capitan sha256 "d53d25e49f4bd8cddd2657ee09eeaec56844996b10445c15561be1a12977a888" => :yosemite + sha256 "a829a5de6e7afda07141adc35e7fdf37dc3664c6b590187f5191a96e2364cd50" => :x86_64_linux end depends_on "boost-build" => :build diff --git a/Formula/jump.rb b/Formula/jump.rb index ac18c166c1c0b..70d3291807f81 100644 --- a/Formula/jump.rb +++ b/Formula/jump.rb @@ -10,6 +10,7 @@ class Jump < Formula sha256 "7399051ba9939abcfbca29e7f371315de6d55d1bd6fa9e1f7aa7d9ee947dd836" => :catalina sha256 "ba0fecff57b7efe0b984f55ad372bcb06c249f6df9353bab2cc648aef5c48ccf" => :mojave sha256 "450233293f93a80152625bfa6b965d7aa17dd5ee74f775e8adae414b41177250" => :high_sierra + sha256 "2f83f4dee0680c49ff8a18013b395cfeed2adea824816aef1350fe04f7379b0d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/jupyterlab.rb b/Formula/jupyterlab.rb index 490e681e430ed..fb8e226484ca6 100644 --- a/Formula/jupyterlab.rb +++ b/Formula/jupyterlab.rb @@ -11,6 +11,7 @@ class Jupyterlab < Formula sha256 "8e8a3daa940995cb18659793e481d641bd8390e41655c2460ef3d528fabeafc6" => :catalina sha256 "b3b56b58eefa6950dfa33654b9df707947d61d0cb87236e61d7973714b8272ac" => :mojave sha256 "18c303cbf415b8b7860c9e292058929a09b8103b17cf03f4d21188b864a3396d" => :high_sierra + sha256 "0b596f21cfc83a9c69ce90dbf1631d7f8d5073e33d58aea8a4bf393c197ae6fd" => :x86_64_linux end depends_on "ipython" @@ -21,9 +22,11 @@ class Jupyterlab < Formula uses_from_macos "expect" => :test - resource "appnope" do - url "https://files.pythonhosted.org/packages/26/34/0f3a5efac31f27fabce64645f8c609de9d925fe2915304d1a40f544cff0e/appnope-0.1.0.tar.gz" - sha256 "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" + if OS.mac? + resource "appnope" do + url "https://files.pythonhosted.org/packages/26/34/0f3a5efac31f27fabce64645f8c609de9d925fe2915304d1a40f544cff0e/appnope-0.1.0.tar.gz" + sha256 "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" + end end resource "attrs" do @@ -317,7 +320,7 @@ def caveats assert_predicate testpath/"nbconvert.html", :exist?, "Failed to export HTML" assert_match "-F _jupyter", - shell_output("source #{bash_completion}/jupyter && complete -p jupyter") + shell_output("bash -c \"source #{bash_completion}/jupyter && complete -p jupyter\"") version_regexp = Regexp.quote(version.to_s) diff --git a/Formula/just.rb b/Formula/just.rb index e7adb2355a445..59be94b2f2f2f 100644 --- a/Formula/just.rb +++ b/Formula/just.rb @@ -9,6 +9,7 @@ class Just < Formula sha256 "f059c7de861f0535890893627ea4b55460cc87b426d3b463acc0769b9dc1fbdb" => :catalina sha256 "bfa8b1e92a14768ac366411dd78fba441bd13843b11b8199633a0705b115128a" => :mojave sha256 "f29b4e5b9ad9e4ae72963956293b61b2b7c0f1d01703cc1c57f53486cd4bedce" => :high_sierra + sha256 "e42a6b5180bbf14dc738a5732b384fb8bf291393289c68b46ce7e093bfcc2536" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/jvgrep.rb b/Formula/jvgrep.rb index 351d7ee5443f4..cb93a96bd2fbb 100644 --- a/Formula/jvgrep.rb +++ b/Formula/jvgrep.rb @@ -10,6 +10,7 @@ class Jvgrep < Formula sha256 "fa73d4fa22c06a91abae4fb577d8000897a95687de102fa09258a2f726801791" => :catalina sha256 "fa73d4fa22c06a91abae4fb577d8000897a95687de102fa09258a2f726801791" => :mojave sha256 "fa73d4fa22c06a91abae4fb577d8000897a95687de102fa09258a2f726801791" => :high_sierra + sha256 "9ce50e79263cd67bc65562d830cdd0b8fc16050ad54856d215c8d0d6bc71b256" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/jxrlib.rb b/Formula/jxrlib.rb index 9c7b53c3af9fa..63925d93ed368 100644 --- a/Formula/jxrlib.rb +++ b/Formula/jxrlib.rb @@ -13,6 +13,7 @@ class Jxrlib < Formula sha256 "47c308b47ec8227d813a21c8092b32ada9b7f862aef102bf619d6bb19f0144e1" => :el_capitan sha256 "0dae977caf9e34289c9dd09f7e12bdf7158ccc42d9fa2dc00b4164b82c1caf3f" => :yosemite sha256 "cc49654146951a561ca6fce7c485f7f3f3511ab5549a7db8263e4e8ddc95e740" => :mavericks + sha256 "8c974183d0274cf56788f23bdffacab2b5045dc09b47129771e997c94d510b81" => :x86_64_linux end def install diff --git a/Formula/k3d.rb b/Formula/k3d.rb index 235aa8d399f9e..f0e550e16e648 100644 --- a/Formula/k3d.rb +++ b/Formula/k3d.rb @@ -10,6 +10,7 @@ class K3d < Formula sha256 "3c1dd20b30c4a51347c2c01a5dc4346e4aa4ffc9162cb9f187df43d333192c28" => :catalina sha256 "0039236f61e40518ebfc684b45a5f13aa3ac9c6da15128b7a67fb020961e1605" => :mojave sha256 "3e63ce46a496a7fe264aa10583115f4fa5e51eaa04020ffbe1c73962fe55b755" => :high_sierra + sha256 "b7609dae46d203f44594ca04aa8e1ffe2e9fd947bd28a6a29dd56fce1df3dfac" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/k6.rb b/Formula/k6.rb index 093cebcacb3dc..89478b8ef9e18 100644 --- a/Formula/k6.rb +++ b/Formula/k6.rb @@ -10,6 +10,7 @@ class K6 < Formula sha256 "70f6f2d4386f07c89b1139a5d3feedeea8eba9a443ff6c9ac88b6d88d7120416" => :catalina sha256 "6f70e79b736f65282837f018405e5a414d87cb8bcb49e7d1b852ad5d3771fece" => :mojave sha256 "a809b4232be33515a8d5038745daac93caa94141ab8787772fd034df392378fe" => :high_sierra + sha256 "c4c634b187aeb78f6014708efad0ba23af9ab4a6946fab38c3046c221373b84e" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/kafkacat.rb b/Formula/kafkacat.rb index d9713ec4a4cc1..4d78f27a652d5 100644 --- a/Formula/kafkacat.rb +++ b/Formula/kafkacat.rb @@ -11,6 +11,7 @@ class Kafkacat < Formula sha256 "af4674858fa32d4c39346018f441609647f35071ef9d7615f214ad47594e1b6f" => :catalina sha256 "169186d382345c58af1a3a616493ce305f7abb808420ac95a8230e9bcbcec2d9" => :mojave sha256 "60bca6aa0aae36980bcd917cb0ff1b042d7cb3317c5e6e6446488c25ac1edf29" => :high_sierra + sha256 "872520b884dda485a4440defc603e2155ffb274c53f2e0eef97d989e734be77a" => :x86_64_linux end depends_on "avro-c" diff --git a/Formula/kahip.rb b/Formula/kahip.rb index d2d5da284288d..4a2b0a915e454 100644 --- a/Formula/kahip.rb +++ b/Formula/kahip.rb @@ -10,6 +10,7 @@ class Kahip < Formula sha256 "3c59b856d2b908f55fe555621a1ad866a1e4e2cbc1e07d13bda116d33d9f1ddc" => :mojave sha256 "5872593fdd32749fc4d11bff597808732428137b869840f5db65e7ef408e393c" => :high_sierra sha256 "cb925202435f91a405717bd7f5f162d54bdab0bccbdb87eaa817324d331211b0" => :sierra + sha256 "283559695d4fb7c78a65123c34449f84460d5f23fdd4c050a3a3727605b5878b" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/kakasi.rb b/Formula/kakasi.rb index 67a31ba5b3506..157400e3799bc 100644 --- a/Formula/kakasi.rb +++ b/Formula/kakasi.rb @@ -13,6 +13,7 @@ class Kakasi < Formula sha256 "7fca04e65ce14fa8d18d19e197525063274057a2760e4841d4e8a9b06f4b0fa3" => :el_capitan sha256 "da407c10d807cf72679df6555d29b53f388dd32abf674f1ae0ecbace44fc3372" => :yosemite sha256 "86403b2e2a45e2ea81b78bbe7edc7bf2b01d464f351ea265441413e63bf85822" => :mavericks + sha256 "e73e5d24e98cc69fc02f40decb1c9bee7f49f8affb8276435984737637241938" => :x86_64_linux end def install diff --git a/Formula/kakoune.rb b/Formula/kakoune.rb index 6729db2f7a384..3c44ad9464257 100644 --- a/Formula/kakoune.rb +++ b/Formula/kakoune.rb @@ -11,11 +11,23 @@ class Kakoune < Formula sha256 "4190698871db5696c3dbbdcca4c15d26ed8858451db4e0a4ddb8a10fff71afab" => :catalina sha256 "c62c3102bbed733f1f00ed64fafa1f07353b78d59f1a35e7a1746d2e35bc698c" => :mojave sha256 "7fc5a7b69fe56f47b24a2e4c1074319963e3b7c0a0c92f3c0d0688f57eb2a278" => :high_sierra + sha256 "963f14db69ad3a7cae0288770decbac28a9ec7e90f02dbc7f501a433bd2392c5" => :x86_64_linux end depends_on :macos => :high_sierra # needs C++17 depends_on "ncurses" + unless OS.mac? + fails_with :gcc => "5" + fails_with :gcc => "6" + depends_on "binutils" => :build + depends_on "linux-headers" => :build + depends_on "pkg-config" => :build + depends_on "gcc@7" + end + + uses_from_macos "libxslt" => :build + def install cd "src" do system "make", "install", "debug=no", "PREFIX=#{prefix}" diff --git a/Formula/kallisto.rb b/Formula/kallisto.rb index 963ff15bed361..5034ca01e2107 100644 --- a/Formula/kallisto.rb +++ b/Formula/kallisto.rb @@ -5,10 +5,11 @@ class Kallisto < Formula sha256 "c447ca8ddc40fcbd7d877d7c868bc8b72807aa8823a8a8d659e19bdd515baaf2" bottle do - cellar :any_skip_relocation + cellar :any sha256 "7ef1f941663072b0a57597992acf8203ba3664129f305cb8626c0c346e51bf0c" => :catalina sha256 "b2e59c1cc0fc1b07d02bab1cbc1533bcca1edf4bc0b81791d5ac597a7b84cce0" => :mojave sha256 "8491424ec8d4f8e170315e13c5f3bb92895b608c9c7108f260459e06bbbf73f9" => :high_sierra + sha256 "e156a9efff4fdd99320d9d3a5c65cdc7cbe35ae36319ff975ed97f7918390398" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/kapacitor.rb b/Formula/kapacitor.rb index 2fb06cedcf039..9c2023d0a4db4 100644 --- a/Formula/kapacitor.rb +++ b/Formula/kapacitor.rb @@ -11,6 +11,7 @@ class Kapacitor < Formula sha256 "7ee7eca6cd66838aa2fe214cbffa75375103e5d6d4d6d1aad5d4ce0a4064ad08" => :catalina sha256 "85371bcc18833788733d65a821447cea4e0c644d4457ae0da70ccf96dbc1e635" => :mojave sha256 "883cee096d636e749afba8e4938a7f24fe18cc063976dbf1f0aef3cca0f3818d" => :high_sierra + sha256 "f57cb1f9cea09b9a0a84f42458f9144732cbabb6245cba853745cc43d77ae2da" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/karn.rb b/Formula/karn.rb index 00341b7cdc569..67a94c102f6bd 100644 --- a/Formula/karn.rb +++ b/Formula/karn.rb @@ -11,6 +11,7 @@ class Karn < Formula sha256 "a837fd65265db402d67fda5ff5bb4337822d1efd945bee56f7a664e6bc67c343" => :high_sierra sha256 "0b29500ed8d75753402ea041190021d679624b739665b3a4d11df3d4a3100e59" => :sierra sha256 "bc217bf56d073ffabd11c81382387029aa09d216ef8060b3134a6190997ef0f5" => :el_capitan + sha256 "03533f5131e54f5c363cdb27a03a245770cfd952a0eb0d8b4ed6d3242a4194ac" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kcov.rb b/Formula/kcov.rb index 149e9071b38d1..6ee79fbf2bbcc 100644 --- a/Formula/kcov.rb +++ b/Formula/kcov.rb @@ -10,6 +10,7 @@ class Kcov < Formula sha256 "7a3af28e85c85c6f1dc684086884c724dfdbcf72efca48add536c5dd08bda4c0" => :catalina sha256 "833750a5d75e99a392010b305841daca6d0007e5a9b2ccd2ab5d54f18c01b6ad" => :mojave sha256 "e5c6cc5b5ed21b5609107cb80ac67dec4ffc9b9227e272464b9eeade66932bd3" => :high_sierra + sha256 "753c990c08ad1f08aaf0595db7418289f0fd586e08182e16bffb50748ff49b3e" => :x86_64_linux end depends_on "cmake" => :build @@ -17,6 +18,12 @@ class Kcov < Formula depends_on "python@3.8" => :build depends_on :macos # Due to Python 2 + unless OS.mac? + depends_on "curl" + depends_on "elfutils" + depends_on "zlib" + end + def install mkdir "build" do system "cmake", "-DSPECIFY_RPATH=ON", *std_cmake_args, ".." diff --git a/Formula/kcptun.rb b/Formula/kcptun.rb index ce305f85d8dc2..d02ea9d0ca889 100644 --- a/Formula/kcptun.rb +++ b/Formula/kcptun.rb @@ -10,6 +10,7 @@ class Kcptun < Formula sha256 "5267f9a75abdb00a6ada00b008818fc66ee3cad4b0659d36bff9e0e7712604ab" => :catalina sha256 "a83769bd3e3dfb00debbe53a9dd8610e7bd87d232a7925a5aaac54c9c3e0a325" => :mojave sha256 "8214eae17ccafb7662c51e7a4b1a812ca3720ed03d9ca94770e63763c84265d8" => :high_sierra + sha256 "f22adc76f6aabae7d345dddbc771b23b7d8b5601c6c9f422f19b8dbe260fcf96" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kedge.rb b/Formula/kedge.rb index 11ff93a7ab8a4..1d71877ae47c1 100644 --- a/Formula/kedge.rb +++ b/Formula/kedge.rb @@ -11,6 +11,7 @@ class Kedge < Formula sha256 "ff1bf61801e5c5e17ba83abe714c4d30914a458291cdc0fc4654ee952a919c4c" => :high_sierra sha256 "39f193757913fc743191091a86b5d162b4cb4af618975db1ecd649dce7a08941" => :sierra sha256 "1ff9804be018e8bf5bd0668ce1e1a647ab04005b4ea34fb22f49c50c215b4e13" => :el_capitan + sha256 "387689996cf16d3ffee16df613912a61846e2377816b8ae655f4f1aa7680f802" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/keepassc.rb b/Formula/keepassc.rb index b9901c407dca7..568e26631e215 100644 --- a/Formula/keepassc.rb +++ b/Formula/keepassc.rb @@ -10,6 +10,7 @@ class Keepassc < Formula sha256 "d45c0751c541f70f630d57b6de4be54c7e404fa447b00c645da081baecf4ef07" => :catalina sha256 "278b472373d6b75a37833a23a7bfe472c4bdd56ee582534a82a28b0a9dcd5248" => :mojave sha256 "6304afecfb788ee22bf327d47ca046fc905db8383b348393eb7907f7b1479ce4" => :high_sierra + sha256 "69350832c62ff693c78b23de88aa9046a6993a09a19fd3d696ad69bc9211ce42" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/kepubify.rb b/Formula/kepubify.rb index 8ff36068c18ec..da060c55e1dec 100644 --- a/Formula/kepubify.rb +++ b/Formula/kepubify.rb @@ -10,6 +10,7 @@ class Kepubify < Formula sha256 "03a69105b70a3d021fd013f5883dca27b78d367c53f4c022d97837b6a21a6875" => :catalina sha256 "b320420bf7ba3e05fa4cfa5c9df55e27bc086836d582fdf726bd3c569b196384" => :mojave sha256 "38eb6db2a92942233f877ed25b65db4292e7cc65e0c28af32edd867e313fcb82" => :high_sierra + sha256 "38bb49af86148bb9fd1f53d44bd31d70965671cebc62c6d45c594f7272e4b031" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/keystone.rb b/Formula/keystone.rb index 9cb228c48dc21..fbb9b126b7830 100644 --- a/Formula/keystone.rb +++ b/Formula/keystone.rb @@ -10,6 +10,7 @@ class Keystone < Formula sha256 "84cdef2aa8a5697ce2fc62e6ae1316f2dcca6fcd0f92d2bba68b399af9c48440" => :catalina sha256 "814feeee85e111a21fdd287fbed3fca3e1cd86be396dcba7612c3e1aec7dd4d3" => :mojave sha256 "77740af9b9e48baaf0a7d1dc4d74b883c1babbaab6a7e9bf65a00035b59c546d" => :high_sierra + sha256 "675adee0f281231477110542b03ef0631784938e6928cdbe2678b0e4cd67cee9" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/khal.rb b/Formula/khal.rb index d40b4abe1f06d..3d7cd84966b96 100644 --- a/Formula/khal.rb +++ b/Formula/khal.rb @@ -5,7 +5,7 @@ class Khal < Formula homepage "https://lostpackets.de/khal/" url "https://files.pythonhosted.org/packages/f7/45/555398810c14f572ea9ff8e92cd4f6e492ba8c50da1241fad58e58234463/khal-0.10.1.tar.gz" sha256 "d450f9da70ddead28d794eed81c2d2a074655980a16cbd9f47f1c0c9e59b0be5" - revision 2 + revision OS.mac? ? 2 : 3 head "https://github.com/pimutils/khal.git" bottle do @@ -13,6 +13,7 @@ class Khal < Formula sha256 "4fd8c3901fc6dc40fb4cca2b1724fc8c2f06aad6984c46a5f5cabd38549938ae" => :catalina sha256 "fa5e0a274c6e3cfd849fc8022f0dd94332f2f1e324b7d205b993cae5ed9c6a36" => :mojave sha256 "09300aa3a7c4f1d8840e039f8530fad8ccb716798abd34fc7a1f1a7398899339" => :high_sierra + sha256 "88750adfd26320519a21c29b30d818f6a8650f83fa11349d2ae6d2e902578815" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/khard.rb b/Formula/khard.rb index 00ebd485a745d..e8cb511ffb12d 100644 --- a/Formula/khard.rb +++ b/Formula/khard.rb @@ -5,12 +5,14 @@ class Khard < Formula homepage "https://github.com/scheibler/khard/" url "https://files.pythonhosted.org/packages/5e/55/a4b34562af0f604b703fde449e18d4b452205daa303aeff832b6387f8849/khard-0.16.1.tar.gz" sha256 "0d9f67a575ac945365c7748cf71f39d3b2281462977254d2e325ceff0ac4e439" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation sha256 "077ace786816be18db01618f82524bcaa63713f769588cdec5c3a7db7dc5db98" => :catalina sha256 "ccfb049a7e5887d37f3c7359b700ac36769422afe56f6422e326adf214dcda89" => :mojave sha256 "0b9d4ed54176ca9340d9605fdb9eb5fa19a96c461de05d6767ebe7fdf342c535" => :high_sierra + sha256 "ff5c2cf61c9e09454af1ce5cb448305940614f9b4e568e3f41e29e8b607e4c03" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/kibana.rb b/Formula/kibana.rb index c05f8d846c075..66ac2f02660dc 100644 --- a/Formula/kibana.rb +++ b/Formula/kibana.rb @@ -17,6 +17,8 @@ class Kibana < Formula depends_on "yarn" => :build depends_on "node@10" + depends_on "linuxbrew/xorg/libx11" unless OS.mac? + def install # remove non open source files rm_rf "x-pack" diff --git a/Formula/kimwitu++.rb b/Formula/kimwitu++.rb index cead27f21cff7..deda07823553f 100644 --- a/Formula/kimwitu++.rb +++ b/Formula/kimwitu++.rb @@ -13,6 +13,7 @@ class Kimwituxx < Formula sha256 "98c3516d1f3a9b17397354d8dde712f8a8c0f97ac919c65fc468ab4569534cc4" => :el_capitan sha256 "6b396c209bc1bc9df74df57f86e2d27a36817f2ed3a6ba2c5101879dec6ffb43" => :yosemite sha256 "850a6609b75b222e5443a2c293ecaec376dfa6fe2a3ba708d742c6fdb2537af7" => :mavericks + sha256 "d588641cfcc626adcf0ec598289a5445fdcddfed6358afaca4a3fbfaea6a468c" => :x86_64_linux end def install diff --git a/Formula/kind.rb b/Formula/kind.rb index ed3c9c3f77fa1..251c2a36d3db1 100644 --- a/Formula/kind.rb +++ b/Formula/kind.rb @@ -10,6 +10,7 @@ class Kind < Formula sha256 "d5d016dfc483c522b4dfaafadfdd1cc4a75f67d03acfe241939adbc31055ce8c" => :catalina sha256 "8bb7ed79e0577c72cef015922edee274f30c3ce53048cec1b2d46f6a2bb65bee" => :mojave sha256 "f48ee5934b269f9e10af04ecb32c5eb06d353edfedc6a57feb3527e5e1c9cf56" => :high_sierra + sha256 "391302be42f523cf4f980c9a53aa368689164d2e1ac76c7d0799c7b574eeb660" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kitchen-sync.rb b/Formula/kitchen-sync.rb index 92e1ac0086726..09529f2238018 100644 --- a/Formula/kitchen-sync.rb +++ b/Formula/kitchen-sync.rb @@ -10,6 +10,7 @@ class KitchenSync < Formula sha256 "5e1ed5a8c6b4fd0ba5216bcae308778b64cdb2e36c8456b4ccbc16987ac9f4ea" => :catalina sha256 "66075d2897bb6690ba17ac0d833060fbecebdbf3855429d8c1182feb5df72197" => :mojave sha256 "b03c35ce73313a6e0e675e15575363d0665c5a44e7314d7b2bdc90b18a3ecb1a" => :high_sierra + sha256 "fafc81157f5f9ff27f8681dc74e2071d5f58c6bfd8cf244ccdd2cfff25d3cb01" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/knot.rb b/Formula/knot.rb index 496df937ae7cf..6118ad7a5c55f 100644 --- a/Formula/knot.rb +++ b/Formula/knot.rb @@ -8,6 +8,7 @@ class Knot < Formula sha256 "1f2c208e2bd5f7451865d8f923e68a21ff023e87349f51d710432d25056b8a6c" => :catalina sha256 "10cff141d8b38bb6b06426f08cb85eb8ce67035b5da7ed222cf9edcdb6d1d661" => :mojave sha256 "47a8b4bfaab5f1db40e72c552ebf274242f804b84672e040580f37c50ba0451a" => :high_sierra + sha256 "41e8d221d49f685f34cb3f9ef1c7b9f5dded5fa6b42aa2ab84bb144a7c7eb93d" => :x86_64_linux end head do @@ -26,6 +27,8 @@ class Knot < Formula depends_on "protobuf-c" depends_on "userspace-rcu" + uses_from_macos "libedit" + def install system "autoreconf", "-fvi" if build.head? system "./configure", "--disable-dependency-tracking", diff --git a/Formula/known_hosts.rb b/Formula/known_hosts.rb index 99fc1f85a0c4b..f49759cf0bc2c 100644 --- a/Formula/known_hosts.rb +++ b/Formula/known_hosts.rb @@ -14,6 +14,7 @@ class KnownHosts < Formula sha256 "b1f7982e9fb744226dcdf2be12467613ca97fa9a05f92673a4c785f6f445333c" => :el_capitan sha256 "be8ddf7bec2c25ee2de9f84db383b56e25e45825386e6726bedbda41824c9d6a" => :yosemite sha256 "826d0ac6e5b61f6fa5278710b0acda82f474d9e81c85b644815a5963a296938f" => :mavericks + sha256 "cd41533b1859c4a66e5e71e6243ea7e80b48744611ca4a47a9a5d7abcb22b6f8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/kompose.rb b/Formula/kompose.rb index 90e3b194e4a09..8834654a49a1e 100644 --- a/Formula/kompose.rb +++ b/Formula/kompose.rb @@ -9,6 +9,7 @@ class Kompose < Formula sha256 "e769a37febb0d4bf08901f266dfcd6cdaba0cce741a44727371e2b5191c59039" => :catalina sha256 "09c6779b612484a7320b5c47e2bcff25c1de9037a93ddb510e355f90f1a6c6e9" => :mojave sha256 "e65c904bb6bd7029f08ecbe69fdbd368c49591b9acdd9bf48f2a473bee501415" => :high_sierra + sha256 "340671915dd81c4d37cd838eb489b72b341cbee0dd45b76022470e13b653c164" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/krakend.rb b/Formula/krakend.rb index 6152d435a7f6e..f079e1b9e62f3 100644 --- a/Formula/krakend.rb +++ b/Formula/krakend.rb @@ -9,6 +9,7 @@ class Krakend < Formula sha256 "3b2c4d19653b8c43580f994349beb23e70d5b2a1c2c187d54d8c1481d072a7ea" => :catalina sha256 "d7dcdd8038f317dba6b12533b5750235f3e12fd2e584de5b4e5a56f29428e092" => :mojave sha256 "db6cc9c73c230995752276f410b742b848d718ab9e6c6b783a6dfc3035f96dc9" => :high_sierra + sha256 "f5c27bfb71c636bf14f12ff5401ed0bb17ab1f1c46efef5734f11f7c3d7ae17d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/krb5.rb b/Formula/krb5.rb index c1bcb8171f039..991bd0a21fd07 100644 --- a/Formula/krb5.rb +++ b/Formula/krb5.rb @@ -8,6 +8,7 @@ class Krb5 < Formula sha256 "db39e4570abab6459fb857cb41fdd0a375810d25a4c712f4504585255397d150" => :catalina sha256 "e35ce1f9da67683b70fa075f4317a476c8356860c0a1c935d6a56eaee6716e8e" => :mojave sha256 "972a37782e92d2dec91a9f6cd90d2a98f4004101268579e1a1d6c3650014bed4" => :high_sierra + sha256 "aafc20ec9075a8aa2f43b6eedf4a746f2bc8456f442a03ee6ecbc3e325acfcbb" => :x86_64_linux end keg_only :provided_by_macos diff --git a/Formula/krew.rb b/Formula/krew.rb index 4e1a8971f1b01..33ed847235b9c 100644 --- a/Formula/krew.rb +++ b/Formula/krew.rb @@ -11,6 +11,7 @@ class Krew < Formula sha256 "530b8df4b6c973f2aa45b8e4ed565979963771b1f5d3638231f8705a97c162b3" => :catalina sha256 "e51ee6903e65b289910dbccb11ac8de741a9f52d8ac3adb555a6b5684e6ec938" => :mojave sha256 "ee763d27b51175e050bb3bd00335c7f950eaf823d6b73aeb03e8d67f41240227" => :high_sierra + sha256 "cbda9b3e0656fd2d273549f39bcb69bb4daf5b550fcaacf1f650f92c570eeeca" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ksh.rb b/Formula/ksh.rb index 61003e27cc168..bbc98aade8cf6 100644 --- a/Formula/ksh.rb +++ b/Formula/ksh.rb @@ -9,6 +9,7 @@ class Ksh < Formula sha256 "ea7be886a6acee55713ca673ce1578a1303389fb2a964734c38137d3610d7f2b" => :catalina sha256 "3bc3469d43fba904b3045722d43bb52444f88c2e6745af977bae9b52d1f0090e" => :mojave sha256 "733e1c6bdd05054bf8d0097a6ae9ea2ca21e74b4676df7b424d4b9f43078afd4" => :high_sierra + sha256 "40dbdf54a5608442ad7970087afac20704744893e10c391acc9fdb1b81039fd3" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/ktmpl.rb b/Formula/ktmpl.rb index 8e7faf47fe38c..c1cee2b1300c8 100644 --- a/Formula/ktmpl.rb +++ b/Formula/ktmpl.rb @@ -11,6 +11,7 @@ class Ktmpl < Formula sha256 "d8c1e6fd18fc96f615e119c64cd7df67940cb0a9b3113450e49f567b9875c9ee" => :catalina sha256 "7c91c4a9674effc29e0ef187fc05163500a81ac5a7c0502552b12098c72633dd" => :mojave sha256 "2cc0b69a68bbd12cfd02e17d079363f773006a7bd07b77588cf83d7207950b3f" => :high_sierra + sha256 "ba7f99adb316aeeb52fd3f13971b19a28e180bd110ba49cb72bb2cbc2e8ea5ff" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/ktoblzcheck.rb b/Formula/ktoblzcheck.rb index 422bb3f8d66c0..ef9d06c1cd443 100644 --- a/Formula/ktoblzcheck.rb +++ b/Formula/ktoblzcheck.rb @@ -8,6 +8,7 @@ class Ktoblzcheck < Formula sha256 "93495421d21c635d04637865d68c922d70ed0112b01929d113d21cd533afabc1" => :catalina sha256 "447d1889a2350c704d8c4d276c8122f8ecd24b906f5b4944e39bdbb77bf39962" => :mojave sha256 "242eca7d985cf7d70b78a2838d96a7b91b1e67b68ca7376919296bc253a99540" => :high_sierra + sha256 "3aab611689ecaa01635149a3ff6b3207a2a7c36af07564f795f9050ab92e231d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/kube-aws.rb b/Formula/kube-aws.rb index 20e467f3b4195..a75d59d848dba 100644 --- a/Formula/kube-aws.rb +++ b/Formula/kube-aws.rb @@ -11,6 +11,7 @@ class KubeAws < Formula sha256 "b9886afaab6dd749d4f6ae8699c6b3e7f7f58643256cbad8c39c20bdac5be93f" => :catalina sha256 "2163f4ba577af7afc517ec347158be45d909eb999a0c1185a662cf83168fb444" => :mojave sha256 "c400eff91b8ab74770af53bd3ae522e33947da4e08f46f2040ce2fc20047af5f" => :high_sierra + sha256 "7d9c497c2e660e0519172cb0d71cacc2a39c6a86ae0d2dec1fd417a2a15367a6" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kubeaudit.rb b/Formula/kubeaudit.rb index f85486510f5e2..787b38fa85af5 100644 --- a/Formula/kubeaudit.rb +++ b/Formula/kubeaudit.rb @@ -10,6 +10,7 @@ class Kubeaudit < Formula sha256 "3d788171cf4f563cd2010525027e2f2359687610aed37e6af8c089a6eaeb69d4" => :catalina sha256 "6b7bc21fb975da2d7fdf2c43ca68821b5e1a4006f19ba5faa11fd16b2c19b2ed" => :mojave sha256 "4a88db513c8ba3ea81129cb64c620e0835e11eaadb03745630b00d414fbe76fd" => :high_sierra + sha256 "65cc434b253b81c06919b27780d72b9ac0e99e22dd39db3ffd6ed4a5df667c8d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kubebuilder.rb b/Formula/kubebuilder.rb index 017f066fab84e..5b041e9614a68 100644 --- a/Formula/kubebuilder.rb +++ b/Formula/kubebuilder.rb @@ -7,10 +7,10 @@ class Kubebuilder < Formula head "https://github.com/kubernetes-sigs/kubebuilder.git" bottle do - cellar :any_skip_relocation sha256 "b587ddd6d67b12a7fd2635f8f4da56402133a036fe79e635b08427b401a9b71b" => :catalina sha256 "7de399f00ecd47e3150e05d213a44886f499456ed5480c095100e329203ab399" => :mojave sha256 "62040031af53761dbe639796b5dc95278be2a048380f691563fb9cd4ef7f8041" => :high_sierra + sha256 "fb3e33679b7fce4f80f90a9ba370d3a1406e9cca2da8e2a77f612d28a8e2b203" => :x86_64_linux end depends_on "git-lfs" => :build diff --git a/Formula/kubecfg.rb b/Formula/kubecfg.rb index c3800c7566671..be5969f553d10 100644 --- a/Formula/kubecfg.rb +++ b/Formula/kubecfg.rb @@ -9,6 +9,7 @@ class Kubecfg < Formula sha256 "32946d46969da7c8e49e40cb3aaf149b74bb4ab1929f22135c7ca211c8b92e45" => :catalina sha256 "90e88901d99070b88824fed247438c712ecd941c2259e7b942e2bcc7910d78e1" => :mojave sha256 "db6f3ad9399f9fc978506f0966ea8f82f52da9879466412d2bcb2cc34d829a9c" => :high_sierra + sha256 "5148fd935957de7ca60a565cf123abde2c3c9e8cc94dafdd16bef71dac24b071" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kubeless.rb b/Formula/kubeless.rb index 7f55e3a4e22b5..694cee4df7807 100644 --- a/Formula/kubeless.rb +++ b/Formula/kubeless.rb @@ -9,6 +9,7 @@ class Kubeless < Formula sha256 "94927a41f4778a3e99934154bda7db05c4048e83d49a840ecf7eca6ddfbc32e4" => :catalina sha256 "0b0f24835a3fb21b5a5459a030f821f2c13691ad8978a02067dfb38f15d8ac6f" => :mojave sha256 "ec427f71d144c616cfc1803da51caf69f6ead7cefd5ade2f8c23129d73eec705" => :high_sierra + sha256 "b3f3a1bb9fc4fdad0df229ace92d72b94414639a6443f60e05ea2d3b5b88215c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kubeprod.rb b/Formula/kubeprod.rb index c72c470a48799..b59356a57727d 100644 --- a/Formula/kubeprod.rb +++ b/Formula/kubeprod.rb @@ -9,19 +9,20 @@ class Kubeprod < Formula sha256 "202ec0c87aed643fe5532a6146b066f5958233e4143aab4b539504b7645891e1" => :catalina sha256 "1b6ba93ae6fd9f13a5d14f7ac8732f77fe28469df4b6762f3e8426c0698bae69" => :mojave sha256 "55aebc70fa724478dd1eb45829872dcb960e65e3c00606a4b640c4798675b4ac" => :high_sierra + sha256 "ce729da0ae41f0d12ad6c838dd21b845dc10f9c6a4058ede9d7ac5cd99a7510b" => :x86_64_linux end depends_on "go" => :build def install ENV["GOPATH"] = buildpath - ENV["TARGETS"] = "darwin/amd64" + ENV["TARGETS"] = OS.mac? ? "darwin/amd64" : "linux/amd64" dir = buildpath/"src/github.com/bitnami/kube-prod-runtime" dir.install buildpath.children cd dir do system "make", "-C", "kubeprod", "release", "VERSION=v#{version}" - bin.install "kubeprod/_dist/darwin-amd64/bkpr-v#{version}/kubeprod" + bin.install "kubeprod/_dist/" + ENV["TARGETS"].tr("/", "-") + "/bkpr-v#{version}/kubeprod" end end diff --git a/Formula/kubernetes-cli.rb b/Formula/kubernetes-cli.rb index 301db11700459..8f4ae9b3429d6 100644 --- a/Formula/kubernetes-cli.rb +++ b/Formula/kubernetes-cli.rb @@ -11,14 +11,20 @@ class KubernetesCli < Formula sha256 "165285b970b2b3d2e4a6253f1a63b2e2c20afbb7cdef3f65597a8be4eb237cb3" => :catalina sha256 "1417e6ae9bb0f6b698d7c1c7c60b446083df00eb7d4dc598e43b31ed39916d30" => :mojave sha256 "842f1b9aaa4ad64adc3995c2b028d4756cf43bf25e867031d656f1cbf2db44ac" => :high_sierra + sha256 "7e357c8694b34fe8bbd0dce4584452f2d73cc455556a16c6307f9e1bb65366e5" => :x86_64_linux end depends_on "go" => :build uses_from_macos "rsync" => :build + on_linux do + depends_on "rsync" => :build + end + def install ENV["GOPATH"] = buildpath + os = OS.linux? ? "linux" : "darwin" dir = buildpath/"src/k8s.io/kubernetes" dir.install buildpath.children - [buildpath/".brew_home"] @@ -29,7 +35,7 @@ def install # Make binary system "make", "kubectl" - bin.install "_output/local/bin/darwin/amd64/kubectl" + bin.install "_output/local/bin/#{os}/amd64/kubectl" # Install bash completion output = Utils.safe_popen_read("#{bin}/kubectl completion bash") diff --git a/Formula/kubernetes-service-catalog-client.rb b/Formula/kubernetes-service-catalog-client.rb index 66597192b2224..56b268a87ac1c 100644 --- a/Formula/kubernetes-service-catalog-client.rb +++ b/Formula/kubernetes-service-catalog-client.rb @@ -9,6 +9,7 @@ class KubernetesServiceCatalogClient < Formula sha256 "d17afa1cc5c192ba9ff73777a71d288744b52f08d49c3ca3eb0b57d46f529873" => :catalina sha256 "0fc4e96709b5f3a71afe4a526e70842b28b5aad677af9c6de7f3dcc62b94d891" => :mojave sha256 "4dda09b950c138a452a3a66d6742ef912761ac0365cc725ca9fad39189496690" => :high_sierra + sha256 "feacf58309a03427de312adab2d1bfcb2cea9661745a9a65c43237b819f11f50" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kubeseal.rb b/Formula/kubeseal.rb index b70858cfba9e1..e67edfddb7516 100644 --- a/Formula/kubeseal.rb +++ b/Formula/kubeseal.rb @@ -11,6 +11,7 @@ class Kubeseal < Formula sha256 "f80b7f12a29cebb0372c28370cd18991cfdb9ea0c6dc0a9ee41265aee393f0f1" => :catalina sha256 "91902a7c652021076f8ac8582bcce22ae77d321411adf67d21603eb6dbc1d0af" => :mojave sha256 "6285fd829b58dbf2802698d112b86a45b996e60c477dd8a218901020428aed95" => :high_sierra + sha256 "83a5abe17baa28f13d5ad6241c161a97243b0ccdb0dcfa58172a1ce63837ca34" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kubespy.rb b/Formula/kubespy.rb index e877422e57a77..4d9e9a0514426 100644 --- a/Formula/kubespy.rb +++ b/Formula/kubespy.rb @@ -10,6 +10,7 @@ class Kubespy < Formula sha256 "783702f8de5226fb50d35d30ee4f600f3c8ba82006e2ec52c6f643994f97ed65" => :catalina sha256 "0793f861231c44c23578b3c6d8faab29c868eb3ca4cc5786ad76536863fb04e0" => :mojave sha256 "a39ae5031e190cf58be0863d51738225366da5d36ede449af4146bd782b48e7a" => :high_sierra + sha256 "df21ea87c2616cf57643feba3030dfadb39d6d5c59d222db2d73285fd693eefe" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kustomize.rb b/Formula/kustomize.rb index 9829542c77ab3..13d574822fd80 100644 --- a/Formula/kustomize.rb +++ b/Formula/kustomize.rb @@ -11,6 +11,7 @@ class Kustomize < Formula sha256 "418c18672d5b1cd87a7a1df93bbfc1bce26f6e083fdfb6df3b212c233c82f1e4" => :catalina sha256 "a2971ecd137bcd53bc20ae1cabbe92894a9f08544778e87aac986e6669b115f4" => :mojave sha256 "9a1acdce8261c3f182249491bfb390510a8d8abd451ced366525bbc50f4e5add" => :high_sierra + sha256 "ff045eeff9d5e548f1fbf46fc26109c0837eb7046753e86317065ee1f2725f2d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/kvazaar.rb b/Formula/kvazaar.rb index 9f569a4a7bd33..7541451b75b21 100644 --- a/Formula/kvazaar.rb +++ b/Formula/kvazaar.rb @@ -10,6 +10,7 @@ class Kvazaar < Formula sha256 "75467ab21cc9bb1a3f81f41949a0312300f9d470b4547e827111379b94a237d8" => :catalina sha256 "d146e6aa5dda30a3353f72bae18356622fe613e1a7a43ae6d5d5e2fa8bfc2aba" => :mojave sha256 "50723e7fbe1dfb25f2ba39b84f4059b208bed481ae0832d00f24c7221bdde905" => :high_sierra + sha256 "3fb96396e7a8889eeb2a86770e5069e6b237e2be427afc42016b787b21cdfdbe" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/kyma-cli.rb b/Formula/kyma-cli.rb index 6f7c0abd573d5..29e0eecf21ac0 100644 --- a/Formula/kyma-cli.rb +++ b/Formula/kyma-cli.rb @@ -11,13 +11,14 @@ class KymaCli < Formula sha256 "31250ef53da7d2d54659867bbb41122a8aced78fbdf7afac97a7cdbc755e2232" => :catalina sha256 "75b428267bd96bece87a36e4d57b5915406ea5669a825b5d2c7d31d460de58dd" => :mojave sha256 "bd8d44c4b6ea8f2ca516e795e33ece1a399cf93ab078902e24ac969494a5230e" => :high_sierra + sha256 "1eed98521093e100ca2072196c0cbbfe92feb72492441b4e9d3a4936fa6d95c8" => :x86_64_linux end depends_on "go" => :build def install - system "make", "build-darwin" - bin.install "bin/kyma-darwin" => "kyma" + system "make", OS.mac? ? "build-darwin" : "build-linux" + bin.install OS.mac? ? "bin/kyma-darwin" : "bin/kyma-linux" => "kyma" end test do diff --git a/Formula/kyoto-cabinet.rb b/Formula/kyoto-cabinet.rb index 7f438f4700a85..9e4261fde39a3 100644 --- a/Formula/kyoto-cabinet.rb +++ b/Formula/kyoto-cabinet.rb @@ -9,12 +9,13 @@ class KyotoCabinet < Formula sha256 "ddd2f1b0f1985ad81b04b29dbd54f95c5f7c88f7427b559e9f298a6473a820b0" => :mojave sha256 "e4b99c22b5aebf85986e5c172ec61768833708acbb04318335f6641bea1f77ef" => :high_sierra sha256 "04ef198a6638dabdee27e881df9b16970eadc724f2f663a01edee7950b38b85a" => :sierra + sha256 "689642bef7edccdea636d2502985143a0b5a31dd1b76bc07625977b9f82ecc8c" => :x86_64_linux end patch :DATA def install - system "./configure", "--disable-debug", "--prefix=#{prefix}" + system "./configure", "--disable-debug", "--prefix=#{prefix}", *("--disable-zlib" unless OS.mac?) system "make" # Separate steps required system "make", "install" end diff --git a/Formula/kyoto-tycoon.rb b/Formula/kyoto-tycoon.rb index c8145635fcd3b..96e59222e0b24 100644 --- a/Formula/kyoto-tycoon.rb +++ b/Formula/kyoto-tycoon.rb @@ -10,6 +10,7 @@ class KyotoTycoon < Formula sha256 "04d72b5c55be3c26c688eda6c0cc9f88c85855ba6fe81aa36e210fc29afe7572" => :mojave sha256 "ce7db5082c632bef982d5463f3a8507d786fd3bcae7f7cccf8663ab36c3571bd" => :high_sierra sha256 "e75c60a4417bc00d04e1f24241320329f01b0d3076de2585e92375b12c4ef31d" => :sierra + sha256 "d0e9e8f2cdb9c00813f29168138ccd59eb86fa6e4232514bc5b7eea612209e06" => :x86_64_linux end depends_on "kyoto-cabinet" diff --git a/Formula/kytea.rb b/Formula/kytea.rb index 7eaa6b0a03331..1de648fd52ae6 100644 --- a/Formula/kytea.rb +++ b/Formula/kytea.rb @@ -12,6 +12,7 @@ class Kytea < Formula sha256 "3e0c66a7efb34ddb8e4f80d9b95562779e224271b8d63d38f9bc8176103427e2" => :el_capitan sha256 "2f2dda314728cd74750db339ebc2d166b8b611ad54668cc3e7b6225d39aec3f5" => :yosemite sha256 "045d0c9ad0cf35e003b8839cb0213e3f49d9107dfbc955e449b36fd4b6596640" => :mavericks + sha256 "50c45c17af6949a560ddf4f06c24d9e9d70bc0fc34d53b42f0cbac50ea7b6abd" => :x86_64_linux end head do diff --git a/Formula/l-smash.rb b/Formula/l-smash.rb index e5e6023cf039f..2f23d1c09f805 100644 --- a/Formula/l-smash.rb +++ b/Formula/l-smash.rb @@ -16,6 +16,7 @@ class LSmash < Formula sha256 "5751796e42e7d544f4976bc304a0ae7407dc5217b2b4218b0a6afdc18ea3eeaf" => :el_capitan sha256 "3703bdeb1dfe66aef898e60a990f4e64f0ab3c1fe26a49cf824b3c6998acaacc" => :yosemite sha256 "78c5c52a90e1609694b43a45240126515f97be8a1d129a57215d4a7ba9e3717f" => :mavericks + sha256 "00b5b08edf3405261e5b6777a2ca57c15b51d504e4369d27c811acd925cd694a" => :x86_64_linux end # failed to upgrade since 02-11-2018 diff --git a/Formula/ladspa-sdk.rb b/Formula/ladspa-sdk.rb new file mode 100644 index 0000000000000..27fb2e2426597 --- /dev/null +++ b/Formula/ladspa-sdk.rb @@ -0,0 +1,25 @@ +class LadspaSdk < Formula + desc "Linux Audio Developer's Simple Plugin" + homepage "https://ladspa.org" + url "https://www.ladspa.org/download/ladspa_sdk_1.15.tgz" + sha256 "4229959b09d20c88c8c86f4aa76427843011705df22d9c28b38359fd1829fded" + + bottle do + sha256 "87235984ac866b2b579c6b944b767cc7bd2778ae963fae262f2d98b72528326f" => :x86_64_linux + end + + depends_on :linux + + def install + chdir "src" do + inreplace "Makefile", "INSTALL_PLUGINS_DIR = /usr/lib/ladspa/", "INSTALL_PLUGINS_DIR = #{lib}" + inreplace "Makefile", "INSTALL_INCLUDE_DIR = /usr/include/", "INSTALL_INCLUDE_DIR = #{include}" + inreplace "Makefile", "INSTALL_BINARY_DIR = /usr/bin/", "INSTALL_BINARY_DIR = #{bin}" + system "make", "install" + end + end + + test do + assert_match "Mono Amplifier", shell_output("#{bin}/listplugins") + end +end diff --git a/Formula/lame.rb b/Formula/lame.rb index 4b9f9a8c5d95e..765ae1ea19f28 100644 --- a/Formula/lame.rb +++ b/Formula/lame.rb @@ -11,6 +11,7 @@ class Lame < Formula sha256 "9e65c67b83efa5a686aea0506dc44935cd2af2d4fe55fe38dc19610a0ccd80dd" => :high_sierra sha256 "c2d7bce53be2efb5d19d99ea00fbe69613885cce46009e8ab6099f8d5925c3ba" => :sierra sha256 "73c4d677b4e5357dc5baf30c96ac5f33cf7902e9c77869834b7cd9d17f3415bc" => :el_capitan + sha256 "293b74a7490a120e88ad55b4b663e8596636a98dbd6b7f54f1222f0a3246d9d3" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/landscaper.rb b/Formula/landscaper.rb index 0dde92f3544fd..577799815a2e0 100644 --- a/Formula/landscaper.rb +++ b/Formula/landscaper.rb @@ -12,6 +12,7 @@ class Landscaper < Formula sha256 "74decffaf180e0e0dd9bfa2312877da01443a3418afe0f485c1b655c4af1da41" => :catalina sha256 "ff82cdb7be6329f9a4a5ce34bcbb04bc9356ab46fa3ecd30b830cf35df268529" => :mojave sha256 "68302c1748fe4eb063855df24420a8681a54b8ce484f2e030616bd4c4a812d52" => :high_sierra + sha256 "6f860ab3aeb8f760ef14307e0ae93b680101857070512066ffe955d5ffb1a88b" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/lapack.rb b/Formula/lapack.rb index 288c520c3681d..194a2beddf9b2 100644 --- a/Formula/lapack.rb +++ b/Formula/lapack.rb @@ -6,9 +6,11 @@ class Lapack < Formula head "https://github.com/Reference-LAPACK/lapack.git" bottle do + cellar :any_skip_relocation sha256 "c5f8a726a57ffe294cfc488752ed2ad9f15e76ab211be020834df4f196b81b59" => :catalina sha256 "47760f1eba02ad2c66f536acfff97e4bafaff4c6088822c8547f7df35a92fb33" => :mojave sha256 "25833d6cbc3e54bb2c055727865ddd3ab74ffb53bf5a7fb285e73f9f5737ad05" => :high_sierra + sha256 "352d76569b6f71e389087ac266ea0bdf8563e472fde7b3697886ef86e0b2f45b" => :x86_64_linux end keg_only :shadowed_by_macos, "macOS provides LAPACK in Accelerate.framework" diff --git a/Formula/lasi.rb b/Formula/lasi.rb index 585f4b0c5ac3a..4e99f9fb98cd9 100644 --- a/Formula/lasi.rb +++ b/Formula/lasi.rb @@ -12,6 +12,7 @@ class Lasi < Formula sha256 "65a46c00e8cef9b98bf1b36229a3da7cf69038b5e1d8cccbb620cb1431d27319" => :catalina sha256 "5ef18cc43b46bf548f42925b3b2beb4993461ba78d5078f1cacaf8ac7b7af169" => :mojave sha256 "447ee1c538c34cb9f06c5dc743ad86807ddb4e05ea6e345b6db085705324da6d" => :high_sierra + sha256 "f01d0d8e66423a73655364bd110c6ecbf9a0d464f19cc45c35eb1d4442c5ded1" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/laszip.rb b/Formula/laszip.rb index 0f9ac1e3fd015..0e0b6297f747a 100644 --- a/Formula/laszip.rb +++ b/Formula/laszip.rb @@ -6,9 +6,11 @@ class Laszip < Formula head "https://github.com/LASzip/LASzip.git" bottle do + cellar :any_skip_relocation sha256 "df73f3c2c8be13bc0fab13f28cbb22262a24c283f4da85cf6b21c55531516e7f" => :catalina sha256 "3a9bc6d5931145800cb5792740a3cae118d27c4879144f3c74a44c2aee75ce64" => :mojave sha256 "a32459a4896bdc365fae55b70744bb7ae2a05b552e3bb0b0097345e0ea423014" => :high_sierra + sha256 "15fa5ef57a5b86446e6d9e21fe1cab535d2716ec703864f347fce124f8e8ee0e" => :x86_64_linux end depends_on "cmake" => :build @@ -21,7 +23,7 @@ def install test do system ENV.cxx, pkgshare/"example/laszipdllexample.cpp", "-L#{lib}", - "-llaszip", "-llaszip_api", "-Wno-format", "-o", "test" + "-llaszip", "-llaszip_api", "-Wno-format", *("-ldl" unless OS.mac?), "-o", "test" assert_match "LASzip DLL", shell_output("./test -h 2>&1", 1) end end diff --git a/Formula/latex2html.rb b/Formula/latex2html.rb index 42bc41509350d..56cff74521a8a 100644 --- a/Formula/latex2html.rb +++ b/Formula/latex2html.rb @@ -9,6 +9,7 @@ class Latex2html < Formula sha256 "67047d5b5d62383ce1aa89f7e686f597cc5681f73f70ff4cbcca7adb501a2fde" => :catalina sha256 "09197aae2b56daffdec8b1310524a54bf5f150ba6b01028f9fbd9fc826a024ca" => :mojave sha256 "505bfd350877a8cac8dbe37e3fc40eee907b896a1309ec379ba02ceabb32d929" => :high_sierra + sha256 "e4085a95b185ce2c37d4e4f11f658858e70fdab56ddeffb14e48de06e6b70b23" => :x86_64_linux end depends_on "ghostscript" diff --git a/Formula/latex2rtf.rb b/Formula/latex2rtf.rb index e6675ed7df051..4953ccf3e6d3d 100644 --- a/Formula/latex2rtf.rb +++ b/Formula/latex2rtf.rb @@ -8,6 +8,7 @@ class Latex2rtf < Formula sha256 "be21a155b6d80c651312135de1348e1847ac57b1b1d612bf820e92fe663e9b10" => :catalina sha256 "7c933531921ef07cc2471938266c91380d2364761b01fad8680bc70648812b19" => :mojave sha256 "cf6c89983b5c8593a74f62e86825f4a9e7cc7f31fb83639c8247c51fa4d3975a" => :high_sierra + sha256 "86750f7e83cc9177b0751dea5fbf86a5671f0521d0f69eee13200a3eedbc7a83" => :x86_64_linux end def install diff --git a/Formula/latexdiff.rb b/Formula/latexdiff.rb index bc0377dc1e019..cf39bcab2a168 100644 --- a/Formula/latexdiff.rb +++ b/Formula/latexdiff.rb @@ -9,6 +9,7 @@ class Latexdiff < Formula sha256 "8eb979b1b52125f102bbc56bbc4611d5b8075f003318307a2205485d95c789aa" => :catalina sha256 "8eb979b1b52125f102bbc56bbc4611d5b8075f003318307a2205485d95c789aa" => :mojave sha256 "8eb979b1b52125f102bbc56bbc4611d5b8075f003318307a2205485d95c789aa" => :high_sierra + sha256 "d9cb7732a465de6fa6084717b20e21bcb708fbe55e46c847eabbc9613871fbae" => :x86_64_linux end # osx default perl cause compilation error diff --git a/Formula/latexml.rb b/Formula/latexml.rb index 2b4ea3b3dfe61..c0ebbaefab80d 100644 --- a/Formula/latexml.rb +++ b/Formula/latexml.rb @@ -11,6 +11,7 @@ class Latexml < Formula sha256 "e7c78acf6bb580fdb949777719972a806c1d7d349d9e826b338572bedde6cf5c" => :mojave sha256 "388dbf99df85e55879cccfa48eed9b6ef362d13f3ffe83dbfd09b1e7fb12fa1f" => :high_sierra sha256 "b911ac9897012edcc7c32d96785e4ca3830ce8cbddff78da0942263c7fb0d0bb" => :sierra + sha256 "2ee028e2b024a8242de43ef97e15dd912fdb2a108641aeb340aea027188864cd" => :x86_64_linux end uses_from_macos "libxml2" @@ -26,6 +27,93 @@ class Latexml < Formula sha256 "53c9b1f86531cde060ee63709d1fda73cabc0cf2d581d29b22b014781b9f026b" end + unless OS.mac? + resource "Path::Tiny" do + url "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz" + sha256 "3c49482be2b3eb7ddd7e73a5b90cff648393f5d5de334ff126ce7a3632723ff5" + end + + resource "IO::String" do + url "https://cpan.metacpan.org/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz" + sha256 "2a3f4ad8442d9070780e58ef43722d19d1ee21a803bf7c8206877a10482de5a0" + end + + resource "File::Chdir" do + url "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz" + sha256 "efc121f40bd7a0f62f8ec9b8bc70f7f5409d81cd705e37008596c8efc4452b01" + end + + resource "Capture::Tiny" do + url "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz" + sha256 "6c23113e87bad393308c90a207013e505f659274736638d8c79bac9c67cc3e19" + end + + resource "File::Which" do + url "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz" + sha256 "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078" + end + + resource "Archive::Zip" do + url "https://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-1.64.tar.gz" + sha256 "de5f84f2148038363d557b1fa33f58edc208111f789f7299fe3d8f6e11b4d17d" + end + + resource "Alien::Build" do + url "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-1.78.tar.gz" + sha256 "132c71bbf4248af401a4780308ac98d98471f6efae2f4f56aea5ef3677406fc9" + end + + resource "Alien::LibXML2" do + url "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.09.tar.gz" + sha256 "926e43bfcdd70bc111795b78bc41dd3a5c80f466eec5841d32aa6a497228dcba" + end + + resource "LWP" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/libwww-perl-6.39.tar.gz" + sha256 "9a8d7747938aa75d7d524c71574ae7f99ca66a5dac8255a7f7759f373e7774d5" + end + + resource "Parse::RecDescent" do + url "https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz" + sha256 "1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37" + end + + resource "XML::LibXML" do + url "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0201.tar.gz" + sha256 "e008700732502b3f1f0890696ec6e2dc70abf526cd710efd9ab7675cae199bc2" + end + + resource "XML::Sax" do + url "https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz" + sha256 "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0" + end + + resource "XML::LibXSLT" do + url "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.96.tar.gz" + sha256 "2a5e374edaa2e9f9d26b432265bfea9b4bb7a94c9fbfef9047b298fce844d473" + end + + resource "URI" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/URI-1.76.tar.gz" + sha256 "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e" + end + + resource "HTTP::Request" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz" + sha256 "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112" + end + + resource "Canary::Stability" do + url "https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/Canary-Stability-2013.tar.gz" + sha256 "a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea" + end + + resource "JSON::XS" do + url "https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-4.02.tar.gz" + sha256 "a5ad172138071a14729da8a01921ca233da4fe2bed290ffdfb8e560dd8adcf16" + end + end + resource "Text::Unidecode" do url "https://cpan.metacpan.org/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz" sha256 "6c24f14ddc1d20e26161c207b73ca184eed2ef57f08b5fb2ee196e6e2e88b1c6" @@ -35,6 +123,7 @@ def install ENV.prepend_create_path "PERL5LIB", libexec+"lib/perl5" resources.each do |r| r.stage do + ENV["PERL_CANARY_STABILITY_NOPROMPT"] = "1" unless OS.mac? system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" system "make" system "make", "install" diff --git a/Formula/launch.rb b/Formula/launch.rb index b1d6a8e1db0c4..2351008eba1e6 100644 --- a/Formula/launch.rb +++ b/Formula/launch.rb @@ -14,7 +14,10 @@ class Launch < Formula sha256 "9905b0dd99460cd88d48a1cf4c230ec03db380262001fa7a2ba54cbcbb84fad0" => :el_capitan end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? + + # hard dependency on macOS API's + depends_on :macos def install rm_rf "launch" # We'll build it ourself, thanks. diff --git a/Formula/lazydocker.rb b/Formula/lazydocker.rb index a8d79a06a18a4..cdee53d94e3b3 100644 --- a/Formula/lazydocker.rb +++ b/Formula/lazydocker.rb @@ -10,6 +10,7 @@ class Lazydocker < Formula sha256 "0a32a3111697ccba3b9f1d959f206c23a6b2fdc2fdb968f5eed12575c67e56b4" => :catalina sha256 "efe1cebae9966e4cbe0b55cfd28f6625d37b821827c7954168e80fc932ec57e2" => :mojave sha256 "79c56a22d891d09ce3b08ef1c400768dc68f2c5244b9a33070aae6f33e3d1e7b" => :high_sierra + sha256 "f58dd6a4bb82951ade044fdbc7d99caaa6dbb49db95976162b920bd46667f0d6" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/lazygit.rb b/Formula/lazygit.rb index 067176ffd2d59..6e15e1db0e32a 100644 --- a/Formula/lazygit.rb +++ b/Formula/lazygit.rb @@ -9,6 +9,7 @@ class Lazygit < Formula sha256 "e1208b282f14c75a93a01f791009ea644e7438ea812e411fef6a8a47f63acbe5" => :catalina sha256 "2a8ca3c11245e60ea115b0e7c4a24c85724096e4146040ea88a4b679af8a4b07" => :mojave sha256 "fb0346d006b244733af581f5e249e643d8653cc1b1d9c42bec7e71e8b3c39bae" => :high_sierra + sha256 "ab1bc73c3bbb81525bb814ec1629a51d12500c8f064dde39437513c4b3713bb4" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/lbdb.rb b/Formula/lbdb.rb index 7756b84792899..e2e7f56904418 100644 --- a/Formula/lbdb.rb +++ b/Formula/lbdb.rb @@ -10,6 +10,7 @@ class Lbdb < Formula sha256 "a02ea4967e809c9254dac7726c7ee9365e1ba99a8eef68fe6dfd4de34d2fa5af" => :mojave sha256 "0e5c126d7cb1c5ed3211ee1758a388597b00f32c3fb22c0420919e3667371ee2" => :high_sierra sha256 "d22e5b8b66ab51d8c6d324330178284c9b35e3ef17362724089e1e979e9c05d4" => :sierra + sha256 "396d6f9973c11e0f44393f6cd5758ae6f2504e4659646470dd8c47d870d839f1" => :x86_64_linux end depends_on "abook" diff --git a/Formula/lbzip2.rb b/Formula/lbzip2.rb index cb3c4da949e50..e2341514ee89f 100644 --- a/Formula/lbzip2.rb +++ b/Formula/lbzip2.rb @@ -14,6 +14,7 @@ class Lbzip2 < Formula sha256 "91c1fb0593205365ff4ada30a34fe7f3afcb1c4e684a3bf239e9168d9fdfc4f7" => :el_capitan sha256 "983c8fe1c23dbfdb73d9e7320e776521c4998169a2d17cd1c6f3035674d8a147" => :yosemite sha256 "7e521c70fadae71ad2e7807cc844183c05751e4a2433d9f1210069fb2a34333e" => :mavericks + sha256 "ebd6b5df54c326d39152c8c845ddbcab27424586e46f7114f23804550c0922c8" => :x86_64_linux end def install diff --git a/Formula/lcdf-typetools.rb b/Formula/lcdf-typetools.rb index d2979c5190801..125a1e24e6281 100644 --- a/Formula/lcdf-typetools.rb +++ b/Formula/lcdf-typetools.rb @@ -9,6 +9,7 @@ class LcdfTypetools < Formula sha256 "0fd983396dbcf027e560753e6f25797500d085762edcf59a1a2034cd55c24cfd" => :mojave sha256 "cdff1c16d03fd920033f85dd2e2180f91791057729fbd26b6f193ac7cd0ce9f4" => :high_sierra sha256 "2bfe28f9e869eec676cada56bcf6efe97024e0e1f93b126a7b26ac2a292db2af" => :sierra + sha256 "f40ddeb592dfdfdfa121474e5c6caa3d98f0dcdc2bac3ed7b2dfa77f0311c92e" => :x86_64_linux end def install diff --git a/Formula/lcdproc.rb b/Formula/lcdproc.rb index 24fd961467154..e5bea8d03e93f 100644 --- a/Formula/lcdproc.rb +++ b/Formula/lcdproc.rb @@ -11,6 +11,7 @@ class Lcdproc < Formula sha256 "2371b10dc3bd2644ac83ced35dcde1960110217385f9f5547917ebbbb823e332" => :sierra sha256 "1de4bece6e781dc6d88d000039095cbf6edbd10313163ef9644152d67778171c" => :el_capitan sha256 "2ac794ede644c1c86b321af648eb2b0197762cb7e5eb09cd0a31e8eed842e2f9" => :yosemite + sha256 "8bbdf070ebb721bf5daa69e35d475c22c9207c8b2402689ea48fe1bb56f8aa47" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/lci.rb b/Formula/lci.rb index 78394a6def88b..058b51262b4f1 100644 --- a/Formula/lci.rb +++ b/Formula/lci.rb @@ -12,6 +12,7 @@ class Lci < Formula sha256 "88603e7d22fa41138940318a9ce703087062a5466e796a17d636f9ca212a9fc3" => :el_capitan sha256 "46a84d5644606edb37c1f915df039901ac96d6728345bb95d57ed52fe783a34d" => :yosemite sha256 "d9c2381543f5fff02005a66d07f5c8fb925e4c2c40d87392816947c3c1b22816" => :mavericks + sha256 "b96e9d72694c390a8a8947d2324a2e4bd32da0ed57c80ef0b63460abab047a94" => :x86_64_linux # glibc 2.19 end conflicts_with "lolcode", :because => "both install `lci` binaries" diff --git a/Formula/lcm.rb b/Formula/lcm.rb index 2eb21acdd89a3..25f51189dc8b8 100644 --- a/Formula/lcm.rb +++ b/Formula/lcm.rb @@ -12,6 +12,7 @@ class Lcm < Formula sha256 "70db20b2479715ceac73fd10d65dbdd9d0db2939a27006d824d508c998c4ba4f" => :catalina sha256 "d17f35983d9b396339f527e2486d224b1d31e2342df26441c9ef2d694314ffc7" => :mojave sha256 "cf6e8b17fca7a9d9d5b53970348e97b4ef5b61107531238d9acab4f5eead09bc" => :high_sierra + sha256 "09a112a27b077aaf56342964593a542e3a1a5dc70e0d973e743e607fa9ff3303" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/lcrack.rb b/Formula/lcrack.rb index 3b39d5e5af2a0..8cf7199380ed2 100644 --- a/Formula/lcrack.rb +++ b/Formula/lcrack.rb @@ -15,6 +15,7 @@ class Lcrack < Formula sha256 "2bd1de3426e4bd4ebfc6fb6026dc9a9fd046a5d9345459700a2361b7fe53f49c" => :el_capitan sha256 "443e64bdb0307e12f4ef990abea7941239784cb7c9798929880a7973f86cf5bc" => :yosemite sha256 "7ce0dcf84e40ecf7bffc05b068f8c5109d055e654fba8a8c918cbfada447e19e" => :mavericks + sha256 "2d68734cf22e26c529c39593b64a85096efeab7304b23f0de4d7dd2f94ba9e03" => :x86_64_linux end def install diff --git a/Formula/ldc.rb b/Formula/ldc.rb index fbab644345539..f564b40015f8d 100644 --- a/Formula/ldc.rb +++ b/Formula/ldc.rb @@ -9,10 +9,10 @@ class Ldc < Formula sha256 "122d9a37cccbd671d223a2ce683ad141489633d2f11fa8f662635f6ba4a49027" => :catalina sha256 "67f9bdd412e9ee9e6864f52ae5b52358a01b93de359fe8aad4b9d7bed73a572a" => :mojave sha256 "7945dba30bfac0ced442b69a46a477593ee04e3b3f28cc6fdb56b94f58e94706" => :high_sierra + sha256 "f422d9aeb3a6be820e49e55a342372a8bc2b08c43798331df374309ecb7774e7" => :x86_64_linux end depends_on "cmake" => :build - depends_on "libconfig" => :build depends_on "llvm" uses_from_macos "libxml2" => :build @@ -22,15 +22,28 @@ class Ldc < Formula end resource "ldc-bootstrap" do - url "https://github.com/ldc-developers/ldc/releases/download/v1.20.1/ldc2-1.20.1-osx-x86_64.tar.xz" - version "1.20.1" - sha256 "b0e711b97d7993ca77fed0f49a7d2cf279249406d46e9cf005dd77d5a4e23956" + if OS.mac? + url "https://github.com/ldc-developers/ldc/releases/download/v1.20.1/ldc2-1.20.1-osx-x86_64.tar.xz" + version "1.20.1" + sha256 "b0e711b97d7993ca77fed0f49a7d2cf279249406d46e9cf005dd77d5a4e23956" + else + url "https://github.com/ldc-developers/ldc/releases/download/v1.20.1/ldc2-1.20.1-linux-x86_64.tar.xz" + version "1.20.1" + sha256 "2185802dcabb89e516f904ee7c4c313dcf5784bb1d15cc8e674075455b1d0b6b" + end end def install + # Fix the error: + # CMakeFiles/LDCShared.dir/build.make:68: recipe for target 'dmd2/id.h' failed + ENV.deparallelize unless OS.mac? + ENV.cxx11 (buildpath/"ldc-bootstrap").install resource("ldc-bootstrap") + # Fix ldc-bootstrap/bin/ldmd2: error while loading shared libraries: libxml2.so.2 + ENV.prepend_path "LD_LIBRARY_PATH", Formula["libxml2"].lib + mkdir "build" do args = std_cmake_args + %W[ -DLLVM_ROOT_DIR=#{Formula["llvm"].opt_prefix} @@ -53,10 +66,13 @@ def install EOS system bin/"ldc2", "test.d" assert_match "Hello, world!", shell_output("./test") - system bin/"ldc2", "-flto=thin", "test.d" - assert_match "Hello, world!", shell_output("./test") - system bin/"ldc2", "-flto=full", "test.d" - assert_match "Hello, world!", shell_output("./test") + # Fix Error: The LLVMgold.so plugin (needed for LTO) was not found. + if OS.mac? + system bin/"ldc2", "-flto=thin", "test.d" + assert_match "Hello, world!", shell_output("./test") + system bin/"ldc2", "-flto=full", "test.d" + assert_match "Hello, world!", shell_output("./test") + end system bin/"ldmd2", "test.d" assert_match "Hello, world!", shell_output("./test") end diff --git a/Formula/ldns.rb b/Formula/ldns.rb index 040da0880b61c..43aef2c40c293 100644 --- a/Formula/ldns.rb +++ b/Formula/ldns.rb @@ -6,10 +6,11 @@ class Ldns < Formula revision 2 bottle do - cellar :any + cellar :any_skip_relocation sha256 "0446a8f1f3bc55d5d618c5bb2137d45dd3784d69e575ebabacf3dddb0d61055a" => :catalina sha256 "1df2448c33ca744971061cecc782c7fe464b449eb9852c8b6287a59b8f696938" => :mojave sha256 "da38537015dd33fa5ee0b5a5239cfc57a83aa4806a59b8d2111f7a498595d40a" => :high_sierra + sha256 "34db1d839bb37aa14c80c5dd981095682d81a47fc73d57c546c7d63d42a67a96" => :x86_64_linux end depends_on "swig" => :build @@ -35,9 +36,11 @@ def install ENV["PYTHON"] = Formula["python@3.8"].opt_bin/"python3" system "./configure", *args - inreplace "Makefile" do |s| - s.change_make_var! "PYTHON_LDFLAGS", "-undefined dynamic_lookup" - s.gsub! /(\$\(PYTHON_LDFLAGS\).*) -no-undefined/, "\\1" + if OS.mac? + inreplace "Makefile" do |s| + s.change_make_var! "PYTHON_LDFLAGS", "-undefined dynamic_lookup" + s.gsub! /(\$\(PYTHON_LDFLAGS\).*) -no-undefined/, "\\1" + end end system "make" diff --git a/Formula/lean-cli.rb b/Formula/lean-cli.rb index 75f590998e5a5..fb103cdc7cb1b 100644 --- a/Formula/lean-cli.rb +++ b/Formula/lean-cli.rb @@ -10,6 +10,7 @@ class LeanCli < Formula sha256 "7a5f55ee2ee2f7ec1cc0da511cede9245b8410f0639da8eab0e7d5b47f7a9060" => :catalina sha256 "b5804747a881fe183502f58486d3e1a27336690c25f2a8aff6b08037409c7100" => :mojave sha256 "601dc511053b0af1c74b09354812f083293e0fb8c6eab7686949dabe17813cf6" => :high_sierra + sha256 "c432f96276bc8702e37fb1bee700022c7489bd73af225dcf4e2586272f6ee503" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/lean.rb b/Formula/lean.rb index bbd577d6048d4..f2d7d4f531937 100644 --- a/Formula/lean.rb +++ b/Formula/lean.rb @@ -11,6 +11,7 @@ class Lean < Formula sha256 "a4e42293767b2c39d46ededd68ccdbae0deddc8280a8d5a0004390091e91acd4" => :mojave sha256 "31506dc58b1108625510415a551fea963739898ad675d8cb3023af6e3922e109" => :high_sierra sha256 "a5df8afdccd0db40f4a9c8184d9197a8a66a47b2c2bbf7451e05976b13274025" => :sierra + sha256 "c585e95ea9ea1e8eead98ba5cdfe5966e93e7eed58352973d2be0995657c1a58" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/leaps.rb b/Formula/leaps.rb index b8e63d62bd792..2ee578e643853 100644 --- a/Formula/leaps.rb +++ b/Formula/leaps.rb @@ -12,6 +12,7 @@ class Leaps < Formula sha256 "37343e978d4035fa9b2881c038748ec4704bf8a57308c59e64592dd404166e36" => :high_sierra sha256 "d269ec8f0e492e2a9c7804ca2cc6d9211a9be7c3dfbb0daaab19c5b14bef5b24" => :sierra sha256 "e36259af15ec8cf6546b1f7d99a105efb9a30c198f549a67964417e31892fe97" => :el_capitan + sha256 "9227ee7760070da32d60a5cecb15d91af5aec49c6dbb053b3b3a098a9abe6e0a" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/ledger.rb b/Formula/ledger.rb index 3d94ff50841b7..0702499114789 100644 --- a/Formula/ledger.rb +++ b/Formula/ledger.rb @@ -9,6 +9,7 @@ class Ledger < Formula sha256 "66d5a0700f708ed2030db289e5fb9437185f3f0cebc03d24a5a18ba299c94063" => :catalina sha256 "a39a1ce36e416f8d8b920173d598a2635a51e6a15d86da5eee8a02c55c88744b" => :mojave sha256 "442b0e1736797ca9686168635e991ba36924759e889c3a01052b4e39ba1b7d51" => :high_sierra + sha256 "16039893f5b574b5196b225cbac3dda8faf594ed9cf9f768e6e388146f6b243a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ledit.rb b/Formula/ledit.rb index abdecfe371d65..0797b69611a4f 100644 --- a/Formula/ledit.rb +++ b/Formula/ledit.rb @@ -11,6 +11,7 @@ class Ledit < Formula sha256 "55df7d80dfcfb5c04274f9a33a5fc03a4a1b9b2b1fb4f3b08c0cef83759c74a3" => :high_sierra sha256 "b7e2b19079d843f9704572bf21de6251e7a6619d809ce230e22be5440517ab57" => :sierra sha256 "952162580a2542b7038b2702b8a2ed9223e519ca703b221daf054566723ecd59" => :el_capitan + sha256 "61348dd368939356df214df67e8bd80791b9e24721058ac134e7f38106e2e168" => :x86_64_linux end depends_on "camlp5" diff --git a/Formula/legit.rb b/Formula/legit.rb index 3bb7463bff726..88a34468e6b1f 100644 --- a/Formula/legit.rb +++ b/Formula/legit.rb @@ -6,6 +6,7 @@ class Legit < Formula url "https://files.pythonhosted.org/packages/cb/e4/8cc5904c486241bf2edc4dd84f357fa96686dc85f48eedb835af65f821bf/legit-1.2.0.post0.tar.gz" version "1.2.0.post0" sha256 "949396b68029a8af405ab20c901902341ef6bd55c7fec6dab71141d63d406b11" + revision 1 unless OS.mac? head "https://github.com/frostming/legit.git", :branch => "master" bottle do @@ -13,6 +14,7 @@ class Legit < Formula sha256 "f8e751f24ec29945d19282e2ba4ebbde289f29365c62e2083792bae79b1be7b9" => :catalina sha256 "3cf90c6383f7a7f0be82aeef8605775de297b3911484d2472970562031d2d008" => :mojave sha256 "cec24c2e497d9b8c162a06fb867778da3ecb08fe8ff7299a386c8abf1a03f895" => :high_sierra + sha256 "1db0f0a420fb2dd6579ad3affb839705815188e6c2abd446568abb7c54738664" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/lego.rb b/Formula/lego.rb index 2a8296f74babf..1402cf8262dc0 100644 --- a/Formula/lego.rb +++ b/Formula/lego.rb @@ -10,6 +10,7 @@ class Lego < Formula sha256 "1f28d7b0efe03365a9fb281c9ea680a5e9715d43cb6bd8ef99b18ac0def3a105" => :catalina sha256 "8602e35affcfc310f79723eccffbb6da9e87d9dab69537b1ae86831c1a4b702c" => :mojave sha256 "af3237e22b689aa1428f85b2f4a670f3a43e860019865825bb45c86231e18a6e" => :high_sierra + sha256 "4953ab8b3846549d28faaa25369f6179750350f555b15a4ac4f8d5540b4f18f6" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/leiningen.rb b/Formula/leiningen.rb index 0dcc7fd185bcd..fc28c7c943ac2 100644 --- a/Formula/leiningen.rb +++ b/Formula/leiningen.rb @@ -10,8 +10,11 @@ class Leiningen < Formula sha256 "70a6ab2365ebf7efd3d2d84fd89d88b59c6417df9225562784f8b6184653a49b" => :catalina sha256 "70a6ab2365ebf7efd3d2d84fd89d88b59c6417df9225562784f8b6184653a49b" => :mojave sha256 "70a6ab2365ebf7efd3d2d84fd89d88b59c6417df9225562784f8b6184653a49b" => :high_sierra + sha256 "6fa271929c010e0e7bb307bc9c320eca60b483cd40b44f6380f1e1addb59223c" => :x86_64_linux end + depends_on :java => :test unless OS.mac? + resource "jar" do url "https://github.com/technomancy/leiningen/releases/download/2.9.3/leiningen-2.9.3-standalone.zip", :using => :nounzip sha256 "23e1df18bc97226d570f47335a8d543e1b759ea303544ea57d5309be3dedcbbb" diff --git a/Formula/lensfun.rb b/Formula/lensfun.rb index f6c45d70a00d4..ded119b1db6ce 100644 --- a/Formula/lensfun.rb +++ b/Formula/lensfun.rb @@ -11,6 +11,7 @@ class Lensfun < Formula sha256 "66ab460c11f7476a85c31f9941d2b2f35a416d1f2db9a75b029ed038ff63cf0c" => :catalina sha256 "913b9cebd837443975420bf43b32076b6cd52ca3358599f5ea05229f08e4cc9e" => :mojave sha256 "6c9f55d9fcc97aeb95654086f739b0ddfc95febb76e9c68037a262a535b3f87e" => :high_sierra + sha256 "ba761cad8602ea35aa558d689480b6c4573d3ba25e93d076f4a6a7f0c3942ac9" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/lepton.rb b/Formula/lepton.rb index 0bee9456a0086..aca0a540e26e5 100644 --- a/Formula/lepton.rb +++ b/Formula/lepton.rb @@ -14,6 +14,7 @@ class Lepton < Formula sha256 "a6a1a47dd2f80fe66d5dfbde97b91ba93d054f6934ba2a950ede603e405e6eed" => :el_capitan sha256 "700264c93fab4bba78cf62ac3a77ea60099cd38399f00d6972f8093b89dd8404" => :yosemite sha256 "fc7f77f9ed19af975e747b8eb8e39b6187f12ed226e2b1c15553a8c0e470bdff" => :mavericks + sha256 "22f0dbf0256ceb322c6abbf269d6df32c5cdd136d5fc29a7ebd69293343b7ea9" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/leptonica.rb b/Formula/leptonica.rb index 292482c9d51df..a4b5945b6d28b 100644 --- a/Formula/leptonica.rb +++ b/Formula/leptonica.rb @@ -9,6 +9,7 @@ class Leptonica < Formula sha256 "2e53934abea2e776f9b532f4ea9d56c12e0bbbd83a54f56aa74de3393450dc11" => :catalina sha256 "29985739b8eb8fdc9e927bfe95f5ed63c0f11a48f693b8af0210efce4b5d7742" => :mojave sha256 "715a73dfeab21b60423385a51a400e815857742c4902b4d875083a50bc971354" => :high_sierra + sha256 "ad22d307cd6b6c1a08d2931e878ddcdd0db206f6fa9419a21552e32af17978ca" => :x86_64_linux end depends_on "pkg-config" => :build @@ -37,7 +38,7 @@ def install #include int main(int argc, char **argv) { - std::fprintf(stdout, "%d.%d.%d", LIBLEPT_MAJOR_VERSION, LIBLEPT_MINOR_VERSION, LIBLEPT_PATCH_VERSION); + fprintf(stdout, "%d.%d.%d", LIBLEPT_MAJOR_VERSION, LIBLEPT_MINOR_VERSION, LIBLEPT_PATCH_VERSION); return 0; } EOS diff --git a/Formula/lerna.rb b/Formula/lerna.rb index 4dcbd9a8309c8..966d1441b9d13 100644 --- a/Formula/lerna.rb +++ b/Formula/lerna.rb @@ -11,6 +11,7 @@ class Lerna < Formula sha256 "5f2b51b458e4379c8f4bf192eb532e567fa2a209eff59fc78aa4a73a2c95c9a4" => :catalina sha256 "363088564849de9b6c79ac5cdbbb872ca43841b0d80af27c85c696cbd2dc75bb" => :mojave sha256 "833823b45ebd250a74b170f980861ae9cc6831040e5362309e637d13291a97af" => :high_sierra + sha256 "9717fa362cf5fc1839425d0ab84a82ea15164261e597f717778bdd9f85050f2b" => :x86_64_linux end depends_on "node" diff --git a/Formula/less.rb b/Formula/less.rb index c6921b12b8a31..e0ea2eb86042b 100644 --- a/Formula/less.rb +++ b/Formula/less.rb @@ -9,6 +9,7 @@ class Less < Formula sha256 "a76b3f1fb43e1e0ab566a70eca5430afa744d6d87430b55e9a5b98160834c8b9" => :catalina sha256 "2ee3f16d15855ab88ad87067085c0f2dd58c90c5b91ae51499ae0548a24693b2" => :mojave sha256 "46cd5ba33b6a1d00cfa3993712ea617bce5b6c9908b016a72413f370eda714be" => :high_sierra + sha256 "bd5ade0457183a6b18f442a3f12bfa4e4875c557644f3a6a346dfe299bce39fa" => :x86_64_linux end depends_on "pcre" diff --git a/Formula/lesspipe.rb b/Formula/lesspipe.rb index 6b2bfc8a406b5..e9bdb0aa1199b 100644 --- a/Formula/lesspipe.rb +++ b/Formula/lesspipe.rb @@ -9,6 +9,7 @@ class Lesspipe < Formula sha256 "ddefc7bc6202699c00fc69d5bf4e22c06a05cc6ad7c49dca5ff84c32b88ad190" => :catalina sha256 "ddefc7bc6202699c00fc69d5bf4e22c06a05cc6ad7c49dca5ff84c32b88ad190" => :mojave sha256 "ddefc7bc6202699c00fc69d5bf4e22c06a05cc6ad7c49dca5ff84c32b88ad190" => :high_sierra + sha256 "4da5f3e8e3defdec7dfa61a880f2363d5e580b842c651fbd1fb77e4e1aef5c5b" => :x86_64_linux end def install diff --git a/Formula/leveldb.rb b/Formula/leveldb.rb index 8700d2b63c044..2f0e9e2850906 100644 --- a/Formula/leveldb.rb +++ b/Formula/leveldb.rb @@ -10,6 +10,7 @@ class Leveldb < Formula sha256 "22e4a129bedd5030525f749a5b5ec978bf6da0a9b0625fe829da482a5ab85755" => :mojave sha256 "b1cf697cad28caac418d2e0ef49bc90863f389402185d3cc0f1f7079516d02c2" => :high_sierra sha256 "810dbeba5e3f7d72d4772b9eff4d9022a1240c0abc6235afbd343c199741e6f7" => :sierra + sha256 "debca309da693fdb3461c429d0f9116bb8970bd08833276a6400a280c458d8b7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/lf.rb b/Formula/lf.rb index 42b100b6d0d60..1c450d178c528 100644 --- a/Formula/lf.rb +++ b/Formula/lf.rb @@ -10,6 +10,7 @@ class Lf < Formula sha256 "d53611f5c7f78e947eeed932abd4cd64591b416815043e62c971257f1d300cd7" => :catalina sha256 "9d08c5d7c877993c3a47108fa36f27290c16fd92e198aaff4ab8494a92337f8a" => :mojave sha256 "6d4f60d4005731fa3c0851caed566add13a11899271523c6815f88b0907e8c1c" => :high_sierra + sha256 "c988752f309750589a1ab7348992253b2797f223376c15a387cfe6879948262d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/lftp.rb b/Formula/lftp.rb index 3992d22caa8e7..4e53f070a2c92 100644 --- a/Formula/lftp.rb +++ b/Formula/lftp.rb @@ -8,6 +8,7 @@ class Lftp < Formula sha256 "88341463e443203acace85f22c68bfecc1e374e97c3bc61a4d55992a7894dbdc" => :catalina sha256 "7fb04159e36521d586e023c99ac6f63d3a695e6043ae62645c68da964776eebc" => :mojave sha256 "54a5bfc00d589ffec053ceb367cb1acee8ad1d13a5549eeda097f9b3fb5c92e2" => :high_sierra + sha256 "8ea1054ff032558e75fa82fe3a93eb742fca42171ad2e8b45c71fc52d6e5b018" => :x86_64_linux end depends_on "libidn" diff --git a/Formula/lha.rb b/Formula/lha.rb index 526a48a78791f..b380c816ff063 100644 --- a/Formula/lha.rb +++ b/Formula/lha.rb @@ -15,6 +15,7 @@ class Lha < Formula sha256 "35f3e193c1bf0d26c62ea6897721c559191fea64f27d71781a90f670d9a23557" => :el_capitan sha256 "9cb516a73d1d117c39f63d16b3211df626783c9bb1a7038f524dd9c36045b1ac" => :yosemite sha256 "bd26a5a48396d06019f7998f4c9bf511a74ef237814fee5f5c8ba9df31b30a37" => :mavericks + sha256 "3c3a36157f2adf1bab2014add505dee8b0a0f7b87a8c4b7f37a16fbbe43e2349" => :x86_64_linux # glibc 2.19 end head do diff --git a/Formula/lhasa.rb b/Formula/lhasa.rb index 8d92550425de2..9664f33eb6466 100644 --- a/Formula/lhasa.rb +++ b/Formula/lhasa.rb @@ -14,6 +14,7 @@ class Lhasa < Formula sha256 "0d407f1058853c656a4aef717c1e72ff57472e0622fb344a5ef57c4c9ad8c3ee" => :el_capitan sha256 "afd0b2c24f4e4103c6ab8e918a972fda1b614890fc527bf314cc253e199013ee" => :yosemite sha256 "eecde92149160d0ec03d5b2f88408d67a4bc03b415ed4a78ff12474f6aa965f4" => :mavericks + sha256 "6eff66f4de61c01c4d29aeef0e30d23b0e8e217abe58324836ba90035c9d219e" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/lib3ds.rb b/Formula/lib3ds.rb index 102ea2b8b14d1..40013ca608c8d 100644 --- a/Formula/lib3ds.rb +++ b/Formula/lib3ds.rb @@ -14,6 +14,7 @@ class Lib3ds < Formula sha256 "e5810afd47dd88fb769e6ef62ef558b4ee4e643d4f5ae3fddb019257642b3375" => :el_capitan sha256 "33f5b51953a8d4a583c7d5d6a7796ffaaccf8bf6a303fac300bfdb76dcd0ad60" => :yosemite sha256 "3faa2167b32ab4fba667c2fc1d1131411fc3765c7e32a220b16aa62ee433d930" => :mavericks + sha256 "3fc16bc23ab20951e579914bc8d3f3ad97c88cd6f204591370cd887be3bfc2c6" => :x86_64_linux end def install diff --git a/Formula/libaio.rb b/Formula/libaio.rb new file mode 100644 index 0000000000000..dfa43a618064d --- /dev/null +++ b/Formula/libaio.rb @@ -0,0 +1,32 @@ +class Libaio < Formula + desc "Linux-native asynchronous I/O access library" + homepage "https://pagure.io/libaio" + url "https://pagure.io/libaio/archive/libaio-0.3.111/libaio-libaio-0.3.111.tar.gz" + sha256 "e6bc17cba66e59085e670fea238ad095766b412561f90b354eb4012d851730ba" + + bottle do + cellar :any_skip_relocation + sha256 "95183f63bab7cc5f5f14f7b71c2d47d66aff94faab35ab621acac695e25b257e" => :x86_64_linux + end + + depends_on :linux + + def install + system "make" + system "make", "prefix=#{prefix}", "install" + end + + test do + (testpath/"test.c").write <<~EOS + #include + + int main(int argc, char *argv[]) + { + struct io_event *event; + } + EOS + + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-laio", "-o", "test" + system "./test" + end +end diff --git a/Formula/libantlr3c.rb b/Formula/libantlr3c.rb index 01eb87b9d76e5..6568a0274a9e1 100644 --- a/Formula/libantlr3c.rb +++ b/Formula/libantlr3c.rb @@ -14,6 +14,7 @@ class Libantlr3c < Formula sha256 "fea1cde8ae732cdbbffa6a6d329239b1da067d2b69424d53178e60309748c403" => :el_capitan sha256 "8026d876b20980138c076cb4008f358deb858204b6399c436cf45e93594274e7" => :yosemite sha256 "010c3866a3c183b10dec76f845ce826a26a5a384074f8c56f41abeb9e4aa6e77" => :mavericks + sha256 "7ba5de8cbd399bd3a171def488f92250be15a62ca21c12133d5c1645b3d02487" => :x86_64_linux end def install diff --git a/Formula/libao.rb b/Formula/libao.rb index edb967fc9e6eb..92c99f74a6f00 100644 --- a/Formula/libao.rb +++ b/Formula/libao.rb @@ -10,6 +10,7 @@ class Libao < Formula sha256 "703bfcae17a364ad0e526d5556b3583d1864c6db4c52ba85ef64dc0600039372" => :catalina sha256 "932b3a41565e678489471dae66b29fea1ca2de6013c2559f9c34cc5e9bd5a33f" => :mojave sha256 "d7144edd6dc64b987d9a9d584799fe20a76ed92f2b1b18c074a6846926f23169" => :high_sierra + sha256 "15cc75f026413a6866aab48694f9f72eaa751247a934a950d3624213f09644f3" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libarchive.rb b/Formula/libarchive.rb index eb2e7d4e697cd..35e2a46ebf99b 100644 --- a/Formula/libarchive.rb +++ b/Formula/libarchive.rb @@ -9,6 +9,7 @@ class Libarchive < Formula sha256 "ec29541614dd1acd7189e69c6e6a689f959d25e1fb52acf06e52b9a4c38166c4" => :catalina sha256 "5cdfab0da88b4a1141cd2f512ad2815f69191bf7d9adc49e0cb9c814af286688" => :mojave sha256 "df697f70e6100533afeffb949ec2c22c7fcdf23821a2a76c460977cecfbb01b8" => :high_sierra + sha256 "1c9c48916e68f22bd8fedeae6e97fddb290c3b7f9ab83c1634e390cb494fa05f" => :x86_64_linux end keg_only :provided_by_macos @@ -33,11 +34,13 @@ def install system "make", "install" - # Just as apple does it. - ln_s bin/"bsdtar", bin/"tar" - ln_s bin/"bsdcpio", bin/"cpio" - ln_s man1/"bsdtar.1", man1/"tar.1" - ln_s man1/"bsdcpio.1", man1/"cpio.1" + if OS.mac? + # Just as apple does it. + ln_s bin/"bsdtar", bin/"tar" + ln_s bin/"bsdcpio", bin/"cpio" + ln_s man1/"bsdtar.1", man1/"tar.1" + ln_s man1/"bsdcpio.1", man1/"cpio.1" + end end test do diff --git a/Formula/libart.rb b/Formula/libart.rb index 1d456392a6376..da158a51eaa0a 100644 --- a/Formula/libart.rb +++ b/Formula/libart.rb @@ -13,6 +13,7 @@ class Libart < Formula sha256 "18fb7a842650151fef102efadefa52aa12dc3f597ace95b8e25efe6518a65d2e" => :el_capitan sha256 "006a9bf5e40ea99cdb4a10b7a2a2ac6a249f511254be1954a937dac0e50a6f0d" => :yosemite sha256 "276eafd432499ab988a21d9e87104d744e82cf1adf4cc55d47639b1f72ab410a" => :mavericks + sha256 "9cb8b40710f91708ee63c5efe4465b126eaa44bd6b12208d0889a13e9d08d639" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/libass.rb b/Formula/libass.rb index 55e2d6d6dc4a5..830893ff9ebb6 100644 --- a/Formula/libass.rb +++ b/Formula/libass.rb @@ -12,6 +12,7 @@ class Libass < Formula sha256 "adf25e0a4a61f098662952861b1103493f2be98a14975b1cdd27c8aab3a9603a" => :mojave sha256 "d3a3e4c2ff26d2a10991134bca875ecafcff6bc8abb193f3c78cb8c0cd57c779" => :high_sierra sha256 "028e53840dcad7fa8291fddacd46be8276578a3fa8c058b04975cf56a802101d" => :sierra + sha256 "f31a3d420ea6118617e53a152f38d0a99f73fed0cef274a35b7948e3818ff8a0" => :x86_64_linux end head do @@ -27,6 +28,7 @@ class Libass < Formula depends_on "freetype" depends_on "fribidi" depends_on "harfbuzz" + depends_on "fontconfig" unless OS.mac? on_linux do depends_on "fontconfig" @@ -36,7 +38,7 @@ def install system "autoreconf", "-i" if build.head? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", - "--disable-fontconfig" + *("--disable-fontconfig" if OS.mac?) system "make", "install" end diff --git a/Formula/libassuan.rb b/Formula/libassuan.rb index 2197d9bf10eeb..fbb998ee73d5a 100644 --- a/Formula/libassuan.rb +++ b/Formula/libassuan.rb @@ -11,6 +11,7 @@ class Libassuan < Formula sha256 "58154be6004de3e0f731f7b3d7e46060b1f2af831ba81cc15c8b4d8a87dda784" => :mojave sha256 "e6f59decc3a0dbabee93e47facd44fde55397865ced49a7c9a2974e49a38ea3e" => :high_sierra sha256 "ce29b5468c93eeb9a03ee82272aa89695579c275d00044e21043086a57dd93ec" => :sierra + sha256 "980bdab015d384c13bd109ea3bcb8a70fe3f948222db56d8d33ba5bea52c7657" => :x86_64_linux end depends_on "libgpg-error" diff --git a/Formula/libatomic_ops.rb b/Formula/libatomic_ops.rb index 062ef22e14352..3b4549e96de51 100644 --- a/Formula/libatomic_ops.rb +++ b/Formula/libatomic_ops.rb @@ -10,6 +10,7 @@ class LibatomicOps < Formula sha256 "b509d8669c5336775b0462c3e1464419d083bccc0bf43f8dab8fa3eb0ac44405" => :mojave sha256 "2e3053c22101fd8baf693ca404f258763b15e77372b5293e999f8bbc8b032522" => :high_sierra sha256 "d94aa0351ce2de312d0b31a64d48059473a170d9704968378cf121ad097d7d9b" => :sierra + sha256 "c859961b36b3330e7fa803c6f2c43449e41d024bbfb35cd4026404ccb7c4e44c" => :x86_64_linux end def install diff --git a/Formula/libb2.rb b/Formula/libb2.rb index a0e9bba83ca06..e4c337f40914c 100644 --- a/Formula/libb2.rb +++ b/Formula/libb2.rb @@ -10,6 +10,7 @@ class Libb2 < Formula sha256 "bbd333a0a89e6a38445aba0170b14b516edad300c30d6f4239b66a130c446959" => :mojave sha256 "6e9156db268cea377f7050c4e9ebf1ee3065fef76a11c40e03e700a23b1bef36" => :high_sierra sha256 "9b909b878c01b5bb3284ba4d0937352e0df54b27e491fa796dfb6d3e67f989a1" => :sierra + sha256 "e2d6059aed6d1739ef1e8e24a6cd21cbd02a2aaa651ba4261d333feef474d30f" => :x86_64_linux end def install diff --git a/Formula/libb64.rb b/Formula/libb64.rb index 3c32769044bc8..5a05e49acf9b8 100644 --- a/Formula/libb64.rb +++ b/Formula/libb64.rb @@ -9,6 +9,7 @@ class Libb64 < Formula sha256 "ee788cea9a073c456398f86661ea27e092c3d327ea8b0792643ed7d38bd402d0" => :catalina sha256 "7a53661bc0fe2bea875f0a14cc66b6352694f1e797e4506ad2c8ef35dfcc2169" => :mojave sha256 "3b5266e99b78c81ae7ec00c19aa7e9d3fad7f47611fc1332710bd8e03f48da55" => :high_sierra + sha256 "cc45ac83cf14a2508543bdb66e5beaba8df7d12cf6ef16e9c0897a9d879a9104" => :x86_64_linux end def install diff --git a/Formula/libbi.rb b/Formula/libbi.rb index 1f118636747be..f442f46c36595 100644 --- a/Formula/libbi.rb +++ b/Formula/libbi.rb @@ -11,6 +11,7 @@ class Libbi < Formula sha256 "8a5e07818b7ab072b4ce227a8e9c6fbfe0a944376fe0e7ae718757f552daf6cb" => :catalina sha256 "1ccf102c4139efb50411136b936637ca4f353c64660f945044c4056dfaabec5e" => :mojave sha256 "b0336adbd5aa3122599d729ad9472ec368d74d2a891ce0aee0348e4c5768c162" => :high_sierra + sha256 "e0b4cbe8d0490c2c376f215434bb24290ad173b1744155741db6200ec1e249fc" => :x86_64_linux end depends_on "automake" diff --git a/Formula/libbluray.rb b/Formula/libbluray.rb index 6325c6436c679..1aba63739d263 100644 --- a/Formula/libbluray.rb +++ b/Formula/libbluray.rb @@ -9,6 +9,7 @@ class Libbluray < Formula sha256 "ed5b295ee0b40b5c36ca2ceb289c106007f8fe9d475727288b61ea4dd5315bde" => :catalina sha256 "bde7b947d717e7da2367bb3b38ab79eab3843cf3c109603d7fb0c84993872164" => :mojave sha256 "a8a20bb4274ca8844ee7dc9ef27df6660dfe9cc180f85bbaebe11f1cc4edd053" => :high_sierra + sha256 "914d14899234a3521dba43dfd67565acd626588794c924d694ad8a80f4ba68b3" => :x86_64_linux end head do @@ -20,7 +21,11 @@ class Libbluray < Formula end depends_on "ant" => :build - depends_on :java => ["1.8", :build] + if OS.mac? + depends_on :java => ["1.8", :build] + else + depends_on :java + end depends_on "pkg-config" => :build depends_on "fontconfig" depends_on "freetype" @@ -28,12 +33,17 @@ class Libbluray < Formula uses_from_macos "libxml2" def install - # Need to set JAVA_HOME manually since ant overrides 1.8 with 1.8+ - cmd = Language::Java.java_home_cmd("1.8") - ENV["JAVA_HOME"] = Utils.safe_popen_read(cmd).chomp + if OS.mac? + # Need to set JAVA_HOME manually since ant overrides 1.8 with 1.8+ + # Need to set JAVA_HOME manually since ant overrides 1.8 with 1.8+ + cmd = Language::Java.java_home_cmd("1.8") + ENV["JAVA_HOME"] = Utils.safe_popen_read(cmd).chomp - # https://mailman.videolan.org/pipermail/libbluray-devel/2014-April/001401.html - ENV.append_to_cflags "-D_DARWIN_C_SOURCE" + # https://mailman.videolan.org/pipermail/libbluray-devel/2014-April/001401.html + ENV.append_to_cflags "-D_DARWIN_C_SOURCE" + else + ENV["JAVA_HOME"] = Formula["adoptopenjdk"].opt_prefix + end # Work around Xcode 11 clang bug # https://code.videolan.org/videolan/libbluray/issues/20 diff --git a/Formula/libbs2b.rb b/Formula/libbs2b.rb index 7c156228d0bd2..d58a10da79e94 100644 --- a/Formula/libbs2b.rb +++ b/Formula/libbs2b.rb @@ -14,6 +14,7 @@ class Libbs2b < Formula sha256 "7949aa7768466a789d992d079a63d5933d19e76ebfb330b38d3b4822929a71ac" => :el_capitan sha256 "62a45fde4ae7db34b1c14212d2c0ec5c603fdc403dc1df2b629972789dc7489e" => :yosemite sha256 "7cf43c31d5aee33a241af345c4b8a05fc73f48afc8b9f37d5ad9c4fa22d6920e" => :mavericks + sha256 "95e8e8fe98ab149b36214ddeb923258fe9ac13ef3a6367d9a55d9b13165424a4" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libbsd.rb b/Formula/libbsd.rb new file mode 100644 index 0000000000000..fdae81921af0b --- /dev/null +++ b/Formula/libbsd.rb @@ -0,0 +1,26 @@ +class Libbsd < Formula + desc "Utility functions from BSD systems" + homepage "https://libbsd.freedesktop.org/" + url "https://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz" + sha256 "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" + + bottle do + cellar :any_skip_relocation + sha256 "68ac94cf2b7530dcb4b678402d37d7fce907cd628821d5b7549b644146947951" => :x86_64_linux + end + + depends_on :linux + + def install + system "./configure", + "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + assert_match "strtonum", shell_output("nm #{lib/"libbsd.so"}") + end +end diff --git a/Formula/libcaca.rb b/Formula/libcaca.rb index 8ce36398850ce..21ffad6a805b9 100644 --- a/Formula/libcaca.rb +++ b/Formula/libcaca.rb @@ -13,6 +13,7 @@ class Libcaca < Formula sha256 "bd3e0ddf184652575170248e9a3b1b4a8c03ac21913cfcac8016baa9d39386fa" => :catalina sha256 "5da241ff15fcb9b6ad7625b223cbda3b4e4aa5e449677f44c2512cec892485cd" => :mojave sha256 "804a53d45e6db70f211f7b0eebcd9a84d61784a891268889d55b81135e9621a5" => :high_sierra + sha256 "068873ed4f4cdf7a00787e41869ad63c1faa2bf6cdf5e3eea66085dea96d84ee" => :x86_64_linux end head do diff --git a/Formula/libcap-ng.rb b/Formula/libcap-ng.rb new file mode 100644 index 0000000000000..15ae3b3652783 --- /dev/null +++ b/Formula/libcap-ng.rb @@ -0,0 +1,51 @@ +class LibcapNg < Formula + desc "Library for Linux that makes using posix capabilities easy" + homepage "https://people.redhat.com/sgrubb/libcap-ng" + url "https://github.com/stevegrubb/libcap-ng/archive/v0.7.10.tar.gz" + sha256 "c3c156a215e5be5430b2f3b8717bbd1afdabe458b6068a8d163e71cefe98fc32" + + bottle do + cellar :any_skip_relocation + sha256 "6edc4b31731eb8dc4a4b09f8cf4042857e23c233181eb42c6f9a3fae186599df" => :x86_64_linux + end + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + depends_on "m4" => :build + depends_on "python" => :build + depends_on "swig" => :build + depends_on :linux + + # undefined reference to `pthread_atfork' + # https://github.com/stevegrubb/libcap-ng/pull/10 + patch do + url "https://github.com/stevegrubb/libcap-ng/commit/b4e3cb9cb74aa5d33ad21a988a1463d75b159b77.patch?full_index=1" + sha256 "d414dd225d069a86f34313619eeabf287c6b153d97c4a6554b5840c1ccdbebc1" + end + + def install + system "./autogen.sh" + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}", + "--with-python3" + system "make", "install" + end + + test do + (testpath/"test.c").write <<~EOS + #include + #include + + int main(int argc, char *argv[]) + { + if(capng_have_permitted_capabilities() > -1) + printf("ok"); + } + EOS + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lcap-ng", "-o", "test" + assert_equal "ok", `./test` + end +end diff --git a/Formula/libcap.rb b/Formula/libcap.rb new file mode 100644 index 0000000000000..3dcc4aebd8240 --- /dev/null +++ b/Formula/libcap.rb @@ -0,0 +1,21 @@ +class Libcap < Formula + desc "User-space interfaces to POSIX 1003.1e capabilities" + homepage "https://sites.google.com/site/fullycapable/" + url "https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.27.tar.xz" + sha256 "dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a" + + bottle do + cellar :any_skip_relocation + sha256 "ceb5ceec04cc07d29ac5c2d8a37db74a491d5177ef92c4e1c172b9eb2a6dc6e4" => :x86_64_linux + end + + depends_on :linux + + def install + system "make", "install", "prefix=#{prefix}", "lib=lib", "RAISE_SETFCAP=no" + end + + test do + assert_match "usage", shell_output("#{sbin}/getcap 2>&1", 1) + end +end diff --git a/Formula/libcbor.rb b/Formula/libcbor.rb index 0ff1254be2f7f..f6373f1649f3b 100644 --- a/Formula/libcbor.rb +++ b/Formula/libcbor.rb @@ -9,6 +9,7 @@ class Libcbor < Formula sha256 "592a8fe5ad2efd8111f016631ab251162e821e2a1560e42cd6285d60525b3813" => :catalina sha256 "104f1676b69dbcbbedb00c9059d1b08cf05f9003379fee323b9fba7728bb51fa" => :mojave sha256 "7f6b69a84c6c7ec111e7c0a8c2d086e5933a44268d1af20c5dd28eb5af60eccc" => :high_sierra + sha256 "9b4bc53dd064b2e362ff0d38c32f4e7b1c655ccdee79450a6848116bf1b2fae5" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libccd.rb b/Formula/libccd.rb index 7f77dfa961f78..e3be7d1928cc3 100644 --- a/Formula/libccd.rb +++ b/Formula/libccd.rb @@ -10,6 +10,7 @@ class Libccd < Formula sha256 "05c8005ed028e5d5ca250aba9f3c69ece3af5766d91c68fa50fbcf78d139849d" => :mojave sha256 "3b0a74f46d98cc57ddbff8c4f37227e8c5f528905037f346bf17104ba17b71f7" => :high_sierra sha256 "63e2b6149dea77e8ece7a88f7f5f941d9606e9843bc46e4a48853858f6b4a7b3" => :sierra + sha256 "bb2a89f4099f351812d5d06e65dceb2b85b4da0bbb1d349e05d7151c67b5993b" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libcddb.rb b/Formula/libcddb.rb index e6eb991167d31..490364c6af940 100644 --- a/Formula/libcddb.rb +++ b/Formula/libcddb.rb @@ -11,6 +11,7 @@ class Libcddb < Formula sha256 "7f1c41ce153e0550edac0073eeaf3a82d430fdd6b8e1c6d766459f81905b5b1e" => :catalina sha256 "4a54605d856a52362d5b3a76a20872c72df138dca4b19595ffbdd6bc44e210be" => :mojave sha256 "fcb848ca3b114f197ca52850d56a63b298fad61b9ee968496ddc450d969c3078" => :high_sierra + sha256 "c154e405e19e00e922da2c1f948cab0cfe89864fa83ecb29bbec177d4c44b409" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libcdio.rb b/Formula/libcdio.rb index c54354353b99c..c685b4021d65b 100644 --- a/Formula/libcdio.rb +++ b/Formula/libcdio.rb @@ -11,6 +11,7 @@ class Libcdio < Formula sha256 "55014a60373e44384aa7f797c613ccd5289c55d759c3521b7e5d6819ff54b2ac" => :mojave sha256 "32604fb219cc4e59e5eb1e0937b320edfacf31d97f04b9a5fbfcd4354a6a56d0" => :high_sierra sha256 "61095f7c4888b1c0e022ec9eb314fe389feae1eb030d65e7d91512515528e439" => :sierra + sha256 "76d8745c01ede5a4a11defd9001cf0d268c28c1f33fadef562a0a21679ee3586" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libcds.rb b/Formula/libcds.rb index 380a22ec53bde..1997d98ef7ac5 100644 --- a/Formula/libcds.rb +++ b/Formula/libcds.rb @@ -10,6 +10,7 @@ class Libcds < Formula sha256 "ed2baad62fe26da2891255221ee90a8d69f84214431dce923dd7c55aafa39668" => :mojave sha256 "9723b22f7a6e84ef208226241ed3b19dd02b4c9aed9c01284f55bd9b825e216e" => :high_sierra sha256 "fdc30046c9f96c04d7c52d43e948d2e238fb93eee5514101a0dd0ca4de3f2b32" => :sierra + sha256 "b5a0a5736b8e861007eafef586e64429d476593bf7d7336fde6918fc1c27e689" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libcec.rb b/Formula/libcec.rb index 5998569586bff..d8787a78dd1f3 100644 --- a/Formula/libcec.rb +++ b/Formula/libcec.rb @@ -9,10 +9,13 @@ class Libcec < Formula sha256 "fcca0daf72607150ca1468ec90312807c74ebf75971f394e5db86a08f1f36d61" => :catalina sha256 "92da05c25aaaa1af81909bbfda5455622dae620d2dcff095600597a06547c8f5" => :mojave sha256 "5b4d87d43f65d172f737fd8d88e2a0b6f5e1220109dc5745ca5daacb5aeee0ba" => :high_sierra + sha256 "3a63b53a119bcf9f1ab6b8390336d9eabcd14fc4a6951e0fe2f54e93124b3cf9" => :x86_64_linux end depends_on "cmake" => :build + uses_from_macos "ncurses" + resource "p8-platform" do url "https://github.com/Pulse-Eight/platform/archive/p8-platform-2.1.0.1.tar.gz" sha256 "064f8d2c358895c7e0bea9ae956f8d46f3f057772cb97f2743a11d478a0f68a0" diff --git a/Formula/libcello.rb b/Formula/libcello.rb index 85492c02150e1..1e9c5d0803ede 100644 --- a/Formula/libcello.rb +++ b/Formula/libcello.rb @@ -12,6 +12,7 @@ class Libcello < Formula sha256 "1c7719b74c5507dfd84ec93c043c11a4113e13a66f06e9d6f32349ec83042ad2" => :high_sierra sha256 "561319859455b756f53013090f91d6b06b1093c00d59593519ec09210f6bf830" => :sierra sha256 "05384667bb4d98a603406b3bc35962651af06d44eb55f2080c80f8dd979a9d80" => :el_capitan + sha256 "a8b12cdaff11555d7c0ac7930f9831e77d1fe556544121a601b3628ebff1b7c4" => :x86_64_linux end def install diff --git a/Formula/libcerf.rb b/Formula/libcerf.rb index 09a7bddf494c8..f026f06b0dcf8 100644 --- a/Formula/libcerf.rb +++ b/Formula/libcerf.rb @@ -11,6 +11,7 @@ class Libcerf < Formula sha256 "a181d4bf63f5ad9a5f00268a8551e7d62c52e81a88b9e9a29dba148d1a16412f" => :mojave sha256 "48ac5501edc4e90465af39ae8ff57234993f5b9b9f4b08fd8ba00443fd5d977b" => :high_sierra sha256 "401e716456c99bb123252b2f256e6fc70d6a741a23c8bd16d1a2ae0998641387" => :sierra + sha256 "c926dd1b6d89cae7cb28c414d35abe44cd823d7f497dcfbbc4e471a5bfde5c00" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libcmph.rb b/Formula/libcmph.rb index 8d1ba2b7f3e48..fc5a3e58c1730 100644 --- a/Formula/libcmph.rb +++ b/Formula/libcmph.rb @@ -14,6 +14,7 @@ class Libcmph < Formula sha256 "583c5008fe59058f8bd9166660462acfb583feee646472d546587e3e326059cb" => :el_capitan sha256 "4dba37edbd9ec4f32fcb911cbec5cbd457001c3f6a26f14a3ff88a412a42f017" => :yosemite sha256 "ba56f5d7f7c750329312dbf4d43d5d937320082ab32fe35ec84b05aecff125ee" => :mavericks + sha256 "cbfdbc78698af937754a02521783c69b18621a79a1978fd80686dce1d4e267b1" => :x86_64_linux end def install diff --git a/Formula/libcoap.rb b/Formula/libcoap.rb index bb8857a5fef01..3db64eff2a2c2 100644 --- a/Formula/libcoap.rb +++ b/Formula/libcoap.rb @@ -9,6 +9,7 @@ class Libcoap < Formula sha256 "344f2a098d9f1767d50135fbf4ae3bdf893a079ebf8a54f248811673fa437e39" => :catalina sha256 "012f1efcb1655479c531df4db98eb481d83971751edffb99b4ca8c50592cd27c" => :mojave sha256 "a68df19a4ca87c677173c14b534848592bb35e46a715ca066bcd114f8c735236" => :high_sierra + sha256 "c2f79a6135c82ee4d4a3438308dd0283ef945cc84349a7e40178757231ec6cc6" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libconfig.rb b/Formula/libconfig.rb index debe4b2dc988c..400509af9b345 100644 --- a/Formula/libconfig.rb +++ b/Formula/libconfig.rb @@ -11,12 +11,16 @@ class Libconfig < Formula sha256 "5133affbfe2df2eccf05017748542e521e70a8db8763c8d8e39e00aec78fe3f8" => :catalina sha256 "b1c005fc0d3a811efcef915d8e84d9cc2828d6c35c5649f71fab3c714b2ae1ea" => :mojave sha256 "5762b7106a3e4ecc470193cd8abcfd40de090c456d42b413e545402246d73f69" => :high_sierra + sha256 "ba42db3b1ba5f0638460c4b6218532ba17d0e34dd0c144554a399aa924aad3a8" => :x86_64_linux end depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build + uses_from_macos "flex" => :build + uses_from_macos "texinfo" => :build + def install system "autoreconf", "-fiv" system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" @@ -33,8 +37,8 @@ def install return 0; } EOS - system ENV.cc, "-I#{include}", "-L#{lib}", "-lconfig", - testpath/"test.c", "-o", testpath/"test" + system ENV.cc, "-I#{include}", "-L#{lib}", + testpath/"test.c", "-lconfig", "-o", testpath/"test" system "./test" end end diff --git a/Formula/libcouchbase.rb b/Formula/libcouchbase.rb index fd214dfacb5dd..78eb575c11939 100644 --- a/Formula/libcouchbase.rb +++ b/Formula/libcouchbase.rb @@ -9,6 +9,7 @@ class Libcouchbase < Formula sha256 "715d52f1da3bf6a1a14057170bb41aacd2469a98fb86bb8c75df0966ddb3c42a" => :catalina sha256 "fdb0245134a07c6db0ab52ccd731f9b878e8f6ad332276fe2b2dcb7e33246952" => :mojave sha256 "7dd7315f91680dc57b0306011f4b89672856992896764e02273ce303430fb237" => :high_sierra + sha256 "35eef2526252edc413ba6a12050374b1047f1df4b12973013e80ab365ceddf98" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libcroco.rb b/Formula/libcroco.rb index fceaa64afe6f0..2e2fd7a5a0dd0 100644 --- a/Formula/libcroco.rb +++ b/Formula/libcroco.rb @@ -11,6 +11,7 @@ class Libcroco < Formula sha256 "edf97f493296bfe01b2a8cfe156f1e8052e181bed6ea34cabaf18ed59ef28b17" => :mojave sha256 "f6e7d7d608dfcf6e57eaad77eef3cca27c15db0746e102f6dc33cccdd5a8a7bc" => :high_sierra sha256 "a95e3733bd72b789cc9a3cb9dfc9a92153939b984c4d1d47b8aa806e99e99552" => :sierra + sha256 "41fe29bcc2ada0f0d6812b61f2ab2c3b21f20b16992f81082a65d496e89cd6cd" => :x86_64_linux end depends_on "intltool" => :build diff --git a/Formula/libcsv.rb b/Formula/libcsv.rb index 750d337dba608..b00bb208d6ec2 100644 --- a/Formula/libcsv.rb +++ b/Formula/libcsv.rb @@ -14,6 +14,7 @@ class Libcsv < Formula sha256 "3f69bb369fafd5c207f1c8ea500dc1e725e8e7dfe005215ff14b61fc25ac28e6" => :el_capitan sha256 "ace67ec808ae6963525164b700ace39c8552f0c68364415401fea532f3ea2fe2" => :yosemite sha256 "7c32b16f3528f615214dcca0633995ec01a70ff4db8badd09cbcc3a884fe64fc" => :mavericks + sha256 "95782c6108e6ae72034a0cf79216685123f3d285f1afcdd2dbc9c42d39403749" => :x86_64_linux end def install diff --git a/Formula/libcue.rb b/Formula/libcue.rb index ba2040be0843f..8c9130e3d1312 100644 --- a/Formula/libcue.rb +++ b/Formula/libcue.rb @@ -11,6 +11,7 @@ class Libcue < Formula sha256 "209e548399503830e0f786c6faef21836aa350d67db644b9ad291703ebe2e9c5" => :high_sierra sha256 "14a6edb39d2887ad6beeb34dad944501d01f70480a529cb7e50d838833404f4f" => :sierra sha256 "27f8ab5419958ea5817e5e44b68f24ea2a0c27d12a664556b12f6789866d0da5" => :el_capitan + sha256 "c06e978e72a9220195abe2ee63b3b5caca3b7d23fa90565b6277b0c24dc41775" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libcuefile.rb b/Formula/libcuefile.rb index 113af75a34c41..4c3cef92681ea 100644 --- a/Formula/libcuefile.rb +++ b/Formula/libcuefile.rb @@ -15,6 +15,7 @@ class Libcuefile < Formula sha256 "fc48e0953e3df489f37ee30214bd50b07020955b02f957a90c699474f09ef974" => :el_capitan sha256 "427a043ee4dc777743c80a836c5fa69c4de91ea2510f740db099224f95ed38b4" => :yosemite sha256 "b3336424f211dfdd684537b4674afbe32e86179d9cf36dd3c07c3cb0e624cbb8" => :mavericks + sha256 "e94f00b695fde97d790ff4a9743cfaae875893a83c664af983ebc40a160cbc1f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libdaemon.rb b/Formula/libdaemon.rb index 1f9289158dd25..74b3f12197346 100644 --- a/Formula/libdaemon.rb +++ b/Formula/libdaemon.rb @@ -5,11 +5,12 @@ class Libdaemon < Formula sha256 "fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834" bottle do - cellar :any + cellar :any_skip_relocation rebuild 2 sha256 "ad96f0b0e09c3e0c178d3e903659d65ae34fea18365197924a4911c291d02531" => :catalina sha256 "1fe52d810eca4471b4d285de02a09ea9e4b78d762f1a2a292d6da1eb10e9626d" => :mojave sha256 "0933bb1dde0237f4079fefcd228ea644be36fbf814aa96762ebbae3537886558" => :high_sierra + sha256 "26283261454649e12e8060adcfe6e4e4d80d6c65d6ecfc4a6b0c706bfc65f0d2" => :x86_64_linux end def install diff --git a/Formula/libdap.rb b/Formula/libdap.rb index 86cec1926cc41..d33ccc5bd5d02 100644 --- a/Formula/libdap.rb +++ b/Formula/libdap.rb @@ -8,6 +8,7 @@ class Libdap < Formula sha256 "6a0bbd25fd0b5e873d34a46045c6ba72161007b9937d7957790bfc16bf5b05c3" => :catalina sha256 "ce373bf6fbe4f5b28825fcf243633ae7a807d35b1627e985cc231bc722010793" => :mojave sha256 "fbaa33ce89105a9cab0a7d8b22755524a93f39fb2a8e6d3c5a0459c2ded3bdf5" => :high_sierra + sha256 "45a4a00eb02faf6335cebd5d726d72c5ea9e5a75ef3843ab6b6101b33ce0c010" => :x86_64_linux end head do @@ -18,6 +19,9 @@ class Libdap < Formula depends_on "libtool" => :build end + # error: 'max_align_t' has a previous declaration when using gcc 4.8 + fails_with :gcc => "4.8" unless OS.mac? + depends_on "bison" => :build depends_on "pkg-config" => :build depends_on "libxml2" diff --git a/Formula/libdazzle.rb b/Formula/libdazzle.rb index 53af3bed74961..c65eef8c2307e 100644 --- a/Formula/libdazzle.rb +++ b/Formula/libdazzle.rb @@ -6,7 +6,6 @@ class Libdazzle < Formula revision 2 bottle do - cellar :any sha256 "c5ef0fe994d0c84792d0d6eb1e55152b0aab5de0f26b1fb1a264a78dcafcc7da" => :catalina sha256 "9ea4201e473688716ec21feb50eb76e6dc4fad93a5d93de78bb9b3978ab0998b" => :mojave sha256 "8a595bba2bb9ae664b6a784e74b73d7d6b8538f9929384203149612c98c0ef0b" => :high_sierra @@ -91,12 +90,14 @@ def install -lglib-2.0 -lgobject-2.0 -lgtk-3 - -lintl -lpango-1.0 -lpangocairo-1.0 - -Wl,-framework - -Wl,CoreFoundation ] + if OS.mac? + flags << "-lintl" + flags << "-Wl,-framework" + flags << "-Wl,CoreFoundation" + end system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libdbi.rb b/Formula/libdbi.rb index 85aac50877e32..9863252eba949 100644 --- a/Formula/libdbi.rb +++ b/Formula/libdbi.rb @@ -5,11 +5,12 @@ class Libdbi < Formula sha256 "dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503" bottle do - cellar :any + cellar :any_skip_relocation rebuild 1 sha256 "ce66e90000681c5f9174c3698ac4ceefd5d1be6ca4ffa574053f0705217c6837" => :catalina sha256 "3aff10515535dc3f99dfa56644229daba74f719838d3e580754b3bbdc3c0429d" => :mojave sha256 "eb3d8474601267d835b74b5a29944dc6d987486745dcfd17389be3a44b2c0175" => :high_sierra + sha256 "bf81a3dfe0450e286917c856af5b630e5e02983f0d59d466316806c87523c500" => :x86_64_linux end def install diff --git a/Formula/libdc1394.rb b/Formula/libdc1394.rb index 06984ed6cc691..4f1d20606e87e 100644 --- a/Formula/libdc1394.rb +++ b/Formula/libdc1394.rb @@ -21,6 +21,7 @@ class Libdc1394 < Formula sha256 "6cf02c5500f83fa2ccd1ff9b880f44f9652d68b0e90a2345d6c62fb92a988f0a" => :mojave sha256 "536cbd34a43886d63a3dba41e7877ed63ad0fbe1a5e21cde499bd2c9e1e37e52" => :high_sierra sha256 "ff1d7c6b07f21d8cd485574b10091eb21c2316390a7d4cfa84d29cccce8097e6" => :sierra + sha256 "23d63fc6cb173b5a3028d1a94a62db68f3c0eac53bbd707ff4419e96abc12937" => :x86_64_linux end head do diff --git a/Formula/libdca.rb b/Formula/libdca.rb index 8b2f62dec0cf5..9e34a62ca8344 100644 --- a/Formula/libdca.rb +++ b/Formula/libdca.rb @@ -9,6 +9,7 @@ class Libdca < Formula sha256 "d9c4b3a350744867f5782db738d25d1212b9be89449030492083364574f914d7" => :catalina sha256 "594d6b26eb3ca16c3046ff2792de4f78a0f038dc94b1972c8827e86331a46fde" => :mojave sha256 "f8ba469ce443efa0e9fc87b51a87c6b4d510bd3e7bb91ae11d1f91e99f760acc" => :high_sierra + sha256 "1f2d4aca102b49593d3ba3c31794f44e25e2b1d03686d4bf9d38f39fc3784436" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libde265.rb b/Formula/libde265.rb index 205fcc2dbe27b..4d46188c99300 100644 --- a/Formula/libde265.rb +++ b/Formula/libde265.rb @@ -9,6 +9,7 @@ class Libde265 < Formula sha256 "7621e45fa0b119aff03a8c3ff3ed94bec24a2844a28cc10603b96e531afc3dab" => :catalina sha256 "f0b536c23ac8080dd7946dd3bcbe2517f4a9b7e50b815e1ba745277c9982e6ac" => :mojave sha256 "9815c937712d61876a1cb61241b60164f65cf463d6594d46857f691d37775882" => :high_sierra + sha256 "930c577e3bb884acadab49da0518ad1ab40a74c0ac931e00f2bc71b3c3eb2c7d" => :x86_64_linux end def install diff --git a/Formula/libdeflate.rb b/Formula/libdeflate.rb index ac4a7ec86d0e9..30d6880e7cefe 100644 --- a/Formula/libdeflate.rb +++ b/Formula/libdeflate.rb @@ -9,6 +9,7 @@ class Libdeflate < Formula sha256 "212aed6ec63f047e554de8f3214d7af20bff375032c8702df6f8964a568b072a" => :catalina sha256 "6ac658a25367a45ad9d5a28a98e0f4fd80fd8a40fba01b2655a177a0b6ceafbc" => :mojave sha256 "e61e6da245814b3964750d5db14567c85ed51421ea36e43aeee81906fd04a4d3" => :high_sierra + sha256 "4053b4d81a7f24416d83e11aaf93888acce600c6263c4f31e5132af69c7fae77" => :x86_64_linux end def install diff --git a/Formula/libdill.rb b/Formula/libdill.rb index 591f424268b1c..ed6dc0d9726d7 100644 --- a/Formula/libdill.rb +++ b/Formula/libdill.rb @@ -10,6 +10,7 @@ class Libdill < Formula sha256 "7ebbbe85ab5989b48664688c9fdc833b4bbc7846ea94f3f73c34ef620026b878" => :mojave sha256 "062d2f9f6fdeb5588036d3e06752ecfd95b5f4e7b6008b727208fc0a2e7f50a6" => :high_sierra sha256 "6f75a82c15eafe6818b0d79e9c55df0654c6665f37841ee21cf7fb90ac578a92" => :sierra + sha256 "ad2457adaad8bcf7acd7b995a204a7bf71aacc6af26e1e455cae78692279bd9f" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libdiscid.rb b/Formula/libdiscid.rb index 25347dda2f4c9..79bf14ad91514 100644 --- a/Formula/libdiscid.rb +++ b/Formula/libdiscid.rb @@ -11,6 +11,7 @@ class Libdiscid < Formula sha256 "3ffb586f09efcd9322a28bafc671292d0caf38edc18326c048a7390ced94979f" => :high_sierra sha256 "6d43fee98239a6a600e59cce0f4f2ceda713bf27cc3d03bc8711d1c773ba84b6" => :sierra sha256 "22e96d837cfe404cf268c41f6ce26c6b47eb8a991578ce1f18bcea862f9f1c91" => :el_capitan + sha256 "10a975d25cac0c3c8e9f4d035b2086471c458d7f4c858bde445e4a859954038e" => :x86_64_linux end def install diff --git a/Formula/libdivecomputer.rb b/Formula/libdivecomputer.rb index a30312fd189bc..6cdc188eb0d69 100644 --- a/Formula/libdivecomputer.rb +++ b/Formula/libdivecomputer.rb @@ -12,6 +12,7 @@ class Libdivecomputer < Formula sha256 "09dd65b72be93f3364b0b0da389fc4aa4d1fea2094ffe53275544e74ac6a7674" => :high_sierra sha256 "bbc60092aee1409bd0001e2f3cfdde47bb3d2348d3bf18f1fc6921920607f947" => :sierra sha256 "507134023caaaebd5b1689f324aea50839e13f57d180f7134ee270edc2b02cf6" => :el_capitan + sha256 "b8eac2045925aa3802083f90657336d6c2c4425e65ffd5ae9d0d11a45c64eb4a" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libdmtx.rb b/Formula/libdmtx.rb index 8a24f2421a1b4..3f6f074b33bc9 100644 --- a/Formula/libdmtx.rb +++ b/Formula/libdmtx.rb @@ -11,6 +11,7 @@ class Libdmtx < Formula sha256 "eb892feb7d29f9291a0edc2be6c34b4584614103d4af9d1c62eb54370decd8e1" => :high_sierra sha256 "c93913cd5aff29278c538957fd6890d990f760abaff1b14cea6f6f171194b706" => :sierra sha256 "ebcd82bf4d9da2a71bd066722ce6750d6cf064b1c8f477ba9aca47987acd330c" => :el_capitan + sha256 "399dc064ad8757be66a854f5c41c8bd3d1efad7d22adb7a83c1d44bcddb75b52" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libdnet.rb b/Formula/libdnet.rb index a9c72833ec483..a129afce791c6 100644 --- a/Formula/libdnet.rb +++ b/Formula/libdnet.rb @@ -11,6 +11,7 @@ class Libdnet < Formula sha256 "540ccb96d3647a0d71f563e06d08e410d14b7d09c23f6348bc91fd22251e5ff2" => :mojave sha256 "ece250e6792f542e5546ac5e8e5144fe07c76ce3ddb94216181e85092d530e81" => :high_sierra sha256 "bb550ef762ca5d65f87b65575758557afcf8e6b93855be32638cab265540ba6b" => :sierra + sha256 "0cf37dc7a772804f79245843b8e82ff009b24463d7b136b38d0ec0acc33ca005" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libdshconfig.rb b/Formula/libdshconfig.rb index fa6ab6a50744d..f8bf61d0c57e0 100644 --- a/Formula/libdshconfig.rb +++ b/Formula/libdshconfig.rb @@ -14,6 +14,7 @@ class Libdshconfig < Formula sha256 "a26ea1d1cefed24fd890bbc65f9a11d171cdbcb1c00936562255e2adfe29205f" => :el_capitan sha256 "7f4e5e77fc14d6920bd212e9c812c7dad51ad1dbe1542f1c0e4999928db9ad3f" => :yosemite sha256 "c1c35337d7b2bebb59d07a8f792493f1da89f2701eae58d382bb24edfd2c73d3" => :mavericks + sha256 "12664f8d34d9a2f5bcb33dc17b82d35a02a10d0b8ab5c6a201a288dbc59e96d7" => :x86_64_linux end def install diff --git a/Formula/libdv.rb b/Formula/libdv.rb index 6a78becac6885..5f6d33fdaa9e4 100644 --- a/Formula/libdv.rb +++ b/Formula/libdv.rb @@ -14,6 +14,7 @@ class Libdv < Formula sha256 "0624e82748111d0a8a050a802ec4251c443127c39c93b3b2469a00816a602040" => :el_capitan sha256 "49262f766082fa4c9a509236bdaf5eec8746a8c4b9724fc83521bfc5725660c7" => :yosemite sha256 "830002340f10dae43ba81d370bfbcd92a40f8b9330ed03fcb627b70983069a7b" => :mavericks + sha256 "71124d54e0811b7ce6ba63e694ccca0750bcce387f2a4749bf1efd599a8ac7df" => :x86_64_linux # glibc 2.19 end depends_on "popt" @@ -24,7 +25,7 @@ def install # https://trac.macports.org/browser/trunk/dports/multimedia/libdv/Portfile # This flag is the preferred method over what macports uses. # See the apple docs: https://cl.ly/2HeF bottom of the "Finding Imported Symbols" section - ENV.append "LDFLAGS", "-undefined dynamic_lookup" + ENV.append "LDFLAGS", "-undefined dynamic_lookup" if OS.mac? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", diff --git a/Formula/libdvbpsi.rb b/Formula/libdvbpsi.rb index d9e09a514ef92..ffac3d8e6382d 100644 --- a/Formula/libdvbpsi.rb +++ b/Formula/libdvbpsi.rb @@ -10,6 +10,7 @@ class Libdvbpsi < Formula sha256 "26298540d01f52628385c83cac4b6666543af4cc059fa7ad5b3a8bd458955628" => :mojave sha256 "c6d79686bf05346bc473cc148b68901d99ac447a85542ff68d089c71eda1bc87" => :high_sierra sha256 "8bb1f1fff61674756153e8aec744d5d3c726da0c4ecd4bd291cae732e8264af3" => :sierra + sha256 "01a3895cbf26835d8cfca2b52db90e1a0ee39efed1662481489e74399ccbad7b" => :x86_64_linux end def install diff --git a/Formula/libdvdcss.rb b/Formula/libdvdcss.rb index 6ae451f2d89af..9eb6a5aee8dc3 100644 --- a/Formula/libdvdcss.rb +++ b/Formula/libdvdcss.rb @@ -11,6 +11,7 @@ class Libdvdcss < Formula sha256 "4029db91ed7536435bd29db6b67f55509be13e70b6170337edec72daad8992c4" => :high_sierra sha256 "907d51957c4674ddeb27b458dcf5f1f4b382219bda893fc8908147acc1c2b1ea" => :sierra sha256 "0aaed21ecd3c8d3b4a9997300a599de5a541689ab200a6ffce52167b2ce5b664" => :el_capitan + sha256 "b6842616d5b1372ac4f0a22a70c37d1c740af0cc73886c0b96e93131f80977b8" => :x86_64_linux end head do diff --git a/Formula/libdvdnav.rb b/Formula/libdvdnav.rb index 259c28eb0c4d1..fe2631473227e 100644 --- a/Formula/libdvdnav.rb +++ b/Formula/libdvdnav.rb @@ -10,6 +10,7 @@ class Libdvdnav < Formula sha256 "e20bd00c923e4e837a1eac6f89933377afd17957be74a175734d7896efceb27a" => :catalina sha256 "6c13d8aa2220232e9a0e5317371bd52909ec55b0bb08ed7b591612b60814dc7a" => :mojave sha256 "a9c90f8109ce908ffc4fc0b6972ff4869638de8f52787bedd2c471ce457e1edf" => :high_sierra + sha256 "00022848a24182fe5a3b89b1d76d68f8b5f6753117813c716b1ed6e2e62ae718" => :x86_64_linux end head do diff --git a/Formula/libdvdread.rb b/Formula/libdvdread.rb index b96c062ac6d6b..27b49dfba4d9f 100644 --- a/Formula/libdvdread.rb +++ b/Formula/libdvdread.rb @@ -9,6 +9,7 @@ class Libdvdread < Formula sha256 "83bebe58015f6f34973afa003934f183e7ac9202f5e579cfd12536f9ceac1719" => :catalina sha256 "7405838fee2b93209c2bd0834db89c2a2334a94f7d368feb87599da1b08062f6" => :mojave sha256 "c881a8c1c872d922f45bf8a692b9d79b5f6ade1a2f4a48d470d05491bc017436" => :high_sierra + sha256 "0c5f9b444bdf360b956450b1f5cfa5e1a700abfb084fc7a472846774495c1fec" => :x86_64_linux end head do diff --git a/Formula/libebml.rb b/Formula/libebml.rb index 5bea27a987dc5..074698828afef 100644 --- a/Formula/libebml.rb +++ b/Formula/libebml.rb @@ -10,9 +10,15 @@ class Libebml < Formula sha256 "141c96c12242fb7db7e292f487b9e45be1c4c84a4e7d94f0eab2ccb0d72d8285" => :catalina sha256 "010e20e9b1779db7e69666a10c93bfb6a87c06e513ed80c89ea319c674eb215d" => :mojave sha256 "505546edc98c4e9a382c35d17e299023f2ca91b2641f71691993dc99690f79b0" => :high_sierra + sha256 "5243ae9e699e5577a7712e6b61f48b56fecf3ba6af565bc55c9ca17ed64e662c" => :x86_64_linux end depends_on "cmake" => :build + unless OS.mac? + fails_with :gcc => "5" + fails_with :gcc => "6" + depends_on "gcc@7" + end def install mkdir "build" do diff --git a/Formula/libebur128.rb b/Formula/libebur128.rb index a0c079bd03e83..3df5da7a7f38b 100644 --- a/Formula/libebur128.rb +++ b/Formula/libebur128.rb @@ -11,6 +11,7 @@ class Libebur128 < Formula sha256 "68c4f6d13808ad4d55d0a0f48384e9872286b6041a06f8c3984ccb96083fcbee" => :high_sierra sha256 "d4611c0f7becaf4fbdc34089ddaae18e8017ed6dec859adf4fdadb528f989ae4" => :sierra sha256 "3fbb561a893cd7e0858ad25e424e66f70a53023865b33d3519fb1fa62ab35bec" => :el_capitan + sha256 "d7e3239b29049cf9ddac7227c5ce3a9215b226f5847e48f79f39fd79b561b82c" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libedit.rb b/Formula/libedit.rb index 4ec4e0cf45a55..1d08656581aa2 100644 --- a/Formula/libedit.rb +++ b/Formula/libedit.rb @@ -10,6 +10,7 @@ class Libedit < Formula sha256 "faa58f2e587c5b982af44765f7a034a27837fc1e94816e094ace3f408ab4a7bf" => :catalina sha256 "a707377be9d5fef881cdbb77ad3b562c9d5f54befb97a10d0b7158e4db87ef86" => :mojave sha256 "06e087927f024a9030947216be3aaa46f97fc9dcc1b70959f60240b86bd8f574" => :high_sierra + sha256 "e95fee11c5e2e861388bfe1ca575a9d845610cd41aaac23244ce841f02bf6fff" => :x86_64_linux end keg_only :provided_by_macos @@ -21,6 +22,13 @@ def install "--disable-silent-rules", "--prefix=#{prefix}" system "make", "install" + + unless OS.mac? + # Conflicts with ncurses. + mv man3/"history.3", man3/"history_libedit.3" + # Symlink libedit.so.0 to libedit.so.2 for binary compatibility with Debian/Ubuntu. + ln_s lib/"libedit.so.0", lib/"libedit.so.2" + end end test do diff --git a/Formula/libelf.rb b/Formula/libelf.rb index 94e2f1570932f..d0450792a6641 100644 --- a/Formula/libelf.rb +++ b/Formula/libelf.rb @@ -14,6 +14,7 @@ class Libelf < Formula sha256 "a06b058c7e401942f442f573b63aa2cdd548b45d38b02b7af92393c67093f56e" => :el_capitan sha256 "3b4ea9ab20228d9e912f80a330b6d6d093f9bb65a712208c83cd49bdcc4fc9ea" => :yosemite sha256 "eded3b774d412e533f37bc6d5dc133859141653ce953a0d4cbf4a950dda633f6" => :mavericks + sha256 "7bf880eee47f3426bf118683c699ef1b533e8a1d2f76908e481c53e6c93bb5eb" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/libepoxy.rb b/Formula/libepoxy.rb index 452607881609a..e6ee5ae57bd97 100644 --- a/Formula/libepoxy.rb +++ b/Formula/libepoxy.rb @@ -3,18 +3,24 @@ class Libepoxy < Formula homepage "https://github.com/anholt/libepoxy" url "https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.4.tar.xz" sha256 "0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2" - revision 1 + revision OS.mac? ? 1 : 2 bottle do - cellar :any sha256 "9f58a2eab6aafcc95ade6893bde8d878ab422284353e22c11d04c3a6f3a1e7cb" => :catalina sha256 "e42a0410e6f94fa419f785c5b0901eea1506242b1729f97b672f25b463ce3d4e" => :mojave sha256 "95cbc3ce1fc94931e0259f9e55a25d9dcacacd70713ae3e59cba28f3d7ff2a3a" => :high_sierra + sha256 "d2b0eb8b1ee52311d6328c2d5d18e7c4a4d4e4bccb32b06e0fe9b90c53abe910" => :x86_64_linux end depends_on "meson" => :build depends_on "ninja" => :build depends_on "pkg-config" => :build + unless OS.mac? + depends_on "freeglut" + depends_on "linuxbrew/xorg/xorg" + depends_on "linuxbrew/xorg/xorgproto" + depends_on "mesa" + end def install mkdir "build" do @@ -28,10 +34,13 @@ def install (testpath/"test.c").write <<~EOS #include + #ifdef OS_MAC #include #include + #endif int main() { + #ifdef OS_MAC CGLPixelFormatAttribute attribs[] = {0}; CGLPixelFormatObj pix; int npix; @@ -39,14 +48,20 @@ def install CGLChoosePixelFormat( attribs, &pix, &npix ); CGLCreateContext(pix, (void*)0, &ctx); + #endif glClear(GL_COLOR_BUFFER_BIT); + #ifdef OS_MAC CGLReleasePixelFormat(pix); CGLReleaseContext(pix); + #endif return 0; } EOS - system ENV.cc, "test.c", "-L#{lib}", "-lepoxy", "-framework", "OpenGL", "-o", "test" + args = %w[-lepoxy] + args += %w[-framework OpenGL -DOS_MAC] if OS.mac? + args += %w[-o test] + system ENV.cc, "test.c", *args system "ls", "-lh", "test" system "file", "test" system "./test" diff --git a/Formula/liberasurecode.rb b/Formula/liberasurecode.rb index 60fa19f7bc217..ab84b58652381 100644 --- a/Formula/liberasurecode.rb +++ b/Formula/liberasurecode.rb @@ -10,6 +10,7 @@ class Liberasurecode < Formula sha256 "fba6eb4f5a66f164cb2938a5a2981d4879915a225edefb4ff857910170e52e7a" => :mojave sha256 "7d96611a687605c4856d139d6b1c6305ed686587ee67683c7f3068fa6e5332b0" => :high_sierra sha256 "d7a79bb75e8f7c5099a453ec3a4c2dca8d78d3823101158be68f005e068311fc" => :sierra + sha256 "4db5de4eb9b55c979008f7ddb865a322d31a9331d5043c344e27a5a988f30722" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libestr.rb b/Formula/libestr.rb index 92017923fcb9f..abacb9f79808e 100644 --- a/Formula/libestr.rb +++ b/Formula/libestr.rb @@ -10,6 +10,7 @@ class Libestr < Formula sha256 "543dcd541a69d52d5d1d21d51d0cf57c1617cc177f743c2dfea8ea3d548b93e8" => :mojave sha256 "7f17c5dbb6534afe6b37ae1d1f994d3387cd8527d6aaa768604837ac681eee59" => :high_sierra sha256 "5ff130cf6aa42842636dd90b7a8e7e60adbb289682bd915c98937b032c38fc54" => :sierra + sha256 "cd938799f312f00e4b1752e92b89dc31cfb30b680fea6e57c1ae7e74e9374d2d" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libetonyek.rb b/Formula/libetonyek.rb index 9777b44b4b8bb..db6fe0c689959 100644 --- a/Formula/libetonyek.rb +++ b/Formula/libetonyek.rb @@ -10,6 +10,7 @@ class Libetonyek < Formula sha256 "fe426f3577057ac3a73b9527b01124e5f916872b505f12e8224674d72a700c5b" => :catalina sha256 "b51d5847f87fba35e67703d248f0552a4e03eb6fc4e35ba5a180f41fec68fdeb" => :mojave sha256 "d86fef6a245db1b767d8965362eae4782af35b2c2b14e819ae7d436790f909cd" => :high_sierra + sha256 "c8fd35e75edb130232a90b249bfb9c80e5ec0a8a930008cd2d464f1c7460622f" => :x86_64_linux end depends_on "boost" => :build diff --git a/Formula/libev.rb b/Formula/libev.rb index 132a542a47d61..6204a381ed750 100644 --- a/Formula/libev.rb +++ b/Formula/libev.rb @@ -10,6 +10,7 @@ class Libev < Formula sha256 "e5481e2ba48282bffb5ecc059f0ddddd9807400593e849ed4b48b1fed3a14698" => :catalina sha256 "f6cfb8c6bb1219f4a54d36113ada7cc7e1e446d5a207bc77d69ac30d9cfe391f" => :mojave sha256 "f623fc2f4dc3a0980b4733945eb2025cd40636a6d4f5e5d75ae5f89e0b7b07bd" => :high_sierra + sha256 "0a2e30ca1379034e45954d63729f03aa55ad265f602d7f3e86d31aa78b81b292" => :x86_64_linux end def install @@ -50,7 +51,11 @@ def install return 0; } EOS - system ENV.cc, "-I#{include}", "-L#{lib}", "-lev", "-o", "test", "test.c" + if OS.mac? + system ENV.cc, "-I#{include}", "-L#{lib}", "-lev", "-o", "test", "test.c" + else + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lev", "-o", "test" + end input = "hello, world\n" assert_equal input, pipe_output("./test", input, 0) end diff --git a/Formula/libevent.rb b/Formula/libevent.rb index 3629f33415fd1..66359aa64dc61 100644 --- a/Formula/libevent.rb +++ b/Formula/libevent.rb @@ -11,6 +11,7 @@ class Libevent < Formula sha256 "1e14fc34baae0b65cac6d7c75bc5ed0ccb1f6bbaa30c8f0f8477ab8ba85fb3c5" => :mojave sha256 "89df3b053409a11d520e9ca88aed17221416c60c5799ec51813f8c2c7e3536de" => :high_sierra sha256 "a9bddcb861a3464a0e9111926e4cb8d932ad860540f571edb74d448ef5a54811" => :sierra + sha256 "d97c13622f9e5c0ea8e2e12f8b8525542652f3dab8f8a5ee8503c8fda3accbeb" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libevhtp.rb b/Formula/libevhtp.rb index cead9d5925c84..41474eed35498 100644 --- a/Formula/libevhtp.rb +++ b/Formula/libevhtp.rb @@ -10,6 +10,7 @@ class Libevhtp < Formula sha256 "507466763ef1710ef11b82d02a5229d1445ba6393a553d75926b8fe5d727d871" => :catalina sha256 "bfd6cffbcad95d0db38d4b699af24dd3aab1a82b0bdfc7ea7136b212cecab37c" => :mojave sha256 "72be53d01a0ab668255e9ab605c4d7b6c16e4ca1a3f68b026c3c9ae1fe77af50" => :high_sierra + sha256 "29167d6282f7ac44301220daeeec91f0dac8ffac348b361002d933aed56fd558" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libewf.rb b/Formula/libewf.rb index 01f242b5a9685..e9717ffc8e79c 100644 --- a/Formula/libewf.rb +++ b/Formula/libewf.rb @@ -10,6 +10,7 @@ class Libewf < Formula sha256 "43d8ba6c2441f65080f257a7239fe468be70cb2578ec2106230edd1164e967b6" => :catalina sha256 "4c5482f8f1c97f9c3f3687bccd9c3628b314699bc26743e641f2ae573bf95eeb" => :mojave sha256 "cae6fd2f38855fd15f8a50b644d0817181fed055aef85b7793759d7703a833d4" => :high_sierra + sha256 "235d0916edc7a6877b4993ea9d89d59810f11d024118bea0826f347268fd6f2a" => :x86_64_linux end head do @@ -27,6 +28,10 @@ class Libewf < Formula uses_from_macos "zlib" def install + # Workaround bug in gcc-5 that causes the following error: + # undefined reference to `libuna_ ... + ENV.append_to_cflags "-std=gnu89" if ENV.cc == "gcc-5" + if build.head? system "./synclibs.sh" system "./autogen.sh" diff --git a/Formula/libexif.rb b/Formula/libexif.rb index 23230468bf3b2..dfeb39983741b 100644 --- a/Formula/libexif.rb +++ b/Formula/libexif.rb @@ -3,11 +3,13 @@ class Libexif < Formula homepage "https://libexif.github.io/" url "https://github.com/libexif/libexif/releases/download/libexif-0_6_22-release/libexif-0.6.22.tar.xz" sha256 "5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56" + revision 1 unless OS.mac? bottle do sha256 "7379f6990018006122bba69098864e8877e8e6e7be3af535f7e301d8ff097e98" => :catalina sha256 "c20d311fbd1846ce2603950ec9ad9b3b6e8202bf2f97e9aab328c05dc568fcfe" => :mojave sha256 "8b1c7cf6ec777090ce22ccf5c426867948a54da9378e0c9b91d85175eaea4f81" => :high_sierra + sha256 "7139c14be05e7c75cce2b0fd3d58dc95dffe6b3b815396ce0648566cd3000369" => :x86_64_linux end depends_on "autoconf" => :build @@ -34,6 +36,7 @@ def install data = exif_loader_get_data(loader); printf(data ? "Exif data loaded" : "No Exif data"); } + return 0; } EOS flags = %W[ diff --git a/Formula/libextractor.rb b/Formula/libextractor.rb index bed98137df620..6527e3cddc287 100644 --- a/Formula/libextractor.rb +++ b/Formula/libextractor.rb @@ -10,6 +10,7 @@ class Libextractor < Formula sha256 "7e0ed720f6c76d148affdccfdffd70285114e03063ef10711ab207ba52d753f7" => :mojave sha256 "3feba61ae58271eb373e0f215e5e857e1709b7ae6cfeb222d7be8bf302b8a219" => :high_sierra sha256 "5ae5f5a6335e1bc2f2c9d5a9d6206cadd99de6da11594eb87e52ca148bedd1b0" => :sierra + sha256 "da92a52e04318ca14c5e3a65592200aae6b9850a7d8a80b0475a0e7a3edbec0d" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libfabric.rb b/Formula/libfabric.rb index 6e117ea0e170f..33f97a7ba9257 100644 --- a/Formula/libfabric.rb +++ b/Formula/libfabric.rb @@ -10,6 +10,7 @@ class Libfabric < Formula sha256 "abf3b135a763ce34e818435e3b3b071f4c9aeea48d62bf22ffdae8432a55103e" => :catalina sha256 "fdeab4a76a5ee87946a2d76b9e4a8f3b8960c8d3d2fee0d1058a5363ed3f38b8" => :mojave sha256 "06e8fca360c7be76f060f23569defe285175f8d4dbe889bce0e2fe2d552b1a25" => :high_sierra + sha256 "e2001893bfbbc6a9cd142af67b53c76419a9dbc2732528ee8727d8c3c328208a" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libffcall.rb b/Formula/libffcall.rb index 4791005fa46c8..48d3ea53d715d 100644 --- a/Formula/libffcall.rb +++ b/Formula/libffcall.rb @@ -10,6 +10,7 @@ class Libffcall < Formula sha256 "02b522baa2d0f38a85e3a2bee8adb79644e8c834c486737b81a62945b9ec73d4" => :catalina sha256 "e38d2a42a2ad191847e423028580245f4b84829e5c781f6d58ce7da9981da280" => :mojave sha256 "d9f7db3318279d7dac5a162de3a251e96c3810be2e70fe8926d93e63b9849045" => :high_sierra + sha256 "f558d33d0b06fc7c5956354beed87518acf5a6cc32f01e6c86911264ed4c4799" => :x86_64_linux end def install diff --git a/Formula/libffi.rb b/Formula/libffi.rb index c2072402960b1..727d6db4cdb1f 100644 --- a/Formula/libffi.rb +++ b/Formula/libffi.rb @@ -11,6 +11,7 @@ class Libffi < Formula sha256 "dd94d39946f53a8f11f78e998f22e46be9666bb265f80bb4714d5d63c1e16a68" => :catalina sha256 "d6e5efd7521676dfc58fcba567514b898091c8580df4d6253f5dd40a7ee67c82" => :mojave sha256 "7065f0d426921fa069c2494beded9de61e8720954f3f346103c8f871daa4ff8b" => :high_sierra + sha256 "5a62bf6d23a44f8c764d73647b244930a38372cde8b6cd79683ab11cb819d25c" => :x86_64_linux end head do @@ -27,6 +28,13 @@ def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" + + # Move lib64/* to lib/ on Linuxbrew + lib64 = Pathname.new "#{lib}64" + if lib64.directory? + mv Dir[lib64/"*"], lib + rmdir lib64 + end end test do diff --git a/Formula/libfido2.rb b/Formula/libfido2.rb index 38d7bf40ea222..b5cbbfd6a5812 100644 --- a/Formula/libfido2.rb +++ b/Formula/libfido2.rb @@ -10,6 +10,7 @@ class Libfido2 < Formula sha256 "aa56164db657cfbef40a03155bedfbecdd4aca07fc240503346b73ba850d26d9" => :catalina sha256 "8621d7376e70e75db430698b392aaa0c230bff55ebbc34218b9c9acfbae17960" => :mojave sha256 "13df15672e11395e0d056d3e82f533bbe208b57f8adb7f3f116955d31527e1b2" => :high_sierra + sha256 "5fe9e7430ae8916f1fa1384d1b8fe0ee39f63fdd9731d0b84b8eeede9c9da9dc" => :x86_64_linux end depends_on "cmake" => :build @@ -18,6 +19,8 @@ class Libfido2 < Formula depends_on "libcbor" depends_on "openssl@1.1" + depends_on "systemd" unless OS.mac? # for libudev + # Apply fix for https://github.com/Yubico/libfido2/issues/166 (also https://github.com/Yubico/libfido2/issues/179) patch do url "https://github.com/Yubico/libfido2/commit/39544a2c342b0438a8f341b4a4ff20f650f701a3.diff?full_index=1" @@ -26,7 +29,10 @@ class Libfido2 < Formula def install mkdir "build" do - system "cmake", "..", *std_cmake_args + system "cmake", + "..", + ("-DUDEV_RULES_DIR=#{lib}/udev/rules.d" unless OS.mac?), + *std_cmake_args system "make" system "make", "man_symlink_html" system "make", "man_symlink" diff --git a/Formula/libfishsound.rb b/Formula/libfishsound.rb index e101ccda7d186..7eb9cc5fa4062 100644 --- a/Formula/libfishsound.rb +++ b/Formula/libfishsound.rb @@ -14,6 +14,7 @@ class Libfishsound < Formula sha256 "9cf94c3c6963895940e8720aef21c29b001257c918fce6b65685c33f8430f0e4" => :el_capitan sha256 "4fcfc4270d73ac2b0e8d8a4d1fe6b94a1093502b802ed327febb5286ad5140b9" => :yosemite sha256 "b8c54b7d3b2bc5e433b20f89f67c6cb3d03b18e0881126a526ae1ff028d8c220" => :mavericks + sha256 "132ad239e0a0708574b8c2de16d7c439c028fea87eb4befc17bb86e8c3975bbd" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libfixbuf.rb b/Formula/libfixbuf.rb index 580dcfa95dc6d..c9546b17673bb 100644 --- a/Formula/libfixbuf.rb +++ b/Formula/libfixbuf.rb @@ -8,6 +8,7 @@ class Libfixbuf < Formula sha256 "39eac22cafeaa515259fe5b8ddd635b98c69ca42699107bd05e5560d285f6724" => :catalina sha256 "5c63110b498601708f2669fa1c5c734a4d8d67abbdfdfd5056255c746ef6e6ee" => :mojave sha256 "d76d8050c0355326777460e738008b3820b39c53ec38ee759c0c8ddacf0c090e" => :high_sierra + sha256 "26ac090f36ef742325efac368bcab065fd1a254be67b7e0ae01a2d25e3da9111" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libfixposix.rb b/Formula/libfixposix.rb index 34d8bdeccea38..51d427e1e15bb 100644 --- a/Formula/libfixposix.rb +++ b/Formula/libfixposix.rb @@ -12,6 +12,7 @@ class Libfixposix < Formula sha256 "eaf5641bda4184e3092f7f2b0c9e61afa120df85df837377ead98de643a7e21e" => :high_sierra sha256 "024855892877fd868e04eb8b0d2ef71485ffc48b2f441f88ceb61bcc57a56aea" => :sierra sha256 "89a3b36ff587c3eeaa7ba51471ba3d0bc294bdeb66abccd0a3ce446cf6f57e1b" => :el_capitan + sha256 "113836f08b22930e58fa1565f0a2e512dbee6bb1db52faa13636e3d5d570ee08" => :x86_64_linux end depends_on "autoconf" => :build @@ -36,12 +37,13 @@ def install int main(void) { fd_set rset, wset, eset; + unsigned i; lfp_fd_zero(&rset); lfp_fd_zero(&wset); lfp_fd_zero(&eset); - for(unsigned i = 0; i < FD_SETSIZE; i++) { + for(i = 0; i < FD_SETSIZE; i++) { if(lfp_fd_isset(i, &rset)) { printf("%d ", i); } @@ -50,7 +52,13 @@ def install return 0; } EOS - system ENV.cc, "mxstemp.c", lib/"libfixposix.dylib", "-o", "mxstemp" + system ENV.cc, + "mxstemp.c", + lib/"libfixposix.#{OS.mac? ? "dylib" : "so"}", + "-I#{include}", + "-L#{lib}", + "-o", + "mxstemp" system "./mxstemp" end end diff --git a/Formula/libforensic1394.rb b/Formula/libforensic1394.rb index eb61b82497926..ab1855371efed 100644 --- a/Formula/libforensic1394.rb +++ b/Formula/libforensic1394.rb @@ -14,6 +14,7 @@ class Libforensic1394 < Formula sha256 "d850e7c3a04b206c6219c75ba0a00723e9a25d0c97831de289320ef0cc076aae" => :el_capitan sha256 "b64837090b557e25444999bfc41e2023f8fc2ced465ef7ccc067938fe0ec2f2c" => :yosemite sha256 "a2039bd1c161253eac9ac123414f660fbb6059f709b6499ec6a92c73bfba4f42" => :mavericks + sha256 "27559e428c891579487e538e4ac7a07664fac87ed2ee45cc6fd700d6e37240d4" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libfreenect.rb b/Formula/libfreenect.rb index b17e8b39a0cd7..5b4c3df24bc4f 100644 --- a/Formula/libfreenect.rb +++ b/Formula/libfreenect.rb @@ -10,6 +10,7 @@ class Libfreenect < Formula sha256 "a9098e0b3d868c85de4b0bb243d16200361002ff5d27d6d9c9bc5a08fb6ab95a" => :catalina sha256 "d150e4351036b1b3174d24c359736e04a3bbdbe966c77b1714f0edbef486d012" => :mojave sha256 "c08bad975cc7175fdf88a603fb300cac3493f0e20172fc99a69da568d4ad68ff" => :high_sierra + sha256 "88289db3b849dbc03e8dd1c5f08b52b30f7cbcc9e4c1ede64e731bffbd0eb78b" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libftdi.rb b/Formula/libftdi.rb index 39629ed57b7f5..83e64015b7520 100644 --- a/Formula/libftdi.rb +++ b/Formula/libftdi.rb @@ -10,6 +10,7 @@ class Libftdi < Formula sha256 "6bac331af0d1516b3f5cd2b27f8b4ae78647f371f3903b9b9f89aad29963ef1f" => :catalina sha256 "31f0705e5764462ac4e447966bf295db5655fd5b032ad984538883a2f952d4eb" => :mojave sha256 "40aa8fcdecc3af1859fd3fba4bd344b26d8b9746712d6cbc1291a2518451d2fb" => :high_sierra + sha256 "3519fe2ea27a2bf994791b63eb9eb8f78d0eaee67079d51d0fda4bab487e4505" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libftdi0.rb b/Formula/libftdi0.rb index 64ac387ce8e7e..26237d6c8df84 100644 --- a/Formula/libftdi0.rb +++ b/Formula/libftdi0.rb @@ -14,6 +14,7 @@ class Libftdi0 < Formula sha256 "8fbc5ef456600b919430d86dd4e7090ae1f1064e4a51d631ab9bd7b39887ead2" => :el_capitan sha256 "92ecdb3a110e1abcba05561f0def8e573d1f8174d4e04247375dd5cd47d3bc24" => :yosemite sha256 "29d786dcb87e4251c4cbd25c0d5e215eb248b74304f175054b31cbd6a464c071" => :mavericks + sha256 "63247287fa8c88011bb008a199830bbfeaa23bd3dd572188fba7df1697508000" => :x86_64_linux end depends_on "libusb-compat" diff --git a/Formula/libfuse.rb b/Formula/libfuse.rb new file mode 100644 index 0000000000000..a7cbfc8ac9269 --- /dev/null +++ b/Formula/libfuse.rb @@ -0,0 +1,49 @@ +class Libfuse < Formula + desc "Reference implementation of the Linux FUSE interface" + homepage "https://github.com/libfuse/libfuse" + url "https://github.com/libfuse/libfuse/releases/download/fuse-2.9.8/fuse-2.9.8.tar.gz" + sha256 "5e84f81d8dd527ea74f39b6bc001c874c02bad6871d7a9b0c14efb57430eafe3" + head "https://github.com/libfuse/libfuse.git" + + bottle do + sha256 "1c29503e1008d72d58bc2d6efc4ac38500116b3f5794f4aaf16b81afb25827d9" => :x86_64_linux # glibc 2.19 + sha256 "66e21f1df0e11d0aa6f810f821e8981247e9285d39e6579bd7376ebfc6482a58" => :x86_64_linux + end + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + depends_on :linux + + def install + ENV["MOUNT_FUSE_PATH"] = sbin + ENV["UDEV_RULES_PATH"] = etc/"udev/rules.d" + ENV["INIT_D_PATH"] = etc/"init.d" + system "./configure", + "--prefix=#{prefix}", + "--disable-silent-rules", + "--enable-lib", + "--enable-util", + "--enable-example", + "--disable-rpath" + + system "make" + system "make", "install" + (pkgshare/"doc").install Dir["./doc/how-fuse-works", "./doc/kernel.txt"] + (pkgshare/"example").install Dir["./example/Makefile", "./example/*.{c,h}"] + end + + test do + (testpath/"fuse-test.c").write <<~EOS + #include + #include + int main() { + printf("%d%d\\n", FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION); + printf("%d\\n", fuse_version()); + return 0; + } + EOS + system ENV.cc, "fuse-test.c", "-L#{lib}", "-I#{include}", "-D_FILE_OFFSET_BITS=64", "-lfuse", "-o", "fuse-test" + system "./fuse-test" + end +end diff --git a/Formula/libgcrypt.rb b/Formula/libgcrypt.rb index 6a13f7e8c92e4..01313a93dd538 100644 --- a/Formula/libgcrypt.rb +++ b/Formula/libgcrypt.rb @@ -10,6 +10,7 @@ class Libgcrypt < Formula sha256 "d983dca1f56d0177d4ecd6ea2752457caaa5e21cdbe147e354ba1debb1ed34dd" => :mojave sha256 "2188074c35a5a552ce5adad2ebd36a376bbd7309907c96fdbec2dff13c7d1863" => :high_sierra sha256 "3e074f8bd2787fc5878ea8bfc31e50e596222c019054d83465b74e93328f71f3" => :sierra + sha256 "ab82419c7e9e9d05af9f21fff0bb22258d0a75cc464d8ab6ae9e638b89111cad" => :x86_64_linux end depends_on "libgpg-error" @@ -38,9 +39,11 @@ def install # normal place on >10.10 where SIP is enabled. # https://github.com/Homebrew/homebrew-core/pull/3004 # https://bugs.gnupg.org/gnupg/issue2056 - MachO::Tools.change_install_name("#{buildpath}/tests/.libs/random", - "#{lib}/libgcrypt.20.dylib", - "#{buildpath}/src/.libs/libgcrypt.20.dylib") + if OS.mac? + MachO::Tools.change_install_name("#{buildpath}/tests/.libs/random", + "#{lib}/libgcrypt.20.dylib", + "#{buildpath}/src/.libs/libgcrypt.20.dylib") + end system "make", "check" system "make", "install" diff --git a/Formula/libgee.rb b/Formula/libgee.rb index 9c4438ee5d8c9..15f485d6db9c5 100644 --- a/Formula/libgee.rb +++ b/Formula/libgee.rb @@ -9,6 +9,7 @@ class Libgee < Formula sha256 "f05da401040a1fd6372ebb26550d13b3779309d7e393bb109b9c362e8fcb0a0b" => :catalina sha256 "ea8b92ad2fc0f9c4191e83d3a4ace603dd99b2d95da665ac699f0805394595e3" => :mojave sha256 "321db1d8698ebe090ee354090920a614d95fb65fa7a38fad01f15fbfc6d2ea53" => :high_sierra + sha256 "ecf78c8ae9b1c605ecaaae9358d0f8a407cb3185f41fb9cba26e15ee4ab27f72" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -52,8 +53,8 @@ def install -lgee-0.8 -lglib-2.0 -lgobject-2.0 - -lintl ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libgeotiff.rb b/Formula/libgeotiff.rb index 6ccf10bff6869..72e89421def98 100644 --- a/Formula/libgeotiff.rb +++ b/Formula/libgeotiff.rb @@ -5,10 +5,11 @@ class Libgeotiff < Formula sha256 "9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca" bottle do - cellar :any + cellar :any_skip_relocation sha256 "181da2f2a3860b23ee95eded5a9f5600f34e2ee016e76a7fbede959e565d0ca8" => :catalina sha256 "7311abe41270eb90f91b69e84eab0528be0b76a11cc43ce0e2aca1529da585fe" => :mojave sha256 "b52ce34a76c3510314e840753610d5d423cd0689d5b93d3d41e7c119ba67d09b" => :high_sierra + sha256 "4661f6625a0c23deb96ed389ae3daa65c54a40df05434de3ab0de92a0f9f6eb6" => :x86_64_linux end head do diff --git a/Formula/libgetdata.rb b/Formula/libgetdata.rb index 80ed0ddf007b0..7b51e152281de 100644 --- a/Formula/libgetdata.rb +++ b/Formula/libgetdata.rb @@ -3,14 +3,15 @@ class Libgetdata < Formula homepage "https://getdata.sourceforge.io/" url "https://downloads.sourceforge.net/project/getdata/getdata/0.10.0/getdata-0.10.0.tar.xz" sha256 "d547a022f435b9262dcf06dc37ebd41232e2229ded81ef4d4f5b3dbfc558aba3" - revision 1 + revision OS.mac? ? 1 : 2 bottle do - cellar :any + cellar :any_skip_relocation rebuild 3 sha256 "f133f438e1833bff0f5cf43109e27768a983a068dec90a767ba9027d2bc2f0b9" => :catalina sha256 "6c5f143bb202c280c3b3e340a420a1cf6c6d936cba70faf837cd215e451987fe" => :mojave sha256 "6b8b5f7801a6cf31ecd5ac82ee02ca344f9634ad01c235a828e3875d0354931b" => :high_sierra + sha256 "aaa7acceffef19f5e77f6934418c8c394b59e88c8de869bedb2de8163df3a441" => :x86_64_linux end depends_on "libtool" diff --git a/Formula/libgfshare.rb b/Formula/libgfshare.rb index 2e9a914cc8127..03a4ef3e1337d 100644 --- a/Formula/libgfshare.rb +++ b/Formula/libgfshare.rb @@ -13,6 +13,7 @@ class Libgfshare < Formula sha256 "c50ebaadca206eef93bc6d835f5814e0d640223c2c7e39cd12feff47720c054d" => :el_capitan sha256 "6929a937f6f8ee624f02891622375d23aa65114475cf53ce82342976b4705454" => :yosemite sha256 "1696482fdd83b98b999d4b4037ae6c02d06a4b5297d089c826fed92a367d0d5c" => :mavericks + sha256 "5fcea5e75446540a94c30a1ca71d9bd2c514ce94e750c26725b538754e93d242" => :x86_64_linux end def install diff --git a/Formula/libghthash.rb b/Formula/libghthash.rb index cec63654447c2..5495b771195a9 100644 --- a/Formula/libghthash.rb +++ b/Formula/libghthash.rb @@ -14,6 +14,7 @@ class Libghthash < Formula sha256 "e889f34ca4f1978869eff48334f1f55248628fbc586abdeb151fe017479d220e" => :el_capitan sha256 "0487e2e14b14ae288428c474fe9ce3e9baf814d4d73de8b0113ca9cc502ffd63" => :yosemite sha256 "207d07d59447e098c1987286324866ef8b26e0c4c191e4c1c0268ba8d95c5fac" => :mavericks + sha256 "12c448783b932869e4ca6d9453e8b37edd42d208b1c9a9a15bb20543c641f09d" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libgit2-glib.rb b/Formula/libgit2-glib.rb index d030a1ca74663..af76c50886c8b 100644 --- a/Formula/libgit2-glib.rb +++ b/Formula/libgit2-glib.rb @@ -10,6 +10,7 @@ class Libgit2Glib < Formula sha256 "a5297beb6c9ab0602847472ec08fbd2eddad7e91ca3c78db15f4a8175912feea" => :catalina sha256 "ffff80b61a3dd453796abdd059803d887c6de603d501c65a153571a0c04be5ce" => :mojave sha256 "74b08631fc92b096f3034c512ea9f62889edc92c49c6581043fbf56256306ad4" => :high_sierra + sha256 "72407e0360d74e297a46316c2c06680a4b50d95315ded51bb1993e5d7c6a9e58" => :x86_64_linux end depends_on "gobject-introspection" => :build diff --git a/Formula/libgit2.rb b/Formula/libgit2.rb index 3f2f44a95b15c..bfe2da39bad6c 100644 --- a/Formula/libgit2.rb +++ b/Formula/libgit2.rb @@ -10,6 +10,7 @@ class Libgit2 < Formula sha256 "e6456b9dde3c5ed975cc6a106e721ce63a84e37e71762889c360920c999f2b12" => :catalina sha256 "2187f1fd84786573d62180909d1f319c58700fa6fe662a2de93092dbde76bd16" => :mojave sha256 "c7c5dbf3884b241c0350404858ba4f63d640921bee6ff8142c2e214533e42761" => :high_sierra + sha256 "d0e5dcfdd1cee2f523fb9b391ed2474a7d4794d014b44ca5c621ab2e1289e3b9" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libglade.rb b/Formula/libglade.rb index e37d1de1d5114..728df4302b213 100644 --- a/Formula/libglade.rb +++ b/Formula/libglade.rb @@ -11,6 +11,7 @@ class Libglade < Formula sha256 "3fdb8055e888e22f7054432b185aad35a20c0d48b3c07c97429cab2b7a0bd3cc" => :mojave sha256 "fd198334f49180de53d5bde9406e17aa4e3051ee5c421defdab9dbb0f3a1e681" => :high_sierra sha256 "019f499d6ca86f279d5bfec74bf71ffe11a89bb6bc70f6901b7074e14885132c" => :sierra + sha256 "cfb82e7236356cef6b6f19b65d57f65fb7865e4ed7ad6aa229d111e9213ec19e" => :x86_64_linux end depends_on "pkg-config" => :build @@ -72,18 +73,18 @@ def install -L#{pango.opt_lib} -latk-1.0 -lcairo - -lgdk-quartz-2.0 + -lgdk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lgdk_pixbuf-2.0 -lgio-2.0 -lglade-2.0 -lglib-2.0 -lgobject-2.0 - -lgtk-quartz-2.0 - -lintl + -lgtk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lpango-1.0 -lpangocairo-1.0 -lxml2 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libglademm.rb b/Formula/libglademm.rb index f397d52daea99..8fe03f77c6a10 100644 --- a/Formula/libglademm.rb +++ b/Formula/libglademm.rb @@ -11,6 +11,7 @@ class Libglademm < Formula sha256 "7198c6996d64bbe6a06380c23d010f0c9a949e3220c8a3dcb785fba0ceb22c33" => :mojave sha256 "4daab6726178c96ac56452716422004dd4fcdfbaef22b85d99f9ddc317c88ea1" => :high_sierra sha256 "6f7c8cbd127f333df690910aa8aa3561989679719bebbfb9d1d4c41a9821d57c" => :sierra + sha256 "090fce35811b37a212f6ae23b84d9a980df150e1d21a49856c0919dced4896c2" => :x86_64_linux end depends_on "pkg-config" => :build @@ -111,7 +112,7 @@ def install -latkmm-1.6 -lcairo -lcairomm-1.0 - -lgdk-quartz-2.0 + -lgdk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lgdk_pixbuf-2.0 -lgdkmm-2.4 -lgio-2.0 @@ -121,15 +122,15 @@ def install -lglib-2.0 -lglibmm-2.4 -lgobject-2.0 - -lgtk-quartz-2.0 + -lgtk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lgtkmm-2.4 - -lintl -lpango-1.0 -lpangocairo-1.0 -lpangomm-1.4 -lsigc-2.0 -lxml2 ] + flags << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/libgnomecanvas.rb b/Formula/libgnomecanvas.rb index 160b67e82806c..ca57115ba9980 100644 --- a/Formula/libgnomecanvas.rb +++ b/Formula/libgnomecanvas.rb @@ -81,17 +81,17 @@ def install -lart_lgpl_2 -latk-1.0 -lcairo - -lgdk-quartz-2.0 + -lgdk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lgdk_pixbuf-2.0 -lgio-2.0 -lglib-2.0 -lgnomecanvas-2 -lgobject-2.0 - -lgtk-quartz-2.0 - -lintl + -lgtk-#{OS.mac? ? "quartz" : "x11"}-2.0 -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libgpg-error.rb b/Formula/libgpg-error.rb index f872a1dfdade4..a03c5ca9338bc 100644 --- a/Formula/libgpg-error.rb +++ b/Formula/libgpg-error.rb @@ -8,6 +8,7 @@ class LibgpgError < Formula sha256 "e75e41ea083a1d480fd60a0a45e5ab838ad032f961ea5fb0cf8aafff070e3925" => :catalina sha256 "60867a965e4ea8dc1e119adfecaa2bcfe63300bb7bb3e7af635ec921bc64f599" => :mojave sha256 "6d00f7cb42d8e9b75d6c2ab9fa5b691b7844b14ddc268a67d60d4301f568d6f5" => :high_sierra + sha256 "2f01f9d802f854837b43066f15e96cc55a2d94058020725dd2302dce772967f2" => :x86_64_linux end def install diff --git a/Formula/libgphoto2.rb b/Formula/libgphoto2.rb index 7e05e938580a5..6937d5b815dd6 100644 --- a/Formula/libgphoto2.rb +++ b/Formula/libgphoto2.rb @@ -8,6 +8,7 @@ class Libgphoto2 < Formula sha256 "0609b72a67e2d6c45ede30bb4cfca8b4fc6b312d5873c4e647e292fdc1f227ff" => :catalina sha256 "5a1f7ec7d0146bb772a4c6fa2ef5ed53e6a6ac183fe1f916ca8b53b2a4c68ad9" => :mojave sha256 "110b4ca7ee321419851bcf5b8401d2fe082bf29261787700890f93db77af0112" => :high_sierra + sha256 "5ea169788d262e5840c8cea53c6bd7e98b1b3504fb57ae0f66b2c49cf7753eec" => :x86_64_linux end head do @@ -39,7 +40,10 @@ def install return gp_camera_new(&camera); } EOS - system ENV.cc, "test.c", "-L#{lib}", "-lgphoto2", "-o", "test" + system ENV.cc, "test.c", + *("-I#{include}" unless OS.mac?), + *("-Wl,-rpath,#{lib}" unless OS.mac?), + "-L#{lib}", "-lgphoto2", "-o", "test" system "./test" end end diff --git a/Formula/libgraphqlparser.rb b/Formula/libgraphqlparser.rb index eb0cd1cae9f06..ed8cee0753fe9 100644 --- a/Formula/libgraphqlparser.rb +++ b/Formula/libgraphqlparser.rb @@ -10,6 +10,7 @@ class Libgraphqlparser < Formula sha256 "e4cea535715f0ed46ff1713df73dbc43d2845f4e0152f0137d4ad18def845050" => :catalina sha256 "f2d46a3bfb5fd3aef9f8b47a5d1c50d204f6dbd74d1a387ca664e36022b7ddc4" => :mojave sha256 "64779ec3108d9eef789d279abfafa90437c6a76b2ed3973d45979cd1051dc170" => :high_sierra + sha256 "451370cc5e18a9420015806109c94f492a787c2743136ca6f1dab4a84739f532" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libgsf.rb b/Formula/libgsf.rb index d53a38ad599ec..3725849bbe03b 100644 --- a/Formula/libgsf.rb +++ b/Formula/libgsf.rb @@ -8,6 +8,7 @@ class Libgsf < Formula sha256 "82a2fce8b091d204302919c7541a0ad21a28a24fe8ad8a5d4ae7f50f3f190349" => :catalina sha256 "a051f21e80044277fafb60264c915cb79ce5f64059e9737f7a15795bc79ad3c8" => :mojave sha256 "c2cb9985014c2c727abe935f113ab827e5a7af1e4376c27261897381fc87a2ba" => :high_sierra + sha256 "e61aee5354207597d75ecb06a26c1c360e68931a936127b8d2ace54071e60069" => :x86_64_linux end head do @@ -26,6 +27,9 @@ class Libgsf < Formula uses_from_macos "libxml2" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + args = %W[--disable-dependency-tracking --prefix=#{prefix}] if build.head? system "./autogen.sh", *args diff --git a/Formula/libgsm.rb b/Formula/libgsm.rb index fa9002d28856c..dfb4e7c3102de 100644 --- a/Formula/libgsm.rb +++ b/Formula/libgsm.rb @@ -11,11 +11,18 @@ class Libgsm < Formula sha256 "5a2b52e7ed65f005f32bb56519dd425b26e537f888b49402322fe1424f0901e4" => :high_sierra end - # Builds a dynamic library for gsm, this package is no longer developed - # upstream. Patch taken from Debian and modified to build a dylib. - patch do - url "https://gist.githubusercontent.com/dholm/5840964/raw/1e2bea34876b3f7583888b2284b0e51d6f0e21f4/gistfile1.txt" - sha256 "3b47c28991df93b5c23659011e9d99feecade8f2623762041a5dcc0f5686ffd9" + if OS.mac? + # Builds a dynamic library for gsm, this package is no longer developed + # upstream. Patch taken from Debian and modified to build a dylib. + patch do + url "https://gist.githubusercontent.com/dholm/5840964/raw/1e2bea34876b3f7583888b2284b0e51d6f0e21f4/gistfile1.txt" + sha256 "3b47c28991df93b5c23659011e9d99feecade8f2623762041a5dcc0f5686ffd9" + end + else + patch do + url "https://gist.githubusercontent.com/iMichka/9aac903922bc0169f2f6ce4c848d2976/raw/63d5708692e1494daaf573df31be8695875ef4ec/libgsm" + sha256 "ccf749390d91511a5b1f3184f80d8a25898b77b661426eb1a5f3fd4704938908" + end end def install @@ -29,16 +36,18 @@ def install man3.mkpath # Dynamic library must be built first - system "make", "lib/libgsm.1.0.13.dylib", - "CC=#{ENV.cc}", "CCFLAGS=#{ENV.cflags}", - "LDFLAGS=#{ENV.ldflags}" + library = OS.mac? ? "libgsm.1.0.13.dylib" : "libgsm.so" + dylib = OS.mac? ? "dylib" : "so" + system "make", "lib/#{library}", + "CC=#{ENV.cc}", "CCFLAGS=#{ENV.cflags}" + (" -fPIC" unless OS.mac?), + "LDFLAGS=#{ENV.ldflags}" + (" -fPIC" unless OS.mac?) system "make", "all", "CC=#{ENV.cc}", "CCFLAGS=#{ENV.cflags}", "LDFLAGS=#{ENV.ldflags}" system "make", "install", "INSTALL_ROOT=#{prefix}", "GSM_INSTALL_INC=#{include}" - lib.install Dir["lib/*dylib"] + lib.install Dir["lib/*#{dylib}"] end test do diff --git a/Formula/libgtop.rb b/Formula/libgtop.rb index c119cb01e3d0a..ad5e0517e3a9d 100644 --- a/Formula/libgtop.rb +++ b/Formula/libgtop.rb @@ -46,8 +46,8 @@ def install -L#{lib} -lglib-2.0 -lgtop-2.0 - -lintl ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libgweather.rb b/Formula/libgweather.rb index b8353d68c2f8b..c39ab6a3473b8 100644 --- a/Formula/libgweather.rb +++ b/Formula/libgweather.rb @@ -18,8 +18,12 @@ class Libgweather < Formula depends_on "geocode-glib" depends_on "gtk+3" depends_on "libsoup" + depends_on "glibc" unless OS.mac? def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + ENV["DESTDIR"] = "/" mkdir "build" do @@ -94,10 +98,10 @@ def post_install -lgobject-2.0 -lgtk-3 -lgweather-3 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE=1", "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libharu.rb b/Formula/libharu.rb index ebec47eb1dc72..d682a56ff7f52 100644 --- a/Formula/libharu.rb +++ b/Formula/libharu.rb @@ -14,6 +14,7 @@ class Libharu < Formula sha256 "68003e06f893b8df9d412960a06c69f6b45cb4ab5abd96e9f10c5936ab8724ac" => :el_capitan sha256 "fd4201d2cf6e068aed5e946b09ae1b22a390ca4ed968084bfed18ed705047987" => :yosemite sha256 "74e714dd0419580bbde47d9458abd95efd4ea316ec0a28e4c665bbeb89401329" => :mavericks + sha256 "ea389a12bda7d145a1dad959f58623d2c12c50ab4279ab2abf3cb3575905c402" => :x86_64_linux # glibc 2.19 end depends_on "autoconf" => :build diff --git a/Formula/libheif.rb b/Formula/libheif.rb index 6ea48c8116e76..1c84cd5c97bcf 100644 --- a/Formula/libheif.rb +++ b/Formula/libheif.rb @@ -9,6 +9,7 @@ class Libheif < Formula sha256 "dc3c55be447a590b3bfd0ba5e0a1bf1a79276a219123fdbf9d9dda5995a95de0" => :catalina sha256 "9c32b0a2b6ae5c3d9c60abb934ba7bd8f053a05c8ab2e2bc800604dee7ae227b" => :mojave sha256 "78e4531cd8bffbe9107ccea42db15f721e09edb6dd2957a0f6e723824415c456" => :high_sierra + sha256 "f74568a7aba23b85f2781c23e28a7376a651581a1dd1a207317d0edc359bc59e" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libhid.rb b/Formula/libhid.rb index 17e342c6c7279..2089bf4b86355 100644 --- a/Formula/libhid.rb +++ b/Formula/libhid.rb @@ -14,6 +14,7 @@ class Libhid < Formula sha256 "a22388fc2ac89d99ed04449c590b035308a81c8f1a2e80ee68ca64a7e10ced7e" => :el_capitan sha256 "4920ff4278cbc288fc8c84ef9b3137d99010ba047d6f072b9a6eccf07588721a" => :yosemite sha256 "cda30ad7a75c6a9b156806f398d39afd8288dd7c94c6d06685f8168125906cae" => :mavericks + sha256 "4891393410b496523f9772174707680878f5caa575b91f637eba018c95cd3f7c" => :x86_64_linux end depends_on "libusb" diff --git a/Formula/libhttpserver.rb b/Formula/libhttpserver.rb index 95ace5d9a4216..3529e197a25f4 100644 --- a/Formula/libhttpserver.rb +++ b/Formula/libhttpserver.rb @@ -10,6 +10,7 @@ class Libhttpserver < Formula sha256 "e7f063d3efcf580237ee3a414102aabb09604f9f50956f3193ed78d2cdc700d7" => :catalina sha256 "61520d55052d75ea8761d89f892c6b97ecb4811236bbdb748630cca00130b441" => :mojave sha256 "8a48967a0dc9715133455dd6ca548ee16652d451c5cba71c85df9b1ce904f442" => :high_sierra + sha256 "a97a96ef0a783e6055f22047d4804e0002d40a5abe7b4b6be7cb1d328d5f482d" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libhttpseverywhere.rb b/Formula/libhttpseverywhere.rb index 297bfa755c37a..f07530527c099 100644 --- a/Formula/libhttpseverywhere.rb +++ b/Formula/libhttpseverywhere.rb @@ -3,14 +3,14 @@ class Libhttpseverywhere < Formula homepage "https://github.com/gnome/libhttpseverywhere" url "https://download.gnome.org/sources/libhttpseverywhere/0.8/libhttpseverywhere-0.8.3.tar.xz" sha256 "1c006f5633842a2b131c1cf644ab929556fc27968a60da55c00955bd4934b6ca" - revision 2 + revision OS.mac? ? 2 : 4 bottle do - cellar :any sha256 "f329514bd9a5b50bde27abe0a914072c5c32db02a3df1f76e5e6a02256493547" => :catalina sha256 "7ed8d7cc4934185649bb1d3efc00f0ffac955310085db2cf44434cdf476a7e8d" => :mojave sha256 "109e95eba0ebfe5a6d3c358055bc07861e2dce33e2376aa33843e73fba9a52eb" => :high_sierra sha256 "f161a27096199a9810416b47d93c1bbf95b3948641ab009a7cfb049e5264a76f" => :sierra + sha256 "30404cb5ff46b9dd0f67e237c0acaf8e4be4c0f664e2af86f0e3349f7af77f35" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -37,6 +37,16 @@ def install system "ninja" system "ninja", "install" end + + if OS.mac? + dir = [Pathname.new("#{lib}64"), lib/"x86_64-linux-gnu"].find(&:directory?) + unless dir.nil? + mkdir_p lib + system "/bin/mv", *Dir[dir/"*"], lib + rmdir dir + inreplace Dir[lib/"pkgconfig/*.pc"], %r{lib64|lib/x86_64-linux-gnu}, "lib" + end + end end test do @@ -81,11 +91,11 @@ def install -lglib-2.0 -lgobject-2.0 -lhttpseverywhere-0.8 - -lintl -ljson-glib-1.0 -lsoup-2.4 -lxml2 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libical.rb b/Formula/libical.rb index db1d8704c6129..bab685685b462 100644 --- a/Formula/libical.rb +++ b/Formula/libical.rb @@ -10,6 +10,7 @@ class Libical < Formula sha256 "aee72172114e605f00d453d7a2f5e7be3b813fcc56d05463c97de76f579db5f4" => :catalina sha256 "93bd93bbad50f91aaa215ba2f764046fef919790a4ff227328a309b2ad2490d2" => :mojave sha256 "3ff8dae7c504718bffd8fb8ce066c3b5c777d12250bdc87ff3fbb7f230284d1b" => :high_sierra + sha256 "949367ed4e103787fa38f9d2c717669a9b5d00547efd7e10c02873cfa92b5a7f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libicns.rb b/Formula/libicns.rb index b61b3e803abe9..02f689f73e586 100644 --- a/Formula/libicns.rb +++ b/Formula/libicns.rb @@ -14,6 +14,7 @@ class Libicns < Formula sha256 "8fb5848fa2a111b3fc66aaea73c60a0795da6468e2ace92d2de57c9c8a5a3cde" => :sierra sha256 "12579e9f34ef57d3979b5a01206b543a67bf313cdb056d6c3e20e0b8cf0842b6" => :el_capitan sha256 "aed1a7df05a8f98ea64dcdd8c4a406207239b7b187629fc03ae799308a142a4d" => :yosemite + sha256 "008a350b6b14e99a99563f98cb851354601bdb5a676c059c5210c1e54e74f5bb" => :x86_64_linux # glibc 2.19 end depends_on "jasper" diff --git a/Formula/libiconv.rb b/Formula/libiconv.rb index da076cd4ed8da..283aa55980736 100644 --- a/Formula/libiconv.rb +++ b/Formula/libiconv.rb @@ -1,3 +1,11 @@ +class MacOSRequirement < Requirement + fatal true + satisfy(:build_env => false) { OS.mac? } + def message + "is not needed on Linux, where iconv.h is provided by glibc" + end +end + class Libiconv < Formula desc "Conversion library" homepage "https://www.gnu.org/software/libiconv/" @@ -15,6 +23,8 @@ class Libiconv < Formula keg_only :provided_by_macos + depends_on MacOSRequirement + patch do url "https://raw.githubusercontent.com/Homebrew/patches/9be2793af/libiconv/patch-utf8mac.diff" sha256 "e8128732f22f63b5c656659786d2cf76f1450008f36bcf541285268c66cabeab" diff --git a/Formula/libid3tag.rb b/Formula/libid3tag.rb index 642ec935ff081..5b96c05589c1e 100644 --- a/Formula/libid3tag.rb +++ b/Formula/libid3tag.rb @@ -14,6 +14,7 @@ class Libid3tag < Formula sha256 "75e446174dd2a9dc17326c998757c4218a89cddb734f3000d0b0506de801732a" => :el_capitan sha256 "07ef662e3ab9be0cce16eabb13dbc046fc60c42184ac003285371dc955859697" => :yosemite sha256 "d832f73e16b185fed6a66d2f00199a7d76411e438854988262463f4769b40d5b" => :mavericks + sha256 "b7230b9f4ebfee12518bf90fc51c570de0952c0cc4cfaca5744733de90db1838" => :x86_64_linux end # patch for utf-16 (memory leaks), see https://bugs.launchpad.net/mixxx/+bug/403586 @@ -47,6 +48,20 @@ class Libid3tag < Formula sha256 "5e86270ebb179d82acee686700d203e90f42e82beeed455b0163d8611657d395" end + unless OS.mac? + # fix build with gperf + # https://bugs.gentoo.org/show_bug.cgi?id=605158 + patch do + url "https://gist.githubusercontent.com/iMichka/c23ea881388319b38838183754349bba/raw/4829ff0702a511f96026369676a11edd9a79ab30/libid3tag.diff" + sha256 "00f04427c6b3bab2bb8595f6df0ebc774b60031ee60428241801ccf6337d4c5d" + end + end + + unless OS.mac? + depends_on "gperf" + depends_on "zlib" + end + def install system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking" system "make", "install" diff --git a/Formula/libident.rb b/Formula/libident.rb index 4ac25536671a1..cd57e8e5db5f3 100644 --- a/Formula/libident.rb +++ b/Formula/libident.rb @@ -14,6 +14,7 @@ class Libident < Formula sha256 "6236d3b4ee424795859cc64da30997ff67f7ac5bd42702e8eabe10f99339ca48" => :el_capitan sha256 "53db8e889d8efa34b4a3b6a145bcec2bcb53595e7db0cfdd55c8d857dff3a442" => :yosemite sha256 "d8e20cc9d2015b83785d4eb05110afc082a6389267df82546cc89e693dd2db6a" => :mavericks + sha256 "edb435b6f2b0049b9ed2bfb72471cd78471797f1b0de93d566a1e30a8aa40e68" => :x86_64_linux end def install diff --git a/Formula/libidl.rb b/Formula/libidl.rb index d8d3bc08edff6..3a77667ee765a 100644 --- a/Formula/libidl.rb +++ b/Formula/libidl.rb @@ -11,6 +11,7 @@ class Libidl < Formula sha256 "6221a3b0ea37b55c26bc1f83c84ce3e027a8925b92d63055a51fe3a7d6bdff19" => :mojave sha256 "9b07bec68567266f1bc065b05afdb9b034c0c70548145d7cdd963b5958c8da30" => :high_sierra sha256 "ecabcc1a9cd229a135557f0f8bc32a38d03d399ff6816b0fc897cc4bcf72cd1c" => :sierra + sha256 "17f46235b3351f513b02ef92deca3ce690606760749765a2141a57ae3d960a15" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libidn.rb b/Formula/libidn.rb index cc20ce67c2505..11a292513c024 100644 --- a/Formula/libidn.rb +++ b/Formula/libidn.rb @@ -12,6 +12,7 @@ class Libidn < Formula sha256 "94e508f0b66a0c37c7a05dad6fff49542439a05cf913980caff4142e58ae998f" => :high_sierra sha256 "ddbdf99759b5bf8840afdf4b50de61b3770fab70d26e08c0cd54c8df54c7da7d" => :sierra sha256 "11f95f7689146cda4ee3960295cd39f9ec5c613871e35c27d0260c7bd8eeb199" => :el_capitan + sha256 "6cd5a84f577a405d27ed9a90338eed72fedf37cbd26865a51e34670d32ef6553" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libidn2.rb b/Formula/libidn2.rb index 41d1e0c4f646f..3342c083d8b5a 100644 --- a/Formula/libidn2.rb +++ b/Formula/libidn2.rb @@ -9,6 +9,7 @@ class Libidn2 < Formula sha256 "0908585cca518a83f101b2edc0417a26a4b4fc8b76e393c6f6672de6e595c914" => :catalina sha256 "d56e7ff347b0a4c2c433cd44564dfef74c9f1b237ef913307e152314677e1360" => :mojave sha256 "4530dd74cbd31c49b0f499eda0f9ea29ec7ff6ae00f9aff3974247365d1fb21e" => :high_sierra + sha256 "19ba112bede8c0b913033880b7403a1616b3033c41ed46de57c00f421bdd1668" => :x86_64_linux end head do @@ -21,7 +22,11 @@ class Libidn2 < Formula end depends_on "pkg-config" => :build - depends_on "gettext" + if OS.mac? + depends_on "gettext" + else + depends_on "gettext" => :build + end depends_on "libunistring" def install diff --git a/Formula/libilbc.rb b/Formula/libilbc.rb index 49f3bbfd39651..d085eac45bf28 100644 --- a/Formula/libilbc.rb +++ b/Formula/libilbc.rb @@ -13,6 +13,7 @@ class Libilbc < Formula sha256 "fff34390e949e037bb4b16937b62ab4993f55d2fb805656116ceab6a7c9b6e83" => :el_capitan sha256 "7f16b3e0f254f35be8b6275339dc813a6443f65d1c27e1748e08835a49733f6f" => :yosemite sha256 "7aa8495e4050ea38152ec218452d6fac97387ad385a6d63806238e838664471b" => :mavericks + sha256 "8096937f92b1598799672c132fca870e8f6e4b5056b920b81cdd74b22d0701da" => :x86_64_linux end def install diff --git a/Formula/libimagequant.rb b/Formula/libimagequant.rb index 458a0b30fdb08..9949f95f1aef4 100644 --- a/Formula/libimagequant.rb +++ b/Formula/libimagequant.rb @@ -9,6 +9,7 @@ class Libimagequant < Formula sha256 "31bc66699e19c2874ace33dc919782b6effefa53bdcb6bfe804f954e9d4df1bf" => :catalina sha256 "65b36c32d15e2605ab813007436090f2004c50062dd68a806fe324e832f62e06" => :mojave sha256 "9f2444bbeed8e96b5a575dd6d9168330f5aa9609aae13919eb50576d2b93e994" => :high_sierra + sha256 "d61468342d59ee839cd17987cf5839ba63ab9bfb18dba0716fb5390e46fec2ae" => :x86_64_linux end def install diff --git a/Formula/libimobiledevice.rb b/Formula/libimobiledevice.rb index 2800de7f84666..36655c64a549e 100644 --- a/Formula/libimobiledevice.rb +++ b/Formula/libimobiledevice.rb @@ -9,6 +9,7 @@ class Libimobiledevice < Formula sha256 "eb7f28d86797461d5ef859d00629176e1ce3234790ef17b9ee3f9c9990a664e2" => :catalina sha256 "5143eaf34011a22dd1951f10495a7568e77a2e862fb9f4dbae9bab2f784f926e" => :mojave sha256 "072d224a0fa2a77bccde27eee39b65300a387613b41f07fc677108a7812ec003" => :high_sierra + sha256 "4aee409e60e657edc0f5127aafd198cdf4a09aece3c296ad55702644572518f3" => :x86_64_linux end head do diff --git a/Formula/libinfinity.rb b/Formula/libinfinity.rb index 059c77cc1268a..17a91ad96291c 100644 --- a/Formula/libinfinity.rb +++ b/Formula/libinfinity.rb @@ -10,6 +10,7 @@ class Libinfinity < Formula sha256 "8c9bdd8c7cfb58b1f8c9ce451881c620d574ac749ff0f40e4efa87c0faebba26" => :mojave sha256 "ea90d469694a6da2dd087ceb5f77fc9294b0ce7cee678d135ad466c3a1ae636d" => :high_sierra sha256 "6dd59d33bdc050e1e61d5a7a6efa79a83c0130c237f04c678f7e8fe6a455e4df" => :sierra + sha256 "b115b475338a4ca2aaf87870b893a4b4100bbec3a298bd2c32d1bb49bdb23b71" => :x86_64_linux end depends_on "pkg-config" => :build @@ -69,9 +70,9 @@ def install -lgsasl -lgthread-2.0 -linfinity-0.6 - -lintl -lxml2 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libiodbc.rb b/Formula/libiodbc.rb index 5ab21c10c51fd..01438c1ef7f5f 100644 --- a/Formula/libiodbc.rb +++ b/Formula/libiodbc.rb @@ -10,6 +10,7 @@ class Libiodbc < Formula sha256 "1472bb0987705537158b7c3196d27d01ba02d6c0fdcca733f3cf8d53eca29c5d" => :mojave sha256 "77a4fb5fa3036a831e05e2a83585ac2fcdcdf4cf83baa72f28cfb2f8a659ba13" => :high_sierra sha256 "abc07f2fe98ed04c4dc5bd5cada2ea68fb9be56337ed442393609f0a22ec21e8" => :sierra + sha256 "c0e2b529a96f39dc5af6c0d69d5089efa13e28a4823926360b066de2f142117f" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libiptcdata.rb b/Formula/libiptcdata.rb index 56adf1eed362b..5b656cd46d67f 100644 --- a/Formula/libiptcdata.rb +++ b/Formula/libiptcdata.rb @@ -10,6 +10,7 @@ class Libiptcdata < Formula sha256 "78dc7bb6b1e5bcccc1c0c9ef158b8d423f782aa455b1b10c3eebb29de6e7fa58" => :mojave sha256 "62f4a032075fbf0b9a43ef474b784bae7c47d503483bdc2e09e851c5568345e3" => :high_sierra sha256 "0a9cd6e750e496cd4eb9797ac34d3659c8dc2bb6977020def1edb2ee60711a39" => :sierra + sha256 "7f9b08a8c811698bef704d6f07486e4cc0df0783d32ad2af750ace1d1ed37630" => :x86_64_linux end depends_on "gettext" diff --git a/Formula/libiscsi.rb b/Formula/libiscsi.rb index 2b117f3494c93..08e3e9af48eb9 100644 --- a/Formula/libiscsi.rb +++ b/Formula/libiscsi.rb @@ -11,6 +11,7 @@ class Libiscsi < Formula sha256 "473988c2ba81d9d9cf6eb21f2f3d41ade13e76131a2c2aabdade9983c79f99ed" => :mojave sha256 "c05b614ecbacf4f957777c33144924322147b40b898fbb1acf91b72663e35203" => :high_sierra sha256 "832760665cad678de3079365edc72bc21d946dd03ecff9304220b9972a29dd8c" => :sierra + sha256 "15397ee12c43f009f7990487bcd6e01f658c9d89cb1e5ea6c8c6c34a01d93dc9" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libjson-rpc-cpp.rb b/Formula/libjson-rpc-cpp.rb index e69d93c4545eb..8864642e31df8 100644 --- a/Formula/libjson-rpc-cpp.rb +++ b/Formula/libjson-rpc-cpp.rb @@ -11,6 +11,7 @@ class LibjsonRpcCpp < Formula sha256 "b8a99a97b7ebbcb40cc19ad3f4805a93270e376fe7ef4ccbc02235c0f94f4c74" => :catalina sha256 "15fbc327291d065a0a691f14ea90367923296da22a4012247a2083ebec8eca3b" => :mojave sha256 "d3e24865583d50b44a833b08fb90093a2db62bda4615e3c734ffe5cd2bda23ff" => :high_sierra + sha256 "8d960b30033558dd03da4428d0b8ff8b007e94bdf83cd5bbd2b317bf478ed8b7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libjwt.rb b/Formula/libjwt.rb index c29730c1c929a..6b3c06a382700 100644 --- a/Formula/libjwt.rb +++ b/Formula/libjwt.rb @@ -9,6 +9,7 @@ class Libjwt < Formula sha256 "247bde97c3bc0b297d83a4f3234ed44c6e5c84f94bbbbb794654b7d9ec4a176a" => :catalina sha256 "b89dfc9c94b697150d3ec8d9b18208755c8253f4e2657f87111db10c288851d6" => :mojave sha256 "27966254d5e40f91dd93b012ce65677829727498d5aef1321cf26e884944c545" => :high_sierra + sha256 "f6d0fb0f34c82096ae719f14ece201574dcf7120002fa3a5e0eddf24dacd1110" => :x86_64_linux end depends_on "autoconf" => :build @@ -38,7 +39,7 @@ def install return 0; } EOS - system ENV.cc, "test.c", "-L#{lib}", "-I#{include}", "-ljwt", "-o", "test" + system ENV.cc, "test.c", "-L#{lib}", "-I#{include}", "-ljwt", *("-Wl,-rpath=#{lib}" unless OS.mac?), "-o", "test" system "./test" end end diff --git a/Formula/libksba.rb b/Formula/libksba.rb index 1f6d6bec7b712..79ec10a22b2f5 100644 --- a/Formula/libksba.rb +++ b/Formula/libksba.rb @@ -9,6 +9,7 @@ class Libksba < Formula sha256 "14b9bc72288c2fc4061ea49261427aa9e00738a383433302ff86ae18095b2f4a" => :catalina sha256 "153e805e508005ebd9c8eca39b4027f35cddcc123583a421664746dda51ddbc9" => :mojave sha256 "ed07783410f48fe767e96ad596b570ccd0d849715af99b84f99918428953a9a5" => :high_sierra + sha256 "2940af0dca37428f21fd62ee0cce5666234385a73435350d3ae24edc7673776a" => :x86_64_linux end depends_on "libgpg-error" diff --git a/Formula/liblcf.rb b/Formula/liblcf.rb index 306cea58db991..13d672a858030 100644 --- a/Formula/liblcf.rb +++ b/Formula/liblcf.rb @@ -11,6 +11,7 @@ class Liblcf < Formula sha256 "1765ea5fd438e35c255104fcf3670f4fb20b44b0d88dfc5579deeb95fd0567a1" => :catalina sha256 "626aeacfaba89b8d5bb57945c4f82c33758e7a78de2b2d87261e6e83e874a7bc" => :mojave sha256 "b508d5fd894f0962328296f0d292eb3cd88e48d42d20e75934b7b9abad62c53a" => :high_sierra + sha256 "ceb6f33dda029e2f510741eb4e6c6fc45ea13fdf797c84dcd8cc00f315d4dfae" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/liblo.rb b/Formula/liblo.rb index d95db253e00bc..a4b4e110d9ca3 100644 --- a/Formula/liblo.rb +++ b/Formula/liblo.rb @@ -9,6 +9,7 @@ class Liblo < Formula sha256 "aac4280d5e147a6baab53c252bbf7cda296fe5bdeceb26d7aa60acb10ecc5444" => :catalina sha256 "3310110ec91fb412b8d5c727bda03454aebec087d78ebada20bb53ad9582088e" => :mojave sha256 "034eaec236ee4df490d16db9998ec7a4d88223d929b333c8b08ade641bc74bcb" => :high_sierra + sha256 "1d22e5739b849c6cf6dfe80e12a2789d18d9b6756047afe65faec18402acba2d" => :x86_64_linux end head do diff --git a/Formula/liblockfile.rb b/Formula/liblockfile.rb index a182c920f6cb3..b69c9bf89e741 100644 --- a/Formula/liblockfile.rb +++ b/Formula/liblockfile.rb @@ -8,6 +8,7 @@ class Liblockfile < Formula sha256 "e5991a3eac0b5cd41f2850d73643607c33bb41b7014105f0ed80b75c5e7ef866" => :catalina sha256 "18663ff713cb46c514546f5a73026deb4e3df5b701b082b5cd68275581b05ba8" => :mojave sha256 "bc532693f97e4d14ac59974b80f5a31b121b5cc404efb2aacda1c1607f4bcf5b" => :high_sierra + sha256 "7706bb498c44a406364bed062c99f719bbcfae21b49125b1861737d09af50b69" => :x86_64_linux end def install diff --git a/Formula/liblouis.rb b/Formula/liblouis.rb index a6971cbda8bae..0b1d24682c484 100644 --- a/Formula/liblouis.rb +++ b/Formula/liblouis.rb @@ -9,10 +9,12 @@ class Liblouis < Formula depends_on "pkg-config" => :build depends_on "python@3.8" end + bottle do sha256 "d90fc8996fd09ba5154fb9cc597a8a588834b95511b50c589020a875ed0f4feb" => :catalina sha256 "ce4feb9450cb8cbbaf70f885c04ca84d4136eed237bfaa7876ef5ae22491a272" => :mojave sha256 "d3527a68640b4bf5f2c174299e472709e8b6c149b37882854e4aaa7efd0fc2b2" => :high_sierra + sha256 "ed2ddf9991d213f84211413b93eb6c1b09d5605cc5e72b8de9b080d0b6c5301b" => :x86_64_linux end head do diff --git a/Formula/liblqr.rb b/Formula/liblqr.rb index 01d9708fd10c2..b1a9ac5fd06cb 100644 --- a/Formula/liblqr.rb +++ b/Formula/liblqr.rb @@ -12,6 +12,7 @@ class Liblqr < Formula sha256 "18803ed552ae07c1998c87ba6c4ebaee1ec5eaab843c2cfa2cc3775f0b55da23" => :catalina sha256 "83054ddb4fffb94ea12f609a90082220a451bfdc793284d104f1fdeaf4aa8fd6" => :mojave sha256 "43e9b4f518364d436b53c89b1ac42e2cfdcafc47fad1ba711bd6456122e47d62" => :high_sierra + sha256 "d316f7e59d5f1f3743dd483005ad7137e4becc0f756f00221429da8c4efbbd97" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libltc.rb b/Formula/libltc.rb index f2e5805db92fc..0dbd9efff8f1a 100644 --- a/Formula/libltc.rb +++ b/Formula/libltc.rb @@ -10,6 +10,7 @@ class Libltc < Formula sha256 "aecfd413335e0981c5ac452bc0b81bee57d3a4e5974237f5b6a64aae734369cf" => :mojave sha256 "30f7ddada1d191c63214d44d9acec4862e71bca2ee67368c8546ec7240f65a9a" => :high_sierra sha256 "1c51db3447916e208601775d43fb248bdc76f3b29b6f309ccc74eddc0a11c9c6" => :sierra + sha256 "00655f14f0ac116120e24ccda52013edb5eb7a6ca700fc19ae25413422b3cfb7" => :x86_64_linux end def install diff --git a/Formula/liblwgeom.rb b/Formula/liblwgeom.rb index ea5c9d34fb5fe..47971d53d7028 100644 --- a/Formula/liblwgeom.rb +++ b/Formula/liblwgeom.rb @@ -10,6 +10,7 @@ class Liblwgeom < Formula sha256 "f3b78efd42b006412552ed9ee5ba052a6ab830d26f4076ea9dfe8213a267e54f" => :catalina sha256 "a103205f3d0034886edca7d456f56184fb209b2878ff5f31351172d7dae6b77c" => :mojave sha256 "fb2c01c298317d9705c3a81b223ebef6c391351135c66359fe7a97f6868d7fa5" => :high_sierra + sha256 "cfddb3b87269820362db2bd7b8bd1cd9cf2116dbacec96a78c45edfbeb5c6fa4" => :x86_64_linux end keg_only "conflicts with PostGIS, which also installs liblwgeom.dylib" @@ -23,7 +24,6 @@ class Liblwgeom < Formula depends_on "geos" depends_on "json-c" depends_on "proj" - uses_from_macos "libxml2" def install @@ -67,7 +67,8 @@ def install return 0; } EOS - system ENV.cc, "test.c", "-I#{include}", "-I#{Formula["proj"].opt_include}", + system ENV.cc, *("-Wl,-rpath=#{lib}" unless OS.mac?), + "test.c", "-I#{include}", "-I#{Formula["proj"].opt_include}", "-L#{lib}", "-llwgeom", "-o", "test" system "./test" end diff --git a/Formula/libmaa.rb b/Formula/libmaa.rb index 50d056a75641f..ec33d84537070 100644 --- a/Formula/libmaa.rb +++ b/Formula/libmaa.rb @@ -9,6 +9,7 @@ class Libmaa < Formula sha256 "d9ad37a60f4f1f2eac61cf6a5b85ea1948eda86c65adb26a82c11f8abf70bb0c" => :catalina sha256 "5f06991bd6aa87dbd9c82db5d7cf701cb6431dcf8debd7404dfb611fa07a5e69" => :mojave sha256 "5741f3bb649eeb3b6371eaa13dcda342227d8b2f86bc547d1a0abe97561f8521" => :high_sierra + sha256 "29a772851528ee9263e6271c3542519fb1bf854f9b9196104f4eade34a6d8d1c" => :x86_64_linux end depends_on "bmake" => :build diff --git a/Formula/libmagic.rb b/Formula/libmagic.rb index 69cf8b682e1b7..98b15f74aafc4 100644 --- a/Formula/libmagic.rb +++ b/Formula/libmagic.rb @@ -8,6 +8,7 @@ class Libmagic < Formula sha256 "90b17cb74e853804227abdd32c6810ff535fb98e8862f946c49860b697faece0" => :catalina sha256 "f32eb14fbef470d28a041ddefec932e8d96870b4a13dbac3f61d8c6de6e50f29" => :mojave sha256 "110d2db0b588dc5a379124d024b228e8ee8aae58c95a6a0510e68dc36426a86a" => :high_sierra + sha256 "fa24ab8447b58ec9cc2e1313ddbf3ccb75e626d2b0c63edf9d06a2e7dc65911d" => :x86_64_linux end uses_from_macos "zlib" @@ -41,7 +42,11 @@ def install puts(magic_file(cookie, argv[1])); } EOS - system ENV.cc, "-I#{include}", "-L#{lib}", "-lmagic", "test.c", "-o", "test" + if OS.mac? + system ENV.cc, "-I#{include}", "-L#{lib}", "-lmagic", "test.c", "-o", "test" + else + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lmagic", "-o", "test" + end cp test_fixtures("test.png"), "test.png" assert_equal "image/png", shell_output("./test test.png").chomp end diff --git a/Formula/libmatio.rb b/Formula/libmatio.rb index 0ab28ec070103..ea5b5a9337147 100644 --- a/Formula/libmatio.rb +++ b/Formula/libmatio.rb @@ -10,6 +10,7 @@ class Libmatio < Formula sha256 "5b8bf79fa47dddfa85405fc2e0ea4e0ca44d9154ff690144568b1b8d334edd03" => :catalina sha256 "fb0f8804978485fedcdd4cd8b6800840aa0b25778be9bbfab29b4dcabb76f5d8" => :mojave sha256 "961900fbb90c3c37a0e1607bead7c92baa23f289afaee607775731303e335b4b" => :high_sierra + sha256 "c89ae38a2488c4f2a3233ac5e34e1e4d5155103303aefc3f8f551d8f90ebf405" => :x86_64_linux end depends_on "hdf5" diff --git a/Formula/libmatroska.rb b/Formula/libmatroska.rb index ecc0fdb8fdaca..22c2c81c6e484 100644 --- a/Formula/libmatroska.rb +++ b/Formula/libmatroska.rb @@ -10,6 +10,7 @@ class Libmatroska < Formula sha256 "6e0fcb6eaab382b943734853dc74b58abc88d1a6b58623aed85c2d3d62676a06" => :catalina sha256 "d6ccd27705a5ec5b414f1373fde91ed7e4b27b1a98ddadf92ce14dd879e7f2fb" => :mojave sha256 "d55b378401f82f39c47af6cc4568c7ddf4d1a18534515b58927112539bd3dce2" => :high_sierra + sha256 "c6f231845e08495598f97973538ea69e0b3e0abef27c0e40ae64b16b128b44f2" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libmaxminddb.rb b/Formula/libmaxminddb.rb index 04e902e22ba81..165792a39833f 100644 --- a/Formula/libmaxminddb.rb +++ b/Formula/libmaxminddb.rb @@ -9,6 +9,7 @@ class Libmaxminddb < Formula sha256 "737fa40053d963f1c658c1de368d467309eb716869350192fc844aff3a078c23" => :catalina sha256 "bf9f7295d6295f51d94e88562dca6b5d979bd0d141cd74c0cfa78941d4b74d7a" => :mojave sha256 "960dd0e63819fc6fb50c83085f013df073308e35df378e2ab5916f96da71389e" => :high_sierra + sha256 "3cf98d5ee57b73591b43a49ec945e9227b80d82c10b22075e42f612010310859" => :x86_64_linux end head do diff --git a/Formula/libmemcached.rb b/Formula/libmemcached.rb index a1363a311a088..71cc81ed84d16 100644 --- a/Formula/libmemcached.rb +++ b/Formula/libmemcached.rb @@ -11,6 +11,7 @@ class Libmemcached < Formula sha256 "24c7d9597b28d79f50f86777aa506b1955737d9e3298e1d79c3ad95b74fb66f8" => :catalina sha256 "203121f43d48b8245a1bb963eded3d56aa44ec921176b9819004e62b12acdc48" => :mojave sha256 "59032bd9e04061aaa7ffafdda12e66535f2e73da25571da0cede2dc21bc62f22" => :high_sierra + sha256 "0b7430e9e2d048e10580161acd2e3138800d71a1e200fd937645eb8d97443a13" => :x86_64_linux end depends_on "memcached" => :test @@ -60,11 +61,19 @@ def install memcached_free(memc); } EOS - system ENV.cc, "-I#{include}", "-L#{lib}", "-lmemcached", "test.c", "-o", "test" + if OS.mac? + system ENV.cc, "-I#{include}", "-L#{lib}", "-lmemcached", "test.c", "-o", "test" + else + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lmemcached", "-o", "test" + end memcached = Formula["memcached"].bin/"memcached" # Assumes port 11211 is not already taken - io = IO.popen("#{memcached} --listen=localhost:11211") + io = if Process.uid.zero? + IO.popen("#{memcached} -u root --listen=localhost:22122") + else + IO.popen("#{memcached} --listen=localhost:11211") + end sleep 1 system "./test" Process.kill "TERM", io.pid diff --git a/Formula/libmetalink.rb b/Formula/libmetalink.rb index 8bee4dcd754d6..c4f9993c8c4af 100644 --- a/Formula/libmetalink.rb +++ b/Formula/libmetalink.rb @@ -13,6 +13,7 @@ class Libmetalink < Formula sha256 "4ca3f82ac2e2520c677def661168c6ba14ee2b8f0139fbe33cf5be66745244d3" => :el_capitan sha256 "e627cde406e135a735fd2586622d2fa05cf6ef9fda8a0ea08d09ddfce20dca75" => :yosemite sha256 "9ff31fac7dcd9f9231c067eff04d9b59e1de9f8416142d519799746dbfa34c24" => :mavericks + sha256 "7f8f2b1fbedd2c845252928f3f379cc3d411fca1cd6d546f26e7d4d084017fa7" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/libmicrohttpd.rb b/Formula/libmicrohttpd.rb index 20b68eaa42ec2..575e66cabd440 100644 --- a/Formula/libmicrohttpd.rb +++ b/Formula/libmicrohttpd.rb @@ -11,6 +11,7 @@ class Libmicrohttpd < Formula sha256 "065c03c15e7cddac444a335ae9a4a581b9cb10f9ea4edbafab86cb9ec083ce49" => :mojave sha256 "2b022a903526ca0d939b8660fd1d9ca82877c29734b177bb865631a6fbf0e375" => :high_sierra sha256 "60a0909d2d0f9784060686b71c58afae980601141d19d20d62c78c451467245c" => :sierra + sha256 "2eda68cec5ddcef0761a3c1f4a22d3005580682cb73ee80478ab4dbd9a5102c0" => :x86_64_linux end depends_on "gnutls" diff --git a/Formula/libmikmod.rb b/Formula/libmikmod.rb index cdec48f65bade..686d950e15374 100644 --- a/Formula/libmikmod.rb +++ b/Formula/libmikmod.rb @@ -12,6 +12,7 @@ class Libmikmod < Formula sha256 "f7785b9a4f95ff28d55ffd022780ed1cd9bde139b3482cc4f52b862cd9abf247" => :sierra sha256 "202b59906b8113d694f9c1e81df7a5f00f8afbc9e66a2b1188674058a64ae206" => :el_capitan sha256 "8276808d976d108dd2768cacb5b54bf570ef6662b8855e7d3537e0ffaaeb1a19" => :yosemite + sha256 "be7aefb9f7630a6626b95611782862c529bac8df955e8a4d16ef9bf25b2c2928" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/libmill.rb b/Formula/libmill.rb index 5b4da8aff3e18..de671b207c49c 100644 --- a/Formula/libmill.rb +++ b/Formula/libmill.rb @@ -12,6 +12,7 @@ class Libmill < Formula sha256 "6eb891740171f0471d420da7e92df829dd64e108cdf115588a639f6be3906e0a" => :sierra sha256 "37103d981777f9c30dda9add67a2cafc72b405ee7d10ac3a32b1f267b0b5cda5" => :el_capitan sha256 "4f8a2b4ddbcac88459c0f4b463e497a82e8d6a02b43419e29e2be8230c15123d" => :yosemite + sha256 "41d12c56fbbadb54a3d8590d90a1f3553191dd343674a6b9d9e0fe4435f1c0c5" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libming.rb b/Formula/libming.rb index 947beee9b3785..5debeab47aed8 100644 --- a/Formula/libming.rb +++ b/Formula/libming.rb @@ -10,6 +10,7 @@ class Libming < Formula sha256 "9c37f5438fb510747686c52cfd2070007ccbb57ecdfb256e344713764aae8782" => :catalina sha256 "6c4230cfec9255a8f4f4d029414807726b44a1fcd597920c2502a1c5ad84ba52" => :mojave sha256 "50d6199171c5d8bc5b7cfb24e6befe9f2c7aefc12d8ee7127202fcf1ea646ae4" => :high_sierra + sha256 "044092c7e26caf5808fcc10a34743289e2d87a406407cd8075ffb37029ab8964" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libmnl.rb b/Formula/libmnl.rb new file mode 100644 index 0000000000000..5380b197daa3f --- /dev/null +++ b/Formula/libmnl.rb @@ -0,0 +1,46 @@ +class Libmnl < Formula + desc "Minimalistic user-space library oriented to Netlink developers" + homepage "https://www.netfilter.org/projects/libmnl" + url "git://git.netfilter.org/libmnl", + :tag => "libmnl-1.0.4", + :revision => "0930a63252958f40bb0f9d09de86985c25cea039" + + bottle do + cellar :any_skip_relocation + sha256 "b2ea8cee83f8849eb17544ebe72cd17316433cdbf18f9401dab2382bdcf41091" => :x86_64_linux + end + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + depends_on :linux + + def install + system "./autogen.sh" + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + (testpath/"test.c").write <<~EOS + #include + #include + #include + #include + + #include + #include + + int main(int argc, char *argv[]) + { + struct mnl_socket *nl; + char buf[MNL_SOCKET_BUFFER_SIZE]; + } + EOS + + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lmnl", "-o", "test" + end +end diff --git a/Formula/libmodbus.rb b/Formula/libmodbus.rb index 64924702c86c8..8f81e6bdcd5e6 100644 --- a/Formula/libmodbus.rb +++ b/Formula/libmodbus.rb @@ -10,6 +10,7 @@ class Libmodbus < Formula sha256 "0dd32373b5988d09317728357780b3cdc54cad290afcb51b390f33a50fa653e0" => :mojave sha256 "d821c77d787cf51c96811c37374d5cc42c7948636c84d7b7b6251a7e0afa29a0" => :high_sierra sha256 "462dd4e48e87bab1e48ef64f3f3a907392994a9f8c0753c8b739ca5207882b32" => :sierra + sha256 "86458cab51fd996c53df86f6d21ebc6ff2f08f3c9079af1463c36935baf56c8e" => :x86_64_linux end head do diff --git a/Formula/libmodplug.rb b/Formula/libmodplug.rb index f829fdc5f63fc..3212fb195c936 100644 --- a/Formula/libmodplug.rb +++ b/Formula/libmodplug.rb @@ -12,6 +12,7 @@ class Libmodplug < Formula sha256 "3f46eca3704d441ba8133d71bd283e8d24cff61e8b903fff720b78932185f9bf" => :high_sierra sha256 "fc88a11e82b19a1a0aa4ada0ed3468147464d3414c3e9dffda9cea139b195c9d" => :sierra sha256 "968a0bdc082725f136ab94f3a7eaf5a6a376eb94ec03b45f49ab275bd9193318" => :el_capitan + sha256 "a267c9306a29ae0b5987eec09cdb090712f8b2c94f5b8a97d62e68dd5ee56309" => :x86_64_linux end resource "testmod" do @@ -51,6 +52,7 @@ def install # Second, acquire an actual music file from a popular internet # source and attempt to parse it. resource("testmod").stage testpath + mv "downloads.php?moduleid=60395", "downloads.php" unless OS.mac? (testpath/"test_mod.cpp").write <<~EOS #include "libmodplug/modplug.h" #include diff --git a/Formula/libmowgli.rb b/Formula/libmowgli.rb index 8bed3947d5d16..024f9f908984d 100644 --- a/Formula/libmowgli.rb +++ b/Formula/libmowgli.rb @@ -12,6 +12,7 @@ class Libmowgli < Formula sha256 "68656add47085df19786c9d419d7dd2e880514f3a5fa63838362ef92807c3420" => :mojave sha256 "061c1fc5a942024894205ee47a5ffc41fae5dde42ca6b744f66dad5d4a2e60fe" => :high_sierra sha256 "a83b21ccd87a25d26122ab813afbd24ef6bc07e6c92b16db11813d4fab71a055" => :sierra + sha256 "7cc49204cb2aa396e28c2a89567b23235e7a6cd6525673d2ac266a8c59202724" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/libmp3splt.rb b/Formula/libmp3splt.rb index 514fc0f87f62d..1a1911555c437 100644 --- a/Formula/libmp3splt.rb +++ b/Formula/libmp3splt.rb @@ -10,6 +10,7 @@ class Libmp3splt < Formula sha256 "d929bb92be95a49b808d087be5e88100bc23c423100da1afd86422cf0ed3d6cb" => :mojave sha256 "71eb2ec5137acc03b95dbfdfadbb88c6bade2cb1548cce2655876971e346707a" => :high_sierra sha256 "805407189fbd468b036493996832e387395380a2fbda743cafac78876632abf9" => :sierra + sha256 "df0fe08763144831bf9544e2ccda4746623cd3c6730021a363138b89b203fe72" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libmpc.rb b/Formula/libmpc.rb index a8be1fcc77ee1..f45199717fc18 100644 --- a/Formula/libmpc.rb +++ b/Formula/libmpc.rb @@ -11,6 +11,7 @@ class Libmpc < Formula sha256 "3b28ec506ab53ef5f3163e87fb72ae735b7f91ee2fc20fe184cf1241481b72a5" => :high_sierra sha256 "18d620a1612bc51b1fbd1b3b62c9c73766b90549c746740c5a27d2ab1ec5ede7" => :sierra sha256 "6f19f936781dae0db248abdd84a72c3e25451c44379706bc3800760f0aa43888" => :el_capitan + sha256 "b31648a86228a042aaa8e7d58faba7859059910a427f9ef4211b06bd9152f8c2" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/libmpdclient.rb b/Formula/libmpdclient.rb index 4301934cebeb8..901ee903b8919 100644 --- a/Formula/libmpdclient.rb +++ b/Formula/libmpdclient.rb @@ -10,6 +10,7 @@ class Libmpdclient < Formula sha256 "f2b24acc930ccf6f52580122187b1e0b6069e9407674e4a9f795740576f3478b" => :catalina sha256 "bf5948d2521dc3c54a31740765162ef9f4043415b01a1377002597c54bb68324" => :mojave sha256 "4bb5a9d58a7dd3cdb13320ff6a650ce979446e3fa61cabb2aa4954c3ef17e62a" => :high_sierra + sha256 "4e78d8a5f751f6e8f11f93a8390260137929cc69c63145269440878e20b6806c" => :x86_64_linux end depends_on "doxygen" => :build diff --git a/Formula/libmpeg2.rb b/Formula/libmpeg2.rb index 5768b127996ae..0dc936b9c491e 100644 --- a/Formula/libmpeg2.rb +++ b/Formula/libmpeg2.rb @@ -14,6 +14,7 @@ class Libmpeg2 < Formula sha256 "841e93dd99b97b96b475aedff29b58f5be5c4156869b1c0212e5d7ed8dd7f481" => :el_capitan sha256 "3d07c45554ff34036b9eae5a31dc5417c15109ba134d414035b1bf6f9dda7c79" => :yosemite sha256 "f6a868beb10fbf84d3eb1af556478ecbfb238d28608a53b99e607c02910e5e49" => :mavericks + sha256 "e2fb3af22794475ec0c78e176d54a2e60dcb525b132a87989cf9baba59ff6e37" => :x86_64_linux # glibc 2.19 end depends_on "sdl" diff --git a/Formula/libmtp.rb b/Formula/libmtp.rb index 385fd1afa8c89..4bc12b2c3ee1a 100644 --- a/Formula/libmtp.rb +++ b/Formula/libmtp.rb @@ -9,6 +9,7 @@ class Libmtp < Formula sha256 "47ef836719d1fc0ddfc64528d93f1892a4b1db55cc73b025d5824a53956b8ff6" => :catalina sha256 "dab56fa876053034299e6a5e6ccdc56d8f55b2b6eba89cb7fc402d011f3e5318" => :mojave sha256 "89264c49b080c39b588ffa5f4ecad60aaa68aca5baf92a6460defee779c4733e" => :high_sierra + sha256 "315fec802423c2c8a280d5761961d2ccaf1a1a2bdb2eb6527e9ba92d909e409f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libmwaw.rb b/Formula/libmwaw.rb index 6c2b05223f9d1..65650bdf570cb 100644 --- a/Formula/libmwaw.rb +++ b/Formula/libmwaw.rb @@ -9,6 +9,7 @@ class Libmwaw < Formula sha256 "c911649b2829547fe591010dcb908593de7b084c5ec88487cde17a654e84ee5f" => :catalina sha256 "7f226dc382e5a67fbeb2650e97503c53e95274c38b77d34b7e047737796eb42b" => :mojave sha256 "0e16cc626464cd858e158d2dca81d818ce2191ac694168f63f7252b74264e53b" => :high_sierra + sha256 "cf50b7fdf59e50b51db004c3a0549929cd3f5a8b613bec5c8395c869d29f834a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libmxml.rb b/Formula/libmxml.rb index b8e7eae2007a1..059317ca5df10 100644 --- a/Formula/libmxml.rb +++ b/Formula/libmxml.rb @@ -11,9 +11,10 @@ class Libmxml < Formula sha256 "f8e186285e66c760f033ab4205cfa5d05a48d3b5ac2a668c0f3cd4572c0fd151" => :mojave sha256 "bf35de7007c525ef4e179ec3e89df8656b9a206f9390df068585361d90cbd3b6" => :high_sierra sha256 "044434b96bcf9a3097e28c4e85fa5e1e558f2b2dc62c7e8eba6363c664924b68" => :sierra + sha256 "b2e6b1fb7f1eaa4dd4b48bff18eb8a72486cb4d478694eb8ed9ef06927652fee" => :x86_64_linux end - depends_on :xcode => :build # for docsetutil + depends_on :xcode => :build if OS.mac? # for docsetutil def install system "./configure", "--disable-debug", diff --git a/Formula/libnatpmp.rb b/Formula/libnatpmp.rb index b65eb6b7146b7..7779c359f4bfd 100644 --- a/Formula/libnatpmp.rb +++ b/Formula/libnatpmp.rb @@ -11,6 +11,7 @@ class Libnatpmp < Formula sha256 "04c286ebb17bf08728749e390dd9ccabf3fcc4b660ffe4b6f315dcf89012f15a" => :high_sierra sha256 "d1aaa97c827918f7d35d121399cb8f59b4442b94c3283a51b7931f0e008ff934" => :sierra sha256 "667fe1a26fdd6e1a36f6e7b263f2f8e3d01f884da9d9edeb182dbb40b08475ab" => :el_capitan + sha256 "05e5b8a929142a7b6723be3b86c3be5babb36c4fd136866a4b3df7d03b9a64f3" => :x86_64_linux end def install diff --git a/Formula/libnet.rb b/Formula/libnet.rb index d29eb9716cb37..193d8fe2bc7bb 100644 --- a/Formula/libnet.rb +++ b/Formula/libnet.rb @@ -9,6 +9,7 @@ class Libnet < Formula sha256 "0ecfbf2539a6e051ca8aa5962c0ee7cb57ffd173cf654b0eec8152c1a3fbf133" => :catalina sha256 "cadba638a54f4d5646a3510439ab89317ed23df3c45b12704b78065bb127fbc4" => :mojave sha256 "44e7b11e8f900f9d6f8e0d1a5deed99c46078dd2dbc997937f713ce5a1ac0f38" => :high_sierra + sha256 "41583b0b290ff95aa1b8c8721c767577c5f4a86dbc9737fbe8fc76fc15d5006e" => :x86_64_linux end depends_on "doxygen" => :build diff --git a/Formula/libnetfilter-queue.rb b/Formula/libnetfilter-queue.rb new file mode 100644 index 0000000000000..aaaba9d111cd6 --- /dev/null +++ b/Formula/libnetfilter-queue.rb @@ -0,0 +1,58 @@ +class LibnetfilterQueue < Formula + desc "Userspace API to packets queued by the kernel packet filter" + homepage "https://www.netfilter.org/projects/libnetfilter_queue" + url "git://git.netfilter.org/libnetfilter_queue", + :tag => "libnetfilter_queue-1.0.3", + :revision => "601abd1c71ccdf90753cf294c120ad43fb25dc54" + + bottle do + cellar :any_skip_relocation + sha256 "4d200baefd48b50001521721704ba2970bfba3aed152620e4baea747be5bc967" => :x86_64_linux + end + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + depends_on "pkg-config" => :build + depends_on "libmnl" + depends_on "libnfnetlink" + depends_on :linux + + def install + system "./autogen.sh" + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + (testpath/"test.c").write <<~EOS + #include + #include + #include + #include + #include + #include + #include + + #include + #include + #include + + #include + #include + + #include + + int main(int argc, char *argv[]) + { + struct mnl_socket *nl; + char buf[NFQA_CFG_F_MAX]; + } + EOS + + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lmnl", "-o", "test" + end +end diff --git a/Formula/libnfnetlink.rb b/Formula/libnfnetlink.rb new file mode 100644 index 0000000000000..9bef4b3e05df4 --- /dev/null +++ b/Formula/libnfnetlink.rb @@ -0,0 +1,38 @@ +class Libnfnetlink < Formula + desc "Low-level library for netfilter related communication" + homepage "https://www.netfilter.org/projects/libnfnetlink" + url "git://git.netfilter.org/libnfnetlink", + :tag => "libnfnetlink-1.0.1", + :revision => "1166116e34af868bc814aea338c246e49a7a8748" + + bottle do + cellar :any_skip_relocation + sha256 "6935ad517877f2c838d8d44b87519b0862b586bf5344785e0da55d1460de7417" => :x86_64_linux + end + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + depends_on :linux + + def install + system "./autogen.sh" + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + (testpath/"test.c").write <<~EOS + #include + + int main() { + int i = NFNL_BUFFSIZE; + } + EOS + + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lnfnetlink", "-o", "test" + end +end diff --git a/Formula/libnfs.rb b/Formula/libnfs.rb index 9e9f597fed780..1e2ed89972f28 100644 --- a/Formula/libnfs.rb +++ b/Formula/libnfs.rb @@ -10,6 +10,7 @@ class Libnfs < Formula sha256 "e51a653f469f19db8c24f009166b7c63a3d9e48ffd16e687d81e2fc0da52f632" => :mojave sha256 "2c6199b4295a952c6c179811c9190c8741054011f23ed5a051528baf07b44509" => :high_sierra sha256 "668a6d77334fd656ea8ca32c1bb36c9253fb95f1dc701607d722afa6af6aa737" => :sierra + sha256 "2de58298789155d7b0552e43f1e96063db3320121f9423599fa6d69bd515e6fe" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libngspice.rb b/Formula/libngspice.rb index ce57aab8bba99..7f568315bfc8f 100644 --- a/Formula/libngspice.rb +++ b/Formula/libngspice.rb @@ -8,6 +8,7 @@ class Libngspice < Formula sha256 "841f339c398271eb34271fbcdfc0bb8fadf9d17946366f4d846b1e4d6787b54d" => :catalina sha256 "2e23db9a3e98328340cb5d1f91d784d23cd29108b2dd3a598a133effc0e2b983" => :mojave sha256 "a82395ca8c0b71c8ac9727ac327f31123bd88453632d00d7efbc6f2240cd1f31" => :high_sierra + sha256 "0096b9b7f5470942bb8227db503b4b2e3bacb3c5fe114ab8bee00a9ddbbd8610" => :x86_64_linux end head do diff --git a/Formula/libnice.rb b/Formula/libnice.rb index ba185ec6711d2..54a1c0aa6335f 100644 --- a/Formula/libnice.rb +++ b/Formula/libnice.rb @@ -9,12 +9,14 @@ class Libnice < Formula sha256 "1ebb405afa6b66fddbf4c90ab97f3d9e528f1ce3a11c571bc4d5f10c97a812e6" => :catalina sha256 "0d2f05d15e8e188b56758da0c7aaa05109bb85a6c3088e0f9b863d2c10a76961" => :mojave sha256 "7851630de0b1da7adf67c514f4d6df037c05ba4e1a426d22029ac8aa20d38877" => :high_sierra + sha256 "6def5e210d57e9e29977facd5256900fd83e3f0f0e3caf13f10927c4228f6e58" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "glib" depends_on "gnutls" depends_on "gstreamer" + depends_on "intltool" => :build unless OS.mac? def install system "./configure", "--disable-dependency-tracking", @@ -51,16 +53,17 @@ def install -I#{glib.opt_lib}/glib-2.0/include -I#{include}/nice -D_REENTRANT + test.c -L#{gettext.opt_lib} -L#{glib.opt_lib} -L#{lib} + -lnice -lgio-2.0 -lglib-2.0 -lgobject-2.0 - -lintl - -lnice ] - system ENV.cc, *flags, "test.c", "-o", "test" + flags << "-lintl" if OS.mac? + system ENV.cc, *flags, "-o", "test" system "./test" end end diff --git a/Formula/libnova.rb b/Formula/libnova.rb index 4fabc6ce3d683..3233c94e8546c 100644 --- a/Formula/libnova.rb +++ b/Formula/libnova.rb @@ -5,11 +5,12 @@ class Libnova < Formula sha256 "7c5aa33e45a3e7118d77df05af7341e61784284f1e8d0d965307f1663f415bb1" bottle do - cellar :any + cellar :any_skip_relocation sha256 "d7f6515e6a018fd9b9fb47d25610e62cef4f0953fa3c33c7fb3499d5ed0e3f1b" => :catalina sha256 "2bcc962108ffee6fafeae45e5b9eb8f6b233bd2aaa0163f6c89e2f77ddc6eb3f" => :mojave sha256 "08345c100121f219e199a833563b8f35d17e5368b93e3711377cc20acd0dce99" => :high_sierra sha256 "1ef1a9898b97967ba9cabdf002ddcc4b398976f0c9bb7c826f7980ffaef87dd4" => :sierra + sha256 "4712e1ff2877eaeb4da0ea6de97201c6cf2bf77e648d67afcfee00ee22eafcd1" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libnsl.rb b/Formula/libnsl.rb new file mode 100644 index 0000000000000..ba29a64da7802 --- /dev/null +++ b/Formula/libnsl.rb @@ -0,0 +1,51 @@ +class Libnsl < Formula + desc "Public client interface for NIS(YP) and NIS+" + homepage "https://github.com/thkukuk/libnsl" + url "https://github.com/thkukuk/libnsl/archive/v1.2.0.tar.gz" + sha256 "a5a28ef17c4ca23a005a729257c959620b09f8c7f99d0edbfe2eb6b06bafd3f8" + revision 1 + + bottle do + cellar :any_skip_relocation + sha256 "4595f4ad9116022fef72721d411251d667a4ad906bb6d6459125cf36455234ac" => :x86_64_linux + end + + keg_only "it conflicts with glibc" + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "gettext" => :build + depends_on "libtool" => :build + depends_on "m4" => :build + depends_on "pkg-config" => :build + depends_on "libtirpc" + depends_on :linux + + def install + inreplace "po/Makefile.in.in" do |s| + s.gsub! /GETTEXT_MACRO_VERSION =.*/, + "GETTEXT_MACRO_VERSION = #{Formula["gettext"].version.to_s[/(\d\.\d+)/, 1]}" + end + system "./autogen.sh" + system "./configure", "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make" + system "make", "install" + end + + test do + (testpath/"test.c").write <<~EOS + #include + + int main(int argc, char *argv[]) + { + if(NIS_PK_NONE != 0) + return 1; + } + EOS + + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lnsl", "-o", "test" + system "./test" + end +end diff --git a/Formula/liboauth.rb b/Formula/liboauth.rb index cf794ce1034a8..b52a6d0f379f9 100644 --- a/Formula/liboauth.rb +++ b/Formula/liboauth.rb @@ -11,6 +11,7 @@ class Liboauth < Formula sha256 "2cc45826629d726ad5496c7d1ead73844d213f0862c981830645751ff0f678be" => :mojave sha256 "c1f049ca62762088244421339f848a5de1e5e388ced1d15463da00a9b0222784" => :high_sierra sha256 "d3a3ffc611c1d2047e2b56a632e7d4b4e5f4d0657483932fdcd4972455d28f60" => :sierra + sha256 "f558f31475f58cfcc8bbce61a84711a633fe889f73c36c73caf958e9a5701435" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/libofx.rb b/Formula/libofx.rb index 0628fb835aebb..68e86c0f463d2 100644 --- a/Formula/libofx.rb +++ b/Formula/libofx.rb @@ -8,6 +8,7 @@ class Libofx < Formula sha256 "aa4c73d9fe09d54bc4fb0a1dde14bd927949f4d0ce100dae987f03df79236958" => :catalina sha256 "9b731e873dee237f2723fd05aa7f88b0e64f29197297c33e9def68112d7c2fc8" => :mojave sha256 "7c561c3c928ad133d1763afe6a9d25b784d236411f00085151740f3505b164b3" => :high_sierra + sha256 "52ce7edb22483ac2fe19fb8315bd43b4d0d3887ee5e328c327665a8028d1763a" => :x86_64_linux end depends_on "open-sp" diff --git a/Formula/libogg.rb b/Formula/libogg.rb index d81f7ba7623aa..30f3bda9d4446 100644 --- a/Formula/libogg.rb +++ b/Formula/libogg.rb @@ -19,6 +19,7 @@ class Libogg < Formula sha256 "b95bbf935f48878bd96d1c0e6557a017aa18cb17a080bc3ef9308b6415c278ef" => :catalina sha256 "3cc7656859154f6eb98d3ddbe4b74c810b505e2162af1357b3ed6b70cad35125" => :mojave sha256 "95f271ec181f6b999674636272a3414db4242eabd0a0b0572cfa0f1f324f5ef8" => :high_sierra + sha256 "a30b7f16798ae911cc89114f4360495c05196f127a0e6152350c60307fe4df2a" => :x86_64_linux end head do diff --git a/Formula/liboil.rb b/Formula/liboil.rb index a8cef244a0218..0aa5795314f36 100644 --- a/Formula/liboil.rb +++ b/Formula/liboil.rb @@ -14,6 +14,7 @@ class Liboil < Formula sha256 "7d76b7a220caeb8dbaef27b879f4f3ac0ad5b236b563961abd9484e8bc9e0160" => :el_capitan sha256 "9ea78f801296e8643f366d634449a043376e9015e9329dc1c591a9ad55a37b66" => :yosemite sha256 "b7f92d53730febc590a12c4812784428e947c61361354c46f2fef245c0a51bba" => :mavericks + sha256 "d9a3f5e5422b01b9d8e7d234ddd8843ca97c7263064d8d34789c5766285db2d2" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libolm.rb b/Formula/libolm.rb index 9e76ec42caeb3..e73ade5c72a22 100644 --- a/Formula/libolm.rb +++ b/Formula/libolm.rb @@ -9,6 +9,7 @@ class Libolm < Formula sha256 "bbe4e24d1c0a1e584d2feb1b4cdcf2b3b6f995e8e01b48367d2b60d5b25ab2c6" => :catalina sha256 "0bcc49962732ee4eb211fc59abbc803444dab90486539f76605b233bdb765705" => :mojave sha256 "7c5a282fba56d8968e138cd7c36949757397f8cc2ba8446c683cf3b24f5ff6aa" => :high_sierra + sha256 "932520df706720622b76d062d56a54d4ca9d9aa790b2146f31514aec520798ab" => :x86_64_linux end depends_on "cmake" => :build @@ -22,6 +23,7 @@ def install (testpath/"test.cpp").write <<~EOS #include #include + #include #include "olm/olm.h" diff --git a/Formula/libomp.rb b/Formula/libomp.rb index 556dc4273a732..2377d1fee13c6 100644 --- a/Formula/libomp.rb +++ b/Formula/libomp.rb @@ -9,6 +9,7 @@ class Libomp < Formula sha256 "0ea757dbea7bf12141ef1d209d2f3b59919baa0caa0482d7ea6ae9c2dfed2382" => :catalina sha256 "aecd306b605763dbd06c73b5d470c924643b48c051f06d8a4e70be705052c8ee" => :mojave sha256 "ddfbe1ab7c6dafc45c787d6b4ae19fffb6465bbc0aef007b728cb98ba0d6d2b1" => :high_sierra + sha256 "2113ad956255342bc2263ad658755660a83f0271995e27d333100165dd08a8f7" => :x86_64_linux end depends_on "cmake" => :build @@ -41,6 +42,7 @@ def install } EOS system ENV.cxx, "-Werror", "-Xpreprocessor", "-fopenmp", "test.cpp", + ("-std=c++11" unless OS.mac?), "-L#{lib}", "-lomp", "-o", "test" system "./test" end diff --git a/Formula/libopendkim.rb b/Formula/libopendkim.rb index 68acdca8292fd..4cabee9092986 100644 --- a/Formula/libopendkim.rb +++ b/Formula/libopendkim.rb @@ -6,10 +6,11 @@ class Libopendkim < Formula revision 2 bottle do - cellar :any + cellar :any_skip_relocation sha256 "76268e02f90b0931a9fd8d2ae933d334c2efb9ee34dc85c77d8eecc25b48c68b" => :mojave sha256 "e5d79e2cd539dff2a02ac91b171b23c0c36d7d012d2a3d21af1cbd732c2ee58a" => :high_sierra sha256 "33a66999fc2479cd6d0d27d2189ed34125e2510afb7afe0c97cdb08ed67efc95" => :sierra + sha256 "7eaaffbdfa45d5d36a0bde7e3f3ef13fdaffe19ce957c1500266a8f2e1048d45" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libopennet.rb b/Formula/libopennet.rb index 59173832b0646..576db3f910b14 100644 --- a/Formula/libopennet.rb +++ b/Formula/libopennet.rb @@ -13,6 +13,7 @@ class Libopennet < Formula sha256 "de1cb9622ec3b6501236af7e66367bc5bbaa20dfb8e3ae328a339bea6d708bab" => :el_capitan sha256 "abcf105b630a05b8a7d26f1a0ba8defafcf31c0dc23e79c3a5f8a9a14878e6de" => :yosemite sha256 "cc3c5f62b47b334019035ab1f34f6f9e8b195f3ea37afa820d8b3dbbb4402eae" => :mavericks + sha256 "5fba5d772168f099ea802a9581a753d39540e6f9ae8fc0d0f33d864fe528cb5d" => :x86_64_linux end def install diff --git a/Formula/liboping.rb b/Formula/liboping.rb index 4c15db35968e9..3dd3c5a75823b 100644 --- a/Formula/liboping.rb +++ b/Formula/liboping.rb @@ -11,6 +11,7 @@ class Liboping < Formula sha256 "42b80e23afe4fb4f296d039b0bdd4ccd0da21937514fdd04a90bc01d39da7aec" => :sierra sha256 "de0bb72a0752469b262db3a24a41c84746930858462cd08993c057caadd46264" => :el_capitan sha256 "c4f46d01bdace450a49e2c4fc4ba4056070bf1b869ed07f1b0a1d6a4f7646bc9" => :yosemite + sha256 "c85669755c8afdc54ec31e0ba30e49589c84cd0ed2ad2b0988e97135d5381fc1" => :x86_64_linux # glibc 2.19 end uses_from_macos "ncurses" diff --git a/Formula/libopusenc.rb b/Formula/libopusenc.rb index 57b754ecb2a97..7acf1e9373683 100644 --- a/Formula/libopusenc.rb +++ b/Formula/libopusenc.rb @@ -10,6 +10,7 @@ class Libopusenc < Formula sha256 "593106e48c86436fd1908c79f1ef54f206bb37f0983ccb3901190cebe6e78cea" => :catalina sha256 "96a05dd8d0071fb38ed14f4f5b64af576baee3719a16fc8fc331ddfa1a4d65ec" => :mojave sha256 "e5cfb0433abe565b11351f9d6ec3fb44852a8aeb99ef8f6710ee9d899eb97ab3" => :high_sierra + sha256 "ef69108275b1dd6b7e8dd5343742520c7f3798c836ac84f9511ef13954d892b7" => :x86_64_linux end head do diff --git a/Formula/libosip.rb b/Formula/libosip.rb index 424ca5596183f..e6da4abe13563 100644 --- a/Formula/libosip.rb +++ b/Formula/libosip.rb @@ -10,6 +10,7 @@ class Libosip < Formula sha256 "7738fc68bf18445a8e9c1d3149507b2ac637a84f1094f4d75626552cdbe1d19c" => :catalina sha256 "1b8267b7239e9f690c214e0a789e0e6781242af462e4115452b19475a52cb57a" => :mojave sha256 "66e2807a297c1eeb853219def838b72a2eba7a8d95238040c26cc01377c5b5cf" => :high_sierra + sha256 "b9d6f144e7a44bb868cf2301b75950610ae351b52eaf940885a068859703bde6" => :x86_64_linux end def install diff --git a/Formula/libosmium.rb b/Formula/libosmium.rb index 521905def4b24..eb713f34d9139 100644 --- a/Formula/libosmium.rb +++ b/Formula/libosmium.rb @@ -10,6 +10,7 @@ class Libosmium < Formula sha256 "dadd63f6645e8f030f245083218f5a6bfd60bf97a6fa7e8a212010a934fa0b1a" => :catalina sha256 "dadd63f6645e8f030f245083218f5a6bfd60bf97a6fa7e8a212010a934fa0b1a" => :mojave sha256 "dadd63f6645e8f030f245083218f5a6bfd60bf97a6fa7e8a212010a934fa0b1a" => :high_sierra + sha256 "ca36628ccad24476de313dae1336cbf3a6aa3de9093ad283ae0f9faa6662e686" => :x86_64_linux end depends_on "boost" => :build @@ -62,7 +63,14 @@ def install } EOS - system ENV.cxx, "-std=c++11", "-stdlib=libc++", "-lexpat", "-o", "libosmium_read", "test.cpp" + system ENV.cxx, + "-std=c++11", + *("-stdlib=libc++" if OS.mac?), + "-o", + "libosmium_read", + "test.cpp", + "-lexpat", + *("-pthread" unless OS.mac?) system "./libosmium_read", "test.osm" end end diff --git a/Formula/libotr.rb b/Formula/libotr.rb index 2b7b1cae9a2ae..3a6625dd1919f 100644 --- a/Formula/libotr.rb +++ b/Formula/libotr.rb @@ -13,6 +13,7 @@ class Libotr < Formula sha256 "43d7a166cd12b611e7bf15dfa3865d18e573a81a218e2aeb0061d51203ecde39" => :el_capitan sha256 "b3f215fd3952f7a97af36500365c3c017f23de107162f4c76b0e48355bd2a358" => :yosemite sha256 "12338de29acd18bb5d7a90552e33b1a353ae7de3f10ab0316dfd6bda379d919b" => :mavericks + sha256 "bb3248b582b0932249aeaa7c62011d251932a0ca00988d8f37739626651a748d" => :x86_64_linux end depends_on "libgcrypt" diff --git a/Formula/libowfat.rb b/Formula/libowfat.rb index a702b0bf32006..baf22e12e6982 100644 --- a/Formula/libowfat.rb +++ b/Formula/libowfat.rb @@ -10,6 +10,7 @@ class Libowfat < Formula sha256 "2424abb2cccd7f41582ea49ccbee60dbecc436c843d9531c0e7c68c35b9330a4" => :catalina sha256 "08041ad3f0edd4b20e6ed1f6c768414aa7241940a14386c1dffd04caa5ef70ca" => :mojave sha256 "4740574a0e5184f8b371b1a7571304810b4fb29a92d60cf54979387dab3448c5" => :high_sierra + sha256 "9585b4987a431232c8a0a4b78642e54512d2385ae9e059de223386fe9c06faed" => :x86_64_linux end patch do diff --git a/Formula/libpagemaker.rb b/Formula/libpagemaker.rb index 007ec0fd87391..6244b189c50ae 100644 --- a/Formula/libpagemaker.rb +++ b/Formula/libpagemaker.rb @@ -11,6 +11,7 @@ class Libpagemaker < Formula sha256 "db0f93e5cf4cb6dfe4810b7cb8240db5c2c439a717d09def2f6163e3db6984c6" => :high_sierra sha256 "0809994f61c8cd34e4edca3496273f293d314e89da5e8ec2a3df280cf436ba37" => :sierra sha256 "10c23ab2759830f22ff8080cd4da18252fb719445bd651ab4664e785682c100a" => :el_capitan + sha256 "f0a09fe03a85e766438bd622ee632f2c65d86f30b69e1aba89876edc5eab73b8" => :x86_64_linux end depends_on "boost" => :build diff --git a/Formula/libpano.rb b/Formula/libpano.rb index 6a181d3019c4b..c1c375cbdb2cc 100644 --- a/Formula/libpano.rb +++ b/Formula/libpano.rb @@ -14,6 +14,7 @@ class Libpano < Formula sha256 "ee3a892768cab28490d0c5719d503faec655ed274b42d21cd93413c269430bfa" => :sierra sha256 "cde19367882bcb0f1ef6aa389a56fad271dbe956055b8c3e7cafe9c27a559478" => :el_capitan sha256 "d78f4a20ee2b3a55e91cb04f9655f719631fe8b3ac9ffed162e88a337a6e3a08" => :yosemite + sha256 "035c55fb5b6839925cb9bd7c8774a41d20a7724fba0dd879da801de86ece7987" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/libpcap.rb b/Formula/libpcap.rb index 1400ee2e8bbbf..04d7ee3c84577 100644 --- a/Formula/libpcap.rb +++ b/Formula/libpcap.rb @@ -10,6 +10,7 @@ class Libpcap < Formula sha256 "3a85693ff5d241ccdc689af9fa1281434ddf6ae3d0887cd679d07bbc1730ec29" => :catalina sha256 "57ec7b7a786335d818c7eaca81a834c5ca9f4865a91df78b621d6b5d586cf859" => :mojave sha256 "26028b66ea5395a0eee75ebd5790e9d3a688e83698631aec328224bb7baa6037" => :high_sierra + sha256 "67a66711694b8a5809612b89217be309a3e01a37596b42772a626c8207c26c1f" => :x86_64_linux end keg_only :provided_by_macos diff --git a/Formula/libpcl.rb b/Formula/libpcl.rb index 1f033c05a50a1..07760f7a6388b 100644 --- a/Formula/libpcl.rb +++ b/Formula/libpcl.rb @@ -14,6 +14,7 @@ class Libpcl < Formula sha256 "1975baf018352fd1f1ca88bd39fc02db384e2f6be4017976184dda3365c60608" => :el_capitan sha256 "e9c6f7bc1efab583e44879426a5abb2ff5e7f3eb30261a81a7be723c3280c3a3" => :yosemite sha256 "8f8e6669f9a552618b5578ad649e0b2a5f0860922e756c79a609b2eb21b5d4b4" => :mavericks + sha256 "0f7ac6736461560ec54ab2cf752952a9e9da832e0b85cfbefbc96cb2bb9c9be5" => :x86_64_linux end def install diff --git a/Formula/libpeas.rb b/Formula/libpeas.rb index 295f41efc085a..698bca28824c2 100644 --- a/Formula/libpeas.rb +++ b/Formula/libpeas.rb @@ -9,6 +9,7 @@ class Libpeas < Formula sha256 "814ed5d3d4c27c2d831c5e2f4cd632283707e9e558d80bc61770a441abd8da0b" => :catalina sha256 "e31b60a59aa04040766e6220bf732532e843e048fe197a87e82d217e79ac77b7" => :mojave sha256 "ec9c9f97d99a774219e1cb280592264d90ceee1b4294c602d90df05f6694711b" => :high_sierra + sha256 "0c4fdc4d7a9763d829755132da2f8184343e7e598feed71e23d7fc1e4f8b340b" => :x86_64_linux end depends_on "meson" => :build @@ -22,6 +23,8 @@ class Libpeas < Formula depends_on "python@3.8" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? args = std_meson_args + %w[ -Dpython3=true -Dintrospection=true @@ -67,9 +70,9 @@ def install -lglib-2.0 -lgmodule-2.0 -lgobject-2.0 - -lintl -lpeas-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/libphonenumber.rb b/Formula/libphonenumber.rb index f6674e20a85c7..411b3a7e921d7 100644 --- a/Formula/libphonenumber.rb +++ b/Formula/libphonenumber.rb @@ -9,6 +9,7 @@ class Libphonenumber < Formula sha256 "bb7771137abffc9e06acf4b0e59ec12096bde697e2ff31a2db2171846e137e15" => :catalina sha256 "646a8e6a7f857856e906c2ea459b03a9eee43aaccff57238306621256d441bbb" => :mojave sha256 "823918c15d16bccac60f51c8af0fd442c1b11f76a9d7ffc6dc55afbe52ff9a73" => :high_sierra + sha256 "6e14476bcc709049e3017296e1aa588cf2515637fd5061ae53bb22e945fa1733" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libplctag.rb b/Formula/libplctag.rb index c0ecf36cfd868..350aacce99058 100644 --- a/Formula/libplctag.rb +++ b/Formula/libplctag.rb @@ -9,6 +9,7 @@ class Libplctag < Formula sha256 "06d6f12a038c1b05c47d4d70c432492ad68462cae2fd1a1c6ae72e3e277908b4" => :catalina sha256 "db027f5b570d3aa43869b5a638c36099f7275561138605dd901c58b5cdd94bea" => :mojave sha256 "f2ad5244fcb61cc657133ee4d6c81975f6a9b85da0b3f58e129ff7bcd557a475" => :high_sierra + sha256 "0f616dbe6b0781313220a9b9e8cae57cc3d7f7e45572f03b7579de5d9f971254" => :x86_64_linux end depends_on "cmake" => :build @@ -30,7 +31,11 @@ def install return 0; } EOS - system ENV.cc, "test.c", "-L#{lib}", "-lplctag", "-o", "test" + system ENV.cc, "test.c", + *("-pthread" unless OS.mac?), + *("-I#{include}" unless OS.mac?), + *("-Wl,-rpath=#{lib}" unless OS.mac?), + "-L#{lib}", "-lplctag", "-o", "test" system "./test" end end diff --git a/Formula/libplist.rb b/Formula/libplist.rb index fba2c0e874200..55c0846a7c376 100644 --- a/Formula/libplist.rb +++ b/Formula/libplist.rb @@ -9,6 +9,7 @@ class Libplist < Formula sha256 "20faf60d286c8ceed790a9b6e34245acf7bafacc7fcbcb390d6b62e194b323e6" => :catalina sha256 "768453f8710ec1c3e074ad0ebc7723da88c2b8575e5de6962ca6f1d4a85cb61d" => :mojave sha256 "02291f2f28099a73de8fa37b49962fe575a434be63af356cceff9200c6d73f37" => :high_sierra + sha256 "f9499d34d2b486a2a2ec069da288f8069603f29647ad7e7429f0d78ce24bdaaa" => :x86_64_linux end head do diff --git a/Formula/libpng.rb b/Formula/libpng.rb index ba7f276738251..4bec43c463d10 100644 --- a/Formula/libpng.rb +++ b/Formula/libpng.rb @@ -11,6 +11,7 @@ class Libpng < Formula sha256 "53bbd14cc27c86c16605e256e7646a1b5656c253abca084958c5d80a2961cb01" => :mojave sha256 "bbdd94bdd5954bc50c096391486e67265dce5631efb913dcffe4469806a242b6" => :high_sierra sha256 "e66797079a9a8134f91bd36b58054c6c32f6a9cd161c1bd19f0192319edb80aa" => :sierra + sha256 "c5d219b27780c730af50693110ed2c79e50200d3595c7e395998fe3950354ec9" => :x86_64_linux end head do diff --git a/Formula/libpoker-eval.rb b/Formula/libpoker-eval.rb index 8f52335b361ae..0244f0fbabbd1 100644 --- a/Formula/libpoker-eval.rb +++ b/Formula/libpoker-eval.rb @@ -15,6 +15,7 @@ class LibpokerEval < Formula sha256 "67b105600a8e29ed2d38421bc27340ff6e9092806f6458f0ddd6a27de0bcfb9c" => :el_capitan sha256 "b15086546ac1ac0310e3113231bfcc2c9de0d23474be8a1a1b4663e6bc8f713f" => :yosemite sha256 "9bbfb3886a4e530455dbf53581aecd0df8c86a2f80a444692441449c30f76d92" => :mavericks + sha256 "13fefc57333b56e0e1a3e4cbf583ed3b70e2e0a3cd9ce0d86b17a1135b153de8" => :x86_64_linux end def install diff --git a/Formula/libpq.rb b/Formula/libpq.rb index de8c3f0b42116..a63e75a508529 100644 --- a/Formula/libpq.rb +++ b/Formula/libpq.rb @@ -8,6 +8,7 @@ class Libpq < Formula sha256 "2278f4c6e51a0be17b8fe91667c2bda6318c2dabe39c120be1afa374ee68d4a5" => :catalina sha256 "d8e3e4541a895293cdf7f081747bcac80fe2a85665ca8165b69e8c6e7061acca" => :mojave sha256 "98289d8fe1c54cd352e0c216607f5097107e96552df6f01d4d5842bd0d3aae28" => :high_sierra + sha256 "a71cdc1bb38286f33aee7322dc8c7ea6402ec008042a5e3dcc666b4f0fd7537d" => :x86_64_linux end keg_only "conflicts with postgres formula" @@ -15,9 +16,10 @@ class Libpq < Formula # GSSAPI provided by Kerberos.framework crashes when forked. # See https://github.com/Homebrew/homebrew-core/issues/47494. depends_on "krb5" - depends_on "openssl@1.1" + uses_from_macos "zlib" + on_linux do depends_on "readline" end @@ -71,6 +73,7 @@ def install } EOS system ENV.cc, "libpq.c", "-L#{lib}", "-I#{include}", "-lpq", "-o", "libpqtest" + ENV.prepend_path "LD_LIBRARY_PATH", lib unless OS.mac? assert_equal "Connection to database attempted and failed", shell_output("./libpqtest") end end diff --git a/Formula/libpqxx.rb b/Formula/libpqxx.rb index 5a152dbd76636..2e7b10347b2fb 100644 --- a/Formula/libpqxx.rb +++ b/Formula/libpqxx.rb @@ -9,12 +9,24 @@ class Libpqxx < Formula sha256 "4600e04403f227ce18b789e236dc78faf8fd9ba230c99ba71e1e011bf33d21d8" => :catalina sha256 "7f99040c5cb0cb12dec832043fc3789b30e323ee3759cea291b8783caa48e43a" => :mojave sha256 "4016b954fb4052fd8988cfbd569c32ae8700f1c5b3da60eaf576672545f18df2" => :high_sierra + sha256 "a9e32b436becdc51b2ca230cfcd63e80869b9531c8b322ed5ee13dc5bf3a5f72" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "python@3.8" => :build depends_on "xmlto" => :build depends_on "libpq" + depends_on "postgresql" + + unless OS.mac? + depends_on "doxygen" => :build + depends_on "xmlto" => :build + depends_on "gcc@9" + fails_with :gcc => "5" + fails_with :gcc => "6" + fails_with :gcc => "7" + fails_with :gcc => "8" + end def install ENV.prepend_path "PATH", Formula["python@3.8"].opt_libexec/"bin" @@ -25,6 +37,8 @@ def install end test do + cxx = OS.mac? ? ENV.cxx : Formula["gcc@9"].opt_bin/"g++-9" + (testpath/"test.cpp").write <<~EOS #include int main(int argc, char** argv) { @@ -32,7 +46,7 @@ def install return 0; } EOS - system ENV.cxx, "-std=c++17", "test.cpp", "-L#{lib}", "-lpqxx", + system cxx, "-std=c++17", "test.cpp", "-L#{lib}", "-lpqxx", "-I#{include}", "-o", "test" # Running ./test will fail because there is no runnning postgresql server # system "./test" diff --git a/Formula/libprelude.rb b/Formula/libprelude.rb new file mode 100644 index 0000000000000..736dfecaf340c --- /dev/null +++ b/Formula/libprelude.rb @@ -0,0 +1,50 @@ +class Libprelude < Formula + desc "Universal Security Information & Event Management (SIEM) system" + homepage "https://www.prelude-siem.org/" + url "https://www.prelude-siem.org/attachments/download/1172/libprelude-5.1.0.tar.gz" + sha256 "a5fa3ca1e428291afe4bb5095f01c05fd0d9ebd517a0ce3d07ca9977abcf41fa" + + bottle do + sha256 "1ba7de08e4e1bae22f2df8dac21cb6d6966e6f9f32962940c70655582fcd3f6b" => :x86_64_linux + end + + depends_on "libtool" => :build + depends_on "perl" => :build + depends_on "pkg-config" => :build + depends_on "python" => :build + depends_on "ruby" => :build + depends_on "swig" => :build + depends_on "valgrind" => :build + depends_on "gnutls" + depends_on "libgcrypt" + depends_on "libgpg-error" + depends_on :linux + depends_on "lua" + + def install + ENV["HAVE_CXX"] = "yes" + args = %W[ + --disable-dependency-tracking + --prefix=#{prefix} + --disable-rpath + --with-pic + --with-python3 + --with-valgrind + --with-lua + --with-ruby + --with-perl + --with-swig + --with-libgcrypt-prefix=#{Formula["libgcrypt"].opt_prefix} + --with-libgnutls-prefix=#{Formula["gnutls"].opt_prefix} + ] + + system "./configure", *args + system "make" + system "make", "install" + end + + test do + assert_equal prefix.to_s, shell_output(bin/"libprelude-config --prefix").chomp + assert_equal version.to_s, shell_output(bin/"libprelude-config --version").chomp + end +end diff --git a/Formula/libproxy.rb b/Formula/libproxy.rb index 12dd7c2f69483..48826365ce57e 100644 --- a/Formula/libproxy.rb +++ b/Formula/libproxy.rb @@ -3,13 +3,14 @@ class Libproxy < Formula homepage "https://libproxy.github.io/libproxy/" url "https://github.com/libproxy/libproxy/archive/0.4.15.tar.gz" sha256 "18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0" - revision 2 + revision OS.mac? ? 2 : 3 head "https://github.com/libproxy/libproxy.git" bottle do sha256 "fbb6b461e2abfbd8f3c117c64410827fac0759cefab76cbccd4051f9d5b98d9c" => :catalina sha256 "74b3f2231eaaaf6ca8cbcb7868b0cb71a62ed4228b1c6fb81ce1b9548819cdb6" => :mojave sha256 "bf36cc90d464f46a70aca6407df2ea7c7b1b325d29346de3813298016cd0c324" => :high_sierra + sha256 "03710c823852ba953c70838da3db211aa166089a72f608bd85c13d8c57a8743e" => :x86_64_linux end depends_on "cmake" => :build @@ -17,6 +18,8 @@ class Libproxy < Formula uses_from_macos "perl" + depends_on "glib" unless OS.mac? + def install xy = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3" args = std_cmake_args + %W[ diff --git a/Formula/libpsl.rb b/Formula/libpsl.rb index c1becfe2b0c02..c704959663234 100644 --- a/Formula/libpsl.rb +++ b/Formula/libpsl.rb @@ -3,13 +3,14 @@ class Libpsl < Formula homepage "https://rockdaboot.github.io/libpsl" url "https://github.com/rockdaboot/libpsl/releases/download/libpsl-0.21.0/libpsl-0.21.0.tar.gz" sha256 "41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any sha256 "a1d53ecac4851b290e62b7753a8a937872bcf039d25acffb40c0b194c669ccbe" => :catalina sha256 "7969e5a474336273b2476e7a7a064ce871b64454aa069edd5af3b5c8b223c566" => :mojave sha256 "9f2176b329f68042a5748aa51497607e75aa5fd612933e0c5c9afdf0b75cdb75" => :high_sierra + sha256 "9aef12ba2e55c199ee9fb2a8267c7a66bc389732b9789dca16748b4394914086" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libquantum.rb b/Formula/libquantum.rb index 93da984acd467..0d906a2ff4be4 100644 --- a/Formula/libquantum.rb +++ b/Formula/libquantum.rb @@ -9,6 +9,7 @@ class Libquantum < Formula sha256 "0a58575e3f577ad9f8157546913669bac571462dd34d32e54c37e2935b126bed" => :catalina sha256 "0c7724330a9a2741d5b52521482fb4c4516d5dc7115538f6131894e4d2b31e10" => :mojave sha256 "1a93bf4fd93f8a68412b622fcf94eddd2fa9a86ada64dd8eb4cca27ccfaa8ce1" => :high_sierra + sha256 "192997312cfb0f27ba73949f9a156418d6c413a61fe74562e7cef72ece84a21a" => :x86_64_linux end def install @@ -35,7 +36,7 @@ def install return 0; } EOS - system ENV.cc, "-O3", "-o", "qtest", "qtest.c", "-L#{lib}", "-lquantum" + system ENV.cc, "-O3", ("-fopenmp" unless OS.mac?), "-o", "qtest", "qtest.c", "-L#{lib}", "-lquantum" system "./qtest" end end diff --git a/Formula/libquicktime.rb b/Formula/libquicktime.rb index 4e6746daf969f..4f2d0d775bbe7 100644 --- a/Formula/libquicktime.rb +++ b/Formula/libquicktime.rb @@ -10,6 +10,7 @@ class Libquicktime < Formula sha256 "56165e3b70f7e444bca93369b3fa4602eefb1aa4b9624ed1ecbaa4741eb7c245" => :mojave sha256 "df1b207f23b3edc587629a0fd700a446d4f8210e6a7de3bbfd3d5c122cef16f7" => :high_sierra sha256 "1770ac237a79cb0d9ae918e4bcd6d92bcca6a6695823f7a3fde6dde7d3077acb" => :sierra + sha256 "8cdd461b8aedea9a30ddd01b067cefbca629eef0030125583f33351ef3b5945f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libquvi.rb b/Formula/libquvi.rb index b1eff436378d1..2ad55357c2068 100644 --- a/Formula/libquvi.rb +++ b/Formula/libquvi.rb @@ -11,6 +11,7 @@ class Libquvi < Formula sha256 "bb5a4201afd814e87ee496b8cefbcf126f0245d7b3c600039e71e7b355115bf7" => :high_sierra sha256 "9968d412860717f837082f0e9d225b741d8430a99a3d1c4e12b7a1cdc95cd456" => :sierra sha256 "d91506a098fa564598b4aecbad97a2fa30728fafd8ad82bf8c4ff4bedb8d6c0a" => :el_capitan + sha256 "a71d548fc037b4b2c291052ebb111e6d8f87147f9e5b961f16419080da48b58a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libraqm.rb b/Formula/libraqm.rb index 3694bc8aed094..58aae0027683f 100644 --- a/Formula/libraqm.rb +++ b/Formula/libraqm.rb @@ -10,6 +10,7 @@ class Libraqm < Formula sha256 "c216caedf4a6709818f70525be9c1bbea6872d35b5ddd7e967de5e06fa48d626" => :catalina sha256 "637d5a3258bb8928c537479687e82234ab0729650b23e00bcf5215fd3b6377b3" => :mojave sha256 "a7bf34866571bbcb37fc95c13d985c18494625bb34d08325aa9970c22a330e91" => :high_sierra + sha256 "b2e547a12cef8dc1528e1627f96147a0be92c89625b58220cb7a05700295c5a4" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libraw.rb b/Formula/libraw.rb index b0d60dfe511ea..0fe5b7225ec22 100644 --- a/Formula/libraw.rb +++ b/Formula/libraw.rb @@ -10,6 +10,7 @@ class Libraw < Formula sha256 "7c962099ebd8959acee2921993e26120928604ff6809a1f7a372b95a00d2c130" => :mojave sha256 "f2e39a3e5811e1798fe84bc3122b9450eed0dfd861e586aaf9a76f13451942dd" => :high_sierra sha256 "684fb608b113365f690fad65636d45ae2f46469b10930363e45193ea9b4286ed" => :sierra + sha256 "605543f8e9d59a8c4528a6ac8baa6d813fdee011ecc0df6923ed0971bd80a889" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/librcsc.rb b/Formula/librcsc.rb index 4423f34b7fef0..3436d77015953 100644 --- a/Formula/librcsc.rb +++ b/Formula/librcsc.rb @@ -15,6 +15,7 @@ class Librcsc < Formula sha256 "c2093c232c857c15bea5dd6c1c6df14aa4b00ed0c6eb3ab7e4d0d3f8c72b54c6" => :el_capitan sha256 "c339890cbed4a1ca1b0a14d4375ece92ccee44a1f29023e1f633e9a9e0d6b6d5" => :yosemite sha256 "db8f74fadedc34da92c2109c1bbb90971c494e104c6041f1c8429def7f14dbc9" => :mavericks + sha256 "664aecab5d3e5e6217c3ee9c38f406de610310a7a98581209174a50f8ce36cc3" => :x86_64_linux end depends_on "boost" diff --git a/Formula/librdkafka.rb b/Formula/librdkafka.rb index 0dee96d5c9013..3f6b787904d34 100644 --- a/Formula/librdkafka.rb +++ b/Formula/librdkafka.rb @@ -6,9 +6,11 @@ class Librdkafka < Formula head "https://github.com/edenhill/librdkafka.git" bottle do + cellar :any sha256 "5090a19995c88d0ce00d2bced83b33cb6f944cf91d9fd9fa1a8f22dfc470ff29" => :catalina sha256 "31fcd402659b9f89506c920d9fc9ae2d00141af30d80a42ca7818c6a7109a3da" => :mojave sha256 "ae1eb1cbe686c2b9913e87c6068db886c06ff6716a36cccfb49b9226337c89d1" => :high_sierra + sha256 "6bc03fa8e71dd42fdb58e522a2389c83cc587f50fdbdd88de2f90068d2b02737" => :x86_64_linux end depends_on "pkg-config" => :build @@ -17,6 +19,8 @@ class Librdkafka < Formula depends_on "openssl@1.1" depends_on "zstd" + depends_on "python" unless OS.mac? + def install system "./configure", "--prefix=#{prefix}" system "make" diff --git a/Formula/libre.rb b/Formula/libre.rb index 099281a15d7d0..c702f215366cf 100644 --- a/Formula/libre.rb +++ b/Formula/libre.rb @@ -9,6 +9,7 @@ class Libre < Formula sha256 "0ca7e76631b5f30d72b4bc4248e894d00f05cfb785c98856d82cd5cc13e591f9" => :catalina sha256 "5d43d79ef2406e40c858463189ca8a40f0b13ede8a7090b56ba0fd1ef942dabc" => :mojave sha256 "32787ca36540a0c7c330560076e25726bcca0f08a7b77014d3837bd9c7ca1840" => :high_sierra + sha256 "4144fefdf5e1f8e51a1fed247b043ab65d2fbcee4ba00e935f559e5ec69562c6" => :x86_64_linux end depends_on "openssl@1.1" @@ -16,16 +17,26 @@ class Libre < Formula uses_from_macos "zlib" def install - system "make", "SYSROOT=#{MacOS.sdk_path}/usr", "install", "PREFIX=#{prefix}" + system "make", *("SYSROOT=#{MacOS.sdk_path}/usr" if OS.mac?), "install", "PREFIX=#{prefix}" end test do - (testpath/"test.c").write <<~EOS - #include - int main() { - return libre_init(); - } - EOS + if OS.mac? + (testpath/"test.c").write <<~EOS + #include + int main() { + return libre_init(); + } + EOS + else + (testpath/"test.c").write <<~EOS + #include + #include + int main() { + return libre_init(); + } + EOS + end system ENV.cc, "test.c", "-L#{lib}", "-lre" end end diff --git a/Formula/libreadline-java.rb b/Formula/libreadline-java.rb index bf769d803b023..469c08eb13aa9 100644 --- a/Formula/libreadline-java.rb +++ b/Formula/libreadline-java.rb @@ -35,7 +35,7 @@ def install # original Apple/Sun JDK used to. if File.exist? "#{java_home}/include/jni.h" ENV["JAVAINCLUDE"] = "#{java_home}/include" - ENV["JAVANATINC"] = "#{java_home}/include/darwin" + ENV["JAVANATINC"] = "#{java_home}/include/#{OS.mac? ? "darwin" : "linux"}" elsif File.exist? "/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h" ENV["JAVAINCLUDE"] = "/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/" ENV["JAVANATINC"] = "/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/" @@ -49,7 +49,7 @@ def install s.change_make_var! "JAVALIBDIR", "$(PREFIX)/share/libreadline-java" s.change_make_var! "JAVAINCLUDE", ENV["JAVAINCLUDE"] s.change_make_var! "JAVANATINC", ENV["JAVANATINC"] - s.gsub! "*.so", "*.jnilib" + s.gsub! "*.so", "*.jnilib" if OS.mac? s.gsub! "install -D", "install -c" end @@ -61,10 +61,12 @@ def install s.change_make_var! "INCLUDES", "-I $(JAVAINCLUDE) -I $(JAVANATINC) -I #{readline.opt_include}" s.change_make_var! "LIBPATH", "-L#{readline.opt_lib}" s.change_make_var! "CC", "cc" - s.gsub! "LIB_EXT := so", "LIB_EXT := jnilib" - s.gsub! "$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@", - "$(CC) -install_name #{HOMEBREW_PREFIX}/lib/$(LIB_PRE)$(TG).$(LIB_EXT) " \ - "-dynamiclib $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@" + if OS.mac? + s.gsub! "LIB_EXT := so", "LIB_EXT := jnilib" + s.gsub! "$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@", + "$(CC) -install_name #{HOMEBREW_PREFIX}/lib/$(LIB_PRE)$(TG).$(LIB_EXT) " \ + "-dynamiclib $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@" + end end pkgshare.mkpath diff --git a/Formula/librem.rb b/Formula/librem.rb index dc22cbc088da1..3cefdf5680b88 100644 --- a/Formula/librem.rb +++ b/Formula/librem.rb @@ -10,6 +10,7 @@ class Librem < Formula sha256 "0303178e3833e6799d2863835cdd3a6c9e639b2fdcf5b3925bae1fb2690419f1" => :mojave sha256 "7b2cfbb41f81dd14636626f5d6e325d79cd7a69af540ddf722a7943a934c92ea" => :high_sierra sha256 "37e4fc160a28de520ac9ee23dafff09e8d6f733d022110782fd8aa2bda7245a4" => :sierra + sha256 "024733b8e8152f4f83e1d58c5aee5c6b44ee853b9e2f809043b6dc1c0c0ebd70" => :x86_64_linux end depends_on "libre" @@ -23,13 +24,24 @@ def install end test do - (testpath/"test.c").write <<~EOS - #include - #include - int main() { - return (NULL != vidfmt_name(VID_FMT_YUV420P)) ? 0 : 1; - } - EOS + if OS.mac? + (testpath/"test.c").write <<~EOS + #include + #include + int main() { + return (NULL != vidfmt_name(VID_FMT_YUV420P)) ? 0 : 1; + } + EOS + else + (testpath/"test.c").write <<~EOS + #include + #include + #include + int main() { + return (NULL != vidfmt_name(VID_FMT_YUV420P)) ? 0 : 1; + } + EOS + end system ENV.cc, "test.c", "-L#{opt_lib}", "-lrem", "-o", "test" system "./test" end diff --git a/Formula/libreplaygain.rb b/Formula/libreplaygain.rb index ae9726b8bd396..e8a176ab71c96 100644 --- a/Formula/libreplaygain.rb +++ b/Formula/libreplaygain.rb @@ -15,6 +15,7 @@ class Libreplaygain < Formula sha256 "58b52d360c2f37f3ab3a50c4a2fe72b9a370bd951d52939f8853a5ef49fcc322" => :el_capitan sha256 "d47338c5b86daabf3e2e05ab9dd2443c04c1233f3319307e8e5d545b24dcf722" => :yosemite sha256 "dc3f2c3823c5552bddad7b1727b9086dc2fe79e8fa13987b420d1621c97e2bce" => :mavericks + sha256 "192ad8d9539a4121eaa4b70b5eecf9f8ce7af90c9ed02aeef288748d2ec0c1dd" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libresample.rb b/Formula/libresample.rb index 70a00e3ac22a6..436fa5068a024 100644 --- a/Formula/libresample.rb +++ b/Formula/libresample.rb @@ -14,6 +14,7 @@ class Libresample < Formula sha256 "ba2446005f2417fa81e5a5963d2273494396f8821ee95fd84ed9825342564598" => :el_capitan sha256 "2f58f8b45cd7b6f89f645cb90d3b4f63dd0a28e927713f3a4664c348e3a15a21" => :yosemite sha256 "61a8ab0861ce6e6c45632b7235eaf718e4be191fe8c184ba8f065d436681d786" => :mavericks + sha256 "5cd85c8ea65ed33a5a989af48d2c3e69e6fea877af3c3993909db216b9a931a8" => :x86_64_linux end def install diff --git a/Formula/libressl.rb b/Formula/libressl.rb index d68d227c6d500..d6f308625ca57 100644 --- a/Formula/libressl.rb +++ b/Formula/libressl.rb @@ -10,6 +10,7 @@ class Libressl < Formula sha256 "7574171656070665bb3bda72ceb202753f969754efd538249c351b458c642cb5" => :catalina sha256 "73f014a32921e7cac5a4369e55a0c9bfd5afaa52b2d802a6d3d635f2d67553e5" => :mojave sha256 "a303985660e86455f63cecf8733de05896846522db407afc6154788e6bccf40c" => :high_sierra + sha256 "ff5577cc04f3b7cbb97402fe2f80facd0287b27f3492e5a226dfd476102ea785" => :x86_64_linux end head do @@ -39,6 +40,8 @@ def install end def post_install + return unless OS.mac? + keychains = %w[ /System/Library/Keychains/SystemRootCertificates.keychain ] diff --git a/Formula/librest.rb b/Formula/librest.rb index 180ff62dc6eb2..9fdb2e50198f6 100644 --- a/Formula/librest.rb +++ b/Formula/librest.rb @@ -10,6 +10,7 @@ class Librest < Formula sha256 "47fd3f7eeb5c4c540fa9972fce471caaba2fd5006c90ee70b51bc42badd29c67" => :mojave sha256 "c8b2c713c6dbbcb18f2b41e4efb97341303406860eb72ac606691a1c67b6e275" => :high_sierra sha256 "26b2a7f163a2adb2cec329f83cd6046a2199c26ca38c191e5c20f813851b7a29" => :sierra + sha256 "f4cf5fa76e4d03b507a722cca8facc50c6546401c73442fc3d715b2631940ee7" => :x86_64_linux end depends_on "gobject-introspection" => :build diff --git a/Formula/librevenge.rb b/Formula/librevenge.rb index 112be06a9ae78..8dd2a5a8867bd 100644 --- a/Formula/librevenge.rb +++ b/Formula/librevenge.rb @@ -14,6 +14,7 @@ class Librevenge < Formula sha256 "827a37488cc92f16ba8f4d7343e7944c7faed4b8cf9d930f49d93e4104784c94" => :el_capitan sha256 "a95c4fc2b7832e226d21a209811a2f149b8fde4962d07d354e3a6cb80b7f0a01" => :yosemite sha256 "45c4df842b9cf38554efeb4d04f2c2abf2ed8341e0fb4bc0d80830e02e1fbfeb" => :mavericks + sha256 "fdcd310449d3db5bf6b6f0c0acfe2669a2f1a285ddd35ff37821574a932769f3" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/librsvg.rb b/Formula/librsvg.rb index 94daa38957e7e..1456106f8507c 100644 --- a/Formula/librsvg.rb +++ b/Formula/librsvg.rb @@ -8,6 +8,7 @@ class Librsvg < Formula sha256 "1f74dca46b1b375a3d070977750c0fdea443e7fda826b65766deb82a86b6aee1" => :catalina sha256 "9995930258b4b10684b7cd82002569eae4b77ab573b3b4d065f134d45ebfd264" => :mojave sha256 "1b5fd45b7f74d991ff2ea797b1652b83b172d9d358465a0a832a5f4a77390719" => :high_sierra + sha256 "effd0aa1bd2a31aa6568a534cf06418f66faf763899141f2d6211127a9899d6c" => :x86_64_linux end depends_on "gobject-introspection" => :build @@ -20,7 +21,7 @@ class Librsvg < Formula def install # https://gitlab.gnome.org/GNOME/librsvg/issues/545#note_753842 - ENV.append "LDFLAGS", "-lobjc" + ENV.append "LDFLAGS", "-lobjc" if OS.mac? args = %W[ --disable-dependency-tracking @@ -90,10 +91,10 @@ def post_install -lgio-2.0 -lglib-2.0 -lgobject-2.0 - -lintl -lm -lrsvg-2 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/librsync.rb b/Formula/librsync.rb index fcdd248105418..004ef74add8bd 100644 --- a/Formula/librsync.rb +++ b/Formula/librsync.rb @@ -5,9 +5,11 @@ class Librsync < Formula sha256 "dbd7eb643665691bdf4009174461463737b19b4814b789baad62914cabfe4569" bottle do + cellar :any_skip_relocation sha256 "eb1526a88a99556f1ae98c7fa008a8c17ddbe2efe2e55de0192ccbccf9840937" => :catalina sha256 "27f16505bf1b37a9701d70701e708451d47743a3b4d453dcc1d4048065af05af" => :mojave sha256 "20fd33975022b7caaa12b9906b726f1b9dd9a792d9291170e72298a351650610" => :high_sierra + sha256 "73eb18e6db5100a584ea4463e4f6efd1da2f6e2b4fcea3b251f4c3d20bf17455" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libsamplerate.rb b/Formula/libsamplerate.rb index 1c6407a30cbbd..b06f0d72cc6bb 100644 --- a/Formula/libsamplerate.rb +++ b/Formula/libsamplerate.rb @@ -11,6 +11,7 @@ class Libsamplerate < Formula sha256 "4230f5c4bc95c882164799c28d1e8e0fd58e24649aacd585a8d9fa03e7b54395" => :mojave sha256 "e8eeb394697f34f294ca67b4ed296fcee986aabc152ffc7d27360f67e30038f5" => :high_sierra sha256 "5dfce39eab407ae04dbe0704b5f76123da2703260f4fac12c76437bb02415fc1" => :sierra + sha256 "3a820264e06a34fd52cbd7e06cb3475697e0c834f628d8e8dd9c0ead108e6b8a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libsasl2.rb b/Formula/libsasl2.rb new file mode 100644 index 0000000000000..cad1ab1754878 --- /dev/null +++ b/Formula/libsasl2.rb @@ -0,0 +1,36 @@ +class Libsasl2 < Formula + desc "Simple Authentication and Security Layer" + homepage "https://www.cyrusimap.org/sasl/" + url "https://www.cyrusimap.org/releases/cyrus-sasl-2.1.27.tar.gz" + sha256 "26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5" + + bottle do + sha256 "fea25c321868478ed2bab0788a188e87d00d90bf423f7c4c11161bcca9eda3b5" => :x86_64_linux + end + + depends_on :linux + depends_on "openssl@1.1" + + def install + # Deparallelize, else we get weird build errors + ENV.deparallelize + + system "./configure", "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + (testpath/"test.cpp").write <<~EOS + #include + int main(void) { + } + EOS + + system ENV.cxx, "-I#{include}", "-L#{lib}", + "-I#{Formula["libsasl2"].include}/sasl", + "-lsasl2", "-o", "test", "test.cpp" + system "./test" + end +end diff --git a/Formula/libsass.rb b/Formula/libsass.rb index 00b0785e00fca..6751f9bf973f5 100644 --- a/Formula/libsass.rb +++ b/Formula/libsass.rb @@ -11,6 +11,7 @@ class Libsass < Formula sha256 "a674d8155125a1659499c689b2c3ecc4d37c8196667a93b4463f65dfa77a686c" => :catalina sha256 "45e5e4f4eb76253127712dcef15df520064db0bd712e3fea9f349fa6ebee79a5" => :mojave sha256 "85722d303754f2d6d07c4c704cf81c9aa827473f7d6130c66d90da984862c47d" => :high_sierra + sha256 "d54d0966b528dcd0fd9826e4c5a7e65d551354deb4b515211fbefffed7d03622" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libscrypt.rb b/Formula/libscrypt.rb index bc0786027520c..ac6e3f3ebb5b2 100644 --- a/Formula/libscrypt.rb +++ b/Formula/libscrypt.rb @@ -13,11 +13,20 @@ class Libscrypt < Formula sha256 "bc2c8318384a72f82802937f7e6dd8017ec44fb6fc94583e5f0c38056e1a660c" => :el_capitan sha256 "0e870b01dbbfc49432cc8ea81c90ee6d8732b6d8adc4665368844536d5c6e092" => :yosemite sha256 "fe3bc1ca8b19e7c86e103f1345cb9294da01cc15b950302ad5486ef49b2b212d" => :mavericks + sha256 "b02209e5c778dcfdd9e13123d9ce258f909f583ce5e0b474d916bb4ea1c48293" => :x86_64_linux end def install - system "make", "install-osx", "PREFIX=#{prefix}", "LDFLAGS=", "CFLAGS_EXTRA=" - system "make", "check", "LDFLAGS=", "CFLAGS_EXTRA=" + if OS.mac? + system "make", "install-osx", "PREFIX=#{prefix}", "LDFLAGS=", "CFLAGS_EXTRA=" + system "make", "check", "LDFLAGS=", "CFLAGS_EXTRA=" + else + system "make" + system "make", "check" + lib.install "libscrypt.a", "libscrypt.so", "libscrypt.so.0" + include.install "libscrypt.h" + prefix.install "libscrypt.version" + end end test do diff --git a/Formula/libseccomp.rb b/Formula/libseccomp.rb new file mode 100644 index 0000000000000..b3fb7f3af8f5d --- /dev/null +++ b/Formula/libseccomp.rb @@ -0,0 +1,44 @@ +class Libseccomp < Formula + desc "Interface to the Linux Kernel's syscall filtering mechanism" + homepage "https://github.com/seccomp/libseccomp" + url "https://github.com/seccomp/libseccomp/releases/download/v2.4.2/libseccomp-2.4.2.tar.gz" + sha256 "b54f27b53884caacc932e75e6b44304ac83586e2abe7a83eca6daecc5440585b" + + bottle do + cellar :any_skip_relocation + sha256 "ab6d430d4c758ce3cc55e5ec6ba8609196655bc03988271c25ad086ff54f823e" => :x86_64_linux + end + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + depends_on :linux + + def install + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + ver = version.to_s.split(".") + ver_major = ver[0] + ver_minor = ver[1] + + (testpath/"test.c").write <<~EOS + #include + int main(int argc, char *argv[]) + { + if(SCMP_VER_MAJOR != #{ver_major}) + return 1; + if(SCMP_VER_MINOR != #{ver_minor}) + return 1; + } + EOS + + system ENV.cc, "test.c", "-I#{include}", "-L#{lib}", "-lseccomp", "-o", "test" + system "./test" + end +end diff --git a/Formula/libsecret.rb b/Formula/libsecret.rb index 2436a4d19bdf4..e5170c727dbb2 100644 --- a/Formula/libsecret.rb +++ b/Formula/libsecret.rb @@ -8,6 +8,7 @@ class Libsecret < Formula sha256 "6b63c9ade94d5428c76332662178a0ea47ea682478cc2a0d189acb5d9480b562" => :catalina sha256 "cf7e3aee821a63ef75f9ad9d33061d6dbd358b1bb07873d991f4b4e877842fef" => :mojave sha256 "d88253d0c70ec7cf66c6f7d4f3b2894d0cd68cfd381dbd3087860bdbeddde945" => :high_sierra + sha256 "aaf669226661e961be62076b0dd564240b1b855ea10b5e16599208468031532f" => :x86_64_linux end depends_on "docbook-xsl" => :build @@ -19,6 +20,9 @@ class Libsecret < Formula depends_on "libgcrypt" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" args = %W[ @@ -31,6 +35,7 @@ def install ] system "./configure", *args + system "make", "install" end diff --git a/Formula/libserdes.rb b/Formula/libserdes.rb index 5204bf18a0c54..d4b1a723ef744 100644 --- a/Formula/libserdes.rb +++ b/Formula/libserdes.rb @@ -11,6 +11,7 @@ class Libserdes < Formula sha256 "18387cd0d55c022000b92478f68edd90904ad4bf1684862f4eab189dcf90ae48" => :catalina sha256 "c61903729be4087a5cad61418cc2a557591d0c457dddc8264d5000d8be03884b" => :mojave sha256 "8b89ec94a1e8c571ddf2a9a71f25029c0f6524ad3aa425c2f65afee0869de250" => :high_sierra + sha256 "50487b15dc1df1c23495f47e7a8ec4000556653e005c95be13f57da9f4b0fa9c" => :x86_64_linux end depends_on "avro-c" diff --git a/Formula/libserialport.rb b/Formula/libserialport.rb index 4c2b28d6c4961..f7250916315ae 100644 --- a/Formula/libserialport.rb +++ b/Formula/libserialport.rb @@ -11,6 +11,7 @@ class Libserialport < Formula sha256 "36dd828a2eba76bf82a3cd9c2c9ed9b684753c3a38aea33269f82f699762422b" => :high_sierra sha256 "e34159ce49ba7c90e2fc0672f99df7b11a6d2de9ceccfc20679918bb87cb9b1e" => :sierra sha256 "a2e2cb79d5a3774077c7458b0c131e67d345e8e7b2dc29735302d003fec3379e" => :el_capitan + sha256 "8e96b4e32c14b54c93338ca1d5c4bd1dbe41dedc60cafd13247f05cb2b214f9b" => :x86_64_linux end def install diff --git a/Formula/libshout.rb b/Formula/libshout.rb index 35296b27d8078..0edce8664d57c 100644 --- a/Formula/libshout.rb +++ b/Formula/libshout.rb @@ -10,6 +10,7 @@ class Libshout < Formula sha256 "14144ef978dbceb4b858ebeb667be83721ba4b3742fd0e0743ab76a9b2f99095" => :mojave sha256 "f9fef02da35d628c601f24726fa2d748f350692d4bf4c196d28bd08b0f4786eb" => :high_sierra sha256 "1d246580781a0bf5240363da62a476499a16948935f1b0693d05660ccd5aa9de" => :sierra + sha256 "a6ae65939b12b0b5a800c2810fe531d0956a99a56a95955994d04db8a64df98b" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libsigc++.rb b/Formula/libsigc++.rb index 2724e0297c5f4..aa8b202fb2c8a 100644 --- a/Formula/libsigc++.rb +++ b/Formula/libsigc++.rb @@ -9,9 +9,18 @@ class Libsigcxx < Formula sha256 "77bf9858cb60a1842d970bbbc020a5379536806acbc4114afa56d8c941013765" => :catalina sha256 "7ae9cb9a4d6a645574c6cf5aba8a9cfbbab44349545374f604073393c67f6f50" => :mojave sha256 "e2c75abf2675c7830fd19aa268472aeee8b5c42cd9355147585bad9be7c3059a" => :high_sierra + sha256 "ac0c799922daffa86ca5b5c3ca069764a9c1d36199bc96d0c9f2f0055eb9cd86" => :x86_64_linux end - depends_on :macos => :high_sierra # needs C++17 + depends_on :macos => :high_sierra if OS.mac? # needs C++17 + unless OS.mac? + depends_on "m4" => :build + depends_on "gcc@7" + + fails_with :gcc => "4" + fails_with :gcc => "5" + fails_with :gcc => "6" + end def install ENV.cxx11 @@ -21,6 +30,7 @@ def install system "make", "install" end test do + ENV["CXX"] = Formula["gcc@7"].opt_bin/"c++-7" unless OS.mac? (testpath/"test.cpp").write <<~EOS #include #include diff --git a/Formula/libsigc++@2.rb b/Formula/libsigc++@2.rb index f41dd018a3ab0..55ce0e8451f48 100644 --- a/Formula/libsigc++@2.rb +++ b/Formula/libsigc++@2.rb @@ -9,6 +9,7 @@ class LibsigcxxAT2 < Formula sha256 "bcf678faa58639056292bb201143fe4add755d9f6da6a65f4b7d10cff0ccfe17" => :catalina sha256 "034cb3a54d796e4b9ec4619a15612fc64fc7e7cbddf189f71bb5342f7b631a3d" => :mojave sha256 "c8cccc56cfb07d96e339af416c7a2449673c5303f15f99c5f668fc4c5f792695" => :high_sierra + sha256 "5048d7caa6a3a6d55888e9bdcbad60635dbbc1bc5f8c09c30016993f6ceb6f81" => :x86_64_linux end uses_from_macos "m4" => :build diff --git a/Formula/libsignal-protocol-c.rb b/Formula/libsignal-protocol-c.rb index 55d2af973bb1b..0992c2bd23f65 100644 --- a/Formula/libsignal-protocol-c.rb +++ b/Formula/libsignal-protocol-c.rb @@ -9,6 +9,7 @@ class LibsignalProtocolC < Formula sha256 "2ad98569b7c0543579c9a2596a78e86bb7a915fb17632850cea099feb9d2d674" => :catalina sha256 "95991e7aa3ef7fa4fdfb25f8f3ed588103e7343599bb5fd86c190e0a2b62ebf8" => :mojave sha256 "9dc54604cd42340d8e1ab2da73b54fd19d4cfdb87144921bdb6bcf03e2b41993" => :high_sierra + sha256 "a4ad0ba17963188518a216bb2d584d24bef302a66ef4cf03a0f0e2e83d23412d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libsigsegv.rb b/Formula/libsigsegv.rb index d64d097c1d546..56b8164ee50a5 100644 --- a/Formula/libsigsegv.rb +++ b/Formula/libsigsegv.rb @@ -12,6 +12,7 @@ class Libsigsegv < Formula sha256 "5fea960fc3cc9f168749e36e37efbf53f3030d4a3fc2f2602f182d3dcafd5a17" => :high_sierra sha256 "158f90f84a050e266c23299745b7553321c304649e9f88afcf34d73ef08f95a1" => :sierra sha256 "b9808096e671482dffd3c4b7ea330d8fc58027bee92c6a774b953fefc1606eb1" => :el_capitan + sha256 "53be61b94241903684a8e06a332207ee4ba44c2c7316a8cc4b988c7b68891aac" => :x86_64_linux end def install diff --git a/Formula/libsixel.rb b/Formula/libsixel.rb index 47eebea115346..60ac094791bdc 100644 --- a/Formula/libsixel.rb +++ b/Formula/libsixel.rb @@ -9,6 +9,7 @@ class Libsixel < Formula sha256 "520fa6d77af3c6cc84fb84b1a5b8797bb6e44396b70ad7654eb3362d2174d0ab" => :catalina sha256 "716d90122f113bd1c6b2ad7e872a476923981b4c26830c94ca68724437e860b1" => :mojave sha256 "9e061ce67b22c8ad8760bccc7e954ee46852285bc078087712538e102ce8215c" => :high_sierra + sha256 "219b506690cf24fd40e0df9b90f1ecd44ec1e166eb325dade1b914fb0f117718" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/libsmf.rb b/Formula/libsmf.rb index 456bc983c944d..924f17f99470f 100644 --- a/Formula/libsmf.rb +++ b/Formula/libsmf.rb @@ -11,6 +11,7 @@ class Libsmf < Formula sha256 "bbe040e330a998499e078129097a07f2c5de9fff9c5f26a638e6f5248badda3b" => :mojave sha256 "7a4b394b51e89bd781fcce0514b3cc58656da63fa2e317186e47828e2c271320" => :high_sierra sha256 "45aedd028eb76b2dfbb6fa3ba9b3fc809e7265411d5d7760997a71503ebae41a" => :sierra + sha256 "610023f4a71bc211b47e1ca618d61dc40cf476c9b0b7f785a98dce13a3e47ea7" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libsmi.rb b/Formula/libsmi.rb index 0dae202be7fa7..c33d587afc160 100644 --- a/Formula/libsmi.rb +++ b/Formula/libsmi.rb @@ -11,6 +11,7 @@ class Libsmi < Formula sha256 "1a25b44883bb95940e789ec6395dfa796ec44fd4e0d9ae1ee81a4119fe70ac14" => :catalina sha256 "507d7f52bd7be5c1cc3170831de43e3ebd5a4312b6eda5d795d7519437016246" => :mojave sha256 "25a31cf7557ddfc1174a932b904d6c96bda4f3c733caf8258edbdef376e99544" => :high_sierra + sha256 "d33ce3b67917f68e4cdedfbac29df8a93f94e97ce4493a952a594b1e70314777" => :x86_64_linux end def install diff --git a/Formula/libsndfile.rb b/Formula/libsndfile.rb index 7f2fdb92dc807..46d0cd90e5cb3 100644 --- a/Formula/libsndfile.rb +++ b/Formula/libsndfile.rb @@ -12,6 +12,7 @@ class Libsndfile < Formula sha256 "4e4bde6464cfbefcf7f2a9001af0ea34c6273b466ffa71ac953b2bb41eb619ec" => :sierra sha256 "49d17fa55815680936b529b7bbb8e5cf180c98722c7f8b45d763bfe2d1f0a5de" => :el_capitan sha256 "9df59790751d64c7f61682233a733030de9e6406682f3a15e30e708103930038" => :yosemite + sha256 "c68c5c4eb7176e632a84c72ebd0f9a7269d4a3272dd852356fed0e5da33fa6b6" => :x86_64_linux # glibc 2.19 end depends_on "autoconf" => :build diff --git a/Formula/libsodium.rb b/Formula/libsodium.rb index e709b92ad54ec..aeca1428f7e99 100644 --- a/Formula/libsodium.rb +++ b/Formula/libsodium.rb @@ -10,6 +10,7 @@ class Libsodium < Formula sha256 "db372521cd0b1861a5b578bee22426f3a1f4f7cb3c382be1f842da4715dc65bd" => :catalina sha256 "55245bfcf6654b0914d3f7459b99a08c54ef2560587bf583a1c1aff4cfc81f28" => :mojave sha256 "fc972755eb60f4221d7b32e58fc0f94e99b913fefefc84c4c76dc4bca1c5c445" => :high_sierra + sha256 "f7a0d2d788866c83dfe70624ea4e990a1c9a055f89d07ab3556dafb14e1d5931" => :x86_64_linux end head do diff --git a/Formula/libsoxr.rb b/Formula/libsoxr.rb index 9dba42d09efde..78e0e55cfcb18 100644 --- a/Formula/libsoxr.rb +++ b/Formula/libsoxr.rb @@ -11,6 +11,7 @@ class Libsoxr < Formula sha256 "10b952f7e1ca5f9c839f87a2920e6739d4e3c262e88b05a3b8a62074de69e5ac" => :high_sierra sha256 "b469390e789389d10825c86d2ed825e1cb64efd14ecf98870043178846ed38ab" => :sierra sha256 "473b6f61851824ec47918a423295332f00d2ac802f2da4ef7058c621a4f365b0" => :el_capitan + sha256 "af2772bb670a700e64e2f7c7afbe9067ee12925f716d625ad6e7ab9838c3a51a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libspatialite.rb b/Formula/libspatialite.rb index 56c826b9b3694..c195f1fa12737 100644 --- a/Formula/libspatialite.rb +++ b/Formula/libspatialite.rb @@ -20,6 +20,7 @@ class Libspatialite < Formula sha256 "e8bd429119857fab4cb51f3ba7b64024b51eb2400873e71fc9d6aad297c109ce" => :catalina sha256 "8fcc2ccaf861f94c3fb41b1c6435e86f52a7fe70e66d9e02a5acb16d285c4360" => :mojave sha256 "a77ac13e3758d389ccf42fa62d8a7bb528062c215e2b380b8d3df7211696712f" => :high_sierra + sha256 "eb503a8e5aa809d47593b3e50aac8cb3f0cfb4a4eeb410366e5367048b8b7a96" => :x86_64_linux end head do diff --git a/Formula/libspectre.rb b/Formula/libspectre.rb index 1dfb994af0a70..56f2372fe33c0 100644 --- a/Formula/libspectre.rb +++ b/Formula/libspectre.rb @@ -5,10 +5,11 @@ class Libspectre < Formula sha256 "49ae9c52b5af81b405455c19fe24089d701761da2c45d22164a99576ceedfbed" bottle do - cellar :any + cellar :any_skip_relocation sha256 "a5ebee9481527fc2e9fb217ac3d017435c77c36beb0d82a1722df463df7bdaaf" => :catalina sha256 "4d18ccc28ca26864e17d4b6d43828550ca821315d547e71358c043c0a8151705" => :mojave sha256 "6d9dbf0542d1bd02f056bcad34ae176e3e991fb5cb1babd0854b402fc15779d2" => :high_sierra + sha256 "190f0978e0b16f548850405a4082946cdc40f8c642079eee516aef286da50d06" => :x86_64_linux end depends_on "ghostscript" diff --git a/Formula/libspectrum.rb b/Formula/libspectrum.rb index dae2263c96b31..caf56fc2bea9f 100644 --- a/Formula/libspectrum.rb +++ b/Formula/libspectrum.rb @@ -11,6 +11,7 @@ class Libspectrum < Formula sha256 "25edb4f26816ec6bfb7f1437c9a17fb2621c1bb81b93a48e22960aabf89d3a1d" => :catalina sha256 "29b40b473d7db763d376b1ac1949db8887b3d0a08016d84370add76524c0c377" => :mojave sha256 "b4ee40ecf01a16826994e74d31ca1dbc34baeeee0287908f4e1e4a11365f6b4b" => :high_sierra + sha256 "01c7b8459ce6f012ee3256c96cec0867cb36712b639818f278c84a5502bb52f8" => :x86_64_linux end head do diff --git a/Formula/libspiro.rb b/Formula/libspiro.rb index 7645a2eba47fa..64cfa9ef996c0 100644 --- a/Formula/libspiro.rb +++ b/Formula/libspiro.rb @@ -10,6 +10,7 @@ class Libspiro < Formula sha256 "238761be2cd640f6c3f59f0461ce7f5b73dc71c9613236e180bc55f4231e167b" => :catalina sha256 "fb1b2e548eddc684a5b615cedabc2c6403e0c87409fdb419369ca40e2b70aa52" => :mojave sha256 "b7155fe14b9909a06a9044ca2d3275f5b2cbcd9aac23583b3819ba53898ff120" => :high_sierra + sha256 "f3fa73570971a8a442bebcb63b411476d780ff89bd579f1663939d68194addbd" => :x86_64_linux end head do diff --git a/Formula/libspnav.rb b/Formula/libspnav.rb index 1a3386bff7376..da68b9c980bb8 100644 --- a/Formula/libspnav.rb +++ b/Formula/libspnav.rb @@ -13,6 +13,7 @@ class Libspnav < Formula sha256 "48685db33ebe4acb821b33dbd609f95d03c47bd6c316b08f1bc1110d86271643" => :el_capitan sha256 "87bf93469bb14eef1a24de81cd521f6a62363a6aa7c04a319f3f18905de039b1" => :yosemite sha256 "f425659deb611eacb94f2245f0c8f8235aa0169a422874f2aa2c32f8d207b84a" => :mavericks + sha256 "bdbbcc3697bbd884b33a520cef39350410a00adca28a675675863cd89cb62785" => :x86_64_linux end def install diff --git a/Formula/libssh.rb b/Formula/libssh.rb index 793c216234d52..fca4ee4f7e755 100644 --- a/Formula/libssh.rb +++ b/Formula/libssh.rb @@ -10,6 +10,7 @@ class Libssh < Formula sha256 "80a7241688554d68ba4dfdcc04a69711ed02dde72f496603565ab9f0c5198df3" => :catalina sha256 "25fbc3fa80454fb8cc8733d26dd811840020cb301e2515a45866325520905039" => :mojave sha256 "afc9749026ce1c566415227e36f6e528e90d79e11a650718ed9d3a51bb3027f0" => :high_sierra + sha256 "68e65a7c4af6c3b70994ba47b0fe54607c571221bd4d07e9aee915532e130660" => :x86_64_linux end depends_on "cmake" => :build @@ -39,8 +40,8 @@ def install return 0; } EOS - system ENV.cc, "-I#{include}", "-L#{lib}", "-lssh", - testpath/"test.c", "-o", testpath/"test" + system ENV.cc, "-I#{include}", *("-L#{lib}" if OS.mac?), *("-lssh" if OS.mac?), + testpath/"test.c", *("-L#{lib}" unless OS.mac?), *("-lssh" unless OS.mac?), "-o", testpath/"test" system "./test" end end diff --git a/Formula/libssh2.rb b/Formula/libssh2.rb index 8bb69f54f5c20..8c9fee471b93b 100644 --- a/Formula/libssh2.rb +++ b/Formula/libssh2.rb @@ -11,6 +11,7 @@ class Libssh2 < Formula sha256 "327c56ad6a54894e5ef9aa3019d2444d32f1d0fba80925940100e517dd3109c9" => :mojave sha256 "ee29f44ef6fb59242fc7ee1747f02df2287722af4a45319289c9ee224367ba06" => :high_sierra sha256 "769fbbdc4e67b8de15c269f66a6efe86c5b0195df56e7e46b44377a572800efa" => :sierra + sha256 "07fa92938502deb9633103511ef95a7a54a9bd1a42955b63f0e1787b01169d3f" => :x86_64_linux end head do diff --git a/Formula/libstatgrab.rb b/Formula/libstatgrab.rb index bba7da0dd6366..55e08dde7eb5a 100644 --- a/Formula/libstatgrab.rb +++ b/Formula/libstatgrab.rb @@ -11,6 +11,7 @@ class Libstatgrab < Formula sha256 "bb1778c08b1b91cff873016e3a6f314d3a97a55db378e0870354bb64337ea50b" => :mojave sha256 "d7d932298fe68980389bf5b2c8f1d6ef41a6037630b4951996139c2277fbf6f4" => :high_sierra sha256 "17efc663227f42859add13c81e0b5fac1f3f3a0418c3d15b83363ea90c0b4a91" => :sierra + sha256 "28562aed435bb94ea567771537d6ecebc5d7e0a29435c124e341a4946386cdce" => :x86_64_linux end def install diff --git a/Formula/libstfl.rb b/Formula/libstfl.rb index 487230ecd5058..0e96d8a9fa872 100644 --- a/Formula/libstfl.rb +++ b/Formula/libstfl.rb @@ -10,10 +10,11 @@ class Libstfl < Formula sha256 "a72700193b9de0b12b5886043e39da52c71f6159c38477d8c63ec552ba42f4e9" => :catalina sha256 "05dd3bc8aa05eb7f0d236b0f17891f3b8f8eed959c22489c8adab8cd5217ee61" => :mojave sha256 "be2fa58735e737b334952209f35cb19824c6f7b7b8115727f175537cc28a6b12" => :high_sierra + sha256 "ab50ba83888a532e4d3de65cab1c42272976c6b6513b3f3d128c46172eec5254" => :x86_64_linux end + depends_on "python@3.8" => :build depends_on "swig" => :build - depends_on "python@3.8" depends_on "ruby" uses_from_macos "perl" @@ -21,8 +22,12 @@ class Libstfl < Formula def install ENV.prepend_path "PATH", Formula["python@3.8"].opt_libexec/"bin" - ENV.append "LDLIBS", "-liconv" - ENV.append "LIBS", "-lncurses -liconv -lruby" + if OS.mac? + ENV.append "LDLIBS", "-liconv" + ENV.append "LIBS", "-lncurses -liconv -lruby" + else + ENV.append "LIBS", "-lncurses -lruby" + end %w[ stfl.pc.in @@ -49,8 +54,12 @@ def install s.change_make_var! "PYTHON_SITEARCH", lib/"python#{xy}/site-packages" s.gsub! "lib-dynload/", "" s.gsub! "ncursesw", "ncurses" - s.gsub! "gcc", "gcc -undefined dynamic_lookup #{`#{python_config} --cflags`.chomp}" - s.gsub! "-lncurses", "-lncurses -liconv" + if OS.mac? + s.gsub! "gcc", "gcc -undefined dynamic_lookup #{`#{python_config} --cflags`.chomp}" + s.gsub! "-lncurses", "-lncurses -liconv" + else + s.gsub! "gcc", "gcc #{`#{python_config} --cflags`.chomp}" + end end # Fails race condition of test: @@ -60,7 +69,7 @@ def install system "make" - inreplace "perl5/Makefile", "Network/Library", libexec/"lib/perl5" + inreplace "perl5/Makefile", "Network/Library", libexec/"lib/perl5" if OS.mac? system "make", "install", "prefix=#{prefix}" end diff --git a/Formula/libstrophe.rb b/Formula/libstrophe.rb index 5997c411539e2..e8563cba54a1a 100644 --- a/Formula/libstrophe.rb +++ b/Formula/libstrophe.rb @@ -10,6 +10,7 @@ class Libstrophe < Formula sha256 "da52155acc06ec67fb84cc51403bdecc76c6431a3d827ef3e30ea138b880b803" => :catalina sha256 "040195fb364d82bbc32e11bfd37e2dbabae64bc898602064c1a432b7c3869efd" => :mojave sha256 "149335c1a3224dbcfdb10bf4c5271edcc224c030d667fc9a8012244b4c2f06ed" => :high_sierra + sha256 "341bf96347c46a583cb2479d5bb247a1e2ff54a7083e8111e843702d38d624ac" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libstxxl.rb b/Formula/libstxxl.rb index 077bd1c3be8bb..18366253b04da 100644 --- a/Formula/libstxxl.rb +++ b/Formula/libstxxl.rb @@ -13,6 +13,7 @@ class Libstxxl < Formula sha256 "8753b0c9ec11f1f6195fa52c346b4d6015652931908156dcdb4468cc94103d1c" => :el_capitan sha256 "fbefd1ceb6f328ef77b9a005f5bc3c93fe23fa68d60b4a5e126a68a6a9d8e17d" => :yosemite sha256 "5a64626281265368e41f51089271c031ae8782651d65fe012f8a86949e37573b" => :mavericks + sha256 "d1454663e06c340f15a4452fe41aeea606768df5958d9f71db6d62148cfa574a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libsvg-cairo.rb b/Formula/libsvg-cairo.rb index 4262804177a5f..2855f5d218ad9 100644 --- a/Formula/libsvg-cairo.rb +++ b/Formula/libsvg-cairo.rb @@ -13,6 +13,7 @@ class LibsvgCairo < Formula sha256 "63cfba79036bfd190a92e6a4c501e2e4c737bf63e6a8df6bdca56885c66ae740" => :sierra sha256 "9f87cc3a6d7e702aab12b23ad1f720ae592bdfb9112753e27c9cf2203dc21915" => :el_capitan sha256 "55bd8f9bfede25e71e9731d72ace27ce7724a4cce030a4e4e6969554ee64238d" => :yosemite + sha256 "071d883e83c9b3c9d5b9625d87a20ca892781dd8f20aacd07236ccbb32b51710" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libsvg.rb b/Formula/libsvg.rb index bfda01d8076e8..47b1507eec092 100644 --- a/Formula/libsvg.rb +++ b/Formula/libsvg.rb @@ -15,6 +15,7 @@ class Libsvg < Formula sha256 "4e7903c15847c2d07a2bdf16d6ddad5a0191ef452cf7733624703fd1b5fd7859" => :el_capitan sha256 "05c230ab37e4f4a3b854373b5c71b275414f852d1b776a60351c0fd49c31674a" => :yosemite sha256 "a6de74ce690bcc7dffd353139182dc0d896250cdca652c315356349f7e78729e" => :mavericks + sha256 "2c2a09470b239192bce44a058fbe0313735c7ce096c26b2eba4e88032ebe4e62" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libsvm.rb b/Formula/libsvm.rb index 807b438e6b103..4ff2b79afe962 100644 --- a/Formula/libsvm.rb +++ b/Formula/libsvm.rb @@ -12,15 +12,21 @@ class Libsvm < Formula sha256 "8dded17ad2e22342ae25d392d5e4d9776572f8b5081e62064e97c027f8c481e6" => :catalina sha256 "4db9a3e77edfda475ca8bdcad82ce1443ed50df41b28b59d726b1fa81944e2c7" => :mojave sha256 "5d4ee9cec3a0048ef8abd328022fa3752c3dc2ead9d86d9995b79558700dbbd2" => :high_sierra + sha256 "93892583011e9379e0378425f9b4be778919cb4df18c7b46a59903208732bf5e" => :x86_64_linux end def install - system "make", "CFLAGS=#{ENV.cflags}" + system "make", "CFLAGS=#{ENV.cflags} -fPIC" system "make", "lib" bin.install "svm-scale", "svm-train", "svm-predict" - lib.install "libsvm.so.2" => "libsvm.2.dylib" - lib.install_symlink "libsvm.2.dylib" => "libsvm.dylib" - MachO::Tools.change_dylib_id("#{lib}/libsvm.2.dylib", "#{lib}/libsvm.2.dylib") + if OS.mac? + lib.install "libsvm.so.2" => "libsvm.2.dylib" + lib.install_symlink "libsvm.2.dylib" => "libsvm.dylib" + MachO::Tools.change_dylib_id("#{lib}/libsvm.2.dylib", "#{lib}/libsvm.2.dylib") + else + lib.install "libsvm.so.2" + lib.install_symlink "libsvm.so.2" => "libsvm.so" + end include.install "svm.h" end diff --git a/Formula/libtar.rb b/Formula/libtar.rb index f6367ca315c35..8a0e79c86ab37 100644 --- a/Formula/libtar.rb +++ b/Formula/libtar.rb @@ -15,6 +15,7 @@ class Libtar < Formula sha256 "018f1c9897f52b783878db67db39a5933a4863a3f9dedc2af9b6bf13f2161957" => :el_capitan sha256 "d8d138fb4c1cf8c33aaaf8633cd748e9a423e84f1df886ae1842d4816b1f34a0" => :yosemite sha256 "b8eb40cc1715243eb0ff85eddd2a5f5546e19ca7278ce30b08bd8e1bd3f0682f" => :mavericks + sha256 "895b12d04e1cda40eb0458d3125a534aa38daed594ff3f68fd65a8e3f5bc86f0" => :x86_64_linux # glibc 2.19 end depends_on "autoconf" => :build diff --git a/Formula/libtasn1.rb b/Formula/libtasn1.rb index f7df1ee148564..460b37726cbf7 100644 --- a/Formula/libtasn1.rb +++ b/Formula/libtasn1.rb @@ -10,6 +10,7 @@ class Libtasn1 < Formula sha256 "00bd968b6a110c5cb497cf0e3b14800ed5e67a2476d0d544aeb1c0c2c1f3f332" => :catalina sha256 "3c2e9cdfec0ccec899847a3ab69b88967b6cbc0b3e406fa1938a4ca6f277b674" => :mojave sha256 "c3cf713b5bb29fcac1381b7242e557b7920cb327c77170a6dd038a477d6021cd" => :high_sierra + sha256 "82fa21c3e11abccccd9f3dfeb4cbba3b5cd6f2463ebd8c787401d7089ebb20af" => :x86_64_linux end def install diff --git a/Formula/libtcod.rb b/Formula/libtcod.rb index f30c6123ef552..afe86e28474f6 100644 --- a/Formula/libtcod.rb +++ b/Formula/libtcod.rb @@ -20,6 +20,11 @@ class Libtcod < Formula depends_on :macos # Due to Python 2 depends_on "sdl2" + unless OS.mac? + depends_on "zlib" + depends_on "linuxbrew/xorg/xorg" + end + def install cd "buildsys/autotools" do system "autoreconf", "-fiv" diff --git a/Formula/libtecla.rb b/Formula/libtecla.rb index 31bea4f00c7eb..781c500d38345 100644 --- a/Formula/libtecla.rb +++ b/Formula/libtecla.rb @@ -13,6 +13,7 @@ class Libtecla < Formula sha256 "3ceb3942ea4ae1434dcc0aea00fa58b6f16787bc1a0067e9497ad4cb050f771a" => :el_capitan sha256 "836d6100343197540f079ea7f6b9e5641fd8efc4e331d3492f8be4cd41ced6e9" => :yosemite sha256 "d7f9b95bbe7540504751d42589e8500a77d15dc3e6b2f7fe501ed872172f1129" => :mavericks + sha256 "d51094034ca406b255ddd2a44c9eeb078ace5502b5bb9b9421e8260a0beb1e10" => :x86_64_linux # glibc 2.19 end uses_from_macos "ncurses" diff --git a/Formula/libtermkey.rb b/Formula/libtermkey.rb index dd3716f9ec8af..33822fba444b0 100644 --- a/Formula/libtermkey.rb +++ b/Formula/libtermkey.rb @@ -10,11 +10,13 @@ class Libtermkey < Formula sha256 "efa6360ccb50275ee143410e57b4ff47b2d6bafd97d6f4feeb3cb3ee02050a2c" => :mojave sha256 "e3b848de428f811c1879530c043145152bf4b0e599ed642aa2845904d13f7081" => :high_sierra sha256 "3f8ce77603619d85de7127f317e276c0cd38a461c545cafeb7c875e7c89fe467" => :sierra + sha256 "06448056fd738bb09a88c734b85e54692bfbd1bed7a977307cbbe480a1e0e5f1" => :x86_64_linux end depends_on "libtool" => :build depends_on "pkg-config" => :build depends_on "unibilium" + depends_on "glib" => :build unless OS.mac? uses_from_macos "ncurses" diff --git a/Formula/libtextcat.rb b/Formula/libtextcat.rb index 28e14d639affb..538cc4c5786a6 100644 --- a/Formula/libtextcat.rb +++ b/Formula/libtextcat.rb @@ -15,6 +15,7 @@ class Libtextcat < Formula sha256 "afa51f83d0a3c96ffc6f6c35011c864347f31d2c3aea987102c59f0257177072" => :el_capitan sha256 "1a63f24b16949843f6a3f6c17d9467208a471cfa6bf1b193738fa94c2d320f02" => :yosemite sha256 "e7880fa731747f117a943fd99bd41da25bae3e6440316d782c4798cf3f55e0b7" => :mavericks + sha256 "90b38de4353d0e026a9b6259b698e34d0091c94d8d54579bef4f07de7fb97869" => :x86_64_linux end def install diff --git a/Formula/libtiff.rb b/Formula/libtiff.rb index 52b1e77d718d3..7d12655bf50ea 100644 --- a/Formula/libtiff.rb +++ b/Formula/libtiff.rb @@ -10,6 +10,7 @@ class Libtiff < Formula sha256 "449bd9123e73e4c4eab85b77322d769cc9df0f6adab05e9b9319b012d1215a68" => :catalina sha256 "dd060521aa30fb2f4678c9ebab6362104a9a705d098a90eac4059743c93c8c16" => :mojave sha256 "577c2754b00fc8a5009e08bfd7af630ab4812250508df20a1c92d3c7ae678b94" => :high_sierra + sha256 "3ab9a2e801258f6511eba129eddf8068ab3bd0ecd5209277cb2f9744b864bfd6" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/libtirpc.rb b/Formula/libtirpc.rb new file mode 100644 index 0000000000000..8144aa25b781e --- /dev/null +++ b/Formula/libtirpc.rb @@ -0,0 +1,39 @@ +class Libtirpc < Formula + desc "Port of Sun's Transport-Independent RPC library to Linux" + homepage "https://sourceforge.net/projects/libtirpc/" + url "https://downloads.sourceforge.net/project/libtirpc/libtirpc/1.1.4/libtirpc-1.1.4.tar.bz2" + sha256 "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d" + + bottle do + cellar :any_skip_relocation + sha256 "8877610a23ff7fc029060517988cd0d07ad253448840bc6927ab5e6b381c3562" => :x86_64_linux + end + + depends_on "krb5" + depends_on :linux + + def install + system "./configure", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + (testpath/"test.c").write <<~EOS + #include + #include + int main () { + char key[] = "My8digitkey1234"; + if (sizeof(key) != 16) + return 1; + des_setparity(key); + printf("%lu\\n", sizeof(key)); + return 0; + } + EOS + system ENV.cc, "test.c", "-L#{lib}", "-I#{include}/tirpc", "-ltirpc", "-o", "test" + system "./test" + end +end diff --git a/Formula/libtomcrypt.rb b/Formula/libtomcrypt.rb index 3c79b3c87c9bf..9449ab99c43fd 100644 --- a/Formula/libtomcrypt.rb +++ b/Formula/libtomcrypt.rb @@ -10,6 +10,7 @@ class Libtomcrypt < Formula sha256 "2ecaaf5a2d64b92c58498482c3aec69c84c7772ffa5f213ad43010199cd7dec8" => :catalina sha256 "fbc00f6bcb941ab719a45ca7a52192b6bda774de1e8997c070fbf025bc031f1a" => :mojave sha256 "7dda8583b31d847e69406c4eebda576e6de8fd6a3a5461a73c890bcce3162c05" => :high_sierra + sha256 "a17141661941d0d72cbb17ef37c10e21f53766064be87f87b9a5abf802e551ea" => :x86_64_linux end def install diff --git a/Formula/libtommath.rb b/Formula/libtommath.rb index 92a5f80d3fe7a..41d0115c44b8b 100644 --- a/Formula/libtommath.rb +++ b/Formula/libtommath.rb @@ -11,6 +11,7 @@ class Libtommath < Formula sha256 "700d1c4dfecd1016215158de7436d02452a149c5882ba3fda1201a72d6c3d5ea" => :catalina sha256 "9832ceb97e387a519d6ae9b66bb3a7066c1d112d947667527a5edfcc692e4983" => :mojave sha256 "26e39af069485ef58c3517fb765db3a5e8dba0f253aac3d0d5968ff2a35e595b" => :high_sierra + sha256 "46ade22aa2c3833f8b71335ededa27275aa126cd6b72ace138395823cf1a8f3c" => :x86_64_linux end # Fixes mp_set_double being missing on macOS. diff --git a/Formula/libtool.rb b/Formula/libtool.rb index c29c928393f11..7ab6a9ab2e631 100644 --- a/Formula/libtool.rb +++ b/Formula/libtool.rb @@ -4,13 +4,14 @@ class Libtool < Formula url "https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz" mirror "https://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.xz" sha256 "7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f" - revision 2 + revision OS.mac? ? 2 : 4 bottle do cellar :any sha256 "af317b35d0a394b7ef55fba4950735b0392d9f31bececebf9c412261c23a01fc" => :catalina sha256 "77ca68934e7ed9b9b0b8ce17618d7f08fc5d5a95d7b845622bf57345ffb1c0d6" => :mojave sha256 "60c7d86f9364e166846f8d3fb2ba969e6ca157e7ecbbb42a1de259116618c2ba" => :high_sierra + sha256 "a0789f8180632aff54aaf7cc276d7c4fe4e7b10f18a949256b87b111c1d8ee26" => :x86_64_linux end uses_from_macos "m4" => :build @@ -30,11 +31,18 @@ def install end ENV["SED"] = "sed" # prevent libtool from hardcoding sed path from superenv + system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", - "--program-prefix=g", + ("--program-prefix=g" if OS.mac?), "--enable-ltdl-install" system "make", "install" + + bin.install_symlink "libtool" => "glibtool" + bin.install_symlink "libtoolize" => "glibtoolize" + + # Avoid references to the Homebrew shims directory + inreplace bin/"libtool", HOMEBREW_SHIMS_PATH/"linux/super/", "/usr/bin/" unless OS.mac? end def caveats @@ -45,7 +53,7 @@ def caveats end test do - system "#{bin}/glibtool", "execute", "/usr/bin/true" + system "#{bin}/glibtool", "execute", File.executable?("/usr/bin/true") ? "/usr/bin/true" : "/bin/true" (testpath/"hello.c").write <<~EOS #include int main() { puts("Hello, world!"); return 0; } diff --git a/Formula/libtorrent-rakshasa.rb b/Formula/libtorrent-rakshasa.rb index 829bce5e5bcb6..34f2719eb4b78 100644 --- a/Formula/libtorrent-rakshasa.rb +++ b/Formula/libtorrent-rakshasa.rb @@ -9,6 +9,7 @@ class LibtorrentRakshasa < Formula sha256 "207e33009028a8721a89c91139fe78fea1cd9fb8a05862286264dfc53548886a" => :catalina sha256 "94afd9fcef673d4e3945c13085df931e12c1bf2422bf6a2ad2c6848634c2fa65" => :mojave sha256 "135df02ce3bb98b05d9f849b8014087e8acaefcc24b1547ff9b1740bbd74492a" => :high_sierra + sha256 "fd0289f02557000737c036cb0321fcf42a84effd36af56375989c968c2fc88cf" => :x86_64_linux end depends_on "autoconf" => :build @@ -17,6 +18,8 @@ class LibtorrentRakshasa < Formula depends_on "pkg-config" => :build depends_on "openssl@1.1" + uses_from_macos "zlib" + conflicts_with "libtorrent-rasterbar", :because => "they both use the same libname" diff --git a/Formula/libtorrent-rasterbar.rb b/Formula/libtorrent-rasterbar.rb index 07792579dc1c0..085d39aef5db1 100644 --- a/Formula/libtorrent-rasterbar.rb +++ b/Formula/libtorrent-rasterbar.rb @@ -9,6 +9,7 @@ class LibtorrentRasterbar < Formula sha256 "ebcf3c671f25bf16e9643b647e2dff1339458d7b6b4e28fbde07e0e54abe29fd" => :catalina sha256 "68bd2a4ed0dd30a61b4bf5667eb21a01e3bc617a6bcb55a5ea5cdbea8954b50e" => :mojave sha256 "1f25a63a7e555b4f4c9f0491e363aa2ba8d5eb134dc3f65a1df6c60cc926c187" => :high_sierra + sha256 "a0b0ed8190763fe9b2f5f31fe51a1d063c2a78d3a9d8827588f0b25392e7ca43" => :x86_64_linux end head do @@ -55,12 +56,23 @@ def install end test do - system ENV.cxx, "-std=c++11", "-I#{Formula["boost"].include}/boost", - "-L#{lib}", "-ltorrent-rasterbar", - "-L#{Formula["boost"].lib}", "-lboost_system", - "-framework", "SystemConfiguration", - "-framework", "CoreFoundation", - libexec/"examples/make_torrent.cpp", "-o", "test" + if OS.mac? + system ENV.cxx, "-std=c++11", "-I#{Formula["boost"].include}/boost", + "-L#{lib}", "-ltorrent-rasterbar", + "-L#{Formula["boost"].lib}", "-lboost_system", + "-framework", "SystemConfiguration", + "-framework", "CoreFoundation", + libexec/"examples/make_torrent.cpp", "-o", "test" + else + system ENV.cxx, libexec/"examples/make_torrent.cpp", + "-std=c++11", + "-I#{Formula["boost"].include}/boost", "-L#{Formula["boost"].lib}", + "-I#{include}", "-L#{lib}", + "-lpthread", + "-lboost_system", + "-ltorrent-rasterbar", + "-o", "test" + end system "./test", test_fixtures("test.mp3"), "-o", "test.torrent" assert_predicate testpath/"test.torrent", :exist? end diff --git a/Formula/libtrng.rb b/Formula/libtrng.rb index 0ffc88b103754..9cee2d097e6ac 100644 --- a/Formula/libtrng.rb +++ b/Formula/libtrng.rb @@ -9,6 +9,7 @@ class Libtrng < Formula sha256 "b0e5af117a32d265de30662de4d7ef61e412853f262949e86ac1ff91dfd69875" => :catalina sha256 "4b753374a4fb6305e417ea5d89237f6e62b47b8c9e2c034c76e26475184de48c" => :mojave sha256 "4f269f561d5b8b692189e90cba163578ad68b2fa83a84660d8da4d367c4a2e93" => :high_sierra + sha256 "e0acfd3b0411b8cb5cb6257d0716eb209a033ed33fe65e32b08d19e69f5fbb22" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libu2f-host.rb b/Formula/libu2f-host.rb index 13ba0bed54d96..df49591acd1c3 100644 --- a/Formula/libu2f-host.rb +++ b/Formula/libu2f-host.rb @@ -10,6 +10,7 @@ class Libu2fHost < Formula sha256 "de1df148c237465d9211d31f885845c44332a797b577f96d231461e822da8194" => :mojave sha256 "29ed5c81b0310b148b65e377d5197311edbada65dfe84d6ab193b701fd982af4" => :high_sierra sha256 "5ee537e748bb3c59aa28c640c656acb25680d37c34933684453a256921ab3f51" => :sierra + sha256 "720d8365fb99d452fa977f95f938241d42ce2e0328cfe7ad1fe9e85d6fa43529" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libu2f-server.rb b/Formula/libu2f-server.rb index 2cfe8c5790aea..445999d785f6d 100644 --- a/Formula/libu2f-server.rb +++ b/Formula/libu2f-server.rb @@ -11,6 +11,7 @@ class Libu2fServer < Formula sha256 "732660807115af952d552524130daa4bf0e4314eebf2f94eade5e2b8229ad678" => :mojave sha256 "f947cf956060d05e1ccf80d21e5f8e0efcc26144cdc15998fb26235bde0b184c" => :high_sierra sha256 "e507b37b71477f7315eeae089473689bc6fbf05466a402ffd48df80c26985ddd" => :sierra + sha256 "97f6e3ee0c9d38767035587fc8980263cfa36f5101491aa85728a9bdf0be022b" => :x86_64_linux end depends_on "check" => :build diff --git a/Formula/libucl.rb b/Formula/libucl.rb index e33fcbc4d8750..d465f4809e1b3 100644 --- a/Formula/libucl.rb +++ b/Formula/libucl.rb @@ -12,6 +12,7 @@ class Libucl < Formula sha256 "dd5dbb4eb7e3d37816acc4f3bc2842c8e91caeb4a6f058eed75cab9d72192315" => :high_sierra sha256 "5c477e0feb163dc955e89eabf97cae445fefc9c920fe46073c85af348535d7cd" => :sierra sha256 "93e7d66507c386c9fe720b5f4c77d3b719574b7c311319cddc09bcbda659bce7" => :el_capitan + sha256 "105185654971e14837cbac0afdd5be444081b1536f0799a80b54972c42e2a794" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libuecc.rb b/Formula/libuecc.rb index c1bac39f6cc98..9cf76fd161be8 100644 --- a/Formula/libuecc.rb +++ b/Formula/libuecc.rb @@ -12,6 +12,7 @@ class Libuecc < Formula sha256 "95646c23acf19c1f07032c6f311f446e7a32b1a9d0c1dd385ec3c41811036572" => :high_sierra sha256 "4722877fdc4538c814a10e6d0dc2f1a4d2a3571ce4ca1c8b37279c88cd83883f" => :sierra sha256 "d9e52027a6535fb74e44026d23ef13a2417a1f22402173dc90d136071ea5290d" => :el_capitan + sha256 "e3281fed2c6db78c24720127aa2f873823a332dc58393f68ba29cd4e6fd82cb7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libuninameslist.rb b/Formula/libuninameslist.rb index a97e1c10525e4..69046ef998027 100644 --- a/Formula/libuninameslist.rb +++ b/Formula/libuninameslist.rb @@ -9,6 +9,7 @@ class Libuninameslist < Formula sha256 "38e3ba23a50f2acdebdf4a6419b8e5d996650f9fd9c4e081eb18c77b57dc08ac" => :catalina sha256 "5bbf66b5f23f99f833b95fae6462084c98838e79142e66a0e602ad7a70dc13f6" => :mojave sha256 "9e6875ea89497fb8f3c8c4121f9142f7ca23f85a4d2ae8b3845d49db4194cf51" => :high_sierra + sha256 "146645519948f29f3e49ffafdff267b672ce9654a9470d2f27e9ebc1ab45bd61" => :x86_64_linux end head do diff --git a/Formula/libunistring.rb b/Formula/libunistring.rb index 6b54aab22b1e9..fc4e928ec3ed4 100644 --- a/Formula/libunistring.rb +++ b/Formula/libunistring.rb @@ -12,6 +12,7 @@ class Libunistring < Formula sha256 "5eeec8fdede3d6ae2c1082179879a41d3b600a36e7d83acc5ea0587ad85d5a9d" => :high_sierra sha256 "3a7a0e8737c19995bc8a263724a90a26b418b177deee90b4e6746c353b348e12" => :sierra sha256 "df01e794e8d11926ea023798f9f95d516a6c28009cbdfd29ea1d1a9107812d66" => :el_capitan + sha256 "c3abe7fa8b2fb314e2bbbe003e9db550148e95a2816e3c95e30199178bfe578b" => :x86_64_linux end def install diff --git a/Formula/libupnp.rb b/Formula/libupnp.rb index c4685ff1336de..8b854f162b74f 100644 --- a/Formula/libupnp.rb +++ b/Formula/libupnp.rb @@ -9,6 +9,7 @@ class Libupnp < Formula sha256 "2343d98fde1cf6ff2cb529f08d609b9685e85e72cdb75916daf5fb21345c5baf" => :catalina sha256 "7d05f24f8bcb7e0edaaa35bce6f94208d05e9157c0b8897205bd0df84e9e845f" => :mojave sha256 "b67bb447214ba6622325b0b0932ae2366a7ea4d6b9342d723ec9c027515cadbc" => :high_sierra + sha256 "30efcd2c2824ccd7ccdd40f107b2263f0fa25c78fc7b34dd67f4dd4e4f0cd143" => :x86_64_linux end def install diff --git a/Formula/libusb-compat.rb b/Formula/libusb-compat.rb index 1479ae45f1638..99a04500d177d 100644 --- a/Formula/libusb-compat.rb +++ b/Formula/libusb-compat.rb @@ -13,6 +13,7 @@ class LibusbCompat < Formula sha256 "e24ad80ee860f6f6c7e6c8dbb100aaa2de3294e2ecf7f591f2f51c52e11f09ea" => :sierra sha256 "7b62449f8a9c02834b74adeb0827ca2ae32b47cb82923de0a8e88f16c36ca8b8" => :el_capitan sha256 "0e4f131b8fd8210db3ff353a92c35ed12643a717b8780618680e3b4a16d7f347" => :yosemite + sha256 "7a27e889da8e809d5c93ce724be81367f69d623849df97c5b894a4b971dd04f1" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/libusb.rb b/Formula/libusb.rb index e9856682c5854..0f855bfe7607f 100644 --- a/Formula/libusb.rb +++ b/Formula/libusb.rb @@ -10,6 +10,7 @@ class Libusb < Formula sha256 "cbfd8044e5e595fcee3cbf62edac4b626a8c623be53ed76e7111fa235ff97668" => :catalina sha256 "6dd71c1bc0bbe67ee8f76fb01d33d805bde20b7182695e338e080c9d443029a6" => :mojave sha256 "312ca96b255aa045cd2c87150c58e020f49d50e7f354219d944a37de8ec0278c" => :high_sierra + sha256 "48d8e029c40d50e3e549a30a04814c8f23b30e61c6769fb1f4944128f614129f" => :x86_64_linux end head do @@ -20,6 +21,8 @@ class Libusb < Formula depends_on "libtool" => :build end + depends_on "systemd" if OS.linux? # for libudev + def install args = %W[--disable-dependency-tracking --prefix=#{prefix}] @@ -32,8 +35,8 @@ def install test do cp_r (pkgshare/"examples"), testpath cd "examples" do - system ENV.cc, "-lusb-1.0", "-L#{lib}", "-I#{include}/libusb-1.0", - "listdevs.c", "-o", "test" + system ENV.cc, "-L#{lib}", "-I#{include}/libusb-1.0", + "listdevs.c", "-o", "test", "-lusb-1.0" system "./test" end end diff --git a/Formula/libusbmuxd.rb b/Formula/libusbmuxd.rb index 52134a0e60738..c443acf374152 100644 --- a/Formula/libusbmuxd.rb +++ b/Formula/libusbmuxd.rb @@ -10,6 +10,7 @@ class Libusbmuxd < Formula sha256 "72fcc67099f03a3d68faa131eaf464a431e5d5eaea0a5ddb9b8414c065f7ef73" => :catalina sha256 "132ee76aa823e51abb97c92c53ab8a30819720ced7020080f949cf4fd937f6ea" => :mojave sha256 "67c3d43cb2a1ebfd68fba1c9b51b419288fedefc93f101adeea1b5f6bdf1ad77" => :high_sierra + sha256 "cea8ac47904a4a0dac13f9420ec2c8639e03f8cad78f373b521bb93e1431618f" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libuv.rb b/Formula/libuv.rb index 288764db328fe..d2674cb7611f5 100644 --- a/Formula/libuv.rb +++ b/Formula/libuv.rb @@ -10,6 +10,7 @@ class Libuv < Formula sha256 "49933a77e2c7022eea4bc13481a22b46b4335abb5202b9815ea81b5b71cfa508" => :catalina sha256 "649cb26495fd52cbfcefc6aedbaa4be5cae50dab66132083cd912b213468bff0" => :mojave sha256 "b4840d8c12a0f5384c0d82e124889cdbe4ca6a5e8dd0c9adb3c3dfdd6539b303" => :high_sierra + sha256 "ce104eeb6947a00aa3dfb5cf0c2fc4219eb66e1851108e301fc097856251b72d" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libuvc.rb b/Formula/libuvc.rb index 0efe9d3486a77..d053b06e9c500 100644 --- a/Formula/libuvc.rb +++ b/Formula/libuvc.rb @@ -13,6 +13,7 @@ class Libuvc < Formula sha256 "c0ec2076095af1c5154bc43d18a5869b5678f026f1b3c76964f136e4ada07717" => :high_sierra sha256 "1888941024fe1b8ca44f15b98e51390872286c0145806fbd0a61999bab225905" => :sierra sha256 "4defbab7e171c20da065eb5e4f2b11b5b27165efbd850e742674be281f3a0fcd" => :el_capitan + sha256 "53b5d544c54769aca873258fa6d022cf0a342173d90f92373439cc25b68bd434" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libvbucket.rb b/Formula/libvbucket.rb index a218949aa480f..a524fe0e6833e 100644 --- a/Formula/libvbucket.rb +++ b/Formula/libvbucket.rb @@ -14,6 +14,7 @@ class Libvbucket < Formula sha256 "cc3333f73161a96deb410ae0b8185a74e0c2a5bc8e62018929b17efe6ef732b8" => :el_capitan sha256 "dd69ae3261c461b15bd29e435ab95496441dfde4535cb7d6925527cdfa8c64dd" => :yosemite sha256 "920f0656e62f10e6fc6649b0edc4a6f46dc196f931b7c14833608d9e926a4d09" => :mavericks + sha256 "d74034d12d03175501a165f0cb1dacb10544be8a7d6a1914ba09bf490e24b566" => :x86_64_linux end def install diff --git a/Formula/libvidstab.rb b/Formula/libvidstab.rb index 7b98705e1c3a8..3b222b5ddbbeb 100644 --- a/Formula/libvidstab.rb +++ b/Formula/libvidstab.rb @@ -12,6 +12,7 @@ class Libvidstab < Formula sha256 "5ff2357b04a9bb854b9a09d3b6974f7c665e032948a95981357bf62b857a4099" => :sierra sha256 "e3ed904feb361f98bc78ee3211ab6a13a4913f56e09213fecfb73f305c95dc45" => :el_capitan sha256 "f12257af2bbd99c395152638cb8a76e654a838072c55cb7a1cc25bacef632cc8" => :yosemite + sha256 "9903fe167d9ed96dc3d7a6fee63d1d651b68e3172de6b2b7327f7723a1b51d58" => :x86_64_linux # glibc 2.19 end depends_on "cmake" => :build diff --git a/Formula/libvmaf.rb b/Formula/libvmaf.rb index b18a70fe43290..202a5bba5381b 100644 --- a/Formula/libvmaf.rb +++ b/Formula/libvmaf.rb @@ -5,10 +5,11 @@ class Libvmaf < Formula sha256 "9267b40223ac8d67fb6b99726ce7ed3925b9843f18ad5aa8ffbe2fe873e45cbe" bottle do - cellar :any + cellar :any_skip_relocation sha256 "873889277a7832ad4a824fc11de7a8e83a07dce4e875b91b3ea17fa1240dabca" => :catalina sha256 "e443f171f8b387448750dafaf145d8fd03ded30e5ef92e6774c3ccef33d3c53e" => :mojave sha256 "b8bf0a9899818a59cb23ed9fe7abd84f84418cf340685efea16618795e5b731b" => :high_sierra + sha256 "7f81e8077d61daa9c30d0f35799c99aab3e96ffae9ee128697709fa44fd25dfe" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/libvo-aacenc.rb b/Formula/libvo-aacenc.rb index 85556b45ee88d..8a1dfe0fa83a8 100644 --- a/Formula/libvo-aacenc.rb +++ b/Formula/libvo-aacenc.rb @@ -13,6 +13,7 @@ class LibvoAacenc < Formula sha256 "e9a59439f8eec4cdc4d273afb49cbd8f8357862d4d8c7c5d9d9d38588ec6d810" => :el_capitan sha256 "cf63ddcb79e40b79264507393ed4fa1b223feecf4638f0e58fef464db722b554" => :yosemite sha256 "645f4294e8512add5c5f263cd8273c93e22eab565307ada5f8804ef7b9d41d8d" => :mavericks + sha256 "83ce60b4e4f066d2bb98b4952d2fe92199cc41588bdc280c69f688e4fd4d7809" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/libvoikko.rb b/Formula/libvoikko.rb index eb3ea4625642c..60c777b5038a2 100644 --- a/Formula/libvoikko.rb +++ b/Formula/libvoikko.rb @@ -10,6 +10,7 @@ class Libvoikko < Formula sha256 "77b2e04b116979ed93b2b6371fa434433e770b944410a55b15b2174a45ff7b8d" => :catalina sha256 "f9ab71db12a2457de1705ea205506efd2bacf3433a85cfecc00af01dc7430a5c" => :mojave sha256 "e809b2d5759f6c04c20228d91598d767462354bc4a97bcb30daa017132cd01e7" => :high_sierra + sha256 "4545f9354995733af75ec9391174212c9f36a106a906ed8215b74a868b8037de" => :x86_64_linux end depends_on "foma" => :build diff --git a/Formula/libvorbis.rb b/Formula/libvorbis.rb index d760dc54e863d..3c56a58efcff0 100644 --- a/Formula/libvorbis.rb +++ b/Formula/libvorbis.rb @@ -10,6 +10,7 @@ class Libvorbis < Formula sha256 "78dd589f9c2110c204e8762d3ee2899b209cded2bd372603be0fc8c748f52cd4" => :catalina sha256 "2fdfb811a94b56091aa3175708e92f7371c59a961a798fe8dfb2a82d0241406e" => :mojave sha256 "434729ebb5c161e3240dde60f752af6bbec324af3b7df87f802d48134db92afb" => :high_sierra + sha256 "39eef213df783ebcee233503664973a3d56719f28915aa0f392a86b2858ee6cd" => :x86_64_linux end head do diff --git a/Formula/libvpx.rb b/Formula/libvpx.rb index cb705c4f488ce..ac7c834fb6c82 100644 --- a/Formula/libvpx.rb +++ b/Formula/libvpx.rb @@ -11,6 +11,7 @@ class Libvpx < Formula sha256 "4648d298037c5ac129b41e29a53a39445d7b1d90b90b4eef1eb1d476ae835ab5" => :catalina sha256 "d509da7176f5db9dc3953b8380a84386a9e0c9c71ce9d50cd410f84679e00c48" => :mojave sha256 "8b2b60c22848752acb6cc470105918932e5f3bf0a45e4af6f3154b1a79ac91c0" => :high_sierra + sha256 "9301e58d0655b586720de04cb3d42a3b46ee3b3ab30e37bd27e1ddb010d9fef9" => :x86_64_linux end depends_on "yasm" => :build diff --git a/Formula/libvterm.rb b/Formula/libvterm.rb index d78d7293a1770..b7c210f3a526a 100644 --- a/Formula/libvterm.rb +++ b/Formula/libvterm.rb @@ -10,6 +10,7 @@ class Libvterm < Formula sha256 "74c971c0a3157f7b34c69360c7b76611dcbb949e50ba255603a70f3d643e7cca" => :catalina sha256 "da5f5c504963d145c7a5e2ac9fd0fc0d9008251f98b11fbc6f818da59057c128" => :mojave sha256 "3362cf826401b4c9d4012de2777eecd90b3b168b723f51371adb5eb18e22fbc9" => :high_sierra + sha256 "6f16d7865caccba09b4acb8252c9794e54012105e98c7eff9bc30387eef4a83e" => :x86_64_linux end depends_on "libtool" => :build diff --git a/Formula/libwandevent.rb b/Formula/libwandevent.rb index bb53d636ee8f7..715292c22f98e 100644 --- a/Formula/libwandevent.rb +++ b/Formula/libwandevent.rb @@ -12,6 +12,7 @@ class Libwandevent < Formula sha256 "e4b00ade9387b8fdccf72bbe9edd0e334c69f23597f85dd1e6da02088703c286" => :sierra sha256 "f1459d39284b520c17443c6bef5ccb641dfe1e20266a4f34071f6a87cd9669e4" => :el_capitan sha256 "b8c90b8dca1d0ded39036d7f23b4e33857c7914e178ba8ac8870ab702f96fa04" => :yosemite + sha256 "0059a328c6e1ce3b54bf269fb06f933209a0afaa9eee2659ccc2bbb4c0c16d74" => :x86_64_linux end def install diff --git a/Formula/libwebsockets.rb b/Formula/libwebsockets.rb index 1e1dfcab9522e..308db8b30ea84 100644 --- a/Formula/libwebsockets.rb +++ b/Formula/libwebsockets.rb @@ -9,6 +9,7 @@ class Libwebsockets < Formula sha256 "1c58b7f6e0fc788ec6bdbf1be8465b5ea66c3ac5aaa35f6994245b815e5c4324" => :catalina sha256 "9e8a31e00e850e38cd5f354f707caaae8d24aac3034ae3f748192f9a47912157" => :mojave sha256 "72eded73851def11c00c25a96c0934c8b9d67c20d8f6e5915bb4ae0bd605c2a6" => :high_sierra + sha256 "b662466a66f2360bc37817647064b116775b3d580707c58b82c36a04d44276ab" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/libwmf.rb b/Formula/libwmf.rb index dd4bad85dd908..1736be84a230b 100644 --- a/Formula/libwmf.rb +++ b/Formula/libwmf.rb @@ -12,6 +12,7 @@ class Libwmf < Formula sha256 "9df806eb6a4a3ca1a2b4b656ff02623175892981fbf136c89d4df5b5853bd20c" => :sierra sha256 "205bf519460576ecf73e9314ba1171542be58ea22cea81c26424d661734f2d2f" => :el_capitan sha256 "3554c19cc80eb6435ad630587a38dd094a3f33008c11a93a622f1eb62b2a3e2e" => :yosemite + sha256 "436afdfc6a33c889b1d082870759779a3248070dc349084058159d8dd1585e29" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libxc.rb b/Formula/libxc.rb index 93e642a497e3c..753f0ee64ac5e 100644 --- a/Formula/libxc.rb +++ b/Formula/libxc.rb @@ -10,6 +10,7 @@ class Libxc < Formula sha256 "072df8c5f3e00bf045f4e062993ecb08e324872daf3503b8f2bacef866a3de14" => :catalina sha256 "7727321091982306464ad87e055074b2675d83ee3c8416cf6b0681a4db31bc85" => :mojave sha256 "c8f820ca8dce64220c8c1e60002a13c4ed21d5decfd6b1189b6d286ca5c47ab4" => :high_sierra + sha256 "0fe93e7ecc908da080122a987132e0f944701a10555f5e3fdd5cb85e2ae77a2a" => :x86_64_linux end depends_on "autoconf" => :build @@ -37,7 +38,11 @@ def install printf(\"%d.%d.%d\", major, minor, micro); } EOS - system ENV.cc, "test.c", "-L#{lib}", "-lxc", "-I#{include}", "-o", "ctest" + if OS.mac? + system ENV.cc, "test.c", "-L#{lib}", "-lxc", "-I#{include}", "-o", "ctest" + else + system ENV.cc, "test.c", "-L#{lib}", "-I#{include}", "-lm", "-lxc", "-o", "ctest" + end system "./ctest" (testpath/"test.f90").write <<~EOS diff --git a/Formula/libxdg-basedir.rb b/Formula/libxdg-basedir.rb index 0386348b2695f..3f5b468db7c54 100644 --- a/Formula/libxdg-basedir.rb +++ b/Formula/libxdg-basedir.rb @@ -13,6 +13,7 @@ class LibxdgBasedir < Formula sha256 "30b3e34a46470f11d90ca01aebd2b2d1fbaa6cc8a05c1bcec7067d40fdec75d1" => :el_capitan sha256 "7e165b0e949f559789981a5c0e0fd68bbf478943a0c9b03ad3778cecb0219691" => :yosemite sha256 "5c7bfadf4ca8b26c077eea7480df5a4ca3634b5823860a06ce2756050acbe84a" => :mavericks + sha256 "fa14818ebb73407ff98f96f188594a7a2a64915e2c56b7971b0bd2f84f88d551" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libxdiff.rb b/Formula/libxdiff.rb index f1d695980e5c8..21187e8096a5a 100644 --- a/Formula/libxdiff.rb +++ b/Formula/libxdiff.rb @@ -14,6 +14,7 @@ class Libxdiff < Formula sha256 "55d89877bd5457b7a5b77cf68187f544ff413228ec17a701e7879644ae528f35" => :el_capitan sha256 "6269c8d291cea44aceda9bd8e1e93a061e64d76852e47b781ae49aee28f0c31c" => :yosemite sha256 "eb1a482e6da44ad722af99334618ddb17da926f4c88a8c85361e04ce0e59bb54" => :mavericks + sha256 "29b24110584476d786fce5b591069bc30c793ad85f5592c9e782b8211fb3399b" => :x86_64_linux end def install diff --git a/Formula/libxkbcommon.rb b/Formula/libxkbcommon.rb index 2d9bcd0044b7e..a632afa499f13 100644 --- a/Formula/libxkbcommon.rb +++ b/Formula/libxkbcommon.rb @@ -10,13 +10,19 @@ class Libxkbcommon < Formula sha256 "4cdb1253e94b84d437d265c6e7c893c0bd4ab250de217c1326bc7192917dd53b" => :catalina sha256 "d3f1d57e7ac3f00e3ddf5b95f24446ea09b254d880757ca928ab6f3873aad215" => :mojave sha256 "d9faf6a0432c5c26d3245d401899ee7a4230eade04cdd36995fa49748d1a8a62" => :high_sierra + sha256 "94e5759fb008b2e78e3c4541ffa671e8d84ed12c6ec892026527780a5d2c0ecd" => :x86_64_linux end depends_on "bison" => :build depends_on "meson" => :build depends_on "ninja" => :build depends_on "pkg-config" => :build - depends_on :x11 + depends_on :x11 if OS.mac? + + unless OS.mac? + depends_on "linuxbrew/xorg/xkeyboardconfig" + depends_on "linuxbrew/xorg/libxcb" + end def install mkdir "build" do diff --git a/Formula/libxlsxwriter.rb b/Formula/libxlsxwriter.rb index d4dbb0bb1132b..3a6292186bad3 100644 --- a/Formula/libxlsxwriter.rb +++ b/Formula/libxlsxwriter.rb @@ -9,6 +9,7 @@ class Libxlsxwriter < Formula sha256 "aa4dfa3809039590f7e5284ab4ea0457d351d7b5983ec7f3ff62a944d1e0392c" => :catalina sha256 "71bfed5e6a4a29cfc504ca53036555a642da48e7768e0a7520ee7e4835f919dd" => :mojave sha256 "e0a34105b51af1ee4ff32a5e8bbbb9fd853b19b3d860c79396d583834ec8708f" => :high_sierra + sha256 "65bd0e1db687c8992d331bc80542298849db1e1487467657097d5d756cd08786" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/libxml++.rb b/Formula/libxml++.rb index 0405b20f1c7d1..4775edb5835af 100644 --- a/Formula/libxml++.rb +++ b/Formula/libxml++.rb @@ -3,7 +3,7 @@ class Libxmlxx < Formula homepage "https://libxmlplusplus.sourceforge.io/" url "https://download.gnome.org/sources/libxml++/2.40/libxml++-2.40.1.tar.xz" sha256 "4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9" - revision 2 + revision OS.mac? ? 2: 4 bottle do cellar :any @@ -11,6 +11,7 @@ class Libxmlxx < Formula sha256 "720d42ff48194360d192e9166697a8e299268ac2722c5c8b599fc2898cbd1def" => :mojave sha256 "9f25cf8395b3a06dbfe5d7dc2ddc320e2491211bedbe95ddac53b748eca9a31e" => :high_sierra sha256 "074c4e2583789fd71bb88abbb230cee7a55d17bece2ff8630feeb895b0c5fddf" => :sierra + sha256 "df9a28ad52aa81b36ed20f1e2a860fc4661c486b0cbf779da80771f5494dff42" => :x86_64_linux end depends_on "pkg-config" => :build @@ -59,11 +60,11 @@ def install -lglib-2.0 -lglibmm-2.4 -lgobject-2.0 - -lintl -lsigc-2.0 -lxml++-2.6 -lxml2 ] + args << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/libxml++3.rb b/Formula/libxml++3.rb index 34f8877ad7c76..21cbc86fe3ace 100644 --- a/Formula/libxml++3.rb +++ b/Formula/libxml++3.rb @@ -9,6 +9,7 @@ class Libxmlxx3 < Formula sha256 "583c5345ed243a5cea2bbf82e71a130e85554110ebe3927183171c66225a7c26" => :catalina sha256 "054180f67aa9d297a26c40fc9e6dcc27bf68e78f09db895b3821c68751eabae2" => :mojave sha256 "2da0d0f6e732f910e75e5b20c19a01056854d00feab6e1c2490b7722bbc1af29" => :high_sierra + sha256 "96fb527eebcdfdb6dbc000c006d9b8fda423468ed199c1caff5f2abb88b0d9b3" => :x86_64_linux end depends_on "pkg-config" => :build @@ -57,11 +58,11 @@ def install -lglib-2.0 -lglibmm-2.4 -lgobject-2.0 - -lintl -lsigc-2.0 -lxml++-3.0 -lxml2 ] + flags << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/libxml2.rb b/Formula/libxml2.rb index 4b2c5a77d15ec..043de2a4dadc3 100644 --- a/Formula/libxml2.rb +++ b/Formula/libxml2.rb @@ -11,6 +11,7 @@ class Libxml2 < Formula sha256 "bab6280370d9e7171d34e79ed1c1caa9b0b772ef7a1568f448a654255a505d5e" => :catalina sha256 "7185d4c64a25e546eaf525134210bfb21edffb0bfa93c122e4696ab3788cfbf3" => :mojave sha256 "bff3e730b9531c1b5088d49633a740eb27938961dc762b7de344e06d85ea20ee" => :high_sierra + sha256 "afa080258dd1517d0c076ea053e661954bb185d0bf804104fd6a601e78fa57df" => :x86_64_linux end head do @@ -61,7 +62,7 @@ def install cd "python" do # We need to insert our include dir first inreplace "setup.py", "includes_dir = [", - "includes_dir = ['#{include}', '#{MacOS.sdk_path}/usr/include'," + "includes_dir = ['#{include}', '#{OS.mac? ? MacOS.sdk_path/"usr" : HOMEBREW_PREFIX}/include'," system Formula["python@3.8"].opt_bin/"python3", "setup.py", "install", "--prefix=#{prefix}" end end @@ -79,8 +80,8 @@ def install return 0; } EOS - args = shell_output("#{bin}/xml2-config --cflags --libs").split - args += %w[test.c -o test] + args = %w[test.c -o test] + args += shell_output("#{bin}/xml2-config --cflags --libs").split system ENV.cc, *args system "./test" diff --git a/Formula/libxmlsec1.rb b/Formula/libxmlsec1.rb index 9d1062373d2bb..b4a47ff4f1a8d 100644 --- a/Formula/libxmlsec1.rb +++ b/Formula/libxmlsec1.rb @@ -9,6 +9,7 @@ class Libxmlsec1 < Formula sha256 "4214643458e159a5de8d558ac93c0f9a96c862cde71bc4f14a794d797304bd31" => :catalina sha256 "75031c634f924e22948121de02ad29408bc961cb7589f908bd02f67bfa576f69" => :mojave sha256 "50aab4085561db3c215d0020117f2585cf078125c58fa24174904cf1d001cd21" => :high_sierra + sha256 "db635f11da6f33dabc5131ab8fd9691d80ba2b9a81c0a6dff656ffee767d370a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/libxmp.rb b/Formula/libxmp.rb index 21945368c92e5..68dac6cb83a02 100644 --- a/Formula/libxmp.rb +++ b/Formula/libxmp.rb @@ -12,6 +12,7 @@ class Libxmp < Formula sha256 "019ff8e51453bf527ba6ec46fd289acc5396208e230445afb0332a18752d72e2" => :sierra sha256 "8da81ed699c312c831be38295df20218663fef23aec1cab91afa7e425baaa4ab" => :el_capitan sha256 "dd80b8a6786f265488503234bb7aecffa15ab0a5c099677fd0989fd3329709d2" => :yosemite + sha256 "000485628d649584912f7aec7f8eb536a0f764a4045380830e42837b146b5176" => :x86_64_linux end head do diff --git a/Formula/libxo.rb b/Formula/libxo.rb index 518c5e08b54cf..0d2ee2d021992 100644 --- a/Formula/libxo.rb +++ b/Formula/libxo.rb @@ -8,6 +8,7 @@ class Libxo < Formula sha256 "3dffbef9394a617fa8c901c44ce7b31b8843c947762744a8ea1374780d5c1224" => :catalina sha256 "9c137a2e9828de98fb201d4d8da74eda20e6a276d90a83d8d1fa3017ba7059d1" => :mojave sha256 "59d5d434c2ec21fb06dd22b87780e82a31b6eebfd9db795fafece858bc1e4755" => :high_sierra + sha256 "f5e1ecc093ae16bee17f90be76cd67583385e60d02f3bea571ac51bede86bffd" => :x86_64_linux end depends_on "libtool" => :build diff --git a/Formula/libxslt.rb b/Formula/libxslt.rb index 0e322872bf812..e7a1ee4a91ec9 100644 --- a/Formula/libxslt.rb +++ b/Formula/libxslt.rb @@ -3,12 +3,14 @@ class Libxslt < Formula homepage "http://xmlsoft.org/XSLT/" url "http://xmlsoft.org/sources/libxslt-1.1.34.tar.gz" sha256 "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f" + revision 1 unless OS.mac? bottle do - cellar :any + cellar :any_skip_relocation sha256 "cbadecf3186f45754220dff4cbdfbb576882a211d615b52249a4c9d8ba4d7c3a" => :catalina sha256 "6feb1b8d57dd0d8b651733720d4dac728d2e27cf8c9fa9f88e60612fe0a0c882" => :mojave sha256 "733c15b756070866d08196dcd5eef9facea1ce98d9c233cd6bf73fa426e0d062" => :high_sierra + sha256 "c16054b828e41ac85f98e50ca2a8c086a5b477feef554d12d286a2103471967d" => :x86_64_linux end head do @@ -29,6 +31,7 @@ def install system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", "--prefix=#{prefix}", + ("--without-crypto" unless OS.mac?), "--without-python", "--with-libxml-prefix=#{Formula["libxml2"].opt_prefix}" system "make" diff --git a/Formula/libyaml.rb b/Formula/libyaml.rb index 672b934adec8c..7d2fb10591d85 100644 --- a/Formula/libyaml.rb +++ b/Formula/libyaml.rb @@ -9,6 +9,7 @@ class Libyaml < Formula sha256 "56d3549b342cffb181e3eb05356697bbb362b9733c73e0eeff9b637ecf92cd23" => :catalina sha256 "a04988b3868cfadf7bcaff6b753b59388cbea70b38f2fa41a25229150d073696" => :mojave sha256 "d3e22ad09c3d6872c5f7ee7c7f1146c9f14c178ff4c3a3488a20bf584bc854d5" => :high_sierra + sha256 "7467d0c0a6a389b6e3b90dee0ea083be1a85be412f85afc0a6f027ad838dd6c0" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/libyubikey.rb b/Formula/libyubikey.rb index d469d5253286f..74a438cf461cd 100644 --- a/Formula/libyubikey.rb +++ b/Formula/libyubikey.rb @@ -13,6 +13,7 @@ class Libyubikey < Formula sha256 "2b1fbc1860932dd4a4c2b09928d838bc3646ff0b2a97bc5c538981befdc21760" => :el_capitan sha256 "7f5c7a55b9e5bf373f01f8f02a983d45ae11d801acc8110cd8f5e13edf0e2973" => :yosemite sha256 "efaf65ea86cb01821d8c3145ab0f0528f6bb9e8afa0090ffbf2c0818e093c357" => :mavericks + sha256 "47b0325d71e03da76b69b3eb8449b7ed0cb10cd7cfcff99adb0f3c70975551b3" => :x86_64_linux end def install diff --git a/Formula/libzdb.rb b/Formula/libzdb.rb index b52215c9931df..15b83d2e66cd4 100644 --- a/Formula/libzdb.rb +++ b/Formula/libzdb.rb @@ -9,6 +9,7 @@ class Libzdb < Formula sha256 "114982357474fdd8af3df7d11a3575e81686ff55d6c2018b5385c7f5acfee7ed" => :catalina sha256 "bc52a04fe2ae5500200c1521f4e32497c9eee2d2c4087e60c9ed11a09b2cac67" => :mojave sha256 "123039235efee305797c3252e0e4b07c93989785165c044eefa9f86eae73f9b0" => :high_sierra + sha256 "11571183ea966c810f1dae1d777b4599cc3a0e3d2a3ccb08d68d1f39d433a468" => :x86_64_linux end depends_on :macos => :high_sierra # C++ 17 is required @@ -17,7 +18,17 @@ class Libzdb < Formula depends_on "postgresql" depends_on "sqlite" + unless OS.mac? + depends_on "gcc@7" # C++ 17 is required + + fails_with :gcc => "4" + fails_with :gcc => "5" + fails_with :gcc => "6" + end + def install + # workaround for error: 'assert' was not declared in this scope + system "sed", "-i", "1,1i#include ", "test/zdbpp.cpp" unless OS.mac? system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking" system "make", "install" pkgshare.install "test" @@ -26,7 +37,8 @@ def install test do cp_r pkgshare/"test", testpath cd "test" do - system ENV.cc, "select.c", "-L#{lib}", "-lzdb", "-I#{include}/zdb", "-o", "select" + system ENV.cc, "select.c", "-L#{lib}", + *("-lpthread" unless OS.mac?), "-lzdb", "-I#{include}/zdb", "-o", "select" system "./select" end end diff --git a/Formula/libzip.rb b/Formula/libzip.rb index 06761c2a177c5..0f6237c52b6f6 100644 --- a/Formula/libzip.rb +++ b/Formula/libzip.rb @@ -8,9 +8,14 @@ class Libzip < Formula sha256 "a5e946984fe35dbbceb39dbb2a68e781cb3c7d7df642b5e0024e87e4dd211f26" => :catalina sha256 "8799d573ede87e67c7498e12e63a4ec9deac4ee2e76d51303c59f71350597d1b" => :mojave sha256 "4cf3e50e427b704125978eddddc4bd64e67d2631f54c4fd7990503a8b07dff57" => :high_sierra + sha256 "a46ce4a7a33b2189b64c2ee75359ed73009641b1bade9cebb07840b658183590" => :x86_64_linux end depends_on "cmake" => :build + unless OS.mac? + depends_on "openssl@1.1" + depends_on "xz" # For LZMA + end uses_from_macos "bzip2" uses_from_macos "zlib" @@ -24,6 +29,12 @@ def install end test do + zip = OS.mac? ? "/usr/bin/zip" : which("zip") + if zip.nil? + opoo "Not testing unzip, because it requires zip, which is unavailable." + return + end + touch "file1" system "zip", "file1.zip", "file1" touch "file2" diff --git a/Formula/lightning.rb b/Formula/lightning.rb index 0f52abf853c8a..88bd9bbf7c13e 100644 --- a/Formula/lightning.rb +++ b/Formula/lightning.rb @@ -10,6 +10,7 @@ class Lightning < Formula sha256 "543bb685d72b8e9b10b14f3dcd615d38f8f499d10e1d27e40604240fc3f65ac3" => :catalina sha256 "c767959e901e6f47f9bbfe243e629508edbdb138376443d7943c4c4a5a52d4f2" => :mojave sha256 "da42166b5dd858cad42eeb7fc69a9ef870d23b67da6fa978d4bc58d3a464a0d4" => :high_sierra + sha256 "7c848b9a98637b222e8fa9bd4fa9a53855e43e62c3fc81819b7fbe46aefcad25" => :x86_64_linux end depends_on "binutils" => :build diff --git a/Formula/lighttpd.rb b/Formula/lighttpd.rb index 5af27ca34a5ee..f31c89769ed09 100644 --- a/Formula/lighttpd.rb +++ b/Formula/lighttpd.rb @@ -8,6 +8,7 @@ class Lighttpd < Formula sha256 "7cb7b6026dbba9a3afde8a0e2e2740499564687fb61ee6c49d5cabc29f780a2d" => :catalina sha256 "432da2049539f4416d952ecdfcfefc5b5230447edaebfd63b958a92581ae57ab" => :mojave sha256 "c7e9b87c219d8bf64561c185c6fcc68c2caafded7a4e980d379fd4fbbe00bd1d" => :high_sierra + sha256 "0deee2884bc726413c2ac3f76c32f72268c8eeda8af29b44351b8a3ba22fced2" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/link-grammar.rb b/Formula/link-grammar.rb index d63bfe7506281..36abd0739ac5f 100644 --- a/Formula/link-grammar.rb +++ b/Formula/link-grammar.rb @@ -8,6 +8,7 @@ class LinkGrammar < Formula sha256 "e38c9f157ec985be94ed5e792442f5d81c00b71d0b84164ed146d8ab3fbb46dd" => :catalina sha256 "4e9b86a609145b67983faa850c0918500cdcb1da5ab5f1ecb945cabdc8533b74" => :mojave sha256 "391cc292bef0a6eb3b21add8bf427f0fcc0122ec59b41003387df27a1c51803c" => :high_sierra + sha256 "d026d4a7189fbd621d0ab8d7884c5c85962851b3806713e8cc69a7ad72579805" => :x86_64_linux end depends_on "ant" => :build diff --git a/Formula/linkerd.rb b/Formula/linkerd.rb index a7f2d504c5da2..3df3608a4fa17 100644 --- a/Formula/linkerd.rb +++ b/Formula/linkerd.rb @@ -11,6 +11,7 @@ class Linkerd < Formula sha256 "c0014dc13f18612f9346e16e1e1cf8520560cafddf406fff33ff8778c1314581" => :catalina sha256 "c3768f1ebfb56ae0685f7debdd354a79b507f3076fb464480fffd0367d58ea32" => :mojave sha256 "9affcd21b8644326642e098fdcdcf57ac083621d709264b630a4fd6b7b685ded" => :high_sierra + sha256 "fe61e3a7497afd75fc0a04f59e9d823d52920e1da05970a415211049e8058c89" => :x86_64_linux end depends_on "go" => :build @@ -18,8 +19,14 @@ class Linkerd < Formula def install ENV["CI_FORCE_CLEAN"] = "1" + os = if OS.mac? + "darwin" + else + "linux" + end + system "bin/build-cli-bin" - bin.install "target/cli/darwin/linkerd" + bin.install "target/cli/#{os}/linkerd" # Install bash completion output = Utils.safe_popen_read("#{bin}/linkerd completion bash") diff --git a/Formula/links.rb b/Formula/links.rb index 15222fe86789f..85163b09687cc 100644 --- a/Formula/links.rb +++ b/Formula/links.rb @@ -9,6 +9,7 @@ class Links < Formula sha256 "0a3c7483bcee4795978c8db90bdf2f07a46baa09cb6258a620f7d89e4724a466" => :catalina sha256 "82b66ce4fc6e261197ad6d00110a6963620772b4e1e0b553c4c982e39c363fa5" => :mojave sha256 "8c04e068acff9290a354b2c244638ca27056a086b67b90fac90e6bbfc1a7215b" => :high_sierra + sha256 "97ae4aaad50108b0a4a87ba867b4677ad40b8d6a70dd6868314cbdac102895f6" => :x86_64_linux end depends_on "pkg-config" => :build @@ -16,6 +17,7 @@ class Links < Formula depends_on "librsvg" depends_on "libtiff" depends_on "openssl@1.1" + depends_on "linuxbrew/xorg/xorg" unless OS.mac? def install args = %W[ diff --git a/Formula/linux-headers.rb b/Formula/linux-headers.rb new file mode 100644 index 0000000000000..23ad98e17a1e8 --- /dev/null +++ b/Formula/linux-headers.rb @@ -0,0 +1,22 @@ +class LinuxHeaders < Formula + desc "Header files of the Linux kernel" + homepage "https://kernel.org/" + url "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.80.tar.gz" + sha256 "291d844619b5e7c43bd5aa0b2c286274fc5ffe31494ba475f167a21157e88186" + + bottle do + cellar :any_skip_relocation + sha256 "b9d7edb2760ec070372d6dd37f2dff85c34221cf77d124d4732092447ac2cf9f" => :x86_64_linux # glibc 2.19 + end + + depends_on :linux + + def install + system "make", "headers_install", "INSTALL_HDR_PATH=#{prefix}" + rm Dir[prefix/"**/{.install,..install.cmd}"] + end + + test do + assert_match "KERNEL_VERSION", File.read(include/"linux/version.h") + end +end diff --git a/Formula/linux-pam.rb b/Formula/linux-pam.rb new file mode 100644 index 0000000000000..488e6a4fa7d89 --- /dev/null +++ b/Formula/linux-pam.rb @@ -0,0 +1,48 @@ +class LinuxPam < Formula + desc "Pluggable Authentication Modules for Linux" + homepage "http://www.linux-pam.org" + url "https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-1.3.1.tar.xz" + sha256 "eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db" + revision 1 + head "https://github.com/linux-pam/linux-pam.git" + + bottle do + sha256 "cfd3e88fa210f22cdd7ea27dc997aed320f5c338717cf490cd76cbbfb3c312f1" => :x86_64_linux + end + + depends_on "pkg-config" => :build + depends_on "berkeley-db" + depends_on "libprelude" + depends_on :linux + + skip_clean :la, "etc" + + def install + args = %W[ + --disable-debug + --disable-dependency-tracking + --disable-silent-rules + --prefix=#{prefix} + --includedir=#{include}/security + --oldincludedir=#{include} + --enable-securedir=#{lib}/security + --sysconfdir=#{etc} + --with-xml-catalog=#{etc}/xml/catalog + --with-libprelude-prefix=#{Formula["libprelude"].opt_prefix} + ] + + system "./configure", *args + system "make" + system "make", "check" + system "make", "install" + end + + def post_install + chmod "u=rwxs,g=rx,o=rx", "#{sbin}/unix_chkpwd" + end + + test do + File.exist? "#{sbin}/unix_chkpwd" + assert_match "Usage", shell_output("#{sbin}/mkhomedir_helper 2>&1", 14) + end +end diff --git a/Formula/liquid-dsp.rb b/Formula/liquid-dsp.rb index b0b41b8077f8e..8c5e329b74af7 100644 --- a/Formula/liquid-dsp.rb +++ b/Formula/liquid-dsp.rb @@ -10,6 +10,7 @@ class LiquidDsp < Formula sha256 "12702bbff57912c18a4f637df59da56054f8afcc11f96467341af3bd26ec0992" => :mojave sha256 "f0a6f6caba39b3e06a972aa89293161fa6d4d3759751709f40f2cc8d7ea3c913" => :high_sierra sha256 "10bca6603365aeefad410287fbf1657b6b2401544e2cc16f1f2ef6f9ffbe8bc9" => :sierra + sha256 "0033a8865cb445399359cbe2d1db8cd86017bbb2da24631e608fb826b41f6c98" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/literate-git.rb b/Formula/literate-git.rb index bc602dd611871..7007f8208e083 100644 --- a/Formula/literate-git.rb +++ b/Formula/literate-git.rb @@ -5,13 +5,14 @@ class LiterateGit < Formula homepage "https://github.com/bennorth/literate-git" url "https://github.com/bennorth/literate-git/archive/v0.3.1.tar.gz" sha256 "f1dec77584236a5ab2bcee9169e16b5d976e83cd53d279512136bdc90b04940a" - revision 3 + revision OS.mac? ? 3 : 5 bottle do cellar :any sha256 "b704c927f102c0ce4fac2a02d6e0e3a93569179af257a0922b7b14b326d0bbe1" => :catalina sha256 "6f82567697db68d8ff88fd5c493717cbba18869904252319daa4cfe26cc80b42" => :mojave sha256 "237597cd7d2517d3b34144ba0eacd21a9d50d32e6bbe0ce496eaf8d1b9c9dab7" => :high_sierra + sha256 "11737a034e1247554453f6919450519892fb560a6ec635031dc267897afc8478" => :x86_64_linux end depends_on "libgit2" diff --git a/Formula/little-cms.rb b/Formula/little-cms.rb index 41fc5e78aaced..d3704a095a101 100644 --- a/Formula/little-cms.rb +++ b/Formula/little-cms.rb @@ -13,6 +13,7 @@ class LittleCms < Formula sha256 "227c16cbe117abeac7398265543c20b905396b214785e1a9dc48041f0f3ce128" => :sierra sha256 "c1125a0074a82747ffc33ab79c617ea448b605ace47d6c5cf788f2d3a49d7c5d" => :el_capitan sha256 "bc02c8267bf616ef0dcfc27db97a849b0f79e8211164ea4a955482b964255a7e" => :yosemite + sha256 "cbbce881216ac6e065c72218f651bac2513ff50d8ac295a6bc935bd2f2cb3a28" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/little-cms2.rb b/Formula/little-cms2.rb index c073aabfdb745..de6e0f9f9c9ee 100644 --- a/Formula/little-cms2.rb +++ b/Formula/little-cms2.rb @@ -11,6 +11,7 @@ class LittleCms2 < Formula sha256 "b0fe7486871b0fb0e34012f48bce09e96229e5e2985d64e7a0164c2847e41975" => :catalina sha256 "e05f0a487d2243411eeb9fd9909f875517d7b27feb3cb914117acd9c60b76fcc" => :mojave sha256 "928d1b8b8292a2d7950d0ef1381c70996bcde325f0124d7dcb68059090544dac" => :high_sierra + sha256 "4f8c6ff23401b88d771fa28d80d3ef3d4f0dfc5fc838d8a73b2a6b540e176d66" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/lizard.rb b/Formula/lizard.rb index cf75e15a4d735..46ec71d74ab02 100644 --- a/Formula/lizard.rb +++ b/Formula/lizard.rb @@ -10,6 +10,7 @@ class Lizard < Formula sha256 "adce9d789c2391a96697128d39f103fa0a23b3e462b7e7a2d22346ceeab74925" => :mojave sha256 "c3266fb61fb88de0d7a9f3fb2ce53e3ca2708278c7c7064b2b61a4abf138708d" => :high_sierra sha256 "928e2fce0d64f3a5c960684ddca781073cdd285fd5f00f61c05675d5cb617366" => :sierra + sha256 "6cf3e399c918fcbd4f2c80b77affb83dcc98ed74ea348ba36e247282faedf82e" => :x86_64_linux end def install diff --git a/Formula/lldpd.rb b/Formula/lldpd.rb index 25e5d2124ed55..04672b06fc09e 100644 --- a/Formula/lldpd.rb +++ b/Formula/lldpd.rb @@ -8,6 +8,7 @@ class Lldpd < Formula sha256 "f37abc384f5435813515146bfa157d53d07611bce4b1b177ddc3d3410416b0b5" => :catalina sha256 "578f07789b6d8f8d0ab98d64707ec14a1879005a06bfe88f9d0447d474e7f2cf" => :mojave sha256 "4f04dc494f01c2ce011ea48c1e85efb3c985e98fe5b31ce768019d3746acd5ea" => :high_sierra + sha256 "25b993a4f98117c8d0997860dc46dc4d459ff8eff6d23d843551c373eb105c62" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/llvm.rb b/Formula/llvm.rb index cebbdee0f7120..a473f14c95a58 100644 --- a/Formula/llvm.rb +++ b/Formula/llvm.rb @@ -1,8 +1,9 @@ +require "os/linux/glibc" + class Llvm < Formula desc "Next-gen compiler infrastructure" homepage "https://llvm.org/" - revision 3 - head "https://github.com/llvm/llvm-project.git" + revision OS.mac? ? 3 : 7 stable do url "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/llvm-10.0.0.src.tar.xz" @@ -11,6 +12,13 @@ class Llvm < Formula resource "clang" do url "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang-10.0.0.src.tar.xz" sha256 "885b062b00e903df72631c5f98b9579ed1ed2790f74e5646b4234fa084eacb21" + + unless OS.mac? + patch do + url "https://gist.githubusercontent.com/iMichka/9ac8e228679a85210e11e59d029217c1/raw/e50e47df860201589e6f43e9f8e9a4fc8d8a972b/clang9?full_index=1" + sha256 "65cf0dd9fdce510e74648e5c230de3e253492b8f6793a89534becdb13e488d0c" + end + end end resource "clang-tools-extra" do @@ -23,9 +31,11 @@ class Llvm < Formula sha256 "6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75" end - resource "libcxx" do - url "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/libcxx-10.0.0.src.tar.xz" - sha256 "270f8a3f176f1981b0f6ab8aa556720988872ec2b48ed3b605d0ced8d09156c7" + if OS.mac? + resource "libcxx" do + url "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/libcxx-10.0.0.src.tar.xz" + sha256 "270f8a3f176f1981b0f6ab8aa556720988872ec2b48ed3b605d0ced8d09156c7" + end end resource "libunwind" do @@ -54,17 +64,40 @@ class Llvm < Formula end end + unless OS.mac? + patch :p2 do + url "https://github.com/llvm/llvm-project/commit/7f5fe30a150e7e87d3fbe4da4ab0e76ec38b40b9.patch?full_index=1" + sha256 "9ed85d2b00d0b70c628a5d1256d87808d944532fe8c592516577a4f8906a042c" + end + + # Needed for crystal + patch :p2, :DATA + end + bottle do cellar :any sha256 "ea9b9f579df49499d9ab0084e10edecc5350298d6c5db399a1dabc8694dab7db" => :catalina sha256 "14f59a25e73e3a00fd36632f2106b41eda1b54aa1039b4b979bd957a8c041bf4" => :mojave sha256 "6e09ca233790a58edae55bba453fd50179369b5514acb5f8b86156401227a75e" => :high_sierra + sha256 "b09fd9d4d0eedb37a159fb1141588011ce6ad8d2945e7c48fc02d5c3e6cf99b0" => :x86_64_linux end # Clang cannot find system headers if Xcode CLT is not installed pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } + end + + head do + url "https://github.com/llvm/llvm-project.git" + + unless OS.mac? + patch do + url "https://gist.githubusercontent.com/iMichka/9ac8e228679a85210e11e59d029217c1/raw/e50e47df860201589e6f43e9f8e9a4fc8d8a972b/clang9?full_index=1" + sha256 "65cf0dd9fdce510e74648e5c230de3e253492b8f6793a89534becdb13e488d0c" + directory "clang" + end + end end keg_only :provided_by_macos @@ -74,7 +107,7 @@ class Llvm < Formula # See: Homebrew/homebrew-core/issues/35513 depends_on "cmake" => :build depends_on "python@3.8" => :build - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "libffi" uses_from_macos "libedit" @@ -82,6 +115,18 @@ class Llvm < Formula uses_from_macos "ncurses" uses_from_macos "zlib" + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "gcc" # needed for libstdc++ + if Formula["glibc"].any_version_installed? || OS::Linux::Glibc.system_version < Formula["glibc"].version + depends_on "glibc" + end + depends_on "binutils" # needed for gold and strip + depends_on "libelf" # openmp requires + + conflicts_with "clang-format", :because => "both install `clang-format` binaries" + end + def install projects = %w[ clang @@ -93,9 +138,9 @@ def install ] runtimes = %w[ compiler-rt - libcxx libunwind ] + args << "libcxx" if OS.mac? llvmpath = buildpath/"llvm" unless build.head? @@ -119,6 +164,17 @@ def install # can almost be treated as an entirely different build from llvm. ENV.permit_arch_flags + unless OS.mac? + # see https://llvm.org/docs/HowToCrossCompileBuiltinsOnArm.html#the-cmake-try-compile-stage-fails + # Basically, the stage1 clang will try to locate a gcc toolchain and often + # get the default from /usr/local, which might contains an old version of + # gcc that can't build compiler-rt. This fixes the problem and, unlike + # setting the main project's cmake option -DGCC_INSTALL_PREFIX, avoid + # hardcoding the gcc path into the binary + inreplace "compiler-rt/CMakeLists.txt", /(cmake_minimum_required.*\n)/, + "\\1add_compile_options(\"--gcc-toolchain=#{Formula["gcc"].opt_prefix}\")" + end + args = %W[ -DLLVM_ENABLE_PROJECTS=#{projects.join(";")} -DLLVM_ENABLE_RUNTIMES=#{runtimes.join(";")} @@ -126,10 +182,8 @@ def install -DLLVM_POLLY_LINK_INTO_TOOLS=ON -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON -DLLVM_LINK_LLVM_DYLIB=ON - -DLLVM_BUILD_LLVM_C_DYLIB=ON -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_FFI=ON - -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_TESTS=OFF @@ -139,7 +193,6 @@ def install -DLLVM_TARGETS_TO_BUILD=all -DFFI_INCLUDE_DIR=#{Formula["libffi"].opt_lib}/libffi-#{Formula["libffi"].version}/include -DFFI_LIBRARY_DIR=#{Formula["libffi"].opt_lib} - -DLLVM_CREATE_XCODE_TOOLCHAIN=ON -DLLDB_USE_SYSTEM_DEBUGSERVER=ON -DLLDB_ENABLE_PYTHON=OFF -DLLDB_ENABLE_LUA=OFF @@ -147,15 +200,36 @@ def install -DLIBOMP_INSTALL_ALIASES=OFF -DCLANG_PYTHON_BINDINGS_VERSIONS=#{py_ver} ] + if OS.mac? + args << "-DLLVM_BUILD_LLVM_C_DYLIB=ON" + args << "-DLLVM_ENABLE_LIBCXX=ON" + args << "-DLLVM_CREATE_XCODE_TOOLCHAIN=ON" + else + args << "-DLLVM_BUILD_LLVM_C_DYLIB=OFF" + args << "-DLLVM_ENABLE_LIBCXX=OFF" + args << "-DLLVM_CREATE_XCODE_TOOLCHAIN=OFF" + args << "-DCLANG_DEFAULT_CXX_STDLIB=libstdc++" + end sdk = MacOS.sdk_path_if_needed args << "-DDEFAULT_SYSROOT=#{sdk}" if sdk + # Enable llvm gold plugin for LTO + args << "-DLLVM_BINUTILS_INCDIR=#{Formula["binutils"].opt_include}" unless OS.mac? + mkdir llvmpath/"build" do system "cmake", "-G", "Unix Makefiles", "..", *(std_cmake_args + args) system "make" system "make", "install" - system "make", "install-xcode-toolchain" + system "make", "install-xcode-toolchain" if OS.mac? + end + + unless OS.mac? + # Strip executables/libraries/object files to reduce their size + system("strip", "--strip-unneeded", "--preserve-dates", *(Dir[bin/"**/*", lib/"**/*"]).select do |f| + f = Pathname.new(f) + f.file? && (f.elf? || f.extname == ".a") + end) end # Install LLVM Python bindings @@ -193,7 +267,7 @@ def caveats system "#{bin}/clang", "-L#{lib}", "-fopenmp", "-nobuiltininc", "-I#{lib}/clang/#{clean_version}/include", - "omptest.c", "-o", "omptest" + "omptest.c", "-o", "omptest", *ENV["LDFLAGS"].split testresult = shell_output("./omptest") sorted_testresult = testresult.split("\n").sort.join("\n") @@ -223,16 +297,32 @@ def caveats } EOS - # Testing default toolchain and SDK location. - system "#{bin}/clang++", "-v", - "-std=c++11", "test.cpp", "-o", "test++" - assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./test++").chomp - system "#{bin}/clang", "-v", "test.c", "-o", "test" - assert_equal "Hello World!", shell_output("./test").chomp + unless OS.mac? + system "#{bin}/clang++", "-v", "test.cpp", "-o", "test" + assert_equal "Hello World!", shell_output("./test").chomp + end # Testing Command Line Tools - if MacOS::CLT.installed? + if OS.mac? && MacOS::CLT.installed? + libclangclt = Dir[ + "/Library/Developer/CommandLineTools/usr/lib/clang/#{MacOS::CLT.version.to_i}*" + ].last { |f| File.directory? f } + + system "#{bin}/clang++", "-v", "-nostdinc", + "-I/Library/Developer/CommandLineTools/usr/include/c++/v1", + "-I#{libclangclt}/include", + "-I/usr/include", + # need it because /Library/.../usr/include/c++/v1/iosfwd refers to , + # which CLT installs to /usr/include + "test.cpp", "-o", "testCLT++" + # Testing default toolchain and SDK location. + system "#{bin}/clang++", "-v", + "-std=c++11", "test.cpp", "-o", "test++" + assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./test++").chomp + system "#{bin}/clang", "-v", "test.c", "-o", "test" + assert_equal "Hello World!", shell_output("./test").chomp + toolchain_path = "/Library/Developer/CommandLineTools" system "#{bin}/clang++", "-v", "-isysroot", MacOS::CLT.sdk_path, @@ -247,7 +337,7 @@ def caveats end # Testing Xcode - if MacOS::Xcode.installed? + if OS.mac? && MacOS::Xcode.installed? system "#{bin}/clang++", "-v", "-isysroot", MacOS::Xcode.sdk_path, "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include/c++/v1", @@ -264,31 +354,47 @@ def caveats # link against installed libc++ # related to https://github.com/Homebrew/legacy-homebrew/issues/47149 - system "#{bin}/clang++", "-v", - "-isystem", "#{opt_include}/c++/v1", - "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", - "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" - assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testlibc++").chomp - - (testpath/"scanbuildtest.cpp").write <<~EOS - #include - int main() { - int *i = new int; - *i = 1; - delete i; - std::cout << *i << std::endl; - return 0; - } - EOS - assert_includes shell_output("#{bin}/scan-build clang++ scanbuildtest.cpp 2>&1"), - "warning: Use of memory after it is freed" - - (testpath/"clangformattest.c").write <<~EOS - int main() { - printf("Hello world!"); } - EOS - assert_equal "int main() { printf(\"Hello world!\"); }\n", + if OS.mac? + system "#{bin}/clang++", "-v", + "-isystem", "#{opt_include}/c++/v1", + "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", + "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" + assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testlibc++").chomp + + (testpath/"scanbuildtest.cpp").write <<~EOS + #include + int main() { + int *i = new int; + *i = 1; + delete i; + std::cout << *i << std::endl; + return 0; + } + EOS + assert_includes shell_output("#{bin}/scan-build clang++ scanbuildtest.cpp 2>&1"), + "warning: Use of memory after it is freed" + + (testpath/"clangformattest.c").write <<~EOS + int main() { + printf("Hello world!"); } + EOS + assert_equal "int main() { printf(\"Hello world!\"); }\n", shell_output("#{bin}/clang-format -style=google clangformattest.c") + end end end +__END__ +diff --git a/llvm/include/llvm/BinaryFormat/Dwarf.h b/llvm/include/llvm/BinaryFormat/Dwarf.h +index 2ad201831..8bb9c6bed 100644 +--- a/llvm/include/llvm/BinaryFormat/Dwarf.h ++++ b/llvm/include/llvm/BinaryFormat/Dwarf.h +@@ -232,6 +232,8 @@ inline bool isCPlusPlus(SourceLanguage S) { + case DW_LANG_hi_user: + return false; + } ++ if (S >= DW_LANG_lo_user && S <= DW_LANG_hi_user) ++ return false; + llvm_unreachable("Invalid source language"); + } + diff --git a/Formula/llvm@6.rb b/Formula/llvm@6.rb index 44ec9a1916a70..2c3342ef04b62 100644 --- a/Formula/llvm@6.rb +++ b/Formula/llvm@6.rb @@ -3,19 +3,20 @@ class LlvmAT6 < Formula homepage "https://llvm.org/" url "https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz" sha256 "b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2" - revision 3 + revision OS.mac? ? 3 : 4 bottle do cellar :any sha256 "3b8315438ee3bf9eaed52b8f293e5aabbbfde7bcab4eded5de9a62b214d0b8b9" => :catalina sha256 "5f628b4b14fe10a7b3654902a126956561983ba7aa96dc1d519bfdde5b0552c0" => :mojave sha256 "bc740b2c28da83adc7bbfecb1c76a1777a963236de52af18f4413d6b090119ec" => :high_sierra + sha256 "95f3236a8fd89bd91f02a5cb53589ed39aa9c91d5f5e904acc435630c8cfee06" => :x86_64_linux end # Clang cannot find system headers if Xcode CLT is not installed pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end keg_only :versioned_formula @@ -24,9 +25,27 @@ class LlvmAT6 < Formula depends_on "cmake" => :build depends_on "libffi" + unless OS.mac? + depends_on "gcc" # needed for libstdc++ + depends_on "binutils" # needed for gold and strip + depends_on "libedit" # llvm requires + depends_on "libelf" # openmp requires + depends_on "ncurses" + depends_on "libxml2" + depends_on "zlib" + depends_on "python@3.8" + end + resource "clang" do url "https://releases.llvm.org/6.0.1/cfe-6.0.1.src.tar.xz" sha256 "7c243f1485bddfdfedada3cd402ff4792ea82362ff91fbdac2dae67c6026b667" + + unless OS.mac? + patch do + url "https://github.com/xu-cheng/clang/commit/83c39729df671c06b003e2638a2d5600a8a2278c.patch?full_index=1" + sha256 "c8a038fb648278d9951d03a437723d5a55abc64346668566b707d555ae5997a6" + end + end end resource "clang-extra-tools" do @@ -39,9 +58,11 @@ class LlvmAT6 < Formula sha256 "f4cd1e15e7d5cb708f9931d4844524e4904867240c306b06a4287b22ac1c99b9" end - resource "libcxx" do - url "https://releases.llvm.org/6.0.1/libcxx-6.0.1.src.tar.xz" - sha256 "7654fbc810a03860e6f01a54c2297a0b9efb04c0b9aa0409251d9bdb3726fc67" + if OS.mac? + resource "libcxx" do + url "https://releases.llvm.org/6.0.1/libcxx-6.0.1.src.tar.xz" + sha256 "7654fbc810a03860e6f01a54c2297a0b9efb04c0b9aa0409251d9bdb3726fc67" + end end resource "libunwind" do @@ -69,6 +90,14 @@ class LlvmAT6 < Formula sha256 "e7765fdf6c8c102b9996dbb46e8b3abc41396032ae2315550610cf5a1ecf4ecc" end + # Clang cannot find system headers if Xcode CLT is not installed + if OS.mac? + pour_bottle? do + reason "The bottle needs the Xcode CLT to be installed." + satisfy { MacOS::CLT.installed? } + end + end + def install # Apple's libstdc++ is too old to build LLVM ENV.libcxx if ENV.compiler == :clang @@ -76,7 +105,7 @@ def install (buildpath/"tools/clang").install resource("clang") (buildpath/"tools/clang/tools/extra").install resource("clang-extra-tools") (buildpath/"projects/openmp").install resource("openmp") - (buildpath/"projects/libcxx").install resource("libcxx") + (buildpath/"projects/libcxx").install resource("libcxx") if OS.mac? (buildpath/"projects/libunwind").install resource("libunwind") (buildpath/"tools/lld").install resource("lld") (buildpath/"tools/polly").install resource("polly") @@ -96,7 +125,6 @@ def install -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_FFI=ON - -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INSTALL_UTILS=ON @@ -105,10 +133,18 @@ def install -DWITH_POLLY=ON -DFFI_INCLUDE_DIR=#{Formula["libffi"].opt_lib}/libffi-#{Formula["libffi"].version}/include -DFFI_LIBRARY_DIR=#{Formula["libffi"].opt_lib} - -DLLVM_CREATE_XCODE_TOOLCHAIN=ON ] - if MacOS.version >= :mojave + if OS.mac? + args << "-DLLVM_CREATE_XCODE_TOOLCHAIN=ON" + args << "-DLLVM_ENABLE_LIBCXX=ON" + else + args << "-DLLVM_CREATE_XCODE_TOOLCHAIN=OFF" + args << "-DLLVM_ENABLE_LIBCXX=OFF" + args << "-DCLANG_DEFAULT_CXX_STDLIB=libstdc++" + end + + if OS.mac? && MacOS.version >= :mojave sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" : MacOS.sdk_path args << "-DDEFAULT_SYSROOT=#{sdk_path}" end @@ -117,7 +153,7 @@ def install system "cmake", "-G", "Unix Makefiles", "..", *(std_cmake_args + args) system "make" system "make", "install" - system "make", "install-xcode-toolchain" + system "make", "install-xcode-toolchain" if OS.mac? end (share/"cmake").install "cmake/modules" @@ -131,8 +167,17 @@ def install man1.install_symlink share/"clang/tools/scan-build/man/scan-build.1" # install llvm python bindings - (lib/"python2.7/site-packages").install buildpath/"bindings/python/llvm" - (lib/"python2.7/site-packages").install buildpath/"tools/clang/bindings/python/clang" + xz = OS.mac? ? "2.7": "3.8" + (lib/"python#{xz}/site-packages").install buildpath/"bindings/python/llvm" + (lib/"python#{xz}/site-packages").install buildpath/"tools/clang/bindings/python/clang" + + unless OS.mac? + # Strip executables/libraries/object files to reduce their size + system("strip", "--strip-unneeded", "--preserve-dates", *(Dir[bin/"**/*", lib/"**/*"]).select do |f| + f = Pathname.new(f) + f.file? && (f.elf? || f.extname == ".a") + end) + end end def caveats @@ -163,7 +208,8 @@ def caveats system "#{bin}/clang", "-L#{lib}", "-fopenmp", "-nobuiltininc", "-I#{lib}/clang/#{clean_version}/include", - "omptest.c", "-o", "omptest" + *("-Wl,-rpath=#{lib}" unless OS.mac?), + "omptest.c", "-o", "omptest", *ENV["LDFLAGS"].split testresult = shell_output("./omptest") sorted_testresult = testresult.split("\n").sort.join("\n") @@ -195,73 +241,80 @@ def caveats } EOS - # Testing default toolchain and SDK location. - system "#{bin}/clang++", "-v", - "-std=c++11", "test.cpp", "-o", "test++" - assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./test++").chomp - system "#{bin}/clang", "-v", "test.c", "-o", "test" - assert_equal "Hello World!", shell_output("./test").chomp - - # Testing Command Line Tools - if MacOS::CLT.installed? - toolchain_path = "/Library/Developer/CommandLineTools" - sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" - system "#{bin}/clang++", "-v", - "-isysroot", sdk_path, - "-isystem", "#{toolchain_path}/usr/include/c++/v1", - "-isystem", "#{toolchain_path}/usr/include", - "-isystem", "#{sdk_path}/usr/include", - "-std=c++11", "test.cpp", "-o", "testCLT++" - assert_includes MachO::Tools.dylibs("testCLT++"), "/usr/lib/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testCLT++").chomp - system "#{bin}/clang", "-v", "test.c", "-o", "testCLT" - assert_equal "Hello World!", shell_output("./testCLT").chomp + unless OS.mac? + system "#{bin}/clang++", "-v", "test.cpp", "-o", "test" + assert_equal "Hello World!", shell_output("./test").chomp end - # Testing Xcode - if MacOS::Xcode.installed? + if OS.mac? + # Testing default toolchain and SDK location. + system "#{bin}/clang++", "-v", + "-std=c++11", "test.cpp", "-o", "test++" + assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./test++").chomp + system "#{bin}/clang", "-v", "test.c", "-o", "test" + assert_equal "Hello World!", shell_output("./test").chomp + + # Testing Command Line Tools + if MacOS::CLT.installed? + toolchain_path = "/Library/Developer/CommandLineTools" + sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + system "#{bin}/clang++", "-v", + "-isysroot", sdk_path, + "-isystem", "#{toolchain_path}/usr/include/c++/v1", + "-isystem", "#{toolchain_path}/usr/include", + "-isystem", "#{sdk_path}/usr/include", + "-std=c++11", "test.cpp", "-o", "testCLT++" + assert_includes MachO::Tools.dylibs("testCLT++"), "/usr/lib/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testCLT++").chomp + system "#{bin}/clang", "-v", "test.c", "-o", "testCLT" + assert_equal "Hello World!", shell_output("./testCLT").chomp + end + + # Testing Xcode + if MacOS::Xcode.installed? + system "#{bin}/clang++", "-v", + "-isysroot", MacOS.sdk_path, + "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include/c++/v1", + "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include", + "-isystem", "#{MacOS.sdk_path}/usr/include", + "-std=c++11", "test.cpp", "-o", "testXC++" + assert_includes MachO::Tools.dylibs("testXC++"), "/usr/lib/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testXC++").chomp + system "#{bin}/clang", "-v", + "-isysroot", MacOS.sdk_path, + "test.c", "-o", "testXC" + assert_equal "Hello World!", shell_output("./testXC").chomp + end + + # link against installed libc++ + # related to https://github.com/Homebrew/legacy-homebrew/issues/47149 system "#{bin}/clang++", "-v", - "-isysroot", MacOS.sdk_path, - "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include/c++/v1", - "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include", - "-isystem", "#{MacOS.sdk_path}/usr/include", - "-std=c++11", "test.cpp", "-o", "testXC++" - assert_includes MachO::Tools.dylibs("testXC++"), "/usr/lib/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testXC++").chomp - system "#{bin}/clang", "-v", - "-isysroot", MacOS.sdk_path, - "test.c", "-o", "testXC" - assert_equal "Hello World!", shell_output("./testXC").chomp + "-isystem", "#{opt_include}/c++/v1", + "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", + "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" + assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testlibc++").chomp + + (testpath/"scanbuildtest.cpp").write <<~EOS + #include + int main() { + int *i = new int; + *i = 1; + delete i; + std::cout << *i << std::endl; + return 0; + } + EOS + assert_includes shell_output("#{bin}/scan-build clang++ scanbuildtest.cpp 2>&1"), + "warning: Use of memory after it is freed" + + (testpath/"clangformattest.c").write <<~EOS + int main() { + printf("Hello world!"); } + EOS + assert_equal "int main() { printf(\"Hello world!\"); }\n", + shell_output("#{bin}/clang-format -style=google clangformattest.c") end - - # link against installed libc++ - # related to https://github.com/Homebrew/legacy-homebrew/issues/47149 - system "#{bin}/clang++", "-v", - "-isystem", "#{opt_include}/c++/v1", - "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", - "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" - assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testlibc++").chomp - - (testpath/"scanbuildtest.cpp").write <<~EOS - #include - int main() { - int *i = new int; - *i = 1; - delete i; - std::cout << *i << std::endl; - return 0; - } - EOS - assert_includes shell_output("#{bin}/scan-build clang++ scanbuildtest.cpp 2>&1"), - "warning: Use of memory after it is freed" - - (testpath/"clangformattest.c").write <<~EOS - int main() { - printf("Hello world!"); } - EOS - assert_equal "int main() { printf(\"Hello world!\"); }\n", - shell_output("#{bin}/clang-format -style=google clangformattest.c") end end diff --git a/Formula/llvm@7.rb b/Formula/llvm@7.rb index b00f6228bcd0f..0cf404de3695c 100644 --- a/Formula/llvm@7.rb +++ b/Formula/llvm@7.rb @@ -3,31 +3,54 @@ class LlvmAT7 < Formula homepage "https://llvm.org/" url "https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz" sha256 "1bcc9b285074ded87b88faaedddb88e6b5d6c331dfcfb57d7f3393dd622b3764" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any sha256 "400bb0bb43849d1f118d93a1647de6e9636934e941c43a6f4866258f764f42b3" => :catalina sha256 "564f25a86c519b737a795de441da6c6c14e9f026813a73149b7939c986241ba6" => :mojave sha256 "4170d8e522ce8aea22450c818bb68b6142671f4239262395d8f09d82621ee343" => :high_sierra + sha256 "e41ddcf009f8654bb6786977a28147340fc48bce9b24e271e372a1b128c41aa4" => :x86_64_linux end # Clang cannot find system headers if Xcode CLT is not installed pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end keg_only :versioned_formula # https://llvm.org/docs/GettingStarted.html#requirement depends_on "cmake" => :build - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "libffi" + unless OS.mac? + depends_on "gcc" # needed for libstdc++ + if Formula["glibc"].any_version_installed? || OS::Linux::Glibc.system_version < Formula["glibc"].version + depends_on "glibc" + end + depends_on "binutils" # needed for gold and strip + depends_on "libedit" # llvm requires + depends_on "libelf" # openmp requires + depends_on "ncurses" + depends_on "libxml2" + depends_on "python@3.8" + depends_on "zlib" + depends_on "libomp" + end + resource "clang" do url "https://releases.llvm.org/7.1.0/cfe-7.1.0.src.tar.xz" sha256 "e97dc472aae52197a4d5e0185eb8f9e04d7575d2dc2b12194ddc768e0f8a846d" + + unless OS.mac? + patch do + url "https://gist.githubusercontent.com/iMichka/027fd3d17b4c729e73a190ae29e44b47/raw/a88c628f28ca9cd444cc3771072260fe46ff8a29/llvm7.patch?full_index=1" + sha256 "8db2acff4fbe0533667c9a0527a6a180fd2a84daea4271665fd42f88a08eaa86" + end + end end resource "clang-extra-tools" do @@ -72,7 +95,7 @@ def install (buildpath/"tools/clang").install resource("clang") (buildpath/"tools/clang/tools/extra").install resource("clang-extra-tools") (buildpath/"projects/openmp").install resource("openmp") - (buildpath/"projects/libcxx").install resource("libcxx") + (buildpath/"projects/libcxx").install resource("libcxx") if OS.mac? (buildpath/"projects/libunwind").install resource("libunwind") (buildpath/"tools/lld").install resource("lld") (buildpath/"tools/polly").install resource("polly") @@ -85,6 +108,17 @@ def install # can almost be treated as an entirely different build from llvm. ENV.permit_arch_flags + unless OS.mac? + # see https://llvm.org/docs/HowToCrossCompileBuiltinsOnArm.html#the-cmake-try-compile-stage-fails + # Basically, the stage1 clang will try to locate a gcc toolchain and often + # get the default from /usr/local, which might contains an old version of + # gcc that can't build compiler-rt. This fixes the problem and, unlike + # setting the main project's cmake option -DGCC_INSTALL_PREFIX, avoid + # hardcoding the gcc path into the binary + inreplace "projects/compiler-rt/CMakeLists.txt", /(cmake_minimum_required.*\n)/, + "\\1add_compile_options(\"--gcc-toolchain=#{Formula["gcc"].opt_prefix}\")" + end + args = %W[ -DLIBOMP_ARCH=x86_64 -DLINK_POLLY_INTO_TOOLS=ON @@ -104,7 +138,17 @@ def install -DLLVM_CREATE_XCODE_TOOLCHAIN=ON ] - if MacOS.version >= :mojave + if OS.mac? + args << "-DLLVM_ENABLE_LIBCXX=ON" + else + args << "-DLLVM_ENABLE_LIBCXX=OFF" + args << "-DCLANG_DEFAULT_CXX_STDLIB=libstdc++" + end + + # Enable llvm gold plugin for LTO + args << "-DLLVM_BINUTILS_INCDIR=#{Formula["binutils"].opt_include}" unless OS.mac? + + if OS.mac? && MacOS.version >= :mojave sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" : MacOS.sdk_path args << "-DDEFAULT_SYSROOT=#{sdk_path}" end @@ -113,7 +157,7 @@ def install system "cmake", "-G", "Unix Makefiles", "..", *(std_cmake_args + args) system "make" system "make", "install" - system "make", "install-xcode-toolchain" + system "make", "install-xcode-toolchain" if OS.mac? end (share/"cmake").install "cmake/modules" @@ -127,8 +171,21 @@ def install man1.install_symlink share/"clang/tools/scan-build/man/scan-build.1" # install llvm python bindings - (lib/"python2.7/site-packages").install buildpath/"bindings/python/llvm" - (lib/"python2.7/site-packages").install buildpath/"tools/clang/bindings/python/clang" + xz = OS.mac? ? "2.7": "3.8" + (lib/"python#{xz}/site-packages").install buildpath/"bindings/python/llvm" + (lib/"python#{xz}/site-packages").install buildpath/"tools/clang/bindings/python/clang" + + unless OS.mac? + # Remove conflicting libraries. + # libgomp.so conflicts with gcc. + rm lib/"libgomp.so" + + # Strip executables/libraries/object files to reduce their size + system("strip", "--strip-unneeded", "--preserve-dates", *(Dir[bin/"**/*", lib/"**/*"]).select do |f| + f = Pathname.new(f) + f.file? && (f.elf? || f.extname == ".a") + end) + end end def caveats @@ -158,7 +215,7 @@ def caveats system "#{bin}/clang", "-L#{lib}", "-fopenmp", "-nobuiltininc", "-I#{lib}/clang/#{clean_version}/include", - "omptest.c", "-o", "omptest" + "omptest.c", "-o", "omptest", *ENV["LDFLAGS"].split testresult = shell_output("./omptest") sorted_testresult = testresult.split("\n").sort.join("\n") @@ -188,16 +245,13 @@ def caveats } EOS - # Testing default toolchain and SDK location. - system "#{bin}/clang++", "-v", - "-std=c++11", "test.cpp", "-o", "test++" - assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./test++").chomp - system "#{bin}/clang", "-v", "test.c", "-o", "test" - assert_equal "Hello World!", shell_output("./test").chomp + unless OS.mac? + system "#{bin}/clang++", "-v", "test.cpp", "-o", "test" + assert_equal "Hello World!", shell_output("./test").chomp + end # Testing Command Line Tools - if MacOS::CLT.installed? + if OS.mac? && MacOS::CLT.installed? toolchain_path = "/Library/Developer/CommandLineTools" sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" system "#{bin}/clang++", "-v", @@ -213,7 +267,7 @@ def caveats end # Testing Xcode - if MacOS::Xcode.installed? + if OS.mac? && MacOS::Xcode.installed? system "#{bin}/clang++", "-v", "-isysroot", MacOS.sdk_path, "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include/c++/v1", @@ -230,31 +284,33 @@ def caveats # link against installed libc++ # related to https://github.com/Homebrew/legacy-homebrew/issues/47149 - system "#{bin}/clang++", "-v", - "-isystem", "#{opt_include}/c++/v1", - "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", - "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" - assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testlibc++").chomp - - (testpath/"scanbuildtest.cpp").write <<~EOS - #include - int main() { - int *i = new int; - *i = 1; - delete i; - std::cout << *i << std::endl; - return 0; - } - EOS - assert_includes shell_output("#{bin}/scan-build clang++ scanbuildtest.cpp 2>&1"), - "warning: Use of memory after it is freed" - - (testpath/"clangformattest.c").write <<~EOS - int main() { - printf("Hello world!"); } - EOS - assert_equal "int main() { printf(\"Hello world!\"); }\n", + if OS.mac? + system "#{bin}/clang++", "-v", + "-isystem", "#{opt_include}/c++/v1", + "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", + "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" + assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testlibc++").chomp + + (testpath/"scanbuildtest.cpp").write <<~EOS + #include + int main() { + int *i = new int; + *i = 1; + delete i; + std::cout << *i << std::endl; + return 0; + } + EOS + assert_includes shell_output("#{bin}/scan-build clang++ scanbuildtest.cpp 2>&1"), + "warning: Use of memory after it is freed" + + (testpath/"clangformattest.c").write <<~EOS + int main() { + printf("Hello world!"); } + EOS + assert_equal "int main() { printf(\"Hello world!\"); }\n", shell_output("#{bin}/clang-format -style=google clangformattest.c") + end end end diff --git a/Formula/llvm@8.rb b/Formula/llvm@8.rb index 6f4dd0538092a..0e3e879351294 100644 --- a/Formula/llvm@8.rb +++ b/Formula/llvm@8.rb @@ -1,34 +1,58 @@ +require "os/linux/glibc" + class LlvmAT8 < Formula desc "Next-gen compiler infrastructure" homepage "https://llvm.org/" url "https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz" sha256 "44787a6d02f7140f145e2250d56c9f849334e11f9ae379827510ed72f12b75e7" - revision 3 + revision OS.mac? ? 3 : 4 bottle do cellar :any sha256 "ab099d84e5f0a58ea37172fd85753336d855fc25e9459ceff12ddc2dbb56ef71" => :catalina sha256 "ee795cbebce64f79bbcf7c42526093df7bd2e5e986a721197bca5cf6c822e87a" => :mojave sha256 "3f80b7119307b128b1e3ae8a2fea97a9878afb5a7436a7d35615b1e743bc7622" => :high_sierra + sha256 "f8d4d3f94d03df55400c31c7ba9f81fc25dfa3cf0ad67c172e04328109a56c4a" => :x86_64_linux end # Clang cannot find system headers if Xcode CLT is not installed pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end keg_only :versioned_formula # https://llvm.org/docs/GettingStarted.html#requirement depends_on "cmake" => :build - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "libffi" depends_on "swig" + unless OS.mac? + depends_on "gcc" # needed for libstdc++ + if Formula["glibc"].any_version_installed? || OS::Linux::Glibc.system_version < Formula["glibc"].version + depends_on "glibc" + end + depends_on "binutils" # needed for gold and strip + depends_on "libedit" # llvm requires + depends_on "libelf" # openmp requires + depends_on "ncurses" + depends_on "libxml2" + depends_on "zlib" + depends_on "python@3.8" + end + resource "clang" do url "https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/cfe-8.0.1.src.tar.xz" sha256 "70effd69f7a8ab249f66b0a68aba8b08af52aa2ab710dfb8a0fba102685b1646" + + unless OS.mac? + patch do + url "https://gist.githubusercontent.com/iMichka/a5d88f6bbe1f62fc43dc040282234452/raw/430616d646260e47360d9cba0901ac2876007350/clang8?full_index=1" + sha256 "a7403c5a3ea2edddb7c1cb70274396f4c31d6b7c37aa1e4e4edaca3d1b78300f" + end + end end resource "clang-extra-tools" do @@ -46,6 +70,11 @@ class LlvmAT8 < Formula sha256 "7f0652c86a0307a250b5741ab6e82bb10766fb6f2b5a5602a63f30337e629b78" end + resource "libcxxabi" do + url "https://llvm.org/releases/6.0.1/libcxxabi-6.0.1.src.tar.xz" + sha256 "209f2ec244a8945c891f722e9eda7c54a5a7048401abd62c62199f3064db385f" + end + resource "libunwind" do url "https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libunwind-8.0.1.src.tar.xz" sha256 "1870161dda3172c63e632c1f60624564e1eb0f9233cfa8f040748ca5ff630f6e" @@ -78,7 +107,7 @@ def install (buildpath/"tools/clang").install resource("clang") (buildpath/"tools/clang/tools/extra").install resource("clang-extra-tools") (buildpath/"projects/openmp").install resource("openmp") - (buildpath/"projects/libcxx").install resource("libcxx") + (buildpath/"projects/libcxx").install resource("libcxx") if OS.mac? (buildpath/"projects/libunwind").install resource("libunwind") (buildpath/"tools/lld").install resource("lld") (buildpath/"tools/lldb").install resource("lldb") @@ -92,6 +121,17 @@ def install # can almost be treated as an entirely different build from llvm. ENV.permit_arch_flags + unless OS.mac? + # see https://llvm.org/docs/HowToCrossCompileBuiltinsOnArm.html#the-cmake-try-compile-stage-fails + # Basically, the stage1 clang will try to locate a gcc toolchain and often + # get the default from /usr/local, which might contains an old version of + # gcc that can't build compiler-rt. This fixes the problem and, unlike + # setting the main project's cmake option -DGCC_INSTALL_PREFIX, avoid + # hardcoding the gcc path into the binary + inreplace "projects/compiler-rt/CMakeLists.txt", /(cmake_minimum_required.*\n)/, + "\\1add_compile_options(\"--gcc-toolchain=#{Formula["gcc"].opt_prefix}\")" + end + args = %W[ -DLIBOMP_ARCH=x86_64 -DLINK_POLLY_INTO_TOOLS=ON @@ -99,7 +139,6 @@ def install -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_FFI=ON - -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DCLANG_ANALYZER_ENABLE_Z3_SOLVER=OFF -DLLVM_INCLUDE_DOCS=OFF @@ -109,13 +148,23 @@ def install -DWITH_POLLY=ON -DFFI_INCLUDE_DIR=#{Formula["libffi"].opt_lib}/libffi-#{Formula["libffi"].version}/include -DFFI_LIBRARY_DIR=#{Formula["libffi"].opt_lib} - -DLLVM_CREATE_XCODE_TOOLCHAIN=ON -DLLDB_USE_SYSTEM_DEBUGSERVER=ON -DLLDB_DISABLE_PYTHON=1 -DLIBOMP_INSTALL_ALIASES=OFF ] + if OS.mac? + args << "-DLLVM_CREATE_XCODE_TOOLCHAIN=ON" + args << "-DLLVM_ENABLE_LIBCXX=ON" + else + args << "-DLLVM_CREATE_XCODE_TOOLCHAIN=OFF" + args << "-DLLVM_ENABLE_LIBCXX=OFF" + args << "-DCLANG_DEFAULT_CXX_STDLIB=libstdc++" + end + + # Enable llvm gold plugin for LTO + args << "-DLLVM_BINUTILS_INCDIR=#{Formula["binutils"].opt_include}" unless OS.mac? - if MacOS.version >= :mojave + if OS.mac? && MacOS.version >= :mojave sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" : MacOS.sdk_path args << "-DDEFAULT_SYSROOT=#{sdk_path}" end @@ -124,7 +173,7 @@ def install system "cmake", "-G", "Unix Makefiles", "..", *(std_cmake_args + args) system "make" system "make", "install" - system "make", "install-xcode-toolchain" + system "make", "install-xcode-toolchain" if OS.mac? end (share/"clang/tools").install Dir["tools/clang/tools/scan-{build,view}"] @@ -134,8 +183,17 @@ def install man1.install_symlink share/"clang/tools/scan-build/man/scan-build.1" # install llvm python bindings - (lib/"python2.7/site-packages").install buildpath/"bindings/python/llvm" - (lib/"python2.7/site-packages").install buildpath/"tools/clang/bindings/python/clang" + xz = OS.mac? ? "2.7": "3.8" + (lib/"python#{xz}/site-packages").install buildpath/"bindings/python/llvm" + (lib/"python#{xz}/site-packages").install buildpath/"tools/clang/bindings/python/clang" + + unless OS.mac? + # Strip executables/libraries/object files to reduce their size + system("strip", "--strip-unneeded", "--preserve-dates", *(Dir[bin/"**/*", lib/"**/*"]).select do |f| + f = Pathname.new(f) + f.file? && (f.elf? || f.extname == ".a") + end) + end end def caveats @@ -165,7 +223,8 @@ def caveats system "#{bin}/clang", "-L#{lib}", "-fopenmp", "-nobuiltininc", "-I#{lib}/clang/#{clean_version}/include", - "omptest.c", "-o", "omptest" + *("-Wl,-rpath=#{lib}" unless OS.mac?), + "omptest.c", "-o", "omptest", *ENV["LDFLAGS"].split testresult = shell_output("./omptest") sorted_testresult = testresult.split("\n").sort.join("\n") @@ -195,73 +254,80 @@ def caveats } EOS - # Testing default toolchain and SDK location. - system "#{bin}/clang++", "-v", - "-std=c++11", "test.cpp", "-o", "test++" - assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./test++").chomp - system "#{bin}/clang", "-v", "test.c", "-o", "test" - assert_equal "Hello World!", shell_output("./test").chomp - - # Testing Command Line Tools - if MacOS::CLT.installed? - toolchain_path = "/Library/Developer/CommandLineTools" - sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" - system "#{bin}/clang++", "-v", - "-isysroot", sdk_path, - "-isystem", "#{toolchain_path}/usr/include/c++/v1", - "-isystem", "#{toolchain_path}/usr/include", - "-isystem", "#{sdk_path}/usr/include", - "-std=c++11", "test.cpp", "-o", "testCLT++" - assert_includes MachO::Tools.dylibs("testCLT++"), "/usr/lib/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testCLT++").chomp - system "#{bin}/clang", "-v", "test.c", "-o", "testCLT" - assert_equal "Hello World!", shell_output("./testCLT").chomp + unless OS.mac? + system "#{bin}/clang++", "-v", "test.cpp", "-o", "test" + assert_equal "Hello World!", shell_output("./test").chomp end - # Testing Xcode - if MacOS::Xcode.installed? + if OS.mac? + # Testing default toolchain and SDK location. + system "#{bin}/clang++", "-v", + "-std=c++11", "test.cpp", "-o", "test++" + assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./test++").chomp + system "#{bin}/clang", "-v", "test.c", "-o", "test" + assert_equal "Hello World!", shell_output("./test").chomp + + # Testing Command Line Tools + if MacOS::CLT.installed? + toolchain_path = "/Library/Developer/CommandLineTools" + sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + system "#{bin}/clang++", "-v", + "-isysroot", sdk_path, + "-isystem", "#{toolchain_path}/usr/include/c++/v1", + "-isystem", "#{toolchain_path}/usr/include", + "-isystem", "#{sdk_path}/usr/include", + "-std=c++11", "test.cpp", "-o", "testCLT++" + assert_includes MachO::Tools.dylibs("testCLT++"), "/usr/lib/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testCLT++").chomp + system "#{bin}/clang", "-v", "test.c", "-o", "testCLT" + assert_equal "Hello World!", shell_output("./testCLT").chomp + end + + # Testing Xcode + if MacOS::Xcode.installed? + system "#{bin}/clang++", "-v", + "-isysroot", MacOS.sdk_path, + "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include/c++/v1", + "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include", + "-isystem", "#{MacOS.sdk_path}/usr/include", + "-std=c++11", "test.cpp", "-o", "testXC++" + assert_includes MachO::Tools.dylibs("testXC++"), "/usr/lib/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testXC++").chomp + system "#{bin}/clang", "-v", + "-isysroot", MacOS.sdk_path, + "test.c", "-o", "testXC" + assert_equal "Hello World!", shell_output("./testXC").chomp + end + + # link against installed libc++ + # related to https://github.com/Homebrew/legacy-homebrew/issues/47149 system "#{bin}/clang++", "-v", - "-isysroot", MacOS.sdk_path, - "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include/c++/v1", - "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include", - "-isystem", "#{MacOS.sdk_path}/usr/include", - "-std=c++11", "test.cpp", "-o", "testXC++" - assert_includes MachO::Tools.dylibs("testXC++"), "/usr/lib/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testXC++").chomp - system "#{bin}/clang", "-v", - "-isysroot", MacOS.sdk_path, - "test.c", "-o", "testXC" - assert_equal "Hello World!", shell_output("./testXC").chomp + "-isystem", "#{opt_include}/c++/v1", + "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", + "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" + assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testlibc++").chomp + + (testpath/"scanbuildtest.cpp").write <<~EOS + #include + int main() { + int *i = new int; + *i = 1; + delete i; + std::cout << *i << std::endl; + return 0; + } + EOS + assert_includes shell_output("#{bin}/scan-build --use-analyzer #{bin}/clang++ clang++ scanbuildtest.cpp 2>&1"), + "warning: Use of memory after it is freed" + + (testpath/"clangformattest.c").write <<~EOS + int main() { + printf("Hello world!"); } + EOS + assert_equal "int main() { printf(\"Hello world!\"); }\n", + shell_output("#{bin}/clang-format -style=google clangformattest.c") end - - # link against installed libc++ - # related to https://github.com/Homebrew/legacy-homebrew/issues/47149 - system "#{bin}/clang++", "-v", - "-isystem", "#{opt_include}/c++/v1", - "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", - "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" - assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testlibc++").chomp - - (testpath/"scanbuildtest.cpp").write <<~EOS - #include - int main() { - int *i = new int; - *i = 1; - delete i; - std::cout << *i << std::endl; - return 0; - } - EOS - assert_includes shell_output("#{bin}/scan-build --use-analyzer #{bin}/clang++ clang++ scanbuildtest.cpp 2>&1"), - "warning: Use of memory after it is freed" - - (testpath/"clangformattest.c").write <<~EOS - int main() { - printf("Hello world!"); } - EOS - assert_equal "int main() { printf(\"Hello world!\"); }\n", - shell_output("#{bin}/clang-format -style=google clangformattest.c") end end diff --git a/Formula/llvm@9.rb b/Formula/llvm@9.rb index 1d076f0bb6c2b..b4155d7a1faec 100644 --- a/Formula/llvm@9.rb +++ b/Formula/llvm@9.rb @@ -15,20 +15,41 @@ class LlvmAT9 < Formula # Clang cannot find system headers if Xcode CLT is not installed pour_bottle? do reason "The bottle needs the Xcode CLT to be installed." - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end keg_only :versioned_formula # https://llvm.org/docs/GettingStarted.html#requirement depends_on "cmake" => :build - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "libffi" depends_on "swig" + unless OS.mac? + depends_on "gcc" # needed for libstdc++ + if Formula["glibc"].any_version_installed? || OS::Linux::Glibc.system_version < Formula["glibc"].version + depends_on "glibc" + end + depends_on "binutils" # needed for gold and strip + depends_on "libedit" # llvm requires + depends_on "libelf" # openmp requires + depends_on "ncurses" + depends_on "libxml2" + depends_on "zlib" + depends_on "python@3.8" + end + resource "clang" do url "https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/clang-9.0.1.src.tar.xz" sha256 "5778512b2e065c204010f88777d44b95250671103e434f9dc7363ab2e3804253" + + unless OS.mac? + patch do + url "https://gist.githubusercontent.com/iMichka/9ac8e228679a85210e11e59d029217c1/raw/e50e47df860201589e6f43e9f8e9a4fc8d8a972b/clang9?full_index=1" + sha256 "65cf0dd9fdce510e74648e5c230de3e253492b8f6793a89534becdb13e488d0c" + end + end end resource "clang-extra-tools" do @@ -78,7 +99,7 @@ def install (buildpath/"tools/clang").install resource("clang") (buildpath/"tools/clang/tools/extra").install resource("clang-extra-tools") (buildpath/"projects/openmp").install resource("openmp") - (buildpath/"projects/libcxx").install resource("libcxx") + (buildpath/"projects/libcxx").install resource("libcxx") if OS.mac? (buildpath/"projects/libunwind").install resource("libunwind") (buildpath/"tools/lld").install resource("lld") (buildpath/"tools/lldb").install resource("lldb") @@ -92,6 +113,17 @@ def install # can almost be treated as an entirely different build from llvm. ENV.permit_arch_flags + unless OS.mac? + # see https://llvm.org/docs/HowToCrossCompileBuiltinsOnArm.html#the-cmake-try-compile-stage-fails + # Basically, the stage1 clang will try to locate a gcc toolchain and often + # get the default from /usr/local, which might contains an old version of + # gcc that can't build compiler-rt. This fixes the problem and, unlike + # setting the main project's cmake option -DGCC_INSTALL_PREFIX, avoid + # hardcoding the gcc path into the binary + inreplace "projects/compiler-rt/CMakeLists.txt", /(cmake_minimum_required.*\n)/, + "\\1add_compile_options(\"--gcc-toolchain=#{Formula["gcc"].opt_prefix}\")" + end + args = %W[ -DLIBOMP_ARCH=x86_64 -DLINK_POLLY_INTO_TOOLS=ON @@ -99,7 +131,6 @@ def install -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_FFI=ON - -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_ENABLE_Z3_SOLVER=OFF -DLLVM_INCLUDE_DOCS=OFF @@ -109,11 +140,21 @@ def install -DWITH_POLLY=ON -DFFI_INCLUDE_DIR=#{Formula["libffi"].opt_lib}/libffi-#{Formula["libffi"].version}/include -DFFI_LIBRARY_DIR=#{Formula["libffi"].opt_lib} - -DLLVM_CREATE_XCODE_TOOLCHAIN=ON -DLLDB_USE_SYSTEM_DEBUGSERVER=ON -DLLDB_DISABLE_PYTHON=1 -DLIBOMP_INSTALL_ALIASES=OFF ] + if OS.mac? + args << "-DLLVM_CREATE_XCODE_TOOLCHAIN=ON" + args << "-DLLVM_ENABLE_LIBCXX=ON" + else + args << "-DLLVM_CREATE_XCODE_TOOLCHAIN=OFF" + args << "-DLLVM_ENABLE_LIBCXX=OFF" + args << "-DCLANG_DEFAULT_CXX_STDLIB=libstdc++" + end + + # Enable llvm gold plugin for LTO + args << "-DLLVM_BINUTILS_INCDIR=#{Formula["binutils"].opt_include}" unless OS.mac? mkdir "build" do if MacOS.version >= :mojave @@ -124,7 +165,7 @@ def install system "cmake", "-G", "Unix Makefiles", "..", *(std_cmake_args + args) system "make" system "make", "install" - system "make", "install-xcode-toolchain" + system "make", "install-xcode-toolchain" if OS.mac? end (share/"clang/tools").install Dir["tools/clang/tools/scan-{build,view}"] @@ -134,8 +175,17 @@ def install man1.install_symlink share/"clang/tools/scan-build/man/scan-build.1" # install llvm python bindings - (lib/"python2.7/site-packages").install buildpath/"bindings/python/llvm" - (lib/"python2.7/site-packages").install buildpath/"tools/clang/bindings/python/clang" + xz = OS.mac? ? "2.7": "3.8" + (lib/"python#{xz}/site-packages").install buildpath/"bindings/python/llvm" + (lib/"python#{xz}/site-packages").install buildpath/"tools/clang/bindings/python/clang" + + unless OS.mac? + # Strip executables/libraries/object files to reduce their size + system("strip", "--strip-unneeded", "--preserve-dates", *(Dir[bin/"**/*", lib/"**/*"]).select do |f| + f = Pathname.new(f) + f.file? && (f.elf? || f.extname == ".a") + end) + end # install emacs modes elisp.install Dir["utils/emacs/*.el"] + %w[ @@ -172,7 +222,8 @@ def caveats system "#{bin}/clang", "-L#{lib}", "-fopenmp", "-nobuiltininc", "-I#{lib}/clang/#{clean_version}/include", - "omptest.c", "-o", "omptest" + *("-Wl,-rpath=#{lib}" unless OS.mac?), + "omptest.c", "-o", "omptest", *ENV["LDFLAGS"].split testresult = shell_output("./omptest") sorted_testresult = testresult.split("\n").sort.join("\n") @@ -202,16 +253,21 @@ def caveats } EOS + unless OS.mac? + system "#{bin}/clang++", "-v", "test.cpp", "-o", "test" + assert_equal "Hello World!", shell_output("./test").chomp + end + # Testing default toolchain and SDK location. system "#{bin}/clang++", "-v", "-std=c++11", "test.cpp", "-o", "test++" - assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" + assert_includes MachO::Tools.dylibs("test++"), "/usr/lib/libc++.1.dylib" if OS.mac? assert_equal "Hello World!", shell_output("./test++").chomp system "#{bin}/clang", "-v", "test.c", "-o", "test" assert_equal "Hello World!", shell_output("./test").chomp # Testing Command Line Tools - if MacOS::CLT.installed? + if OS.mac? && MacOS::CLT.installed? toolchain_path = "/Library/Developer/CommandLineTools" sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" system "#{bin}/clang++", "-v", @@ -227,7 +283,7 @@ def caveats end # Testing Xcode - if MacOS::Xcode.installed? + if OS.mac? && MacOS::Xcode.installed? system "#{bin}/clang++", "-v", "-isysroot", MacOS.sdk_path, "-isystem", "#{MacOS::Xcode.toolchain_path}/usr/include/c++/v1", @@ -244,31 +300,33 @@ def caveats # link against installed libc++ # related to https://github.com/Homebrew/legacy-homebrew/issues/47149 - system "#{bin}/clang++", "-v", - "-isystem", "#{opt_include}/c++/v1", - "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", - "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" - assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" - assert_equal "Hello World!", shell_output("./testlibc++").chomp - - (testpath/"scanbuildtest.cpp").write <<~EOS - #include - int main() { - int *i = new int; - *i = 1; - delete i; - std::cout << *i << std::endl; - return 0; - } - EOS - assert_includes shell_output("#{bin}/scan-build clang++ scanbuildtest.cpp 2>&1"), - "warning: Use of memory after it is freed" - - (testpath/"clangformattest.c").write <<~EOS - int main() { - printf("Hello world!"); } - EOS - assert_equal "int main() { printf(\"Hello world!\"); }\n", - shell_output("#{bin}/clang-format -style=google clangformattest.c") + if OS.mac? + system "#{bin}/clang++", "-v", + "-isystem", "#{opt_include}/c++/v1", + "-std=c++11", "-stdlib=libc++", "test.cpp", "-o", "testlibc++", + "-L#{opt_lib}", "-Wl,-rpath,#{opt_lib}" + assert_includes MachO::Tools.dylibs("testlibc++"), "#{opt_lib}/libc++.1.dylib" + assert_equal "Hello World!", shell_output("./testlibc++").chomp + + (testpath/"scanbuildtest.cpp").write <<~EOS + #include + int main() { + int *i = new int; + *i = 1; + delete i; + std::cout << *i << std::endl; + return 0; + } + EOS + assert_includes shell_output("#{bin}/scan-build clang++ scanbuildtest.cpp 2>&1"), + "warning: Use of memory after it is freed" + + (testpath/"clangformattest.c").write <<~EOS + int main() { + printf("Hello world!"); } + EOS + assert_equal "int main() { printf(\"Hello world!\"); }\n", + shell_output("#{bin}/clang-format -style=google clangformattest.c") + end end end diff --git a/Formula/lm-sensors.rb b/Formula/lm-sensors.rb new file mode 100644 index 0000000000000..5b4400601b996 --- /dev/null +++ b/Formula/lm-sensors.rb @@ -0,0 +1,30 @@ +class LmSensors < Formula + desc "Tools for monitoring the temperatures, voltages, and fans" + homepage "https://github.com/groeck/lm-sensors" + url "https://github.com/lm-sensors/lm-sensors/archive/V3-6-0.tar.gz" + version "3.6.0" + sha256 "0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197" + + bottle do + sha256 "bf3fea16c4ebf78f4234e9c7d00088fb4990433d135e5bb958a1c107dcbf63cd" => :x86_64_linux + end + + depends_on "bison" => :build + depends_on "flex" => :build + depends_on :linux + + def install + args = %W[ + PREFIX=#{prefix} + BUILD_STATIC_LIB=0 + MANDIR=#{man} + ETCDIR=#{prefix}/etc + ] + system "make", *args + system "make", *args, "install" + end + + test do + assert_match("Usage", shell_output("#{bin}/sensors --help")) + end +end diff --git a/Formula/lm4tools.rb b/Formula/lm4tools.rb index 1f8aae9abd800..bffe71e7dac34 100644 --- a/Formula/lm4tools.rb +++ b/Formula/lm4tools.rb @@ -11,6 +11,7 @@ class Lm4tools < Formula sha256 "9c65eb6694f74b513b707c237cf13bb6a54b9e4a188582355f78e94f9ac53407" => :high_sierra sha256 "3238455d6329e9749700b9c12c2e7459b63ea400fb0e7e6818b8c7c9b77b4e6d" => :sierra sha256 "7c6bd7ec1a220de95089d71f79baa61ce459ffa0d00d32af727435594ac7603a" => :el_capitan + sha256 "225fc4696ebdbc1870e529e3065c0d21f53b29ee362f2e3f022abae9d7e297be" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/lmdb.rb b/Formula/lmdb.rb index 492c3e70ffcf6..cfa91b920bd03 100644 --- a/Formula/lmdb.rb +++ b/Formula/lmdb.rb @@ -11,12 +11,14 @@ class Lmdb < Formula sha256 "22dcd49d0d1027f6acef65aeb8f08422f9482daecf4c75b1add02f5368bfd96e" => :catalina sha256 "2e9006940427302ed31c4972d47a998be797c669e2d75056107fcf28974f43e7" => :mojave sha256 "445091428bfb6ca3712290c3484dcba219a6e4ab935829050e0c4caf0bc7b1b3" => :high_sierra + sha256 "3452460075121e2d4225d4583821ade40225f85f518922df5b78d0feb3d95f89" => :x86_64_linux end def install cd "libraries/liblmdb" do - system "make", "SOEXT=.dylib" - system "make", "install", "SOEXT=.dylib", "prefix=#{prefix}" + args = *("SOEXT=.dylib" if OS.mac?) + system "make", *args + system "make", "install", "prefix=#{prefix}", *args end end diff --git a/Formula/lnav.rb b/Formula/lnav.rb index a260bc94bb088..f46b8fc60065b 100644 --- a/Formula/lnav.rb +++ b/Formula/lnav.rb @@ -11,6 +11,7 @@ class Lnav < Formula sha256 "2c6e7bd10eb78c6f476739be3e106012d6decce1d8ff1ae1a51c55f3cea2c688" => :mojave sha256 "bc796136677ca2b4bee92decf2d517ee0a92a6ea2d476b45a350d5aff367c948" => :high_sierra sha256 "91968b3b06733d667459ca2ffb81e82b91d10e4710c22f72a739e2eed203ba1e" => :sierra + sha256 "130a6d90979a44194afc5b7064406c0d77ea389f287e116f36ded237a8f4e013" => :x86_64_linux end head do @@ -26,6 +27,9 @@ class Lnav < Formula depends_on "sqlite" def install + # Fix errors such as "use of undeclared identifier 'sqlite3_value_subtype'" + ENV.delete("SDKROOT") + system "./autogen.sh" if build.head? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", diff --git a/Formula/loc.rb b/Formula/loc.rb index 44e00e155234b..3cb649615b554 100644 --- a/Formula/loc.rb +++ b/Formula/loc.rb @@ -10,6 +10,7 @@ class Loc < Formula sha256 "2a8ac9341661cefa1221418aa2cb5cdd5207108ade6803ab5af34ca01d0aef13" => :catalina sha256 "008db46fed420d7ec698d46e059a4913368af4d8f0b2f4f8502a39ee392b830d" => :mojave sha256 "f4241a70db520e24c587649bf7b8db0f743afaf00b01ebee5934bee7e88ae42e" => :high_sierra + sha256 "fdf1e18b1c387df11367627c1b511297d0412f9b075e5e41b638ebed34bbc23f" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/locateme.rb b/Formula/locateme.rb index 72eec4dfe79de..bafe059ce5957 100644 --- a/Formula/locateme.rb +++ b/Formula/locateme.rb @@ -14,6 +14,8 @@ class Locateme < Formula sha256 "a7876905a4c06452431e506523c5fdf142e2de364427600122fbb9b4928bc6d1" => :yosemite end + depends_on :macos + def install system ENV.cc, "-framework", "Foundation", "-framework", "CoreLocation", "LocateMe.m", "-o", "LocateMe" bin.install "LocateMe" diff --git a/Formula/log4c.rb b/Formula/log4c.rb index a5f5878c53765..032ee3807a2b2 100644 --- a/Formula/log4c.rb +++ b/Formula/log4c.rb @@ -13,6 +13,7 @@ class Log4c < Formula sha256 "2334e58e3ae201b28362707d2b64701e2e1378695e915baad886956e4edea50a" => :el_capitan sha256 "d345d0ab182855859fb21148c708893a395ecd416ba3f05d5e2a5a3111f2bc61" => :yosemite sha256 "676eeaaf8bb2b112ff1e5c1586cc0302e6e5dd0253939b7533dd519095497171" => :mavericks + sha256 "65c931a2251c000152e3b28742026b0c62f09c74626b73963a98bc371d3596d7" => :x86_64_linux end def install diff --git a/Formula/log4cplus.rb b/Formula/log4cplus.rb index 26cd8bd5f4eb6..b5ba6e7d0d514 100644 --- a/Formula/log4cplus.rb +++ b/Formula/log4cplus.rb @@ -9,6 +9,7 @@ class Log4cplus < Formula sha256 "1559e20cf8d6a6cbf66545ef391ab2979bbebd2cafdf4b71ab547d8daa472e01" => :catalina sha256 "1b671e5605cdee4defa7f6e5693ddf1e6d902710e8fecdd541429a8444df5e15" => :mojave sha256 "aaa4f419cf19b836d767066d505a7b4ca9addaa6392231b8f3dfd5ea2b103517" => :high_sierra + sha256 "51385755682cba5386c93d4f2a76085953c7e34e1387af6f10b83759e308c272" => :x86_64_linux end def install @@ -39,7 +40,7 @@ def install } EOS system ENV.cxx, "-std=c++11", "-I#{include}", "-L#{lib}", - "-llog4cplus", "test.cpp", "-o", "test" + "test.cpp", "-o", "test", "-llog4cplus" assert_match "Hello, World!", shell_output("./test") end end diff --git a/Formula/log4cpp.rb b/Formula/log4cpp.rb index 5378d4e9f5712..7f184e36be976 100644 --- a/Formula/log4cpp.rb +++ b/Formula/log4cpp.rb @@ -12,6 +12,7 @@ class Log4cpp < Formula sha256 "db55c3b9dff2f2248d96c71672cb6032efc16a4803ce12dd52c278bd14b9abc8" => :sierra sha256 "dee0bf8b96b1d0de3beb5f2d23cf1e868e6dfd3ec9814e2c4c5eab21432d73e3" => :el_capitan sha256 "19e858f7cf8e47d1c10be1c379feb9faae36d78274a53a4240dcab813a3e382c" => :yosemite + sha256 "a61e67b012228082c9ae9874c838bcd40175943c8c70eb0f58a5a1c724d08669" => :x86_64_linux end def install diff --git a/Formula/log4shib.rb b/Formula/log4shib.rb index e3d357791cb31..52c36ff24c7d1 100644 --- a/Formula/log4shib.rb +++ b/Formula/log4shib.rb @@ -10,6 +10,7 @@ class Log4shib < Formula sha256 "db9aa2c4c1f5f562177d7ab8f772d3634af17ad321866da25da81986c2806941" => :mojave sha256 "6a84a5b1db0fa9fef6e23f906543bde2496e5400f498c8de6b64cab2b191eeda" => :high_sierra sha256 "79197ed691693493ffc4b44dd5450b60c9c6cc97919302ae058c9e9af5cd10f6" => :sierra + sha256 "3606b9db79151283adabb104731f2e0041b2d9f9fd86bdc85abf68a7015f03e4" => :x86_64_linux end def install diff --git a/Formula/logcheck.rb b/Formula/logcheck.rb index 12eb4a44f1eb6..a73fde13be950 100644 --- a/Formula/logcheck.rb +++ b/Formula/logcheck.rb @@ -10,6 +10,7 @@ class Logcheck < Formula sha256 "111520f51e26088aa012bd42dc772e0a00e41decec22011a2bcf71c2ee3e20cc" => :mojave sha256 "111520f51e26088aa012bd42dc772e0a00e41decec22011a2bcf71c2ee3e20cc" => :high_sierra sha256 "12caeda115373b2b964509c07c2101926ab2e67154176078bf72353f3aeab7a3" => :sierra + sha256 "4f9d14914f3c3398a3c56d0b200a57f59bc866abc70363a31ca187d52bcb2e90" => :x86_64_linux end def install diff --git a/Formula/logrotate.rb b/Formula/logrotate.rb index 6ceadec8346d5..5462266d2ad9a 100644 --- a/Formula/logrotate.rb +++ b/Formula/logrotate.rb @@ -5,10 +5,11 @@ class Logrotate < Formula sha256 "442f6fdf61c349eeae5f76799878b88fe45a11c8863a38b618bac6988f4a7ce5" bottle do - cellar :any + cellar :any_skip_relocation sha256 "685db75f3f5c08510db50a7966f2b8d4028709cd02fd586ed21b17e978fd5446" => :catalina sha256 "f32319879033d83978b6dbd4dc970880e733ae437df2de5954c3ca2a6708c850" => :mojave sha256 "38b4e975405eb2a32b7a0d1c8904846198364036deaec47393e6475dc340ca7b" => :high_sierra + sha256 "12369c60345a8b5ade479d12597a0788026d67e728627fc51d7da796ed3b06a2" => :x86_64_linux end depends_on "popt" diff --git a/Formula/logstalgia.rb b/Formula/logstalgia.rb index 1b28d985b0095..385403254ed39 100644 --- a/Formula/logstalgia.rb +++ b/Formula/logstalgia.rb @@ -10,6 +10,7 @@ class Logstalgia < Formula sha256 "3c70aaf704c6486a0820ad416e9b71be4ee80492fdfec509da494d95657ddc6d" => :high_sierra sha256 "bf1761008179e17ff019777b60dd498174532e8feb1d7044c78d84bddbec9864" => :sierra sha256 "98fd439fb47a282ef86a45568f337ff3195418d32459c6e16718d1748e5f23f7" => :el_capitan + sha256 "d8a78ded38d06d06875c377448558e2fa2e4813406c343e3480cc19c0014717a" => :x86_64_linux end head do diff --git a/Formula/logtalk.rb b/Formula/logtalk.rb index fbb4c87aa062f..1cf4cc9a6afb0 100644 --- a/Formula/logtalk.rb +++ b/Formula/logtalk.rb @@ -10,6 +10,7 @@ class Logtalk < Formula sha256 "bfdf6bcc0b104468335d1177d859c0dfe895ec78cb5aa0c6cad920e437021446" => :catalina sha256 "dced74f97317e6334f8e5be6b482968d790758fd730176155c67bc800f2c15ee" => :mojave sha256 "419e1e654803bd9beabbf2433e8e7d643b6b7afe02f13da89633a455d15862b6" => :high_sierra + sha256 "21d682cb167c37e83c183c2bf1ee4b5e17fcc3b93709231a216818c216559c3c" => :x86_64_linux end depends_on "gnu-prolog" diff --git a/Formula/lolcat.rb b/Formula/lolcat.rb index 3981dee14c296..a7ad99074959b 100644 --- a/Formula/lolcat.rb +++ b/Formula/lolcat.rb @@ -10,6 +10,7 @@ class Lolcat < Formula sha256 "c0e179d579938e4301f04b4896bb2c234f4b643e53e53cbd4a7f796978d2ea6d" => :catalina sha256 "ac56190c6ec7e25d49f979aff7f6cc3e45820002ef22fbc444196b64de2590f9" => :mojave sha256 "1eb5cf4cd5565e07659f37e2531be1e72b0e2e8e57587af229e230fa00315ed3" => :high_sierra + sha256 "dd1710f0d55cf77c4c9d71050d1c384ae849a46206e7fca4d0cd33f3ee9fc4b8" => :x86_64_linux end depends_on "ruby" if MacOS.version <= :sierra diff --git a/Formula/loudmouth.rb b/Formula/loudmouth.rb index 195bd01fac304..c3ef44be35570 100644 --- a/Formula/loudmouth.rb +++ b/Formula/loudmouth.rb @@ -11,6 +11,7 @@ class Loudmouth < Formula sha256 "43052aa18cefe00338ba03fe866badd2b2f17cb6766ae2a1203bdcd54cf2ca6b" => :mojave sha256 "28635ff511d03492181d4b2c9f4cfe5b65600f512bc4ed8dc02611ff1c4b1b56" => :high_sierra sha256 "72854a1ff4e2492f0b90d1f435c523ae3801e1ea60d65e033909043081004db0" => :sierra + sha256 "60673ad38c7f885ea356ef3a0b2c6a6ce77fca8418d44fd80ebc10ea5e3a8163" => :x86_64_linux end head do diff --git a/Formula/lout.rb b/Formula/lout.rb index dbfa769dd9a6f..11c630e7f6e77 100644 --- a/Formula/lout.rb +++ b/Formula/lout.rb @@ -12,6 +12,7 @@ class Lout < Formula sha256 "2fbc90ffc3f12312dc11e31996ba94da3b8a4ba1c55f33ca60a5d81aef4e137f" => :el_capitan sha256 "366023d41536d0220a3d226a9f7a5e65b89fcf8ec212bfd6e53f8c2b4110abce" => :yosemite sha256 "7cbcdcbf720e5e93c7e8d41861fedbcb0f1b46233414c7897e94671e4e42a9fa" => :mavericks + sha256 "28147b2f510e8022646f42cb505dfa5e44d787f5645c4935e3ffc84428a6bef6" => :x86_64_linux end def install diff --git a/Formula/lpc21isp.rb b/Formula/lpc21isp.rb index 1b650331b8780..1ed3ee6b12c06 100644 --- a/Formula/lpc21isp.rb +++ b/Formula/lpc21isp.rb @@ -14,6 +14,7 @@ class Lpc21isp < Formula sha256 "c12b33d514be2490a3a5bb9d3c1f8468e7e24d13eee0a636a9d067f486af59fc" => :el_capitan sha256 "10deab3f8de3cb88b27ea38344ba7c641b758faf45f9a247f3fca968f6db456b" => :yosemite sha256 "5631ccbccd2bb128a1592399a558cbb837d63eb9b1ac2d8187c34fb42064b226" => :mavericks + sha256 "cf85362b4d7e620016c81503c5b60d43045bde99fe5130a3946179ce0a7b0275" => :x86_64_linux end def install diff --git a/Formula/lrdf.rb b/Formula/lrdf.rb index f6032604dcaa1..0809b2e334fb3 100644 --- a/Formula/lrdf.rb +++ b/Formula/lrdf.rb @@ -12,6 +12,7 @@ class Lrdf < Formula sha256 "27f0d95eed42b70eb6685ffe8608465b0f39b88b544dbee080fe3decf81512ed" => :sierra sha256 "f615e775140216eff74cd0fe751ace5993030c00921574da635a44b41d8bba57" => :el_capitan sha256 "053602eb98310d03ea0ba7838cd0f746dd34a60759a35fcbae7c41ca08a2919f" => :yosemite + sha256 "9fc06a72630afd4dad5ca3bddaa58077fd46c22ff7836c43f12d00e9d5981fa2" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/lrzip.rb b/Formula/lrzip.rb index 5e8f846491575..9f0e1ae176d63 100644 --- a/Formula/lrzip.rb +++ b/Formula/lrzip.rb @@ -12,6 +12,7 @@ class Lrzip < Formula sha256 "b0c60e0773da9cf70d3164f362b3b527a7a87acd10b632291055d58ca2da7cfc" => :sierra sha256 "c0ea3854495bd5d98f040f1a6b5a08e01857436aac25ead3f7a3fb44841f738a" => :el_capitan sha256 "345d0f65ddc44faab696c5e5bfabf6a6d408435858f49cfd630ee74e61f0c97c" => :yosemite + sha256 "70f50fcc6eb0247f38537bceb281b2786bdc4c1081733fe541a83d1e496f269d" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/lrzsz.rb b/Formula/lrzsz.rb index 61a8807d42882..2d701204899ca 100644 --- a/Formula/lrzsz.rb +++ b/Formula/lrzsz.rb @@ -13,6 +13,7 @@ class Lrzsz < Formula sha256 "c23cc0b0c9a0a7fae5a2e3d69ba01a7e6d09ad5e5a7d06c76620b72773ffebed" => :high_sierra sha256 "997f5b81f84b7814b0f4f78f056404f6c309eba1e62136e5f8ddf4b34d953b59" => :sierra sha256 "1d6517842b64582f629f36e469b61ee91563e1ef1a1b1841a8a4634759dcb0f1" => :el_capitan + sha256 "a5b6cde48e1f28aaa5c8191787fbadd6dca2e5cbd6eb8b7e1ddbe0b290296015" => :x86_64_linux end patch :p0 do diff --git a/Formula/lsd.rb b/Formula/lsd.rb index 5413f3b1ca737..92829e84a5020 100644 --- a/Formula/lsd.rb +++ b/Formula/lsd.rb @@ -9,6 +9,7 @@ class Lsd < Formula sha256 "7522117f464233363dc65128ba98dd51863e86acab321326c687a0fe8a7e2541" => :catalina sha256 "a53f4d8e3bbfdbd9382fc17e770a1a050efd020bd92d84fcfe17542df42af785" => :mojave sha256 "9ee5f02f84c89b1c430339831f7de094dbb38874cb47f6832b23e2b30c2af2d9" => :high_sierra + sha256 "54bd02c1d0a669188b8e517f9f668d3b9f6f97478544342061fc96c2ba9e6fd0" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/lsdvd.rb b/Formula/lsdvd.rb index 0d37131595cf2..db94633774681 100644 --- a/Formula/lsdvd.rb +++ b/Formula/lsdvd.rb @@ -10,6 +10,7 @@ class Lsdvd < Formula sha256 "63e52d4264e765ca6095153de37b08dee02d59676ae98b2f0c36b29c0fdae48e" => :catalina sha256 "1489bcdd29d86d725cbf76a68ff77335729c676fcf1155555da799d7096ee933" => :mojave sha256 "d5a945ffb9e6172df4625d0ed5b3e5c6aecd2dfc6c9ab5b2a83d88267027edc8" => :high_sierra + sha256 "d42eae6d2f9f286e280f5696999df705a3e14680ea44caa02d17510b809f9d31" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/lsof.rb b/Formula/lsof.rb index 07205dd24f580..95ce2b7ac7d56 100644 --- a/Formula/lsof.rb +++ b/Formula/lsof.rb @@ -10,28 +10,31 @@ class Lsof < Formula sha256 "3532e9650fc5b836d5584cd8733f83218229d170859bf2c85e62b4abad08d356" => :mojave sha256 "8ebe4f68ada3d1c1984bbfb660437984f5fc9d61c93b3da8024bfd0d797a2172" => :high_sierra sha256 "e07f28fd45b1eae5231393b45360920da4ad4386a83ccb6a256fc7ea26509f59" => :sierra + sha256 "2d8714fc3de7092cf1ccd7022fd3a420a00c6df64942712060f91bebaec41623" => :x86_64_linux end keg_only :provided_by_macos def install - ENV["LSOF_INCLUDE"] = "#{MacOS.sdk_path}/usr/include" + ENV["LSOF_INCLUDE"] = "#{MacOS.sdk_path}/usr/include" if OS.mac? ENV["LSOF_CC"] = ENV.cc ENV["LSOF_CCV"] = ENV.cxx - # Source hardcodes full header paths at /usr/include - inreplace %w[ - dialects/darwin/kmem/dlsof.h - dialects/darwin/kmem/machine.h - dialects/darwin/libproc/machine.h - ], "/usr/include", "#{MacOS.sdk_path}/usr/include" + if OS.mac? + # Source hardcodes full header paths at /usr/include + inreplace %w[ + dialects/darwin/kmem/dlsof.h + dialects/darwin/kmem/machine.h + dialects/darwin/libproc/machine.h + ], "/usr/include", "#{MacOS.sdk_path}/usr/include" + end mv "00README", "README" - system "./Configure", "-n", "darwin" + system "./Configure", "-n", OS.mac? ? "darwin" : "linux" system "make" bin.install "lsof" - man8.install "lsof.8" + man8.install OS.mac? ? "lsof.8" : "Lsof.8" prefix.install_metafiles end diff --git a/Formula/ltl2ba.rb b/Formula/ltl2ba.rb index 6cff3496ca6ce..aa61e4cce96e6 100644 --- a/Formula/ltl2ba.rb +++ b/Formula/ltl2ba.rb @@ -9,6 +9,7 @@ class Ltl2ba < Formula sha256 "453d994d206ec034580146ff6da2661db60c90fd105867fef4be5eb6f7ff062a" => :catalina sha256 "c5a444d20a1811bf071cdc9c95ffbc272f68283978cbdd676b588ffd9c58735b" => :mojave sha256 "e2d8c66cb983cdcca984048d83a3938158f5286d283cf69df40cc2d8b0c70ff4" => :high_sierra + sha256 "0162a0a16e9d98b8490192a29aa0f743fcb3c39c728ad395b942a9c13c16e056" => :x86_64_linux end def install diff --git a/Formula/lua.rb b/Formula/lua.rb index 3746406224aab..b8bbbd4cd5564 100644 --- a/Formula/lua.rb +++ b/Formula/lua.rb @@ -3,7 +3,7 @@ class Lua < Formula homepage "https://www.lua.org/" url "https://www.lua.org/ftp/lua-5.3.5.tar.gz" sha256 "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any @@ -12,18 +12,39 @@ class Lua < Formula sha256 "fcf36c0a4785ed9f515a1a18d8e158ad806c8ff92a5359959fbfa1b84bc52454" => :high_sierra sha256 "17947facfc289e35fc19a1c4091f4d26387bdc254150df75e0aa95d881e58135" => :sierra sha256 "b6e9699312e768aaa800d06e1f1e445f1bed64c8eb614083915c60e0a2e3d746" => :el_capitan + sha256 "b1d5ef71e2c7c2cc918a90c131b781e80f1f097e1d81899856315c1fa389443d" => :x86_64_linux + end + + unless OS.mac? + depends_on "readline" + depends_on "unzip" + end + + # Add shared library for linux + # Equivalent to the mac patch carried around here ... that will probably never get upstreamed + # Inspired from http://www.linuxfromscratch.org/blfs/view/cvs/general/lua.html + unless OS.mac? + patch do + url "https://gist.githubusercontent.com/iMichka/dfc8617c85c1a6c21ca22240d4f5407b/raw/0dfef35c31fa41de0bface13e9c9f6ea09bd89fa/lua-5.3.5.patch" + sha256 "e74a6ada94e4340e664b35065392ebe5060d5d329b3d8d3e5603df0a8238a961" + end end # Be sure to build a dylib, or else runtime modules will pull in another static copy of liblua = crashy # See: https://github.com/Homebrew/legacy-homebrew/pull/5043 # ***Update me with each version bump!*** - patch :DATA + patch :DATA if OS.mac? def install + # Fix: /usr/bin/ld: lapi.o: relocation R_X86_64_32 against `luaO_nilobject_' can not be used + # when making a shared object; recompile with -fPIC + # See http://www.linuxfromscratch.org/blfs/view/cvs/general/lua.html + ENV.append_to_cflags "-fPIC" unless OS.mac? + # Subtitute formula prefix in `src/Makefile` for install name (dylib ID). # Use our CC/CFLAGS to compile. inreplace "src/Makefile" do |s| - s.gsub! "@LUA_PREFIX@", prefix + s.gsub! "@LUA_PREFIX@", prefix if OS.mac? s.remove_make_var! "CC" s.change_make_var! "CFLAGS", "#{ENV.cflags} -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)" s.change_make_var! "MYLDFLAGS", ENV.ldflags @@ -33,8 +54,14 @@ def install inreplace "src/luaconf.h", "/usr/local", HOMEBREW_PREFIX # We ship our own pkg-config file as Lua no longer provide them upstream. - system "make", "macosx", "INSTALL_TOP=#{prefix}", "INSTALL_INC=#{include}/lua", "INSTALL_MAN=#{man1}" - system "make", "install", "INSTALL_TOP=#{prefix}", "INSTALL_INC=#{include}/lua", "INSTALL_MAN=#{man1}" + arch = OS.mac? ? "macosx" : "linux" + system "make", arch, "INSTALL_TOP=#{prefix}", "INSTALL_INC=#{include}/lua", "INSTALL_MAN=#{man1}" + system "make", + "install", + "INSTALL_TOP=#{prefix}", + "INSTALL_INC=#{include}/lua", + "INSTALL_MAN=#{man1}", + *("TO_LIB=liblua.a liblua.so liblua.so.5.3 liblua.so.5.3.5" unless OS.mac?) (lib/"pkgconfig/lua.pc").write pc_file # Fix some software potentially hunting for different pc names. @@ -67,7 +94,7 @@ def pc_file Description: An Extensible Extension Language Version: #{version} Requires: - Libs: -L${libdir} -llua -lm + Libs: -L${libdir} -llua -lm #{"-ldl" if OS.linux?} Cflags: -I${includedir} EOS end diff --git a/Formula/lua@5.1.rb b/Formula/lua@5.1.rb index 9c01990007347..0b45b10e15835 100644 --- a/Formula/lua@5.1.rb +++ b/Formula/lua@5.1.rb @@ -5,7 +5,7 @@ class LuaAT51 < Formula url "https://www.lua.org/ftp/lua-5.1.5.tar.gz" mirror "https://deb.debian.org/debian/pool/main/l/lua5.1/lua5.1_5.1.5.orig.tar.gz" sha256 "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333" - revision 8 + revision OS.mac? ? 8 : 11 bottle do cellar :any @@ -14,20 +14,40 @@ class LuaAT51 < Formula sha256 "d374b94b3e4b9af93cb5c04086f4a9836c06953b4b1941c68a92986ba57356b1" => :high_sierra sha256 "67ce3661b56fe8dd0daf6f94b7da31a9516b00ae85d9bbe9eabd7ed2e1dbb324" => :sierra sha256 "e43d1c75fe4462c5dca2d95ebee9b0e4897c872f03c4331d5898a06a408cbcb3" => :el_capitan + sha256 "e31f283dedde4b288f527674a1e48fa700a64a344e655244192051a4d9880d4f" => :x86_64_linux + end + + unless OS.mac? + depends_on "readline" + depends_on "unzip" # To be able to work with rock files (in the test and in real life) + end + + # Add shared library for linux + # Equivalent to the mac patch carried around here ... that will probably never get upstreamed + unless OS.mac? + patch do + url "https://gist.githubusercontent.com/iMichka/0f389e65e5abd63bfc6073bfa76082b0/raw/6e9c4c4690c737d93a376e053bcb82cdd69aac3b/lua5.1.5.patch" + sha256 "342b0d08eea9b9836be49fc88b3518cf207ee0e9aea09a248d3620c0b34e8e44" + end end # Be sure to build a dylib, or else runtime modules will pull in another static copy of liblua = crashy # See: https://github.com/Homebrew/homebrew/pull/5043 - patch :DATA + patch :DATA if OS.mac? def install + # Fix: /usr/bin/ld: lapi.o: relocation R_X86_64_32 against `luaO_nilobject_' can not be used + # when making a shared object; recompile with -fPIC + # See http://www.linuxfromscratch.org/blfs/view/cvs/general/lua.html + ENV.append_to_cflags "-fPIC" unless OS.mac? + # Use our CC/CFLAGS to compile. inreplace "src/Makefile" do |s| - s.gsub! "@LUA_PREFIX@", prefix + s.gsub! "@LUA_PREFIX@", prefix if OS.mac? s.remove_make_var! "CC" s.change_make_var! "CFLAGS", "#{ENV.cflags} $(MYCFLAGS)" s.change_make_var! "MYLDFLAGS", ENV.ldflags - s.sub! "MYCFLAGS_VAL", "-fno-common -DLUA_USE_LINUX" + s.sub! "MYCFLAGS_VAL", "-fno-common -DLUA_USE_LINUX" if OS.mac? end # Fix path in the config header @@ -42,8 +62,14 @@ def install s.gsub! "Libs: -L${libdir} -llua -lm", "Libs: -L${libdir} -llua.5.1 -lm" end - system "make", "macosx", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}", "INSTALL_INC=#{include}/lua-5.1" - system "make", "install", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}", "INSTALL_INC=#{include}/lua-5.1" + arch = OS.mac? ? "macosx" : "linux" + system "make", arch, "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}", "INSTALL_INC=#{include}/lua-5.1" + system "make", + "install", + "INSTALL_TOP=#{prefix}", + "INSTALL_MAN=#{man1}", + "INSTALL_INC=#{include}/lua-5.1", + *("TO_LIB=liblua.so.5.1 liblua.so.5.1.5" unless OS.mac?) (lib/"pkgconfig").install "etc/lua.pc" @@ -61,6 +87,12 @@ def install include.install_symlink "lua-5.1" => "lua5.1" (lib/"pkgconfig").install_symlink "lua-5.1.pc" => "lua5.1.pc" (libexec/"lib/pkgconfig").install_symlink lib/"pkgconfig/lua-5.1.pc" => "lua.pc" + + unless OS.mac? + # Hack around wrong .so file naming + lib.install_symlink "liblua.so.5.1.5" => "liblua.5.1.5.so" + lib.install_symlink "liblua.so.5.1" => "liblua.5.1.so" + end end def caveats diff --git a/Formula/luajit.rb b/Formula/luajit.rb index a652f0af72330..1c841b81dc21d 100644 --- a/Formula/luajit.rb +++ b/Formula/luajit.rb @@ -18,6 +18,7 @@ class Luajit < Formula sha256 "907d7fbbd3be370fac28341bf902a551c1d07dd929b9379bb19e30ccaf0bdef6" => :catalina sha256 "a127723ca4997acaa45e3b548eeb43f06ada464f2f59d518c4d68a89d9cfe6cf" => :mojave sha256 "afd383c796b7d3d7826a6a72acea41ecf57cf183ae84d590a777fb6a71166e80" => :high_sierra + sha256 "f695de26ba6c82fdb1cf98d5f624a5e8b1ec2fed5955991653c2d23d295d1067" => :x86_64_linux end def install diff --git a/Formula/luarocks.rb b/Formula/luarocks.rb index 27484598d93dd..c3283e2eebabd 100644 --- a/Formula/luarocks.rb +++ b/Formula/luarocks.rb @@ -10,6 +10,7 @@ class Luarocks < Formula sha256 "edacb067e2c9fc03920b9b9d9f4b804632a1f71f7fb5013b0dcdb2ad277b2352" => :catalina sha256 "edacb067e2c9fc03920b9b9d9f4b804632a1f71f7fb5013b0dcdb2ad277b2352" => :mojave sha256 "edacb067e2c9fc03920b9b9d9f4b804632a1f71f7fb5013b0dcdb2ad277b2352" => :high_sierra + sha256 "e101083c02e2d53946b6b779e0a9f554f92abd7c8d30642f486df377ac57ec7a" => :x86_64_linux end depends_on "lua@5.1" => :test diff --git a/Formula/luvit.rb b/Formula/luvit.rb index 95b27d49822ff..89891861ea32d 100644 --- a/Formula/luvit.rb +++ b/Formula/luvit.rb @@ -10,6 +10,7 @@ class Luvit < Formula sha256 "a1210dda91aa024d11bd4d15a67b71654dcbbbc2ba14a87d1d34ab012f4d5c2a" => :catalina sha256 "a3a37fdf8f0e99efdfc1736978ea9d8cdea74e939b42696fe771c3c5c9914f8f" => :mojave sha256 "2c704b1f98b965c0b6010a897a0c951f47cb896bbbf5381e7d4ee80238692033" => :high_sierra + sha256 "6b2183d92f67900345d15d7740c25d65c9a386667e17b9f3b77df889f1993742" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/lv.rb b/Formula/lv.rb index 67d62e74fe72c..4472cc35b48d9 100644 --- a/Formula/lv.rb +++ b/Formula/lv.rb @@ -10,8 +10,11 @@ class Lv < Formula sha256 "74f154bdfaabb2819bfab9969a88addff7e0b08cca3aafe3ea13805fa588e68d" => :catalina sha256 "491aa872d9c617f7d323aa368498f25728d25bbdf1e60fde272e62b149831c99" => :mojave sha256 "90a79ade2abcd36772eb50db1c93298a67766d626a5316a3eeb1638312fbd377" => :high_sierra + sha256 "5aa1bbb834caa980cc77fb6d2b27ab0ffefacb644351e0ff572d9a4f0e78b168" => :x86_64_linux end + uses_from_macos "ncurses" + on_linux do depends_on "gzip" end @@ -22,7 +25,7 @@ class Lv < Formula def install # zcat doesn't handle gzip'd data on OSX. # Reported upstream to nrt@ff.iij4u.or.jp - inreplace "src/stream.c", 'gz_filter = "zcat"', 'gz_filter = "gzcat"' + inreplace "src/stream.c", 'gz_filter = "zcat"', 'gz_filter = "gzcat"' if OS.mac? cd "build" do system "../src/configure", "--prefix=#{prefix}" @@ -44,13 +47,13 @@ def install --- a/src/escape.c +++ b/src/escape.c @@ -62,6 +62,10 @@ - break; + break; } while( 'm' != ch ); - + + if( 'K' == ch ){ + return TRUE; + } + SIDX = index; - + if( 'm' != ch ){ diff --git a/Formula/lwtools.rb b/Formula/lwtools.rb index a556b46688950..a47214d7df268 100644 --- a/Formula/lwtools.rb +++ b/Formula/lwtools.rb @@ -10,6 +10,7 @@ class Lwtools < Formula sha256 "3cfae9c3afc0a2fa0d8fdf48c88cb504056f35702f45a4afe5070ceb408d4919" => :mojave sha256 "8c0c67d34661986431d9fdb2fe5b6315a0da6b4ec9b4eac139868bfa1ee18069" => :high_sierra sha256 "d4f5b062ba3fbd7c7d3115c6f6451fdaa4daf331e0e7f0641580df19dc3c65e4" => :sierra + sha256 "5746cf00c29463f6b872914a3710c50523b9c84c2e7da4b150ced9e65744657b" => :x86_64_linux end def install diff --git a/Formula/lxc.rb b/Formula/lxc.rb index cd405f1d2b664..b08bf0ba15ae8 100644 --- a/Formula/lxc.rb +++ b/Formula/lxc.rb @@ -9,6 +9,7 @@ class Lxc < Formula sha256 "b25f121c1226278865a6ae39b13665dfb70614533f5a974c8378d9b266cf2bd4" => :catalina sha256 "2bf1ffb18806fb5e535f766acd21c8f80eb15ab00e9d4f697d3374087f4aed0d" => :mojave sha256 "c33f28025ebba9025fe0d7fd5cf909d1b0102cd30d751173b7580bf88f441d0e" => :high_sierra + sha256 "486946c2e85b0ce168414c88adcde361448f57f0e49ff58c91b8f9219776ca04" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/lxsplit.rb b/Formula/lxsplit.rb index dc601d7580c88..414c556e30ccc 100644 --- a/Formula/lxsplit.rb +++ b/Formula/lxsplit.rb @@ -13,6 +13,7 @@ class Lxsplit < Formula sha256 "25699d54183a01f446015fb02521a50b3967ef2d250e56bb1fe3fd0a5aaec2e1" => :el_capitan sha256 "d7d8d9eb204599056a4e109c63114c90e3be797d2be700e114cc3675d8eba0bb" => :yosemite sha256 "da0ee88012d21dc120c7247fd856305fe14a213e38babcd39ab652af06483b7e" => :mavericks + sha256 "10c851e0f17adfd0985dc049a29d806953bea2dfff0420002ad0c31da71eb0ab" => :x86_64_linux end def install diff --git a/Formula/lynx.rb b/Formula/lynx.rb index 9512b92dc46da..32574a59e7c64 100644 --- a/Formula/lynx.rb +++ b/Formula/lynx.rb @@ -11,6 +11,7 @@ class Lynx < Formula sha256 "3b4c3a636d19106a2fea571889a4159fd49b82fbd2694c206d4851b15281fddd" => :mojave sha256 "68eb083eff0962b83dc121e9194d430d4e9c2eb7d559cb998ba992da9b566479" => :high_sierra sha256 "b8ee13323a4e8760f21a82da3b579d3373e282398ff7efe56c7ec8ae9cb0d064" => :sierra + sha256 "2dea27db7f6df945139c5d63b6d6be42522300b7175af5e776cf7e4f74cf408a" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/lz4.rb b/Formula/lz4.rb index 7e2162a2da6fe..d8650327f38e2 100644 --- a/Formula/lz4.rb +++ b/Formula/lz4.rb @@ -11,6 +11,7 @@ class Lz4 < Formula sha256 "67ca428e60e2c2f6e524dd3de42629c1a616d28b2c743b66bf4cbdcc3b28ea46" => :mojave sha256 "7f60879b81a3a9ee52b3e9b87ed265c4934058b841e8f5320044f826b4660a92" => :high_sierra sha256 "00d3610cf09b0fcde34928890f5dac870ebcaffacd6eb51eaea05b754753e462" => :sierra + sha256 "b13aca8c01242c01969211ca5d0a0dd3f25fe230122a9645c742fa7b566106b4" => :x86_64_linux end def install diff --git a/Formula/lzfse.rb b/Formula/lzfse.rb index 5895bc3edafc7..a99284bc5983c 100644 --- a/Formula/lzfse.rb +++ b/Formula/lzfse.rb @@ -11,6 +11,7 @@ class Lzfse < Formula sha256 "e2a28bc48a8d90dd26cf2fe92d9186cbe0f19c8a58a5d15c8591826cd047b43b" => :high_sierra sha256 "2da23959f27fe8a141b2967a591052c6ec081224b7b3c9c65c4a854faba77456" => :sierra sha256 "4fcadd0779483cf14e95f7566002af22e9b488585c37fba1b5e75f715b930c01" => :el_capitan + sha256 "19104cde7a280d1029728ade6450182301ffc4c1eca611c8e4be6030578bf81b" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/lzip.rb b/Formula/lzip.rb index a95ba62f346ec..c6d4471d8be91 100644 --- a/Formula/lzip.rb +++ b/Formula/lzip.rb @@ -10,6 +10,7 @@ class Lzip < Formula sha256 "54716b72b43e41cb8d9912fe3f61aeef651f890bf42f8b92482adfd0f2c99798" => :mojave sha256 "bfe47a5379c4d793e15d1d71f5f6b12047a486e2531718f31f675683d54df595" => :high_sierra sha256 "aba0ea18470d9aa4f619c0f6c133a4f459d4b02327ff539a44a1f473a2112369" => :sierra + sha256 "b2ab63364c2a550a47a9fa22722576200af3c173707a46f828ba6d201642663f" => :x86_64_linux end def install diff --git a/Formula/lzlib.rb b/Formula/lzlib.rb index 7f681b4c086b1..287611e261c41 100644 --- a/Formula/lzlib.rb +++ b/Formula/lzlib.rb @@ -10,6 +10,7 @@ class Lzlib < Formula sha256 "3c28dea3721b03227d660c7c453673d3cb40f00f41e2e4ba3f163a7171926da0" => :mojave sha256 "a49b8dfcf257d31c46841a733f1925020dd49493554d049a479467e602e3e796" => :high_sierra sha256 "3c6df94a873fc2268478e10c23d1aa631c6b29e1afff38de63e2839ad0f1968c" => :sierra + sha256 "2698e80da0148e626b7989385db168e5dce777893267d303c8655d2ea42527e0" => :x86_64_linux end def install diff --git a/Formula/lzo.rb b/Formula/lzo.rb index f66b269c0c8d4..e1300c445723e 100644 --- a/Formula/lzo.rb +++ b/Formula/lzo.rb @@ -12,6 +12,7 @@ class Lzo < Formula sha256 "26969f416ec79374e074f8434d6b7eece891fcbc8bee386e9bbd6d418149bc52" => :sierra sha256 "77abd933fd899707c99b88731a743d5289cc6826bd4ff854a30e088fbbc61222" => :el_capitan sha256 "0c3824de467014932ebdb3a2915a114de95036d7661c4d09df0c0191c9149e22" => :yosemite + sha256 "a41fb0e7fc06aaf7614e93a880b7011ebacfe91a2aa5cb9287d37d86affbd030" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/lzop.rb b/Formula/lzop.rb index 1eb3d6315edc5..d857e05b0bc2a 100644 --- a/Formula/lzop.rb +++ b/Formula/lzop.rb @@ -13,6 +13,7 @@ class Lzop < Formula sha256 "73c2ce334be9317ca79509aec3acef2fa1eff0ffb69fdc10b3850b7f51101f72" => :sierra sha256 "26e49bf0d06fb60d7cd5c431634966f28993edc250c4d06b0db26b28aae3cd0d" => :el_capitan sha256 "d9e12c4bb51c43dd306d5283fde5c3350e3e1f7f1d48c05c831a57b058db1354" => :yosemite + sha256 "1f26b675b0867eb9f6095d1b3bc61155e06dd05835848a6718def97168b6d4d7" => :x86_64_linux # glibc 2.19 end depends_on "lzo" diff --git a/Formula/m-cli.rb b/Formula/m-cli.rb index 887ea66cb2672..0f17cbe3e9905 100644 --- a/Formula/m-cli.rb +++ b/Formula/m-cli.rb @@ -7,6 +7,8 @@ class MCli < Formula bottle :unneeded + depends_on :macos + def install prefix.install Dir["*"] inreplace prefix/"m" do |s| diff --git a/Formula/m4.rb b/Formula/m4.rb index d5e1d68d4ce0e..846218b0604e5 100644 --- a/Formula/m4.rb +++ b/Formula/m4.rb @@ -13,6 +13,7 @@ class M4 < Formula sha256 "b0fe54c5705842618e6446c4c804330df89a78ed09bd5b013b2c5fabf34b218f" => :sierra sha256 "7daa296cf49de573214b4f2c72e3b621bbbc1ef5bfebfbe00fb18a70ba8e3152" => :el_capitan sha256 "00d9327f2e8a59996228569bf4faff1c6550653eb3e20353e77f73a34063f3eb" => :yosemite + sha256 "5a2327087fb76145b4d0fb23acc244115adc3ced14ffc2a6231159a4f16c8a7f" => :x86_64_linux # glibc 2.19 end keg_only :provided_by_macos diff --git a/Formula/mac-robber.rb b/Formula/mac-robber.rb index cb7062ab962aa..5d930ddc7f11a 100644 --- a/Formula/mac-robber.rb +++ b/Formula/mac-robber.rb @@ -13,6 +13,7 @@ class MacRobber < Formula sha256 "0647670a38eb3ae5d8085ad1126f8d70b6e9ac99b086c0ec2f3301ac51ecdb3f" => :el_capitan sha256 "5e8b7656cafbab151ed82702cbd7e712ee30af62b6a6c031f9f440e95c174ed0" => :yosemite sha256 "87b8de3e43626713461398aac48d12a4b494c36b8da6cd4e6587d352fcb251fe" => :mavericks + sha256 "5713286c509ff4ec129c2ab60ddd41fda7e9782ad2c36b92539853a12254cf1f" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/mackup.rb b/Formula/mackup.rb index 57575571c64e3..e74cdfc3caac3 100644 --- a/Formula/mackup.rb +++ b/Formula/mackup.rb @@ -12,6 +12,7 @@ class Mackup < Formula sha256 "be195c66e0330cd8cbc4bef06e8be0d919d613774870de537af8b6ef81d22ad2" => :catalina sha256 "8ee4dc679e9c944d3407febb22b7b0cb59fc2cd45308ffaf637ff0e11bb26604" => :mojave sha256 "da0ee240b7e1b3626becaea6b66673a58a9c0ec803e6e5da4e4f95672a51879b" => :high_sierra + sha256 "cdbd31fa0cb9c39f5995654680bbb712168b86d71a3ab538396ff8a0600ee67a" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/macosvpn.rb b/Formula/macosvpn.rb index e68ed47954550..4e1e57fef76c5 100644 --- a/Formula/macosvpn.rb +++ b/Formula/macosvpn.rb @@ -10,7 +10,7 @@ class Macosvpn < Formula sha256 "e31d705b812175220fef63839c6310ae3ee28e2e8d61dc04bdb2972dd970f513" => :mojave end - depends_on :xcode => ["11.1", :build] + depends_on :xcode => ["11.1", :build] if OS.mac? def install xcodebuild "SYMROOT=build" diff --git a/Formula/macvim.rb b/Formula/macvim.rb index cf7dda424292a..f796e1667afad 100644 --- a/Formula/macvim.rb +++ b/Formula/macvim.rb @@ -15,9 +15,10 @@ class Macvim < Formula sha256 "4b67795ddfcf1018ac1f260231f8a534072edbcb7b4ff060296667fd965a0abb" => :high_sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "cscope" depends_on "lua" + depends_on :macos depends_on "python@3.8" depends_on "ruby" diff --git a/Formula/mad.rb b/Formula/mad.rb index 2b190834c6ec3..a01de9a66754f 100644 --- a/Formula/mad.rb +++ b/Formula/mad.rb @@ -14,6 +14,7 @@ class Mad < Formula sha256 "a8a162813aad00169410a8f14a39927028969c914929fafb0685f0eb80075546" => :el_capitan sha256 "863c71f31ecda8f97effc4dd148564e03219f8ddd162c89e054a7e57623c18c6" => :yosemite sha256 "7bd46d4da0f695b3a5bcc899b7139f14d11741f2e47d34f21a984f9bab953c81" => :mavericks + sha256 "6c3acd9f051c2862eedf2f4fee17de5f3245c5e65aadd6bbf5f9e47a98789c6a" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/madplay.rb b/Formula/madplay.rb index c9be8daf4bc83..34ff5eec4c802 100644 --- a/Formula/madplay.rb +++ b/Formula/madplay.rb @@ -12,6 +12,7 @@ class Madplay < Formula sha256 "81dbc8781c5da50f7188a4031ed5d500b07c51a7589da6799c6bf3477bb90bf6" => :el_capitan sha256 "4ab0b6303cafe408494e85c38b80a3c44964953995c024d2b65a019bc5608c05" => :yosemite sha256 "2b1967955d83ca172724b119e837457aec0eeaa7ded354c810f3635dafbec057" => :mavericks + sha256 "35a3d4fbefcb95aceb39c5a8238644b2bc129642a8d5d4f0b72fbf2d8b55df3c" => :x86_64_linux end depends_on "libid3tag" diff --git a/Formula/mafft.rb b/Formula/mafft.rb index d2f664eb18df8..0856fd2474474 100644 --- a/Formula/mafft.rb +++ b/Formula/mafft.rb @@ -9,6 +9,7 @@ class Mafft < Formula sha256 "f05192f8000a9df20fd61456ce59be5747570fc6535f8c7d018e4395c5b0f214" => :catalina sha256 "dcde3c89f1c54b002a9fb80946a79801b7e0082ec0c4891b3967479dc606ebee" => :mojave sha256 "dda2aa7a240491e453fb98318389ed9a193775a6e74845f56698eb16eced9159" => :high_sierra + sha256 "acad389a4d6c0586c87382c8b67d2e304b8abf0e9a971de466fab73eda4c084a" => :x86_64_linux end def install diff --git a/Formula/mage.rb b/Formula/mage.rb index 32755a901a007..cfdb70d0f698e 100644 --- a/Formula/mage.rb +++ b/Formula/mage.rb @@ -12,6 +12,7 @@ class Mage < Formula sha256 "ac88cd06d100522e8a7af513dd4169706c28f1742dfcf237bf1135836ab045a5" => :mojave sha256 "4cd5deec2b988ba21b372214ece919ea3cbb0e5bb7413ce7e372b21d34e3dbb1" => :high_sierra sha256 "568bb7334e6f30d467fdd6d136284dbda53e2ad70279e8f22f5ba99feffdbb34" => :sierra + sha256 "f6cee9093871d855e129ac9a7beb8dc8c455bf6a45b77e987c6c6565cea2944f" => :x86_64_linux end depends_on "go" diff --git a/Formula/magic-wormhole.rb b/Formula/magic-wormhole.rb index ae0cf9d569528..38257389f091b 100644 --- a/Formula/magic-wormhole.rb +++ b/Formula/magic-wormhole.rb @@ -5,12 +5,14 @@ class MagicWormhole < Formula homepage "https://github.com/warner/magic-wormhole" url "https://files.pythonhosted.org/packages/d4/62/5e4a86f7c4b111e016577f1b304063ebe604f430db15465ac58b13993608/magic-wormhole-0.12.0.tar.gz" sha256 "1b0fd8a334da978f3dd96b620fa9b9348cabedf26a87f74baac7a37052928160" + revision 2 unless OS.mac? bottle do cellar :any sha256 "2a7df1e4f3f866733c53a8dc8c6656eeb4634d57386ba8f75d49656582891225" => :catalina sha256 "8dc8d54c2e161693d905b51710f8111c8d4469c597010f43412f6a169b1318d8" => :mojave sha256 "3e836c232597424b884bd7cc218bbf0e9c844d13518a3a3af8e3ae190feb788c" => :high_sierra + sha256 "6c5805292983a7d959efedcdc9579440676305ae0076bf0218be8f878305006a" => :x86_64_linux end depends_on "libsodium" @@ -157,7 +159,13 @@ def install ENV["SODIUM_INSTALL"] = "system" venv = virtualenv_create(libexec, "python3") venv.pip_install resource("cffi") - virtualenv_install_with_resources + if OS.mac? + virtualenv_install_with_resources + else + # Fix Error: Will not overwrite .../libexec/lib/python3.7/site-packages/homebrew_deps.pth + venv.pip_install resources + venv.pip_install_and_link buildpath + end end test do diff --git a/Formula/magnetix.rb b/Formula/magnetix.rb index 71a7ee224249a..8d3df079e7392 100644 --- a/Formula/magnetix.rb +++ b/Formula/magnetix.rb @@ -14,7 +14,7 @@ class Magnetix < Formula sha256 "ed629c950ac52c6efee73a2e77e7004e0e33a85fe920d793a2e8621a484d7cdc" => :yosemite end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? # Port audio code from QTKit to AVFoundation # Required since 10.12 SDK no longer includes QTKit. diff --git a/Formula/mailcheck.rb b/Formula/mailcheck.rb index 94da5d07009a6..8b943d83275df 100644 --- a/Formula/mailcheck.rb +++ b/Formula/mailcheck.rb @@ -13,6 +13,7 @@ class Mailcheck < Formula sha256 "b7c134dc23431dfaa3f402b859b7154cab5e176711363bd884dc82ce896d7c7a" => :el_capitan sha256 "242b05a6e9b8ccc1ac70e22cbf89bc33a885e726d32509fad6b34a3bee123945" => :yosemite sha256 "32b40cf41ec15bcd0efbfb90858534e4b84056915ceacd6914d71d8acdffeb6f" => :mavericks + sha256 "bf25c7173600f92fb766d88b1a85e8662ced6c32c58410fc08fa519351fa2375" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/mailutils.rb b/Formula/mailutils.rb index 17267c66483ba..fa9ef966c6761 100644 --- a/Formula/mailutils.rb +++ b/Formula/mailutils.rb @@ -9,6 +9,7 @@ class Mailutils < Formula sha256 "35f9c47a5686e1d32fbb262cfe107713724968c1803ff514c9af42cc2d0b4814" => :catalina sha256 "7674dc436a80ad930a23ea27fc5e68cccafa98f1f14ccaa14a67f363cf94a004" => :mojave sha256 "e498a1ff3f1b8d80dd04425e13b7f74ccd18736743e063315347c242e0b67b79" => :high_sierra + sha256 "4afed220de3bae50b5d8a960b30ea6a207188bc0fc0563951ab772a741731c40" => :x86_64_linux end depends_on "gnutls" diff --git a/Formula/make.rb b/Formula/make.rb index 5f6f9d034b196..5455c225153c6 100644 --- a/Formula/make.rb +++ b/Formula/make.rb @@ -9,25 +9,30 @@ class Make < Formula sha256 "b2cbb6b854495469de4d065825c94540ad3053a1ff7c1832f4eb7781ee6b8231" => :catalina sha256 "50ac9c7185e08349c35531d8ee30e755713aec340229cab2008ba1a2ceac15c9" => :mojave sha256 "e7f49884dbeaae3e7ccc9dc3a58fec587c2a594f50314dbc33cde44c6f807f53" => :high_sierra + sha256 "55525ee8f860a35d06e38b2caf6c83c062457e1f08c2199c5750fa0274655380" => :x86_64_linux end def install args = %W[ --disable-dependency-tracking --prefix=#{prefix} - --program-prefix=g ] + args << "--program-prefix=g" if OS.mac? system "./configure", *args system "make", "install" - (libexec/"gnubin").install_symlink bin/"gmake" =>"make" - (libexec/"gnuman/man1").install_symlink man1/"gmake.1" => "make.1" + if OS.mac? + (libexec/"gnubin").install_symlink bin/"gmake" =>"make" + (libexec/"gnuman/man1").install_symlink man1/"gmake.1" => "make.1" + end libexec.install_symlink "gnuman" => "man" end def caveats + return unless OS.mac? + <<~EOS GNU "make" has been installed as "gmake". If you need to use it as "make", you can add a "gnubin" directory @@ -42,8 +47,11 @@ def caveats default: \t@echo Homebrew EOS - - assert_equal "Homebrew\n", shell_output("#{bin}/gmake") - assert_equal "Homebrew\n", shell_output("#{opt_libexec}/gnubin/make") + if OS.mac? + assert_equal "Homebrew\n", shell_output("#{bin}/gmake") + assert_equal "Homebrew\n", shell_output("#{opt_libexec}/gnubin/make") + else + assert_equal "Homebrew\n", shell_output("#{bin}/make") + end end end diff --git a/Formula/makedepend.rb b/Formula/makedepend.rb index 3ab4ed2f87be0..9cd97362b06ee 100644 --- a/Formula/makedepend.rb +++ b/Formula/makedepend.rb @@ -9,6 +9,7 @@ class Makedepend < Formula sha256 "afe76789b5f01ccfee8cc0d4ffa308015fb5d8791a1d7ce6b2dc1ee4bf2a020f" => :catalina sha256 "a25fb9fd3ce11f6b98da2c53fad8f046174697087f5f34664999afb9df5f41de" => :mojave sha256 "0f463e197923867ff9387b2ccd1461d4b410e89205bd3896ae98c5d52679c4c8" => :high_sierra + sha256 "26c8983da0577d99df857001a87e56a9e32bd59e30c26b1fd797b70e37df0cf9" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/makefile2graph.rb b/Formula/makefile2graph.rb index e8a512886b617..aad00e8e010f7 100644 --- a/Formula/makefile2graph.rb +++ b/Formula/makefile2graph.rb @@ -14,13 +14,16 @@ class Makefile2graph < Formula sha256 "ed1939b1b0fd106f3e328e310a887cf454b81481f78fdf57ce75c0480a922d7d" => :el_capitan sha256 "37aebae489e0f341f80417ec711e5c2817f5b8097c3493dcc11bc754bdd1b1cf" => :yosemite sha256 "0de3d4a2492797c3259798493e287ac2403f02254c6cfcf74948a16bcc4bcd0d" => :mavericks + sha256 "d9cf1abfadeef69329bed8ebf251753f2aadb18f6955b8869a468a47b76b6f10" => :x86_64_linux end depends_on "graphviz" def install system "make" - system "make", "test" + # make test fails on CI. Error: fontconfig: Couldn't find font. + # It can be fixed with apt-get install fonts-dejavu-core + system "make", "test" unless ENV["CI"] bin.install "make2graph", "makefile2graph" man1.install "make2graph.1", "makefile2graph.1" doc.install "LICENSE", "README.md", "screenshot.png" diff --git a/Formula/makepkg.rb b/Formula/makepkg.rb index 7de7af186c4b5..af646d579e07f 100644 --- a/Formula/makepkg.rb +++ b/Formula/makepkg.rb @@ -11,6 +11,7 @@ class Makepkg < Formula sha256 "fb89c76eb6c2a50b14d2380ad1440b37f96e86f39d5bd60378ab5ac85cd02b08" => :catalina sha256 "b6606a63e0727072c1016ffa8b60db28de0de67d3b5d3f495aa8d0728b7325c9" => :mojave sha256 "c8f2f6999669c56b5e40e2608ad1e0adfe2c8eb73f8cef959a229856d21da6ed" => :high_sierra + sha256 "89db5edb447a533a4f754a0e716e37977b8427aecab14f4ac0649afee17b783c" => :x86_64_linux end depends_on "asciidoc" => :build @@ -45,6 +46,11 @@ def install pkgrel=0 pkgver=0 EOS - assert_match "md5sums=('e232a2683c0", pipe_output("#{bin}/makepkg -dg 2>&1") + # Won't run as root, use more permissive test + if ENV["USER"] == "root" + assert_match "makepkg (pacman) #{version}", pipe_output("#{bin}/makepkg --version") + else + assert_match "md5sums=('e232a2683c0", pipe_output("#{bin}/makepkg -dg 2>&1") + end end end diff --git a/Formula/malbolge.rb b/Formula/malbolge.rb index 750bf62f50145..d74ce170737ef 100644 --- a/Formula/malbolge.rb +++ b/Formula/malbolge.rb @@ -14,6 +14,7 @@ class Malbolge < Formula sha256 "20f743a8bcb4085f5958e65a54bc20399de6894155ecd64dfc056431d93ec477" => :el_capitan sha256 "e5f617b7bbfee4386442aa739ce8df21b4c54584f2a4ea9f52eec877002ecdf7" => :yosemite sha256 "3681aa628f0cbc4d9f2bd65d647402d05dc850041119e24515223527df261125" => :mavericks + sha256 "2439453845fed5067a63f7a40ac0a65437efa9f83db4d1313198607ef610d9ad" => :x86_64_linux end patch :DATA diff --git a/Formula/man-db.rb b/Formula/man-db.rb index 4fa4b06c3b699..9f0dbe3799ded 100644 --- a/Formula/man-db.rb +++ b/Formula/man-db.rb @@ -9,9 +9,11 @@ class ManDb < Formula sha256 "1f203de0472712f459bee1b66dc93d4fa0c6fc190bdf467c018319add61a22ff" => :catalina sha256 "3eb1e906db4927d45eaa4cd26d28bd69cf62eaa94316f32c3f29266d0070a978" => :mojave sha256 "6827bc87f0ccf3b9e3f04adb8e0aba1d63497291704773bd9f6691d73cf4ee1d" => :high_sierra + sha256 "ec2448551b49cbcb0ad7b2a06a6f901cea94dc76c6097a0a1f37366d048aa6da" => :x86_64_linux end depends_on "pkg-config" => :build + depends_on "gdbm" unless OS.mac? uses_from_macos "groff" uses_from_macos "zlib" @@ -23,6 +25,7 @@ class ManDb < Formula def install resource("libpipeline").stage do + ENV.append_to_cflags "-fPIC" unless OS.mac? system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", @@ -31,6 +34,7 @@ def install "--disable-shared" system "make" system "make", "install" + ENV.remove_from_cflags "-fPIC" unless OS.mac? end ENV["libpipeline_CFLAGS"] = "-I#{buildpath}/libpipeline/include" @@ -45,6 +49,12 @@ def install --program-prefix=g ] + unless OS.mac? + args << "--with-config-file=#{etc}/man_db.conf" + args << "--with-systemdtmpfilesdir=#{etc}/tmpfiles.d" + args << "--with-systemdsystemunitdir=#{etc}/systemd/system" + end + system "./configure", *args system "make", "CFLAGS=#{ENV.cflags}" @@ -88,7 +98,12 @@ def caveats test do ENV["PAGER"] = "cat" output = shell_output("#{bin}/gman true") - assert_match "BSD General Commands Manual", output - assert_match "The true utility always returns with exit code zero", output + if OS.mac? + assert_match "BSD General Commands Manual", output + assert_match "The true utility always returns with exit code zero", output + else + assert_match "true - do nothing, successfully", output + assert_match "GNU coreutils online help: :el_capitan sha256 "2e3cc12c0e7bc0ae5b194f397874015df1fe6b8a8ab52c6972e17ad992732463" => :yosemite sha256 "7ebaf5a969df65809220222b69414a51ed06b90601a28fc2ad140955e17febe0" => :mavericks + sha256 "1f38e6c41b0d47ca9e58f0c0d0514047296a851f28c79b91bfcaf22a4d8d4f3f" => :x86_64_linux end def install diff --git a/Formula/mandoc.rb b/Formula/mandoc.rb index d5994ed7855f9..e39bfcc2e78c1 100644 --- a/Formula/mandoc.rb +++ b/Formula/mandoc.rb @@ -10,6 +10,7 @@ class Mandoc < Formula sha256 "78ffbf8bee7e5135ea303bb861f432288f2d48d403d7e932753b1ef962348917" => :mojave sha256 "3236fdca9fe2cd8cca29d246d9252eaeea8ceeb7d8f5251574c2bc771a841647" => :high_sierra sha256 "6176fcab59057d2188db3047849f96170bcb2133bfbe1f8c94845895d6a89bec" => :sierra + sha256 "59ebf51a88060585b467c262034385d3830888f791ac04b429d7ce49dd9e6c49" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/mariadb-connector-c.rb b/Formula/mariadb-connector-c.rb index f90da017494dc..417061a0e097f 100644 --- a/Formula/mariadb-connector-c.rb +++ b/Formula/mariadb-connector-c.rb @@ -9,6 +9,7 @@ class MariadbConnectorC < Formula sha256 "830dec16151d5d8f7d2c4e3925f9fba5b911d7fe3b9ec07eec23079e0b85293b" => :catalina sha256 "3ce47f04785021838696176ba2da5b79cf5ed5bd7870531701efc47d2e20cbc4" => :mojave sha256 "330e6d5f322494e9deaefd46ec3a8604509b5880b08bc125f6e1a164e01933de" => :high_sierra + sha256 "1ec6d6ecc40b14b7d1d1378c2853df98c5cb3d8309c78cea238a7fe495337072" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/mariadb-connector-odbc.rb b/Formula/mariadb-connector-odbc.rb index 1aa7a8f0ceff3..5ae98d03f5a29 100644 --- a/Formula/mariadb-connector-odbc.rb +++ b/Formula/mariadb-connector-odbc.rb @@ -5,10 +5,10 @@ class MariadbConnectorOdbc < Formula sha256 "699c575e169d770ccfae1c1e776aa7725d849046476bf6579d292c89e8c8593e" bottle do - cellar :any sha256 "98bfc0e11134fa8958aa38810c9c16eb12bda27f4b319ebf8cb218845bec7a89" => :catalina sha256 "28fb8b7089115c8be14b968ab3a604f2a3c2642a8592272bc4caf3812b6e25ba" => :mojave sha256 "84ddb76363d80231117b6a026e1371463478e5d8d15733c0ba786e141c3b8667" => :high_sierra + sha256 "06207f674e005e7c2b2a6a9443c71e5c0460e6f37e849df057351c8919f15911" => :x86_64_linux end depends_on "cmake" => :build @@ -19,7 +19,7 @@ class MariadbConnectorOdbc < Formula def install ENV.append_to_cflags "-I#{Formula["mariadb-connector-c"].opt_include}/mariadb" ENV.append "LDFLAGS", "-L#{Formula["mariadb-connector-c"].opt_lib}/mariadb" - system "cmake", ".", "-DMARIADB_LINK_DYNAMIC=1", + system "cmake", ".", (OS.mac? ? "-DMARIADB_LINK_DYNAMIC=1" : "-DMARIADB_FOUND=1"), "-DWITH_SSL=OPENSSL", "-DOPENSSL_ROOT_DIR=#{Formula["openssl@1.1"].opt_prefix}", "-DWITH_IODBC=0", @@ -33,7 +33,8 @@ def install end test do - output = shell_output("#{Formula["unixodbc"].opt_bin}/dltest #{lib}/libmaodbc.dylib") - assert_equal "SUCCESS: Loaded #{lib}/libmaodbc.dylib", output.chomp + ext = OS.mac? ? "dylib" : "so" + output = shell_output("#{Formula["unixodbc"].opt_bin}/dltest #{lib}/libmaodbc.#{ext}") + assert_equal "SUCCESS: Loaded #{lib}/libmaodbc.#{ext}", output.chomp end end diff --git a/Formula/mariadb.rb b/Formula/mariadb.rb index c775a5641e72b..019a80bdf2434 100644 --- a/Formula/mariadb.rb +++ b/Formula/mariadb.rb @@ -8,12 +8,18 @@ class Mariadb < Formula sha256 "114d02c80a84ce764b21e8b013f053ce0c66198a6530c1c56ca73318993c718e" => :catalina sha256 "e444515e91d27dd3fb11e923ae81fd87cbd057170419cea061992253ba1ab7c9" => :mojave sha256 "70e0007bfdaf8a8667b3c0d57f9441db0cc22c55e8dafc666be777f689a0d58e" => :high_sierra + sha256 "38c2ba331cfb972e9ac55b0d5589219df8717120dde9c72c93c1aa7912f5ee76" => :x86_64_linux end depends_on "cmake" => :build depends_on "pkg-config" => :build depends_on "groonga" depends_on "openssl@1.1" + unless OS.mac? + depends_on "gcc@7" => :build + depends_on "libcsv" + depends_on "linux-pam" + end uses_from_macos "bison" => :build uses_from_macos "bzip2" @@ -26,6 +32,10 @@ class Mariadb < Formula conflicts_with "mariadb-connector-c", :because => "both install plugins" + fails_with :gcc => "4" + fails_with :gcc => "5" + fails_with :gcc => "6" + def install # Set basedir and ldata so that mysql_install_db can find the server # without needing an explicit path to be set. This can still @@ -56,6 +66,12 @@ def install -DCOMPILATION_COMMENT=Homebrew ] + unless OS.mac? + args << "-DWITH_NUMA=OFF" + args << "-DPLUGIN_ROCKSDB=NO" + args << "-DPLUGIN_MROONGA=NO" + end + # disable TokuDB, which is currently not supported on macOS args << "-DPLUGIN_TOKUDB=NO" @@ -108,6 +124,11 @@ def install end def post_install + # https://github.com/Homebrew/linuxbrew-core/pull/16457 + # chown: changing ownership of mariadb/10.4.10_1/lib/plugin/auth_pam_tool_dir/auth_pam_tool + # Operation not permitted + return if ENV["CI"] + # Make sure the var/mysql directory exists (var/"mysql").mkpath unless File.exist? "#{var}/mysql/mysql/user.frm" @@ -153,6 +174,9 @@ def plist end test do + # terminate called after throwing an instance of 'std::bad_alloc' + return if ENV["CI"] + system bin/"mysqld", "--version" prune_file = etc/"my.cnf.d/.homebrew_dont_prune_me" assert_predicate prune_file, :exist?, "Failed to find #{prune_file}!" diff --git a/Formula/markdown.rb b/Formula/markdown.rb index 100c9abd4b8be..a393c5b7132e3 100644 --- a/Formula/markdown.rb +++ b/Formula/markdown.rb @@ -13,6 +13,7 @@ class Markdown < Formula sha256 "a5b025bc09c8b274507cfc5c86da6350560477f24ce109dd5a79f2dafa97d805" => :el_capitan sha256 "5e1b8b5388f1b4ceefe3fae528ae83e2fa3f9ed9f27668e8faded36b9ec3274e" => :yosemite sha256 "66fffda1a29fd9e2dcddcb52fb9606f21d897bf4680583626b612a95d27b1e04" => :mavericks + sha256 "582191e93f3661c33baf4f0a5daf4a1673aa38bb31fadb19c7631e8e1394c95e" => :x86_64_linux # glibc 2.19 end conflicts_with "discount", :because => "both install `markdown` binaries" diff --git a/Formula/marst.rb b/Formula/marst.rb index 301f8481eac55..8ab534c2fcbe5 100644 --- a/Formula/marst.rb +++ b/Formula/marst.rb @@ -14,6 +14,7 @@ class Marst < Formula sha256 "c1a70d467ff3117c2a31bd52a659fbff2293f6f17b11cd4b370e9e8220a483c8" => :el_capitan sha256 "6d8834fc64e1da37fce2ed9cae3c9f0e0dbfcb41f213c55c8413c2a522ed8811" => :yosemite sha256 "7fddf8023d17c4bfcb6fc4141c6202b3e856ee2ecd684236daef058592b79335" => :mavericks + sha256 "b0454e3e833180bc88cbff258db8f9737896d9f22c66180dc562a37aa4eb35ce" => :x86_64_linux end def install diff --git a/Formula/mas.rb b/Formula/mas.rb index 0b21b39e760ee..a4cf699d7ece2 100644 --- a/Formula/mas.rb +++ b/Formula/mas.rb @@ -14,6 +14,7 @@ class Mas < Formula depends_on "carthage" => :build depends_on :xcode => ["10.2", :build] + depends_on :macos def install # Working around build issues in dependencies diff --git a/Formula/masscan.rb b/Formula/masscan.rb index d7a410fdabf43..121b4579e4949 100644 --- a/Formula/masscan.rb +++ b/Formula/masscan.rb @@ -12,6 +12,7 @@ class Masscan < Formula sha256 "20a6281fb4adb9aec9fd7bddf8da30bc2ae8f5bec6daa5b468444916859017fd" => :high_sierra sha256 "729b4ce06557da726edbf7e6e570ed1ff96ca3e0bc42d9399f9ed96aa48ef2a2" => :sierra sha256 "9aa4359e82e1b467f24d7e813ee8919dbc5cf32a182fd6eafcadc015bcd97955" => :el_capitan + sha256 "86b3e0f4fc9d08b6c3203115c23b0839f0aff17dcec2761a6a96dc83218c3220" => :x86_64_linux end def install diff --git a/Formula/massren.rb b/Formula/massren.rb index 87359565e5609..ce4d383f5d4dc 100644 --- a/Formula/massren.rb +++ b/Formula/massren.rb @@ -11,6 +11,7 @@ class Massren < Formula sha256 "99afbeedc3d8ab1e3cf8ca525ac22f1b02efefbfd75b145b342f773cea639be6" => :high_sierra sha256 "14874a768ef7f34aa638cdbd62aa32d2b07fc5c0e6668c86f6f080f172f0fe45" => :sierra sha256 "ea67caccb6dacdbed8979f3dc243e224ff1900928dedf1ea8800f5256f3456b2" => :el_capitan + sha256 "7d6bd10514253acd7a9769cf9ddad77327291745839202ae727e432bd6332e7f" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/math-comp.rb b/Formula/math-comp.rb index 8cca7bca74222..81a0d2511ee0e 100644 --- a/Formula/math-comp.rb +++ b/Formula/math-comp.rb @@ -10,6 +10,7 @@ class MathComp < Formula sha256 "544a1e3aabdbf5d276d1365156da0fc345bb98f96572477c78d015534354c5cc" => :catalina sha256 "56b7c095a4a4fffffab65be91dd6cf217eab04a2831d179469c4e672b2e36654" => :mojave sha256 "f1e7424619f165819c82f0b201c2dd53c5068c1c415e4da489e2382f4b0e9a21" => :high_sierra + sha256 "44d709fe688416c1941055c048f4a3745bfa8c94d97d6dc87a909daa817ff002" => :x86_64_linux end depends_on "ocaml" => :build diff --git a/Formula/mavsdk.rb b/Formula/mavsdk.rb index 7f4214a7a38ea..4cf1de67747c4 100644 --- a/Formula/mavsdk.rb +++ b/Formula/mavsdk.rb @@ -10,6 +10,7 @@ class Mavsdk < Formula sha256 "21ec782d1a4aa1783920a53c924c698fec26e9d42c32042fd66ed11953efb1cd" => :catalina sha256 "41383056b82b35e21af26de42729fb6a9ea130b6171d225dfb49d834e955751b" => :mojave sha256 "c3dc48e7f6c46b186c01be66fa5b59ee90050ae76a2692ee99c475cead5c82a9" => :high_sierra + sha256 "d120e7d41ad3bffca74fed016bd370f190fe35ffbb67f955075958225e53da90" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/mawk.rb b/Formula/mawk.rb index 41ac32d2bee04..86a083ab78604 100644 --- a/Formula/mawk.rb +++ b/Formula/mawk.rb @@ -9,6 +9,7 @@ class Mawk < Formula sha256 "03f9aa87a079b35b6f93813e4016e85d102c578d8b65f2f967b0b7c5c5d869ad" => :catalina sha256 "802b3592430ca644c6590acad265f45ac892fe47fb37732e678afac13f8cf1f0" => :mojave sha256 "d113f78e1c20c8bf86fcf5ce083e206aeca58ee857e7d0a3acb0158d2b01fb45" => :high_sierra + sha256 "2b2b374a9663ac0a42716ae8c7cf1abddc3c8545601ca84d67e0a6a28c87c1ab" => :x86_64_linux end def install diff --git a/Formula/mbedtls.rb b/Formula/mbedtls.rb index 893913b600d79..93c03b893519d 100644 --- a/Formula/mbedtls.rb +++ b/Formula/mbedtls.rb @@ -10,6 +10,7 @@ class Mbedtls < Formula sha256 "eda862a92461ba28c8b122dca7264bc81e487735de652b7f15a227de3b7eaa86" => :catalina sha256 "efb7c341a158a90fce32f24f13d93e0e5b40dbbc6d68f328418f8117005b2b7b" => :mojave sha256 "dd6c1d8ca7d4156b9c4ac7f39c2f50cb99ce09a64db37d0b4b0341c93d4def49" => :high_sierra + sha256 "4bcf708dbf5c7524da9726f0c41cee8215557a4814699e7c8e8054064a1773c8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/mboxgrep.rb b/Formula/mboxgrep.rb index f062ff21a2000..81ec6f2093b7e 100644 --- a/Formula/mboxgrep.rb +++ b/Formula/mboxgrep.rb @@ -13,6 +13,7 @@ class Mboxgrep < Formula sha256 "ecc1d1a83a7ffbc3414feb24c970b89509737f7d1de5c0d8dbd71ba55e008220" => :el_capitan sha256 "08cbb574005db6e34cc191ae4f46670ca35af252e4e6bbc2041a92e32397bc49" => :yosemite sha256 "bb5cefa83e2fb8b37dac858f3119aedb338b29e0eb2715cbff08b4644689ad86" => :mavericks + sha256 "5b5c75cfd31e9b04128b119778189ee919afdef8f7a05702a78480e59d535737" => :x86_64_linux end depends_on "pcre" diff --git a/Formula/mcabber.rb b/Formula/mcabber.rb index 261573ab631a8..529e477d11863 100644 --- a/Formula/mcabber.rb +++ b/Formula/mcabber.rb @@ -10,6 +10,7 @@ class Mcabber < Formula sha256 "fe6ea0970c446bab941b3d4f0206e75673e112dff88c55b5ee429d18f0c9fd68" => :mojave sha256 "55b6b38bfe8d3b924f7eb9b707c3e72324e81d312dd589ec99e283aa567b7ba9" => :high_sierra sha256 "4be58f58cf92107259a4cc18cf17480dabbeeb130cfc6a182daca0bf76634ac5" => :sierra + sha256 "91b80f233dac0357360f3bf997fb8f4ed757b0ad0e19d41df5971ec33feaeac6" => :x86_64_linux end head do diff --git a/Formula/mcpp.rb b/Formula/mcpp.rb index 5c53e2310930f..070aba4ba4307 100644 --- a/Formula/mcpp.rb +++ b/Formula/mcpp.rb @@ -13,6 +13,7 @@ class Mcpp < Formula sha256 "cdd368c63dc6403832c938967f8f099ec3d02acfcc5c75ab0426ad1cd213b045" => :sierra sha256 "0be73930b3dbc8bc247c9a26acbc6115d3f5f665daaabc9ab64606ac6793ace9" => :el_capitan sha256 "612e3efb23a8165af204338a20bbc27ae8fa2ad345964c24d2d7a206dee0317a" => :yosemite + sha256 "f8af0116d15fe470f61cc471bc81baf0f3ff565557121e92bdf22fd470fb5343" => :x86_64_linux end # stpcpy is a macro on macOS; trying to define it as an extern is invalid. diff --git a/Formula/mcrypt.rb b/Formula/mcrypt.rb index e241bbc59b1e3..569de88170e9b 100644 --- a/Formula/mcrypt.rb +++ b/Formula/mcrypt.rb @@ -5,11 +5,11 @@ class Mcrypt < Formula sha256 "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098" bottle do - cellar :any rebuild 2 sha256 "c9d3313218375e8bca6e22b00fcb47f11550c386ae64422bb59869af161cf6eb" => :catalina sha256 "b79e4ba583c523e382d1cc08430c96252c8e048cc1661ab3a9bed90468c8b06c" => :mojave sha256 "e11c2a7a1caf26c2a1d3d171d3291888e065ba0328f6934882cffcaec72475cd" => :high_sierra + sha256 "a556f4e54cb7e198599081cf0abd3e42d0dd10c6af8abab80f4255ab90c3a77c" => :x86_64_linux end depends_on "mhash" diff --git a/Formula/md5deep.rb b/Formula/md5deep.rb index 45cbcd9415df3..0ffac0a0586a0 100644 --- a/Formula/md5deep.rb +++ b/Formula/md5deep.rb @@ -14,6 +14,7 @@ class Md5deep < Formula sha256 "986dad46d2945aac775eb625e41b0236f2413b3924244d5e9aba445994c38687" => :el_capitan sha256 "227b8b8e4f4dd71972cd02062faefef90515b44ef5c3ce55f5c665cf679a26d1" => :yosemite sha256 "1bacd45d420975ff8b90d633e361b54c7f6a14776a41f175313360d31fb03ba4" => :mavericks + sha256 "752515990b25f829c57fcf0a85ce1aeb517fcdacc5d038f24f4ee7f2fd5ff909" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/md5sha1sum.rb b/Formula/md5sha1sum.rb index 2edd012e7a0f8..4df2bdf0fe8a6 100644 --- a/Formula/md5sha1sum.rb +++ b/Formula/md5sha1sum.rb @@ -12,6 +12,7 @@ class Md5sha1sum < Formula sha256 "b1dc1ded1df513c24b7eab764707b088f42661c2cf53395e42ee4e03c245ac5d" => :mojave sha256 "7ed564b5da0f1adf33c0242bffcd4e456d4e46540b578d3cdb810a9f6a28474b" => :high_sierra sha256 "66ff4c578f7eff04b561192dd7789e013714caed61dac322df99f5652790abc7" => :sierra + sha256 "1cc0c0c71ed27f56ddffda65a74ccf632640a8762e73ac641b8777e1c1a445d7" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/mdbook.rb b/Formula/mdbook.rb index 4381fc90e2521..57ecdad3770ca 100644 --- a/Formula/mdbook.rb +++ b/Formula/mdbook.rb @@ -9,6 +9,7 @@ class Mdbook < Formula sha256 "3a822942e2647a25e1068e1df41db825e87855fefc8ee252877e6246ac6e48c3" => :catalina sha256 "569f3329feb1626abf44d3cc714ef44f0e5645edfe08b9de01d85ea299883384" => :mojave sha256 "801437766049bdce1aa45cc5dc1f3d24949020dd83168b109b0407533dade2fd" => :high_sierra + sha256 "a32aa7701aab9cd016feaea2b90de97760a26e4cb9deaa068e466f9fd16e6ada" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/mdbtools.rb b/Formula/mdbtools.rb index 033c58e77d295..cfbe28de22d42 100644 --- a/Formula/mdbtools.rb +++ b/Formula/mdbtools.rb @@ -11,6 +11,7 @@ class Mdbtools < Formula sha256 "7ba58781f1d60f4b5ea1e9af6f75d52be36a7cfec10fef414e1e99d447ad10e5" => :mojave sha256 "57bc1d0d1df78a20881b0d0340a302ec3a7d359a80eaffe78d809bf4dc150521" => :high_sierra sha256 "1e1f75dc87ac2f423ecbf993a118220fe8d309ad179ec9986d099b98f959f216" => :sierra + sha256 "c28f86a64c3cc917776b3409397644db73d2051ea2e5da63ee3f2dc43b093524" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/mdcat.rb b/Formula/mdcat.rb index db36dd34adb05..0eca6d3b769f6 100644 --- a/Formula/mdcat.rb +++ b/Formula/mdcat.rb @@ -9,13 +9,16 @@ class Mdcat < Formula sha256 "dcddb07828db6973b4badb8522a5733cde29114b3cdaa16bb7b676ccdf7faf48" => :catalina sha256 "aac82a12f878e80161925f6a95238a85d853040c9273e53fcaffe534843265cf" => :mojave sha256 "143bd89cf97a6357f6b29241f8b23a5bf71f3e0144d227196d91fe4ca486fbc6" => :high_sierra + sha256 "e6787a0f0bfed57115883bbdd201495ffad7cae8d7c4e14e59a7b3123ed5c4df" => :x86_64_linux end depends_on "cmake" => :build depends_on "rust" => :build on_linux do + depends_on "llvm" => :build depends_on "pkg-config" => :build + depends_on "openssl@1.1" end def install diff --git a/Formula/mdds.rb b/Formula/mdds.rb index f202663565c63..795979df997f6 100644 --- a/Formula/mdds.rb +++ b/Formula/mdds.rb @@ -10,6 +10,7 @@ class Mdds < Formula sha256 "c7415479dc1b23ba867eef310cd265d6813ea9523591a2d30670f3ee20a99923" => :catalina sha256 "ccfeb176c14e310b913302c74ba30d5973184662e62060ec8eea0f16c931f607" => :mojave sha256 "ccfeb176c14e310b913302c74ba30d5973184662e62060ec8eea0f16c931f607" => :high_sierra + sha256 "c5ca155b9eac026cf0266c322dddd394d1072f032a9e5d71b67f1f7013b198f4" => :x86_64_linux end head do diff --git a/Formula/mdf2iso.rb b/Formula/mdf2iso.rb index ec2e66b88d174..1e3f507d6698a 100644 --- a/Formula/mdf2iso.rb +++ b/Formula/mdf2iso.rb @@ -14,6 +14,7 @@ class Mdf2iso < Formula sha256 "fbe092bfc501d4abf8b0df052e26307219ea4bb9fb4eddb20df8b7734ff7fdf5" => :el_capitan sha256 "aab6c1b85c8f863016f7db7ca6b35c56cc7442a6bdf6876f7b9b8ba24b58e5a6" => :yosemite sha256 "8a755700501039ec87145fa6acd0d37e9ecaacd538481bf556e7ed69330bd085" => :mavericks + sha256 "a9bb9b2b18d47cd5d8caf560a5de2967018435b8213299b106d314666e57f3d6" => :x86_64_linux end def install diff --git a/Formula/mdk.rb b/Formula/mdk.rb index 84cafcbe037f4..f91afb2671703 100644 --- a/Formula/mdk.rb +++ b/Formula/mdk.rb @@ -10,6 +10,7 @@ class Mdk < Formula sha256 "11d143b7ea88fb34427d08f9755bc62fb5129b577a7a2fcc813c3cacf4c7c644" => :catalina sha256 "344482a184e612e63d0839e0e254c1c27b44971dcf62dc4cba96fb45a5db4aaf" => :mojave sha256 "261bdee4241a6db4a361aca51bd4b052fc4686bd9f2ece6b24391c569c1c1558" => :high_sierra + sha256 "d3104d21e1c5a26cc07c8b8dce28d71550058574da57c2ae7a4a4663a82485f9" => :x86_64_linux end depends_on "intltool" => :build diff --git a/Formula/mdp.rb b/Formula/mdp.rb index aa98e4819cab6..ede96f25110d6 100644 --- a/Formula/mdp.rb +++ b/Formula/mdp.rb @@ -11,6 +11,7 @@ class Mdp < Formula sha256 "606ffc22ff72a524f46ae683466098409e2db33cb5de58dad6ea179a9390cdbc" => :mojave sha256 "0bfa062ad64e8da4fa6d1df9be7e8a52da7799f87fc012b80847ac58adf81830" => :high_sierra sha256 "b38a74964fd0ac22fcbb50eb569b165128799f77a32d582f102278252b6bd291" => :sierra + sha256 "506939f0a3c49d673c7644b25d734a1f63bb108775ba56cb7dcc2d711cfdeff1" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/mdv.rb b/Formula/mdv.rb index 7c78d4f69586b..7c11c5d028116 100644 --- a/Formula/mdv.rb +++ b/Formula/mdv.rb @@ -11,6 +11,7 @@ class Mdv < Formula sha256 "ba336eac38af86dd98d74dbba06226d13b0bc8af719e1e40a863f9f394da4de8" => :catalina sha256 "ecb421e63e0278668ae2d570c8095186cb3e4695c5ba9891f20d16c2ba3c6e6c" => :mojave sha256 "3b9847a65d7c9820148cd848687efdb598193cc76abb031c1f71841bad2ec60d" => :high_sierra + sha256 "e370954645d6b5ee9df0493e067a2da288f2e62c96ebcf2977bb62e9dbcb4382" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/mecab-ipadic.rb b/Formula/mecab-ipadic.rb index c2e4627ff6622..b96a8f350f33b 100644 --- a/Formula/mecab-ipadic.rb +++ b/Formula/mecab-ipadic.rb @@ -15,6 +15,7 @@ class MecabIpadic < Formula sha256 "9f0ae0a62141e3b28807349cb7a9560e36770acb869f4a4e7a54ea1a28ef8ba5" => :el_capitan sha256 "55703c812de3e7cff503b9cd1eafa0656b3f17c4885165ce4d8e4d2b2356050e" => :yosemite sha256 "0a9ea36b7cc03f73ae34f72e078b7e84ebe814cf8e1cfbea2d5f876c1893b1c5" => :mavericks + sha256 "523abdb9240d55e3f56941011d2c287a58f80f0a697ffddcca15178be978cdbd" => :x86_64_linux end depends_on "mecab" diff --git a/Formula/mecab-jumandic.rb b/Formula/mecab-jumandic.rb index a677df658c5c8..c4887dea0a2fd 100644 --- a/Formula/mecab-jumandic.rb +++ b/Formula/mecab-jumandic.rb @@ -13,6 +13,7 @@ class MecabJumandic < Formula sha256 "4b821839b99982c506a1e262c9fa8b650620bc546a8725a5eaa1dc54b45e4822" => :sierra sha256 "4b821839b99982c506a1e262c9fa8b650620bc546a8725a5eaa1dc54b45e4822" => :el_capitan sha256 "4b821839b99982c506a1e262c9fa8b650620bc546a8725a5eaa1dc54b45e4822" => :yosemite + sha256 "dc470ff5c8619a3611a80386134a8a849a8ec14723f892959f626a091d63c84e" => :x86_64_linux end depends_on "mecab" diff --git a/Formula/mecab-ko-dic.rb b/Formula/mecab-ko-dic.rb index b16e0748d44e0..70306f0dbe198 100644 --- a/Formula/mecab-ko-dic.rb +++ b/Formula/mecab-ko-dic.rb @@ -13,6 +13,7 @@ class MecabKoDic < Formula sha256 "51c5a40a0aad7906cbd83265fbecbc4de3a4f116abceebf9fdb02d17c75f5f69" => :el_capitan sha256 "92be006bcc8552fdaddf82d21b9f8f528af010128febc721a5a5ba262eca99ce" => :yosemite sha256 "0c958bf826cd358431f144dfb3d2d3da08c67cda59efe1d2998b54a401678515" => :mavericks + sha256 "02ee7f40d63ff16d0e7659ca31652c6d5ec9db3e995a74bc6ef0b0590634597d" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/mecab-ko.rb b/Formula/mecab-ko.rb index c8f6374e10ac3..ac8ab597e4dbb 100644 --- a/Formula/mecab-ko.rb +++ b/Formula/mecab-ko.rb @@ -12,6 +12,7 @@ class MecabKo < Formula sha256 "d254239a9fec5e99de9590feb8d7c82f87e31324908003b059aea9a5d6092f2a" => :high_sierra sha256 "86b35c767cb97ab0b5e895475c3254589b101bdc3c8666abc694ea9a480421ec" => :sierra sha256 "c348042904040c28772c3f8f299debe574c6ebaaed7e41b23cac4980aeb8aa97" => :el_capitan + sha256 "41c0d1c1811ed632a34f22f4ca9792048f7bf3728ec4ea9bd37d282aa8714d8c" => :x86_64_linux end conflicts_with "mecab", :becasue => "both install mecab binaries" diff --git a/Formula/mecab-unidic-extended.rb b/Formula/mecab-unidic-extended.rb index df49f70581adb..312c13c00d67e 100644 --- a/Formula/mecab-unidic-extended.rb +++ b/Formula/mecab-unidic-extended.rb @@ -12,6 +12,7 @@ class MecabUnidicExtended < Formula sha256 "8890b4d95d0c3ee114ec48ea95d66c1d8b8a273949a912140fa477ad9265be0b" => :high_sierra sha256 "8890b4d95d0c3ee114ec48ea95d66c1d8b8a273949a912140fa477ad9265be0b" => :sierra sha256 "8890b4d95d0c3ee114ec48ea95d66c1d8b8a273949a912140fa477ad9265be0b" => :el_capitan + sha256 "c14895b68204bd2028de382ab46b5efea0eb4fb218991370930c3a434bff23e0" => :x86_64_linux end depends_on "mecab" diff --git a/Formula/mecab-unidic.rb b/Formula/mecab-unidic.rb index deffeaa15e828..899e211d60b9d 100644 --- a/Formula/mecab-unidic.rb +++ b/Formula/mecab-unidic.rb @@ -15,6 +15,7 @@ class MecabUnidic < Formula sha256 "9ece990d89f8949c82003296bd256ebafddaf5d9caf03a63ea692f2009d52783" => :el_capitan sha256 "f81fd4ff64eb6b7731fd4b818b17398b1eaea3d12d533a7340b9b12aa2331c0d" => :yosemite sha256 "0f5b5d2d705004d502da930f1b8671a5ac34ad8d35ba7547846fa16577b43c87" => :mavericks + sha256 "2fcb1606671570845f5ccee15db9cf51e0538c75d532e2364cffd7172860a6e1" => :x86_64_linux end depends_on "mecab" diff --git a/Formula/mecab.rb b/Formula/mecab.rb index 9677e97ae61dd..85f01653b4198 100644 --- a/Formula/mecab.rb +++ b/Formula/mecab.rb @@ -12,6 +12,7 @@ class Mecab < Formula sha256 "d48340df17075e4a6237ffb87306a42566f8eabb736c546d790586266758f387" => :high_sierra sha256 "d98686ec62189de50f6ed5b7e682d59b90239c8dfd08cf32fd23543466586232" => :sierra sha256 "03df92bdd092065a7cbca5953a0e352c16cadfff5c9f186bbe1ee882258e56d3" => :el_capitan + sha256 "4cff10addb8895df884fca8d81cd4d4c7530efdac45896299d85ab707a80cf4f" => :x86_64_linux end conflicts_with "mecab-ko", :because => "both install mecab binaries" diff --git a/Formula/media-info.rb b/Formula/media-info.rb index 279ba7cf04e54..4464a8f39bbc2 100644 --- a/Formula/media-info.rb +++ b/Formula/media-info.rb @@ -9,6 +9,7 @@ class MediaInfo < Formula sha256 "d2d02196a863e262a5437917d4171ecc0cd6ee04af9aa68afdd91a11c0edfc84" => :catalina sha256 "f0c39a5f20693be853f15a2424541eb009b539508e5719ceea99f15177613d86" => :mojave sha256 "43a6de49a3e7ebe1fa462da717c18cc8fae8668d713677cc417d995c37ed37ae" => :high_sierra + sha256 "322274245be02c3c22342afd4b82c606b3b1df5518fef4d064402316a6b88f6b" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/mediaconch.rb b/Formula/mediaconch.rb index 5e113a7ae1d23..4f907f55b4d12 100644 --- a/Formula/mediaconch.rb +++ b/Formula/mediaconch.rb @@ -11,6 +11,7 @@ class Mediaconch < Formula sha256 "9d59b85fecc5d5caba622fe57358caab23c8ea904954a137b99e66dd4f7fedec" => :mojave sha256 "d59cfb9ac07ffb7eacc4c7970c38676a3909f0966481b99c745735bf87db7b8e" => :high_sierra sha256 "fdb3934174a68121357c21d4f0800e8bbbaa6a296f3386ab52e5298fde96a6b6" => :sierra + sha256 "829fac58efbe3037a628e0cb75c0cd9c3c81c8d6afd560705c47278305dcb457" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/mednafen.rb b/Formula/mednafen.rb index cbd67d063e583..04de8fdf414a7 100644 --- a/Formula/mednafen.rb +++ b/Formula/mednafen.rb @@ -3,11 +3,13 @@ class Mednafen < Formula homepage "https://mednafen.github.io/" url "https://mednafen.github.io/releases/files/mednafen-1.24.3.tar.xz" sha256 "3dea853f784364557fa59e9ba11a17eb2674fc0fb93205f33bdbdaba1da3f70f" + revision 1 unless OS.mac? bottle do sha256 "b0d899239eba87b09c5a14c3cd8b539a8ae251304b5cccefbc192947fb299a19" => :catalina sha256 "43ad97110859253ce5dde1a3c2d0f947a16afb3f893852d15f055133dd8609e1" => :mojave sha256 "87a76e8115dbf4f4a4d7b4515e7b3d184f9a34ac916228fc98ac8cd5e1f090c8" => :high_sierra + sha256 "8dd52bb07f627673628c689df26327eaf49e5b26a33c2fff1455dd7f06df7dc4" => :x86_64_linux end depends_on "pkg-config" => :build @@ -16,12 +18,22 @@ class Mednafen < Formula depends_on :macos => :sierra # needs clock_gettime depends_on "sdl2" + uses_from_macos "zlib" + + unless OS.mac? + depends_on "linuxbrew/xorg/glu" + depends_on "mesa" + end + def install system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking" system "make", "install" end test do + # Test fails on headless CI: Could not initialize SDL: No available video device + return if ENV["CI"] + cmd = "#{bin}/mednafen | head -n1 | grep -o '[0-9].*'" assert_equal version.to_s, shell_output(cmd).chomp end diff --git a/Formula/megacmd.rb b/Formula/megacmd.rb index 3390c5d83ccb8..ce35fcb63d93f 100644 --- a/Formula/megacmd.rb +++ b/Formula/megacmd.rb @@ -11,6 +11,7 @@ class Megacmd < Formula sha256 "e7612192a4ac2e79363d8441f7d0f007c319a5aafd8e4f56e805335cbfa72d21" => :mojave sha256 "02e75c7bbada7c3b3a230f3395448ec1dfb8598e7053ac6ad6a2b0b2f264d9ad" => :high_sierra sha256 "8f60fb2783c1481f086e401e7cbfb2ada3a6e82a35e6d2e1a24643a7c7d8453f" => :sierra + sha256 "b3587d78ef68d19e7897ce620da2a0622f94c3295347ae60c4584ff7e6af3aef" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/megatools.rb b/Formula/megatools.rb index 1592d353da073..4511cc92ff2a5 100644 --- a/Formula/megatools.rb +++ b/Formula/megatools.rb @@ -9,6 +9,7 @@ class Megatools < Formula sha256 "88c7b8cf60517507c7d6e7d9709b53bca671d949c7363c117e27ffb7d860f855" => :catalina sha256 "21844a1f366aec458b92ad00debef361388aca790bdd43583ebe51df22e7f68d" => :mojave sha256 "0f295ea8f68a858f114ef09bd4f53b82c5a401664e16beee28af7cca2d1aef5c" => :high_sierra + sha256 "da69c707ef351b7c785dd7d296cf4538eee8d7d8d15d88102359ea8552214fc7" => :x86_64_linux end depends_on "asciidoc" => :build diff --git a/Formula/memcached.rb b/Formula/memcached.rb index 39f2e71587e8f..0006ec9595e79 100644 --- a/Formula/memcached.rb +++ b/Formula/memcached.rb @@ -10,6 +10,7 @@ class Memcached < Formula sha256 "e942aa7a5eb09af40e100d242a5f65a7caffa077b7aecd2b94b4e81ce5f9c3ff" => :catalina sha256 "72ea783ac973864336ac1b7652475edeb523ce716e66ae4d6f745956429a66f5" => :mojave sha256 "47b162f67655a7cc95a706d5df0df04408038d82e4a859cd747b28590921c175" => :high_sierra + sha256 "c86efc22f4f3b8a05470800d04f45a4d846e48417452012e98c87eabcdea0015" => :x86_64_linux end depends_on "libevent" @@ -48,7 +49,12 @@ def plist test do pidfile = testpath/"memcached.pid" - system bin/"memcached", "--listen=localhost:#{free_port}", "--daemon", "--pidfile=#{pidfile}" + # Assumes port 11211 is not already taken + if !OS.mac? && ENV["CI"] + system bin/"memcached", "-u", ENV["USER"], "--listen=localhost:#{free_port}", "--daemon", "--pidfile=#{pidfile}" + else + system bin/"memcached", "--listen=localhost:#{free_port}", "--daemon", "--pidfile=#{pidfile}" + end sleep 1 assert_predicate pidfile, :exist?, "Failed to start memcached daemon" pid = (testpath/"memcached.pid").read.chomp.to_i diff --git a/Formula/memcacheq.rb b/Formula/memcacheq.rb index e4f6379a37c3a..71a63b006bdb0 100644 --- a/Formula/memcacheq.rb +++ b/Formula/memcacheq.rb @@ -11,6 +11,7 @@ class Memcacheq < Formula sha256 "3a41379223936c7802a6df61454f70cb14fb6df6ae43e46d32fea87b1194c11b" => :mojave sha256 "8e519465f17eadf1db20439176d6d4c120572ca700e3c6d33706df73788f88f7" => :high_sierra sha256 "89f6b5b9085f13f38bacdff51c0082dc17ec992bc8c5366ebfd38542d91d5703" => :sierra + sha256 "842786a8811253bff019e2b72a8b6c8808a7287b10eb359a39e1b73690bed59a" => :x86_64_linux end depends_on "berkeley-db" diff --git a/Formula/menhir.rb b/Formula/menhir.rb index 407991e228bfe..fb5f0088140c6 100644 --- a/Formula/menhir.rb +++ b/Formula/menhir.rb @@ -5,10 +5,10 @@ class Menhir < Formula sha256 "2c436b29f2374566f5e63cb32033a47106c37b625ce45be8ade6857ee6ef0130" bottle do - cellar :any sha256 "1d8fe51d871a8ceb81aa9fd8ab2f6afe52827fd1fb9f44920db00d44013c9612" => :catalina sha256 "143e14a2c00f6b0ca8749c86d3c90da34f1a86b82c777aa0ecd10fd8287a9146" => :mojave sha256 "47f172389fa83b5c27cb50dff49253566dfe992e058a32d656c91733c87ac947" => :high_sierra + sha256 "0b8301a6d3d118592092bab753e604b21f5df6910af9047675a0ee3483bf71e0" => :x86_64_linux end depends_on "dune" => :build diff --git a/Formula/mercurial.rb b/Formula/mercurial.rb index cadf524bbe10d..5fdeb7e6412be 100644 --- a/Formula/mercurial.rb +++ b/Formula/mercurial.rb @@ -10,6 +10,7 @@ class Mercurial < Formula sha256 "56cedcc1d107a933564c964846e975acc3c51be35bc4f1271b5ca37dd1a7b9d7" => :catalina sha256 "f1f72a7731aed677b89affedb39b9d32e83d93e5a5a4865a69c593ae70073b5d" => :mojave sha256 "05dae0130df204d0dacb89a1bbeca0c7608edd67a5710b799554822055d2f3cd" => :high_sierra + sha256 "c43b214a40c368c2e2f1292c262a9026d42b4042b94c8329a2bf58b7ef0628c5" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/mesa.rb b/Formula/mesa.rb index bc04af2a3a398..ed688972d206b 100644 --- a/Formula/mesa.rb +++ b/Formula/mesa.rb @@ -6,20 +6,47 @@ class Mesa < Formula head "https://gitlab.freedesktop.org/mesa/mesa.git" bottle do - cellar :any sha256 "3554b5932a65665c08e70397db4cb74c35abf8d0f4b9a6cf275f06e423bfc0aa" => :catalina sha256 "cf1ff78957fe913c00b57fdda192d828682d33cbae7d11fd6cd7f41e46968141" => :mojave sha256 "20bb00c5495936cb49ef2c5c17a70465fadd7d7a2ca5237a6c9085e8a5d9542f" => :high_sierra + sha256 "283dd5931fba23389db581a455519bf853cb56efea97037c075bebab509ee221" => :x86_64_linux end depends_on "meson-internal" => :build depends_on "ninja" => :build depends_on "pkg-config" => :build depends_on "python@3.8" => :build - depends_on "freeglut" => :test + depends_on "freeglut" => :test if OS.mac? depends_on "expat" depends_on "gettext" + uses_from_macos "bison" => :build + uses_from_macos "flex" => :build + uses_from_macos "ncurses" + uses_from_macos "zlib" + + unless OS.mac? + depends_on "llvm" + depends_on "libelf" + depends_on "linuxbrew/xorg/libdrm" + depends_on "linuxbrew/xorg/libomxil-bellagio" + depends_on "linuxbrew/xorg/libva-internal" + depends_on "linuxbrew/xorg/libvdpau" + depends_on "linuxbrew/xorg/libx11" + depends_on "linuxbrew/xorg/libxcb" + depends_on "linuxbrew/xorg/libxdamage" + depends_on "linuxbrew/xorg/libxext" + depends_on "linuxbrew/xorg/libxfixes" + depends_on "linuxbrew/xorg/libxrandr" + depends_on "linuxbrew/xorg/libxshmfence" + depends_on "linuxbrew/xorg/libxv" + depends_on "linuxbrew/xorg/libxvmc" + depends_on "linuxbrew/xorg/libxxf86vm" + depends_on "linuxbrew/xorg/wayland" + depends_on "linuxbrew/xorg/wayland-protocols" + depends_on "lm-sensors" + end + resource "Mako" do url "https://files.pythonhosted.org/packages/72/89/402d2b4589e120ca76a6aed8fee906a0f5ae204b50e455edd36eda6e778d/Mako-1.1.3.tar.gz" sha256 "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27" @@ -42,20 +69,78 @@ def install resource("gears.c").stage(pkgshare.to_s) mkdir "build" do - system "meson", *std_meson_args, "..", "-Dbuildtype=plain", "-Db_ndebug=true", - "-Dplatforms=surfaceless", "-Dglx=disabled" + args = %w[ + -Dbuildtype=plain + -Db_ndebug=true + ] + + if OS.mac? + args << "-Dplatforms=surfaceless" + args << "-Dglx=disabled" + else + args << "-Dplatforms=x11,wayland,drm,surfaceless" + args << "-Dglx=auto" + args << "-Ddri3=true" + args << "-Ddri-drivers=auto" + args << "-Dgallium-drivers=auto" + args << "-Degl=true" + args << "-Dgbm=true" + args << "-Dopengl=true" + args << "-Dgles1=true" + args << "-Dgles2=true" + args << "-Dxvmc=true" + args << "-Dtools=drm-shim,etnaviv,freedreno,glsl,nir,nouveau,xvmc,lima" + end + + system "meson", *std_meson_args, "..", *args system "ninja" system "ninja", "install" end + + unless OS.mac? + # Strip executables/libraries/object files to reduce their size + system("strip", "--strip-unneeded", "--preserve-dates", *(Dir[bin/"**/*", lib/"**/*"]).select do |f| + f = Pathname.new(f) + f.file? && (f.elf? || f.extname == ".a") + end) + end end test do - flags = %W[ - -framework OpenGL - -I#{Formula["freeglut"].opt_include} - -L#{Formula["freeglut"].opt_lib} - -lglut - ] - system ENV.cc, "#{pkgshare}/gears.c", "-o", "gears", *flags + if OS.mac? + flags = %W[ + -framework OpenGL + -I#{Formula["freeglut"].opt_include} + -L#{Formula["freeglut"].opt_lib} + -lglut + ] + system ENV.cc, "#{pkgshare}/gears.c", "-o", "gears", *flags + else + output = shell_output("ldd #{lib}/libGL.so").chomp + libs = %w[ + libxcb-dri3.so.0 + libxcb-present.so.0 + libxcb-sync.so.1 + libxshmfence.so.1 + libglapi.so.0 + libXext.so.6 + libXdamage.so.1 + libXfixes.so.3 + libX11-xcb.so.1 + libX11.so.6 + libxcb-glx.so.0 + libxcb-dri2.so.0 + libxcb.so.1 + libXxf86vm.so.1 + libdrm.so.2 + libXau.so.6 + libXdmcp.so.6 + libexpat.so.1 + ] + + libs.each do |lib| + assert_match lib, output + end + end end end diff --git a/Formula/meson-internal.rb b/Formula/meson-internal.rb index f810611eae3d2..95b08efceca12 100644 --- a/Formula/meson-internal.rb +++ b/Formula/meson-internal.rb @@ -5,13 +5,14 @@ class MesonInternal < Formula homepage "https://mesonbuild.com/" url "https://github.com/mesonbuild/meson/releases/download/0.46.1/meson-0.46.1.tar.gz" sha256 "19497a03e7e5b303d8d11f98789a79aba59b5ad4a81bd00f4d099be0212cee78" - revision 1 + revision OS.mac? ? 1 : 4 bottle do cellar :any_skip_relocation sha256 "2081b7b2d37614f170b2b55855d77bd2788922a02103da66f2d0d33952541a3f" => :catalina sha256 "c00f702a075153263b34ade26d43a9a3a98673b6b8d30ce7d17e36581b16f2bf" => :mojave sha256 "e5c4655a955250b17edc8fbd17a3bd56b5a99d1fc34db303f2bfa684a2c76167" => :high_sierra + sha256 "d0b9bb61336d35d7eaa7ff97fbe83d52b2c7ff9465e9fc1ad5c86feedc0388f7" => :x86_64_linux end keg_only <<~EOS @@ -24,10 +25,14 @@ class MesonInternal < Formula depends_on "ninja" depends_on "python@3.8" - # see https://github.com/mesonbuild/meson/pull/2577 - patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/a20d7df94112f93ea81f72ff3eacaa2d7e681053/meson-internal/meson-osx.patch?full_index=1" - sha256 "d8545f5ffbb4dcc58131f35a9a97188ecb522c6951574c616d0ad07495d68895" + if OS.mac? + # see https://github.com/mesonbuild/meson/pull/2577 + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/a20d7df94112f93ea81f72ff3eacaa2d7e681053/meson-internal/meson-osx.patch?full_index=1" + sha256 "d8545f5ffbb4dcc58131f35a9a97188ecb522c6951574c616d0ad07495d68895" + end + else + patch :DATA end def install @@ -52,3 +57,21 @@ def install end end end +__END__ +--- a/mesonbuild/scripts/meson_install.py ++++ b/mesonbuild/scripts/meson_install.py +@@ -366,14 +366,6 @@ def install_targets(d): + print("Symlink creation does not work on this platform. " + "Skipping all symlinking.") + printed_symlink_error = True +- if os.path.isfile(outname): +- try: +- depfixer.fix_rpath(outname, install_rpath, False) +- except SystemExit as e: +- if isinstance(e.code, int) and e.code == 0: +- pass +- else: +- raise + + def run(args): + global install_log_file diff --git a/Formula/meson.rb b/Formula/meson.rb index 9068ab971ea36..0945cda1be10f 100644 --- a/Formula/meson.rb +++ b/Formula/meson.rb @@ -10,11 +10,15 @@ class Meson < Formula sha256 "3f4d275c9471b9638967459f233acc20dfbb6067cf62688b420132f93e2e1434" => :catalina sha256 "3f4d275c9471b9638967459f233acc20dfbb6067cf62688b420132f93e2e1434" => :mojave sha256 "3f4d275c9471b9638967459f233acc20dfbb6067cf62688b420132f93e2e1434" => :high_sierra + sha256 "4c64fa176e942401d19119107fc032e0e582b0b17ff9cc9b2c409dcd756ad9bd" => :x86_64_linux end depends_on "ninja" depends_on "python@3.8" + # https://github.com/mesonbuild/meson/issues/2567#issuecomment-504581379 + patch :DATA + def install Language::Python.rewrite_python_shebang(Formula["python@3.8"].opt_bin/"python3") @@ -44,3 +48,20 @@ def install end end end +__END__ +--- meson-0.47.2.orig/mesonbuild/minstall.py ++++ meson-0.47.2/mesonbuild/minstall.py +@@ -486,8 +486,11 @@ class Installer: + printed_symlink_error = True + if os.path.isfile(outname): + try: +- depfixer.fix_rpath(outname, install_rpath, final_path, +- install_name_mappings, verbose=False) ++ if install_rpath: ++ depfixer.fix_rpath(outname, install_rpath, final_path, ++ install_name_mappings, verbose=False) ++ else: ++ print("RPATH changes at install time disabled") + except SystemExit as e: + if isinstance(e.code, int) and e.code == 0: + pass diff --git a/Formula/metis.rb b/Formula/metis.rb index 995a67aa34f06..267d483ce178a 100644 --- a/Formula/metis.rb +++ b/Formula/metis.rb @@ -12,6 +12,7 @@ class Metis < Formula sha256 "9c8deed80ece8c24e7ebccbce8410557b27afe711d3f59fccb7d781254d0cc34" => :sierra sha256 "54f75262475744bc6ad3ba66ac801e03c18bbac00a9bcf0ca9d05853f2022498" => :el_capitan sha256 "b33c2fc2c8a1cdb9f48faf41201bdc6384090b8dbd6ed3eecd05264eb6431c0b" => :yosemite + sha256 "5bae428970f681f9bea501461d755d60127ab380bc0572b35156c4733021df22" => :x86_64_linux # glibc 2.19 end depends_on "cmake" => :build diff --git a/Formula/mhash.rb b/Formula/mhash.rb index 7be65705430f6..536759d703ed1 100644 --- a/Formula/mhash.rb +++ b/Formula/mhash.rb @@ -13,6 +13,7 @@ class Mhash < Formula sha256 "8817cea2b724d7ea00fd1efb348aa8bdb5d93ca155cb9ccf8eb316f76b42941b" => :el_capitan sha256 "fb03873f042a16fd2db5ae2a7eb62e970927b75a9dff92decbb3fd035a2bd41f" => :yosemite sha256 "eb2799dca9f7c9d020e76034361c5859a4dc7e8aecaf4f1e989901b12ef4420c" => :mavericks + sha256 "901a01a7fbc06bea6d8192520a2eef0a6d9ffb7fe8b62df6f47958fd02f10714" => :x86_64_linux end def install diff --git a/Formula/micro.rb b/Formula/micro.rb index 58704eadc3c0b..7774da7cb4d5e 100644 --- a/Formula/micro.rb +++ b/Formula/micro.rb @@ -11,6 +11,7 @@ class Micro < Formula sha256 "be03936409bc31c0897e2df70b2c1387bcb7a9059ef484691bc5d8a4f68f7b18" => :catalina sha256 "f88ea0a7ac16b204ddc9f1a34b6cb3ad98c964b0177682e1928854e476700348" => :mojave sha256 "dc08b92df8eab987e5bbc012d624075cc98b63df9e7f603c12a7606d33639a74" => :high_sierra + sha256 "334fe2c6d9eeec0edb29a47960597d0b95b76fa45cfc67f2118051eea518964e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/micropython.rb b/Formula/micropython.rb index 4ee2b213678c3..471b266b0b881 100644 --- a/Formula/micropython.rb +++ b/Formula/micropython.rb @@ -11,6 +11,7 @@ class Micropython < Formula sha256 "af98b434dd38d24a28541b3bdc168a689b914b425aa80a6bf384c18862ed3737" => :catalina sha256 "dff6248820013f3f31408252de971418ac26f6eacd20791c6eaeb9527ea552f2" => :mojave sha256 "19800fe474da81062c005732c1dd6c3e66e6a2a8e04f38a4a69ce8513808895c" => :high_sierra + sha256 "213b5ab20cf9c60d76dafb69bdabd698066712c06ce3b3b91e37de89c7483f2a" => :x86_64_linux end depends_on "pkg-config" => :build @@ -37,7 +38,7 @@ def install (testpath/"ffi-hello.py").write <<~EOS import ffi - libc = ffi.open("libc.dylib") + libc = ffi.open("libc.#{OS.mac? ? "dylib" : "so.6"}") printf = libc.func("v", "printf", "s") printf("Hello!\\n") EOS diff --git a/Formula/midnight-commander.rb b/Formula/midnight-commander.rb index 172d6cd69634e..41ebdfadfe105 100644 --- a/Formula/midnight-commander.rb +++ b/Formula/midnight-commander.rb @@ -8,6 +8,7 @@ class MidnightCommander < Formula sha256 "c6adcb70e949c89ba12ba91fffb89ad00c55e8c3a063ae6d01954a02a84512f2" => :catalina sha256 "2e3e95bd852f0edd7069b09ff24e897e94bb495f3b852230f7cc3400acfc2d9a" => :mojave sha256 "2e888d8d8cec7a0c881d0df09f5662080494f89e1871fbcccf30e9a0cc18aa1b" => :high_sierra + sha256 "d0af2e5dea6c8f40e14b3d272046adcb64071038137860f58098242612b7cedd" => :x86_64_linux end head do diff --git a/Formula/mighttpd2.rb b/Formula/mighttpd2.rb index 0d557977dadb4..1a3af745e5f77 100644 --- a/Formula/mighttpd2.rb +++ b/Formula/mighttpd2.rb @@ -6,10 +6,10 @@ class Mighttpd2 < Formula revision 1 bottle do - cellar :any_skip_relocation sha256 "bcea435a9feba47df19b64d9fac972a1df8f580647204b07a73b2ade2e14c479" => :catalina sha256 "68e563757fb405de41a4312c03f7b72da99586430ea8f0aff98fdab48213635f" => :mojave sha256 "7b033c6ce128310465134a09bae1ef3df9cb630db732167a06028c1a5773576e" => :high_sierra + sha256 "7652478fdda8d75605a033d776ef5020bb8e5a231ba0ab2991906feab9a80af9" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/mikutter.rb b/Formula/mikutter.rb index 359c0e3439a02..7e92ffa17216e 100644 --- a/Formula/mikutter.rb +++ b/Formula/mikutter.rb @@ -10,13 +10,14 @@ class Mikutter < Formula sha256 "f5a80b458870ced8d7ac5f891c6a2b2c8dfde0e8e80cb1c4ed4f5468e61dff97" => :catalina sha256 "c534514895efea43fe4e2a71debf947b7b366936946436428e0d7abc124cefdd" => :mojave sha256 "c58da76f8142632ae26e718c89f6dd642273a6e8309103a36c23a7421a3c1255" => :high_sierra + sha256 "5131eeff6fd8a99f725a5939ce36d81d145d96e7c3297b57989f40ea44d4582a" => :x86_64_linux end depends_on "gobject-introspection" depends_on "gtk+" depends_on "libidn" depends_on "ruby" - depends_on "terminal-notifier" + depends_on "terminal-notifier" if OS.mac? uses_from_macos "xz" diff --git a/Formula/miller.rb b/Formula/miller.rb index 71d25b8b20d7d..848dde2bd61bc 100644 --- a/Formula/miller.rb +++ b/Formula/miller.rb @@ -10,6 +10,7 @@ class Miller < Formula sha256 "b1e99a7173ec7eac19ac3daa5fd565016897774c9270def0c95610549634a032" => :catalina sha256 "4d5d800c42bedc655093ca0ceb522782721e46af78f1c61e0ebf9fde74f0d9a4" => :mojave sha256 "0485537d6ba6927d11484e5c9f3377c51aa0da38fcecbf701c7833f76812a99d" => :high_sierra + sha256 "5a297507ccd7c4e695d20f1547372b65d10dbe9e118feb9d1bc93d1afda54667" => :x86_64_linux end depends_on "autoconf" => :build @@ -26,6 +27,8 @@ def install system "./configure", "--prefix=#{prefix}", "--disable-silent-rules", "--disable-dependency-tracking" system "make" + # Time zone related tests fail. Reported upstream https://github.com/johnkerl/miller/issues/237 + system "make", "check" unless OS.linux? && ENV["CI"] system "make", "install" end diff --git a/Formula/mingw-w64.rb b/Formula/mingw-w64.rb index 82303a3e3893f..5c472529b16fa 100644 --- a/Formula/mingw-w64.rb +++ b/Formula/mingw-w64.rb @@ -9,6 +9,7 @@ class MingwW64 < Formula sha256 "092d1d30ae9f2de677a35f14ec2907d285b85f9b4ed465a506f72a970deea715" => :catalina sha256 "cdefb18e91d0102ba193caa2c6994d83c30742fa03e03e12b3fc5864ca6b003c" => :mojave sha256 "2658e687bbfee45cfa9d0d74c9c129f9ffc2ac1de017143d25b4017aa899404f" => :high_sierra + sha256 "7c8e6071d8c7b5a17efe32885aefd1021b73a85f244f4b610b3a016577938203" => :x86_64_linux end # Apple's makeinfo is old and has bugs @@ -141,6 +142,14 @@ def install mkdir_p bin Dir["#{arch_dir}/bin/*"].each { |f| ln_s f, bin } end + + # Strip ELF files to reduce their size. + unless OS.mac? + system("strip", "--strip-unneeded", "--preserve-dates", *Dir[prefix/"**/*"].select do |f| + f = Pathname.new(f) + f.file? && f.elf? + end) + end end test do @@ -159,7 +168,7 @@ def install EOS ENV["LC_ALL"] = "C" - ENV.remove_macosxsdk + ENV.remove_macosxsdk if OS.mac? target_archs.each do |arch| target = "#{arch}-w64-mingw32" outarch = (arch == "i686") ? "i386" : "x86-64" diff --git a/Formula/minica.rb b/Formula/minica.rb index 5336d9e52a779..2fd8464c3b9f0 100644 --- a/Formula/minica.rb +++ b/Formula/minica.rb @@ -9,6 +9,7 @@ class Minica < Formula sha256 "6ed3047835593e51bddc2f1150ca3db84f736c4714442140ed693e23561053ee" => :catalina sha256 "3665f724fc7ca7da303894232bceda5f53b3aa75d6fe010f77635f75062212d7" => :mojave sha256 "898ae6355e98099a2692f397b58c497dbed656a7859ed8bfb9e045fc4af56a0f" => :high_sierra + sha256 "1317f1563467da37b9041d490b49eed7b509a01433560fcd3c82101619287d47" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/minidlna.rb b/Formula/minidlna.rb index 04f37a6b96082..d6723eb49f8d2 100644 --- a/Formula/minidlna.rb +++ b/Formula/minidlna.rb @@ -10,6 +10,7 @@ class Minidlna < Formula sha256 "200ede8d7a76a0ddf22978ec19f464e7716ae1e33c0c01b17877de7fcf0a0ea9" => :catalina sha256 "c8b56b111f9625c1baaf66e9f06f6e7df6b039e1ebb188995edb16c2e264830c" => :mojave sha256 "09e2127980deb0e8ed824e72bfa575f110b737ed4fa653ef0edb629faa815369" => :high_sierra + sha256 "b44152ba83533417463ce199da422a7654868b16a8d13e275765b07b47a6824d" => :x86_64_linux end head do diff --git a/Formula/minikube.rb b/Formula/minikube.rb index 16f80b63c3d97..3601a012f6ea5 100644 --- a/Formula/minikube.rb +++ b/Formula/minikube.rb @@ -11,6 +11,7 @@ class Minikube < Formula sha256 "458c030e48c868ac3499c8d321656c67ac4b10637d1549f9e2921c5eab4d0963" => :catalina sha256 "79f7f401711c9c3c2519c93c5b0bb22e7491c4a2b44b06ed8e6a362b25885cd5" => :mojave sha256 "b68b609f8165cccd4f418a5a2f4dff9baa1ed13fb16b98f1d6dcf121c6d4495e" => :high_sierra + sha256 "64bd1a5ad26b08aba441e59c87c680f7ab649b4626e772efceec5da0d539ccab" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/minimal-python.rb b/Formula/minimal-python.rb new file mode 100644 index 0000000000000..615d7bcf2a430 --- /dev/null +++ b/Formula/minimal-python.rb @@ -0,0 +1,256 @@ +class MinimalPython < Formula + desc "Interpreted, interactive, object-oriented programming language" + homepage "https://www.python.org/" + url "https://www.python.org/ftp/python/3.7.2/Python-3.7.2.tgz" + sha256 "f09d83c773b9cc72421abba2c317e4e6e05d919f9bcf34468e192b6a6c8e328d" + revision 1 + + bottle do + sha256 "f0fb1887b88e5aa46ed6171a2501b0b9a5a16ac13a532b858b8f27c4e60114a8" => :x86_64_linux + end + + keg_only "conflicts with python formula" + + depends_on "pkg-config" => :build + depends_on "bzip2" + depends_on "libffi" + depends_on :linux + depends_on "zlib" + + skip_clean "bin/pip3", "bin/pip-3.4", "bin/pip-3.5", "bin/pip-3.6", "bin/pip-3.7" + skip_clean "bin/easy_install3", "bin/easy_install-3.4", + "bin/easy_install-3.5", "bin/easy_install-3.6", "bin/easy_install-3.7" + + resource "setuptools" do + url "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip" + sha256 "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d" + end + + resource "pip" do + url "https://files.pythonhosted.org/packages/4c/4d/88bc9413da11702cbbace3ccc51350ae099bb351febae8acc85fec34f9af/pip-19.0.2.tar.gz" + sha256 "f851133f8b58283fa50d8c78675eb88d4ff4cde29b6c41205cd938b06338e0e5" + end + + resource "wheel" do + url "https://files.pythonhosted.org/packages/d9/7d/86df15e317027f6e87aa68ea854abf8437e796b4c0fadd3ae5ee67b77cb2/wheel-0.33.0.tar.gz" + sha256 "12363e6df5678ecf9daf8429f06f97e7106e701405898f24318ce7f0b79c611a" + end + + def lib_cellar + prefix/"lib/python#{xy}" + end + + def site_packages_cellar + lib_cellar/"site-packages" + end + + # The HOMEBREW_PREFIX location of site-packages. + def site_packages + HOMEBREW_PREFIX/"lib/python#{xy}/site-packages" + end + + def install + ENV.permit_weak_imports + + # Unset these so that installing pip and setuptools puts them where we want + # and not into some other Python the user has installed. + ENV["PYTHONHOME"] = nil + ENV["PYTHONPATH"] = nil + + args = %W[ + --prefix=#{prefix} + --datarootdir=#{share} + --datadir=#{share} + --enable-shared + --without-ensurepip + ] + + args << "--without-gcc" if ENV.compiler == :clang + + # Required for the _ctypes module + # see https://github.com/Linuxbrew/homebrew-core/pull/1007#issuecomment-252421573 + args << "--with-system-ffi" + + cflags = [] + ldflags = [] + cppflags = [] + + # Python's setup.py parses CPPFLAGS and LDFLAGS to learn search + # paths for the dependencies of the compiled extension modules. + # See Linuxbrew/linuxbrew#420, Linuxbrew/linuxbrew#460, and Linuxbrew/linuxbrew#875 + if build.bottle? + # Configure Python to use cc and c++ to build extension modules. + ENV["CC"] = "cc" + ENV["CXX"] = "c++" + end + cppflags << ENV.cppflags << " -I#{HOMEBREW_PREFIX}/include" + ldflags << ENV.ldflags << " -L#{HOMEBREW_PREFIX}/lib" + + args << "CFLAGS=#{cflags.join(" ")}" unless cflags.empty? + args << "LDFLAGS=#{ldflags.join(" ")}" unless ldflags.empty? + args << "CPPFLAGS=#{cppflags.join(" ")}" unless cppflags.empty? + + system "./configure", *args + system "make" + + ENV.deparallelize do + # Tell Python not to install into /Applications (default for framework builds) + system "make", "install", "PYTHONAPPSDIR=#{prefix}" + end + + # Symlink the pkgconfig files into HOMEBREW_PREFIX so they're accessible. + (lib/"pkgconfig").install_symlink Dir["#{frameworks}/Python.framework/Versions/#{xy}/lib/pkgconfig/*"] + + # Remove 2to3 because python2 also installs it + rm bin/"2to3" + + # Remove the site-packages that Python created in its Cellar. + site_packages_cellar.rmtree + + %w[setuptools pip wheel].each do |r| + (libexec/r).install resource(r) + end + + # Install unversioned symlinks in libexec/bin. + { + "idle" => "idle3", + "pydoc" => "pydoc3", + "python" => "python3", + "python-config" => "python3-config", + }.each do |unversioned_name, versioned_name| + (libexec/"bin").install_symlink (bin/versioned_name).realpath => unversioned_name + end + end + + def xy + version.to_s[/^\d\.\d/] + end + + def post_install + ENV.delete "PYTHONPATH" + + # Fix up the site-packages so that user-installed Python software survives + # minor updates, such as going from 3.3.2 to 3.3.3: + + # Create a site-packages in HOMEBREW_PREFIX/lib/python#{xy}/site-packages + site_packages.mkpath + + # Symlink the prefix site-packages into the cellar. + site_packages_cellar.unlink if site_packages_cellar.exist? + site_packages_cellar.parent.install_symlink site_packages + + # Write our sitecustomize.py + rm_rf Dir["#{site_packages}/sitecustomize.py[co]"] + (site_packages/"sitecustomize.py").atomic_write(sitecustomize) + + # Remove old setuptools installations that may still fly around and be + # listed in the easy_install.pth. This can break setuptools build with + # zipimport.ZipImportError: bad local file header + # setuptools-0.9.8-py3.3.egg + rm_rf Dir["#{site_packages}/setuptools*"] + rm_rf Dir["#{site_packages}/distribute*"] + rm_rf Dir["#{site_packages}/pip[-_.][0-9]*", "#{site_packages}/pip"] + + %w[setuptools pip wheel].each do |pkg| + (libexec/pkg).cd do + system bin/"python3", "-s", "setup.py", "--no-user-cfg", "install", + "--force", "--verbose", "--install-scripts=#{bin}", + "--install-lib=#{site_packages}", + "--single-version-externally-managed", + "--record=installed.txt" + end + end + + rm_rf [bin/"pip", bin/"easy_install"] + mv bin/"wheel", bin/"wheel3" + + # Install unversioned symlinks in libexec/bin. + { + "easy_install" => "easy_install-#{xy}", + "pip" => "pip3", + "wheel" => "wheel3", + }.each do |unversioned_name, versioned_name| + (libexec/"bin").install_symlink (bin/versioned_name).realpath => unversioned_name + end + + # post_install happens after link + %W[pip3 pip#{xy} easy_install-#{xy} wheel3].each do |e| + (HOMEBREW_PREFIX/"bin").install_symlink bin/e + end + + # Help distutils find brewed stuff when building extensions + include_dirs = [HOMEBREW_PREFIX/"include"] + library_dirs = [HOMEBREW_PREFIX/"lib"] + + (lib_cellar/"distutils/distutils.cfg").atomic_write <<~EOS + [install] + prefix=#{HOMEBREW_PREFIX} + + [build_ext] + include_dirs=#{include_dirs.join ":"} + library_dirs=#{library_dirs.join ":"} + EOS + end + + def sitecustomize + <<~EOS + # This file is created by Homebrew and is executed on each python startup. + # Don't print from here, or else python command line scripts may fail! + # + import re + import os + import sys + + if sys.version_info[0] != 3: + # This can only happen if the user has set the PYTHONPATH for 3.x and run Python 2.x or vice versa. + # Every Python looks at the PYTHONPATH variable and we can't fix it here in sitecustomize.py, + # because the PYTHONPATH is evaluated after the sitecustomize.py. Many modules (e.g. PyQt4) are + # built only for a specific version of Python and will fail with cryptic error messages. + # In the end this means: Don't set the PYTHONPATH permanently if you use different Python versions. + exit('Your PYTHONPATH points to a site-packages dir for Python 3.x but you are running Python ' + + str(sys.version_info[0]) + '.x!\\n PYTHONPATH is currently: "' + str(os.environ['PYTHONPATH']) + '"\\n' + + ' You should `unset PYTHONPATH` to fix this.') + + # Only do this for a brewed python: + if os.path.realpath(sys.executable).startswith('#{rack}'): + # Shuffle /Library site-packages to the end of sys.path + library_site = '/Library/Python/#{xy}/site-packages' + library_packages = [p for p in sys.path if p.startswith(library_site)] + sys.path = [p for p in sys.path if not p.startswith(library_site)] + # .pth files have already been processed so don't use addsitedir + sys.path.extend(library_packages) + + # the Cellar site-packages is a symlink to the HOMEBREW_PREFIX + # site_packages; prefer the shorter paths + long_prefix = re.compile(r'#{rack}/[0-9\._abrc]+/Frameworks/Python\.framework/Versions/#{xy}/lib/python#{xy}/site-packages') + sys.path = [long_prefix.sub('#{site_packages}', p) for p in sys.path] + + # Set the sys.executable to use the opt_prefix, unless explicitly set + # with PYTHONEXECUTABLE: + if 'PYTHONEXECUTABLE' not in os.environ: + sys.executable = '#{opt_bin}/python#{xy}' + EOS + end + + def caveats + <<~EOS + Python has been installed as + #{HOMEBREW_PREFIX}/bin/python3 + + Unversioned symlinks `python`, `python-config`, `pip` etc. pointing to + `python3`, `python3-config`, `pip3` etc., respectively, have been installed into + #{opt_libexec}/bin + + You can install Python packages with + pip3 install + They will install into the site-package directory + #{HOMEBREW_PREFIX/"lib/python#{xy}/site-packages"} + + See: https://docs.brew.sh/Homebrew-and-Python + EOS + end + + test do + system bin/"pip3", "list", "--format=columns" + end +end diff --git a/Formula/minimal-racket.rb b/Formula/minimal-racket.rb index 6fc9521d87d76..e672af56e6842 100644 --- a/Formula/minimal-racket.rb +++ b/Formula/minimal-racket.rb @@ -9,6 +9,7 @@ class MinimalRacket < Formula sha256 "c16ada1784dafe74e56c4a860f310752060fb161a4acce72bd9f3ac9f85897f3" => :catalina sha256 "7b32a64228abada82c29a05e5bac3fc172b49adb2d86fa27f46665b416f1825b" => :mojave sha256 "a8d174fecc59249af342499b0a174d78f07bd4ea037cd71a177487b980579d7b" => :high_sierra + sha256 "64335ab620279f39ac776fa9f29827c7c157019bc3c5c634d45d2967da532804" => :x86_64_linux end uses_from_macos "libffi" diff --git a/Formula/minimodem.rb b/Formula/minimodem.rb index 50faa444298b2..e6ce58183a3cd 100644 --- a/Formula/minimodem.rb +++ b/Formula/minimodem.rb @@ -14,6 +14,7 @@ class Minimodem < Formula sha256 "1539133df2fe9f85e8dcdf56e2a62d5ae116861e6dbc3b02e45680fbf8a467a9" => :el_capitan sha256 "ac39bf2ca304ce0f513a037193aca0850cf3cafddf17cd40a2ac047e5f051db7" => :yosemite sha256 "bbd84e83ce1e3a2f7f257d5c8b5fafd998187aeeb78b5d98eeb4ca97fc90d00e" => :mavericks + sha256 "d875b60eec4018cc99a07ad82ef486fd1f6e5ffa6836c7a59fff0c5adde8561f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/minio-mc.rb b/Formula/minio-mc.rb index 40a2c9c05c9b4..808315f883684 100644 --- a/Formula/minio-mc.rb +++ b/Formula/minio-mc.rb @@ -11,6 +11,7 @@ class MinioMc < Formula sha256 "e3e9d880b26de8185b686342ec11066769a8b8d96ddeb8c12679f01a644bea97" => :catalina sha256 "36f68fb6f0e4e068cce1df13f1e4b3b0360e47ec01d1af4219f442c9f28723db" => :mojave sha256 "b3e3584fe6a7bded08a5ec2f4795b81f4d0f254599e5b36052502a0836c32e13" => :high_sierra + sha256 "f88e729e1d8806c6ef600cbf5c19dc21d7f75f2aea04a06659df2a7ccdd5621d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/minio.rb b/Formula/minio.rb index 6b4d766d57005..99e4c1ab2709c 100644 --- a/Formula/minio.rb +++ b/Formula/minio.rb @@ -11,6 +11,7 @@ class Minio < Formula sha256 "ba79ba5f2c0fdd6ac31d55c744e8a996783191ea315dac7d0d9e8dba19941457" => :catalina sha256 "1d9a7caf4476d2da50b3b2d45f9b58aec2259b735fb8cd5b7294c359bc49d8ad" => :mojave sha256 "a7f987fd63ece47af0fd5758abad0069bc250a9b557fde73720ee521fe2bdf79" => :high_sierra + sha256 "18e9971c2331bc247b7e51fc23557959a74dc3951bdda13fa4a42c87fa4c94d4" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/minised.rb b/Formula/minised.rb index f96af90709f00..0b3c0e74f1ffa 100644 --- a/Formula/minised.rb +++ b/Formula/minised.rb @@ -14,6 +14,7 @@ class Minised < Formula sha256 "4f33f6d39c9190899cf04857f70481ffd57996daf5001cad661ae0ea7f002a88" => :el_capitan sha256 "d169d87a77fe06c1190065e502e84fc3f3b3714cdc98a1235c78033a41e6a292" => :yosemite sha256 "505d4a7dcb7deeef34344f72b7c7801f90e2c38393add6e2bc41a6434c3fd899" => :mavericks + sha256 "4f10daa3133cd31430b2d5b82e6efeff11e5907fccd21a0823b75414a6eeeef5" => :x86_64_linux end def install diff --git a/Formula/miniserve.rb b/Formula/miniserve.rb index 7b09e0acdacf7..d1be641eaa1d9 100644 --- a/Formula/miniserve.rb +++ b/Formula/miniserve.rb @@ -11,6 +11,7 @@ class Miniserve < Formula sha256 "e8955f888b8c0828d741d5541a2ae6567704d78db99600d59b3d9a02dc571089" => :mojave sha256 "8711ae0bb727abd3ed3ad8d1335275d26fbc473f19bacfbad76b10b5a0bf4efc" => :high_sierra sha256 "a00b82cfce9fecd067b62ec3135a0e9cc59d3133f97ed3c0e7b815e4921c32d0" => :sierra + sha256 "567ea39868cd884189324c9a8558cd84af45e3b252631d9df3083ebfed5d3d47" => :x86_64_linux end depends_on "rust" diff --git a/Formula/miniupnpc.rb b/Formula/miniupnpc.rb index 0d7b2e95f5a15..44f68817964d5 100644 --- a/Formula/miniupnpc.rb +++ b/Formula/miniupnpc.rb @@ -11,6 +11,7 @@ class Miniupnpc < Formula sha256 "266556f31f0430f41a1d64b3fb96daea2a4804b1a85c4486c5e39de0f2808d35" => :high_sierra sha256 "ed39714d275ffb083e29c72b3a5d9142c0a4081fb8c8479950f71bbddbe5d196" => :sierra sha256 "b65b947374b703c4473c6f4daa74090181c7372e4b2d663a05890f988605eab9" => :el_capitan + sha256 "4b4163403ad69516b8a598c388de2f3662564405288576bf87605f79dbbeddf3" => :x86_64_linux end def install diff --git a/Formula/minizinc.rb b/Formula/minizinc.rb index d7da3df5f9cff..df8fc77680705 100644 --- a/Formula/minizinc.rb +++ b/Formula/minizinc.rb @@ -10,6 +10,7 @@ class Minizinc < Formula sha256 "ac8a3708d18b387b114d96c11c689c0578e3d0119d6d86c491675759e6e7d4f7" => :catalina sha256 "c08c60f5bb8d063262f6c787ab7c5ad7a44d2f42aa0be2b783f20d4f6effac11" => :mojave sha256 "41f9a16e2ced9b258ff971a301b03a03a09b691f04917478a79239cdacb6b706" => :high_sierra + sha256 "7aa487922a6c63e7ebfd3cbf3e29b0001be1042c8a416c90e373074ff770c9e8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/minizip.rb b/Formula/minizip.rb index 0d6d4ef5079c2..f9a4835cf304c 100644 --- a/Formula/minizip.rb +++ b/Formula/minizip.rb @@ -11,6 +11,7 @@ class Minizip < Formula sha256 "503832d6da09e7f16b7036ee1cf3055c25ba3602d3ea9815a9800d1840fb69ea" => :mojave sha256 "9fa636770888ef4e9aaa3c1bbf2d3c18fb0e4c393305c2ecf265ca79ecee6e71" => :high_sierra sha256 "83e4b5b1b52ff484a0ba73637e0961ed3d41ecba4ee3c3cfe667d13ef7e51ad7" => :sierra + sha256 "d6b3ab9a792e8f5335e2bf34a859c701acb9c506cea1ac8c6e878f60dc5036e8" => :x86_64_linux end depends_on "autoconf" => :build @@ -28,10 +29,12 @@ def install cd "contrib/minizip" do # edits to statically link to libz.a - inreplace "Makefile.am" do |s| - s.sub! "-L$(zlib_top_builddir)", "$(zlib_top_builddir)/libz.a" - s.sub! "-version-info 1:0:0 -lz", "-version-info 1:0:0" - s.sub! "libminizip.la -lz", "libminizip.la" + if OS.mac? + inreplace "Makefile.am" do |s| + s.sub! "-L$(zlib_top_builddir)", "$(zlib_top_builddir)/libz.a" + s.sub! "-version-info 1:0:0 -lz", "-version-info 1:0:0" + s.sub! "libminizip.la -lz", "libminizip.la" + end end system "autoreconf", "-fi" system "./configure", "--prefix=#{prefix}" diff --git a/Formula/mint.rb b/Formula/mint.rb index d6fb8582c91a0..53f1c29e9d201 100644 --- a/Formula/mint.rb +++ b/Formula/mint.rb @@ -10,7 +10,7 @@ class Mint < Formula sha256 "f70e96558839243a845c67f15defbd8718ad5a9e094ae1c1b998ac9faf4399b0" => :mojave end - depends_on :xcode => ["10.2", :build] + depends_on :xcode => ["10.2", :build] if OS.mac? def install system "make", "install", "PREFIX=#{prefix}" diff --git a/Formula/minuit2.rb b/Formula/minuit2.rb index 23274f17fbb6d..31751cca6f080 100644 --- a/Formula/minuit2.rb +++ b/Formula/minuit2.rb @@ -14,6 +14,7 @@ class Minuit2 < Formula sha256 "7457852262758583daca3f23ac3e6fa312fe0a3fd84f0b20da2081967124a0fc" => :el_capitan sha256 "32ff2d05e0a85b28513789e1f625e654f2141b80202f506ad0f7721caab95ddd" => :yosemite sha256 "e2b2aba706d32238723ee7aaba7e4c536d68a6979b01c67e944bb34039653f40" => :mavericks + sha256 "21d0ab80dd54743416711d524d9b6ab32cba585f7e5784362a32efd4a5710073" => :x86_64_linux end def install diff --git a/Formula/mit-scheme.rb b/Formula/mit-scheme.rb index e644c9001c732..fc0a0a2c010e6 100644 --- a/Formula/mit-scheme.rb +++ b/Formula/mit-scheme.rb @@ -14,7 +14,7 @@ class MitScheme < Formula # Has a hardcoded compile check for /Applications/Xcode.app # Dies on "configure: error: SIZEOF_CHAR is not 1" without Xcode. # https://github.com/Homebrew/homebrew-x11/issues/103#issuecomment-125014423 - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "openssl@1.1" resource "bootstrap" do diff --git a/Formula/mitmproxy.rb b/Formula/mitmproxy.rb index eb4a1a2601441..d0cfe1132f8e8 100644 --- a/Formula/mitmproxy.rb +++ b/Formula/mitmproxy.rb @@ -5,6 +5,7 @@ class Mitmproxy < Formula homepage "https://mitmproxy.org" url "https://github.com/mitmproxy/mitmproxy/archive/v5.1.1.tar.gz" sha256 "555bbe9612e01d41858fbbe9f5d841b65bef3ac989ec26bb5c4c3d12a19dd57c" + revision 1 unless OS.mac? head "https://github.com/mitmproxy/mitmproxy.git" bottle do @@ -12,11 +13,17 @@ class Mitmproxy < Formula sha256 "f4760f88345a950aec6fcb46177ec243c8f41b023fcafb9ce831cf2fa3ff27f9" => :catalina sha256 "19c5b3c7dd7d1aed811659a1aefd514965a4656d6cf3a7196a0ce3f3d0c9d522" => :mojave sha256 "6d43b715648d8998795f843fde02be9ef19b14bc42f27ccbd0d4296e8689e277" => :high_sierra + sha256 "63534d4f92928a27754f3faca8425b881756b0b088b05a94ce1a44e4e8e869d9" => :x86_64_linux end depends_on "openssl@1.1" depends_on "protobuf" depends_on "python@3.8" + unless OS.mac? + depends_on "libffi" + # pkg-config helps setuptools find libffi + depends_on "pkg-config" => :build + end resource "asn1crypto" do url "https://files.pythonhosted.org/packages/9f/3d/8beae739ed8c1c8f00ceac0ab6b0e97299b42da869e24cf82851b27a9123/asn1crypto-1.3.0.tar.gz" diff --git a/Formula/mjpegtools.rb b/Formula/mjpegtools.rb index 4a55f1ec7873a..7b066e72d9d69 100644 --- a/Formula/mjpegtools.rb +++ b/Formula/mjpegtools.rb @@ -13,6 +13,7 @@ class Mjpegtools < Formula sha256 "9f5c0eb81540bf70ff8b2352a8ea21117a75c6dbdac58ea8d04d0da47a639cb9" => :sierra sha256 "2793d05c642305daeb9cceb10f08484ce57d5210a3918121ab04be1f89224142" => :el_capitan sha256 "ba1ec63066197a9bb7fc53f075b17d66f739936b151e90e39a741b33f19eaa9f" => :yosemite + sha256 "b57ddde58c27c8780a633c717c657ba913d6fdeee6086fa7b981d1120820606a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/mk-configure.rb b/Formula/mk-configure.rb index 3e3109538cc21..d9bdc701bd096 100644 --- a/Formula/mk-configure.rb +++ b/Formula/mk-configure.rb @@ -9,6 +9,7 @@ class MkConfigure < Formula sha256 "6953adbce89d8a07e95d89431881dbc3bf100e5de24ade46c409740db728fe8b" => :catalina sha256 "59821ba5bb3b8801fe52e309813b4edec6615a9698de164364ca8e723fa2ecb9" => :mojave sha256 "762f92188096b5c68bf6696a86310e6893829a67ca1bc3bf404fa931c6a7f48b" => :high_sierra + sha256 "15a56bdbdb4fe5cda1e81f668569c9ad922af3d4b9c8ec4c5b18f4271b86c5f8" => :x86_64_linux end depends_on "bmake" diff --git a/Formula/mkcert.rb b/Formula/mkcert.rb index 91aa14fab33c1..8696f84c768b0 100644 --- a/Formula/mkcert.rb +++ b/Formula/mkcert.rb @@ -9,6 +9,7 @@ class Mkcert < Formula sha256 "b7cc76858dc35c6d3aabb07242ab6f5f079c4cb85deea4a9f66114528980914b" => :catalina sha256 "9100c7f044d91e6ca0c483ed572217de28daa34c04fa6e2a130116175ba162e9" => :mojave sha256 "f7d3255bc7f40e66bc75fd6ebfacc6b02c91514f412de9cf4b85b0d332bc4931" => :high_sierra + sha256 "7f63bb06a04836755cbbf3bd67a31da71e4cf6e55f2d52a93445fdc1db4525d4" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/mkclean.rb b/Formula/mkclean.rb index e6cfa7f42bc30..5653d7a56da2e 100644 --- a/Formula/mkclean.rb +++ b/Formula/mkclean.rb @@ -11,6 +11,7 @@ class Mkclean < Formula sha256 "eb519c8f3fb9b2773529d5e7a9751cec7e2a7a67a76af92cab0e6b48449dc6de" => :high_sierra sha256 "73e502b5331d28da40fc3b94763f6ea30a141e48329bede7eddf3e396991671b" => :sierra sha256 "a5db5b2309de19ea395efaafcf828c253e38133464faca623545a221f2b0ba52" => :el_capitan + sha256 "d6842897a02e0fc4d4e7ca046e1f41aaefebb13bceb324aabd2fbf1d96f6c024" => :x86_64_linux end # Fixes compile error with Xcode-4.3+, a hardcoded /Developer. Reported as: diff --git a/Formula/mkdocs.rb b/Formula/mkdocs.rb index 135fc70b8ad2f..78ba7161ca16c 100644 --- a/Formula/mkdocs.rb +++ b/Formula/mkdocs.rb @@ -11,6 +11,7 @@ class Mkdocs < Formula sha256 "3f45e40b1f8cb82988b294a9a44c57b33fcfcc718b4130b2aa684ba6b95fa08f" => :catalina sha256 "456b37b9de877e5bf5836337075add02d844169aa28dd39c3d42c69b04b887a0" => :mojave sha256 "9f8fbedf9f950579f4c6496807ff8de30d47b117ea76877ada80133f9fd795ee" => :high_sierra + sha256 "3cc973810d35b47a58b1ec718c1cfcdb8c50747873d4ef1e25205b4d6e5d13ac" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/mksh.rb b/Formula/mksh.rb index 5c222ff4696ac..d7584a2fff9c0 100644 --- a/Formula/mksh.rb +++ b/Formula/mksh.rb @@ -9,6 +9,7 @@ class Mksh < Formula sha256 "2f558d90c4feae917f31026ba75dd757d5dca170c819320a2a3595bec487a17a" => :catalina sha256 "e957fc3249181ba27dc58a60835a7e08ac8de137c9e7addc7e5ffd845214083c" => :mojave sha256 "09b3570614ce07378456c65ce5a9698cd92fbd794cfceab8b056f3d22bc9d577" => :high_sierra + sha256 "b30edfc71c5d60c269190f42d1af89bf3f5f250b42ea928a1d90396e9a21dd4e" => :x86_64_linux end def install diff --git a/Formula/mktorrent.rb b/Formula/mktorrent.rb index f7811142695cf..860b9c913558d 100644 --- a/Formula/mktorrent.rb +++ b/Formula/mktorrent.rb @@ -11,6 +11,7 @@ class Mktorrent < Formula sha256 "22bc8649ce5fea25549610eec4110d45f3fa1d05335cfc982df82806ff34d71b" => :mojave sha256 "60be732dfea657c6faffa7e9d644f6ade7f974e7fea6ec46fa2941baac5eee80" => :high_sierra sha256 "3e7f91587dbea47713351b40a99b50728a878a9eb720eca14bd125541e62606f" => :sierra + sha256 "425b126bd8bc925e4ddaf214cca4fc6399f4dfaff25be70b736919e001c2bf47" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/mkvalidator.rb b/Formula/mkvalidator.rb index 365781ffc760e..e16f89fcc029f 100644 --- a/Formula/mkvalidator.rb +++ b/Formula/mkvalidator.rb @@ -11,6 +11,7 @@ class Mkvalidator < Formula sha256 "5f0c85894cd7d4a7c5cdce1e26c5cc7c15ac7baa6c32a63e3474632f7727d8af" => :high_sierra sha256 "5f0c85894cd7d4a7c5cdce1e26c5cc7c15ac7baa6c32a63e3474632f7727d8af" => :sierra sha256 "6c253cdf3c824b6e37af7cca51bf05a930785286bc83ec367e10500d9645519c" => :el_capitan + sha256 "a2a885db355b402fb299ee9e3e47b986eb1b8ea9b674f63b83c5fc9646848707" => :x86_64_linux end resource "tests" do diff --git a/Formula/mkvtoolnix.rb b/Formula/mkvtoolnix.rb index 44be41fb5a0f0..dab3dcc79555f 100644 --- a/Formula/mkvtoolnix.rb +++ b/Formula/mkvtoolnix.rb @@ -35,6 +35,8 @@ class Mkvtoolnix < Formula uses_from_macos "ruby" => :build def install + ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" unless OS.mac? + ENV.cxx11 features = %w[flac libebml libmagic libmatroska libogg libvorbis] diff --git a/Formula/mlkit.rb b/Formula/mlkit.rb index a15983b72d84f..9cb31d9cc1119 100644 --- a/Formula/mlkit.rb +++ b/Formula/mlkit.rb @@ -9,6 +9,7 @@ class Mlkit < Formula sha256 "52ac5d00915774111535053f287c05a63976c83ed7a5a900bbc263f030ea6900" => :mojave sha256 "79694e15c915cb2c08b680b2b4404cfbbb6fff56e8f6b5f0196fcc485466d41b" => :high_sierra sha256 "5df6b95fad69e10b31352824433251d3306a42c55c5e7164b0c47b986ea1009d" => :sierra + sha256 "2cc9e05e6be9422537cd979c898f910d7ed3c8eb7804394be8529fbd5a938a85" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/mlogger.rb b/Formula/mlogger.rb index aa37def745bac..3ebca52c5f225 100644 --- a/Formula/mlogger.rb +++ b/Formula/mlogger.rb @@ -12,6 +12,7 @@ class Mlogger < Formula sha256 "1f7392a3d16a2bf595487a4b35bf5c866fa00c0967629eef46f07cbf6e696ff4" => :sierra sha256 "e1f78a9ef569085efcac8c41bd2a70feda85e7fcba5eb7b46a9ee5341cf8cb2d" => :el_capitan sha256 "f64331a815b26047bc982340650aae806a568a10060adfc819e25d077059af2e" => :yosemite + sha256 "5e14ef214b719ce23d386b70e3a08c821737428b2e3d8ecacfd3d2e219e6a748" => :x86_64_linux end def install diff --git a/Formula/mlton.rb b/Formula/mlton.rb index b6ece51565622..0605d068d702e 100644 --- a/Formula/mlton.rb +++ b/Formula/mlton.rb @@ -12,6 +12,7 @@ class Mlton < Formula sha256 "e4d9e5fec0e55d60bdc81cd6ffc97183ba8cd5c66c78fedcaa0a4272d582144c" => :catalina sha256 "2749da8835666e447d6b8ab53046efe6ae8dbc9d85c2183c1fd69138a3988e91" => :mojave sha256 "8a759cb940cabd8f547da4eb0d408b466c2afcea6e2ecf76691616885583cca9" => :high_sierra + sha256 "01667c176396f0ef84c56fb1fcc1593d0dd9a4c6f097f797ced4d67ead4a7b21" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/mm-common.rb b/Formula/mm-common.rb index c976110c08997..ea831a97f0bc5 100644 --- a/Formula/mm-common.rb +++ b/Formula/mm-common.rb @@ -9,6 +9,7 @@ class MmCommon < Formula sha256 "d7a3510229c192e7aad13d7099a922ad2626eb9edccefc5428cb62dc6eb3b31e" => :catalina sha256 "bba33c2217224dc5a3ed1c091201db2c3cf5ce1a497ec690e39eb63fedb63116" => :mojave sha256 "bba33c2217224dc5a3ed1c091201db2c3cf5ce1a497ec690e39eb63fedb63116" => :high_sierra + sha256 "3675a45208e88f8f78ebc1d97d90f46f8096436d08b7bdad6e536efb7edef50a" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/mmark.rb b/Formula/mmark.rb index 908bdd6e21faf..1c39b453d7a3a 100644 --- a/Formula/mmark.rb +++ b/Formula/mmark.rb @@ -9,6 +9,7 @@ class Mmark < Formula sha256 "d32daeffa0d39c6a035fffc346b76d43f4a5976c75d8c1860b57e2a6ea2a3919" => :catalina sha256 "a546cd07a4a8337a4371f91c1711b1c359760177e8f03a81f9e501864efc0a17" => :mojave sha256 "a546cd07a4a8337a4371f91c1711b1c359760177e8f03a81f9e501864efc0a17" => :high_sierra + sha256 "b25c812fa193919af30e57caaaa82b69020a1f38080b275cc124b5b673c40c7d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/mmctl.rb b/Formula/mmctl.rb index 4a155f4296358..f99423294d84c 100644 --- a/Formula/mmctl.rb +++ b/Formula/mmctl.rb @@ -11,6 +11,7 @@ class Mmctl < Formula sha256 "fcaa45d467dfe23b1416194abf9f925a2d0ba8f964ede6a9a5f3158e321261e8" => :catalina sha256 "b26a63c5ff5f6b4c77cbfd9e8ea19b7891db87a3181771191062bb53a66e8286" => :mojave sha256 "e7336db2804579040d3fb43e2afeecb1bcd3e4f500b7d3fe47a98612d96ffbde" => :high_sierra + sha256 "4ecfc9f88c81a40bffe06993807f92f79d16a9da87a9b9d3cfeb4ef0a033fa9b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/mmix.rb b/Formula/mmix.rb index 3d48b4ec1cec6..d0ab29498967e 100644 --- a/Formula/mmix.rb +++ b/Formula/mmix.rb @@ -12,6 +12,7 @@ class Mmix < Formula sha256 "b694920e61edf2dec094618910be78fcd4fbbcad22d4d37363555aad38ee0af0" => :sierra sha256 "c1e8e0d2d627b3ab2c2c68a8b358981dab07466c3c70f3a2e4df8557006deb92" => :el_capitan sha256 "7675c2bc1253e4da2a126d52942449f71cabdd83c39874403d449b5a05ceb145" => :yosemite + sha256 "f5f86dd7a3adf348bd5738818a343121e697f16c28a2d161b20d47aca5e997a5" => :x86_64_linux end depends_on "cweb" => :build diff --git a/Formula/mmseqs2.rb b/Formula/mmseqs2.rb index c4a056b598a49..e57cba54f48a4 100644 --- a/Formula/mmseqs2.rb +++ b/Formula/mmseqs2.rb @@ -8,16 +8,19 @@ class Mmseqs2 < Formula head "https://github.com/soedinglab/MMseqs2.git" bottle do - cellar :any_skip_relocation + cellar :any sha256 "9bc41128722a0a926cc30fca2cfb29574bb150deb8acc482cd61e7e49e8169fb" => :catalina sha256 "789fa0f2f9bef66df73de586236dbffb037f8a32794e47768818d1fc732c05e2" => :mojave sha256 "d3f8b1a3ba35b0af1e80a0a917d915e8c19ea542bde20879c3031f1138af55aa" => :high_sierra + sha256 "7519f977046e943cb9fa6cffd985e18ee2217ca85ce26f453b8a13451f156803" => :x86_64_linux end depends_on "cmake" => :build - depends_on "libomp" + depends_on "libomp" if OS.mac? depends_on "wget" + depends_on "gawk" unless OS.mac? + uses_from_macos "bzip2" uses_from_macos "zlib" @@ -31,12 +34,14 @@ def install args << "-DVERSION_OVERRIDE=#{version}" args << "-DHAVE_SSE4_1=1" - libomp = Formula["libomp"] - args << "-DOpenMP_C_FLAGS=-Xpreprocessor\ -fopenmp\ -I#{libomp.opt_include}" - args << "-DOpenMP_C_LIB_NAMES=omp" - args << "-DOpenMP_CXX_FLAGS=-Xpreprocessor\ -fopenmp\ -I#{libomp.opt_include}" - args << "-DOpenMP_CXX_LIB_NAMES=omp" - args << "-DOpenMP_omp_LIBRARY=#{libomp.opt_lib}/libomp.a" + if OS.mac? + libomp = Formula["libomp"] + args << "-DOpenMP_C_FLAGS=-Xpreprocessor\ -fopenmp\ -I#{libomp.opt_include}" + args << "-DOpenMP_C_LIB_NAMES=omp" + args << "-DOpenMP_CXX_FLAGS=-Xpreprocessor\ -fopenmp\ -I#{libomp.opt_include}" + args << "-DOpenMP_CXX_LIB_NAMES=omp" + args << "-DOpenMP_omp_LIBRARY=#{libomp.opt_lib}/libomp.a" + end system "cmake", ".", *args system "make", "install" diff --git a/Formula/mmsrip.rb b/Formula/mmsrip.rb index 239149ed54031..a818104854fb1 100644 --- a/Formula/mmsrip.rb +++ b/Formula/mmsrip.rb @@ -13,6 +13,7 @@ class Mmsrip < Formula sha256 "b4578327661828737b3aa71615806ba6e2781d7c0815a12815023242ac80e598" => :sierra sha256 "cf0bc6b407f4861b174eddf55ae5da45330d37abc428013ca19f173d36a96d2a" => :el_capitan sha256 "07f4c9d5a84bb52e3c799ebe7c395a4939c0c7ac5dff0fb46e2ce84abd9b5417" => :yosemite + sha256 "9ed45d0ce16dd4be2c154a17c5963b3b52733c1622c061f74b8c4c20f131fe76" => :x86_64_linux end def install diff --git a/Formula/mmv.rb b/Formula/mmv.rb index 1618befaf6833..a5c5888853b82 100644 --- a/Formula/mmv.rb +++ b/Formula/mmv.rb @@ -14,6 +14,7 @@ class Mmv < Formula sha256 "e22f894e1224e3c0f85257c5b4db11ed1095b5a2117f48f38653b22a3d395fe4" => :el_capitan sha256 "4e921612e3edb452f6a67f41248247d1c5b60aa22ad17d632cd43e62f5d77084" => :yosemite sha256 "ad6205419a88e181be9bc8c107b5cd366bb0a60bf4b4b2ec5b3457c64f8060c0" => :mavericks + sha256 "44803efa99a3fb3d84f3303bf8ad5bf016d4e20d9604254226b2376a068dde8b" => :x86_64_linux end patch do diff --git a/Formula/moc.rb b/Formula/moc.rb index 5bf52096aeb23..577e0c956e7e0 100644 --- a/Formula/moc.rb +++ b/Formula/moc.rb @@ -42,6 +42,7 @@ class Moc < Formula sha256 "8a570805d563e3ee3d4c374eb5a8e5d649b7364286e738f9d8bef864663073e1" => :high_sierra sha256 "fe941dffd41e1485f85b3d9bb28a1a30cccfe27d3cac438cc5b71fb347122003" => :sierra sha256 "9e39666cb49b6fd60c16b1b4535d0b39363fcc655e6495cc17d74923df13ff27" => :el_capitan + sha256 "eafb9b84536d14377f7ba39e24fdf6fc86d79c3ab288bdeaad154636ddf7e312" => :x86_64_linux end head do diff --git a/Formula/modd.rb b/Formula/modd.rb index 6946a9a13ce00..ad39fbfc8df2e 100644 --- a/Formula/modd.rb +++ b/Formula/modd.rb @@ -11,12 +11,13 @@ class Modd < Formula sha256 "d1b77821aff14d108379646434442ec9ca4869ec50867083c8e109c35dfb5095" => :mojave sha256 "9dab505f6322b00919c69a8b396b25efb04f38341d2113c0681e6d12181b13d0" => :high_sierra sha256 "165da808127db6197c4dd7e4b527118baf29aa74747d9c7ae84cad47d1bd8e79" => :sierra + sha256 "d69e6cffb1157283b4d975dc8c1b9ef1d3065ec4b7c513fc66a1d018e1dfc195" => :x86_64_linux end depends_on "go" => :build def install - ENV["GOOS"] = "darwin" + ENV["GOOS"] = OS.mac? ? "darwin" : "linux" ENV["GOARCH"] = "amd64" ENV["GOPATH"] = buildpath ENV["GOBIN"] = bin diff --git a/Formula/modules.rb b/Formula/modules.rb index 9ba037dc51013..e4ad6b90187d5 100644 --- a/Formula/modules.rb +++ b/Formula/modules.rb @@ -5,18 +5,30 @@ class Modules < Formula sha256 "8d9829905f79d379c2cf753c7fe6f7be1188853e859f81b44f5116337e8f49d9" bottle do - cellar :any + cellar :any_skip_relocation sha256 "0eff45eac8ca106c0682606a4e20e134dbdf0c76ff9273984a88fc48744a8190" => :catalina sha256 "45dcef5e8a7e67b96b25cae336343eee677a699afff66ea4039742d1d6599d74" => :mojave sha256 "06b3c839f16bda9ebdac25ea1519533994fdb84dd89dfe6de8f56fe685508765" => :high_sierra + sha256 "28e61cfd912321fa72ef7c6aeb2d739263c062d6f3c29b6972f7983b80a54c37" => :x86_64_linux + end + + unless OS.mac? + depends_on "tcl-tk" + depends_on "less" end def install + tcl = OS.mac? ? "#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework" : Formula["tcl-tk"].opt_lib + with_tclsh = OS.mac? ? "" : "--with-tclsh=#{Formula["tcl-tk"].opt_bin}/tclsh" + with_pager = OS.mac? ? "" : "--with-pager=#{Formula["less"].opt_bin}/less" + args = %W[ --disable-dependency-tracking --prefix=#{prefix} --datarootdir=#{share} - --with-tcl=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework + --with-tcl=#{tcl} + #{with_tclsh} + #{with_pager} --without-x ] system "./configure", *args @@ -34,7 +46,11 @@ def caveats test do assert_match "restore", shell_output("#{bin}/envml --help") - output = shell_output("zsh -c 'source #{prefix}/init/zsh; module' 2>&1") + output = if OS.mac? + shell_output("zsh -c 'source #{prefix}/init/zsh; module' 2>&1") + else + shell_output("sh -c '. #{prefix}/init/sh; module' 2>&1") + end assert_match version.to_s, output end end diff --git a/Formula/moe.rb b/Formula/moe.rb index 364e72314d450..6c245538d9f67 100644 --- a/Formula/moe.rb +++ b/Formula/moe.rb @@ -10,6 +10,7 @@ class Moe < Formula sha256 "934ee30ec5f7f95c74183e5faf6ccc7ac36c426747476a5a0fb9628a6169de04" => :mojave sha256 "fdfffe18871a25a5f0a8cf86ac8682f2cc6623dea335575d39f1dd529ee2ae46" => :high_sierra sha256 "f83a8e961f1a7d295741a6abfe7434580761fa485e32498327ffb0e09322fa1e" => :sierra + sha256 "71f249dbe17472ee2b4b0769f29c1a055af301b4561d3cde12440b737adb18e1" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/mogenerator.rb b/Formula/mogenerator.rb index 8df87dfba7c47..0536229824c68 100644 --- a/Formula/mogenerator.rb +++ b/Formula/mogenerator.rb @@ -13,7 +13,9 @@ class Mogenerator < Formula sha256 "aadafc4a282f98739d296f105f24c94666c90417f92c05644fd965dbb42aa37d" => :sierra end - depends_on :xcode => :build + on_macos do + depends_on :xcode => :build + end def install xcodebuild "-target", "mogenerator", "-configuration", "Release", "SYMROOT=symroot", "OBJROOT=objroot" diff --git a/Formula/molecule.rb b/Formula/molecule.rb index afa2ce151572f..e0341c17fa2c4 100644 --- a/Formula/molecule.rb +++ b/Formula/molecule.rb @@ -11,14 +11,18 @@ class Molecule < Formula sha256 "7a5c0719f10cf8fb407a36a66dfbaf875c465278d8ad72264563f480764d55d8" => :catalina sha256 "90688bf741045d1471d5ff2159924a6a78e4d53e85e5eaee15b28328540899ca" => :mojave sha256 "f60c6c6614a5df0032b4b9f7de5775542608c925cef98c7cc9f4b31dc39ec0fc" => :high_sierra + sha256 "312ee948e145bf009d7ffa2cd4551628779511015f690db8b39be257fedf5d20" => :x86_64_linux end depends_on "ansible" depends_on "openssl@1.1" depends_on "python@3.8" + uses_from_macos "libffi" + on_linux do depends_on "pkg-config" => :build + depends_on "gmp" end # Collect requirements from: diff --git a/Formula/mon.rb b/Formula/mon.rb index 7b12eec1c9ac7..42d9f12817590 100644 --- a/Formula/mon.rb +++ b/Formula/mon.rb @@ -13,6 +13,7 @@ class Mon < Formula sha256 "0d22815460538deda7a6a979d0b7dcdf38124ed9473764f6a90d8252cb9bf1aa" => :sierra sha256 "4f2d05a85fac75167df3a445a0803f7d5eddb2bacf967b10738db5066955024a" => :el_capitan sha256 "b446ffbcff634978ff036de6b5585d29e11a6b38604fa78268c7717819250a0f" => :mavericks + sha256 "b5dc95af7db0ef217f36b2d8886390bcede384108ccb51b22a443cfe49a0f288" => :x86_64_linux end def install diff --git a/Formula/mongo-c-driver.rb b/Formula/mongo-c-driver.rb index 4bda5d6d45437..cb0cf28e05ace 100644 --- a/Formula/mongo-c-driver.rb +++ b/Formula/mongo-c-driver.rb @@ -10,11 +10,13 @@ class MongoCDriver < Formula sha256 "bb6ab84a6dc183139d0f3fd2f8680094812fb9465858c4ddfd6a0479e9f6453f" => :catalina sha256 "9fb343166799b012645fa0f031f81ec068ab5f196b60ddab201b0bb2446fe218" => :mojave sha256 "2030cb7799a73518a952ee5b59348cbd90e52c56f41af0eb427a9edf3392da0e" => :high_sierra + sha256 "b2750fb7dc7c3cee8c8921711c739a930f8e1229cf68e1e4553ee99143e75038" => :x86_64_linux end depends_on "cmake" => :build depends_on "pkg-config" => :build depends_on "sphinx-doc" => :build + depends_on "openssl@1.1" unless OS.mac? uses_from_macos "zlib" diff --git a/Formula/mongo-cxx-driver.rb b/Formula/mongo-cxx-driver.rb index 03318118ca2b9..d963f50b59a9e 100644 --- a/Formula/mongo-cxx-driver.rb +++ b/Formula/mongo-cxx-driver.rb @@ -10,6 +10,7 @@ class MongoCxxDriver < Formula sha256 "dc2851f80300a7e98efbca1943ed38ec8041af38443558b7e45273add8de9695" => :catalina sha256 "d02839391a9fcd20c69442be2bd00a7c23bc604e4b1ce7828b7f9a4596debb66" => :mojave sha256 "0b14ae6bcc3279d9257b89c8b5e3508876f8adbdb7a9bc67bff1f988ba7f0ee2" => :high_sierra + sha256 "9f2cf0ec6e40d8052e13864bb7c58cc723f5c6ce54689a3a133da85ed6ce172c" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/mongo-orchestration.rb b/Formula/mongo-orchestration.rb index e41377c45c124..ce080d9af5034 100644 --- a/Formula/mongo-orchestration.rb +++ b/Formula/mongo-orchestration.rb @@ -12,6 +12,7 @@ class MongoOrchestration < Formula sha256 "33576a232a292049ed59ff028ce32bfd14e770742d2156cc04ee26cf20cb45ff" => :catalina sha256 "cb16ab4631efca5cb55fa62e45b84d274169d432964ecef16c34e49380a636f7" => :mojave sha256 "0f068f4639a7e4f7686bf5b6a80bd08b32e2ef4514dcecb4fbfb3dcd86c379be" => :high_sierra + sha256 "59826908c01cb8dd8976953f49f691110adffb673b025f495b9875fb2cc3cd36" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/mongoose.rb b/Formula/mongoose.rb index ca3af3db16672..b56f24cda26a8 100644 --- a/Formula/mongoose.rb +++ b/Formula/mongoose.rb @@ -9,6 +9,7 @@ class Mongoose < Formula sha256 "3eb55e73c26957e647dcc4f978fa7d4d5ae2b223fa631d208f07b341d26ac0d5" => :catalina sha256 "cb43e1b9e539db8348d6038fbe56ca787b02428f3c585cd0528c3c4521a26222" => :mojave sha256 "a65aaee3abb441a26728b8f08c5fa81845f5636d676fadaba5881da4da04ee71" => :high_sierra + sha256 "8ad47a4321a082f6739ab1085448ba54ca488cd5afc45d5c60e814f3ff4af31f" => :x86_64_linux end depends_on "openssl@1.1" @@ -23,9 +24,15 @@ def install bin.install "simplest_web_server" => "mongoose" end - system ENV.cc, "-dynamiclib", "mongoose.c", "-o", "libmongoose.dylib" + if OS.mac? + system ENV.cc, "-dynamiclib", "mongoose.c", "-o", "libmongoose.dylib" + lib.install "libmongoose.dylib" + else + system ENV.cc, "-fPIC", "-c", "mongoose.c" + system ENV.cc, "-shared", "-Wl,-soname,libmongoose.so", "-o", "libmongoose.so", "mongoose.o", "-lc", "-lpthread" + lib.install "libmongoose.so" + end include.install "mongoose.h" - lib.install "libmongoose.dylib" pkgshare.install "examples", "jni" doc.install Dir["docs/*"] end diff --git a/Formula/mongrel2.rb b/Formula/mongrel2.rb index 74ee24fcf2053..83bdcd193289c 100644 --- a/Formula/mongrel2.rb +++ b/Formula/mongrel2.rb @@ -23,6 +23,7 @@ class Mongrel2 < Formula sha256 "7a6880cbc814b084a3ac91e379b7a720438951e31a18119c232f976fded229c3" => :el_capitan sha256 "0b2926fe3d79ab934e95f0e5c067e8bb23b6900b99255482defee9388a0dee07" => :yosemite sha256 "dd07092a2384c243fcd8c54ed67f2a728f3da698276540fc1c9b201eb3c5cbbb" => :mavericks + sha256 "ba23cfd286e198728a95b4d44c7466c2c8acba12e2951d88dd8eb4c7e996ed3a" => :x86_64_linux # glibc 2.19 end depends_on "zeromq" @@ -36,7 +37,7 @@ def install # Mongrel2 pulls from these ENV vars instead ENV["OPTFLAGS"] = "#{ENV.cflags} #{ENV.cppflags}" - ENV["OPTLIBS"] = "#{ENV.ldflags} -undefined dynamic_lookup" + ENV["OPTLIBS"] = "#{ENV.ldflags} -undefined dynamic_lookup" if OS.mac? system "make", "all" system "make", "install", "PREFIX=#{prefix}" diff --git a/Formula/mongroup.rb b/Formula/mongroup.rb index 2731c6eb9e0dc..8b4aa867d83a5 100644 --- a/Formula/mongroup.rb +++ b/Formula/mongroup.rb @@ -13,6 +13,7 @@ class Mongroup < Formula sha256 "d3065cb969df510f29b742e1d6606151328af2afe3542bb3ff3462e7551ade9b" => :sierra sha256 "8e801dac08ad7a776d698dc8bfc170f1df2fcb621561b86c789cc0e8098b1b38" => :el_capitan sha256 "f7db89622f5575404e2ccbb1d0aca159f06b82766f27ac28bd41492d498128a7" => :mavericks + sha256 "4cc849d51482cd963991b0eca4dae6e6797f898532fbd83a243bc9d192d67eae" => :x86_64_linux end depends_on "mon" diff --git a/Formula/mono-libgdiplus.rb b/Formula/mono-libgdiplus.rb index f8c052fcb40d1..710ea363296ce 100644 --- a/Formula/mono-libgdiplus.rb +++ b/Formula/mono-libgdiplus.rb @@ -9,6 +9,7 @@ class MonoLibgdiplus < Formula sha256 "14bb84ad43cf17791299bcc76e3d410f7c7176f169f2cfcfcbc65bda3d8abbf8" => :catalina sha256 "1e7e0566530f6cbefd2e7a57d1fdcaead797d36f07a1688e2b7a8460a0ac96f7" => :mojave sha256 "3c57fe1805bb35d6bc87b1c96e99e523357226a1089b4892efc520941dbfc245" => :high_sierra + sha256 "e048d1b7aff467c9a4ca34f3620d21ce6ed016a946e656f16600c66169d24b1e" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/mono.rb b/Formula/mono.rb index a647fa0a7d7ba..7174535168b5a 100644 --- a/Formula/mono.rb +++ b/Formula/mono.rb @@ -14,6 +14,8 @@ class Mono < Formula depends_on "pkg-config" => :build depends_on :macos # Due to Python 2 + depends_on "unzip" => :build unless OS.mac? + conflicts_with "xsd", :because => "both install `xsd` binaries" # xbuild requires the .exe files inside the runtime directories to diff --git a/Formula/monolith.rb b/Formula/monolith.rb index be321002ad21e..02cc3d562e011 100644 --- a/Formula/monolith.rb +++ b/Formula/monolith.rb @@ -9,6 +9,7 @@ class Monolith < Formula sha256 "dfe598be69f1960dbf3168d1f4f18f385ccc771912196fe903f7850426ef8116" => :catalina sha256 "99ff8d9c27b9d6fa01c45d91307b73bab26c1245803909f0ebe22eadafdb329d" => :mojave sha256 "4f7ecfda2f7bf61a960d53a804a64d89fce3cae3f9c48b1a28e8b75fe435df82" => :high_sierra + sha256 "337c4859931b7ced1053707ee1851e969ff45cf7948656b5cc3f9eb35428f357" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/moreutils.rb b/Formula/moreutils.rb index a094432cd594d..34d0c11527b88 100644 --- a/Formula/moreutils.rb +++ b/Formula/moreutils.rb @@ -12,6 +12,7 @@ class Moreutils < Formula sha256 "a3d5a342bf079998b52d172f0f5e8b066b256145e2eb3ded393a0e6e2680b573" => :mojave sha256 "3731c1304a72a7a0486891bf592cd82b7422d0c37cadeb00b6f633e62f20aa35" => :high_sierra sha256 "fac2ba67a62889ff07edb8257e0d13aa96143a7421521ffdf3e0cf685a1cdc1e" => :sierra + sha256 "9cc1de6127a38360c91c8e4e940f7a405a54494abc9d54769e81b92a583ac31f" => :x86_64_linux end depends_on "docbook-xsl" => :build diff --git a/Formula/mosh.rb b/Formula/mosh.rb index 6952fdc30a24f..4810305cda307 100644 --- a/Formula/mosh.rb +++ b/Formula/mosh.rb @@ -3,13 +3,14 @@ class Mosh < Formula homepage "https://mosh.org" url "https://mosh.org/mosh-1.3.2.tar.gz" sha256 "da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216" - revision 11 + revision OS.mac? ? 11 : 12 bottle do - cellar :any + cellar :any_skip_relocation sha256 "d864ba6a3869df2fd47894862f5f0b7d8e5f5f55daf58742243fa3ca8c69d474" => :catalina sha256 "1f46edf8fbd83303ea4156530357207b6ad538a6abbbd5118f9c39e4898a4a19" => :mojave sha256 "c8aa1ef313d62059bd8abee131880d5fa73f45e961388c055bc5f89970bcaf24" => :high_sierra + sha256 "2ed3c3b6564e47f224182f9a798d53fa655abdb6d3c73f6a7be919235118e3dd" => :x86_64_linux end head do @@ -22,6 +23,7 @@ class Mosh < Formula depends_on "pkg-config" => :build depends_on "tmux" => :build depends_on "protobuf" + depends_on "openssl@1.1" unless OS.mac? uses_from_macos "ncurses" @@ -42,7 +44,7 @@ def install system "./autogen.sh" if build.head? system "./configure", "--prefix=#{prefix}", "--enable-completion" - system "make", "check" + system "make", "check" if OS.mac? system "make", "install" end diff --git a/Formula/mosml.rb b/Formula/mosml.rb index c36bada79febe..3c93814ef2246 100644 --- a/Formula/mosml.rb +++ b/Formula/mosml.rb @@ -10,6 +10,7 @@ class Mosml < Formula sha256 "5dae62ca2034ba70844d684111cec58561895eac39db3177d439747512206002" => :el_capitan sha256 "3a0289ba1b1a56cf3c2a598ccbee9b1739c7c35628a173dd00bd2f20fead6703" => :yosemite sha256 "97ba76cf36e165dc798bdae33fc06c7c5954b1293686f43d2781b3130e75a119" => :mavericks + sha256 "7610a6dbe2f84b3aef14f555f2aa28ef93bb95a5f676b7c1ce34bd670b951e61" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/mosquitto.rb b/Formula/mosquitto.rb index de11496e700dc..e09b77c72b933 100644 --- a/Formula/mosquitto.rb +++ b/Formula/mosquitto.rb @@ -5,10 +5,11 @@ class Mosquitto < Formula sha256 "92d1807717f0f6d57d1ac1207ffdb952e8377e916c7b0bb4718f745239774232" bottle do - cellar :any + cellar :any_skip_relocation sha256 "5ddfb287cb31bebc6ed03919d4dad9929a41a32d208b18e84fa7d93004a4bf4c" => :catalina sha256 "26b87ebf33eb37ee27f1ea0eb05841c4e6d68c0ec3436ba1df15c542734fc27e" => :mojave sha256 "c93f76bc649b7999229e88478fdae1501a18292fe122353bbcd1eb3323f5747e" => :high_sierra + sha256 "bc4deb9bdb7288b3338b2718c7ff4d6808a4de8066ecabc669911e21c2812509" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/most.rb b/Formula/most.rb index 1c03cbb72e788..33992e0f0d4b5 100644 --- a/Formula/most.rb +++ b/Formula/most.rb @@ -11,6 +11,7 @@ class Most < Formula sha256 "aa9766e4fa0be084108b370c639060b7a27e5ff8eb90c649cbc643160659932f" => :mojave sha256 "192ccb3fe86ae7766bd1aadb8e92d8bc7a28cb666fffe52d0750c6c2a4450657" => :high_sierra sha256 "9a9d74a50ade82af787d47e5f6514df01a47b5159dc1521d93c470ce8554743e" => :sierra + sha256 "7fb09694c31232093bc0c65fd3dd43b6ed4f42f86ae4682333cd08ab0b9f998a" => :x86_64_linux end depends_on "s-lang" diff --git a/Formula/movgrab.rb b/Formula/movgrab.rb index bf9b7c0bbd01b..5b767e6d9f507 100644 --- a/Formula/movgrab.rb +++ b/Formula/movgrab.rb @@ -10,9 +10,11 @@ class Movgrab < Formula sha256 "b3032648e55b090ca256192c989683f3b0a26942f38f0460dce9457548c14fe0" => :catalina sha256 "b0e5153f5147c8d256685dfa8be4ac67bc863bb472afcaf769caa133fb94b889" => :mojave sha256 "7702b7817fc398f4901014bd6162578294da414a18b1ae4e5f10ef8cf05a678c" => :high_sierra + sha256 "a213c5acfd106131fb89a7488d4a9bf54150116f4cdc5f56aaf56665b65a3075" => :x86_64_linux end - depends_on "libressl" + depends_on "pkg-config" => :build + depends_on "openssl@1.1" # Fixes an incompatibility between Linux's getxattr and macOS's. # Reported upstream; half of this is already committed, and there's diff --git a/Formula/moz-git-tools.rb b/Formula/moz-git-tools.rb index b48ce873733d4..e0605f48107c2 100644 --- a/Formula/moz-git-tools.rb +++ b/Formula/moz-git-tools.rb @@ -15,6 +15,7 @@ class MozGitTools < Formula sha256 "c5ddb2e842a6fb26ba5feacdee6bac287d94732abd888bd11bc5c80be4f100a4" => :el_capitan sha256 "91f89ec1014d6c7b395571210c0f21b1e701f4bfb90540a94fa3daafd4472d3b" => :yosemite sha256 "8df4c14355c7b6291964609122f8643f61d77e05c2b6b68517710e5653a1423e" => :mavericks + sha256 "062a3aae38de75ddf248d91ac7b402b9fc783867d97aced3a0fa3077debe171f" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/mozjpeg.rb b/Formula/mozjpeg.rb index dd6b242d45772..c71619f6e6997 100644 --- a/Formula/mozjpeg.rb +++ b/Formula/mozjpeg.rb @@ -11,6 +11,7 @@ class Mozjpeg < Formula sha256 "8f84ae70b36cba861c17bc0b7f3befa2e3d30fc807cadd70ed7af0521de325cb" => :mojave sha256 "36faaf1c7c6baaeaed402dc9239b594222e8bce4c8b7b8468d13e7d084c06582" => :high_sierra sha256 "1108870dce024757e600488eb3122994675ca81b4ed20fefd32a622d3ff6a2e8" => :sierra + sha256 "c9037895d280973928e50016a0f3852847f368d4dcb5bfc8cf5fc7fb93d93d2a" => :x86_64_linux end keg_only "mozjpeg is not linked to prevent conflicts with the standard libjpeg" diff --git a/Formula/mp3cat.rb b/Formula/mp3cat.rb index bb3bd10a802d0..92b6a5ca22208 100644 --- a/Formula/mp3cat.rb +++ b/Formula/mp3cat.rb @@ -10,6 +10,7 @@ class Mp3cat < Formula sha256 "e075f29990e6b5222d3e82ed27de698bed42257097e9bd59f0d60f64ea7ae46b" => :mojave sha256 "91152cced755097c42117c72e71f3db9023716e2e9befd1e8a6630fd225e3cea" => :high_sierra sha256 "3954ad75806e1948a4e69efb74fb2e86a4920c7e6b61537ca48f696289ca998a" => :sierra + sha256 "27c8b3ccd406d6147ab1c698fae34652ed93f5b0edbd9241ac880862900f2b30" => :x86_64_linux end def install diff --git a/Formula/mp3check.rb b/Formula/mp3check.rb index 98273bd6e627f..ff041cacd6caa 100644 --- a/Formula/mp3check.rb +++ b/Formula/mp3check.rb @@ -13,6 +13,7 @@ class Mp3check < Formula sha256 "d63ba27cfd87cf1f8b1871fe8b0531882c037f116933cbc59caf429dfeaab735" => :el_capitan sha256 "5fd629e626c6227789c894f1fcf32e076118fd4fe9136e974610ef42135a4ddf" => :yosemite sha256 "ef678ca85ee3272b05e442ae13f319a1ab2868bc6ff9aa3cc84ae3bca0f98ad5" => :mavericks + sha256 "e14e3e289a38a91289f0070e6edadfad29522f8e55a751123df0ce291a12d959" => :x86_64_linux end def install diff --git a/Formula/mp3gain.rb b/Formula/mp3gain.rb index dbe5c2f321b2a..95b38cffe7b80 100644 --- a/Formula/mp3gain.rb +++ b/Formula/mp3gain.rb @@ -12,6 +12,7 @@ class Mp3gain < Formula sha256 "5aa37ac4ab2013f5365da14969494111500337cae3c6d7614b72dfb9e94352f2" => :high_sierra sha256 "66684a469ee1de432a00f1264c89b3921d3558854fa736b24a3942e351617c47" => :sierra sha256 "4c97894216600ba8ac03094a45fe68a7d107f69adbcd638d40c967ad10e95480" => :el_capitan + sha256 "9b56729f7ee00154a58f59516d19c67e9249d83574fd29c3275a58824465ec41" => :x86_64_linux end depends_on "mpg123" diff --git a/Formula/mp3splt.rb b/Formula/mp3splt.rb index d04bf079133d8..48a8e696dab43 100644 --- a/Formula/mp3splt.rb +++ b/Formula/mp3splt.rb @@ -10,6 +10,7 @@ class Mp3splt < Formula sha256 "fb9ec207370028ac673f0f4e067dbae93d19e567ca80ab46e9e49d895262ac81" => :mojave sha256 "5dac4b6a6632c234ad5137084275924e1fcc32833a333924cc55fc50da51afe3" => :high_sierra sha256 "86a18b472c2b9a7b603da79caa1e406c3ca73d717a508cf6999ae2c73a6b7870" => :sierra + sha256 "f443794b8442f509db96bab5319627aeffa8ec4821d579bc70bb08fd98a10ca0" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/mp3wrap.rb b/Formula/mp3wrap.rb index 7e9019b1219a6..6a2c90bd39f7f 100644 --- a/Formula/mp3wrap.rb +++ b/Formula/mp3wrap.rb @@ -13,6 +13,7 @@ class Mp3wrap < Formula sha256 "0471701ab4f6b59423503b7c250376ba597a9f28d9962f6f9b35a107d58411ab" => :sierra sha256 "c65886799c1397eec33f48ef73774ad6a509fec44a18dec4a50c8755736f040a" => :el_capitan sha256 "50e1b97fa8423acc0c3980c7171544cf248b049d31cb1c6d3ba1214c293bc2eb" => :mavericks + sha256 "3adc636d92aaebfbd374697860bdd14df965f70586d845696bb5094afa1ebfd7" => :x86_64_linux end def install diff --git a/Formula/mp4v2.rb b/Formula/mp4v2.rb index 71c1bb8da4982..1af2fe0971ac0 100644 --- a/Formula/mp4v2.rb +++ b/Formula/mp4v2.rb @@ -14,6 +14,7 @@ class Mp4v2 < Formula sha256 "52d299e61126db288d73a3e6e8b40c3eff25af1c7498c4a74787dce2dda02e9a" => :el_capitan sha256 "14ca4b71690959d461d41b4338be70005de4553566996677f973094c1a56c3fb" => :yosemite sha256 "bb51275338ca5b157b303fb9d024922c9b73ddcac69973ba2fe9d880ad6dc914" => :mavericks + sha256 "e743564b2a70c091cc630f159ebde181c6a84d4674270d0e6bab6d5cfff73824" => :x86_64_linux end conflicts_with "bento4", diff --git a/Formula/mpage.rb b/Formula/mpage.rb index 559ea3aba81bd..f0a2cb723eb94 100644 --- a/Formula/mpage.rb +++ b/Formula/mpage.rb @@ -10,6 +10,7 @@ class Mpage < Formula sha256 "fb22af4c695ec3b6e27980a8b180bf4a7904b81ce5ff51f46f0d5ccdc5da8d07" => :high_sierra sha256 "2d020c69ee688a3a2d82f5f2c531a9f7abaf3923f0024e3b5eb2f1466992d7c1" => :sierra sha256 "4b899cd8a7280c7317513a51f6b3227f88c6324c39712530341b9d108d829ee5" => :el_capitan + sha256 "b6bb820edea20d266483c1bc3a212674200cd908165b51d8d76f199fa28b3016" => :x86_64_linux end def install diff --git a/Formula/mpc.rb b/Formula/mpc.rb index 26d8da5fdac9c..78a2695ea3dba 100644 --- a/Formula/mpc.rb +++ b/Formula/mpc.rb @@ -9,6 +9,7 @@ class Mpc < Formula sha256 "341a4c3cef23004a47f37fa299047e63baedceb07405813d6fc112c9ad7d4ff2" => :catalina sha256 "29742180fafe0fffeba3fc09c3d355395084ef3d063004347a96bc37c72682db" => :mojave sha256 "84bd2c475a7880bf1f36c560a5696c12c27ff6cdb5cd907082d14ffd094b1081" => :high_sierra + sha256 "563c1305bef6315981535b1b8df208cc313751dc8f9cdc7278d515386f9aeb98" => :x86_64_linux end depends_on "meson" => :build @@ -27,6 +28,6 @@ def install test do assert_match "query", shell_output("#{bin}/mpc list 2>&1", 1) - assert_match "-F _mpc", shell_output("source #{bash_completion}/mpc && complete -p mpc") + assert_match "-F _mpc", shell_output("source #{bash_completion}/mpc && complete -p mpc") if OS.mac? end end diff --git a/Formula/mpck.rb b/Formula/mpck.rb index 8be31f4bae69a..ee9de23007f11 100644 --- a/Formula/mpck.rb +++ b/Formula/mpck.rb @@ -10,6 +10,7 @@ class Mpck < Formula sha256 "e819ac8ce7eab3b4f83bcdf83cfbb129a9e3cebb36e314dabca646f808ed6257" => :mojave sha256 "3ecd47f83f5645cfaf2bfef23b5b9a1b14bb36f2ec146409ca44d9d5f25c3401" => :high_sierra sha256 "cd283270b83cf83c3e3a3c393404c1eca16e1620ced195821b97fe5ad6b39236" => :sierra + sha256 "d57cb79bd723f695fc86fccd2ddd79a0166aa276b679dbe85e34c8a2f0d59db0" => :x86_64_linux end def install diff --git a/Formula/mpd.rb b/Formula/mpd.rb index 2b916d2136936..e7aa0ede2df2c 100644 --- a/Formula/mpd.rb +++ b/Formula/mpd.rb @@ -6,10 +6,10 @@ class Mpd < Formula head "https://github.com/MusicPlayerDaemon/MPD.git" bottle do - cellar :any sha256 "afeeb86ddfedd0c66cb703abad7d967dcd5e5d5199b880642f00390c678d9c97" => :catalina sha256 "cfad8e2a2f6ddf22d85cab6570c784da25776782c67c5b6d65fa2596c8c10467" => :mojave sha256 "2d303a1da07f1d9fbdca65fb08fdef4134fd066e6408c6dddbe750000f4323fb" => :high_sierra + sha256 "79745fa6dd065eecaa61995f07b3ec88fc41e2a439552e2ab076b9328d67bc8a" => :x86_64_linux end depends_on "boost" => :build @@ -35,11 +35,18 @@ class Mpd < Formula depends_on "opus" depends_on "sqlite" + unless OS.mac? + fails_with :gcc => "5" + depends_on "gcc@6" => :build + depends_on "curl" + end + def install # mpd specifies -std=gnu++0x, but clang appears to try to build # that against libstdc++ anyway, which won't work. # The build is fine with G++. - ENV.libcxx + ENV.libcxx if OS.mac? + ENV.cxx11 unless OS.mac? args = std_meson_args + %W[ --sysconfdir=#{etc} @@ -104,6 +111,10 @@ def plist end test do + # oss_output: Error opening OSS device "/dev/dsp": No such file or directory + # oss_output: Error opening OSS device "/dev/sound/dsp": No such file or directory + return if ENV["CI"] + port = free_port (testpath/"mpd.conf").write <<~EOS diff --git a/Formula/mpdviz.rb b/Formula/mpdviz.rb index 4d7388f7d19ff..7f3d3a5bffd1c 100644 --- a/Formula/mpdviz.rb +++ b/Formula/mpdviz.rb @@ -12,6 +12,7 @@ class Mpdviz < Formula sha256 "f65d98aebf9bee4de6dce79983fe91b20f95d731be71999021639bdd7c8c14e9" => :catalina sha256 "dcc5deb65626637f6a4182f96e1ccd441a462c55657e134d2277a70be8246278" => :mojave sha256 "1f1b0b01dcfd1c37b7820ae93a9775abcd5b1abcdb8a5a4038d348e517b3c87a" => :high_sierra + sha256 "73630b8bb9a93571f252428d2eb19b1ae446cea166726ea44e2f5d1f854efd9b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/mpegdemux.rb b/Formula/mpegdemux.rb index 8595aada749d2..2db11578206d8 100644 --- a/Formula/mpegdemux.rb +++ b/Formula/mpegdemux.rb @@ -13,6 +13,7 @@ class Mpegdemux < Formula sha256 "4f00eabfededc549d4f419b6e6bf7896dbff0c95e83fda5f47067bf73294289b" => :el_capitan sha256 "322f5cf622b25ea9e907e1eb8d1f0ce172672ed91a0592d2621019f3b4159947" => :yosemite sha256 "baa0e3b7dffa4d3017c5639a0e07702b10e8913b87987e3c7235bbfae757fa0e" => :mavericks + sha256 "efd42a8803825c799379636d7f2f4a3cf3beeebbfde613c9f6bdba708598eafe" => :x86_64_linux end def install diff --git a/Formula/mpfi.rb b/Formula/mpfi.rb index c0f86afcc66cc..5e4363ce1d3d8 100644 --- a/Formula/mpfi.rb +++ b/Formula/mpfi.rb @@ -11,6 +11,7 @@ class Mpfi < Formula sha256 "55d8819c0310e6b8bc66742f7ab5881b9b552a9c60eaf940595ed08e8a320a56" => :mojave sha256 "d4464bdbbb2861861fa92e471f75e1b658e7c5f5814028a6c57f74c76092b013" => :high_sierra sha256 "50d3b78c1ef6837198a0320dbbe0852ad524f83bc2e12460bfbdc188bd1da76a" => :sierra + sha256 "9d948d4b378594da197972541f316203868402c5aab7b8b32aa5b83bdad0bd07" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/mpfr.rb b/Formula/mpfr.rb index 0ee3a16a06f80..fe4bddb1ef0bb 100644 --- a/Formula/mpfr.rb +++ b/Formula/mpfr.rb @@ -11,6 +11,7 @@ class Mpfr < Formula sha256 "cfce7ab866e98360c9364cd924da620ae7936d3a224d686aacc209c2107d19aa" => :mojave sha256 "bf5d21e7e8e549f7e8d07791a90f44a487f4c7151897b7c64d02928b5bd73520" => :high_sierra sha256 "4fb1860a481e24c70eefc8e5782030612840f1bb8f50586ca76a4c6c53629deb" => :sierra + sha256 "cffaa9976a516130ac5b979eae7bdd62180ed8924bb52bf0b30935174b1cbab0" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/mpg123.rb b/Formula/mpg123.rb index cdc0319a08241..f9ba14c3871c8 100644 --- a/Formula/mpg123.rb +++ b/Formula/mpg123.rb @@ -8,6 +8,7 @@ class Mpg123 < Formula sha256 "b533cb51989dc62bdfab0a132d677a320eb28441b9a3e17719539dafac8cc626" => :catalina sha256 "4f489969bb034741f240b3ff1d953ff125b7cc16114b66ca98afc62317a500e7" => :mojave sha256 "518142bd7c08441d055bcefec0bb574ad1494c12f4f1178aa9006ac01f25bc5e" => :high_sierra + sha256 "fef6310b9443f3c97d51b13d6b7dc23071db8c2c757f3556ef1b592efd3c7d3b" => :x86_64_linux end def install @@ -18,7 +19,6 @@ def install --disable-debug --disable-dependency-tracking --prefix=#{prefix} - --with-default-audio=coreaudio --with-module-suffix=.so --with-cpu=x86-64 ] diff --git a/Formula/mpg321.rb b/Formula/mpg321.rb index 3c156432d3c8f..476bac6dff47d 100644 --- a/Formula/mpg321.rb +++ b/Formula/mpg321.rb @@ -12,6 +12,7 @@ class Mpg321 < Formula sha256 "6c8921b0703d2952b6038ce7097957c3c2bfe9b59c2d41b5caddc268e96b245d" => :el_capitan sha256 "48b9ac480d966fc344c4867f3dcef7cd59be1440b11fe7d8280d51134a881f78" => :yosemite sha256 "bf86f590672fdb27f6fc92c706db1bfcb2ca0a1e35129c5435821640a11a422f" => :mavericks + sha256 "232cc9ebd436ec387104a7645e9523b1aff0adb5e624cd9dda0560997967c642" => :x86_64_linux end depends_on "libao" diff --git a/Formula/mpgtx.rb b/Formula/mpgtx.rb index 7c8e8d549bdc1..63f2b105702e5 100644 --- a/Formula/mpgtx.rb +++ b/Formula/mpgtx.rb @@ -13,6 +13,7 @@ class Mpgtx < Formula sha256 "566ce06d938b4e3b7886a729d456bd3034325985acbdb5e21355b076d7acccf5" => :el_capitan sha256 "dbe21236b1f2ae76dca4be4fa259c9dd902d2b109a6f0f0549cc7f6463945d06" => :yosemite sha256 "a9b32ab7e68133b508d9f919a740ed279567e1b68d3d9a72e0a50013a1029b11" => :mavericks + sha256 "61a51e8ebdec1f38d21af07e18435c719940f79c192749d0ce3f84b2d493e1cc" => :x86_64_linux end def install diff --git a/Formula/mpi4py.rb b/Formula/mpi4py.rb index d92e344d27e56..e74c0667e2946 100644 --- a/Formula/mpi4py.rb +++ b/Formula/mpi4py.rb @@ -6,10 +6,10 @@ class Mpi4py < Formula revision 1 bottle do - cellar :any sha256 "f32637afaa7a9e9b1de6db1df8707faa1bf3b82f9184f1d4415154c80907fa2d" => :catalina sha256 "0722fb13f9b85970dbdd113d4616ea7c47ea69fdc89747c51fa882adc1fe62d4" => :mojave sha256 "f8cb782c83655a5a97f0016bd519a6528d9f6b73fe61ccd8420f33d4b9a34155" => :high_sierra + sha256 "e74ba490ce6bd2ea0acd62e1838eff419264db79ffd4f1728357cde59716eb0c" => :x86_64_linux end depends_on "cython" => :build @@ -33,9 +33,18 @@ def install "-c", "import mpi4py.MPI" system Formula["python@3.8"].opt_bin/"python3", "-c", "import mpi4py.futures" - system "mpiexec", "-n", "4", Formula["python@3.8"].opt_bin/"python3", + + # Somehow our Azure CI only has two CPU cores available. + cpu_cores = (ENV["CI"] ? 2 : 4).to_s + + if Process.uid.zero? + ENV["OMPI_ALLOW_RUN_AS_ROOT_CONFIRM"] = "1" + ENV["OMPI_ALLOW_RUN_AS_ROOT"] = "1" + end + + system "mpiexec", "-n", cpu_cores, "#{Formula["python@3.8"].opt_bin}/python3", "-m", "mpi4py.run", "-m", "mpi4py.bench", "helloworld" - system "mpiexec", "-n", "4", Formula["python@3.8"].opt_bin/"python3", + system "mpiexec", "-n", cpu_cores, "#{Formula["python@3.8"].opt_bin}/python3", "-m", "mpi4py.run", "-m", "mpi4py.bench", "ringtest", "-l", "10", "-n", "1024" end diff --git a/Formula/mpich.rb b/Formula/mpich.rb index ac9e0bb05a158..03e2d52de8dab 100644 --- a/Formula/mpich.rb +++ b/Formula/mpich.rb @@ -10,6 +10,7 @@ class Mpich < Formula sha256 "7d46386dd93ee397ce6dd9f3198aa16aa9e1390699396f3f3b4135087f6ed216" => :catalina sha256 "865e53a39ea105d5d646986b64a0ad9096cdbf4135d7435448062bc458cb6a64" => :mojave sha256 "9d5dc18a7f5a9283f225e117f6ae879f1205249799287150a0e63ef177682077" => :high_sierra + sha256 "1826a384790d0687debf83b7ce14482df71d6cd51a99105a00340b37ba5018c6" => :x86_64_linux end head do diff --git a/Formula/mplayer.rb b/Formula/mplayer.rb index 4f539b9cda9b8..853b7762c704e 100644 --- a/Formula/mplayer.rb +++ b/Formula/mplayer.rb @@ -10,6 +10,7 @@ class Mplayer < Formula sha256 "72da2446b0077085121da3cc3437a3e07d0bd2136529dd7dfba79d05bca1b405" => :mojave sha256 "11c01635f619e3aa77a85cd095be0b302d2b25fdd4362f47340c93122a113775" => :high_sierra sha256 "225e2628b4edf16a4ffea768e03587a8cc1c3f67544c92cb3fb8f3332feee51d" => :sierra + sha256 "84a93ac8696bb0b91b19cc9ebff86e050dbc72df13cd100bd9e84ee088e10497" => :x86_64_linux end head do diff --git a/Formula/mplayershell.rb b/Formula/mplayershell.rb index fdaa03e1e653b..68e4ffb4f60de 100644 --- a/Formula/mplayershell.rb +++ b/Formula/mplayershell.rb @@ -18,6 +18,7 @@ class Mplayershell < Formula depends_on :xcode => :build + depends_on :macos depends_on "mplayer" def install diff --git a/Formula/mpop.rb b/Formula/mpop.rb index 2cb054f6b12b8..800e9956135d5 100644 --- a/Formula/mpop.rb +++ b/Formula/mpop.rb @@ -8,6 +8,7 @@ class Mpop < Formula sha256 "4d62437fccd5d773e888126e465f1cea07fdcbdc7f0b5fb826267d78747cfa0c" => :catalina sha256 "e2638049d1e7b182aa5ad981436660969d029ee3a7b2afe0cb3a3906817578f3" => :mojave sha256 "0576fae054e001c3fd7954c5b013323aa0bb54d37c7c51b400cef87144d690a1" => :high_sierra + sha256 "c2e6322c8baac55ce0bd9978ace2630771fbc17fa23f0248847bf323c258b933" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/mps-youtube.rb b/Formula/mps-youtube.rb index 249200e1523fe..77653be0b21db 100644 --- a/Formula/mps-youtube.rb +++ b/Formula/mps-youtube.rb @@ -5,13 +5,14 @@ class MpsYoutube < Formula homepage "https://github.com/mps-youtube/mps-youtube" url "https://github.com/mps-youtube/mps-youtube/archive/v0.2.8.tar.gz" sha256 "d5f2c4bc1f57f0566242c4a0a721a5ceaa6d6d407f9d6dd29009a714a0abec74" - revision 10 + revision OS.mac? ? 10 : 11 bottle do cellar :any_skip_relocation sha256 "28c642ad9a2ddad76e66cdcfed51e99a6252ed263bba1dfc11a3bd616ebfb11d" => :catalina sha256 "08d5bae85877ec5459934e372f964177dbd7659343d26f9692d3215429925cc7" => :mojave sha256 "84d055c7b77afa7c1ffb27ec3b1de09bb1a622061408d7f9dde615892c405341" => :high_sierra + sha256 "9796a4765a8f092616fc94e10ec724a73bf026a70d5f0916ca275edeed863b6d" => :x86_64_linux end depends_on "mplayer" diff --git a/Formula/mpssh.rb b/Formula/mpssh.rb index cd3d89ba7babf..f456b942b3ac1 100644 --- a/Formula/mpssh.rb +++ b/Formula/mpssh.rb @@ -22,6 +22,7 @@ class Mpssh < Formula sha256 "e5ac485861dfca0be2bb1ca2eb5826b5ca5977c0d2abb12dc58de011c18046f1" => :el_capitan sha256 "2b91c9a9dbae19e99b8b8735bb3292cc056dcf8e06472c0b2d354f64896a4186" => :yosemite sha256 "60d489a872cb7ed8855c0f95913af4fffe3082b6bee8669b0080c3d30d73249d" => :mavericks + sha256 "57f1f95da19bfaa5743d96a25093f3dfee989494692ae1b68bd9fb1441ee3a85" => :x86_64_linux end def install diff --git a/Formula/mpv.rb b/Formula/mpv.rb index b14e03163cd48..5ddbe14916ba7 100644 --- a/Formula/mpv.rb +++ b/Formula/mpv.rb @@ -15,7 +15,7 @@ class Mpv < Formula depends_on "docutils" => :build depends_on "pkg-config" => :build depends_on "python@3.8" => :build - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "ffmpeg" depends_on "jpeg" diff --git a/Formula/mpw.rb b/Formula/mpw.rb index 9208da71a34e9..149e4010a3f65 100644 --- a/Formula/mpw.rb +++ b/Formula/mpw.rb @@ -14,6 +14,7 @@ class Mpw < Formula sha256 "46677cf8649983d5b77103d2ca56d9ad3697808ecc406f626a3462a089f932da" => :high_sierra sha256 "19bf22915b3c534ad3ee6f1dfc20f142d53ae6c0c88757ae2632b7b1daa6667f" => :sierra sha256 "7090c3d31289d2ac5529bd0a6bae2632a36ba7fcd4bb7974248bb36a15f67c7e" => :el_capitan + sha256 "5fdaa8c3fe7d263026349cc9e46267eabf3b129147a750a350ce4f9dd7358514" => :x86_64_linux end depends_on "json-c" diff --git a/Formula/mr.rb b/Formula/mr.rb index 6acbe851c5a8a..c7ee62f554940 100644 --- a/Formula/mr.rb +++ b/Formula/mr.rb @@ -12,6 +12,7 @@ class Mr < Formula sha256 "a41bcee5b050ec9f98cf5960a457421528b05773867d8c8dbb8eb32716e09fd5" => :high_sierra sha256 "bcac4176692f69d47a83cd961cee92e096f6b35f19cb7206973f77b15a1ba71c" => :sierra sha256 "75fd9c6fbf6dcf833243e4dc9baf0afe81c422e55d3e251f5cfe040b8bc6a254" => :el_capitan + sha256 "6c2f63cf3e3fbc9d1f49d5d9ad37ebdc72cc21c1dd7e2ed9bcef93d65911241d" => :x86_64_linux end resource("test-repo") do diff --git a/Formula/mrboom.rb b/Formula/mrboom.rb index 5c89dd7eb2126..3c002b2f56933 100644 --- a/Formula/mrboom.rb +++ b/Formula/mrboom.rb @@ -9,6 +9,7 @@ class Mrboom < Formula sha256 "d85ec4ab953ce62ec26b3f632943f4155c7b4b06a6c7bfeec4af334bd3453c5d" => :catalina sha256 "8a4663dd80ed90899b51c5a568b1a8330b06441eba93cfa70e773514dbba4b2d" => :mojave sha256 "a3c07658f4050be94c37c341f262b7c82a808dd696f349841aa0e83b07eaf8e7" => :high_sierra + sha256 "bd02c7d499042883e3fc3a879a45d3e280d2a0ebd8dd0e0eedff74fe033bcc47" => :x86_64_linux end depends_on "cmake" => :build @@ -18,14 +19,18 @@ class Mrboom < Formula depends_on "sdl2_mixer" # fix Makefile issue, remove in next release - patch do - url "https://github.com/Javanaise/mrboom-libretro/commit/c777f1059c9a4b3fcefe6e2a19cfe9f81a13740b.diff?full_index=1" - sha256 "19f469ccde5f1a9bc45fa440fd4cbfd294947f17b191f299822db17de66a5a23" + if OS.mac? + patch do + url "https://github.com/Javanaise/mrboom-libretro/commit/c777f1059c9a4b3fcefe6e2a19cfe9f81a13740b.diff?full_index=1" + sha256 "19f469ccde5f1a9bc45fa440fd4cbfd294947f17b191f299822db17de66a5a23" + end + else + patch :DATA end def install system "make", "mrboom", "LIBSDL2=1" - system "make", "install", "PREFIX=#{prefix}" + system "make", "install", "PREFIX=#{prefix}", "MANDIR=share/man/man6" end test do @@ -47,3 +52,21 @@ def install end end end +__END__ +diff --git a/Makefile b/Makefile +index f10b4d073d5d05fb91254479bc6186ca0fd4b8f8..17b8a4052ef0813a04792da8d4ff0cfadd088e6c 100644 +--- a/Makefile ++++ b/Makefile +@@ -500,11 +500,11 @@ clean: + rm -f *.d */*.d */*/*.d */*/*/*.d */*/*/*/*.d */*/*/*/*/*.d + + strip: +- $(STRIP) $(TARGET_NAME).out ++ $(STRIP) $(TARGET_NAME) + + install: strip + $(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/$(BINDIR) +- $(INSTALL) -m 555 $(TARGET_NAME).out $(DESTDIR)$(PREFIX)/$(BINDIR)/$(TARGET_NAME) ++ $(INSTALL) -m 555 $(TARGET_NAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(TARGET_NAME) + $(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/$(MANDIR) + $(INSTALL) -m 644 Assets/$(TARGET_NAME).6 $(DESTDIR)$(PREFIX)/$(MANDIR) diff --git a/Formula/mrtg.rb b/Formula/mrtg.rb index c745227e32cfa..6c18cf37f8400 100644 --- a/Formula/mrtg.rb +++ b/Formula/mrtg.rb @@ -11,6 +11,7 @@ class Mrtg < Formula sha256 "8a76630f04f1c8b6883d7621cf9c72456e22fa5206a8b2b3eb6527547d048fbb" => :high_sierra sha256 "71561d0dbd12007514597dc85bf8ecb5e76e32f0feb35eb126b0998a30db49c8" => :sierra sha256 "0d434588f3d22e55db11fe23baa82a5e1a4a8ccbcab84dfd74ddc1a0dafc085c" => :el_capitan + sha256 "8834e76706bc12e31e8389f4184dc0d526e1398321377c9d49601fd66daff651" => :x86_64_linux end depends_on "gd" diff --git a/Formula/mruby-cli.rb b/Formula/mruby-cli.rb index 29294b7eec30f..8020fb6312365 100644 --- a/Formula/mruby-cli.rb +++ b/Formula/mruby-cli.rb @@ -13,8 +13,12 @@ class MrubyCli < Formula sha256 "d436b8d717f89db9807338345f4b0f385abcfc45f56e9b0b7decc333d4d05ad6" => :sierra sha256 "2f56375783e9365bafc0868d505b54eea315f6dad9a0095decbbd61abeb345ac" => :el_capitan sha256 "a06806ca6a22d3b015e073a984e832013f2efe729870e2aa6d0b17e91a4b9855" => :yosemite + sha256 "cfaf57d03ecbe0808ebe58fd1cd3b1d9f3204634660928dab1f8b2506f14c044" => :x86_64_linux end + uses_from_macos "bison" => :build + uses_from_macos "ruby" => :build + def install ENV["MRUBY_CLI_LOCAL"] = "true" diff --git a/Formula/mruby.rb b/Formula/mruby.rb index 710d7fd16944e..39fe2077f698a 100644 --- a/Formula/mruby.rb +++ b/Formula/mruby.rb @@ -4,12 +4,14 @@ class Mruby < Formula url "https://github.com/mruby/mruby/archive/2.1.1.tar.gz" sha256 "bb27397ee9cb7e0ddf4ff51caf5b0a193d636b7a3c52399684c8c383b41c362a" head "https://github.com/mruby/mruby.git" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation sha256 "1266b351ab448a0d30f7a6bea0bf5e395b3ee40af5eb134c7a6c6bad3c958457" => :catalina sha256 "ec046526f5cdc28b079efe9d514702a8b98a61f6388fb4479f0e0666559e5997" => :mojave sha256 "1b924c188725c14fd0958f5c5314f723cdfca53fc9eb59b266d7b1678e43552c" => :high_sierra + sha256 "48ae21caf1af48eabf2526f3f442084ab00c502e14c58ae5a61d49726a9c80da" => :x86_64_linux end depends_on "bison" => :build diff --git a/Formula/mscgen.rb b/Formula/mscgen.rb index d6af8b44dba89..6cfc6367c62c9 100644 --- a/Formula/mscgen.rb +++ b/Formula/mscgen.rb @@ -12,6 +12,7 @@ class Mscgen < Formula sha256 "1f194eb67147772b362ae5446b2e369b35ee9ffa935c8e22d37cdb4c1364349b" => :mojave sha256 "0f125ab1fbaf04c670f252f05358771f1663b3fc59857bcfd855bbb52e01f88b" => :high_sierra sha256 "08345683137541d79b6422afd2e269b1ab8c195722e5e71cffa6298a3986d563" => :sierra + sha256 "5c8f670a4eb96be9ab3696b54609ace8213dcd1f404316c643c7cbce9f975050" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/msdl.rb b/Formula/msdl.rb index 9d5d97d0179a7..224f3b8c80c40 100644 --- a/Formula/msdl.rb +++ b/Formula/msdl.rb @@ -14,6 +14,7 @@ class Msdl < Formula sha256 "34ba320e82d1ce97fb0a106abd2c5ec848ba16857730ba51cadd0a030bee62ab" => :el_capitan sha256 "5b8ac26e3adbb19386398a5500a8d5631d426b2e0e951433134b5383b80bb568" => :yosemite sha256 "a28059bba6256df7233eacbfdadd9eeec2c3c6ec22038cb06ca49745b347a828" => :mavericks + sha256 "b01b19503e91ce46bef0f624d11eff53bdfafb686dbae616a9ab21f297240ffd" => :x86_64_linux end # Fixes linker error under clang; apparently reported upstream: diff --git a/Formula/msgpack-tools.rb b/Formula/msgpack-tools.rb index ba0349b540eca..b96035924bdad 100644 --- a/Formula/msgpack-tools.rb +++ b/Formula/msgpack-tools.rb @@ -10,6 +10,7 @@ class MsgpackTools < Formula sha256 "30f69cfbcfe93c148fec339d86775357cc804f50c58c42594708f7ae9abad226" => :mojave sha256 "9c12c496640b2913caa23147bdacffed803115e68607c56975bdab106b4b83b0" => :high_sierra sha256 "c576acc7e6078360a79bf7270336e0f3dc9012161e860681cbfe7f2de1313857" => :sierra + sha256 "ad7365beeb052efa6efe766cfcf0c64fb0bb0a49c454d477f9b713e35da23320" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/msgpack.rb b/Formula/msgpack.rb index 36923e1d655c9..5e9bf245cd3d7 100644 --- a/Formula/msgpack.rb +++ b/Formula/msgpack.rb @@ -6,9 +6,11 @@ class Msgpack < Formula head "https://github.com/msgpack/msgpack-c.git" bottle do + cellar :any_skip_relocation sha256 "bb3e3af7ce4994911518db90db9ff4747e72492832b3aa98ff7c82fd3d5990b2" => :catalina sha256 "f418d11d056dd08160b27088d19ee12d4a9e36dbd913ffae8d2c9838a1449475" => :mojave sha256 "7424d6d9dee3edd0f07c4ea6f11567255dea4f1bbffbb6c41f20c5412952028d" => :high_sierra + sha256 "8ffc795917ab21985beeb23e6940c197a3ee483eb767fa393c05ed4a74619331" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/msgpuck.rb b/Formula/msgpuck.rb index fa9f904ceb133..905cb6d70172f 100644 --- a/Formula/msgpuck.rb +++ b/Formula/msgpuck.rb @@ -12,6 +12,7 @@ class Msgpuck < Formula sha256 "50197e08a5b55fbe804109ad01dfa815a6dde2b11b688d89a58154fed2d8d54f" => :high_sierra sha256 "6f4011d177bf2e42f94f853bc93283ada6c48df8fdb7269135def453e65e598d" => :sierra sha256 "b0accfedd2582109acec3297878bb943360282520a31b0d1c16c4ec1aa70a362" => :el_capitan + sha256 "dfd81546c490cf3fb421fa698c647f034cd99095721bf895456a13c0615c8423" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/msmtp.rb b/Formula/msmtp.rb index f4e5f0edcb34e..73dda4dd36161 100644 --- a/Formula/msmtp.rb +++ b/Formula/msmtp.rb @@ -8,10 +8,12 @@ class Msmtp < Formula sha256 "465356913ededba9a76ab0f76f597913a3e7eb5901f47780494e140917a94447" => :catalina sha256 "8ce3ca882b2e0fbc6bad2fdf544f20f53413616bda869544f90c51e9bd87a521" => :mojave sha256 "61d5d5c532afb5f5297ccd3e5d2e7ba09b3810f8b128701160c981e6c16fc73e" => :high_sierra + sha256 "8cd5bc5a76c6d18390fcf96de5d12a236427936506b20ce48d7fe498f866b05a" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "gnutls" + depends_on "libsecret" unless OS.mac? def install args = %W[ diff --git a/Formula/mstch.rb b/Formula/mstch.rb index 58b10002652b0..16c096ef90987 100644 --- a/Formula/mstch.rb +++ b/Formula/mstch.rb @@ -13,6 +13,7 @@ class Mstch < Formula sha256 "0869a4b14d4b9130852d5556d27e945c20239385d3bd30497c32833352fea1e3" => :el_capitan sha256 "1f727fc24497894247b60ee22a3a6d7139156c0efd69f30d7144fd0d4fbb4a75" => :yosemite sha256 "8cf2369310ef49911455a4071066464f261e78060732539ea7deeb4c4858ce29" => :mavericks + sha256 "982d2ac3723fdccfb4ee29de726b1edb0f864fea85387908d5966d6c8b8faebf" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/mtr.rb b/Formula/mtr.rb index 965d9522d439b..70a037ce04189 100644 --- a/Formula/mtr.rb +++ b/Formula/mtr.rb @@ -13,6 +13,7 @@ class Mtr < Formula sha256 "4a4715a86749b16145a303a90d872aaf4f30d21f90718cc091db319a76061cc8" => :mojave sha256 "a1ce74b90b7647841648e097bc8a3215bca12a050727234486c5ea90c9387627" => :high_sierra sha256 "a0c602faaa5af45b8bc5efcc9897a765cc22c1f94411de07ceb32fe5aa721183" => :sierra + sha256 "98307442527900c17cfe3c32f61ab20c4370aba0597c5ce16a096473a20c387b" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/mu.rb b/Formula/mu.rb index 76f2d8faf2e9e..5849819ea438a 100644 --- a/Formula/mu.rb +++ b/Formula/mu.rb @@ -8,7 +8,6 @@ class Mu < Formula sha256 "a3fd3b56fb0872892427909888d55bae2c3f0d574494cb27853ae4907b2c8af9" bottle do - cellar :any sha256 "ff8820080a32067627c8b8ea26a2a80e94d24833d33ffd5c130a251f36243dce" => :catalina sha256 "ae98cf1ff0fdbae8771d01a22078478cfb4b4248c3f664c135a7be6735194d4f" => :mojave sha256 "a9ef200573c8092384f30fcec9cd7b9ecf3e34b29a72fb17a72aadef86772c51" => :high_sierra diff --git a/Formula/mujs.rb b/Formula/mujs.rb index 7228ccd5884c2..f8462829dac30 100644 --- a/Formula/mujs.rb +++ b/Formula/mujs.rb @@ -6,17 +6,22 @@ class Mujs < Formula :tag => "1.0.7", :revision => "90aca80865e28a1b9be9bc5ef1118438f62e4f8f" head "https://github.com/ccxvii/mujs.git" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation sha256 "876610c369e104a1245828afa6578d717b3214ff472ccf4d29e03b38a1adf98e" => :catalina sha256 "8c52be2a15fc45f4cbf0aba09c672e12afb9e6d6ae676b97fa7ae17454fb9c10" => :mojave sha256 "c72f3e89f750198a8e3432043dbb67a40895126e248536babeff9ecd8628e843" => :high_sierra + sha256 "0d43dd6a9358ca63bf428d13322389d1f9a322ec3409b046163fabe73d7f24a6" => :x86_64_linux end + depends_on "readline" unless OS.mac? + def install system "make", "release" system "make", "prefix=#{prefix}", "install" + system "make", "prefix=#{prefix}", "install-shared" unless OS.mac? end test do diff --git a/Formula/multimarkdown.rb b/Formula/multimarkdown.rb index 345b0ce22a4ff..8d1e36d632dc6 100644 --- a/Formula/multimarkdown.rb +++ b/Formula/multimarkdown.rb @@ -10,6 +10,7 @@ class Multimarkdown < Formula sha256 "fda293b3a57480609f06eee55ec2ba8d65799577df2be38c0af1cc70e22fcd9d" => :catalina sha256 "ce5d41628cd36556b2e6375a88dce78d90da7502033fe147fff90c3d542bd7c9" => :mojave sha256 "fde9097e38d1fdb2161d71eb81758e25c1a1a39120a27c931e2d408ac8338fd6" => :high_sierra + sha256 "82b8390e31aea457303cbb1fbc6de68c6c335aa081677c5485dc174346719f08" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/multitail.rb b/Formula/multitail.rb index ff80c739acbbf..908be225a8036 100644 --- a/Formula/multitail.rb +++ b/Formula/multitail.rb @@ -6,17 +6,17 @@ class Multitail < Formula head "https://github.com/flok99/multitail.git" bottle do - cellar :any sha256 "6d0d74b45d02adc52fa6a5f666484c62941457da3cb10e50d65f5d772cc59c02" => :catalina sha256 "933801e9ec5999742cfcea6cc59580f69fc966ad82858326c2a90f68868de60f" => :mojave sha256 "57526de43035b0d5d2520d54b252d29c20a4efb146c019ac044ad5067be5351a" => :high_sierra + sha256 "6496c1392f9856eefa03fc864094e55553d4b478149b592a287c946aa141f271" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "ncurses" def install - system "make", "-f", "makefile.macosx", "multitail", "DESTDIR=#{HOMEBREW_PREFIX}" + system "make", "-f", OS.mac? ? "makefile.macosx" : "Makefile", "multitail", "DESTDIR=#{HOMEBREW_PREFIX}" bin.install "multitail" man1.install gzip("multitail.1") diff --git a/Formula/muparser.rb b/Formula/muparser.rb index ceafbc967f284..db63417070eb8 100644 --- a/Formula/muparser.rb +++ b/Formula/muparser.rb @@ -10,6 +10,7 @@ class Muparser < Formula sha256 "20da2f5a649d58f95eedc5a7aed844a818993efcf2fa9d54d46b2dc8e3822c12" => :catalina sha256 "a6f9fa4ce3f683cc0799887200f1e38db042541a6efe45eaf991ba8b38d8b90e" => :mojave sha256 "bdbf31b17693b892f6be038d84e0b06707d517562d9eac62158612162555aa4e" => :high_sierra + sha256 "0ecd9b0cdae74f2cf8f5e4ca066539e7a2898325d5652d180b459bd01d1e700f" => :x86_64_linux end depends_on "cmake" => :build @@ -18,6 +19,7 @@ class Muparser < Formula fails_with :clang # no OpenMP support def install + ENV.cxx11 unless OS.mac? mkdir "build" do system "cmake", "..", *std_cmake_args system "make", "install" @@ -58,8 +60,8 @@ def install return 0; } EOS - system ENV.cxx, "-I#{include}", "-L#{lib}", "-lmuparser", - testpath/"test.cpp", "-o", testpath/"test" + system ENV.cxx, "-I#{include}", "-L#{lib}", *("-std=c++11" unless OS.mac?), + testpath/"test.cpp", "-lmuparser", "-o", testpath/"test" system "./test" end end diff --git a/Formula/mupdf-tools.rb b/Formula/mupdf-tools.rb index ac1bb2c2ffa12..d45e68da8539c 100644 --- a/Formula/mupdf-tools.rb +++ b/Formula/mupdf-tools.rb @@ -10,6 +10,7 @@ class MupdfTools < Formula sha256 "469777d46f4da93ca69069fc283b1464ec65db3f03df430290fbfb77c1fd5b2d" => :catalina sha256 "02993c27c49e2ae8f2bf30a3fe3680770320bec2873124990c7dd5561ec16f19" => :mojave sha256 "6bd4ca00d57e19125e20cf04e7b6ff1ed7de306d1d0a8f75eb23ad878b94ba99" => :high_sierra + sha256 "49ca48bd97e06b4ec0bafc6e9c2ae4cb700c0de42582d215a5d9d7d2ebda4801" => :x86_64_linux end conflicts_with "mupdf", diff --git a/Formula/mupdf.rb b/Formula/mupdf.rb index 6080113886c40..48da6e360759a 100644 --- a/Formula/mupdf.rb +++ b/Formula/mupdf.rb @@ -3,6 +3,7 @@ class Mupdf < Formula homepage "https://mupdf.com/" url "https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.xz" sha256 "c935fb2593d9a28d9b56b59dad6e3b0716a6790f8a257a68fa7dcb4430bc6086" + revision 1 unless OS.mac? head "https://git.ghostscript.com/mupdf.git" bottle do @@ -10,9 +11,16 @@ class Mupdf < Formula sha256 "473cb909d61450baa808fab50f18342811665f4e9e31f26a21e03f6bc5e70363" => :catalina sha256 "abe79a517f7debadd94a67d3c7130c017ec8b985f381f0af7c9d08c75df13501" => :mojave sha256 "e12021a10707afc92cea6d8a7633ee2a8d0f89359bb2f166c6e53d89e411f0f3" => :high_sierra + sha256 "9ab2ebcde22eb4f130ce50c850bf9eaff9f54bcd4f4e7e5de191b366797d2bf4" => :x86_64_linux end - depends_on :x11 + depends_on "openssl@1.1" + depends_on :x11 if OS.mac? + unless OS.mac? + depends_on "linuxbrew/xorg/glu" + depends_on "linuxbrew/xorg/xinput" + depends_on "mesa" + end conflicts_with "mupdf-tools", :because => "mupdf and mupdf-tools install the same binaries." diff --git a/Formula/mutt.rb b/Formula/mutt.rb index faac1a5c8b96c..41e3289d9e64c 100644 --- a/Formula/mutt.rb +++ b/Formula/mutt.rb @@ -17,6 +17,7 @@ class Mutt < Formula sha256 "775636e22b688047209d4d76773c5ff89a5c91f7c0954d48b8c6a20e1fe67873" => :catalina sha256 "6962697b2d8379cbf44e32f8e215048e220cbbe89960aaa1a38281356b214925" => :mojave sha256 "deac7667a1ccd43bfeaabf1a224a73651ca638078dfa1537ffa3f344c54d47da" => :high_sierra + sha256 "115c4c97a190a16bcfd21e8d1c1300e5092cf568311d694661b880fba8a28e98" => :x86_64_linux end head do @@ -32,6 +33,7 @@ class Mutt < Formula depends_on "gpgme" depends_on "openssl@1.1" depends_on "tokyo-cabinet" + depends_on "krb5" unless OS.mac? uses_from_macos "bzip2" uses_from_macos "ncurses" @@ -55,7 +57,7 @@ def install --enable-sidebar --enable-smtp --with-gss - --with-sasl + #{OS.mac? ? "--with-sasl" : "--with-sasl2"} --with-ssl=#{Formula["openssl@1.1"].opt_prefix} --with-tokyocabinet --enable-gpgme diff --git a/Formula/mvtools.rb b/Formula/mvtools.rb index 0f2f73c110908..b7a53b4e5c2e6 100644 --- a/Formula/mvtools.rb +++ b/Formula/mvtools.rb @@ -10,6 +10,7 @@ class Mvtools < Formula sha256 "0da74491af99cf7cb20d4387d449af550b94abdf6f5330fd95da083689bb80b0" => :catalina sha256 "9349ea16136c2d54c9f132af9e5c1768f486ce4ed6bcababf3f1f2f1944a7389" => :mojave sha256 "d8dfbb4ea0e148a954fb50745230b3827f4e02457d739599d2fdec76e31058d8" => :high_sierra + sha256 "29d69437c0c99cbaac59f9fa17e747982c11a46025285139408d470b9a8b752f" => :x86_64_linux end depends_on "autoconf" => :build @@ -28,19 +29,21 @@ def install end def caveats + dylib = OS.mac? ? "dylib" : "so" <<~EOS MVTools will not be autoloaded in your VapourSynth scripts. To use it use the following code in your scripts: - core.std.LoadPlugin(path="#{HOMEBREW_PREFIX}/lib/libmvtools.dylib") + core.std.LoadPlugin(path="#{HOMEBREW_PREFIX}/lib/libmvtools.#{dylib}") EOS end test do + dylib = OS.mac? ? "dylib" : "so" script = <<~EOS.split("\n").join(";") import vapoursynth as vs core = vs.get_core() - core.std.LoadPlugin(path="#{lib}/libmvtools.dylib") + core.std.LoadPlugin(path="#{lib}/libmvtools.#{dylib}") EOS system Formula["python@3.8"].opt_bin/"python3", "-c", script diff --git a/Formula/mycli.rb b/Formula/mycli.rb index 0189967d637d2..f0e1e74f38888 100644 --- a/Formula/mycli.rb +++ b/Formula/mycli.rb @@ -5,21 +5,32 @@ class Mycli < Formula homepage "https://mycli.net/" url "https://files.pythonhosted.org/packages/dc/b4/4a252eb2ba8343a419b468655a8d1570c146db3e4ab3bc96fb1cd60acdba/mycli-1.21.1.tar.gz" sha256 "8f630a0847243fbed2eeead05b0952963916e1b60a11a065bffbb234a30737e1" + revision 1 unless OS.mac? bottle do cellar :any sha256 "2754cde5c61c591c521dc89584717f35d8dd1463fbe9791034245e0c1d9c5164" => :catalina sha256 "5c1cc0dd09e092145a2493f920183d3542b80b0f5ed9f947c41522d8a8d2c866" => :mojave sha256 "6f9ddc6aecb867a5610c4ce093ce3afa6a5dfcc33215abb9c3ee83d3e363628c" => :high_sierra + sha256 "15c2e5893479e3bd8b29fe8da01a398676d037eab1973fe34ee82a0718d78ebb" => :x86_64_linux end depends_on "openssl@1.1" depends_on "python@3.8" + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "libffi" + end on_linux do depends_on "pkg-config" => :build end + resource "asn1crypto" do + url "https://files.pythonhosted.org/packages/fc/f1/8db7daa71f414ddabfa056c4ef792e1461ff655c2ae2928a2b675bfed6b4/asn1crypto-0.24.0.tar.gz" + sha256 "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49" + end + resource "cffi" do url "https://files.pythonhosted.org/packages/05/54/3324b0c46340c31b909fcec598696aaec7ddc8c18a63f2db352562d3354c/cffi-1.14.0.tar.gz" sha256 "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" diff --git a/Formula/mydumper.rb b/Formula/mydumper.rb index fa9a1b502a3dc..4751b1ca56799 100644 --- a/Formula/mydumper.rb +++ b/Formula/mydumper.rb @@ -9,6 +9,7 @@ class Mydumper < Formula sha256 "157bb28e44f0033093c6dc1e46ad6f72e72fb0ae39c9d480e4cff4d90b0a4384" => :catalina sha256 "d4a3a359cd266b24313e64204a8c99d8c1bfe0ec71fece2a31b8551bbb904eaa" => :mojave sha256 "2f3f2f488038ee040fe619c6f3c35efc414c97a18bfb04885a245528645f8ade" => :high_sierra + sha256 "abaf309d00d2d9966daea7672ce58d3fb49fa4d3ac1a2c99a0839baba1392158" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/myman.rb b/Formula/myman.rb index d8a90067a021e..5d23fd2ef65ac 100644 --- a/Formula/myman.rb +++ b/Formula/myman.rb @@ -13,6 +13,7 @@ class Myman < Formula sha256 "376c71ad2f5abcc0233b3873d70cc963e54ac0ca00a552eceb025ac09b931ff6" => :sierra sha256 "d3b66de7eae03edecb2573524d94239bd013ffd57eeb1980411da12f6d2b2b98" => :el_capitan sha256 "b318e0b227a3ad281afe95edc5a0cc7ab0b1d5e46b1699e6221eb201de869b48" => :yosemite + sha256 "a34e620acc560cb86f943e84762cd51b37c865114ab522bed502cfd8b366fa84" => :x86_64_linux # glibc 2.19 end depends_on "coreutils" => :build diff --git a/Formula/mypy.rb b/Formula/mypy.rb index a4595749eb087..fc84049082638 100644 --- a/Formula/mypy.rb +++ b/Formula/mypy.rb @@ -11,6 +11,7 @@ class Mypy < Formula sha256 "be8e5e9cd4eadfb2609ddba88e9772e85004b0031b682b40d0e1934aafe056b9" => :catalina sha256 "516821003d007ca5f28aab49d9bac6695824f8dcb1682908af2575a86e0896b9" => :mojave sha256 "c73b8cc86ec220dc7bcf90902307d23aee12e2a9e0b4e633a734927b7c47786d" => :high_sierra + sha256 "2cd745e9578479d1a2d2557fcd45663ab65151578ebb6925d4265ac0bc7bc671" => :x86_64_linux end depends_on "sphinx-doc" => :build diff --git a/Formula/mysql++.rb b/Formula/mysql++.rb index 1db1e5237cfbc..e44425f0f46ee 100644 --- a/Formula/mysql++.rb +++ b/Formula/mysql++.rb @@ -10,6 +10,7 @@ class Mysqlxx < Formula sha256 "657ebf2f50f14f877b6892bbee2c5e92aef47093a22918a9d14b871769d76a30" => :catalina sha256 "0e2b71648130ccac76a5d861e609538ffc697e629db9c352b0f69b513df4aa4e" => :mojave sha256 "a8bb0d5cdc09c45b28b15e6e3de0b20260b8f11f395fb968d1f6a4c931d9a292" => :high_sierra + sha256 "b25af7f9049375e1cfeef0759d5e1c367d36ef8a878440b8254c9394c2e61eb6" => :x86_64_linux end depends_on "mysql-client" diff --git a/Formula/mysql-client.rb b/Formula/mysql-client.rb index 76160c70511fa..b0a2b590fa73c 100644 --- a/Formula/mysql-client.rb +++ b/Formula/mysql-client.rb @@ -8,6 +8,7 @@ class MysqlClient < Formula sha256 "43a72c20ae7b146f6dc7d01b9f63bef605972c26ecf2970de841f4ecd02c4b9e" => :catalina sha256 "c8d2434da809237c64cd3dd4139a2bd148b6773fca040c001cc7af468354e761" => :mojave sha256 "cb1fdc14848bdeaf8c3e4ebb1550cabd794771e7f7918be1716e08b43e8889b9" => :high_sierra + sha256 "23148eb60b2b1bc5cfdc834c42282b9dc5b913d1c8d1d419c49d2701350a3ac8" => :x86_64_linux end keg_only "it conflicts with mysql (which contains client libraries)" diff --git a/Formula/mysql-connector-c++.rb b/Formula/mysql-connector-c++.rb index 757ec7342066c..963e75e5a57ce 100644 --- a/Formula/mysql-connector-c++.rb +++ b/Formula/mysql-connector-c++.rb @@ -9,6 +9,7 @@ class MysqlConnectorCxx < Formula sha256 "d135296e51b3c7b0eb1a4735250fae125d08ee7367107b9fc71ec43810b009b7" => :catalina sha256 "02a6351ad7a7be72463d65ead3b4fe23ad8322ca46a8516fefb7054cadddf29a" => :mojave sha256 "093917f65031b2e8a0998b54854976bd5c7ae26ec0a63cfcf48a4906135756e2" => :high_sierra + sha256 "28566d040686af6266b449b86aab73fdcef2795c08c5488b13a285eb65e6c8d7" => :x86_64_linux end depends_on "boost" => :build diff --git a/Formula/mysql-sandbox.rb b/Formula/mysql-sandbox.rb index 7072163ea0ba2..00b77b3ea29ec 100644 --- a/Formula/mysql-sandbox.rb +++ b/Formula/mysql-sandbox.rb @@ -12,6 +12,7 @@ class MysqlSandbox < Formula sha256 "da11d806c9d472f19514da7520ec448210e410983225a3b41c0459634a823ab7" => :high_sierra sha256 "1829b23da5960830f426300cac7b4820f21a4f801a1260357394b205bb9340a4" => :sierra sha256 "77ab4eb3bbd5d374020081b3505cd7f18de1500019af148f00ebef13a34e4222" => :el_capitan + sha256 "8b636037daa88e2fcac76f634a414cae7bbc32fb309b5be9cb2f6d2d2d643bd8" => :x86_64_linux end def install diff --git a/Formula/mysql.rb b/Formula/mysql.rb index 6b6b4ab66b131..311314587d144 100644 --- a/Formula/mysql.rb +++ b/Formula/mysql.rb @@ -9,14 +9,16 @@ class Mysql < Formula sha256 "e5a5455d254260e9ca9821cb9c5e9ba623d724315c5f20ab2e26b9d2c3891f50" => :catalina sha256 "35b85e2bb6cb5c45b230e488a9d8d8f543d066db133aa52e3b94c32246ea7841" => :mojave sha256 "f75655d4d35ca527bbe94020fa09ff65991e9059d5cc4e66520b7c3692de72e1" => :high_sierra + sha256 "47d454371f398d15b9f44fbd7a0b82e88851eff60757250205456fd27128d825" => :x86_64_linux end depends_on "cmake" => :build # GCC is not supported either, so exclude for El Capitan. - depends_on :macos => :sierra if DevelopmentTools.clang_build_version == 800 + depends_on :macos => :sierra if OS.mac? && DevelopmentTools.clang_build_version == 800 depends_on "openssl@1.1" depends_on "protobuf" + # Fix error: Cannot find system editline libraries. uses_from_macos "libedit" conflicts_with "mariadb", "percona-server", @@ -29,11 +31,27 @@ class Mysql < Formula cause "Wrong inlining with Clang 8.0, see MySQL Bug #86711" end + unless OS.mac? + patch do + url "https://raw.githubusercontent.com/NixOS/nixpkgs/dae42566dbee37a3b7a609fa86eca9618f4f4b67/pkgs/servers/sql/mysql/abi-check.patch" + sha256 "0dcfcca3bb3e7eb7ccd3ae02d4eb4fb07877970359611f081b03eab77bd4d6c9" + end + depends_on "pkg-config" => :build + fails_with :gcc => "5" + fails_with :gcc => "6" + depends_on "gcc@7" + end + def datadir var/"mysql" end def install + # Fix libmysqlgcs.a(gcs_logging.cc.o): relocation R_X86_64_32 + # against `_ZN17Gcs_debug_options12m_debug_noneB5cxx11E' can not be used when making + # a shared object; recompile with -fPIC + ENV.append_to_cflags "-fPIC" unless OS.mac? + # -DINSTALL_* are relative to `CMAKE_INSTALL_PREFIX` (`prefix`) args = %W[ -DFORCE_INSOURCE_BUILD=1 @@ -152,6 +170,8 @@ def plist end test do + return if Process.uid.zero? + # Expects datadir to be a completely clean dir, which testpath isn't. dir = Dir.mktmpdir system bin/"mysqld", "--initialize-insecure", "--user=#{ENV["USER"]}", diff --git a/Formula/mysql@5.6.rb b/Formula/mysql@5.6.rb index 91d32fad47ca9..2c940cf5d271d 100644 --- a/Formula/mysql@5.6.rb +++ b/Formula/mysql@5.6.rb @@ -8,12 +8,14 @@ class MysqlAT56 < Formula sha256 "3ae76dae15820186fc74aef54f6365a55e19abc7c6d7826db5a1c774b9d9c759" => :catalina sha256 "85d0cd1ae169ee42eb5fbc95a6a337c17d79d042e041ffb7f01c8313874989c7" => :mojave sha256 "bf8272f7d912896a94f21ba7802e78ca49b70b20fc9c01f610d0f9b449469fae" => :high_sierra + sha256 "a89733701f2dddcd36b8a6151cf5653fc92f0a369053568a0b1367b23b1433fe" => :x86_64_linux end keg_only :versioned_formula depends_on "cmake" => :build depends_on "openssl@1.1" + depends_on "libedit" unless OS.mac? def datadir var/"mysql" diff --git a/Formula/mysql@5.7.rb b/Formula/mysql@5.7.rb index b35fa6240eff1..c4b35e42922a7 100644 --- a/Formula/mysql@5.7.rb +++ b/Formula/mysql@5.7.rb @@ -8,6 +8,7 @@ class MysqlAT57 < Formula sha256 "bf0cdc294df996455c8abad3e03b6691f2145a4036085ad2570ec6c993e6b9c0" => :catalina sha256 "88cf1f9f07a84694654f790507da937909eee1b16a0e47d473b2fc45e19c9ec1" => :mojave sha256 "b4bf218448de13e40027117d3813d9a7a72d3205deb9658da16b85f74ad390af" => :high_sierra + sha256 "11b09ca0cf8a1fa0a3ab1b697b29128a656733447d315c49c2802c8fb46c1258" => :x86_64_linux end keg_only :versioned_formula @@ -26,6 +27,11 @@ def datadir end def install + # Fix libmysqlgcs.a(gcs_logging.cc.o): relocation R_X86_64_32 + # against `_ZN17Gcs_debug_options12m_debug_noneB5cxx11E' can not be used when making + # a shared object; recompile with -fPIC + ENV.append_to_cflags "-fPIC" unless OS.mac? + # -DINSTALL_* are relative to `CMAKE_INSTALL_PREFIX` (`prefix`) args = %W[ -DCOMPILATION_COMMENT=Homebrew diff --git a/Formula/n.rb b/Formula/n.rb index a5991cfb80e94..fece84dcade44 100644 --- a/Formula/n.rb +++ b/Formula/n.rb @@ -10,6 +10,7 @@ class N < Formula sha256 "cc203ce1afe1d3bf97a5c01420e506cfea9e3e57fa3511c7ad3edd4c072d4612" => :catalina sha256 "cc203ce1afe1d3bf97a5c01420e506cfea9e3e57fa3511c7ad3edd4c072d4612" => :mojave sha256 "cc203ce1afe1d3bf97a5c01420e506cfea9e3e57fa3511c7ad3edd4c072d4612" => :high_sierra + sha256 "d193706773c7ad866d150012afde2acbf8c6fe45346c1d9f2597b68a23f0076e" => :x86_64_linux end def install diff --git a/Formula/nacl.rb b/Formula/nacl.rb index 8bb1cf72c714d..2881834689a6b 100644 --- a/Formula/nacl.rb +++ b/Formula/nacl.rb @@ -15,6 +15,7 @@ class Nacl < Formula sha256 "e08c93b814989405fa3b7db9e3a9c4f149e36aaab32aba44e9a2f1659d2d3efd" => :el_capitan sha256 "1a1a7fffc6d41f2f7bcc393375f2907f63b5a13f9414fe0827daef96246301e7" => :yosemite sha256 "44bbb2d7cb0daa6eb06c79e5881ae827786a04dece9b4a34cb0a6ea06cddb1e1" => :mavericks + sha256 "bb16dca39d8f3b98e492e1e85347dac187eb38899bf6bcadc663b4a90ac89ae2" => :x86_64_linux end def install diff --git a/Formula/nano.rb b/Formula/nano.rb index c35cce392ef4d..93d2596bacb7b 100644 --- a/Formula/nano.rb +++ b/Formula/nano.rb @@ -8,12 +8,15 @@ class Nano < Formula sha256 "199872e5dbe7229dc98f1a4bf2c51a72b37289ba226618a49d065b8c15f4f90c" => :catalina sha256 "7714d03eed965ed869fefb0140ae7c6accc423664643b85c6abb9e88498af9ca" => :mojave sha256 "d1e31bd078e9d26b892e7431b4bc1f66e5b297eef8eae8651d25a783563d5363" => :high_sierra + sha256 "1114b599472f4d344453ea8d757f39ce9eaea2109644a1681c94f46b2c01ca1f" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "gettext" depends_on "ncurses" + depends_on "libmagic" unless OS.mac? + def install system "./configure", "--disable-debug", "--disable-dependency-tracking", diff --git a/Formula/nanomsg.rb b/Formula/nanomsg.rb index 989c396db7382..794e06c699482 100644 --- a/Formula/nanomsg.rb +++ b/Formula/nanomsg.rb @@ -10,6 +10,7 @@ class Nanomsg < Formula sha256 "95609047c54b0207587db3a5b3cc8985b35fc922fe8785c63d4d2a44a78ff57f" => :mojave sha256 "11390e904a94e60865186a846af14565b379ec84942a9bc512ba4e5e3ea7ec85" => :high_sierra sha256 "95192ebc59926ff064d7f4cff5ebf9037c7549af61d2f1c23375827c91b88282" => :sierra + sha256 "857b01a27f8bae419ddfc917df788bec98a13ea2bb58f87447d68f948d75fee0" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/nanomsgxx.rb b/Formula/nanomsgxx.rb index e288c23474604..33ccd327e6f0c 100644 --- a/Formula/nanomsgxx.rb +++ b/Formula/nanomsgxx.rb @@ -11,6 +11,7 @@ class Nanomsgxx < Formula sha256 "3c094b3df14d706b6824d0f0e4ec90e2d6aace65e8f7fe484b38fc51b2fe298f" => :catalina sha256 "b4e9a2d42d4307ef122c71288afed6662f0db91be922c73324abe6e5a2b08735" => :mojave sha256 "c48e210289abc4d384fc1139d4565616bb04fbced6f6fae9a6817f2c710ba118" => :high_sierra + sha256 "26a441978b63f4024b00f9efd092f11ba6a10e9fc1b27735114adbb96cccd7b9" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/nanopb-generator.rb b/Formula/nanopb-generator.rb index 5fab1831d642e..57096196144c0 100644 --- a/Formula/nanopb-generator.rb +++ b/Formula/nanopb-generator.rb @@ -9,6 +9,7 @@ class NanopbGenerator < Formula sha256 "42459566535f189ab887bc2d8f2a2cb0bdc6b262b56ba9306434d410d2af8c38" => :catalina sha256 "6bbf097a240a30f9a4560a036d46dc0f10c09f04ca05a45a67430dda911e3397" => :mojave sha256 "6bbf097a240a30f9a4560a036d46dc0f10c09f04ca05a45a67430dda911e3397" => :high_sierra + sha256 "24ce6126011b66c0496067a54c4bbe5e4cf1d6feff448c72aa81e52b0e57e323" => :x86_64_linux end depends_on "protobuf" diff --git a/Formula/nasm.rb b/Formula/nasm.rb index bee70032ba2da..505f801432bd2 100644 --- a/Formula/nasm.rb +++ b/Formula/nasm.rb @@ -9,6 +9,7 @@ class Nasm < Formula sha256 "78a5c441bb57c5cb0a70a54183fa5685b1f31800f0fa13f97d36b01029f0f243" => :catalina sha256 "f9cfc8ad4a4a6e671da2ab8fd12ea19faac331bc427b54b16f5ece9e29a50843" => :mojave sha256 "269f9428ff92c073e4d9d7313d76bbfb11b4d971819d6c807cc09b75c2e2748e" => :high_sierra + sha256 "873b969d74b73e91e80e576aaab61a0d8e9f8d74ceb566cdf83cdd2d3febb8a7" => :x86_64_linux end head do diff --git a/Formula/natalie.rb b/Formula/natalie.rb index 3e106bdfa00ce..07c6e3141ba41 100644 --- a/Formula/natalie.rb +++ b/Formula/natalie.rb @@ -13,7 +13,7 @@ class Natalie < Formula sha256 "dd51e00a1969ffdd478e954bed48bedd1c5a9813b67931aa146711f49cb58223" => :high_sierra end - depends_on :xcode => ["9.4", :build] + depends_on :xcode => ["9.4", :build] if OS.mac? def install system "swift", "build", "--disable-sandbox", "-c", "release", "--static-swift-stdlib" diff --git a/Formula/nativefier.rb b/Formula/nativefier.rb index c354d17230216..b271211d83f4e 100644 --- a/Formula/nativefier.rb +++ b/Formula/nativefier.rb @@ -11,6 +11,7 @@ class Nativefier < Formula sha256 "330bdc626c754bec5d99aee484139c2c5feaa6f5793ef12ad2246e36376bf03d" => :catalina sha256 "c241951545708abf02ebe88bf208e18aaba9d11e23a4e1b411200d7c17540c92" => :mojave sha256 "7d74b9bd002ae241140ea4ca2b33dd466dd795f0fb29e28d9e7f80a53f0c9f47" => :high_sierra + sha256 "547a528b60267b325530a2752d0f5704044d6851948021ea0477b85d2d70a6cd" => :x86_64_linux end depends_on "node" diff --git a/Formula/nats-server.rb b/Formula/nats-server.rb index 4a41562157e66..0ea83ce93cee6 100644 --- a/Formula/nats-server.rb +++ b/Formula/nats-server.rb @@ -10,6 +10,7 @@ class NatsServer < Formula sha256 "75373587ef838b12f3ace83a39e8987496d551c786711ccd46c4f1d3c038d44c" => :catalina sha256 "66a6cb75b86ccc17aebd7d1494de0fdf06b880186a0e1cbac2eb131e870cf461" => :mojave sha256 "2c3f3a8192cc2358a30c0a8d6bccc1bd6faf2f4e49c726dfb8d71606496ea6f1" => :high_sierra + sha256 "3b8fcaf0472982a676be5766c3e3a6826d38edfc92b4d9faec5b44ac8d2c1af8" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/nats-streaming-server.rb b/Formula/nats-streaming-server.rb index 9974e4bac91a2..6b2040a007193 100644 --- a/Formula/nats-streaming-server.rb +++ b/Formula/nats-streaming-server.rb @@ -10,6 +10,7 @@ class NatsStreamingServer < Formula sha256 "a06f30c69dd3207cb6d57af4e360228d6e322a5f11da0ee6b953f64a7f8f7c0e" => :catalina sha256 "35893ee9e92a67a057358be54b30f37ddfb44210feac598e80c0646bd3aec3ff" => :mojave sha256 "00f582b64e5cf8c8170f0b9fff79a37d82d60d2ac8af18ac5ea703a779924a72" => :high_sierra + sha256 "01dc9118c93e961d75c7808a0bd31dda19a078f906d7b46daf9c2b100b386125" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/nauty.rb b/Formula/nauty.rb index 428879d4cc6f7..226b941620292 100644 --- a/Formula/nauty.rb +++ b/Formula/nauty.rb @@ -10,6 +10,7 @@ class Nauty < Formula sha256 "5d118260b6fdabceb476c1421e4b4dd41d3027943b623ff7a4dc81baf6e284b9" => :catalina sha256 "2fa3783663f6e67d9a6e42c492c68412fdeeff7201d81e557b75927ff50b78f1" => :mojave sha256 "a5333c52eecb023c23be9638ebd916606db43f8f7ef1d7ada4877ca00355d65a" => :high_sierra + sha256 "a1b43c456103ecf2c1200ede8adbc6ab728527ceb711148edd848950a3917440" => :x86_64_linux end def install diff --git a/Formula/navi.rb b/Formula/navi.rb index 9327268b47aa2..5676faf7d7ad5 100644 --- a/Formula/navi.rb +++ b/Formula/navi.rb @@ -9,11 +9,14 @@ class Navi < Formula sha256 "4bb0a094d284ae344216ff510acab238c0ac9de53d62718736692ddcfa82b4d3" => :catalina sha256 "d01ac98c9b810e673232f9e56aaa8e3316866d0e3579d7a3ab349fc68cc68f6f" => :mojave sha256 "05e2b50a3d499792f11f3faa95afb74e4c4d3b1556a6ab53b65f43cbb62ff1f2" => :high_sierra + sha256 "887c74c01a0d7a26dcc438ed8f6eb9dde90126d29b6a5751f227b1bfc3a09359" => :x86_64_linux end depends_on "rust" => :build depends_on "fzf" + uses_from_macos "zlib" + def install system "cargo", "install", *std_cargo_args end diff --git a/Formula/nbdime.rb b/Formula/nbdime.rb index 9deff83652149..be8edba08990a 100644 --- a/Formula/nbdime.rb +++ b/Formula/nbdime.rb @@ -5,19 +5,23 @@ class Nbdime < Formula homepage "https://nbdime.readthedocs.io" url "https://files.pythonhosted.org/packages/92/84/6358505bef11c164fce3b747b4193ec9d9617cb2db9bb6c60c9f6d30109c/nbdime-2.0.0.tar.gz" sha256 "896f79a23557f190b73a3981fdceb128a2d24454701daef74d82aac2aa10715d" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation sha256 "bc9d3b4ad550bd9f907b54e13a7879661da04102cd689abe87dc8f7e4a31b93b" => :catalina sha256 "2f73b31f7e365e8680cc146bbd53445e0c24996127e7d3c3d1fe9d945ea52959" => :mojave sha256 "3d5a18f4e22e1d704d23a3dbafed19261d2b0bc74036443fff65c6038b7c3dc9" => :high_sierra + sha256 "fc1cf3a3b36ee0878ff3ef886a86ba842b8be9316383c16672da33a016276f48" => :x86_64_linux end depends_on "python@3.8" - resource "appnope" do - url "https://files.pythonhosted.org/packages/26/34/0f3a5efac31f27fabce64645f8c609de9d925fe2915304d1a40f544cff0e/appnope-0.1.0.tar.gz" - sha256 "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" + if OS.mac? + resource "appnope" do + url "https://files.pythonhosted.org/packages/26/34/0f3a5efac31f27fabce64645f8c609de9d925fe2915304d1a40f544cff0e/appnope-0.1.0.tar.gz" + sha256 "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71" + end end resource "attrs" do diff --git a/Formula/nbimg.rb b/Formula/nbimg.rb index 4f49ce2631ae3..6d94361e3bf1a 100644 --- a/Formula/nbimg.rb +++ b/Formula/nbimg.rb @@ -13,6 +13,7 @@ class Nbimg < Formula sha256 "402904e3588fe5a8ae00d7131fe29821880f31a8ec19fb89e70a79f76e067452" => :el_capitan sha256 "7e5f47c47238a5e6b0abca121880c72e78e29d0638924afa75ed999286dc934b" => :yosemite sha256 "5389c76ef785f2d7d7ce695dc5b9a1bbecf3dd8eb3fcc8646a28a8b52dfa6a96" => :mavericks + sha256 "a3a9e6cbde8903e6a767ac2e5d40b59c5047a60bb44ce01ee08e83aadc9c2100" => :x86_64_linux end def install diff --git a/Formula/ncdc.rb b/Formula/ncdc.rb index 4f32bd2642c5a..2d89a26a20065 100644 --- a/Formula/ncdc.rb +++ b/Formula/ncdc.rb @@ -10,6 +10,7 @@ class Ncdc < Formula sha256 "4490571bb2101e00e3edc39ab25baf75a63dfd9617381ae0f102a274a2fbf622" => :mojave sha256 "bd143dd032839762597253796c562607e43c654c128d4f4162fd382fd660dbfd" => :high_sierra sha256 "59f5011b9c39b78c75a2bf5d93ae398a16660852a3b8fd8ed3a3389ea463fbf7" => :sierra + sha256 "f72b8b67691feae62042732b2915c4fb47e9e653fb57d4c2fab44f62c8eef68e" => :x86_64_linux end head do diff --git a/Formula/ncdu.rb b/Formula/ncdu.rb index cc3127eac9ba2..9adf45601b675 100644 --- a/Formula/ncdu.rb +++ b/Formula/ncdu.rb @@ -9,6 +9,7 @@ class Ncdu < Formula sha256 "994f7f4e9624a0984ec7c37b5b15b9ae5c24663ebffaba19b0979f4e99919fee" => :catalina sha256 "f7908eaf47c7842b15e56e17279583f4c938a9c920e1bae41f05d3e5506a99fb" => :mojave sha256 "d094385dbfd71831c5f2b03f0817a06df9471a44f5437aaf577676d2723bc865" => :high_sierra + sha256 "cba821cb164e136af9f8a655766ff4d737c0014a126149cb4976094ed06d2168" => :x86_64_linux end head do diff --git a/Formula/ncftp.rb b/Formula/ncftp.rb index ad925eed2e429..4eca6e0b52dca 100644 --- a/Formula/ncftp.rb +++ b/Formula/ncftp.rb @@ -12,6 +12,7 @@ class Ncftp < Formula sha256 "25caf7d9c7ac3c1642d3d205fcedfbea05878798033c0ff82cc3b5fbab4674d5" => :sierra sha256 "821f66bcd8991168314bb77f1404b3af6f93fda5c4fdcb3c651d3b7fbdd7f4fe" => :el_capitan sha256 "ac12f87bb648eb4dde883ad5ccca0c8cf80c60e1437ce03e5fc8d768fcec1bde" => :yosemite + sha256 "56fc2ac2646ff028578711afe50279af74d5625965ab1e2543a28bdf35592eda" => :x86_64_linux end def install diff --git a/Formula/ncmpc.rb b/Formula/ncmpc.rb index 3a6fe7a7d5709..e6398ec8419c3 100644 --- a/Formula/ncmpc.rb +++ b/Formula/ncmpc.rb @@ -5,20 +5,25 @@ class Ncmpc < Formula sha256 "2bc1aa38aacd23131895cd9aa3abd9d1ca5700857034d9f35209e13e061e27a2" bottle do - cellar :any sha256 "ca880e781bb617e6fbbcfb70168ac8939b8b5a04bbc24128d68bb9450b4af498" => :catalina sha256 "aacbb298f4ceb0911d117babf04e5ce7e2dc17f8999805bc40cd784c256814be" => :mojave sha256 "7891f4939522591774bdeab323a49c53f3f0742f64eed19389ece06762b2beec" => :high_sierra + sha256 "0bff9afcb637717dbfe70b964da475d071522223bb78e5bfa12872ac2b292425" => :x86_64_linux end depends_on "boost" => :build depends_on "meson" => :build depends_on "ninja" => :build depends_on "pkg-config" => :build - depends_on "gcc" if DevelopmentTools.clang_build_version <= 800 depends_on "gettext" depends_on "libmpdclient" depends_on "pcre" + if OS.mac? + depends_on "gcc" if DevelopmentTools.clang_build_version <= 800 + else + fails_with :gcc => "5" + depends_on "gcc@6" => :build + end fails_with :clang do build 800 diff --git a/Formula/ncmpcpp.rb b/Formula/ncmpcpp.rb index d2b6b59349e1e..a36d416a33a9b 100644 --- a/Formula/ncmpcpp.rb +++ b/Formula/ncmpcpp.rb @@ -30,7 +30,7 @@ class Ncmpcpp < Formula def install ENV.cxx11 - ENV.append "LDFLAGS", "-liconv" + ENV.append "LDFLAGS", "-liconv" if OS.mac? ENV.append "BOOST_LIB_SUFFIX", "-mt" ENV.append "CXXFLAGS", "-D_XOPEN_SOURCE_EXTENDED" diff --git a/Formula/ncompress.rb b/Formula/ncompress.rb index 62ca189ac59d7..b06275e9edb33 100644 --- a/Formula/ncompress.rb +++ b/Formula/ncompress.rb @@ -10,6 +10,7 @@ class Ncompress < Formula sha256 "cc232677371ee83d7af62598553c028e11071e309d8620818965b94d2a43b9a4" => :catalina sha256 "c5d28fad3558616e2347c16a3aa8a353c7c5b0317c175a1b99e5d6e0f6bae736" => :mojave sha256 "b1fa7c42647c420dd48849ad9fb0f05da911ef3bec9459f9ba3892de2d05a58b" => :high_sierra + sha256 "7614c9b5fdd47233a4d5a7a9c1c89f998f88d7a8fcfeeb22e3cf35bba61ef178" => :x86_64_linux end keg_only :provided_by_macos diff --git a/Formula/ncp.rb b/Formula/ncp.rb index 705b82d808406..fb99f2fe0b08a 100644 --- a/Formula/ncp.rb +++ b/Formula/ncp.rb @@ -13,6 +13,7 @@ class Ncp < Formula sha256 "2c56e482f1608eeb3925f4db0b1ef782fb1644d2a7318e522a4a3c7ba7efcdd4" => :high_sierra sha256 "d261de84549f890b4a3ca4c9f9d72ec25dd5a66c77fbccf6c29577c49a3c0866" => :sierra sha256 "08f17ef57ee62eb3ca90c7c033fba68edc2822d93689ddabdcaa49913c98f369" => :el_capitan + sha256 "5dfba4e13df632656268bee49548b9e309dd02a353bef5e21b8d00043de7d9d8" => :x86_64_linux end depends_on "libowfat" diff --git a/Formula/ncrack.rb b/Formula/ncrack.rb index 61d0bd4ec6024..4f090c89ac162 100644 --- a/Formula/ncrack.rb +++ b/Formula/ncrack.rb @@ -10,6 +10,7 @@ class Ncrack < Formula sha256 "b323c29b588f397487e74ee9e7312a8344a4b4c728043cf825838a0e19c58c17" => :mojave sha256 "297c3ca427025e5e07a435e8c46f96846c10c88a3a19eaf432639d05c1e82d12" => :high_sierra sha256 "5f1be0ae0ed5b38dc19ff32b4b157b81929bbfa2e8ebf524f0406a5dca962fc2" => :sierra + sha256 "6961f7401eb9eac1baaca4f59455ebb254a538689bb62d4b79e76505cff952ec" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/ncurses.rb b/Formula/ncurses.rb index 505d0054b66b0..1b957a5bfe120 100644 --- a/Formula/ncurses.rb +++ b/Formula/ncurses.rb @@ -9,11 +9,13 @@ class Ncurses < Formula sha256 "eae51ad3391edafe3d6c649ba44f607ee1464b4b5d9ee48770e9817ee5f0ccdd" => :catalina sha256 "1771e0ce821cf8cbe38d0ce8d1843fd559532923222edc5dbf5b31fcf24fed90" => :mojave sha256 "4648be8457b081026d3da80f290abaf3fbfdcb49d62914861a63fc706f9adabe" => :high_sierra + sha256 "fc5a0983a8afae8ef46945f3bec9dba9d66e81e879027d100d05088ea6f8043d" => :x86_64_linux end keg_only :provided_by_macos depends_on "pkg-config" => :build + depends_on "gpatch" => :build unless OS.mac? def install system "./configure", "--prefix=#{prefix}", @@ -23,7 +25,8 @@ def install "--enable-symlinks", "--enable-widec", "--with-shared", - "--with-gpm=no" + "--with-gpm=no", + *("--without-ada" unless OS.mac?) system "make", "install" make_libncurses_symlinks @@ -35,15 +38,26 @@ def make_libncurses_symlinks major = version.to_s.split(".")[0] %w[form menu ncurses panel].each do |name| - lib.install_symlink "lib#{name}w.#{major}.dylib" => "lib#{name}.dylib" - lib.install_symlink "lib#{name}w.#{major}.dylib" => "lib#{name}.#{major}.dylib" + if OS.mac? + lib.install_symlink "lib#{name}w.#{major}.dylib" => "lib#{name}.dylib" + lib.install_symlink "lib#{name}w.#{major}.dylib" => "lib#{name}.#{major}.dylib" + else + lib.install_symlink "lib#{name}w.so.#{major}" => "lib#{name}.so" + lib.install_symlink "lib#{name}w.so.#{major}" => "lib#{name}.so.#{major}" + end lib.install_symlink "lib#{name}w.a" => "lib#{name}.a" lib.install_symlink "lib#{name}w_g.a" => "lib#{name}_g.a" end lib.install_symlink "libncurses++w.a" => "libncurses++.a" lib.install_symlink "libncurses.a" => "libcurses.a" - lib.install_symlink "libncurses.dylib" => "libcurses.dylib" + if OS.mac? + lib.install_symlink "libncurses.dylib" => "libcurses.dylib" + else + lib.install_symlink "libncurses.so" => "libcurses.so" + lib.install_symlink "libncurses.so" => "libtermcap.so" + lib.install_symlink "libncurses.so" => "libtinfo.so" + end (lib/"pkgconfig").install_symlink "ncursesw.pc" => "ncurses.pc" (lib/"pkgconfig").install_symlink "formw.pc" => "form.pc" diff --git a/Formula/ncview.rb b/Formula/ncview.rb index 2525be4aafd34..f5b3cbcb3aa8f 100644 --- a/Formula/ncview.rb +++ b/Formula/ncview.rb @@ -10,12 +10,14 @@ class Ncview < Formula sha256 "0a1594bb793189d1359cbd800e44d830cc9cf39b713d71128d41323b284e687a" => :catalina sha256 "d0b8e9fb871edf26633325c7309269689d0b4bd858f16a45527230dc16533abf" => :mojave sha256 "5511d243f73fd1a7867bb4dd0263afe215dd0e4e29ef77199efee5db08c2d207" => :high_sierra + sha256 "972f7559569d1ef6a1ad44f186514214857e0916e7fcff60aa401013e37d2d5d" => :x86_64_linux end depends_on "libpng" depends_on "netcdf" depends_on "udunits" - depends_on :x11 + depends_on :x11 if OS.mac? + depends_on "linuxbrew/xorg/xorg" unless OS.mac? def install # Bypass compiler check (which fails due to netcdf's nc-config being diff --git a/Formula/ndiff.rb b/Formula/ndiff.rb index 5eaca4425e084..3587b9adf18b9 100644 --- a/Formula/ndiff.rb +++ b/Formula/ndiff.rb @@ -13,6 +13,7 @@ class Ndiff < Formula sha256 "6faf20ce4c88110019c76cc4253cd65e5743fab7cff109fc8a7d41c8f411012e" => :el_capitan sha256 "80adff8ec563059b7f49005c7e567b950ca58b392a4a5db18ae4957fe18b296d" => :yosemite sha256 "7451587f9747af6e7ffd0e5dbacd337a72cd9b7f3c45a1240c2033e0731d5d46" => :mavericks + sha256 "530c8cfa5d98ee1a8369af1cac5e83a70a1ff0c488de83a34fbbc648f4ead91b" => :x86_64_linux end conflicts_with "nmap", :because => "both install `ndiff` binaries" diff --git a/Formula/neatvi.rb b/Formula/neatvi.rb index 472c8846d89d2..15e54add8cc98 100644 --- a/Formula/neatvi.rb +++ b/Formula/neatvi.rb @@ -11,6 +11,7 @@ class Neatvi < Formula sha256 "3c839cf593245c6d026d4a547669c29978e3ec64ef9f247630e4d1183db1376f" => :catalina sha256 "12703985422c0a7dd73003a874c0ce747cf3fb3022f674cbb344e7a0d7836ce9" => :mojave sha256 "e7046e2ff2dbe83c98fa1ddf5c06f299ffc45f825c421fccb95b624d104eae3e" => :high_sierra + sha256 "fd9c23f04a139246fff40319182aed35c51885db463621005792817318fa6f5b" => :x86_64_linux end def install diff --git a/Formula/nebula.rb b/Formula/nebula.rb index dc81bc80e4c4a..5149ea22f503d 100644 --- a/Formula/nebula.rb +++ b/Formula/nebula.rb @@ -9,6 +9,7 @@ class Nebula < Formula sha256 "5d3c7165792a6af1ca242ad8cb2e1466eb2ed29973f0b0a303cc1b995389a7d8" => :catalina sha256 "3da3e3c250ab1727bff0b22c0d84daa4d6ea52d113b46626d6990bdc046cdfd2" => :mojave sha256 "f82f0b0f5d11c9b5e82ee2719270f9a5260689c75fe4074e499c3891b0a177bd" => :high_sierra + sha256 "4b512d1f59d8b5eb734477f897400b8875b8db6cfac76bd716bd03585b96cd18" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/neko.rb b/Formula/neko.rb index 33ced308dc36f..26dfec82b8c7d 100644 --- a/Formula/neko.rb +++ b/Formula/neko.rb @@ -12,6 +12,7 @@ class Neko < Formula sha256 "f101a4304c00fef7c7bbe59cc3e13c29bdfd0c8fc6d0675143011157eb3a245b" => :catalina sha256 "1e6101a96f295482f8b4c427ddb4aec296bcf4d43e28f7c004a6b8a14aa8658a" => :mojave sha256 "2bca5474e29dae508cf5095f695fa8348f8b599233ed299b3c693aa02e7f8087" => :high_sierra + sha256 "e6b92b6dbb8b5561321781b4f12ba964eb5b94042f1db86eb330946e4e764a3e" => :x86_64_linux end depends_on "cmake" => :build @@ -21,8 +22,24 @@ class Neko < Formula depends_on "mbedtls" depends_on "openssl@1.1" depends_on "pcre" + unless OS.mac? + depends_on "apr" + depends_on "apr-util" + depends_on "httpd" + # On mac, neko uses carbon. On Linux it uses gtk2 + depends_on "gtk+" + depends_on "pango" + depends_on "sqlite" + end def install + args = std_cmake_args + unless OS.mac? + args << "-DAPR_LIBRARY=#{Formula["apr"].libexec}/lib" + args << "-DAPR_INCLUDE_DIR=#{Formula["apr"].libexec}/include/apr-1" + args << "-DAPRUTIL_LIBRARY=#{Formula["apr-util"].libexec}/lib" + args << "-DAPRUTIL_INCLUDE_DIR=#{Formula["apr-util"].libexec}/include/apr-1" + end inreplace "libs/mysql/CMakeLists.txt", %r{https://downloads.mariadb.org/f/}, "https://downloads.mariadb.com/Connectors/c/" @@ -31,7 +48,7 @@ def install # It is because there is no easy way to define we just need any one of mariadb, mariadb-connector-c, # mysql, and mysql-client. system "cmake", ".", "-G", "Ninja", "-DSTATIC_DEPS=MariaDBConnector", - "-DRELOCATABLE=OFF", "-DRUN_LDCONFIG=OFF", *std_cmake_args + "-DRELOCATABLE=OFF", "-DRUN_LDCONFIG=OFF", *args system "ninja", "install" end diff --git a/Formula/neofetch.rb b/Formula/neofetch.rb index c63e8e286393f..87f35f4c89e39 100644 --- a/Formula/neofetch.rb +++ b/Formula/neofetch.rb @@ -10,10 +10,13 @@ class Neofetch < Formula sha256 "bfb4c9f42eee7659b0028a7d4de28524d5a6eb8f1199f83789fa0242b37c456e" => :catalina sha256 "bfb4c9f42eee7659b0028a7d4de28524d5a6eb8f1199f83789fa0242b37c456e" => :mojave sha256 "bfb4c9f42eee7659b0028a7d4de28524d5a6eb8f1199f83789fa0242b37c456e" => :high_sierra + sha256 "ad35edefef328dd31f22f2afb7b3aa0758a8e3444978a0fbed5e268d919b8e6d" => :x86_64_linux end - depends_on "imagemagick" - depends_on "screenresolution" + if OS.mac? + depends_on "imagemagick" + depends_on "screenresolution" + end def install system "make", "install", "PREFIX=#{prefix}" diff --git a/Formula/neomutt.rb b/Formula/neomutt.rb index 3ea9bfcb5dd15..f089e4404a6cf 100644 --- a/Formula/neomutt.rb +++ b/Formula/neomutt.rb @@ -20,6 +20,10 @@ class Neomutt < Formula depends_on "notmuch" depends_on "openssl@1.1" depends_on "tokyo-cabinet" + unless OS.mac? + depends_on "krb5" + depends_on "libsasl2" + end def install ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" diff --git a/Formula/neovim.rb b/Formula/neovim.rb index e838e25c27a8e..fcb50f095036f 100644 --- a/Formula/neovim.rb +++ b/Formula/neovim.rb @@ -3,11 +3,13 @@ class Neovim < Formula homepage "https://neovim.io/" url "https://github.com/neovim/neovim/archive/v0.4.3.tar.gz" sha256 "91a0b5d32204a821bf414690e6b48cf69224d1961d37158c2b383f6a6cf854d2" + revision 1 unless OS.mac? bottle do sha256 "389ab254794ea04df8a106bf281c227c4fdee27c609d52951f32b9a0239031d6" => :catalina sha256 "fb6cc38c45be4650a4a750a314cec27f6f7643dc7c22a1f5abae347e1b39b388" => :mojave sha256 "b2f7450e005f4eb22bfaf650fe7741fa8629393a947b4dd48c9f91e7fc258113" => :high_sierra + sha256 "1d9227bbfb72a42d49e9997adbb630169b677043ba993bfe2b02692eb5e7431b" => :x86_64_linux end head do @@ -25,6 +27,11 @@ class Neovim < Formula depends_on "luajit" depends_on "msgpack" depends_on "unibilium" + unless OS.mac? + depends_on "unzip" => :build + depends_on "gperf" + depends_on "libnsl" + end resource "mpack" do url "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz" diff --git a/Formula/nestopia-ue.rb b/Formula/nestopia-ue.rb index 6c04f1fbbb254..bfcc1afb8b54e 100644 --- a/Formula/nestopia-ue.rb +++ b/Formula/nestopia-ue.rb @@ -9,6 +9,7 @@ class NestopiaUe < Formula sha256 "19acd9260a874dec614062d0362a5936a0d9322e9fe66f0f8426d0dec67a6dd6" => :catalina sha256 "e41a57949e9ebeffd1fa72de619da0dc2bbc813adf1b83922a0151362a9b9f04" => :mojave sha256 "dc7632deb424cbfd112350aa1ddad0d1b0715cce9ebfda0bbbd8e77640cea044" => :high_sierra + sha256 "c6b4c42c99fffa7706958b3343beb7ca2e4718b5e036b243801176e64b72a342" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/net-snmp.rb b/Formula/net-snmp.rb index e9f2dc921fd32..1bbf34106809b 100644 --- a/Formula/net-snmp.rb +++ b/Formula/net-snmp.rb @@ -10,6 +10,7 @@ class NetSnmp < Formula sha256 "efd1bcbd0e99fc29571de33c64fd1494db705a114778800d8181a27424a24421" => :mojave sha256 "f5774ae4c5cc7f5a7fe5eb9eaa60f35842af5f6c2c184444428cc2e412f040fb" => :high_sierra sha256 "1b1ea4f4456b6fc36c501398852b2e9979791387f38993129382b75782176f97" => :sierra + sha256 "ed3478ed3ee7ea2bdd8d556da0be03a663edf16caf79ec5d167f360fd2217d86" => :x86_64_linux end keg_only :provided_by_macos diff --git a/Formula/net-tools.rb b/Formula/net-tools.rb new file mode 100644 index 0000000000000..10c6150a3f326 --- /dev/null +++ b/Formula/net-tools.rb @@ -0,0 +1,27 @@ +class NetTools < Formula + desc "Linux networking base tools" + homepage "https://sourceforge.net/projects/net-tools" + url "https://git.code.sf.net/p/net-tools/code.git", + # not specyfing a tag, cause upstream did not make a release since a long time... + :revision => "aebd88ef8d6e15f673b62a649a50d07ed727c888" + version "1.60+" + + bottle do + cellar :any_skip_relocation + sha256 "d3356573f08d651305f57af733130adabf68f5f13e92ff4db5cdc0c069a94f73" => :x86_64_linux + end + + depends_on "gettext" => :build + depends_on "libdnet" + depends_on :linux + + def install + system "yes '' | make config" + system "make" + system "make", "DESTDIR=#{prefix}", "update" + end + + test do + system bin/"netstat", "-i" + end +end diff --git a/Formula/netcat.rb b/Formula/netcat.rb index 1b627bbf01576..571662b727032 100644 --- a/Formula/netcat.rb +++ b/Formula/netcat.rb @@ -12,6 +12,7 @@ class Netcat < Formula sha256 "879d9c32f09e9ef31cb672983707f9d95341f6639bb8a4db54d7a6ea0878b946" => :high_sierra sha256 "9027fd429d5407fba0b3206bd0cd198c669f4744155efcf8e0dbdd6ba69b6d34" => :sierra sha256 "1f346605e0236ea7880258da2abf0bde1d7d8d8735a07d6d32feaf12425ff6da" => :el_capitan + sha256 "4e33302ac97830d63c665cd426504368f3b0756119873470c8b3392e7e2cffcb" => :x86_64_linux end def install diff --git a/Formula/netcat6.rb b/Formula/netcat6.rb index 1d3d7a0050b16..b559e5b5b5839 100644 --- a/Formula/netcat6.rb +++ b/Formula/netcat6.rb @@ -10,6 +10,7 @@ class Netcat6 < Formula sha256 "aba098730e397f84b6ed7534b41bd7f65f5f6182189d890ac93216faff2fe9b7" => :mojave sha256 "b3fe44c42b33bc668cdaa0f05eb10a5f9b67891b1947b98abe9cad6464182835" => :high_sierra sha256 "bdb853a9a63a03555682eae734d9d9a7725591dfd16128cf59f208968ef16ef2" => :sierra + sha256 "be703e7dbe6e1b367d7eb01eb66f91ee81dfa8be963c1ec02a7be486fc9be0a3" => :x86_64_linux end def install diff --git a/Formula/netcdf.rb b/Formula/netcdf.rb index a8520c0c7167a..12f4d61aecf0b 100644 --- a/Formula/netcdf.rb +++ b/Formula/netcdf.rb @@ -7,9 +7,11 @@ class Netcdf < Formula head "https://github.com/Unidata/netcdf-c.git" bottle do + cellar :any_skip_relocation sha256 "c7510a4fe72e43f11e642e5f08951ff136ab677579d1208c38471902df92b1cc" => :catalina sha256 "3a4da525b304b8ade90ee27d476fff47ff00ed0a9c482e48f6cbc783a915c35e" => :mojave sha256 "4860a333ac67dee3d27e44c1248ccf106e7e7607386c8d66033e0f16237f0c2f" => :high_sierra + sha256 "9b8f274acb9dbe13bb089550d5762f696e672f6d47435e10df3148fd9eced98a" => :x86_64_linux end depends_on "cmake" => :build @@ -39,7 +41,7 @@ class Netcdf < Formula def install ENV.deparallelize - common_args = std_cmake_args << "-DBUILD_TESTING=OFF" + common_args = std_cmake_args << "-DBUILD_TESTING=OFF" << "-DCMAKE_INSTALL_LIBDIR=#{lib}" mkdir "build" do args = common_args.dup @@ -56,7 +58,7 @@ def install # Add newly created installation to paths so that binding libraries can # find the core libs. - args = common_args.dup << "-DNETCDF_C_LIBRARY=#{lib}/libnetcdf.dylib" + args = common_args.dup << "-DNETCDF_C_LIBRARY=#{lib}/libnetcdf.#{OS.mac? ? "dylib" : "so"}" cxx_args = args.dup cxx_args << "-DNCXX_ENABLE_TESTS=OFF" @@ -95,13 +97,15 @@ def install system "make", "install" end - # SIP causes system Python not to play nicely with @rpath - libnetcdf = (lib/"libnetcdf.dylib").readlink - %w[libnetcdf-cxx4.dylib libnetcdf_c++.dylib].each do |f| - macho = MachO.open("#{lib}/#{f}") - macho.change_dylib("@rpath/#{libnetcdf}", - "#{lib}/#{libnetcdf}") - macho.write! + if OS.mac? + # SIP causes system Python not to play nicely with @rpath + libnetcdf = (lib/"libnetcdf.dylib").readlink + %w[libnetcdf-cxx4.dylib libnetcdf_c++.dylib].each do |f| + macho = MachO.open("#{lib}/#{f}") + macho.change_dylib("@rpath/#{libnetcdf}", + "#{lib}/#{libnetcdf}") + macho.write! + end end end diff --git a/Formula/nethack.rb b/Formula/nethack.rb index 889fa32105cb8..126618110d801 100644 --- a/Formula/nethack.rb +++ b/Formula/nethack.rb @@ -12,6 +12,7 @@ class Nethack < Formula sha256 "69418bfcba43b656118140a7e50992772567c4c2ab4827ce0af343892a149945" => :catalina sha256 "4d186d190dcab9cc719a3868aa73a6c311407f8c1510e1d3bfd185a8070177bc" => :mojave sha256 "6b6b5eb3571c69d31ac0c88f42acae3cea5f42ec513bafd03960db8c9f994177" => :high_sierra + sha256 "7b62ff8bc77a49942b76eb1e5bee8ebcc290a748d80079e492ef5008ffc94ae0" => :x86_64_linux end uses_from_macos "bison" => :build diff --git a/Formula/nethogs.rb b/Formula/nethogs.rb index 002bea32b0104..062a2511651e8 100644 --- a/Formula/nethogs.rb +++ b/Formula/nethogs.rb @@ -9,6 +9,7 @@ class Nethogs < Formula sha256 "6f6124fdf95847d5a49d15733e1bebb0b7060995f7ad672863fcd89bb985ef1d" => :catalina sha256 "e61f5ad80657ad381414c992a391d454689f6845965387c7b803f115b5fd72b4" => :mojave sha256 "f994c61fe07025f7c18de9a15be44c3de107e12c19cde6e3cd53a892cc61b7b4" => :high_sierra + sha256 "2a7db8c708783a5cdafcb01d81c4bb4638ce5d724dab90216f02b40ece13889a" => :x86_64_linux end uses_from_macos "libpcap" diff --git a/Formula/netlify-cli.rb b/Formula/netlify-cli.rb index 324a9305445f4..0298c432ff274 100644 --- a/Formula/netlify-cli.rb +++ b/Formula/netlify-cli.rb @@ -12,6 +12,7 @@ class NetlifyCli < Formula sha256 "91a9b111fcf8e9369c27627dca3649ba5fbb89e60aed80b613bbf2ce84973581" => :catalina sha256 "65fde49929cb622469c83777e405126df49a96b0b243d984d7c714d56b9486ea" => :mojave sha256 "2bc96aa52fb0758cc9756e40a2d20f8220dae9d1796a2892bf021a6dfecde215" => :high_sierra + sha256 "0803ce602ca4b9799c835a52a77b65dad9232530b6ffd4f1ffb22f5f58fa341e" => :x86_64_linux end depends_on "node" diff --git a/Formula/netpbm.rb b/Formula/netpbm.rb index b1a44629d5d11..1bccedc5eca6e 100644 --- a/Formula/netpbm.rb +++ b/Formula/netpbm.rb @@ -13,6 +13,7 @@ class Netpbm < Formula sha256 "37a97b0de551ec64acca8e1c9506e332fa6d89c9e1aabf0a17da0f6eda8209bf" => :catalina sha256 "c41c2506bf6902e2c20ca671b146b7f61b7280f70e592a1c577dc6e6258af8bf" => :mojave sha256 "cd6bde5ae0be1518e7413f5304433635ab6cc30179565b6ed58182081408cf94" => :high_sierra + sha256 "b680aa34d95d893f4a8139603fc1170b42b7ec1a525946020fe6379ccc7fdb4b" => :x86_64_linux end depends_on "subversion" => :build, :since => :catalina @@ -34,10 +35,14 @@ def install inreplace "config.mk" do |s| s.remove_make_var! "CC" - s.change_make_var! "CFLAGS_SHLIB", "-fno-common" - s.change_make_var! "NETPBMLIBTYPE", "dylib" - s.change_make_var! "NETPBMLIBSUFFIX", "dylib" - s.change_make_var! "LDSHLIB", "--shared -o $(SONAME)" + if OS.linux? + s.change_make_var! "CFLAGS_SHLIB", "-fPIC" + elsif OS.mac? + s.change_make_var! "CFLAGS_SHLIB", "-fno-common" + s.change_make_var! "NETPBMLIBTYPE", "dylib" + s.change_make_var! "NETPBMLIBSUFFIX", "dylib" + s.change_make_var! "LDSHLIB", "--shared -o $(SONAME)" + end s.change_make_var! "TIFFLIB", "-ltiff" s.change_make_var! "JPEGLIB", "-ljpeg" s.change_make_var! "PNGLIB", "-lpng" @@ -58,7 +63,8 @@ def install end prefix.install %w[bin include lib misc] - lib.install Dir["staticlink/*.a"], Dir["sharedlink/*.dylib"] + lib.install Dir["staticlink/*.a"] + lib.install Dir["sharedlink/*.dylib"] if OS.mac? (lib/"pkgconfig").install "pkgconfig_template" => "netpbm.pc" end end diff --git a/Formula/netperf.rb b/Formula/netperf.rb index c84c661be2e95..edcfe24f77885 100644 --- a/Formula/netperf.rb +++ b/Formula/netperf.rb @@ -13,6 +13,7 @@ class Netperf < Formula sha256 "cf086e0d276a572aba8318f7080cedc94b36a7b612cdbb4bcc3ceefef0080c53" => :high_sierra sha256 "4d3f648081c84ad697d608b56bcfce3237de7c34c4e4a53d9851628f9d50cd5d" => :sierra sha256 "c6e96625b1f83a7f83d3c9b53b8584ab65d73cfd59bc38672588ba82d37ecc1d" => :el_capitan + sha256 "a1d056b27016b8262bf9960a1d466f536222dba7369e954d1be8fae1a53de83c" => :x86_64_linux end def install diff --git a/Formula/nettle.rb b/Formula/nettle.rb index 1a6d1545c436e..26508b1d5969f 100644 --- a/Formula/nettle.rb +++ b/Formula/nettle.rb @@ -10,6 +10,7 @@ class Nettle < Formula sha256 "7ac7677ba653dbef81dd83ed8cde3dfcb7b464d04442886c396179932f4f9faa" => :catalina sha256 "d378b026725d8d449ca6497ce2158b93c991a0e0326921a5f914bc4847da3a92" => :mojave sha256 "07c65cb4d172b05065dcceb702b41ca3408b31b6154690c7a4cfa430b2de074d" => :high_sierra + sha256 "39f632c5fc91fbeaaeecf0de0b60e0c6297dda86324684967fdb033f1897160a" => :x86_64_linux end depends_on "gmp" @@ -32,6 +33,15 @@ def install system "make" system "make", "install" system "make", "check" + + # Move lib64/* to lib/ on Linux + lib64 = Pathname.new "#{lib}64" + if lib64.directory? + mkdir_p lib + system "mv #{lib64}/* #{lib}/" + rmdir lib64 + inreplace Dir[lib/"pkgconfig/*"], "/lib64", "/lib" + end end test do diff --git a/Formula/nettoe.rb b/Formula/nettoe.rb index 64c0883f5b6c0..3d5c7221e8cf7 100644 --- a/Formula/nettoe.rb +++ b/Formula/nettoe.rb @@ -12,6 +12,7 @@ class Nettoe < Formula sha256 "49ad705043bdd9f1ab860d877d3ffba584bef5ddbd4c03f6fe43adc49b9c1e5d" => :sierra sha256 "c8208683e4730233147e6c7153a469cdc1f477aacde0559937f0da93c8ad0345" => :el_capitan sha256 "78038d253cd382f5f3a6b3b12c7776828c44c1572f0569bec862763aa5141c2a" => :yosemite + sha256 "8e1c49404519fb92debf74026248900db5e369039f7326052e665456840ed15c" => :x86_64_linux end def install diff --git a/Formula/newman.rb b/Formula/newman.rb index 56bcec3b7b29d..80e326c0d5273 100644 --- a/Formula/newman.rb +++ b/Formula/newman.rb @@ -11,6 +11,7 @@ class Newman < Formula sha256 "a00bb88049b63eda5e1f41ad578e28b4a2212984f66a7d441f46c42faf784937" => :catalina sha256 "3bf2bc9c5ddc05b427edfe9c2656fc75634adf46ea987ae143285609708637ed" => :mojave sha256 "48e6e2e69ddd036c090709610a7735dbb13ac96a12b750ccbb6f2195aa5bc531" => :high_sierra + sha256 "f1d39c0b34e3df29e000705167b7216f10269b2b52c1df3b6e3f94e80f5fffd1" => :x86_64_linux end depends_on "node" diff --git a/Formula/newsboat.rb b/Formula/newsboat.rb index dd6f279d131a8..a5b679b9f1884 100644 --- a/Formula/newsboat.rb +++ b/Formula/newsboat.rb @@ -9,6 +9,7 @@ class Newsboat < Formula sha256 "9b650d0f032cd046cc75de2870186977666892ddef0c120e9481d452aed64679" => :catalina sha256 "59c06c5a6b1e7c360f9c31c93e7d2f25296ce8a0048b47ad365cb642c2365d19" => :mojave sha256 "023a4bcb967d4bd7bd052a59167b1581d16e261c1dbe2a0fdac11d8b38ee816d" => :high_sierra + sha256 "5c2ea61d3d8703278622eeeeca0c5a7b7859a6bf0ba952cb5a45c817abf70b7b" => :x86_64_linux end depends_on "asciidoctor" => :build diff --git a/Formula/newt.rb b/Formula/newt.rb index 663292c819fa4..aa2cac5d97a5e 100644 --- a/Formula/newt.rb +++ b/Formula/newt.rb @@ -10,28 +10,34 @@ class Newt < Formula sha256 "2b902ecc6fc52b2f2681eb23e4eb568684a018deeada88e5a920952de8cc1080" => :mojave sha256 "7a88cbe033eb207df57a6410f19339975a672e331c073e3ee79e467652c8753c" => :high_sierra sha256 "4d82531bb783ba5e3f8a64150582e61b2fd4a9fb8be96d0bee88fa3bbe0dc3c3" => :sierra + sha256 "4f72da0d4af62cace8f3291d52453ebd22391ef8740df0eaffcb7e5b0c947137" => :x86_64_linux end depends_on "gettext" depends_on "popt" depends_on "s-lang" + depends_on "python" unless OS.mac? def install args = ["--prefix=#{prefix}", "--without-tcl"] - inreplace "Makefile.in" do |s| - # name libraries correctly - # https://bugzilla.redhat.com/show_bug.cgi?id=1192285 - s.gsub! "libnewt.$(SOEXT).$(SONAME)", "libnewt.$(SONAME).dylib" - s.gsub! "libnewt.$(SOEXT).$(VERSION)", "libnewt.$(VERSION).dylib" - - # don't link to libpython.dylib - # causes https://github.com/Homebrew/homebrew/issues/30252 - # https://bugzilla.redhat.com/show_bug.cgi?id=1192286 - s.gsub! "`$$pyconfig --ldflags`", '"-undefined dynamic_lookup"' - s.gsub! "`$$pyconfig --libs`", '""' + if OS.mac? + inreplace "Makefile.in" do |s| + # name libraries correctly + # https://bugzilla.redhat.com/show_bug.cgi?id=1192285 + s.gsub! "libnewt.$(SOEXT).$(SONAME)", "libnewt.$(SONAME).dylib" + s.gsub! "libnewt.$(SOEXT).$(VERSION)", "libnewt.$(VERSION).dylib" + + # don't link to libpython.dylib + # causes https://github.com/Homebrew/homebrew/issues/30252 + # https://bugzilla.redhat.com/show_bug.cgi?id=1192286 + s.gsub! "`$$pyconfig --ldflags`", '"-undefined dynamic_lookup"' + s.gsub! "`$$pyconfig --libs`", '""' + end end + inreplace "configure", "/usr/include/python", "#{HOMEBREW_PREFIX}/include/python" unless OS.mac? + system "./configure", *args system "make", "install" end diff --git a/Formula/nghttp2.rb b/Formula/nghttp2.rb index e8ecb2b5bd588..e228b8218a121 100644 --- a/Formula/nghttp2.rb +++ b/Formula/nghttp2.rb @@ -8,6 +8,7 @@ class Nghttp2 < Formula sha256 "d81b96cf82189cd4049ff7fe400a4e5b05eed38029d34e8325b751e7b9f3d730" => :catalina sha256 "718a1b33f18b2b72b92110d2fb3f83e9ab6e4831f9bc2bdf7636757129104552" => :mojave sha256 "f56e7c923879fd77d7c9737395c7c5df1ab3e9ffa03baa900385b53a91469803" => :high_sierra + sha256 "0f711a72b48a4aa4f55d041f1e6af92e9eacaed673c9d2ca4019754ab43d689c" => :x86_64_linux end head do @@ -30,6 +31,16 @@ class Nghttp2 < Formula uses_from_macos "zlib" + unless OS.mac? + patch do + # Fix: shrpx_api_downstream_connection.cc:57:3: error: + # array must be initialized with a brace-enclosed initializer + url "https://gist.githubusercontent.com/iMichka/5dda45fbad3e70f52a6b4e7dfd382969/raw/" \ + "19797e17926922bdd1ef21a47e162d8be8e2ca65/nghttp2?full_index=1" + sha256 "0759d448d4b419911c12fa7d5cbf1df2d6d41835c9077bf3accf9eac58f24f12" + end + end + def install ENV.cxx11 @@ -47,7 +58,8 @@ def install system "autoreconf", "-ivf" if build.head? system "./configure", *args system "make" - system "make", "check" + # Fails on Linux: + system "make", "check" if OS.mac? system "make", "install" end diff --git a/Formula/nginx.rb b/Formula/nginx.rb index acd1ab629e246..c2a17c5087f6a 100644 --- a/Formula/nginx.rb +++ b/Formula/nginx.rb @@ -11,15 +11,21 @@ class Nginx < Formula sha256 "4a86d7460ef0a195e34aae7b3e0b8234760c6285cc2014a2ae934aeff5e57c90" => :catalina sha256 "5d8db0e84c8238a8bf4cc89289ddb7f4cd9b3dd60cc1c3fd3e888268eebc97d5" => :mojave sha256 "1b3ce24465950119f814189c7f3261ce9d84e95e0223cd010c0eb12900db6cf1" => :high_sierra + sha256 "3116eca5ccfe9c60ed4392622bfa52afdc97d65370a4c0957221a9af9a6107d1" => :x86_64_linux end depends_on "openssl@1.1" depends_on "pcre" + uses_from_macos "xz" => :build # for the tar command in the install step + def install # keep clean copy of source for compiling dynamic modules e.g. passenger (pkgshare/"src").mkpath - system "tar", "-cJf", (pkgshare/"src/src.tar.xz"), "--options", "compression-level=9", "." + system "tar", "-cJf", + (pkgshare/"src/src.tar.xz"), + *("--options" if OS.mac?), + *("compression-level=9" if OS.mac?), "." # Changes default port to 8080 inreplace "conf/nginx.conf" do |s| diff --git a/Formula/ngircd.rb b/Formula/ngircd.rb index 599bb95cdb732..506aa2e4ed31f 100644 --- a/Formula/ngircd.rb +++ b/Formula/ngircd.rb @@ -10,6 +10,7 @@ class Ngircd < Formula sha256 "129bf331b86f1d54735cf773a36b402323af0667afc1e2a1da4554899d05e8e3" => :catalina sha256 "7fdce95437555b6de33aa1b0c9d3e3441405b5d3c9ec2f728a7b28f35983402d" => :mojave sha256 "b58cacea0c009487e46b48d7220623001e49ad31722704ee805fd7029313f5d6" => :high_sierra + sha256 "aa396991d5dba0e4223b1335dad39f3d1f9db97440be0dea857574a933765d17" => :x86_64_linux end depends_on "libident" diff --git a/Formula/ngspice.rb b/Formula/ngspice.rb index 072c34a91731d..4452af3415327 100644 --- a/Formula/ngspice.rb +++ b/Formula/ngspice.rb @@ -8,6 +8,7 @@ class Ngspice < Formula sha256 "924b787c656fc7062bd5e3c96b0a2b33f458013d27c1aa55cd85f56218ac7a8e" => :catalina sha256 "7a93fe4be3e1508b76d1549ee9d749fbcadb801dc0d2333d0d3042880044ad96" => :mojave sha256 "c8c737e0652d05084ed7496af7bc0e1cb55e9f6b2a1ccaaaeff5a436a0d96f92" => :high_sierra + sha256 "76564b8719b1b5439dd7803a386702e59295816db3d88cfe5f9b3a6092c5dfcd" => :x86_64_linux end head do diff --git a/Formula/ngt.rb b/Formula/ngt.rb index 4b5909c447644..a31acb78ad534 100644 --- a/Formula/ngt.rb +++ b/Formula/ngt.rb @@ -9,6 +9,7 @@ class Ngt < Formula sha256 "20d0b230f7a4ca0c478402e827ffbc1d5c3492818622bfede04b5c60a5daa9f2" => :catalina sha256 "4dd35ae5acda58cbe9b840a0f45116eb73a2bebcb0752cafc7439c898c3e6bc2" => :mojave sha256 "2a47ea878b03ed9c6bbdfe4007e21b291f2ff3bc6ad7606abe23f1efd5e85d78" => :high_sierra + sha256 "795313f0a7eaf9a8cdc067facca9aafd823db7c2861c1be4c3e4c57d2e08e639" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/nickle.rb b/Formula/nickle.rb index 4afdd8aafb8d1..9468ce5279071 100644 --- a/Formula/nickle.rb +++ b/Formula/nickle.rb @@ -8,6 +8,7 @@ class Nickle < Formula sha256 "d27c9f22a0526d8db09e27371181023ad120132f8a2ae63412b7d3b9e2564f0c" => :catalina sha256 "456ad0c96d0c02e44571cf8e24f4fbe9bc9a1a5296c896a0cfae05fea9e576d2" => :mojave sha256 "5887f0f5de76945279b8fe90c1be0dde47563b4ea5a97433611491c87e2487b3" => :high_sierra + sha256 "571b18cd99150a372a32c302be77fd59e3692d7d633ef6f65e6616bcfc8173e0" => :x86_64_linux end depends_on "readline" diff --git a/Formula/nift.rb b/Formula/nift.rb index 4a60ec004d8cb..a8e356ad6a5b9 100644 --- a/Formula/nift.rb +++ b/Formula/nift.rb @@ -9,8 +9,11 @@ class Nift < Formula sha256 "f08a936baa0f3e81ec0aa8343fb4970c39a7c73b308bad8df4e21fd665320ade" => :catalina sha256 "56e8f7ea837fbff3d3a887bd57134364c55f352c0c4e9a5bf38301dbb7e4bdda" => :mojave sha256 "ad7c89b1c61ba4659dff5fb3b021b3283f253e158ed72830b0598afdc33198c8" => :high_sierra + sha256 "ad8de8249476ad1dc5aa2f4a079fb0b1eff33aabca711da7eef51d0205b71a63" => :x86_64_linux end + depends_on "luajit" unless OS.mac? + def install system "make" system "make", "install", "PREFIX=#{prefix}" diff --git a/Formula/nim.rb b/Formula/nim.rb index c60c235b7d4b7..fa8148a30d051 100644 --- a/Formula/nim.rb +++ b/Formula/nim.rb @@ -9,6 +9,7 @@ class Nim < Formula sha256 "d9893915c7306617053c8e74b383315a573d624e396e1fa9c9bef069446d29b5" => :catalina sha256 "206367c0fec082a793187aff91fe92cb350cd95db78ec96d844d488ee4e88a64" => :mojave sha256 "57cfb08ba8102472526a48cb9870b8a2ce32fd864ff10c9a833c8d78aac70766" => :high_sierra + sha256 "f36ccc9618eb59f12472af837b7272275ed179c6e2589f92253ee0a75c523125" => :x86_64_linux end head do diff --git a/Formula/ninja.rb b/Formula/ninja.rb index 9b1069a5e9a56..8a8f6ab366ffd 100644 --- a/Formula/ninja.rb +++ b/Formula/ninja.rb @@ -3,6 +3,7 @@ class Ninja < Formula homepage "https://ninja-build.org/" url "https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz" sha256 "3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f" + revision 1 unless OS.mac? head "https://github.com/ninja-build/ninja.git" bottle do @@ -10,9 +11,14 @@ class Ninja < Formula sha256 "b536415ef20ab14e808ef3fe558bbcd4c86de048d7e47cc86906fed4e1507fdc" => :catalina sha256 "07c7d5eab06643969950a168b7a4ce34a39d236869e909942294eb136dfe3063" => :mojave sha256 "e413c88eed509424d118a0b61b7b3c63535fc7c8c92cd336322db7a8af9cf6e0" => :high_sierra + sha256 "ddec6959492b9366a5f53660885844e66465338563a79c5e1d386459be44e92e" => :x86_64_linux end + depends_on "python@3.8" => :build unless OS.mac? + def install + ENV.prepend_path "PATH", Formula["python@3.8"].opt_libexec/"bin" unless OS.mac? + system "python", "configure.py", "--bootstrap" # Quickly test the build diff --git a/Formula/nkf.rb b/Formula/nkf.rb index 7bb3c2f07f9fd..982d5c9b5342b 100644 --- a/Formula/nkf.rb +++ b/Formula/nkf.rb @@ -11,6 +11,7 @@ class Nkf < Formula sha256 "85183c457daaecd9a3ce59cea556189ad0131c6134d77e7890643a3fb75e3965" => :mojave sha256 "9af47f293d4531c8d7ec5a81bd041349773f982b9710edca03eb3eb59b02a8b5" => :high_sierra sha256 "8d908ee97c34e85ed85c268c895e143d57c7afdd9bc232a75b690067281765fc" => :sierra + sha256 "b7933d88c02d33188891fb70619bd807cc18658b6d7823d3e48894df27725d9b" => :x86_64_linux end def install diff --git a/Formula/nload.rb b/Formula/nload.rb index 09439601d70eb..9d6ed61181b6b 100644 --- a/Formula/nload.rb +++ b/Formula/nload.rb @@ -10,6 +10,7 @@ class Nload < Formula sha256 "2e566035d80abd97c43955ac5fa05ba347b67dbbd10d0543faef3cf5cc7b0bfb" => :catalina sha256 "1dbf614f22611f66ee49efa6b1f5a1af29066be04e461d56e9766b84aeb68077" => :mojave sha256 "3bcdee6e4f2e404d0ec728620b025524de265f94fccc290b29fc81f04f85be36" => :high_sierra + sha256 "a142f2d9f70c0686669f5d744b986ee3244ee29274d30e8471ca176d4361317d" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/nlohmann-json.rb b/Formula/nlohmann-json.rb index fe72db669d4a0..cc8440954ce6d 100644 --- a/Formula/nlohmann-json.rb +++ b/Formula/nlohmann-json.rb @@ -10,6 +10,7 @@ class NlohmannJson < Formula sha256 "9479d4d551e9d1a65641770101eaabaf38b5b1b26f4dc91bbd1038de8b8e6daf" => :catalina sha256 "9479d4d551e9d1a65641770101eaabaf38b5b1b26f4dc91bbd1038de8b8e6daf" => :mojave sha256 "9479d4d551e9d1a65641770101eaabaf38b5b1b26f4dc91bbd1038de8b8e6daf" => :high_sierra + sha256 "91cf1dddd722527b6367c1f55b9859b7de3df73d6f961f1103980edbc30bdc06" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/nlopt.rb b/Formula/nlopt.rb index 536cf6b1f22c0..5be6d79538474 100644 --- a/Formula/nlopt.rb +++ b/Formula/nlopt.rb @@ -6,9 +6,11 @@ class Nlopt < Formula head "https://github.com/stevengj/nlopt.git" bottle do + cellar :any sha256 "67fbb937e618ea96f22cae30d9f71c3abc4d36b8e9b3d48a0ac47074189da936" => :catalina sha256 "849095263f9cac072ca976169f1689ed51b04be20f89e219513bcc7db8a01937" => :mojave sha256 "aef5b9054a8b604ad90fa7bb689b3daa3b671b9d65f16e53d25b7a9fa8e074d8" => :high_sierra + sha256 "06e2dc77c54ab3ed90548af0de213a2ef688ef4e856eccf0ccab96f9ad1a56f7" => :x86_64_linux end depends_on "cmake" => [:build, :test] diff --git a/Formula/nmap.rb b/Formula/nmap.rb index b6352b229505b..a067ad2f5272d 100644 --- a/Formula/nmap.rb +++ b/Formula/nmap.rb @@ -11,6 +11,7 @@ class Nmap < Formula sha256 "bc12b9340cf3c23ac9f5a4eb6102884baf556b2347f46c3971600b91fb081125" => :mojave sha256 "3cbc937428a7db08be8fa106b3a70ffad16f4a4d80808d2113490dd9ab60786c" => :high_sierra sha256 "afa1fde2e44927ccb36447a0ce1dde08927ae67fd789afeb3883a95bd61edbc4" => :sierra + sha256 "6bd59ba3672a7b134a12c7cb46c1ca3c9616f7c410f4a93cde10cdd8f2d5470f" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/nng.rb b/Formula/nng.rb index 1d4dbffd9d881..ab8f0eaad1e95 100644 --- a/Formula/nng.rb +++ b/Formula/nng.rb @@ -8,6 +8,7 @@ class Nng < Formula sha256 "feea9c352fd19ca9d625a4b64458a7b7cedd3d027e2c1065dfdede3f4cdd81e7" => :catalina sha256 "832c27a3418c241ec128f93ccb395c21a53de85942bacf91eb110456500c9294" => :mojave sha256 "79f4d2e9a49be6044dde80c90b7ebb0cb781b86ece50bfb2cdab11c401b70244" => :high_sierra + sha256 "9f2b0aa65fc28cbc65e78eb5718974ecfabd0003c6aeda1d254b38eb56f0cd53" => :x86_64_linux end depends_on "asciidoctor" => :build diff --git a/Formula/nnn.rb b/Formula/nnn.rb index c4f2e932e7a3d..7e68b5063b1f3 100644 --- a/Formula/nnn.rb +++ b/Formula/nnn.rb @@ -10,6 +10,7 @@ class Nnn < Formula sha256 "03b76b59a614592af2124a28a93002a524401fe3e59044ccaa73b0c19e4510d3" => :catalina sha256 "61f5a2b9a55a57121752c805f49f9978d6fccb6aae8a90d1889004b6298926a4" => :mojave sha256 "453a6724e2dabfe6a1b0dd059b421788f0243fc07ed3703fc822edf4584a4b6d" => :high_sierra + sha256 "a3cb4cb6bb9afd70c1811b63363b20209d136d7f6b7f426f28aacb696275693e" => :x86_64_linux end depends_on "readline" @@ -25,6 +26,10 @@ def install end test do + # Test fails on CI: Input/output error @ io_fread - /dev/pts/0 + # Fixing it involves pty/ruby voodoo, which is not worth spending time on + return if !OS.mac? && ENV["CI"] + # Testing this curses app requires a pty require "pty" diff --git a/Formula/no-more-secrets.rb b/Formula/no-more-secrets.rb index ac2ed0cd685fb..546716328da45 100644 --- a/Formula/no-more-secrets.rb +++ b/Formula/no-more-secrets.rb @@ -11,6 +11,7 @@ class NoMoreSecrets < Formula sha256 "ad2927337af4e85d6bff3fbdcfeb2e435c85de8d527d23a3644c7add3c7acab0" => :high_sierra sha256 "97ff320dd7639a7a71fbfa4f7e72fb7c66e4b60ea0f6a6adc4583c63cbda05ac" => :sierra sha256 "78c52bd9f179967cb240c8f49763e03e512092ee476b73e38166bfa79757664f" => :el_capitan + sha256 "d5f1a4c9cd5475c3c827311068e2dac60cdc3bda46ecaa5d1925bba8fd868312" => :x86_64_linux end def install diff --git a/Formula/node-sass.rb b/Formula/node-sass.rb index 5a05c50655f12..57f8abc7fd333 100644 --- a/Formula/node-sass.rb +++ b/Formula/node-sass.rb @@ -11,6 +11,7 @@ class NodeSass < Formula sha256 "d537d2b694e096afcd4a60d5ad23c14eecb947622a57b68bf8711a5376e9ebdf" => :catalina sha256 "5aa46ab77bb306f631759a1cfd502191e8071e3ab4fd3253431dbdd3a03379f1" => :mojave sha256 "4fbb3afabbb12ae7bc1cc3c536e48992e67941f803c5eb510dbc9f0c796f2d17" => :high_sierra + sha256 "88e5165bbaaf1d7c3fd905f21922af0e863af861963c6b09069f7f9ac82d247d" => :x86_64_linux end depends_on "node" diff --git a/Formula/node.rb b/Formula/node.rb index 83869424a029e..723ecd611c3c3 100644 --- a/Formula/node.rb +++ b/Formula/node.rb @@ -10,6 +10,7 @@ class Node < Formula sha256 "7fbf484b2c921451809192dba684a838ba387a4affc1d4380ebb607f95ccf0ec" => :catalina sha256 "06ef204701e93bbcf3909dba4ac9d3ca1d4df00a980f03cbeab390be1c562d34" => :mojave sha256 "68c7e5ff3e93bda3795d954b83609282f9ccf3cbe8096affeb28179d1fc1bd1d" => :high_sierra + sha256 "59c0b25415730182ef94a0dca61a9a0c6a2fd4792ab14cfaa74a0a0e1970b415" => :x86_64_linux end depends_on "pkg-config" => :build @@ -99,8 +100,10 @@ def post_install assert_predicate HOMEBREW_PREFIX/"bin/npm", :exist?, "npm must exist" assert_predicate HOMEBREW_PREFIX/"bin/npm", :executable?, "npm must be executable" npm_args = ["-ddd", "--cache=#{HOMEBREW_CACHE}/npm_cache", "--build-from-source"] - system "#{HOMEBREW_PREFIX}/bin/npm", *npm_args, "install", "npm@latest" - system "#{HOMEBREW_PREFIX}/bin/npm", *npm_args, "install", "bufferutil" unless head? + system "#{HOMEBREW_PREFIX}/bin/npm", *npm_args, "install", ("--unsafe-perm" if Process.uid.zero?), "npm@latest" + unless head? + system "#{HOMEBREW_PREFIX}/bin/npm", *npm_args, "install", ("--unsafe-perm" if Process.uid.zero?), "bufferutil" + end assert_predicate HOMEBREW_PREFIX/"bin/npx", :exist?, "npx must exist" assert_predicate HOMEBREW_PREFIX/"bin/npx", :executable?, "npx must be executable" assert_match "< hello >", shell_output("#{HOMEBREW_PREFIX}/bin/npx cowsay hello") diff --git a/Formula/node@12.rb b/Formula/node@12.rb index 3af87f4791a0d..6dc913f30b700 100644 --- a/Formula/node@12.rb +++ b/Formula/node@12.rb @@ -9,6 +9,7 @@ class NodeAT12 < Formula sha256 "8225f6b3fae5c26fd2925a6ce270124e7b63988229b55ca5699b55acfa0e694c" => :catalina sha256 "cbb2eaaa45c608f8de9037cd9dcafaba5cea8d56efd75bd54bef4e68e3c6505b" => :mojave sha256 "d4b91c2d0815ac6f2002b54a3eb0af1ef22e02a299c5c4fce65611a8e574b514" => :high_sierra + sha256 "be1960f91df75fb00261f2dfd5f990f662e4a615a1a966d5e56b09b714368cb6" => :x86_64_linux end keg_only :versioned_formula @@ -48,8 +49,10 @@ def post_install assert_predicate bin/"npm", :exist?, "npm must exist" assert_predicate bin/"npm", :executable?, "npm must be executable" npm_args = ["-ddd", "--cache=#{HOMEBREW_CACHE}/npm_cache", "--build-from-source"] - system "#{bin}/npm", *npm_args, "install", "npm@latest" - system "#{bin}/npm", *npm_args, "install", "bufferutil" + system "#{bin}/npm", *npm_args, "install", ("--unsafe-perm" if Process.uid.zero?), "npm@latest" + unless head? + system "#{bin}/npm", *npm_args, "install", ("--unsafe-perm" if Process.uid.zero?), "bufferutil" + end assert_predicate bin/"npx", :exist?, "npx must exist" assert_predicate bin/"npx", :executable?, "npx must be executable" assert_match "< hello >", shell_output("#{bin}/npx cowsay hello") diff --git a/Formula/nomad.rb b/Formula/nomad.rb index 11895f2d4f824..81d934d0d151b 100644 --- a/Formula/nomad.rb +++ b/Formula/nomad.rb @@ -10,6 +10,7 @@ class Nomad < Formula sha256 "6b28f6f35597d1d8abbc9c2bf939e576a1589d4c464a512f79686de0e0c646b5" => :catalina sha256 "04f65b111785238902f0586a8d54d5636467c1963da741230b1fecfe7bb54fa9" => :mojave sha256 "c8d63cb29684bc567472d537ae602fec78fc117417e0f13809e4dc85cd8114c3" => :high_sierra + sha256 "01d0e09e2b2ba2d59c0caaccb04e393941b99cec5d49b1f2e803ab1cea6ca848" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/nopoll.rb b/Formula/nopoll.rb index 3ae76f73a80fa..2c6381ad777bc 100644 --- a/Formula/nopoll.rb +++ b/Formula/nopoll.rb @@ -12,6 +12,7 @@ class Nopoll < Formula sha256 "dcd358fc9a1f1e106aae15d59b1190956f0ac4e7f52673d24833edca3c1146cb" => :mojave sha256 "16bde638c91fd329d946b5854cd44291cbf516af2888e7880c5fa47dcb777936" => :high_sierra sha256 "dd12a792cc0cb95a56cce2037d22b4c1141b85da48d2c511f6495914351ce2f0" => :sierra + sha256 "1128029c6204cc31215dfc949fe819bb17a34cf16dddcf28020250d79f21ff18" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/noti.rb b/Formula/noti.rb index 664bee345dda4..cc0f1f0056494 100644 --- a/Formula/noti.rb +++ b/Formula/noti.rb @@ -9,6 +9,7 @@ class Noti < Formula sha256 "2c1a4a0b6f970c9cccabcb119b9ec8c43494eba00c14fb2fc851ac4063cb88dc" => :catalina sha256 "013130b6505c40b91c091663726343f92d401727d4b02e84c5268a2a64a22f62" => :mojave sha256 "ed27cb9b0e02a8cd9ef880a95036ffa2159880fff334786ee594fef3677f97d1" => :high_sierra + sha256 "26e50df337b44374b69b14023d6f20156f66de101314e7fed9741dd5bdb4a8a0" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/notifiers.rb b/Formula/notifiers.rb index 477ebd13bf8b7..badd31dcd53a7 100644 --- a/Formula/notifiers.rb +++ b/Formula/notifiers.rb @@ -5,13 +5,14 @@ class Notifiers < Formula homepage "https://pypi.org/project/notifiers/" url "https://files.pythonhosted.org/packages/4f/36/4c300f55949b9be84284d51253ae48d564dc2c4f2bffb94f26c8c1485f07/notifiers-1.2.1.tar.gz" sha256 "34625af405f4aa19293eaaefe145ccc92c6018ae9798f53a03a7fcc996e541aa" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "627cae6d4d4620c83fe486beea84a42868880ba68aedbee156a23d4d9fa0047e" => :catalina sha256 "011b44eafa3ba60a890f050f45c3c0356cabdc449797ceb1ed6cf2c42d844fc0" => :mojave sha256 "99759b6553b572f9b417f500f75c1f6d1a8006265154be77877229ff70683d0a" => :high_sierra + sha256 "98f177c215877b0ed14ef26fa1720818f22d91e8c049e645f8eda07eec249e34" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/now-cli.rb b/Formula/now-cli.rb index 3a74456bbdf29..bded54ccf8604 100644 --- a/Formula/now-cli.rb +++ b/Formula/now-cli.rb @@ -11,6 +11,7 @@ class NowCli < Formula sha256 "db56419b05b4a2984a8fc4e9c82748ff8136ae7539d95750bef0be691b26a725" => :catalina sha256 "e6c305750e8fb94e54425984f5c60bc33fc512e6e04cb8218aaf7612b22c0b92" => :mojave sha256 "ac1ecc0139340ef1ee4a829bbf8ca924f4d449b70cf331e62e0e5afcc36ca446" => :high_sierra + sha256 "ed2cdd6e1f8737fa6a015d0bfaf33b46735c8878a08a0aa5ede1f9033e4c0d68" => :x86_64_linux end depends_on "node" diff --git a/Formula/npth.rb b/Formula/npth.rb index 1f4861395946a..31f84bd54dbc8 100644 --- a/Formula/npth.rb +++ b/Formula/npth.rb @@ -12,6 +12,7 @@ class Npth < Formula sha256 "51a68f02a29f9b1a596048894be6425696872ddbbc928b372c07a5e256df8ba8" => :high_sierra sha256 "930defbdfa6136f82abdaa7efea0328390079d13f284798756997217eb31427d" => :sierra sha256 "8b2591ec804a0e410e8bf8657487f2d26248307e7cf74b2e49906037618ebc03" => :el_capitan + sha256 "5d7dabef2890e1981208c7674a2bb3404978b500331307096a12060d59443108" => :x86_64_linux end def install diff --git a/Formula/nq.rb b/Formula/nq.rb index c4f2dda0d3fe9..b0cafa5ab2d37 100644 --- a/Formula/nq.rb +++ b/Formula/nq.rb @@ -12,6 +12,7 @@ class Nq < Formula sha256 "a6d18f2d7f1fafd661a5d145599969707efe71969ccc6ac34593f3f60c59081a" => :high_sierra sha256 "0e8d6557f7713be4c1e5074ea909d36cd12e2e17d85a1c0a1141ac64f06953d3" => :sierra sha256 "67374f5db8a35f877a16e0fdbd313276fb269db81ce49e7654fb61fa865417cd" => :el_capitan + sha256 "6275d5e82b0031b90db56ceb085221afdf23b1fd21744848281bcd6cc07b6212" => :x86_64_linux end def install diff --git a/Formula/nrg2iso.rb b/Formula/nrg2iso.rb index 5ee684030a0e7..e03067f34fc37 100644 --- a/Formula/nrg2iso.rb +++ b/Formula/nrg2iso.rb @@ -13,6 +13,7 @@ class Nrg2iso < Formula sha256 "fed88dfb217cc0b5fa0a4f7a7aec40342314998624e084921e1b5cc02d08d27d" => :el_capitan sha256 "18949f41b9ba386c996a49541875d3320184b88dccb04136846f32b3d681e647" => :yosemite sha256 "a46624bc9fc5f7883e923920dbc96aef720e5bb37b4ac71a281d101b96decee6" => :mavericks + sha256 "d0fb491c42ca34949c123a0724f0821ec5ef6fc1c328d0f4f7ab54a627791036" => :x86_64_linux end def install diff --git a/Formula/nsd.rb b/Formula/nsd.rb index 51192726f521d..ba3043e6367c5 100644 --- a/Formula/nsd.rb +++ b/Formula/nsd.rb @@ -8,6 +8,7 @@ class Nsd < Formula sha256 "69f6d9d52527c392e5d01ec67d78b71113a799e3ce02e15837e8e947f0509c81" => :catalina sha256 "f6f707defe682c1e7f5d477166f5adae5687bfb5ff25895ece916be1674ba5d0" => :mojave sha256 "e9780a88833916958fa7f276efe27d792b996d64a988f5684acd8c2c336eba50" => :high_sierra + sha256 "7524f64dad3fe79027567a12d239c8acc355fbb72ad4e859c51f1afbc8ae0d84" => :x86_64_linux end depends_on "libevent" diff --git a/Formula/nspr.rb b/Formula/nspr.rb index bc2f12387d1de..30751232a62d7 100644 --- a/Formula/nspr.rb +++ b/Formula/nspr.rb @@ -9,6 +9,7 @@ class Nspr < Formula sha256 "70c30f08abf5a0499dcbe9d97061bd2c48d25ffaff0d435e8d7eede589f4c046" => :catalina sha256 "039c4d5ad25a611c6c62bd6542e1faa505a9fb4c4c43ac742b8ecaa947f85dd5" => :mojave sha256 "d94d9687669abfc4f85f2a275c5ab7bbb0f3f49873d6939a2def529910182459" => :high_sierra + sha256 "89ccaa288f3a5db10a449a5d859daeb5a75b3a1c40ec7732d8a6b9262d10d772" => :x86_64_linux end def install @@ -29,7 +30,7 @@ def install ] system "./configure", *args # Remove the broken (for anyone but Firefox) install_name - inreplace "config/autoconf.mk", "-install_name @executable_path/$@ ", "-install_name #{lib}/$@ " + inreplace "config/autoconf.mk", "-install_name @executable_path/$@ ", "-install_name #{lib}/$@ " if OS.mac? system "make" system "make", "install" diff --git a/Formula/nsq.rb b/Formula/nsq.rb index 8fbb68b67f421..7ddb2826af1bc 100644 --- a/Formula/nsq.rb +++ b/Formula/nsq.rb @@ -11,6 +11,7 @@ class Nsq < Formula sha256 "2aae6c19e55ebd926426301fa85dd5716bce20a04bfbc11a5519dbada6a67368" => :catalina sha256 "bffff40b52e50eb181b9a02c8650b51924e45e8d650a5ed17051b8b1c0ce46cc" => :mojave sha256 "96ead21ddbb8f6f004141aac2e7c5a23d8740eaa5d4730eb4b0d6d94a0b63683" => :high_sierra + sha256 "aeaa97b951eaa61bdadb391041f48e325b541ce632d20c24fb2927c0dd9c1762" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/nss.rb b/Formula/nss.rb index b100944d7f486..a5df4d574d082 100644 --- a/Formula/nss.rb +++ b/Formula/nss.rb @@ -9,6 +9,7 @@ class Nss < Formula sha256 "798172411c4a3c7d71ba3eb98968d883591f63135371e45727af89436802f409" => :catalina sha256 "eec53f7a5a977c814331941b8ae158d630f24fb0c441f72460b9bc9e92f1dbaf" => :mojave sha256 "3ecc262ca4a64ebeccce66ffa777e492ad0e5ed7ffc06201061a636688b7a10a" => :high_sierra + sha256 "9c9adaf4dca89d2bb29a0c1979f793081ff65c0150d96653ca132e98ddebe7dc" => :x86_64_linux end depends_on "nspr" @@ -40,7 +41,7 @@ def install # rather than copying the referenced file. cd "../dist" bin.mkpath - Dir.glob("Darwin*/bin/*") do |file| + Dir.glob("*.OBJ/bin/*") do |file| cp file, bin unless file.include? ".dylib" end @@ -50,7 +51,7 @@ def install lib.mkpath libexec.mkpath - Dir.glob("Darwin*/lib/*") do |file| + Dir.glob("*.OBJ/lib/*") do |file| if file.include? ".chk" cp file, libexec else diff --git a/Formula/ntl.rb b/Formula/ntl.rb index 15ecc1ba4baec..a997f107501e6 100644 --- a/Formula/ntl.rb +++ b/Formula/ntl.rb @@ -9,6 +9,7 @@ class Ntl < Formula sha256 "fc44a358782565b05098a29f2694fe16100c2b5aa096c04875edd093adf78b5d" => :catalina sha256 "d0739cc2ebea1427d1fae3b0f871105b69d6f9c4c765415ed2f328af1e925598" => :mojave sha256 "5747add8bf85ae5a46d8c12635efbf61a2b5c402e35fdaebcf7499148c682564" => :high_sierra + sha256 "1c5f41bd2f461b4e906ec2941181b414ce52b34a34d499d9a7c9f2091e2e764e" => :x86_64_linux end depends_on "gmp" @@ -45,6 +46,7 @@ def install -lntl -lgmp ] + flags << "-lpthread" unless OS.mac? system ENV.cxx, "square.cc", "-o", "square", *flags assert_equal "4611686018427387904", pipe_output("./square", "2147483648") end diff --git a/Formula/numpy.rb b/Formula/numpy.rb index 37109ec13000e..e728b93a65416 100644 --- a/Formula/numpy.rb +++ b/Formula/numpy.rb @@ -6,10 +6,10 @@ class Numpy < Formula head "https://github.com/numpy/numpy.git" bottle do - cellar :any sha256 "fa9c808a7473eac7f9366142edf410530792f0b7491fcb0035b05e6e9bfe19d1" => :catalina sha256 "2caa9558fe1122f529c3bc6a88eff97fc1b76ab53c7c45997adb7d08c7c8042b" => :mojave sha256 "e6ca79c3ca935316f3ec4c55572ac93baf1f0d73cb83e81df7c1cbc93eb9fa85" => :high_sierra + sha256 "9b76430f4f6a89a1bb12bb2ed83b141bcbcdf8e849ed2ff88038ca0d435b60c3" => :x86_64_linux end depends_on "cython" => :build diff --git a/Formula/nushell.rb b/Formula/nushell.rb index 67c186076ada4..73f3cd21b871b 100644 --- a/Formula/nushell.rb +++ b/Formula/nushell.rb @@ -10,6 +10,7 @@ class Nushell < Formula sha256 "a516b3eb630fde82b8bb1d4ee84870bded2609ed2ea61844174edbd064cec0cf" => :catalina sha256 "e76db1897d9c612c7cc00d291257f83ad3204f67720cadd65e4ece60f35e531e" => :mojave sha256 "3a3e49fff0d9431348555acc8b7c909186a7e00df53ff6d80de70c7e66316898" => :high_sierra + sha256 "d12c73a7761c17363dd43fe1ee52dcef7df9a96ed594f890617bbc4496bc8a31" => :x86_64_linux end depends_on "rust" => :build @@ -21,12 +22,22 @@ class Nushell < Formula depends_on "pkg-config" => :build end + unless OS.mac? + depends_on "linuxbrew/xorg/libxcb" + depends_on "linuxbrew/xorg/libx11" + end + def install system "cargo", "install", "--features", "stable", *std_cargo_args end test do - assert_equal pipe_output("#{bin}/nu", 'echo \'{"foo":1, "bar":2}\' | from json | get bar | echo $it'), - "Welcome to Nushell #{version} (type 'help' for more info)\n~ \n❯ 2~ \n❯ " + if OS.mac? + assert_equal pipe_output("#{bin}/nu", 'echo \'{"foo":1, "bar":2}\' | from-json | get bar | echo $it'), + "Welcome to Nushell #{version} (type 'help' for more info)\n~ \n❯ 2~ \n❯ " + else + assert_match "Welcome to Nushell #{version} (type 'help' for more info)\n", + pipe_output("#{bin}/nu", 'echo \'{"foo":1, "bar":2}\' | from-json | get bar | echo $it') + end end end diff --git a/Formula/nut.rb b/Formula/nut.rb index 4933fbcbcb044..0eae34109d0c3 100644 --- a/Formula/nut.rb +++ b/Formula/nut.rb @@ -19,6 +19,7 @@ class Nut < Formula sha256 "1586ba300fc949859b2bebb55af99bc634362db7633e91a0db30aad28bef9c09" => :catalina sha256 "dde3a1e3dc4e86f77d01071c0d669ea600569b41f8e9f11bb16a6b19e39286ca" => :mojave sha256 "6fda08463f3e551d255b80e6e467b1f2938c973ab016f81b1585dd73373da562" => :high_sierra + sha256 "735dd59dc6c82c2a0fb0e0af44771166dbcd02c82fe3d86a57311ad9df971b36" => :x86_64_linux end head do diff --git a/Formula/nutcracker.rb b/Formula/nutcracker.rb index 9a981c780dfb6..3c15cd1e218ce 100644 --- a/Formula/nutcracker.rb +++ b/Formula/nutcracker.rb @@ -14,6 +14,7 @@ class Nutcracker < Formula sha256 "1f3714c4459185e9002ea87f4fc4a4de429f028df957615ee9876c61a7c89a6d" => :el_capitan sha256 "73698710fa026b8585665a9b730626df444dabe6acf118cc4f0c2f57c27e214c" => :yosemite sha256 "8e66691c40fe71934bb5eab848c61ef07f8f427774e253c0065eb64cc5410f9b" => :mavericks + sha256 "e668d0660e17566f860e447bb2215ae935bb5aa670cccf18470ee3df50a6beb2" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/nuttcp.rb b/Formula/nuttcp.rb index f37afb3677d7d..4a149dca904c4 100644 --- a/Formula/nuttcp.rb +++ b/Formula/nuttcp.rb @@ -9,6 +9,7 @@ class Nuttcp < Formula sha256 "0f5e7a2b61f91360023ef643c0a77fa711855b34006ff07867f1283051aded5c" => :catalina sha256 "de0d1395983d9980dfff73de8282b76bf70c987fb36c68ff5e341f245507100a" => :mojave sha256 "8d9ea3c88d5347b34cc4b3385b6898f942b8e4ff5a4f4a26897e4b66297e2692" => :high_sierra + sha256 "dbe782d8e379330f336221d4a723784201d87fe304b7a5718996800c3519b292" => :x86_64_linux end def install diff --git a/Formula/nuvie.rb b/Formula/nuvie.rb index 943f3a54ad458..0b875ebb0348a 100644 --- a/Formula/nuvie.rb +++ b/Formula/nuvie.rb @@ -10,6 +10,7 @@ class Nuvie < Formula sha256 "286980f2c5b977f355d59bf2b10366b3c38613764b66707852e2934649089bc6" => :catalina sha256 "b1cefbd62e4b350d330853e14f789cc0b137c19b434271d1837114e10a73b0ca" => :mojave sha256 "f066beb078dd00f4b339ce25b7ff06dadd6ddf62283008ee149d2758c80e439b" => :high_sierra + sha256 "e08e736585cbba3cdff386005e00fddf44c03698e80b82eb2cc53bb4926721d5" => :x86_64_linux end head do diff --git a/Formula/nvi.rb b/Formula/nvi.rb index c4257f31a6fcb..86e3209b0ea47 100644 --- a/Formula/nvi.rb +++ b/Formula/nvi.rb @@ -12,6 +12,7 @@ class Nvi < Formula sha256 "dcaa5dd43e6edfc5c8188761cc8aad6b80a06abc7382b8ceac4d92498354b5c4" => :high_sierra sha256 "1327ea05ec82ec05e9ec7b00b95ac3f7329b198a613385042a0814265b393f13" => :sierra sha256 "e188b0a9fa040c6a11f7ed6338d28d96428e11cfa019aaa1d0aa69e0f2b87bc3" => :el_capitan + sha256 "a3a18b39e16e0bfd592b5f52a063973e38037f28e3ae3f35082da0e0dffdde19" => :x86_64_linux end depends_on "xz" => :build # Homebrew bug. Shouldn't need declaring explicitly. diff --git a/Formula/nyancat.rb b/Formula/nyancat.rb index 0c8657872a3ba..9d741936218f4 100644 --- a/Formula/nyancat.rb +++ b/Formula/nyancat.rb @@ -11,6 +11,7 @@ class Nyancat < Formula sha256 "2272aa5028ca779224f68fd25a3c07ff41c71bb7d14511186808a6b59bfe32c3" => :high_sierra sha256 "413a6ff99b622e60b0878ca74c3051d0feac094a7eb1fa9e90db715735cdd2bf" => :sierra sha256 "2484fb6eabaaa65a988191b9c2f920d7290bc20f73dbf41e4a996e0306827364" => :el_capitan + sha256 "2c957decb15264ab51cdf2a8ca3f0a3461024e42fc2731adf46103d18bc7ddcd" => :x86_64_linux end # Makefile: Add install directory option diff --git a/Formula/nylon.rb b/Formula/nylon.rb index 37d89b461e14a..7faf0e4787715 100644 --- a/Formula/nylon.rb +++ b/Formula/nylon.rb @@ -11,6 +11,7 @@ class Nylon < Formula sha256 "cb2cbfbd8df94b8581a116807075daf9fadbe9b9c5cfa537ea30dfa76537dd5c" => :mojave sha256 "3df9b3197c8dc9a227221027047c8de77ddb6ad9ce2edd14544c2d6e4923b660" => :high_sierra sha256 "b7eeab5896aaaca9c73166e519d092a71f15a36e800a28742729f8cbc270e6d8" => :sierra + sha256 "efbd60188c728e74d073afe553a4512222850758de3221a4fe8a51486a48dc09" => :x86_64_linux end depends_on "libevent" diff --git a/Formula/nzbget.rb b/Formula/nzbget.rb index 5aec76b4af31f..72fb7607abd92 100644 --- a/Formula/nzbget.rb +++ b/Formula/nzbget.rb @@ -11,6 +11,7 @@ class Nzbget < Formula sha256 "1d69e26d929d2a1be4824ea8c2134d543033462302bc5527269d5ca7b1b2c575" => :mojave sha256 "862bd9889d1590b8e3f600419f2bbf84f1ea7582ed55c58eccc024382d6db245" => :high_sierra sha256 "2e174f6c4df74ef3cd5decca500963db0c99d71553da624693ec4e9d085a0a56" => :sierra + sha256 "6c3c540e8b43fc0ea81f33cceb45df6b042e673742c444493797079b5e8c9a2d" => :x86_64_linux end depends_on "pkg-config" => :build @@ -24,9 +25,14 @@ def install # Fix "ncurses library not found" # Reported 14 Aug 2016: https://github.com/nzbget/nzbget/issues/264 - (buildpath/"brew_include").install_symlink MacOS.sdk_path/"usr/include/ncurses.h" - ENV["ncurses_CFLAGS"] = "-I#{buildpath}/brew_include" - ENV["ncurses_LIBS"] = "-L/usr/lib -lncurses" + if OS.mac? + (buildpath/"brew_include").install_symlink MacOS.sdk_path/"usr/include/ncurses.h" + ENV["ncurses_CFLAGS"] = "-I#{buildpath}/brew_include" + ENV["ncurses_LIBS"] = "-L/usr/lib -lncurses" + else + ENV["ncurses_CFLAGS"] = "-I#{Formula["ncurses"].opt_include}" + ENV["ncurses_LIBS"] = "-L#{Formula["ncurses"].opt_lib} -lncurses" + end # Tell configure to use OpenSSL system "./configure", "--disable-debug", "--disable-dependency-tracking", @@ -39,8 +45,10 @@ def install # Set upstream's recommended values for file systems without # sparse-file support (e.g., HFS+); see Homebrew/homebrew-core#972 - inreplace "nzbget.conf", "DirectWrite=yes", "DirectWrite=no" - inreplace "nzbget.conf", "ArticleCache=0", "ArticleCache=700" + if OS.mac? + inreplace "nzbget.conf", "DirectWrite=yes", "DirectWrite=no" + inreplace "nzbget.conf", "ArticleCache=0", "ArticleCache=700" + end etc.install "nzbget.conf" end @@ -74,10 +82,10 @@ def plist test do (testpath/"downloads/dst").mkpath # Start nzbget as a server in daemon-mode - system "#{bin}/nzbget", "-D" + system "#{bin}/nzbget", "-D", "-c", etc/"nzbget.conf" # Query server for version information - system "#{bin}/nzbget", "-V" + system "#{bin}/nzbget", "-V", "-c", etc/"nzbget.conf" # Shutdown server daemon - system "#{bin}/nzbget", "-Q" + system "#{bin}/nzbget", "-Q", "-c", etc/"nzbget.conf" end end diff --git a/Formula/oath-toolkit.rb b/Formula/oath-toolkit.rb index 8749503da543e..8e02633ee3f8e 100644 --- a/Formula/oath-toolkit.rb +++ b/Formula/oath-toolkit.rb @@ -11,6 +11,7 @@ class OathToolkit < Formula sha256 "24a65399ed4b462a3291c542616e1a5dad4df008dcb116fd12c34030f05135b0" => :catalina sha256 "ab9cbc2e7e8c7004c5a3db7fbc4b6a0cbc9560a353a306cba0fa4d1174a46f68" => :mojave sha256 "a7fbff2831b4c6a61896c65b482b3db50d2e070e1e74772e7fb929bbd4a586f0" => :high_sierra + sha256 "e1ec14a3c3c6941c6af6fa9e81a6dffb27d07f3593e79ef865ee8edbd20f5be0" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/oauth2l.rb b/Formula/oauth2l.rb index c0c11b939661a..06b8a3e8c2e3a 100644 --- a/Formula/oauth2l.rb +++ b/Formula/oauth2l.rb @@ -10,6 +10,7 @@ class Oauth2l < Formula sha256 "5cc7ab09462ced7fde59421399d9a2eaa6bdc6a7c223f82ea6c2998961ec690d" => :catalina sha256 "7273e656e6e6d24e0a2e0a1a2e21e4fc9704b03f0e26e4172c2f51ca851d441b" => :mojave sha256 "950e998aeae2d56005f4c4915f05458d1a59715f024811e6a70eaca886aa8aaa" => :high_sierra + sha256 "8c54ba0e379799e914b8e08982b7485f3ce17ca278d67cc180ff8a8273dcb46f" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/objc-codegenutils.rb b/Formula/objc-codegenutils.rb index 6a5ccc633cbd5..429e6e2a16041 100644 --- a/Formula/objc-codegenutils.rb +++ b/Formula/objc-codegenutils.rb @@ -15,7 +15,7 @@ class ObjcCodegenutils < Formula sha256 "46d389e6ec12462dfbdd97822ce7c6e8156bbe9fac7a3baf04c20cb1991d9f75" => :mavericks end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? def install xcodebuild "-project", "codegenutils.xcodeproj", "-target", "assetgen", diff --git a/Formula/ocaml-findlib.rb b/Formula/ocaml-findlib.rb index 6efbac76d8f0c..9f1d039a58592 100644 --- a/Formula/ocaml-findlib.rb +++ b/Formula/ocaml-findlib.rb @@ -9,6 +9,7 @@ class OcamlFindlib < Formula sha256 "ba498040816b2b5b00ed84a96107119a99a52a0815b86ace5e5708f807be1ddb" => :catalina sha256 "b9af770177876ae3ffff6cca808a7ea72866a0bfe3b92a987878629fc42b3eff" => :mojave sha256 "a412ed75fa6bd7180846f2305eea5d2a4170bb41535c26fb047fbbd2b0adef8a" => :high_sierra + sha256 "18ba4487b9071f5007dfa8ed99194beb32a4e8ed91ca13c86ee0850511402ecc" => :x86_64_linux end depends_on "ocaml" diff --git a/Formula/ocaml-num.rb b/Formula/ocaml-num.rb index 2f69575212a3c..d236da1bfc9df 100644 --- a/Formula/ocaml-num.rb +++ b/Formula/ocaml-num.rb @@ -10,6 +10,7 @@ class OcamlNum < Formula sha256 "7890616190d8d7071d8c3cf2ea494885a115fc3b2d4058cb4be81132622e6cf2" => :catalina sha256 "e6feb685e5bc9486eee9c9a3a8f8712a6df05bc6564c518b0549052e835500c0" => :mojave sha256 "16e31884645c7deca510218f7611d6c2ed105ef5229efcf3f17b4ab7a5f6330c" => :high_sierra + sha256 "6ef3799198e631181220a85d0271b72c515a135e927c518b66f43d57a95ee762" => :x86_64_linux end depends_on "ocaml-findlib" => :build diff --git a/Formula/ocaml.rb b/Formula/ocaml.rb index 81ffeed47ee19..aa1a90005569c 100644 --- a/Formula/ocaml.rb +++ b/Formula/ocaml.rb @@ -22,13 +22,15 @@ class Ocaml < Formula sha256 "d3661fa949c06ce4132df11fb82bca7f0a58b3ba555700e54fafc264b621af0b" => :catalina sha256 "39551915056e6652aa10579c926e43ff2a0d744202be2ba89dd4107f1d4346cf" => :mojave sha256 "4e96119913768af5be322c05efe1ddb5716d389bedfaa582fd8cb5eee1abfed1" => :high_sierra + sha256 "2a5bb8d8fac93037dc18af6df160c07e4c22eb0222469cfea7f9100589ca244a" => :x86_64_linux end pour_bottle? do # The ocaml compilers embed prefix information in weird ways that the default # brew detection doesn't find, and so needs to be explicitly blacklisted. - reason "The bottle needs to be installed into /usr/local." - satisfy { HOMEBREW_PREFIX.to_s == "/usr/local" } + default_prefix = OS.linux? ? "/home/linuxbrew/.linuxbrew" : "/usr/local" + reason "The bottle needs to be installed into #{default_prefix}." + satisfy { HOMEBREW_PREFIX.to_s == default_prefix } end def install diff --git a/Formula/ocamlbuild.rb b/Formula/ocamlbuild.rb index 7827130bf90fd..72ca2cff41358 100644 --- a/Formula/ocamlbuild.rb +++ b/Formula/ocamlbuild.rb @@ -10,6 +10,7 @@ class Ocamlbuild < Formula sha256 "8f6fc7e7413b24faa041b7651349a3128f9eadefae5c9aa0c50f0d1a56e010f6" => :catalina sha256 "04fed811edb4dd3903f742ec6678643f9959e85c4fcb763972c8779dec059515" => :mojave sha256 "e4cd0274f9657874e29add30545055af4ea8697d426ed95f799ddce63aef5cfe" => :high_sierra + sha256 "ff6b9bddb52278904dd7ab0ce695da0273f9ede88920e28630c54672af98fdb6" => :x86_64_linux end depends_on "ocaml" diff --git a/Formula/ocamlsdl.rb b/Formula/ocamlsdl.rb index 4f60aca47fddf..e9bd67aa10f78 100644 --- a/Formula/ocamlsdl.rb +++ b/Formula/ocamlsdl.rb @@ -37,7 +37,7 @@ def install EOS system "#{Formula["ocaml"].opt_bin}/ocamlopt", "-I", "+sdl", "sdl.cmxa", "-cclib", "-lSDLmain", "-cclib", "-lSDL", "-cclib", - "-Wl,-framework,Cocoa", "-o", "test", "test.ml" + *("-Wl,-framework,Cocoa" if OS.mac?), "-o", "test", "test.ml" system "./test" end end diff --git a/Formula/ocproxy.rb b/Formula/ocproxy.rb index 3136c17a0994d..9cb154c2eb2fd 100644 --- a/Formula/ocproxy.rb +++ b/Formula/ocproxy.rb @@ -12,6 +12,7 @@ class Ocproxy < Formula sha256 "786f0c42a3d282b78d8dc2fa18c36e46707451f4ac848e9af7dd82ab31b40f6d" => :mojave sha256 "0cd70ac67ebd419b869ad4dd70c6cd1217248c8e7b7a57d3a7c8e15c7d2f7dfc" => :high_sierra sha256 "8e33eae007c082ec9b6787210096a4e20992151a7b2c5f345941f68c478ae0e2" => :sierra + sha256 "ab9030077d842b07fdd98e887b98d9e50abd22459cb24bf5a4379c6c7b3a5359" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/ocrad.rb b/Formula/ocrad.rb index 30f0791420528..653431e522343 100644 --- a/Formula/ocrad.rb +++ b/Formula/ocrad.rb @@ -11,6 +11,7 @@ class Ocrad < Formula sha256 "3d1c85bb36faedf5ab12f78e8c3511dcc4164561ba8bc09924b48f6aa3fa0b37" => :mojave sha256 "ba9b30eeabc11634502e30fd9a730d5727668550f9708d46fbefc03bcb3917de" => :high_sierra sha256 "903ce6530395c0973418020561ddd60da739f3a36e865500776922e18975460b" => :sierra + sha256 "fe81c88121b741c46ffee8248146b0ee03c14cf0b3f4d809ceaadde5b31c5091" => :x86_64_linux end def install diff --git a/Formula/ocrmypdf.rb b/Formula/ocrmypdf.rb index a0646d27ebe2b..20a5d9150a8d1 100644 --- a/Formula/ocrmypdf.rb +++ b/Formula/ocrmypdf.rb @@ -28,7 +28,6 @@ class Ocrmypdf < Formula depends_on "unpaper" uses_from_macos "libffi" - uses_from_macos "libxml2" uses_from_macos "libxslt" uses_from_macos "zlib" @@ -112,11 +111,16 @@ def install resource("Pillow").stage do inreplace "setup.py" do |s| - sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" - s.gsub! "openjpeg.h", "probably_not_a_header_called_this_eh.h" - s.gsub! "xcb.h", "probably_not_a_header_called_this_eh.h" - s.gsub! "ZLIB_ROOT = None", - "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + if OS.mac? + sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" + s.gsub! "openjpeg.h", "probably_not_a_header_called_this_eh.h" + s.gsub! "xcb.h", "probably_not_a_header_called_this_eh.h" + s.gsub! "ZLIB_ROOT = None", + "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + else + s.gsub! "ZLIB_ROOT = None", + "ZLIB_ROOT = ('#{Formula["zlib"].opt_prefix}/lib', '#{Formula["zlib"].opt_prefix}/include')" + end s.gsub! "JPEG_ROOT = None", "JPEG_ROOT = ('#{Formula["jpeg"].opt_prefix}/lib', '#{Formula["jpeg"].opt_prefix}/include')" s.gsub! "FREETYPE_ROOT = None", @@ -124,15 +128,15 @@ def install "'#{Formula["freetype"].opt_prefix}/include')" end - # avoid triggering "helpful" distutils code that doesn't recognize Xcode 7 .tbd stubs - unless MacOS::CLT.installed? + if OS.mac? && !MacOS::CLT.installed? + # avoid triggering "helpful" distutils code that doesn't recognize Xcode 7 .tbd stubs ENV.append "CFLAGS", "-I#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers" end venv.pip_install Pathname.pwd end # Fix "ld: file not found: /usr/lib/system/libsystem_darwin.dylib" for lxml - ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra + ENV["SDKROOT"] = MacOS.sdk_path if OS.mac? && MacOS.version == :sierra res = resources.map(&:name).to_set - ["Pillow"] res.each do |r| diff --git a/Formula/octave.rb b/Formula/octave.rb index e5f3808d3f283..ae6c6fe1f0d2a 100644 --- a/Formula/octave.rb +++ b/Formula/octave.rb @@ -68,24 +68,6 @@ class Octave < Formula end def install - # Default configuration passes all linker flags to mkoctfile, to be - # inserted into every oct/mex build. This is unnecessary and can cause - # cause linking problems. - inreplace "src/mkoctfile.in.cc", - /%OCTAVE_CONF_OCT(AVE)?_LINK_(DEPS|OPTS)%/, - '""' - - # Qt 5.12 compatibility - # https://savannah.gnu.org/bugs/?55187 - ENV["QCOLLECTIONGENERATOR"] = "qhelpgenerator" - # These "shouldn't" be necessary, but the build breaks without them. - # https://savannah.gnu.org/bugs/?55883 - ENV["QT_CPPFLAGS"]="-I#{Formula["qt"].opt_include}" - ENV.append "CPPFLAGS", "-I#{Formula["qt"].opt_include}" - ENV["QT_LDFLAGS"]="-F#{Formula["qt"].opt_lib}" - ENV.append "LDFLAGS", "-F#{Formula["qt"].opt_lib}" - - system "./bootstrap" if build.head? system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking", "--disable-silent-rules", diff --git a/Formula/octomap.rb b/Formula/octomap.rb index 2aea18cf88431..18ee111091c1a 100644 --- a/Formula/octomap.rb +++ b/Formula/octomap.rb @@ -8,6 +8,7 @@ class Octomap < Formula sha256 "dcf938ee253a527143d78cbc39c20046015519b5aff741656016f0a67ff705b9" => :catalina sha256 "878681f950a14d49b47bd69605a12bae4f42f127b4cc7750de14b7a16f6a9930" => :mojave sha256 "92def71d469ce8d5a660d371eded16f8d25f9346e2fc3f34ffd105f3bbd2060c" => :high_sierra + sha256 "9c4eb26f3fb5c10641e33adbf9c86d0e91546c8c1e683aa0f6816f14308ee25f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ode.rb b/Formula/ode.rb index 7a83790e21fc1..10ec0c87d26cf 100644 --- a/Formula/ode.rb +++ b/Formula/ode.rb @@ -6,11 +6,12 @@ class Ode < Formula head "https://bitbucket.org/odedevs/ode.git" bottle do - cellar :any + cellar :any_skip_relocation rebuild 1 sha256 "4bddeed55b5f77a87a6719a804e18421ede97a40350038aef4496c1d8d95a77c" => :catalina sha256 "430c17a4551ea6c7d4473d5344dc7b0c3951cce4cf8ce099edcfb5c88424fd67" => :mojave sha256 "87666bd9ae5c66430a48c0d8fd805fc3b8aff01a5a2b82c984f63b5307cd8009" => :high_sierra + sha256 "4ffebbc96aafd3a7b124683f5dbb2688220fab733c3480196c089a1e92373924" => :x86_64_linux end depends_on "autoconf" => :build @@ -41,9 +42,11 @@ def install return 0; } EOS + std = OS.mac? ? "-lc++" : "-lstdc++" system ENV.cc, "test.cpp", "-I#{include}/ode", "-L#{lib}", "-lode", "-L#{Formula["libccd"].opt_lib}", "-lccd", - "-lc++", "-o", "test" + *("-lm" unless OS.mac?), + std, *("-lpthread" unless OS.mac?), "-o", "test" system "./test" end end diff --git a/Formula/odpi.rb b/Formula/odpi.rb index aff9ab3170587..bbd02021afe5c 100644 --- a/Formula/odpi.rb +++ b/Formula/odpi.rb @@ -9,6 +9,7 @@ class Odpi < Formula sha256 "72b2a344080349aaf5f6aaa6167f43df59e5dd7da3d8912d60eb989058e35624" => :catalina sha256 "7505b4d90a69f0fca41be9316063e4eeb858fd7c9b8b795274532eb3b5248b25" => :mojave sha256 "fa3483646ef433386054229455ffe1a0109d6bb007cdaa8693c9d97ebd82f301" => :high_sierra + sha256 "f25b9d7fc748ea250f30fe171f268f940ed5462e7e4da1c9b8eb16167a8579db" => :x86_64_linux end def install diff --git a/Formula/offlineimap.rb b/Formula/offlineimap.rb index 135f0e1d4c965..5aa2d24c74011 100644 --- a/Formula/offlineimap.rb +++ b/Formula/offlineimap.rb @@ -12,8 +12,12 @@ class Offlineimap < Formula sha256 "ff922fc76e1e5571628d7ecb4bd436180895352768979c2cd9bcfee048b5d0f4" => :high_sierra end + depends_on "asciidoc" => :build + depends_on "docbook-xsl" => :build + depends_on "sphinx-doc" => :build depends_on :macos # Due to Python 2 (Will never support Python 3) # https://github.com/OfflineIMAP/offlineimap/issues/616#issuecomment-491003691 + uses_from_macos "libxml2" uses_from_macos "libxslt" diff --git a/Formula/oggz.rb b/Formula/oggz.rb index 9c873933b263a..167ca59d4751d 100644 --- a/Formula/oggz.rb +++ b/Formula/oggz.rb @@ -13,6 +13,7 @@ class Oggz < Formula sha256 "4c1819dbc134981faf5e2e03dc69d210deb8dabd59b71969c1f479fa32322635" => :el_capitan sha256 "c6076111f111c5d77dc608bcb4892f10dffb84e5b4f5ebdfba311ec332fa6623" => :yosemite sha256 "a3aa5e741dd3e7a9aebb65748f80f45947549a79915b68161a79f12cb37b4b12" => :mavericks + sha256 "4bb486b267963c1d71a73cd38fceebb7e08b338908ba8b6db5c86ec89298054f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/ogmtools.rb b/Formula/ogmtools.rb index eb468e3021853..4228322cd6ebd 100644 --- a/Formula/ogmtools.rb +++ b/Formula/ogmtools.rb @@ -13,6 +13,7 @@ class Ogmtools < Formula sha256 "8e0ceae59b3a69647511dff89566a734d25a96a764893c7599ee1ece73890db5" => :el_capitan sha256 "3a43fec619944cd6fa8e57bd067477ef63997919e11174ddafb160c47b28fd5d" => :yosemite sha256 "9dc3df5391b2203a0da69ad5be638daa066f9bfc2655bf4d553837aa90f7f4d1" => :mavericks + sha256 "0d5b5c91f6c304d9e6adf77a3dd514bfafcd70766bd569f045e70ea18612da32" => :x86_64_linux end depends_on "libogg" diff --git a/Formula/ohcount.rb b/Formula/ohcount.rb index d5c6a7ed32563..ebc05d8acc14d 100644 --- a/Formula/ohcount.rb +++ b/Formula/ohcount.rb @@ -11,6 +11,7 @@ class Ohcount < Formula sha256 "b93054a4459a246895a524de21559fc1387e8cc6436d83481c7d85afc10be9e8" => :mojave sha256 "2bcddb3687af78d9317be143579afe692f8a3034c51b1e7e07ddd53491792365" => :high_sierra sha256 "716a64cf45acdb062651994384e88e74e5bf258a1b70b9b29cf09c5c115084e5" => :sierra + sha256 "91e2bfd24a6dc5025bf70842f73ecf1635663a380786a39f4e0f9749e3f42f31" => :x86_64_linux end depends_on "gperf" => :build diff --git a/Formula/okteto.rb b/Formula/okteto.rb index 1c92b282e66d8..ef227ab153e67 100644 --- a/Formula/okteto.rb +++ b/Formula/okteto.rb @@ -9,6 +9,7 @@ class Okteto < Formula sha256 "29e59d3cfc2dbf4abee96bc5733d6c6893d6acc45c53735b0ecdc65284034fc6" => :catalina sha256 "23678a783ff18f250a17881a01d0513061bfabbfe1c975ee2921a1414db34094" => :mojave sha256 "a0eefab02bbdb3aecae2564a5202f4f58a1703b99d3db136ecf3d0fe67cbc201" => :high_sierra + sha256 "cd8f2e33aeda63cf1a0e595624ee9853df0fb6ef927d161d37a075097efc69d7" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/omega.rb b/Formula/omega.rb index 736aac20ff23b..ca19e49a021a1 100644 --- a/Formula/omega.rb +++ b/Formula/omega.rb @@ -8,6 +8,7 @@ class Omega < Formula sha256 "21def29541640883bd956e842a3370d9ac7dde45bd166add19ca83013f86189f" => :catalina sha256 "5625e477813a8c7bd720e17416b6dd80faf959f5d7210c3262031ba30c3e1f6e" => :mojave sha256 "ff44c076ce6ad71238f2293e35ad7c8fed610dfeb5eb15e8a52c0e68d9a0b62d" => :high_sierra + sha256 "02e27c9ecf321411d2898b86fc0f4c0c58f1e336bb23c25870e82d122dcbb8d6" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/ompl.rb b/Formula/ompl.rb index db98827af332a..d3d4a31de45d0 100644 --- a/Formula/ompl.rb +++ b/Formula/ompl.rb @@ -9,6 +9,7 @@ class Ompl < Formula sha256 "f58fc1ff49aeac3a38aa2629385019ad854e9624b4c6e3a3f9051456494984f9" => :catalina sha256 "9d66bb50880af5db4f3fc3a1d85140170643518fc72e78ccc6b7b7814261d198" => :mojave sha256 "b11650509f65bcf45ea04acdd7fe4bebaff22f829c512d73c308e75476f0a94a" => :high_sierra + sha256 "5b833df1f9b5ec36c24c634b3daf63eae92e578d4e39f79d36dd9e34d45b5fce" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ondir.rb b/Formula/ondir.rb index 014482ea553db..1a562cc0ab835 100644 --- a/Formula/ondir.rb +++ b/Formula/ondir.rb @@ -14,6 +14,7 @@ class Ondir < Formula sha256 "8d841a2a8b98a512265dc05deb3ea74e7458a4d5412da786f595c31420b7fadd" => :el_capitan sha256 "3d7b419d963bcd2be6d04cb3f666c8c58866f9556251f6efcb2f0b6abcad5902" => :yosemite sha256 "a994efec34c5c9edd1b014959b3fe1a1a95c1d9ece14c5d7d7c51c2b421c7a11" => :mavericks + sha256 "7c6dbd66a893fb47c588ca51bd35d8d340603efabd071480b8c7b82fdc2751c1" => :x86_64_linux end def install diff --git a/Formula/one-ml.rb b/Formula/one-ml.rb index a3fa3bd96e2d2..a6d22ececcdee 100644 --- a/Formula/one-ml.rb +++ b/Formula/one-ml.rb @@ -11,6 +11,7 @@ class OneMl < Formula sha256 "309111ca64b6c6fa02f1a93dcdc83858d74bc4d7e6a1bcb898443b72e2fa62fc" => :catalina sha256 "ddd62944bea4f0182b771d405d2255c1d5cdd9e217a2bc00891018de9458b7c2" => :mojave sha256 "d377a804f2f05d9f48869a6822bb42070be94b225d1d24ee0f4a3e23019532c8" => :high_sierra + sha256 "996fb0696832552a0966140341d733f487d817182774a035c7159807975cd562" => :x86_64_linux end depends_on "ocaml" => :build diff --git a/Formula/onednn.rb b/Formula/onednn.rb index e59972c78d5d6..04f9f6b92bb65 100644 --- a/Formula/onednn.rb +++ b/Formula/onednn.rb @@ -10,6 +10,7 @@ class Onednn < Formula sha256 "6c0397633ae7e439d40026bff8593cdf90385b3f08e2a5286c9dbb1684e16097" => :catalina sha256 "179cc20a24a1181e27ecacbdc2ea43f8ebf4575ab798dca288fa32f842c3fbaf" => :mojave sha256 "6a22a61f6c15c14487513dc882c1f762036131a15cf4b2b743bb1590e3f207f3" => :high_sierra + sha256 "04fdb4ac676485411e0ded983a6c37bae780d4851e17e7c6446c7ad4459406da" => :x86_64_linux end depends_on "cmake" => :build @@ -31,7 +32,11 @@ def install return !(status == mkldnn_success); } EOS - system ENV.cc, "-L#{lib}", "-lmkldnn", "test.c", "-o", "test" + if OS.mac? + system ENV.cc, "-L#{lib}", "-lmkldnn", "test.c", "-o", "test" + else + system ENV.cc, "test.c", "-L#{lib}", "-lmkldnn", "-o", "test" + end system "./test" end end diff --git a/Formula/onedrive.rb b/Formula/onedrive.rb new file mode 100644 index 0000000000000..1f6dce9c53f60 --- /dev/null +++ b/Formula/onedrive.rb @@ -0,0 +1,29 @@ +class Onedrive < Formula + desc "Folder synchronization with OneDrive" + homepage "https://github.com/abraunegg/onedrive" + url "https://github.com/abraunegg/onedrive/archive/v2.3.13.tar.gz" + sha256 "efa8f132a0dfe5faf1b24c4afaffe95954262bb4e48024198ac984df195f82ed" + + bottle do + cellar :any_skip_relocation + sha256 "23866244bcf417302e2602cfd74df7f161930cff8305a460131a4336412c5cd4" => :x86_64_linux + end + + depends_on "dmd" => :build + depends_on "pkg-config" => :build + depends_on "curl-openssl" + depends_on :linux + depends_on "sqlite" + + def install + ENV["DC"] = "dmd" + system "./configure", "--prefix=#{prefix}" + system "make", "install" + bash_completion.install "contrib/completions/complete.bash" + zsh_completion.install "contrib/completions/complete.zsh" => "_onedrive" + end + + test do + system "#{bin}/onedrive", "--version" + end +end diff --git a/Formula/onefetch.rb b/Formula/onefetch.rb index 29042d35f3ee2..db4f3efc00376 100644 --- a/Formula/onefetch.rb +++ b/Formula/onefetch.rb @@ -9,6 +9,7 @@ class Onefetch < Formula sha256 "54ce778668b9953a5c683ba12045998a2a4ae1291a0a2f0e5c4a51aba63e7bc3" => :catalina sha256 "4937b9ddd81bf626dd5b5a0b6ec2d289c74ef125a0e5bb0c87641e343d687412" => :mojave sha256 "eca2bbb2a918e3ffdf41de1e3703941397265c618a31793a29fba4a37f887427" => :high_sierra + sha256 "a684a5f12a9c1a3182c535fc42f3ad8378d99bb3ba63448e24d1d85e6477fe53" => :x86_64_linux end depends_on "rust" => :build @@ -22,6 +23,10 @@ def install test do system "#{bin}/onefetch", "--help" assert_match "onefetch " + version.to_s, shell_output("#{bin}/onefetch -V").chomp + if ENV["CI"] + system "git config --global user.email you@example.com" + system "git config --global user.name Name" + end system "git init && echo \"puts 'Hello, world'\" > main.rb && git add main.rb && git commit -m \"First commit\"" assert_match /Language:.*Ruby/, shell_output("#{bin}/onefetch").chomp end diff --git a/Formula/oniguruma.rb b/Formula/oniguruma.rb index e0084e927845f..226d2ce7d6b56 100644 --- a/Formula/oniguruma.rb +++ b/Formula/oniguruma.rb @@ -11,6 +11,7 @@ class Oniguruma < Formula sha256 "15241cccbb727a11200b6eb7398500795057bb065784a3af6ec9c98cd6ce7686" => :catalina sha256 "40fd839d421fba70280c0b6f879c4a5889205e4ba2292a568df935dc410fecb2" => :mojave sha256 "b522dc58b0b37db5102213150acd1ea740c201d489d65d6a3b63cced744acf6c" => :high_sierra + sha256 "17c30de1912b62c33ae3f4073ae11f68bb85e2835f77cda3147ffa58b29383fc" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/onioncat.rb b/Formula/onioncat.rb index 67729a3f5c323..82b69d28a63e4 100644 --- a/Formula/onioncat.rb +++ b/Formula/onioncat.rb @@ -9,6 +9,7 @@ class Onioncat < Formula sha256 "4ef31c45ecf525bfc963069d8020dfd8d63ccad9b779ad1efa4ea4c6ae8832db" => :catalina sha256 "f69495ac60b021b3d84b8abd2f74152d93bba7bbb59a5c0a28f0edcaf7149c0c" => :mojave sha256 "62bfd76828320dd38f8081086ebdfed307f112f88019a348c39d43b53882893d" => :high_sierra + sha256 "b85374dfa0ffe304b158e868ac33e849f3d17022f50b4eb1c7c7b2e84a50a21a" => :x86_64_linux end depends_on "tor" diff --git a/Formula/onnxruntime.rb b/Formula/onnxruntime.rb index 0165bf00f1fd0..cde31a02817bf 100644 --- a/Formula/onnxruntime.rb +++ b/Formula/onnxruntime.rb @@ -10,6 +10,7 @@ class Onnxruntime < Formula sha256 "8523ac42679c8d4ab9b7224468020781a2654abad851d7e95a3d570cd29456c2" => :catalina sha256 "c9f06b98661dfba06e3bdebc1743274f1a77c0af78f3f7b5290c01f900e5ee2d" => :mojave sha256 "21055d5a282b4c9501d3623a6d3b5dae04954e6cf925fbdc93d4d9723d634e7d" => :high_sierra + sha256 "ad244865b5fb09d90f274bce2f50cf8c78a03a4da491748d25e149d484d32aad" => :x86_64_linux end depends_on "cmake" => :build @@ -32,17 +33,32 @@ def install end test do - (testpath/"test.c").write <<~EOS - #include - #include - int main() - { - printf("%s\\n", OrtGetApiBase()->GetVersionString()); - return 0; - } - EOS - system ENV.cc, "-I#{include}", "-L#{lib}", "-lonnxruntime", - testpath/"test.c", "-o", testpath/"test" - assert_equal version, shell_output("./test").strip + if OS.mac? + (testpath/"test.c").write <<~EOS + #include + #include + int main() + { + printf("%s\\n", OrtGetApiBase()->GetVersionString()); + return 0; + } + EOS + system ENV.cc, "-I#{include}", "-L#{lib}", "-lonnxruntime", + testpath/"test.c", "-o", testpath/"test" + assert_equal version, shell_output("./test").strip + else + (testpath/"test.c").write <<~EOS + #include + #include + int main() + { + if(ORT_API_VERSION) + printf("ok"); + } + EOS + system ENV.cc, "-I#{include}", "-L#{lib}", "-lonnxruntime", + testpath/"test.c", "-o", testpath/"test" + assert_equal "ok", shell_output("./test").strip + end end end diff --git a/Formula/opa.rb b/Formula/opa.rb index 19ace28e0daca..67173b654401e 100644 --- a/Formula/opa.rb +++ b/Formula/opa.rb @@ -10,6 +10,7 @@ class Opa < Formula sha256 "ad97bf77534ea5b72012148ec96e08700b1762b89f1222738e5c51f43c74f5d8" => :catalina sha256 "8ef806fc00001368ac78a50df08024c0b52d76438b1f7963ab9d71e02c045b4f" => :mojave sha256 "271f1584b341382fd5f9b5f601707d4fcb0efe96b66d82bf958221f091a287a9" => :high_sierra + sha256 "5ed911165ca9b61aac74f4908917bb4d8f09aaf27c20d153073558c8ce310ff9" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/opam.rb b/Formula/opam.rb index 6680e2979c616..2fa242404c63d 100644 --- a/Formula/opam.rb +++ b/Formula/opam.rb @@ -10,6 +10,7 @@ class Opam < Formula sha256 "f159a779ee6521c95c06b382fbea72bd1cedf6463d9be8bc85f5cfac4ef16b0d" => :catalina sha256 "fec93e54a1a635c7d2b5ca4acfbd051665a606f6760b5336b846b23ca8663e23" => :mojave sha256 "5fef1c5aca812af337373a34b9a97e2f0bd7bf3f22a36c3d184af73a4c2ea7f7" => :high_sierra + sha256 "14695c2527c6170de82b3f77d798f8bb9ca549e4ad6116728e81a8f564e40023" => :x86_64_linux end depends_on "ocaml" => [:build, :test] diff --git a/Formula/open-babel.rb b/Formula/open-babel.rb index 82b2418b0e629..c46610f9ce2dc 100644 --- a/Formula/open-babel.rb +++ b/Formula/open-babel.rb @@ -10,6 +10,7 @@ class OpenBabel < Formula sha256 "997886c087d6c342ea47649bb6de0e50fa807a2116aaad2119490b8921b85edf" => :catalina sha256 "d8bf12ee10f070e6ca4396fa37d02da80f5449f5c3927a0050ffbb028331a01a" => :mojave sha256 "035d300440fbfaaf20939137db63e8f78246983a16db563dcd1b66f4980685f4" => :high_sierra + sha256 "d2c6d510e5025d626c4b4b1ae74dffd611ad928e05bfdd757fa3cebefae0a598" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/open-jtalk.rb b/Formula/open-jtalk.rb index 274dcaa681926..8da54dadb593b 100644 --- a/Formula/open-jtalk.rb +++ b/Formula/open-jtalk.rb @@ -10,6 +10,7 @@ class OpenJtalk < Formula sha256 "bed36f972fe3dc3d5f286eff5c1b1605a1bcfae6cc755b7b2aee57fc497f7913" => :mojave sha256 "cd50656bb81db4528b82b844c773440d6cdfec63e545a64002a473da05a7eb18" => :high_sierra sha256 "b015d173b77980d0da3a8eedad02fdff95ac919c790917ba9cb197db91207235" => :sierra + sha256 "98eef76812ba433ddb6d0c9772dc22ca699e3a3a6ff2a444dee11364eb82981d" => :x86_64_linux end resource "hts_engine API" do diff --git a/Formula/open-mesh.rb b/Formula/open-mesh.rb index cbf3f38987b26..2b41d6cfd9d23 100644 --- a/Formula/open-mesh.rb +++ b/Formula/open-mesh.rb @@ -10,6 +10,7 @@ class OpenMesh < Formula sha256 "40eabd6160d88b74bb3298b42dfce249c327bee9a596b5911a4015462b457dfb" => :catalina sha256 "3c523efbed147ef236ba22b7fdfc8fddae883b4ce7b9f03e970af199416adbe5" => :mojave sha256 "a1b6514505ea011f01e8a61fd20dec9f31b900a42e8581e24a23beca738dc5f3" => :high_sierra + sha256 "b4da74f89c5ab22af8184e3220565d078d3b3084f1eaeeecd0ad991b116e171f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/open-mpi.rb b/Formula/open-mpi.rb index 602a1ca364adc..ff1a926451978 100644 --- a/Formula/open-mpi.rb +++ b/Formula/open-mpi.rb @@ -8,6 +8,7 @@ class OpenMpi < Formula sha256 "b45ead03ae109edf9e21641c95936971bc26e73043f714bdafc8424ca48f80ab" => :catalina sha256 "f989294546d32ccc440f91957518e306c5988070d71a55b85781735d599eaba0" => :mojave sha256 "e6fc345d013a800ae875b65baa417e7fce9b1231bc14fc2257e82ce6f273cb4e" => :high_sierra + sha256 "c18585be38f31d2bc5e951bfeb608a9bbcb1da0a55ac7383ee041c7b5e680448" => :x86_64_linux end head do @@ -24,6 +25,9 @@ class OpenMpi < Formula conflicts_with "mpich", :because => "both install MPI compiler wrappers" def install + # Fix libopen-pal.so: undefined reference to `__atomic_compare_exchange_16' + ENV["HOMEBREW_OPTFLAGS"] = "" if !OS.mac? && build.bottle? + # otherwise libmpi_usempi_ignore_tkr gets built as a static library ENV["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version @@ -87,7 +91,7 @@ def install EOS system bin/"mpicc", "hello.c", "-o", "hello" system "./hello" - system bin/"mpirun", "./hello" + system bin/"mpirun", "--allow-run-as-root", "./hello" (testpath/"hellof.f90").write <<~EOS program hello include 'mpif.h' @@ -101,6 +105,6 @@ def install EOS system bin/"mpif90", "hellof.f90", "-o", "hellof" system "./hellof" - system bin/"mpirun", "./hellof" + system bin/"mpirun", "--allow-run-as-root", "./hellof" end end diff --git a/Formula/open-ocd.rb b/Formula/open-ocd.rb index 3425bcb499fa3..b63de11e08b0f 100644 --- a/Formula/open-ocd.rb +++ b/Formula/open-ocd.rb @@ -10,6 +10,7 @@ class OpenOcd < Formula sha256 "491bec9acdc4e446a6515975041f21dec919ba330f88b5a69e8651ddd9c07468" => :mojave sha256 "0258f4d658907060d890c978a4d122ac5501119c4d28bb272e4bf5bc59bd8852" => :high_sierra sha256 "790605e83cc22ab4a455a382f7b6a434d44c19f82e0b8a0ee6a3bf28ac6f9f31" => :sierra + sha256 "b1bd008d2bacea026671495974c59975f43bbdea841364f038f72ee19b4b62dc" => :x86_64_linux end head do diff --git a/Formula/open-sp.rb b/Formula/open-sp.rb index f6bf6b6a03088..4b5ccbb4bf593 100644 --- a/Formula/open-sp.rb +++ b/Formula/open-sp.rb @@ -11,6 +11,7 @@ class OpenSp < Formula sha256 "41deb89bf8fd39c9d99eb171039a949fba4e82eb86d674d2584ae70a0e3ecc73" => :high_sierra sha256 "77f282ed97f428763c7952365353a6b915ff3315d7808db73a51e785961e989c" => :sierra sha256 "03629f243a1598b2b26fc07f8b747c77b62efe88ce435d8e018167140d22b86e" => :el_capitan + sha256 "f01acccbb4fd2d7841b93a359353f9302d3cdcb21d212c05e98f7ad0907f5245" => :x86_64_linux end depends_on "docbook" => :build diff --git a/Formula/open-tyrian.rb b/Formula/open-tyrian.rb index 82e21b03bfc01..806db86a7880a 100644 --- a/Formula/open-tyrian.rb +++ b/Formula/open-tyrian.rb @@ -10,6 +10,7 @@ class OpenTyrian < Formula sha256 "5e66ea919c426dcce63be043164439b258a22a906ece3b3b1ec1e41147ac0b76" => :catalina sha256 "f49d2282ee86031f1c1442b6d1eb2fb2753286cb89207b63f03ee98e51e9221f" => :mojave sha256 "541d2f9a00f4a56b9464c44994c94da0afeab340c1b3809b61a0c437fda69b7f" => :high_sierra + sha256 "25364076b9371b79fef80c301cd420eab68a0b54ca621e4d1c21ca95d32facf7" => :x86_64_linux end depends_on "sdl" diff --git a/Formula/openal-soft.rb b/Formula/openal-soft.rb index 2da36f3f852e1..ac28850271061 100644 --- a/Formula/openal-soft.rb +++ b/Formula/openal-soft.rb @@ -10,6 +10,7 @@ class OpenalSoft < Formula sha256 "b62337bb563eaaacec777b6861de4b6ba1d33ad8e19418b4b5a0cdfb37473fcf" => :catalina sha256 "f6448e18550e62cd283bebe24e98f6253c5c18758aeb7c44f3816f1840082b25" => :mojave sha256 "26dbb8819cd991e4a901f3f90f0cc2339c9e4220330329dcf7caa37b14d048d7" => :high_sierra + sha256 "078bd103e43fd7378671d0b8c332d5798cdf3bc562813d74e6e485f2447cd56b" => :x86_64_linux end keg_only :shadowed_by_macos, "macOS provides OpenAL.framework" diff --git a/Formula/openblas.rb b/Formula/openblas.rb index af77e8c90387b..025ef3ec3f7c0 100644 --- a/Formula/openblas.rb +++ b/Formula/openblas.rb @@ -10,6 +10,7 @@ class Openblas < Formula sha256 "78adf725595ca6ea98e97cadf2f13cd49bf7abe7fe1e57f9d8cc47f1f0312d2f" => :catalina sha256 "ae33553b0f7745b167eac0fbd2e93dc1ac010c1bb5a57d893e5e5bd84b56ca88" => :mojave sha256 "7b54bb60994215c561da00595aa4c2f049869b9e0a1d4b3c88d64f95ae47ed9f" => :high_sierra + sha256 "b693e9f47af8fa7f96ba79903c3f957acaccca5ab4552760ba15ed1ac96d27df" => :x86_64_linux end keg_only :shadowed_by_macos, "macOS provides BLAS in Accelerate.framework" @@ -23,11 +24,12 @@ def install ENV["NO_AVX512"] = "1" # Must call in two steps - system "make", "CC=#{ENV.cc}", "FC=gfortran", "libs", "netlib", "shared" + system "make", "CC=#{ENV.cc}", "FC=gfortran", "libs", "netlib", "shared", *("NO_AVX512=1" unless OS.mac?) system "make", "PREFIX=#{prefix}", "install" - lib.install_symlink "libopenblas.dylib" => "libblas.dylib" - lib.install_symlink "libopenblas.dylib" => "liblapack.dylib" + so = OS.mac? ? "dylib" : "so" + lib.install_symlink "libopenblas.#{so}" => "libblas.#{so}" + lib.install_symlink "libopenblas.#{so}" => "liblapack.#{so}" end test do diff --git a/Formula/opencolorio.rb b/Formula/opencolorio.rb index 36f4e1fd1e37e..d94b6058c5d09 100644 --- a/Formula/opencolorio.rb +++ b/Formula/opencolorio.rb @@ -11,6 +11,7 @@ class Opencolorio < Formula sha256 "d47e35411a692bf51624ecd4958d48a24788d1e1ec0d0ceefa7b86120d7d3a0d" => :catalina sha256 "8f8c1e02c9f4006463476b5dc870c3decc945e3df78fad43cfe93c4b5d1ec35e" => :mojave sha256 "be544d7630cd26c9694474393de260c0114435b3bb1a7dd85b0379f49673c66b" => :high_sierra + sha256 "60eeb8ff63a19b756ce30a5b0b14bf17529b7d146d968c31e3ecd34d6336bdc7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/openconnect.rb b/Formula/openconnect.rb index 1eb3b8cbe34ac..5a338681fbbea 100644 --- a/Formula/openconnect.rb +++ b/Formula/openconnect.rb @@ -9,6 +9,7 @@ class Openconnect < Formula sha256 "b4144970e695adc8f049319408cd431c96eb2ca4714feb903e0f01f3926dfd1f" => :catalina sha256 "5f4d9cb8a0a39983205bad4e1e6d7a2ae586f0725571fa83eac6421b8d6f4b9a" => :mojave sha256 "4d306766b4a334c7dcc8497b0684005c9011cd8913131b25bae2f56f3b3217d1" => :high_sierra + sha256 "b4142a28d9d0134600ee58a2d6f2001bacfda6d1c572a55e12d52a0b4b4e7ba0" => :x86_64_linux end head do diff --git a/Formula/opencore-amr.rb b/Formula/opencore-amr.rb index ca0c9da233b2b..39ed0704ff3a6 100644 --- a/Formula/opencore-amr.rb +++ b/Formula/opencore-amr.rb @@ -12,6 +12,7 @@ class OpencoreAmr < Formula sha256 "2b6378d4427dc88bac7e01d2614dd100535f1d78b1e6b81560e3a074e1d5a770" => :sierra sha256 "4b628ad01f725342698a8556c4176f5d57e3647cc0f52669092a0523b76cc5d0" => :el_capitan sha256 "0e8940ad28407b353c69b7fa0cdcd7d90777345f5ea86dcc9974552f99c1030c" => :yosemite + sha256 "0718e8b5edad39d2ff92939c0ecccf3068b052f7ab17c71fcbfb6e387bf9a4b6" => :x86_64_linux end def install diff --git a/Formula/opencv.rb b/Formula/opencv.rb index 26bc03ac8400e..1bd5b32d0c194 100644 --- a/Formula/opencv.rb +++ b/Formula/opencv.rb @@ -9,6 +9,7 @@ class Opencv < Formula sha256 "0d457dd4616dd0f7788ff299c39274aa54a9477fe3b290430576408f1ac47cb5" => :catalina sha256 "b8b104f25eb19a2b26b681bee7c791d9afa2a5648e65210bc0766df363f5fc34" => :mojave sha256 "c49eeb4793c2a85efe9cacb691b1d54298858c7f486d4b97ee95c8d8a910ab16" => :high_sierra + sha256 "79d54f19a8f4c3320678bef265e039f26c56646ffdda2d688c26e148419a7014" => :x86_64_linux end depends_on "cmake" => :build @@ -28,6 +29,7 @@ class Opencv < Formula depends_on "python@3.8" depends_on "tbb" depends_on "webp" + depends_on "openblas" unless OS.mac? resource "contrib" do url "https://github.com/opencv/opencv_contrib/archive/4.3.0.tar.gz" @@ -80,6 +82,7 @@ def install -DBUILD_opencv_python3=ON -DPYTHON3_EXECUTABLE=#{Formula["python@3.8"].opt_bin}/python3 ] + args << "-DENABLE_PRECOMPILED_HEADERS=OFF" unless OS.mac? # The compiler on older Mac OS cannot build some OpenCV files using AVX2 # extensions, failing with errors such as @@ -92,12 +95,20 @@ def install mkdir "build" do system "cmake", "..", *args - inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/mac/super/", "" + if OS.mac? + inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/mac/super/", "" + else + inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/linux/super/", "" + end system "make" system "make", "install" system "make", "clean" system "cmake", "..", "-DBUILD_SHARED_LIBS=OFF", *args - inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/mac/super/", "" + if OS.mac? + inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/mac/super/", "" + else + inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/linux/super/", "" + end system "make" lib.install Dir["lib/*.a"] lib.install Dir["3rdparty/**/*.a"] diff --git a/Formula/opencv@2.rb b/Formula/opencv@2.rb index c7d101f8f86ee..a3c8e052c6e7b 100644 --- a/Formula/opencv@2.rb +++ b/Formula/opencv@2.rb @@ -24,8 +24,11 @@ class OpencvAT2 < Formula depends_on "numpy@1.16" depends_on "openexr" + depends_on "glib" unless OS.mac? + def install ENV.cxx11 + dylib = OS.mac? ? "dylib" : "so" jpeg = Formula["jpeg"] args = std_cmake_args + %W[ @@ -49,17 +52,14 @@ def install -DWITH_OPENGL=ON -DWITH_TBB=OFF -DJPEG_INCLUDE_DIR=#{jpeg.opt_include} - -DJPEG_LIBRARY=#{jpeg.opt_lib}/libjpeg.dylib + -DJPEG_LIBRARY=#{jpeg.opt_lib}/libjpeg.#{dylib} -DENABLE_SSSE3=ON ] py_prefix = `python-config --prefix`.chomp py_lib = "#{py_prefix}/lib" - args << "-DPYTHON_LIBRARY=#{py_lib}/libpython2.7.dylib" + args << "-DPYTHON_LIBRARY=#{py_lib}/libpython2.7.#{dylib}" args << "-DPYTHON_INCLUDE_DIR=#{py_prefix}/include/python2.7" - - # Make sure find_program locates system Python - # https://github.com/Homebrew/homebrew-science/issues/2302 args << "-DCMAKE_PREFIX_PATH=#{py_prefix}" args << "-DENABLE_SSE41=ON" << "-DENABLE_SSE42=ON" if MacOS.version.requires_sse42? diff --git a/Formula/opencv@3.rb b/Formula/opencv@3.rb index 289ac2c42b029..c8a773932691f 100644 --- a/Formula/opencv@3.rb +++ b/Formula/opencv@3.rb @@ -78,12 +78,20 @@ def install mkdir "build" do system "cmake", "..", *args - inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/mac/super/", "" + if OS.mac? + inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/mac/super/", "" + else + inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/linux/super/", "" + end system "make" system "make", "install" system "make", "clean" system "cmake", "..", "-DBUILD_SHARED_LIBS=OFF", *args - inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/mac/super/", "" + if OS.mac? + inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/mac/super/", "" + else + inreplace "modules/core/version_string.inc", "#{HOMEBREW_SHIMS_PATH}/linux/super/", "" + end system "make" lib.install Dir["lib/*.a"] lib.install Dir["3rdparty/**/*.a"] diff --git a/Formula/opendetex.rb b/Formula/opendetex.rb index 3c77e9d89a68a..587bca874999a 100644 --- a/Formula/opendetex.rb +++ b/Formula/opendetex.rb @@ -9,6 +9,7 @@ class Opendetex < Formula sha256 "db8c07a7987de189582449f403d15ecbcf7867cac9b1a6694ffe91217fa3f2cb" => :catalina sha256 "d9b5550e47478394dd53f9b307bd0398488ac93311a4aa1544f9b7172a0a310c" => :mojave sha256 "59bfca18bfe6cf097d158a3e411e0f24f4c800b52d4d43d4f939c8e23082d009" => :high_sierra + sha256 "718956f89c922b6d17f54a97fc87ce802a36f25ae867a78f2b65285a0a2e5a53" => :x86_64_linux end uses_from_macos "flex" => :build diff --git a/Formula/openexr.rb b/Formula/openexr.rb index 4a75307a4c58d..58ace0288f201 100644 --- a/Formula/openexr.rb +++ b/Formula/openexr.rb @@ -8,6 +8,7 @@ class Openexr < Formula sha256 "cd7b32d91f6e70711a4010f2027be140189d8fc92f5fcdb12331228a9e762817" => :catalina sha256 "057ebb08dfa17cefc33121b6fe39af3ac43b59b4c197abba473a0e4724f07802" => :mojave sha256 "a5d9520a67acdb84ac3593290d2d65d3f4dd0c4db4ed4fe9f5c07c4b5a441ae2" => :high_sierra + sha256 "72c03bb0e75166c7d6328cc01831dfcdfe49c4fc1c699b4ca2232c8b6784f276" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/openfortivpn.rb b/Formula/openfortivpn.rb index a564ce05c1bb5..37bde465b47be 100644 --- a/Formula/openfortivpn.rb +++ b/Formula/openfortivpn.rb @@ -9,6 +9,7 @@ class Openfortivpn < Formula sha256 "0c04566ef63f3cc1cb5062c3a18b78f6fed368dd6d449670e3a2fedf2d6f3806" => :catalina sha256 "d35fe4166d8371cf285e6b54fe3b92d380bb8932b9f307f3ba1d6f51650013d0" => :mojave sha256 "7bb4c80c9b516bc18ab034ef0d928d254212aec7d4ee34d43e3f94fe16115044" => :high_sierra + sha256 "bc5f63b364d6a708b67360b320c97b9d6eec73d623eb09add27ae5b34959cde4" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/openh264.rb b/Formula/openh264.rb index e4392f55e0e05..406a63577ee94 100644 --- a/Formula/openh264.rb +++ b/Formula/openh264.rb @@ -10,13 +10,14 @@ class Openh264 < Formula sha256 "40bbd156c791be70467bebecb927745edc9b54dd46aa2c4a317562a4cf1dce8e" => :catalina sha256 "952ae4b5cafae14722588046032ee363b7b027178aa30ec450e4ee916b85eb4b" => :mojave sha256 "de7a5593d7a401e606b44d88347e83651508538d2461e4510b024f41b8b0f42e" => :high_sierra + sha256 "dadf6aa1da05e02f885d9bbb0347912a06b7b2176609bc44bee4127b2175f220" => :x86_64_linux end depends_on "nasm" => :build def install system "make", "install-shared", "PREFIX=#{prefix}" - chmod 0444, "#{lib}/libopenh264.dylib" + chmod 0444, "#{lib}/libopenh264.dylib" if OS.mac? end test do diff --git a/Formula/openhmd.rb b/Formula/openhmd.rb index 4c28755f704ff..9bab8b8c63c8a 100644 --- a/Formula/openhmd.rb +++ b/Formula/openhmd.rb @@ -11,6 +11,7 @@ class Openhmd < Formula sha256 "796c1a6f06715aa8a3304cca0083378d5fe2a1006b55da8727938922b5408c8d" => :mojave sha256 "1c54727de5836916bca42065d0ed53f0a796d07ec6866408a69213c94b151092" => :high_sierra sha256 "97f5dff1e77b6b615544ed6611aa6d8c3395e3c6dc759c4576084d87a4e976ad" => :sierra + sha256 "1c76125523d08577fba3e0f1ed47825b78c7040a5185798feb042833ab95fb84" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/openimageio.rb b/Formula/openimageio.rb index 4ee94a43e43f0..7413ccd9bf366 100644 --- a/Formula/openimageio.rb +++ b/Formula/openimageio.rb @@ -10,6 +10,7 @@ class Openimageio < Formula sha256 "48179416ab126d38f950d9f1c929c376d1b8df35746469dea77715d63ba72412" => :catalina sha256 "8f06af6415ac7288ff1cd36305e1ef69131b5409a6f985d57a60c4f01d22f70d" => :mojave sha256 "091a1467e43a5d7788dcb64b3f4dfd728451920258023a18de564e9c7bb3007f" => :high_sierra + sha256 "4253782894bb754573d9eecd95c4cc3bbc0bec929111e13e6e87715caf32bbfc" => :x86_64_linux end depends_on "cmake" => :build @@ -45,20 +46,25 @@ def install ] # CMake picks up the system's python dylib, even if we have a brewed one. + ext = OS.mac? ? "dylib" : "so" py3ver = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3" - py3prefix = Formula["python@3.8"].opt_frameworks/"Python.framework/Versions/#{py3ver}" + py3prefix = if OS.mac? + Formula["python@3.8"].opt_frameworks/"Python.framework/Versions/#{py3ver}" + else + Formula["python@3.8"].opt_prefix + end ENV["PYTHONPATH"] = lib/"python#{py3ver}/site-packages" args << "-DPYTHON_EXECUTABLE=#{py3prefix}/bin/python3" - args << "-DPYTHON_LIBRARY=#{py3prefix}/lib/libpython#{py3ver}.dylib" + args << "-DPYTHON_LIBRARY=#{py3prefix}/lib/libpython#{py3ver}.#{ext}" args << "-DPYTHON_INCLUDE_DIR=#{py3prefix}/include/python#{py3ver}" # CMake picks up boost-python instead of boost-python3 args << "-DBOOST_ROOT=#{Formula["boost"].opt_prefix}" boost_lib = Formula["boost-python3"].opt_lib py3ver_without_dots = py3ver.to_s.delete(".") - args << "-DBoost_PYTHON_LIBRARIES=#{boost_lib}/libboost_python#{py3ver_without_dots}-mt.dylib" + args << "-DBoost_PYTHON_LIBRARIES=#{boost_lib}/libboost_python#{py3ver_without_dots}-mt.#{ext}" # This is strange, but must be set to make the hack above work args << "-DBoost_PYTHON_LIBRARY_DEBUG=''" diff --git a/Formula/openjdk.rb b/Formula/openjdk.rb index b336f2b56fb9d..a087239c1626f 100644 --- a/Formula/openjdk.rb +++ b/Formula/openjdk.rb @@ -11,25 +11,45 @@ class Openjdk < Formula sha256 "65adca036393f528e3830cab8b0aafec94be870de087d94cfe098fd593517307" => :catalina sha256 "6034ec5a0927803eae37a5e85b6c6efadb930527827b45ecc593e25a9750061c" => :mojave sha256 "358101f25201e4c942297223d854ef95003798fe5396ebc671efa359c27e3d22" => :high_sierra + sha256 "68e4b312ecabd1aa36cf2b70b5a1ab4f8de0f77cd1eaf66448af4091db137b6a" => :x86_64_linux end keg_only "it shadows the macOS `java` wrapper" depends_on "autoconf" => :build + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "alsa-lib" + depends_on "cups" + depends_on "fontconfig" + depends_on "unzip" + depends_on "zip" + depends_on "linuxbrew/xorg/libx11" + depends_on "linuxbrew/xorg/libxext" + depends_on "linuxbrew/xorg/libxrandr" + depends_on "linuxbrew/xorg/libxrender" + depends_on "linuxbrew/xorg/libxt" + depends_on "linuxbrew/xorg/libxtst" + end on_linux do depends_on "pkg-config" => :build end resource "boot-jdk" do - url "https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_osx-x64_bin.tar.gz" - sha256 "675a739ab89b28a8db89510f87cb2ec3206ec6662fb4b4996264c16c72cdd2a1" + if OS.mac? + url "https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_osx-x64_bin.tar.gz" + sha256 "675a739ab89b28a8db89510f87cb2ec3206ec6662fb4b4996264c16c72cdd2a1" + else + url "https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz" + sha256 "75998a6ebf477467aa5fb68227a67733f0e77e01f737d4dfbc01e617e59106ed" + end end def install boot_jdk_dir = Pathname.pwd/"boot-jdk" resource("boot-jdk").stage boot_jdk_dir - boot_jdk = boot_jdk_dir/"Contents/Home" + boot_jdk = OS.mac? ? boot_jdk_dir/"Contents/Home" : boot_jdk_dir java_options = ENV.delete("_JAVA_OPTIONS") short_version, _, build = version.to_s.rpartition("+") @@ -39,21 +59,31 @@ def install "--without-version-opt", "--with-version-build=#{build}", "--with-toolchain-path=/usr/bin", - "--with-extra-ldflags=-headerpad_max_install_names", + ("--with-extra-ldflags=-headerpad_max_install_names" if OS.mac?), "--with-boot-jdk=#{boot_jdk}", "--with-boot-jdk-jvmargs=#{java_options}", "--with-debug-level=release", "--with-native-debug-symbols=none", "--enable-dtrace=auto", - "--with-jvm-variants=server" + "--with-jvm-variants=server", + ("--with-x=#{HOMEBREW_PREFIX}" unless OS.mac?), + ("--with-cups=#{HOMEBREW_PREFIX}" unless OS.mac?), + ("--with-fontconfig=#{HOMEBREW_PREFIX}" unless OS.mac?) ENV["MAKEFLAGS"] = "JOBS=#{ENV.make_jobs}" system "make", "images" - libexec.install "build/macosx-x86_64-server-release/images/jdk-bundle/jdk-#{short_version}.jdk" => "openjdk.jdk" - bin.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/bin/*"] - include.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/include/*.h"] - include.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/include/darwin/*.h"] + if OS.mac? + libexec.install "build/macosx-x86_64-server-release/images/jdk-bundle/jdk-#{short_version}.jdk" => "openjdk.jdk" + bin.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/bin/*"] + include.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/include/*.h"] + include.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/include/darwin/*.h"] + else + libexec.install Dir["build/linux-x86_64-server-release/images/jdk/*"] + bin.install_symlink Dir["#{libexec}/bin/*"] + include.install_symlink Dir["#{libexec}/include/*.h"] + include.install_symlink Dir["#{libexec}/include/linux/*.h"] + end end def caveats diff --git a/Formula/openjdk@10.rb b/Formula/openjdk@10.rb new file mode 100644 index 0000000000000..f29fe20ced3b5 --- /dev/null +++ b/Formula/openjdk@10.rb @@ -0,0 +1,38 @@ +class OpenjdkAT10 < Formula + desc "Java Development Kit" + homepage "http://jdk.java.net/10/" + version "10.0.2" + if OS.mac? + url "http://java.com/" + else + url "https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz" + sha256 "f3b26abc9990a0b8929781310e14a339a7542adfd6596afb842fa0dd7e3848b2" + end + + bottle do + sha256 "07db75aecdfd58b5fb0b7eca8885de56a42134b07ed4c05764967569583c63d7" => :x86_64_linux + end + + depends_on :linux + + def install + prefix.install Dir["*"] + share.mkdir + share.install prefix/"man" + end + + test do + (testpath/"Hello.java").write <<~EOS + class Hello + { + public static void main(String[] args) + { + System.out.println("Hello Homebrew"); + } + } + EOS + system bin/"javac", "Hello.java" + assert_predicate testpath/"Hello.class", :exist?, "Failed to compile Java program!" + assert_equal "Hello Homebrew\n", shell_output("#{bin}/java Hello") + end +end diff --git a/Formula/openjdk@11.rb b/Formula/openjdk@11.rb index 7f08e8be1769d..fb34ae000fb1e 100644 --- a/Formula/openjdk@11.rb +++ b/Formula/openjdk@11.rb @@ -10,25 +10,45 @@ class OpenjdkAT11 < Formula sha256 "1cef37f5566ca7c60c03bad337c81516525459a7c4892519bc9badf90633a935" => :catalina sha256 "5bb229b65beda25d23ffee46f02bc8a921ad21c9312716e20ea4eba2cfb27901" => :mojave sha256 "2ee32dada456c7c8560ebda3d6b182a80a83b015cd91a30e82602ae0b5e4ce0a" => :high_sierra + sha256 "2fb2601acfe01331d503df321c6ea237f18326595115238dc44c36a3f498aff4" => :x86_64_linux end keg_only :versioned_formula depends_on "autoconf" => :build + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "alsa-lib" + depends_on "cups" + depends_on "fontconfig" + depends_on "unzip" + depends_on "zip" + depends_on "linuxbrew/xorg/libx11" + depends_on "linuxbrew/xorg/libxext" + depends_on "linuxbrew/xorg/libxrandr" + depends_on "linuxbrew/xorg/libxrender" + depends_on "linuxbrew/xorg/libxt" + depends_on "linuxbrew/xorg/libxtst" + end on_linux do depends_on "pkg-config" => :build end resource "boot-jdk" do - url "https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_osx-x64_bin.tar.gz" - sha256 "77ea7675ee29b85aa7df138014790f91047bfdafbc997cb41a1030a0417356d7" + if OS.mac? + url "https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_osx-x64_bin.tar.gz" + sha256 "77ea7675ee29b85aa7df138014790f91047bfdafbc997cb41a1030a0417356d7" + else + url "https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz" + sha256 "f3b26abc9990a0b8929781310e14a339a7542adfd6596afb842fa0dd7e3848b2" + end end def install boot_jdk_dir = Pathname.pwd/"boot-jdk" resource("boot-jdk").stage boot_jdk_dir - boot_jdk = boot_jdk_dir/"Contents/Home" + boot_jdk = OS.mac? ? boot_jdk_dir/"Contents/Home" : boot_jdk_dir java_options = ENV.delete("_JAVA_OPTIONS") short_version, _, build = version.to_s.rpartition("+") @@ -38,22 +58,31 @@ def install "--without-version-opt", "--with-version-build=#{build}", "--with-toolchain-path=/usr/bin", - "--with-extra-ldflags=-headerpad_max_install_names", + ("--with-extra-ldflags=-headerpad_max_install_names" if OS.mac?), "--with-boot-jdk=#{boot_jdk}", "--with-boot-jdk-jvmargs=#{java_options}", "--with-debug-level=release", "--with-native-debug-symbols=none", "--enable-dtrace=auto", - "--with-jvm-variants=server" + "--with-jvm-variants=server", + ("--with-x=#{HOMEBREW_PREFIX}" unless OS.mac?), + ("--with-cups=#{HOMEBREW_PREFIX}" unless OS.mac?), + ("--with-fontconfig=#{HOMEBREW_PREFIX}" unless OS.mac?) ENV["MAKEFLAGS"] = "JOBS=#{ENV.make_jobs}" system "make", "images" - jdk = "build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-#{short_version}.jdk" - libexec.install jdk => "openjdk.jdk" - bin.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/bin/*"] - include.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/include/*.h"] - include.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/include/darwin/*.h"] + if OS.mac? + libexec.install "build/macosx-x86_64-server-release/images/jdk-bundle/jdk-#{short_version}.jdk" => "openjdk.jdk" + bin.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/bin/*"] + include.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/include/*.h"] + include.install_symlink Dir["#{libexec}/openjdk.jdk/Contents/Home/include/darwin/*.h"] + else + libexec.install Dir["build/linux-x86_64-normal-server-release/images/jdk/*"] + bin.install_symlink Dir["#{libexec}/bin/*"] + include.install_symlink Dir["#{libexec}/include/*.h"] + include.install_symlink Dir["#{libexec}/include/linux/*.h"] + end end def caveats diff --git a/Formula/openjdk@9.rb b/Formula/openjdk@9.rb new file mode 100644 index 0000000000000..a5ad946ae3cc6 --- /dev/null +++ b/Formula/openjdk@9.rb @@ -0,0 +1,38 @@ +class OpenjdkAT9 < Formula + desc "Java Development Kit" + homepage "http://jdk.java.net/archive/" + version "9.0.4" + if OS.mac? + url "http://java.com/" + else + url "https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz" + sha256 "39362fb9bfb341fcc802e55e8ea59f4664ca58fd821ce956d48e1aa4fb3d2dec" + end + + bottle do + sha256 "32ee918a254ba3059a2b6ef27279bebbf2b8941654338ab55af563442f5fe778" => :x86_64_linux + end + + depends_on :linux + + def install + prefix.install Dir["*"] + share.mkdir + share.install prefix/"man" + end + + test do + (testpath/"Hello.java").write <<~EOS + class Hello + { + public static void main(String[] args) + { + System.out.println("Hello Homebrew"); + } + } + EOS + system bin/"javac", "Hello.java" + assert_predicate testpath/"Hello.class", :exist?, "Failed to compile Java program!" + assert_equal "Hello Homebrew\n", shell_output("#{bin}/java Hello") + end +end diff --git a/Formula/openjpeg.rb b/Formula/openjpeg.rb index bd99916166c94..9bb0d2697dcc3 100644 --- a/Formula/openjpeg.rb +++ b/Formula/openjpeg.rb @@ -11,6 +11,7 @@ class Openjpeg < Formula sha256 "6de317bfef3ab808ff5f3eb9c1aa47f77e7236fba8ad0d606b29b38eb47c321e" => :mojave sha256 "1eb8b2f698ecf16196e06a2d9f7ba20eb7f0ba447d351e36eb3344d3ed6c5c58" => :high_sierra sha256 "d2b377424ff5387892bc1af653654fdcc70702e4524f3309b3f0874ac6e2d84c" => :sierra + sha256 "33168cda26238c22f4c307229c743213a893c984f3815dd8f329e741aa108180" => :x86_64_linux end depends_on "cmake" => :build @@ -39,8 +40,8 @@ def install return 0; } EOS - system ENV.cc, "-I#{include.children.first}", "-L#{lib}", "-lopenjp2", - testpath/"test.c", "-o", "test" + system ENV.cc, "-I#{include.children.first}", + testpath/"test.c", "-L#{lib}", "-lopenjp2", "-o", "test" system "./test" end end diff --git a/Formula/openldap.rb b/Formula/openldap.rb index db2d015d89d47..6a9212646d2a3 100644 --- a/Formula/openldap.rb +++ b/Formula/openldap.rb @@ -8,11 +8,16 @@ class Openldap < Formula sha256 "c0f1fe7a472cba83a584bd574ba2a4d8e04b73fac95259855ee8697359f7e117" => :catalina sha256 "b4273ace070b3f6afb965b0f2c9d43524a38d1521b55febe84833586a5d773fb" => :mojave sha256 "fe64b6a62c8fddfa647f8e48ad233ee09514cc0bc7ba43058b85b0809e4cfab2" => :high_sierra + sha256 "40c0f133911b284cb1c605f9cb883c73b0b66d4637d85c9e7c4bcf1db873de74" => :x86_64_linux end keg_only :provided_by_macos depends_on "openssl@1.1" + unless OS.mac? + depends_on "groff" => :build + depends_on "util-linux" # for libuuid.so.1 + end on_linux do depends_on "util-linux" diff --git a/Formula/openlibm.rb b/Formula/openlibm.rb index c4189c3eacc73..44a30ae1999bb 100644 --- a/Formula/openlibm.rb +++ b/Formula/openlibm.rb @@ -9,6 +9,7 @@ class Openlibm < Formula sha256 "a7d18405ee96e1409a3de89904263280b364ae5e0d046be6a1391031f6ec5bb9" => :catalina sha256 "d7f73575a6b6b7efb4307165f578e172a1563955ed476683b27bbaca6c0cafb6" => :mojave sha256 "4f769ffeda11f2bc17a5cd52a4bcd59723586b9258b789adcdb628fb700cca86" => :high_sierra + sha256 "f49019b9ce5a9639565cd9cac9c3ebe8673dea687cc1d576b15726ec85af0bde" => :x86_64_linux end keg_only :provided_by_macos diff --git a/Formula/openmotif.rb b/Formula/openmotif.rb index e5ba4da7d008d..0048986fdacff 100644 --- a/Formula/openmotif.rb +++ b/Formula/openmotif.rb @@ -10,6 +10,7 @@ class Openmotif < Formula sha256 "ca0c7a96b098ed5efc2dace2cb1b9bc2447c8f1cf0780e882bfee691160466e0" => :high_sierra sha256 "21120a7b3aab57d5660c480ab5f1924cbfb31e8625674bf02704971f103616f9" => :sierra sha256 "bef02966fb2d72ac23235c8038cdf864cefe47d1cb905fac08a9194d7c9ed554" => :el_capitan + sha256 "72fd978916fbba47139e0e2402d4f0fb15adcfe88881229714fd3857d276901d" => :x86_64_linux end depends_on "pkg-config" => :build @@ -17,12 +18,23 @@ class Openmotif < Formula depends_on "freetype" depends_on "jpeg" depends_on "libpng" - depends_on :x11 + if OS.mac? + depends_on :x11 + else + depends_on "linuxbrew/xorg/xorg" + depends_on "linuxbrew/xorg/xbitmaps" + depends_on "flex" => :build + end conflicts_with "lesstif", :because => "Lesstif and Openmotif are complete replacements for each other" def install + unless OS.mac? + inreplace ["demos/programs/Exm/simple_app/Makefile.am", "demos/programs/Exm/simple_app/Makefile.in"], + /(LDADD.*\n.*libExm.a)/, + "\\1 -lX11" + end system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking", "--disable-silent-rules" diff --git a/Formula/opensaml.rb b/Formula/opensaml.rb index 4e2a813496b77..6ae82255b95a0 100644 --- a/Formula/opensaml.rb +++ b/Formula/opensaml.rb @@ -9,6 +9,7 @@ class Opensaml < Formula sha256 "fb766a10e4471cb65da1e9833ab752e360af38a598f50fe4190881950abed391" => :catalina sha256 "06438e82b7723985c2089d8ab2198dc8ac7bfc0cf3e86c3b78c0bea8586ecb41" => :mojave sha256 "55e58f4e0e0a077ea5dc4a936e759a9f5e710fab05b2f9f6efb4b01144130d3a" => :high_sierra + sha256 "d06f173edbff0f73139c8838576435b0958adb43aed11d89256993131561b8d7" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/openshift-cli.rb b/Formula/openshift-cli.rb index c85c3f8b56a4c..ee2f2c4602e12 100644 --- a/Formula/openshift-cli.rb +++ b/Formula/openshift-cli.rb @@ -15,13 +15,16 @@ class OpenshiftCli < Formula sha256 "e565ddf932f76f4638e2fcf6ae85a76b4c528d000df4dc8f8ae35ee77c860adb" => :mojave sha256 "4e8426318d66ff09d71200bbef8154d0ba965c7ae67a6f23b18a94bf59d05b3f" => :high_sierra sha256 "3fb7f73cdb5b933e3e05b5724ac09dddef5c6d133c7474900cb8e47321f225f6" => :sierra + sha256 "88e171c1805bcd33336be641e1046c78907f9655b794a72504ea5a4aa6fee2b3" => :x86_64_linux end depends_on "coreutils" => :build depends_on "go" => :build depends_on "socat" + depends_on "krb5" unless OS.mac? def install + ENV.O0 unless OS.mac? # See https://github.com/golang/go/issues/26487 ENV["GOPATH"] = buildpath dir = buildpath/"src/github.com/openshift/origin" dir.install buildpath.children - [buildpath/".brew_home"] @@ -35,7 +38,7 @@ def install system "make", "all", "WHAT=staging/src/github.com/openshift/oc/cmd/oc" end - bin.install "_output/local/bin/darwin/amd64/oc" + bin.install "_output/local/bin/#{OS.mac? ? "darwin" : "linux"}/amd64/oc" prefix.install_metafiles diff --git a/Formula/openslide.rb b/Formula/openslide.rb index 11267769a8e44..46706b684a462 100644 --- a/Formula/openslide.rb +++ b/Formula/openslide.rb @@ -11,6 +11,7 @@ class Openslide < Formula sha256 "d90e3ee5514064389cea2bdf1d4369cc2be4e1d965ac9d56f47e0c6e22f310af" => :mojave sha256 "1d70f22fad80e061bcfa5d4955d522d37bd077c51cad4697579a104759233ad2" => :high_sierra sha256 "de34071d033c87c731be7954d7c0ced87ddf086100c29fea07410d68621b9929" => :sierra + sha256 "421b9ef84c0d9ee17356a47208e6b8ad07f83d5c944855a4f3b6bb7fe2f64a40" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/openslp.rb b/Formula/openslp.rb index e2dd29cd9e278..b2a518623aec2 100644 --- a/Formula/openslp.rb +++ b/Formula/openslp.rb @@ -12,6 +12,7 @@ class Openslp < Formula sha256 "1c19d8355ddda63b9259101a0b7b56ea0fd9fb8f343e2df19f7248542fbf38e5" => :el_capitan sha256 "95e41f7f42e80ab3234b460d90196389a0d275877195fe188ffc6249c0b762ce" => :yosemite sha256 "883203d7fc5bbd6faefa058bf2f68dad2cc6a485f46599163d000684ae585507" => :mavericks + sha256 "4bc594636cf22b11cd255c2db2c046ec4f3af30f3ac5b1e90e665f0c47743f78" => :x86_64_linux end def install diff --git a/Formula/openssh.rb b/Formula/openssh.rb index 91129deeb8085..9f93a537fff36 100644 --- a/Formula/openssh.rb +++ b/Formula/openssh.rb @@ -20,28 +20,37 @@ class Openssh < Formula depends_on "libfido2" depends_on "openssl@1.1" + unless OS.mac? + depends_on "libedit" + depends_on "krb5" + depends_on "zlib" + depends_on "lsof" => :test + end + resource "com.openssh.sshd.sb" do url "https://opensource.apple.com/source/OpenSSH/OpenSSH-209.50.1/com.openssh.sshd.sb" sha256 "a273f86360ea5da3910cfa4c118be931d10904267605cdd4b2055ced3a829774" end # Both these patches are applied by Apple. - patch do - url "https://raw.githubusercontent.com/Homebrew/patches/1860b0a745f1fe726900974845d1b0dd3c3398d6/openssh/patch-sandbox-darwin.c-apple-sandbox-named-external.diff" - sha256 "d886b98f99fd27e3157b02b5b57f3fb49f43fd33806195970d4567f12be66e71" - end + if OS.mac? + patch do + url "https://raw.githubusercontent.com/Homebrew/patches/1860b0a745f1fe726900974845d1b0dd3c3398d6/openssh/patch-sandbox-darwin.c-apple-sandbox-named-external.diff" + sha256 "d886b98f99fd27e3157b02b5b57f3fb49f43fd33806195970d4567f12be66e71" + end - patch do - url "https://raw.githubusercontent.com/Homebrew/patches/d8b2d8c2612fd251ac6de17bf0cc5174c3aab94c/openssh/patch-sshd.c-apple-sandbox-named-external.diff" - sha256 "3505c58bf1e584c8af92d916fe5f3f1899a6b15cc64a00ddece1dc0874b2f78f" + patch do + url "https://raw.githubusercontent.com/Homebrew/patches/d8b2d8c2612fd251ac6de17bf0cc5174c3aab94c/openssh/patch-sshd.c-apple-sandbox-named-external.diff" + sha256 "3505c58bf1e584c8af92d916fe5f3f1899a6b15cc64a00ddece1dc0874b2f78f" + end end def install - ENV.append "CPPFLAGS", "-D__APPLE_SANDBOX_NAMED_EXTERNAL__" + ENV.append "CPPFLAGS", "-D__APPLE_SANDBOX_NAMED_EXTERNAL__" if OS.mac? # Ensure sandbox profile prefix is correct. # We introduce this issue with patching, it's not an upstream bug. - inreplace "sandbox-darwin.c", "@PREFIX@/share/openssh", etc/"ssh" + inreplace "sandbox-darwin.c", "@PREFIX@/share/openssh", etc/"ssh" if OS.mac? args = %W[ --prefix=#{prefix} @@ -49,11 +58,13 @@ def install --with-ldns --with-libedit --with-kerberos5 - --with-pam --with-ssl-dir=#{Formula["openssl@1.1"].opt_prefix} --with-security-key-builtin ] + args << "--with-pam" if OS.mac? + args << "--with-privsep-path=#{var}/lib/sshd" unless OS.mac? + system "./configure", *args system "make" ENV.deparallelize @@ -69,6 +80,12 @@ def install end test do + if ENV["CI"] + # Fixes "Starting sshd: Privilege separation user sshd does not exist FAILED" in docker + system "groupadd", "-g", "133", "sshd" + system "useradd", "-u", "133", "-g", "133", "-c", "sshd", "-d", "/", "sshd" + end + assert_match "OpenSSH_", shell_output("#{bin}/ssh -V 2>&1") port = free_port diff --git a/Formula/openssl@1.1.rb b/Formula/openssl@1.1.rb index 4923df2fb81db..23c37748e63a0 100644 --- a/Formula/openssl@1.1.rb +++ b/Formula/openssl@1.1.rb @@ -11,10 +11,30 @@ class OpensslAT11 < Formula sha256 "1926679569c6af5337de812d86f4dad2b21ff883ad3a5d2cd9e8836ac5ac7ffe" => :catalina sha256 "5c9d113393ff3efc95e5509175305fc9304fba35390a61915ed2864941c423f2" => :mojave sha256 "eebad96faa46489dc8bf8502b16ec0192f5ff9d803794c9744ad50352bfca0f7" => :high_sierra + sha256 "6487415cb2902e5837927427a6b93a579bf5481652e526422d73f687bef41d3e" => :x86_64_linux end keg_only :shadowed_by_macos, "macOS provides LibreSSL" + unless OS.mac? + resource "cacert" do + # homepage "http://curl.haxx.se/docs/caextract.html" + url "https://curl.haxx.se/ca/cacert-2020-01-01.pem" + mirror "https://gist.githubusercontent.com/dawidd6/16d94180a019f31fd31bc679365387bc/raw/ef02c78b9d6427585d756528964d18a2b9e318f7/cacert-2020-01-01.pem" + sha256 "adf770dfd574a0d6026bfaa270cb6879b063957177a991d453ff1d302c02081f" + end + + resource "Test::Harness" do + url "https://cpan.metacpan.org/authors/id/L/LE/LEONT/Test-Harness-3.42.tar.gz" + sha256 "0fd90d4efea82d6e262e6933759e85d27cbcfa4091b14bf4042ae20bab528e53" + end + + resource "Test::More" do + url "https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Simple-1.302175.tar.gz" + sha256 "c8c8f5c51ad6d7a858c3b61b8b658d8e789d3da5d300065df0633875b0075e49" + end + end + # SSLv2 died with 1.1.0, so no-ssl2 no longer required. # SSLv3 & zlib are off by default with 1.1.0 but this may not # be obvious to everyone, so explicitly state it for now to @@ -26,10 +46,27 @@ def configure_args no-ssl3 no-ssl3-method no-zlib + #{[ENV.cppflags, ENV.cflags, ENV.ldflags].join(" ").strip unless OS.mac?} + #{"enable-md2" unless OS.mac?} ] end def install + unless OS.mac? + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + resource("Test::Harness").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make", "PERL5LIB=#{ENV["PERL5LIB"]}", "CC=#{ENV.cc}" + system "make", "install" + end + + resource("Test::More").stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make", "PERL5LIB=#{ENV["PERL5LIB"]}", "CC=#{ENV.cc}" + system "make", "install" + end + end + # This could interfere with how we expect OpenSSL to build. ENV.delete("OPENSSL_LOCAL_CONFIG_DIR") @@ -38,13 +75,24 @@ def install # Whilst our env points to opt_bin, by default OpenSSL resolves the symlink. ENV["PERL"] = Formula["perl"].opt_bin/"perl" if which("perl") == Formula["perl"].opt_bin/"perl" - arch_args = %w[darwin64-x86_64-cc enable-ec_nistp_64_gcc_128] + if OS.mac? + arch_args = %w[darwin64-x86_64-cc enable-ec_nistp_64_gcc_128] + else + arch_args = [] + if Hardware::CPU.intel? + arch_args << (Hardware::CPU.is_64_bit? ? "linux-x86_64" : "linux-elf") + elsif Hardware::CPU.arm? + arch_args << (Hardware::CPU.is_64_bit? ? "linux-aarch64" : "linux-armv4") + end + end ENV.deparallelize system "perl", "./Configure", *(configure_args + arch_args) system "make" - system "make", "test" + system "make", "test" if OS.mac? system "make", "install", "MANDIR=#{man}", "MANSUFFIX=ssl" + # See https://github.com/Linuxbrew/homebrew-core/pull/8891 + system "make", "test" unless OS.mac? end def openssldir @@ -52,6 +100,16 @@ def openssldir end def post_install + unless OS.mac? + # Download and install cacert.pem from curl.haxx.se + cacert = resource("cacert") + cacert.fetch + rm_f openssldir/"cert.pem" + filename = Pathname.new(cacert.url).basename + openssldir.install cacert.files(filename => "cert.pem") + return + end + keychains = %w[ /System/Library/Keychains/SystemRootCertificates.keychain ] diff --git a/Formula/opentracing-cpp.rb b/Formula/opentracing-cpp.rb index 49dcec5db262e..d151f8ca18ab8 100644 --- a/Formula/opentracing-cpp.rb +++ b/Formula/opentracing-cpp.rb @@ -9,6 +9,7 @@ class OpentracingCpp < Formula sha256 "151a5af54448492f668979eb3a0e9fb92e2e1a99cb6766ba3985a9a88f26526a" => :catalina sha256 "5a10c35e98785ee6567c241e845e3fd24a2fa52f15ade1d4e6a91f939752bd8c" => :mojave sha256 "7747ffc077d879fbbbf4509e65fcfc154f238c9c92482bf94d1fb176156be563" => :high_sierra + sha256 "dc35c641ee16ae5babb0ca1faae6ff117f1c19d3c0a1479a00c8a4b8043e03ab" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/openvpn.rb b/Formula/openvpn.rb index f23aba7c89c2f..08d0f3f255dc3 100644 --- a/Formula/openvpn.rb +++ b/Formula/openvpn.rb @@ -9,6 +9,7 @@ class Openvpn < Formula sha256 "b4d2c905d810562fc11e83c226ed8572386482f1e856e0f8de3e5ff63ee00526" => :catalina sha256 "315e55c0f3b2cdbf4c3e8545c98702e1c4eeff20bc37dbf89921389494b3ef54" => :mojave sha256 "bb3ce3b1fbbdf51cf5a207d00a1f60d22eb9b98096595fb81c563dffac077c0f" => :high_sierra + sha256 "d5949da94c2e5ac63644f820946bcaf2595436534b9895c64cae03de1b03b795" => :x86_64_linux end depends_on "pkg-config" => :build @@ -17,6 +18,10 @@ class Openvpn < Formula depends_on "openssl@1.1" depends_on "pkcs11-helper" + unless OS.mac? + depends_on "linux-pam" + depends_on "net-tools" + end def install system "./configure", "--disable-debug", diff --git a/Formula/operator-sdk.rb b/Formula/operator-sdk.rb index e2bf9da2e6228..5281f1eaa95b3 100644 --- a/Formula/operator-sdk.rb +++ b/Formula/operator-sdk.rb @@ -10,6 +10,7 @@ class OperatorSdk < Formula sha256 "e65f3924379136ae7e70bb127de617c1abe7c412ee0f76d68f2b30076a800e5a" => :catalina sha256 "9e00bc50006c341b63a7e324ce08a184043adf686626ea2864246a44e0f12d73" => :mojave sha256 "0220df7e671176dc8d8f7b3f017437db0d183701d8ae2fd1aa250e2965e1c23c" => :high_sierra + sha256 "e26faa310d66e3cd54fe0c8d79f1f90539613a5430d1b5bc2708e519adc701fd" => :x86_64_linux end depends_on "go" diff --git a/Formula/ophcrack.rb b/Formula/ophcrack.rb index be07440d76d6e..aafcc1547317b 100644 --- a/Formula/ophcrack.rb +++ b/Formula/ophcrack.rb @@ -12,6 +12,7 @@ class Ophcrack < Formula sha256 "0bdbfbee37e693edff5fc8f71c52f1fb12d6dd07c1e64aa1a20401df0789853a" => :mojave sha256 "a1061331c1e9b4a726c818005a3d795ba8c73b29ecd78a3828b5e5eafac18107" => :high_sierra sha256 "6229ee0c1e44192fa0d513b7e72e5c72e7fbd29b5ad7f61cd5c5824d76d49105" => :sierra + sha256 "d2198ca755690e9db9a2216549fd266b2654510274ffba3a58205fd7296df811" => :x86_64_linux end depends_on "openssl@1.1" @@ -22,6 +23,7 @@ def install system "./configure", "--disable-debug", "--disable-gui", "--with-libssl=#{Formula["openssl@1.1"].opt_prefix}", + ("--with-libexpat=#{Formula["expat"].opt_prefix}" unless OS.mac?), "--prefix=#{prefix}" system "make", "install" end diff --git a/Formula/optipng.rb b/Formula/optipng.rb index def96804d0d75..a92821332d2d1 100644 --- a/Formula/optipng.rb +++ b/Formula/optipng.rb @@ -12,6 +12,7 @@ class Optipng < Formula sha256 "b64e8d6bd75de2e40d481c7b0e816f45b0865e2dfa42f03e507f67607804ef2b" => :high_sierra sha256 "416ce24daab37aaef4fecda949fc80bed2b1d9b9714406f972b093846578ab3a" => :sierra sha256 "f59e3cedb808003915ee214f6487b968e3e6dcea669452f0a732fcced03aaa8f" => :el_capitan + sha256 "583e39421ee8cba284602103d524f6d9c6abc46d5319415b54f4919b1819017f" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/opus-tools.rb b/Formula/opus-tools.rb index 91bc778d5cc28..66198e53ce371 100644 --- a/Formula/opus-tools.rb +++ b/Formula/opus-tools.rb @@ -10,6 +10,7 @@ class OpusTools < Formula sha256 "964b3493cffeb5e32411c7a34e1813e8e83e940419aca39f50be7db9b0c8fab2" => :catalina sha256 "c4059aca471c3b1ec384323c1c801b844a2d2b61f17434ebc43c0accffde9f9b" => :mojave sha256 "0f8828cf6044f2d7b0cac9c591295b420244e8f086dc0afae9ae5420e6be7cb9" => :high_sierra + sha256 "4d512ac525dd99bf194a432108bb6be04338bf91846dcfeb0e1387c094f855b6" => :x86_64_linux end head do diff --git a/Formula/opus.rb b/Formula/opus.rb index 7060cbba6ce12..24fde6d29eaac 100644 --- a/Formula/opus.rb +++ b/Formula/opus.rb @@ -10,6 +10,7 @@ class Opus < Formula sha256 "5cb191f66da0ef2b8d03985c79cb18a59506aaba8a01cc0b1a821c293e88d576" => :catalina sha256 "21fa4c22a63bccc5e188dabb9c85af63a57d19582c4f616716bccb063e2befec" => :mojave sha256 "8b45ac09baae56bdc2c7ee224d5a1ae68efb826a9aec2220e0b27e8ce633b8aa" => :high_sierra + sha256 "984bc704f88437baa73e8b475149ef13ddd1bca9414f47ebe00f44b863793a28" => :x86_64_linux end head do @@ -53,8 +54,13 @@ def install return err; } EOS - system ENV.cxx, "-I#{include}/opus", "-L#{lib}", "-lopus", - testpath/"test.cpp", "-o", "test" + if OS.mac? + system ENV.cxx, "-I#{include}/opus", "-L#{lib}", "-lopus", + testpath/"test.cpp", "-o", "test" + else + system ENV.cxx, "-I#{include}/opus", + testpath/"test.cpp", "-L#{lib}", "-lopus", "-o", "test" + end system "./test" end end diff --git a/Formula/opusfile.rb b/Formula/opusfile.rb index 3184527dc40a5..973b114a685e0 100644 --- a/Formula/opusfile.rb +++ b/Formula/opusfile.rb @@ -11,6 +11,7 @@ class Opusfile < Formula sha256 "acd200760db74feb30ea28bdb14cdf8b3ebdeb5a65759e1095fad3f9583c3ef3" => :catalina sha256 "44e1c4d26cac791ff40de7b15fb2718c6aaa99856a128c23a3c542a3132e2053" => :mojave sha256 "7f83ce800aaa0dedb44b18332e1628e307bf83d693586ed6359b02e6ea21737e" => :high_sierra + sha256 "66cc97376bf816dbda0026b9f1194123dd41ba771d04c0a7c5502025e5eea661" => :x86_64_linux end head do diff --git a/Formula/orbit.rb b/Formula/orbit.rb index 2ea8018f8dca3..baf0e23a35b05 100644 --- a/Formula/orbit.rb +++ b/Formula/orbit.rb @@ -10,6 +10,7 @@ class Orbit < Formula sha256 "a604838d3a9e9690eceefb5f798aa5c02a6d46b5e1f1cbb50bbc5cc95df451e9" => :catalina sha256 "367cb438ac5ee8c44cd932d259f82b43458af90df8df28803e2248ad75952800" => :mojave sha256 "50487080b7e4614d077b4cbb818a726a7bae7a7a281fc85fabd6ff88ed848016" => :high_sierra + sha256 "181d8758639395d40411e04c7d2ce03c0530f285f1af96942407eec86f0c422a" => :x86_64_linux end depends_on "pkg-config" => :build @@ -28,6 +29,8 @@ class Orbit < Formula end def install + # Fix for https://forums.gentoo.org/viewtopic-t-1020924-start-0.html + ENV.deparallelize unless OS.mac? system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" diff --git a/Formula/orc.rb b/Formula/orc.rb index f685ea273d026..77546d67c4ba9 100644 --- a/Formula/orc.rb +++ b/Formula/orc.rb @@ -9,6 +9,7 @@ class Orc < Formula sha256 "c4a11fbf1e2d645b0bbcbabc467c6f7fe604282833ece90264b063806a1e4909" => :catalina sha256 "b9c58730d763ca611867504ff7005245e95ca435b027d85ff7f7471dc7431b59" => :mojave sha256 "b732bc9e7fa9825222b0dda3dfdbe7f38cf45aeb46c239f432fc646d98079e76" => :high_sierra + sha256 "a69874c451d86fd31ada1aaf8ca5a961de6cfb42944b18da8eadbb371375de70" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/orocos-kdl.rb b/Formula/orocos-kdl.rb index 079b6921bfef8..64c2b73fd4981 100644 --- a/Formula/orocos-kdl.rb +++ b/Formula/orocos-kdl.rb @@ -11,6 +11,7 @@ class OrocosKdl < Formula sha256 "32e9cd3e10a20c046a45122557dda364352619c59acffca07f8c858cdcff9765" => :high_sierra sha256 "2696ca8480d6be3de18a141630388ef5fe5486096c02f99726b6d07cc91ff958" => :sierra sha256 "87d3407e88f69187f10119d109321c8ece7c04154262475665f462923f69ffe9" => :el_capitan + sha256 "64f15475c1ea44fb029eb035f5f95224015f5564f69d97101fd26e0665ed5f82" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/osc.rb b/Formula/osc.rb index 11bf5333ac0aa..2c67aab362de5 100644 --- a/Formula/osc.rb +++ b/Formula/osc.rb @@ -12,6 +12,7 @@ class Osc < Formula sha256 "c0b5be694e7a7be280746d507ab928392365d24c4f5130f5070e9da6169f744a" => :catalina sha256 "452a9846612deb1fa4205b492152826ea3d11e0391dab3f6633f8fd04395313a" => :mojave sha256 "ac1bb79ace0cc7eb7e5abe8bbb36cf67bbaaed1ce4b5d3d2dcbd360672308b44" => :high_sierra + sha256 "f183acee65c80017a5d083119c10ad71ed8e29013799d2e4ed40de528d7807b5" => :x86_64_linux end depends_on "swig" => :build diff --git a/Formula/osm-gps-map.rb b/Formula/osm-gps-map.rb index f5e48cd4e7d8d..6ea95c0919234 100644 --- a/Formula/osm-gps-map.rb +++ b/Formula/osm-gps-map.rb @@ -81,6 +81,10 @@ def install -losmgpsmap-1.0 ] system ENV.cc, "test.c", "-o", "test", *flags + + # (test:40601): Gtk-WARNING **: 23:06:24.466: cannot open display + return if !OS.mac? && ENV["CI"] + system "./test" end end diff --git a/Formula/osm-pbf.rb b/Formula/osm-pbf.rb index bbbbe56225659..d656c4a510d98 100644 --- a/Formula/osm-pbf.rb +++ b/Formula/osm-pbf.rb @@ -12,6 +12,7 @@ class OsmPbf < Formula sha256 "68e5bf0c9924719525b0522da2656ae43a7cdb11bcdf3a6c05e481c3f5b242ec" => :high_sierra sha256 "c4f104fa72861e982b9071e656675a3ed3c4bf2d37fddeab3c5eb952d7864d9b" => :sierra sha256 "6e6902ebcdb50d95ab0aeeb9fcc086956eb768110f1646839dba876b1f31c643" => :el_capitan + sha256 "dc911231a19612f1ba74825fe8c2d15610c57875e86714eb24bd726aee55c5ec" => :x86_64_linux end depends_on "protobuf" diff --git a/Formula/osm2pgsql.rb b/Formula/osm2pgsql.rb index c30f5ec9032b8..62c2621d4a74b 100644 --- a/Formula/osm2pgsql.rb +++ b/Formula/osm2pgsql.rb @@ -10,6 +10,7 @@ class Osm2pgsql < Formula sha256 "8a75a1cce23049c268514c45a1c1f7fa3e9e2594ef37f917fa916dcfd820f61d" => :catalina sha256 "b8c30a15e7d08731e701e46b1cb56827cf8e34594e566d1b8ec69e150e343ac6" => :mojave sha256 "93e01a705ff066e207d433afda097627fd82976a95bee8d053a04e4692f40a4a" => :high_sierra + sha256 "6eb826252eacfb01a083005c71cb6941ca762943236dd4c2c5a44b812c0c1565" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/osmfilter.rb b/Formula/osmfilter.rb index c3aa72ab561ff..51e7783149cf3 100644 --- a/Formula/osmfilter.rb +++ b/Formula/osmfilter.rb @@ -4,15 +4,16 @@ class Osmfilter < Formula url "https://gitlab.com/osm-c-tools/osmctools.git", :tag => "0.9", :revision => "f341f5f237737594c1b024338f0a2fc04fabdff3" + revision 1 unless OS.mac? head "https://gitlab.com/osm-c-tools/osmctools.git" bottle do - cellar :any_skip_relocation sha256 "5e2b755a970b7432fb076d787cb1777df18861832d0e4d45132fd84e4d7aea20" => :catalina sha256 "470532603de299b9073f5511b8be798558d430f86ba4f37b330a497ec9fdae48" => :mojave sha256 "b2e2d4190462b0b0e473da4a50ab5e25da007aca21db898d2d359e9e9eb2cde7" => :high_sierra sha256 "d7a8285fe18af71d0093b89e9b5613a4fe30ceb4978e07f61ad1974e734d7f50" => :sierra sha256 "6a0fd608e0bc8094f08edb6f86a51b45745506d3ef84e0454ef1498dd77f61b0" => :el_capitan + sha256 "08c1e658dfd2df393acd89410720ae6825ec1abd175e358d9ebd0fa3436ddeaa" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/osmium-tool.rb b/Formula/osmium-tool.rb index a0d8139a4dd86..79ce54afb2ac5 100644 --- a/Formula/osmium-tool.rb +++ b/Formula/osmium-tool.rb @@ -9,6 +9,7 @@ class OsmiumTool < Formula sha256 "5bc39388890c18e37d0fa87b1644a7f3768860721980ac324fe5737d411eefca" => :catalina sha256 "67e2e3075ab367207375d3d84dcd4c5cd014757fcae8213787cf45b3a2e262d0" => :mojave sha256 "b892d8dabfb211da58b6a3e2ffa6a5a65c2d5f8ceb481979fa14667be4a1ba62" => :high_sierra + sha256 "3d7191684db1ea97f5800f7526a316d839c9ce4c2b6a33fba371f79c7028a73e" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/osqp.rb b/Formula/osqp.rb index bea083c22e2b3..7e667f5e899d6 100644 --- a/Formula/osqp.rb +++ b/Formula/osqp.rb @@ -9,6 +9,7 @@ class Osqp < Formula sha256 "50feea323216bf8cc5d8dda92264a9354d547b5076d4c3b37b75792d0ac14c3f" => :catalina sha256 "99a2f2810fc34c0241c0bc4a7bc31704a5b1ccc8201d112735e75cda14bb4bca" => :mojave sha256 "2f50e046d34b7556891c7351aeab94347d1404b4ac1dcb041c413c4fb42bf16d" => :high_sierra + sha256 "70df64a0910604a52633fb530050b1f811f008818ef3abdea39ab2c23c06f3e1" => :x86_64_linux end depends_on "cmake" => [:build, :test] @@ -36,7 +37,7 @@ def install rm_rf include/"qdldl" rm_rf lib/"cmake/qdldl" rm lib/"libqdldl.a" - rm lib/"libqdldl.dylib" + rm lib/"libqdldl.dylib" if OS.mac? end test do @@ -45,9 +46,9 @@ def install project(osqp_demo LANGUAGES C) find_package(osqp CONFIG REQUIRED) add_executable(osqp_demo osqp_demo.c) - target_link_libraries(osqp_demo PRIVATE osqp::osqp) + target_link_libraries(osqp_demo PRIVATE osqp::osqp -lm) add_executable(osqp_demo_static osqp_demo.c) - target_link_libraries(osqp_demo_static PRIVATE osqp::osqpstatic) + target_link_libraries(osqp_demo_static PRIVATE osqp::osqpstatic -lm) EOS # from https://github.com/oxfordcontrol/osqp/blob/HEAD/tests/demo/test_demo.h (testpath/"osqp_demo.c").write <<~EOS diff --git a/Formula/osslsigncode.rb b/Formula/osslsigncode.rb index 8188f282ade78..fc808c92fca33 100644 --- a/Formula/osslsigncode.rb +++ b/Formula/osslsigncode.rb @@ -10,6 +10,7 @@ class Osslsigncode < Formula sha256 "9f9d6f343dc0a7e6ecf34a27e97049b62952e5a05319b1f7aa4c235cf793fc5e" => :catalina sha256 "cf48ec533b5cc0db3cf56903091936822c422d484371c28b2397bd02bd3bdbbb" => :mojave sha256 "5999a97a256941d082e171faceb5cbf7fb54720031d71cc1c086d8d08d18ff01" => :high_sierra + sha256 "bccf670be04064edbf2c41fb13f270b591aac307594267b14b05df7c30552562" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/ossp-uuid.rb b/Formula/ossp-uuid.rb index 00943e2645d06..3d60a08c5a5a1 100644 --- a/Formula/ossp-uuid.rb +++ b/Formula/ossp-uuid.rb @@ -14,6 +14,7 @@ class OsspUuid < Formula sha256 "ac4456fc1c29db7e0d565ebdd392cf827be315b52c9eb3abcd113c4c7b981f25" => :el_capitan sha256 "c6cfa39816d19fa8d4586d6a364cd17e3a089ea018242875dc371731578a4ac7" => :yosemite sha256 "5253f4fab035aca3ca3b867ce0d081812eb17fe0dcaab6599087abaa385c478d" => :mavericks + sha256 "92cc17f72267c14bc1333ec626c55f58ac420100db239dbcbeea7dea94160e72" => :x86_64_linux end def install diff --git a/Formula/osxutils.rb b/Formula/osxutils.rb index 1f20ec4020bd5..bf0395febcb22 100644 --- a/Formula/osxutils.rb +++ b/Formula/osxutils.rb @@ -14,6 +14,8 @@ class Osxutils < Formula sha256 "3bd65cf2550b709c111e31db7cb7d829a9260ed5dd35a682c370ed01593c1989" => :el_capitan end + depends_on :macos + def install system "make" system "make", "PREFIX=#{prefix}", "install" diff --git a/Formula/otf2.rb b/Formula/otf2.rb index 528f89b70d225..eff2f1c6e0428 100644 --- a/Formula/otf2.rb +++ b/Formula/otf2.rb @@ -9,6 +9,7 @@ class Otf2 < Formula sha256 "4c532e5cb9864669bc29b6ad5007669c92a6abb3e069d7904ab3b102169ec2bc" => :catalina sha256 "ec63ae3bd66e7231b05f6bbd5ce8b0606126ad25e871f59d9e066fa62b9e26d8" => :mojave sha256 "dbf4c3c761e51a184a675d369a54dea5247d25d96e78899ca3b268a04c629c48" => :high_sierra + sha256 "35035cfc34ece5e028b1dd3343610e2e9196f34a4c8cd042ea62ee6128ee5942" => :x86_64_linux end depends_on "sphinx-doc" => :build @@ -41,6 +42,11 @@ def install end test do + if Process.uid.zero? + ENV["OMPI_ALLOW_RUN_AS_ROOT"] = "1" + ENV["OMPI_ALLOW_RUN_AS_ROOT_CONFIRM"] = "1" + end + cp_r "#{share}/doc/otf2/examples", testpath workdir = testpath/"examples" chdir "#{testpath}/examples" do diff --git a/Formula/otf2bdf.rb b/Formula/otf2bdf.rb index a1ac7c8ef014c..d3532d82b3db3 100644 --- a/Formula/otf2bdf.rb +++ b/Formula/otf2bdf.rb @@ -10,6 +10,7 @@ class Otf2bdf < Formula sha256 "200d4f317f5fda0c3c4a350ba773322af4a29af56a65f9e3de11b406ab517522" => :catalina sha256 "76e89f43b017f0bc2f90c3d49e70d75ac9da5260b9567d1078449f1b80af60bf" => :mojave sha256 "208ef317e3c51e88818c4f59ca0333a76d6efeed97b04affe66c3cd6b601bada" => :high_sierra + sha256 "f04564d10f3b4e3288fb918729a633f56d09f4ba1cec4898a91ad00f9b34b506" => :x86_64_linux end depends_on "freetype" @@ -19,6 +20,13 @@ class Otf2bdf < Formula sha256 "e7b13759bd5caac0976facbd1672312fe624dd172bbfd989ffcc5918ab21bfc1" end + unless OS.mac? + resource "test-font" do + url "https://raw.githubusercontent.com/paddykontschak/finder/master/fonts/LucidaGrande.ttc" + sha256 "e188b3f32f5b2d15dbf01e9b4480fed899605e287516d7c0de6809d8e7368934" + end + end + def install buildpath.install resource("mkinstalldirs") chmod 0755, "mkinstalldirs" @@ -27,6 +35,12 @@ def install end test do - assert_match /MacRoman/, shell_output("#{bin}/otf2bdf -et /System/Library/Fonts/LucidaGrande.ttc") + if OS.mac? + assert_match /MacRoman/, shell_output("#{bin}/otf2bdf -et /System/Library/Fonts/LucidaGrande.ttc") + else + resource("test-font").stage do + assert_match /MacRoman/, shell_output("#{bin}/otf2bdf -et LucidaGrande.ttc") + end + end end end diff --git a/Formula/ott.rb b/Formula/ott.rb index 9127490229eb3..a4e6b6493116e 100644 --- a/Formula/ott.rb +++ b/Formula/ott.rb @@ -10,6 +10,7 @@ class Ott < Formula sha256 "1cf56f59cd4fa2cd4c1e067fdcd9c63d9287ea700b9ced54af926222b43dfea0" => :catalina sha256 "f96a67f19f9eea3bebd7144e126b37aceae2853d2f3b91fb6a06b3dec533ab30" => :mojave sha256 "0383486c69d738578cd580b9e9b4de2274909ce86cad1fc5274c5c13b2bcabd7" => :high_sierra + sha256 "972d7d63b695f71da5431b5ad9739c44350e97788c847943288723ed2c433871" => :x86_64_linux end depends_on "ocaml" => :build diff --git a/Formula/overmind.rb b/Formula/overmind.rb index 5742074e7bc1b..7ee79ae2dacf7 100644 --- a/Formula/overmind.rb +++ b/Formula/overmind.rb @@ -10,6 +10,7 @@ class Overmind < Formula sha256 "92947cadb4c81d86710dd03679ee41323c0a15481349f3d381c40551e9dc564c" => :catalina sha256 "173ee92b1df1bb52c09e0e7dcb7949774ed8abaa022a66f0d8d04699ab83f9b7" => :mojave sha256 "be3a5f096fd9495c2cdd4835751d759568a7cf1f16b85768b5dd3c1d73b9f40d" => :high_sierra + sha256 "1c9cdeb3f8fa753a853a89e9008765743d4e7ac450bec66dfcb9d673f51e960d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/owamp.rb b/Formula/owamp.rb index 60dda2b3c06c7..c86f67b68cbf1 100644 --- a/Formula/owamp.rb +++ b/Formula/owamp.rb @@ -14,6 +14,7 @@ class Owamp < Formula sha256 "6f86a33c176ba1394560b7707466c088930f13db102b7adc159e80e889fdc5cf" => :el_capitan sha256 "fce4cc5bf0a9b5355779fb45637651f6a78bb8d3dd93bdc3ff2826b7866617fd" => :yosemite sha256 "6c6b6f1f143b929b892c6556db3b06299835326a72c5180c482b2630e62dc543" => :mavericks + sha256 "0c0e15d7f9f2c9c1d19660a4aeba9d4789fc2921525e5c491a2e2992ca952159" => :x86_64_linux end depends_on "i2util" diff --git a/Formula/owfs.rb b/Formula/owfs.rb index 0b5abd3375737..1925cceba9dca 100644 --- a/Formula/owfs.rb +++ b/Formula/owfs.rb @@ -12,6 +12,7 @@ class Owfs < Formula sha256 "118ad185bc83ac080c485e1572c5dbf9118c5620a89076e7c2715a45f07684c8" => :mojave sha256 "63f73726171fbc413a80a30581a604a68f6371d05d86db9a848d1ddbf5cb7913" => :high_sierra sha256 "76c620684afb471f5d348badbc1c7429054b348c8ebe4a8c4f70b02b3ab26374" => :sierra + sha256 "3d790b62f9f9d8206f40d62809362532f870a7716eefcd67186a0208accc8063" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/oxipng.rb b/Formula/oxipng.rb index 51a0312511784..5b6afbfb2a676 100644 --- a/Formula/oxipng.rb +++ b/Formula/oxipng.rb @@ -10,6 +10,7 @@ class Oxipng < Formula sha256 "efec4545006c363b196773b0667a80a2894b020b8fe83e8fa63c3b2494193b25" => :catalina sha256 "3bdd648e50bad274f4616a7445d482752526df13f924623ba653031568b73c57" => :mojave sha256 "ed093c935c899acb8ae58b23611e383eb54e48b7fb645ad71b42344c6fd4275a" => :high_sierra + sha256 "f250597e1a6a566c486a0c4cbd029212540b99f9f52770f15fdbea63c6a3edcc" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/p11-kit.rb b/Formula/p11-kit.rb index 8854d2e646491..c9d003d3c3ca7 100644 --- a/Formula/p11-kit.rb +++ b/Formula/p11-kit.rb @@ -9,6 +9,7 @@ class P11Kit < Formula sha256 "f9d23713a5fbd8e1eea89bcc9ab8da6792e1f7e66553da0e307ae8437a7fd950" => :catalina sha256 "72d092bf908d2623a9be13c716fd8ca04734382bd42b3ab5dd8bf2b1ab2dc00b" => :mojave sha256 "bf2e9dc6ae194c9d39d079bbd7714f4dda32b2800e37c67a2a86409aa69771bd" => :high_sierra + sha256 "b37979dd4cf20fcd4d86187883084ab8e7299c90570bfb86a0b495595bbbecef" => :x86_64_linux end head do diff --git a/Formula/p7zip.rb b/Formula/p7zip.rb index 9629e38de0efd..b0f1f10239842 100644 --- a/Formula/p7zip.rb +++ b/Formula/p7zip.rb @@ -11,6 +11,7 @@ class P7zip < Formula sha256 "0de20c4bd05dc5652ca5f188895bf74e52eb701aaed502a0d1271eb58236f898" => :mojave sha256 "5951a42bd864da7dba5ef5781a2efba206daba8b6f75c60c0cfd910dae218482" => :high_sierra sha256 "73fe6276e906f67cd28adc0f5a22c914d57fd3cfdd54134ad64e5330f710235a" => :sierra + sha256 "fc22088a7e64d75874c4f0b69981e1b56ca62d3a2f1fb170275cbf0985be9e95" => :x86_64_linux end patch do @@ -26,7 +27,11 @@ class P7zip < Formula end def install - mv "makefile.macosx_llvm_64bits", "makefile.machine" + if OS.mac? + mv "makefile.macosx_llvm_64bits", "makefile.machine" + else + mv "makefile.linux_any_cpu", "makefile.machine" + end system "make", "all3", "CC=#{ENV.cc} $(ALLFLAGS)", "CXX=#{ENV.cxx} $(ALLFLAGS)" diff --git a/Formula/pacapt.rb b/Formula/pacapt.rb index c54bd1bd8cc28..67941cee260d4 100644 --- a/Formula/pacapt.rb +++ b/Formula/pacapt.rb @@ -9,6 +9,7 @@ class Pacapt < Formula sha256 "88560339524e9f110cb58ddd3e8744cc44d6e24f86c0b9ca05ef01a059c55be2" => :catalina sha256 "88560339524e9f110cb58ddd3e8744cc44d6e24f86c0b9ca05ef01a059c55be2" => :mojave sha256 "88560339524e9f110cb58ddd3e8744cc44d6e24f86c0b9ca05ef01a059c55be2" => :high_sierra + sha256 "486019bcc3141d0e226581caf8edb5cb6636f4d74748f2cd7dd9739fbd2f83c0" => :x86_64_linux end def install diff --git a/Formula/pachi.rb b/Formula/pachi.rb index 45dd1dd020b95..71158f505a2db 100644 --- a/Formula/pachi.rb +++ b/Formula/pachi.rb @@ -3,6 +3,7 @@ class Pachi < Formula homepage "https://pachi.or.cz/" url "https://github.com/pasky/pachi/archive/pachi-12.50.tar.gz" sha256 "62c8d44bd4610fe9534a1f21bb092da209c9fb8dcb8d39558d79adabe31e740a" + revision 1 unless OS.mac? head "https://github.com/pasky/pachi.git" bottle do @@ -10,6 +11,7 @@ class Pachi < Formula sha256 "e1cac19564a176a50d27f08b4e395a53ff4144dc17fd93dcaa013adfc8cca83a" => :catalina sha256 "76edc1b521dfb93e8c6573b689c8bc5a01103888f2f7310fd46aa53d8b6ea0dc" => :mojave sha256 "476509041b907edfd0380bc91a3fd4fc41b359bae58524ab4ab8017df4f61fe0" => :high_sierra + sha256 "ec9d2b2b59cf163a751244b940e06fcb0ef27be4a8513d82b7860bbd3e3e84b5" => :x86_64_linux end resource "patterns" do diff --git a/Formula/packer.rb b/Formula/packer.rb index 302fd803781c2..2e0ed30bcf24b 100644 --- a/Formula/packer.rb +++ b/Formula/packer.rb @@ -11,6 +11,7 @@ class Packer < Formula sha256 "84918bf57b75d3127afc1aefddeb90eafa5b9f9669cbb87e823a94822ec12aa9" => :catalina sha256 "a6bea8c5bbe38a62d40e530b86d46ab747463affe288963adadd9334bf07c810" => :mojave sha256 "653dcd30c77a8989039754053efbee6fe901db91866e675b8f0ff8e0d046195e" => :high_sierra + sha256 "4d24ca7d9c59dbb1f0ff5f34e61bed1a1e389d76e61081267fb2f5fed6b2c688" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/packetq.rb b/Formula/packetq.rb index c92296868eed6..fe9c79b0d200a 100644 --- a/Formula/packetq.rb +++ b/Formula/packetq.rb @@ -9,8 +9,11 @@ class Packetq < Formula sha256 "f9838e0f004b12ca2b43feb321d4a90c5e2778a22fabd9b9b528b783c0ef98b4" => :catalina sha256 "bc56d9875b526794212e1267b17ea7ba24a639f1efaf804fe2f528f334e2854a" => :mojave sha256 "6c085b37c22ef43c3dc4bff3c68c8fb2aa02acd5ba83e6767ac3574f00e278f8" => :high_sierra + sha256 "9447c6783e4ba1ac9fea8ae3281ded15dfdd123332c0526864c7106061e71de1" => :x86_64_linux end + uses_from_macos "zlib" + def install system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", diff --git a/Formula/packmol.rb b/Formula/packmol.rb index 5dde7d93a4cdc..6b5a04e2eccf7 100644 --- a/Formula/packmol.rb +++ b/Formula/packmol.rb @@ -6,9 +6,11 @@ class Packmol < Formula head "https://github.com/mcubeg/packmol.git" bottle do + cellar :any_skip_relocation sha256 "30eaadfcb75cdfaeca7f10c9ae8b96c3f1a423420a1b1ee8e22bfa86a4f21d3d" => :catalina sha256 "3c486c726d2e535fed629ab3db8c09424be37ec11f4f3e75883cb1e5ee315907" => :mojave sha256 "2b9a34a4e1fa9cbc1d4b522b1d1cb591baf7e17d25fbb9ded02a636f95e982a3" => :high_sierra + sha256 "54c9ced2ad219ce619d7b7235cd7a5686c31fb9d30c0098f0f869015167f4867" => :x86_64_linux end depends_on "gcc" # for gfortran diff --git a/Formula/pacparser.rb b/Formula/pacparser.rb index 419fd8ba95df1..e62ccadaca008 100644 --- a/Formula/pacparser.rb +++ b/Formula/pacparser.rb @@ -12,6 +12,7 @@ class Pacparser < Formula sha256 "5a4db686679c753a806fa2e2df5e93263f973f447f9357fcdadc071687c10071" => :mojave sha256 "1bb0af844e0cfd58357987f2f9e6f82b0e72a13df961f13ad8b81b3e00a3dff2" => :high_sierra sha256 "719e5eadacf71e3a2e863447609322c45f3be3a9d3ee63373c05a9a2ae7f31b8" => :sierra + sha256 "b9e6dfaf00279359bdd42ffda10235567fd196c230384cb4c3032b41ded413e9" => :x86_64_linux end def install diff --git a/Formula/pacvim.rb b/Formula/pacvim.rb index 94f75272a9e76..1cedc6aff2b6c 100644 --- a/Formula/pacvim.rb +++ b/Formula/pacvim.rb @@ -5,12 +5,21 @@ class Pacvim < Formula sha256 "c869c5450fbafdfe8ba8a8a9bba3718775926f276f0552052dcfa090d21acb28" head "https://github.com/jmoon018/PacVim.git" + # Use ncurses.h instead of cursesw.h which is not installed by brew + unless OS.mac? + patch do + url "https://github.com/jmoon018/PacVim/pull/31.patch?full_index=1" + sha256 "e5b753de87937c0853a1adbab31eb1ec938add4ceb0df26eafef5b4f613bc3e6" + end + end + bottle do cellar :any_skip_relocation rebuild 1 sha256 "85bd0087ecc54716772881e46ce00553ee037eb2ea200d34d5db28709092369f" => :catalina sha256 "e2ecd6cc1337adb4c9e760c50a83ae04a8cb86495d3c1ea167bfa5930d7a16a0" => :mojave sha256 "b8ef8cdba34802db97fba770e013393973e908e11486b87a4f5189f139e468dc" => :high_sierra + sha256 "9a304c39ddb8a1e9680ec916e92faa291eac7f406f01e76141ab16a1e7051f70" => :x86_64_linux end uses_from_macos "ncurses" @@ -19,4 +28,8 @@ def install ENV.cxx11 system "make", "install", "PREFIX=#{prefix}" end + + test do + assert_predicate bin/name, :exist? + end end diff --git a/Formula/pagmo.rb b/Formula/pagmo.rb index 145eb7ef08bfa..ea7bfebacd9c6 100644 --- a/Formula/pagmo.rb +++ b/Formula/pagmo.rb @@ -9,6 +9,7 @@ class Pagmo < Formula sha256 "0f50a88dc4df4c8cabafceb3a96a9fb93d913db185257ca91830345dc7f5e13f" => :catalina sha256 "acd5be5bb4b9fa2b93512c7a480dae7c1a84025330f866157bf0db9640f8948e" => :mojave sha256 "4146ac95f0a01a6901c696cd54808b5834942e39bb10689b8ea6094be45d1582" => :high_sierra + sha256 "85f703dc0e719f6e6dbd7fd4ab3e0e087d8dee11580f99b15a03a17705366639" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/pandoc-crossref.rb b/Formula/pandoc-crossref.rb index 65d13c01e52e6..1dfeff7971c53 100644 --- a/Formula/pandoc-crossref.rb +++ b/Formula/pandoc-crossref.rb @@ -9,16 +9,19 @@ class PandocCrossref < Formula sha256 "255641ecab3b7429382eb0e9361423e32a79aa26e6260347174c33788b654894" bottle do - cellar :any_skip_relocation sha256 "c1fc9b7e27079de950cd5926404b928ab794fbea680373ff2de879d53e70c853" => :catalina sha256 "b3479f76133f44c081c6f3d7aa6ff68e2cba04bee2f83ec84d82b80b2e5d89ba" => :mojave sha256 "d71d84afc93ff2099ab6bfadf71cfbc36e57d5262f2f66e4102fe4f5609828a9" => :high_sierra + sha256 "d6f0a71f63fcc0c99e5fc9808f52745aa116a89c16ad735f110b3fa7004a8a48" => :x86_64_linux end depends_on "cabal-install" => :build depends_on "ghc@8.6" => :build depends_on "pandoc" + uses_from_macos "unzip" => :build + uses_from_macos "zlib" + def install install_cabal_package end diff --git a/Formula/pandoc.rb b/Formula/pandoc.rb index 4550e31a62e66..038fef868167b 100644 --- a/Formula/pandoc.rb +++ b/Formula/pandoc.rb @@ -10,10 +10,10 @@ class Pandoc < Formula head "https://github.com/jgm/pandoc.git" bottle do - cellar :any_skip_relocation sha256 "040eafbe1ebb8fe4c2b27425d7d3e566770c8c531eee7fdec2c96e01f4bf32a4" => :catalina sha256 "61493929e5168952bc5bc64149bf67f8bec818313950aee764273b146b126442" => :mojave sha256 "0fa6bfa3d880c8dcc41a469bd60ae74202094fb16bf6ca7ed48bf1cba11aea0b" => :high_sierra + sha256 "aba2b308fb0009e016cdf7a3c7174b19d4ae25465329ef31c5245fcd674e8580" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/pango.rb b/Formula/pango.rb index 85d018354efb6..171fc8414ef54 100644 --- a/Formula/pango.rb +++ b/Formula/pango.rb @@ -8,6 +8,7 @@ class Pango < Formula sha256 "38a8cab63ed7ea37fc5448b74dae21b7f935d4f4ea9c08b658f3553f20ec8f28" => :catalina sha256 "643284e68fcb4699572e7ab327a16ae3eb1c242527a96cb404cd98f14f22a893" => :mojave sha256 "42552a9d26655f006f2361c9a1773d56bd5c5cabcd4f6ad5861fec29bd27c2cc" => :high_sierra + sha256 "4b785b7124427d5de557549f0c62bd0b129d512deb5c510da77d31ce1376a471" => :x86_64_linux end head do @@ -78,10 +79,10 @@ def install -lcairo -lglib-2.0 -lgobject-2.0 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/pangomm.rb b/Formula/pangomm.rb index 3a0869251eea1..eeb4d688f31bb 100644 --- a/Formula/pangomm.rb +++ b/Formula/pangomm.rb @@ -9,6 +9,7 @@ class Pangomm < Formula sha256 "52e1c201a3967f61e5b3867c172f98cc44f169e60b03af47e00e487a67a53690" => :catalina sha256 "45d67e560dffb346b957011717b33873b53fca560da86648d4f90a40a8b6df98" => :mojave sha256 "a2097268ad9f93093aa809ba243edbe515b00e6e378c1c6b4dac01b32c24fb20" => :high_sierra + sha256 "baf79cbc6e8bd4af27de5263dd637104b16e9eab968db32cac1263cd03e6dbf9" => :x86_64_linux end depends_on "pkg-config" => :build @@ -74,12 +75,12 @@ def install -lglib-2.0 -lglibmm-2.4 -lgobject-2.0 - -lintl -lpango-1.0 -lpangocairo-1.0 -lpangomm-1.4 -lsigc-2.0 ] + flags << "-lintl" if OS.mac? system ENV.cxx, "-std=c++11", "test.cpp", "-o", "test", *flags system "./test" end diff --git a/Formula/paperkey.rb b/Formula/paperkey.rb index 7158448cc6de4..9e6529dca0d32 100644 --- a/Formula/paperkey.rb +++ b/Formula/paperkey.rb @@ -10,6 +10,7 @@ class Paperkey < Formula sha256 "894ef3339013be6574f736e316c61cbf54fbc3dcac358df14f1d54b1d7387854" => :mojave sha256 "82e49c6aa559a349ce73521a90881acb74a540de03d355ad7461c177d00bb8e8" => :high_sierra sha256 "fecd3e866173f93ddd6d89e91f2850d29c10e8edf27bb969a95de581ec382c56" => :sierra + sha256 "f4a482f73b0c20d70970b9a2c712b9f4a7ae38ff24bc9be320d40a1d5d78db6e" => :x86_64_linux end resource "secret.gpg" do diff --git a/Formula/par.rb b/Formula/par.rb index 0a002c4f7b0b0..7021403214ab3 100644 --- a/Formula/par.rb +++ b/Formula/par.rb @@ -9,6 +9,7 @@ class Par < Formula sha256 "457e5ff8ba94268a745fc954f84cbbaab7ac7d3a239ca602107a85a2e5d146a8" => :catalina sha256 "ef5da7a3e359ba4c72ad4f11c2f1fb18adea19c6c51409d0fc7400ec60ef2422" => :mojave sha256 "344dd1109a03e8c6017c2ca26a17c9f07c700c743b89b42786efce956bac70e1" => :high_sierra + sha256 "3aff9c01b6ab56de73cb61b164ce7c350dc4cdb75b0de2676599d47dfdb358b5" => :x86_64_linux end conflicts_with "rancid", :because => "both install `par` binaries" diff --git a/Formula/par2.rb b/Formula/par2.rb index b876116d81bf6..efd805856c195 100644 --- a/Formula/par2.rb +++ b/Formula/par2.rb @@ -9,6 +9,7 @@ class Par2 < Formula sha256 "26609c45028599a4845f68cda2a5cd08c2a0dc37ae3987d4abf86aed99499f50" => :catalina sha256 "cded10d8f18c5ab236ceb624854afb672681bd1a86f21e47d70de793db378580" => :mojave sha256 "35477bcfecd91b7fe885739737f576b63545aab51ba997bc60f9a74927b775dc" => :high_sierra + sha256 "abb05496548e0a60ae03cbad9cf484274e97dc091a341ae5495557c5201276a7" => :x86_64_linux end def install diff --git a/Formula/parallel.rb b/Formula/parallel.rb index 361ac4f5f6551..9baca6adec999 100644 --- a/Formula/parallel.rb +++ b/Formula/parallel.rb @@ -11,6 +11,7 @@ class Parallel < Formula sha256 "eff11ec3d9bf05b44b379c0993c5f3687f775b564864cd1557a1168a51ebad61" => :catalina sha256 "eff11ec3d9bf05b44b379c0993c5f3687f775b564864cd1557a1168a51ebad61" => :mojave sha256 "eff11ec3d9bf05b44b379c0993c5f3687f775b564864cd1557a1168a51ebad61" => :high_sierra + sha256 "6728376f7c4bccec52cbb99c4dc6f94387eb4bb156c6689da51ea3e44b5bfe7d" => :x86_64_linux end conflicts_with "moreutils", diff --git a/Formula/pari.rb b/Formula/pari.rb index 29e6c84cec430..70cfd2d7ec590 100644 --- a/Formula/pari.rb +++ b/Formula/pari.rb @@ -8,10 +8,12 @@ class Pari < Formula sha256 "34bff086dc53fc97511828c3329f71ab67c394011f88d551dc5d820fad455a93" => :catalina sha256 "bb2a09ef34d5e55b7f357169c34cd8e5942bb074770b789757e21388d440d80d" => :mojave sha256 "13613061281235cc2ffb502fd6541775a305ab61aa6ff85ed8ca15b23ec44ae4" => :high_sierra + sha256 "4684074cd7adb997277add1cb66c5aef82e88e008d205950d4829389cd16e676" => :x86_64_linux end depends_on "gmp" depends_on "readline" + depends_on "texlive" => :build unless OS.mac? def install readline = Formula["readline"].opt_prefix @@ -25,7 +27,8 @@ def install system "make", "install" # Avoid references to Homebrew shims - inreplace lib/"pari/pari.cfg", HOMEBREW_LIBRARY/"Homebrew/shims/mac/super/", "/usr/bin/" + os = OS.mac? ? "mac" : "linux" + inreplace lib/"pari/pari.cfg", HOMEBREW_LIBRARY/"Homebrew/shims/#{os}/super/", "/usr/bin/" end def caveats diff --git a/Formula/pass-otp.rb b/Formula/pass-otp.rb index 894a9522febad..062658d18b1b3 100644 --- a/Formula/pass-otp.rb +++ b/Formula/pass-otp.rb @@ -11,6 +11,7 @@ class PassOtp < Formula sha256 "4fd5893adc28693cf5b532d0ad1d469d58842e355d676cb3371c4832ed1e7a0c" => :mojave sha256 "4fd5893adc28693cf5b532d0ad1d469d58842e355d676cb3371c4832ed1e7a0c" => :high_sierra sha256 "bd30d129efb90973ffa102df943b0b3f07c47f28cb70027bec07a75d66bfd145" => :sierra + sha256 "2a79f071dfaf9e9594e7945717b7b42151708de40e4fc06f3296b0a65761b4e9" => :x86_64_linux end depends_on "gnupg" => :test diff --git a/Formula/pass.rb b/Formula/pass.rb index a0e84eb9414d1..04f3a11aa2ef3 100644 --- a/Formula/pass.rb +++ b/Formula/pass.rb @@ -11,6 +11,7 @@ class Pass < Formula sha256 "8130755986b8124ead30b7444bbab1f5b12b5481ddf914a310e221fdda736eb3" => :catalina sha256 "8130755986b8124ead30b7444bbab1f5b12b5481ddf914a310e221fdda736eb3" => :mojave sha256 "8130755986b8124ead30b7444bbab1f5b12b5481ddf914a310e221fdda736eb3" => :high_sierra + sha256 "348fab786e1ea979375eec5dc48555b145917457773c0901240889c768202e7f" => :x86_64_linux end depends_on "gnu-getopt" diff --git a/Formula/passpie.rb b/Formula/passpie.rb index bf1f19c782d7f..97e108245b722 100644 --- a/Formula/passpie.rb +++ b/Formula/passpie.rb @@ -5,7 +5,7 @@ class Passpie < Formula homepage "https://github.com/marcwebbie/passpie" url "https://files.pythonhosted.org/packages/c8/2e/db84fa9d33c9361024343411875835143dc7b73eb3320b41c4f543b40ad6/passpie-1.6.1.tar.gz" sha256 "eec50eabb9f4c9abd9a1d89794f86afe3956e1ba9f6c831d04b164fd4fc0ad02" - revision 1 + revision OS.mac? ? 1 : 2 head "https://github.com/marcwebbie/passpie.git" bottle do @@ -13,6 +13,7 @@ class Passpie < Formula sha256 "29a24482b5c955a6d14b7a285d6937c04ab89a53f110c8343221d2ccef2cb508" => :catalina sha256 "9f524fdab59188aab2b53fe7c3e5084ecdc27149dd742abffdfb13af074ba0ee" => :mojave sha256 "acac2254266a3c741c15e28403482e67517d447dc4a4c0411934ec93ab902945" => :high_sierra + sha256 "442b659edcd6391e2e04206acceb85fa4a14b652ca1577a1b655bc5481043e03" => :x86_64_linux end depends_on "gnupg" diff --git a/Formula/pastebinit.rb b/Formula/pastebinit.rb index 5e2764ae13e48..408bb508cb076 100644 --- a/Formula/pastebinit.rb +++ b/Formula/pastebinit.rb @@ -10,9 +10,10 @@ class Pastebinit < Formula sha256 "088a0565e08ea4beced3319aff9ebc0fa97101be72c9e54f34c603ee3c501c80" => :catalina sha256 "088a0565e08ea4beced3319aff9ebc0fa97101be72c9e54f34c603ee3c501c80" => :mojave sha256 "088a0565e08ea4beced3319aff9ebc0fa97101be72c9e54f34c603ee3c501c80" => :high_sierra + sha256 "4ce08eea949644182b42818b428f6aa83f78a017852cf0372ed1afb4620b9c6a" => :x86_64_linux end - depends_on "docbook2x" => :build + depends_on "docbook2x" => :build if OS.mac? # broken on linux depends_on "python@3.8" # Remove for next release @@ -27,10 +28,10 @@ def install s.gsub! "/usr/local/etc/pastebin.d", etc/"pastebin.d" end - system "docbook2man", "pastebinit.xml" + system "docbook2man", "pastebinit.xml" if OS.mac? bin.install "pastebinit" etc.install "pastebin.d" - man1.install "PASTEBINIT.1" => "pastebinit.1" + man1.install "PASTEBINIT.1" => "pastebinit.1" if OS.mac? libexec.install %w[po utils] end diff --git a/Formula/pastel.rb b/Formula/pastel.rb index 570770502cbca..d8009d80bd9ce 100644 --- a/Formula/pastel.rb +++ b/Formula/pastel.rb @@ -9,6 +9,7 @@ class Pastel < Formula sha256 "e2478748ed0561c76af8f68b4067f42cd365ad7735a9d44dda159e9bd35a1c1d" => :catalina sha256 "3d9fcb9c4f2e70010681b88f0ceca5795773b849e7bc6f59689e90ad969a673c" => :mojave sha256 "06f87da95e1d1b0f53fbcd9c9ff36e4c8a0d3ea85825ac7bc648b3ab445e61ee" => :high_sierra + sha256 "921f26cbdd5e4fedce06655961f8c8786bf0b35677f82348909d1a6d0af03198" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/patchelf.rb b/Formula/patchelf.rb index ec3cfe3c619b8..1ddc789318934 100644 --- a/Formula/patchelf.rb +++ b/Formula/patchelf.rb @@ -1,34 +1,35 @@ class Patchelf < Formula desc "Modify dynamic ELF executables" - homepage "https://github.com/NixOS/patchelf" - url "https://github.com/NixOS/patchelf/archive/0.11.tar.gz" - sha256 "e9dc4dbed842e475176ef60531c2805ed37a71c34cc6dc5d1b9ad68d889aeb6b" + homepage "https://nixos.org/patchelf.html" + url "https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.gz" + sha256 "b2deabce05c34ce98558c0efb965f209de592197b2c88e930298d740ead09019" bottle do cellar :any_skip_relocation - sha256 "91944c42c39963a6a4c39fa330062ed1d269b0a2be0b5010ae6bac61cff16e53" => :catalina - sha256 "8a5e731cb4724804c386ffd3218b47a4adb06a86003929d03d24ae8d388c7722" => :mojave - sha256 "7646ae37a16d2e63594a7ebefb482884f3e60fc7089acb72e0b2aea49659bdf0" => :high_sierra + rebuild 1 + sha256 "a808a7b52e286a6710c079a7e8be08f977554868da6b0fd69032032031900243" => :catalina + sha256 "8f57b65d6a11bfe332e7663b144c0e4e9842291c2b0a4055bd10794b2911dac4" => :mojave + sha256 "98e221be1ce346f4c33bee1fc87b7dba33aafcc88c98ac061e04a69c9c9e9584" => :high_sierra + sha256 "2504614537c2837d9668389349586730c38b93a632175e1cf80568b0650eb5aa" => :sierra + sha256 "7f19eacef4e3d18d9c82a4f4060bd86abeb912a4a76fa37c29f0bb104a38b2a2" => :x86_64_linux # glibc 2.13 end - depends_on "autoconf" => :build - depends_on "automake" => :build - - resource "helloworld" do + resource "hellworld" do url "http://timelessname.com/elfbin/helloworld.tar.gz" sha256 "d8c1e93f13e0b7d8fc13ce75d5b089f4d4cec15dad91d08d94a166822d749459" end def install - system "./bootstrap.sh" system "./configure", "--prefix=#{prefix}", - "--disable-dependency-tracking", - "--disable-silent-rules" + "CXXFLAGS=-static-libgcc -static-libstdc++", + "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules" system "make", "install" end test do - resource("helloworld").stage do + resource("hellworld").stage do assert_equal "/lib/ld-linux.so.2\n", shell_output("#{bin}/patchelf --print-interpreter chello") assert_equal "libc.so.6\n", shell_output("#{bin}/patchelf --print-needed chello") assert_equal "\n", shell_output("#{bin}/patchelf --print-rpath chello") diff --git a/Formula/patchutils.rb b/Formula/patchutils.rb index 51279a2726ce2..3425a393d2ee7 100644 --- a/Formula/patchutils.rb +++ b/Formula/patchutils.rb @@ -15,6 +15,7 @@ class Patchutils < Formula sha256 "08689727cdf1f89cc075ec2e6e71ac456c5429067899ccb5dac12848a6c2abcd" => :el_capitan sha256 "df5a0b90219fe01b6934696d27782920c3e9c45152980e72a1c542006c625ae9" => :yosemite sha256 "84cae8e92f1e9b3f377fd6584c0811a3c3989fb898bb7596ba0d1192ae10a834" => :mavericks + sha256 "abd6d041439ab9782109e9aa60cecbefa03346e2cd011264165e4ba18894eaf4" => :x86_64_linux # glibc 2.19 end head do diff --git a/Formula/path-extractor.rb b/Formula/path-extractor.rb index 8b6babd4cfc18..77343c9020e87 100644 --- a/Formula/path-extractor.rb +++ b/Formula/path-extractor.rb @@ -14,6 +14,7 @@ class PathExtractor < Formula sha256 "90521da4fd1834db41fbf19b7b6ce9f82a943ab2412acd41b6c5d749146770e7" => :el_capitan sha256 "718512fe3585d82dee8d655c2ab534dac70d0b24a8164bcc012f0f2a65a55e5b" => :yosemite sha256 "f883b0656efe0d31b35b98ab0c82d82f1fa827b39d3712136c49bae2363f539d" => :mavericks + sha256 "43bae2b10f5116c680559e20ff5207d5bc2bac70a3cd242029e70888061c24b8" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/pbzip2.rb b/Formula/pbzip2.rb index d048c5cc96f4a..8c8339e15bab5 100644 --- a/Formula/pbzip2.rb +++ b/Formula/pbzip2.rb @@ -12,6 +12,7 @@ class Pbzip2 < Formula sha256 "c15b9c38b5302286033e54ff4be006c3b31ccb179f96641e44f1126958527d7e" => :sierra sha256 "be653d724b6f061cb9939dbdbf457aebc275e16dbf599f598b9ff3999fdd5db3" => :el_capitan sha256 "ad103aef3e2d72293cfed3fcc42999afee9b4fc332f8319e3c079758215411c9" => :yosemite + sha256 "f212965d48b2321dde49bded9cc2d6e55e6d5083c5a232025f7bc3c077360eec" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/pce.rb b/Formula/pce.rb index 9760a7be6655f..22e6f2121e5e6 100644 --- a/Formula/pce.rb +++ b/Formula/pce.rb @@ -12,6 +12,7 @@ class Pce < Formula sha256 "8c0364c490a9b01875ab9c05c7bc5a6cba190e27d941c72bbbb3e17af71ab88a" => :mojave sha256 "6c67f811c813423d7380894d6de77aeeeba20d9f18fd36a71653c23b97c433f6" => :high_sierra sha256 "ae09a42321608dfa10291d2a2a1afed87a137c9612a54e513360022de8e908b3" => :sierra + sha256 "7bd78ce992771dfb3f22f955c4153e7ab463a49224d688ad02ffa1979dfcea92" => :x86_64_linux end depends_on "nasm" => :build if MacOS.version >= :high_sierra diff --git a/Formula/pcre++.rb b/Formula/pcre++.rb index a9ab6baac46cf..5396ea964a5d0 100644 --- a/Formula/pcre++.rb +++ b/Formula/pcre++.rb @@ -13,6 +13,7 @@ class Pcrexx < Formula sha256 "5c30b4cbf987ad3b9a05521f83c672419b636277714838b6f7dee5a656c9868b" => :el_capitan sha256 "c883ed380b38f020e7383643fedf80f4bad9ed1205592fe8127423e340c02c05" => :yosemite sha256 "fd7050ff36dbb4c5605a4f0a9bb5d5de3ea01e6b959dd2026297a9ae35b99f51" => :mavericks + sha256 "539777749613468b4aa8f374321980e31a56e42e41abbf3777f9103d4ffaca6a" => :x86_64_linux # glibc 2.19 end depends_on "autoconf" => :build diff --git a/Formula/pcre.rb b/Formula/pcre.rb index 263890710c1e0..ed64bcb8a6e5c 100644 --- a/Formula/pcre.rb +++ b/Formula/pcre.rb @@ -10,6 +10,7 @@ class Pcre < Formula sha256 "f8ac266e04f984fa55091a43f0fdc39a40d57c2489d289a186c88ccedaba7eeb" => :catalina sha256 "ed9b483538da7bc6559d2e63dd36659736fab9510681661d970d707a18731de4" => :mojave sha256 "aeea1351e1439847d00c3cee54bd28639493e686f809568cf42fea7bb28da2a5" => :high_sierra + sha256 "e09f36059975d108b0e42fa9d69b9ed25bc81bc25371dcee58134ad7416a6a61" => :x86_64_linux end head do diff --git a/Formula/pcre2.rb b/Formula/pcre2.rb index 8f4ae1fe2a7c0..b9295ccab386a 100644 --- a/Formula/pcre2.rb +++ b/Formula/pcre2.rb @@ -10,6 +10,7 @@ class Pcre2 < Formula sha256 "6a1e59a5db23d684f92d2bf695601d1b466f3e9d5407f704ba4679d885d13cef" => :catalina sha256 "d7be9b0193654484e40bc30dd330711cc1e72fa9bf29f854dd50458f6a827d1b" => :mojave sha256 "69c4fb400d19d1910df33376974b274362ed715ab7d67ee480b5211156174784" => :high_sierra + sha256 "e91b8af68acd7073f19487e3479d131c36f140c8d6d7db7187238210aaf1436d" => :x86_64_linux end uses_from_macos "bzip2" diff --git a/Formula/pcsc-lite.rb b/Formula/pcsc-lite.rb index 1a077f0f86945..90d629b5b6896 100644 --- a/Formula/pcsc-lite.rb +++ b/Formula/pcsc-lite.rb @@ -9,6 +9,7 @@ class PcscLite < Formula sha256 "650bd1cb922417a5ef04f6667261e9b11393ebbd24750f6332ed067716a5e192" => :catalina sha256 "fca41c0447251ec74156c0dd68e6b38b695d9f14d7176c329964c223cfb983e6" => :mojave sha256 "4fc95dd4040b9ac313724c6db99937949dc18013c8a59839f806885e0d5e2e50" => :high_sierra + sha256 "a737aaa1e69a94a4dafca752160b304bf423436d3308442766cb56f22d06aa9f" => :x86_64_linux end keg_only :shadowed_by_macos, "macOS provides PCSC.framework" @@ -17,12 +18,17 @@ class PcscLite < Formula depends_on "pkg-config" => :build end + depends_on "libusb" unless OS.mac? + def install - system "./configure", "--disable-dependency-tracking", - "--disable-silent-rules", - "--prefix=#{prefix}", - "--sysconfdir=#{etc}", - "--disable-libsystemd" + args = %W[--disable-dependency-tracking + --disable-silent-rules + --prefix=#{prefix} + --sysconfdir=#{etc} + --disable-libsystemd] + args << "--disable-libudev" unless OS.mac? + + system "./configure", *args system "make", "install" end diff --git a/Formula/pdf-redact-tools.rb b/Formula/pdf-redact-tools.rb index bf93e972dc056..0976720c2e235 100644 --- a/Formula/pdf-redact-tools.rb +++ b/Formula/pdf-redact-tools.rb @@ -11,6 +11,7 @@ class PdfRedactTools < Formula sha256 "d36fd54bdf0fecba50c0d2e4c8ec7c4702bc626b7228f55482fa04527837e80a" => :catalina sha256 "1d5dddb4adc486d89537a5368550c787b9dbae0c6cd9cddba9b2e45820b025e1" => :mojave sha256 "1d5dddb4adc486d89537a5368550c787b9dbae0c6cd9cddba9b2e45820b025e1" => :high_sierra + sha256 "412188c047811c99761394d7923c209efe43c7ed8c436296a26e580b9993757e" => :x86_64_linux end depends_on "exiftool" diff --git a/Formula/pdf2htmlex.rb b/Formula/pdf2htmlex.rb index e812ba1c1d37c..95161bb7d83e3 100644 --- a/Formula/pdf2htmlex.rb +++ b/Formula/pdf2htmlex.rb @@ -56,7 +56,7 @@ def install inreplace "gutils/gimagereadgif.c", "DGifCloseFile(gif)", "DGifCloseFile(gif, NULL)" # Fix linker error; see: https://trac.macports.org/ticket/25012 - ENV.append "LDFLAGS", "-lintl" + ENV.append "LDFLAGS", "-lintl" if OS.mac? system "./autogen.sh" system "./configure", "--prefix=#{libexec}/fontforge", diff --git a/Formula/pdf2json.rb b/Formula/pdf2json.rb index b2ad59ddb3642..014a2b35c887a 100644 --- a/Formula/pdf2json.rb +++ b/Formula/pdf2json.rb @@ -9,6 +9,7 @@ class Pdf2json < Formula sha256 "035c69de85f1cad569ff743faef796a88b9f9a706be802bf111a83505858b366" => :catalina sha256 "abf950838b700f50ff4279501533176cb5a1929fb0b88c8ccf94b07ac362c66d" => :mojave sha256 "4bee4b8c61362c64d72a3f011f8c5ef223c5e80d269e442a18472adc42e108e9" => :high_sierra + sha256 "d12d466dbb2fcd6061b2138034e14a81b9dbc241dd1496d9cad2013f036a5f9c" => :x86_64_linux end def install diff --git a/Formula/pdf2svg.rb b/Formula/pdf2svg.rb index 3ce9086907318..b3cca1fc64fb8 100644 --- a/Formula/pdf2svg.rb +++ b/Formula/pdf2svg.rb @@ -11,6 +11,7 @@ class Pdf2svg < Formula sha256 "3999f52a6638bd2090feabd62cf91112a6b98bf6577a112771941ec6781eabd8" => :mojave sha256 "9477928316e8a5cb7edc7d03568a22a2f2fb87e1440a96e100c79695c1b5cde9" => :high_sierra sha256 "ec7f985d7a62787268265f4e05c87d59926a7f242c22972e32418e7cfaa5448e" => :sierra + sha256 "1672a27619a8fb70ea144aa28944f2afdafe63d93bc349384b4bc1d5c2ebe6d2" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/pdfcpu.rb b/Formula/pdfcpu.rb index 66dc49981220f..cced1217ffbbc 100644 --- a/Formula/pdfcpu.rb +++ b/Formula/pdfcpu.rb @@ -9,6 +9,7 @@ class Pdfcpu < Formula sha256 "6678b5940ae2cc31abc7d551390d8b3d36b40990ec66dfea9ddf4f495eb3af6b" => :catalina sha256 "6678b5940ae2cc31abc7d551390d8b3d36b40990ec66dfea9ddf4f495eb3af6b" => :mojave sha256 "6678b5940ae2cc31abc7d551390d8b3d36b40990ec66dfea9ddf4f495eb3af6b" => :high_sierra + sha256 "6064e41e2190c16b94c2266b75fe19d3d4e43f7592972ae915ea01b98e070fbd" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/pdfcrack.rb b/Formula/pdfcrack.rb index 47e73ecc61086..d0fa432ccf881 100644 --- a/Formula/pdfcrack.rb +++ b/Formula/pdfcrack.rb @@ -9,6 +9,7 @@ class Pdfcrack < Formula sha256 "2c26ba3ca3a1edd9cc9e6570cb5d1c7838a152a3d8281a2a16c6be5276d47b23" => :catalina sha256 "12310e0c5841db19ecf51f527cde0aaba1663a04aa78c760a5d6e02218dc4e3c" => :mojave sha256 "9923fadda54414a1d0cd5e86b0796aec8bbaf7c80e96e7518b5ae136d50d5674" => :high_sierra + sha256 "f075ba2bcfd8bf8d6cdab7bc7a683003e7047a2d3858a4c28702ca0ae3fd397a" => :x86_64_linux end def install diff --git a/Formula/pdfgrep.rb b/Formula/pdfgrep.rb index b714aafe31797..096b6a4a304c5 100644 --- a/Formula/pdfgrep.rb +++ b/Formula/pdfgrep.rb @@ -10,6 +10,7 @@ class Pdfgrep < Formula sha256 "4e6828ef5db24086dae00e10c9c18671352303c6e79a2148f62bd9104678ea08" => :mojave sha256 "95ffadce5ed5baa82a48c71e1bb8915d080c9e9d4a14e63982945eb543e58b10" => :high_sierra sha256 "b004e7801489c6cb0361c5032278d11cafd4ace151a02ee97214c79dba0f89be" => :sierra + sha256 "46e699d419dcafaf6a2ee3edf5f4c59349880f6027ba1c24e691d01ba285029b" => :x86_64_linux end head do diff --git a/Formula/pdflib-lite.rb b/Formula/pdflib-lite.rb index d1080daa87f97..134bbd87937da 100644 --- a/Formula/pdflib-lite.rb +++ b/Formula/pdflib-lite.rb @@ -17,6 +17,7 @@ class PdflibLite < Formula sha256 "c05f42bfb25d1fa204440a1d421af10f9bf853e94dd17c7325e0382d7683d589" => :el_capitan sha256 "e2e8891b33b4f3f2bab8f809e19d9df0450c1e872d39e6d5090094630210ee45" => :yosemite sha256 "d4506f8523153b8e452c17f2897d10ce526476ed8e27c913a9325aac2f2b4f0f" => :mavericks + sha256 "26799f10d823f7027b237a768e68c428c2733772cdfaf8ffc52f4ea45f5eb350" => :x86_64_linux end def install diff --git a/Formula/pdftk-java.rb b/Formula/pdftk-java.rb index 883118608e739..149a65b8552ce 100644 --- a/Formula/pdftk-java.rb +++ b/Formula/pdftk-java.rb @@ -10,6 +10,7 @@ class PdftkJava < Formula sha256 "e53bbd046b64c720eb40087858529a1ca03a34c3b177d9b6f7375368456f8878" => :catalina sha256 "8ad12f6f341128ed0963dd74814342f01afa1f635835f48af33ddba28a55439b" => :mojave sha256 "ae1b26b9ca6f455bc39eb358cdbd01036b7f387d15e0a6f670af54f6d6394b08" => :high_sierra + sha256 "162b488d5b6b177aee8997fb59ef5d1a987cf6c01df912af698c7d99977ac9bd" => :x86_64_linux end depends_on "gradle" => :build diff --git a/Formula/pdftohtml.rb b/Formula/pdftohtml.rb index bbfe20b295c45..f1f1575d09f02 100644 --- a/Formula/pdftohtml.rb +++ b/Formula/pdftohtml.rb @@ -10,6 +10,7 @@ class Pdftohtml < Formula sha256 "d8a6e5bb1d84ee766898543d77307b4a9a6e6f826ebe9cc48ce6db8bb24c8923" => :catalina sha256 "c49245634c48c7c24501cfb848a98e4b6a281ff0cf89235bb7a7ce09619e66ad" => :mojave sha256 "200be428031e013f58b792b092b56e74743d6362d747b0c883bb95269d7a5e72" => :high_sierra + sha256 "b9143a7594d0cfb28d97e49ffdf477649837f481179b74067f997d0a9fe9b14a" => :x86_64_linux end conflicts_with "pdf2image", "poppler", "xpdf", diff --git a/Formula/pdns.rb b/Formula/pdns.rb index ede9ea5ad1c34..fcf3c920c7543 100644 --- a/Formula/pdns.rb +++ b/Formula/pdns.rb @@ -8,6 +8,7 @@ class Pdns < Formula sha256 "abda262260fff1178494b353f70b32087e48c934001d15eb92418360a4111ea5" => :catalina sha256 "b3dfd65d42e150a2ce1da416507a975f72cd28bbd9092497c933796afa172e04" => :mojave sha256 "2647076a193298b4cd3db2701a027fcb4e583b556400b13e282e81be5538c24c" => :high_sierra + sha256 "71ba3c1e1bfc328eaf586dddb92dd8a2cbbe375ed75f8733b82f553d27169e3e" => :x86_64_linux end head do diff --git a/Formula/pdnsd.rb b/Formula/pdnsd.rb index e80929e4d47a9..705a0e6b79df6 100644 --- a/Formula/pdnsd.rb +++ b/Formula/pdnsd.rb @@ -12,6 +12,7 @@ class Pdnsd < Formula sha256 "be218973e8fe1d807e7d9ec2762cab2a9968ce302fb46fb89974a686c1afcc43" => :high_sierra sha256 "81c4852b1093820909afc140f052f732cbd94e428d9aff261b90d74cb4935b09" => :sierra sha256 "1fa2f1f6ba9fc4fe710c1dc1d5bfb2b9663c557f5cdddf3a2fff8394f138a08f" => :el_capitan + sha256 "7990afef4fc1b4cfbf5f3f21e2942fdbdbb67e8fa1c82ad97b8ebd17181c5154" => :x86_64_linux end def install diff --git a/Formula/pdnsrec.rb b/Formula/pdnsrec.rb index 2472b8993bc2e..9941e78bbbbd2 100644 --- a/Formula/pdnsrec.rb +++ b/Formula/pdnsrec.rb @@ -8,11 +8,12 @@ class Pdnsrec < Formula sha256 "7070944c3f1ff85a200f6010cd792ae0843f7c54e0e0e351f391876310ccdc7e" => :catalina sha256 "2db26f78466c6e0d08b1e2b3a09c124906b2a3a50c60bb2f574b0c346a427d34" => :mojave sha256 "b0ed864e0ce19f38919cf0b401ca2b0dc6a33889032278070c4e2cec30388162" => :high_sierra + sha256 "13d661be3dcddc7d8075682a3c8b77f3f7fe01732d245848ed4d36e81cfb7f2a" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "boost" - depends_on "gcc" if DevelopmentTools.clang_build_version == 600 + depends_on "gcc" if OS.mac? && DevelopmentTools.clang_build_version <= 600 depends_on "lua" depends_on "openssl@1.1" diff --git a/Formula/peco.rb b/Formula/peco.rb index 7c8e4ac9fcfdf..a8f08da225099 100644 --- a/Formula/peco.rb +++ b/Formula/peco.rb @@ -10,6 +10,7 @@ class Peco < Formula sha256 "e7fdbc66f3eff034c2c652d427952002f8c842f29aa1c7d44170d66e4866bdb6" => :catalina sha256 "85e61dc800cba2795fef1a8c9f77cc384f7ec7be6ae22819f74c747b2f9b4db5" => :mojave sha256 "a8e5c5b29e4650a17a2ac48ff6b25563176f66eaf0a2a0d557b72ba0899ddee1" => :high_sierra + sha256 "5464b38fda44fbc5311c517c2b0018f98b38e9a87a3ecaf310a8655a8371705a" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/peg-markdown.rb b/Formula/peg-markdown.rb index be0902639617f..5c65447cd1081 100644 --- a/Formula/peg-markdown.rb +++ b/Formula/peg-markdown.rb @@ -12,6 +12,7 @@ class PegMarkdown < Formula sha256 "a60087175a8f3c5242e9183eeddb433e6bdbe68409cae0a7c61d66da4622b150" => :mojave sha256 "207764b26b253904cf61e9e13eb32e81a51d61d548b7dafd366da5a5394a5f08" => :high_sierra sha256 "2d75448f008aa176b624ecb02bc6e3f7492ea8953a99f84fcdacc6b301b39412" => :sierra + sha256 "9e4faec22a16d39d25ab0102cf461cb4feb155b1030081304f63c2e9993d07b0" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/peg.rb b/Formula/peg.rb index 83afe065795fc..3cc81026c4807 100644 --- a/Formula/peg.rb +++ b/Formula/peg.rb @@ -14,6 +14,7 @@ class Peg < Formula sha256 "44d0ab83d1bc3ee71294d328dc70dd14206b8d8ddf05a195f2cdf354d746d5dc" => :el_capitan sha256 "9abe69e43c8e2672aa7b5b26df5c80976c2d0365b5d85d672e8948cebe88646f" => :yosemite sha256 "bbe71ecc8acb17bdf2538f41ae56472bc104a69e310cfd533565507c3468c53c" => :mavericks + sha256 "8ca157383ee4e957e218ecff22c904f5ba01bd00c1e7ec935327361930badea5" => :x86_64_linux end def install diff --git a/Formula/pelikan.rb b/Formula/pelikan.rb index a7e2f963739cf..fc512f3ec3997 100644 --- a/Formula/pelikan.rb +++ b/Formula/pelikan.rb @@ -14,6 +14,7 @@ class Pelikan < Formula sha256 "e314ce6288bf76e271bf69ce844e2e846b16cad68ce635faf1e5130c3c6911d0" => :el_capitan sha256 "ab04b8488e6272d0000c8e67842c4b286eb23459a6de9e9a392f14aa87c9978e" => :yosemite sha256 "80459134cbab7aa94ab55d38488b2058696f7408869306f75e80cfa0350ed40d" => :mavericks + sha256 "2c8cd06c6ade8a905139dddaae5a78f71cd4e3c3a143ad1aaf89fde7ca73d630" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/percona-server.rb b/Formula/percona-server.rb index 8fb9abd2f7710..3bbf9eb3d8292 100644 --- a/Formula/percona-server.rb +++ b/Formula/percona-server.rb @@ -8,6 +8,7 @@ class PerconaServer < Formula sha256 "c6ad05c52e82f419f65a46bd627c784fec43dfb8545e68fb4939995fb5fefed2" => :catalina sha256 "cae8782ea16aa5fdfebe4ccac3189d2e7fbdc0d6290c0b8fda6ab46792f956eb" => :mojave sha256 "30719045c2ee376f8cf269e12fcd307f7d0313338b59b6e1c24861207177b287" => :high_sierra + sha256 "01688c524edd4d9449141e73c9eee00c27e5ed8075281c70b3bc2e7ad04307ea" => :x86_64_linux end pour_bottle? do @@ -18,6 +19,14 @@ class PerconaServer < Formula depends_on "cmake" => :build depends_on "openssl@1.1" + uses_from_macos "curl" + + on_linux do + depends_on "pkg-config" => :build + depends_on "libedit" + depends_on "readline" + end + conflicts_with "mariadb", "mysql", :because => "percona, mariadb, and mysql install the same binaries." conflicts_with "protobuf", @@ -43,11 +52,10 @@ def datadir end def install - # -DINSTALL_* are relative to `CMAKE_INSTALL_PREFIX` (`prefix`) args = %W[ -DFORCE_INSOURCE_BUILD=1 -DCOMPILATION_COMMENT=Homebrew - -DDEFAULT_CHARSET=utf8mb4 + -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8mb4_0900_ai_ci -DINSTALL_DOCDIR=share/doc/#{name} -DINSTALL_INCLUDEDIR=include/mysql @@ -64,6 +72,7 @@ def install -DWITH_INNODB_MEMCACHED=ON -DWITH_EDITLINE=system ] + args << "-DWITH_EDITLINE=system" if OS.mac? # MySQL >5.7.x mandates Boost as a requirement to build & has a strict # version check in place to ensure it only builds against expected release. @@ -83,9 +92,12 @@ def install system "make" system "make", "install" - (prefix/"mysql-test").cd do - system "./mysql-test-run.pl", "status", "--vardir=#{Dir.mktmpdir}" + if OS.mac? + (prefix/"mysql-test").cd do + system "./mysql-test-run.pl", "status", "--vardir=#{Dir.mktmpdir}" + end end + # Test is disabled on Linux as it is currently failing # Remove the tests directory rm_rf prefix/"mysql-test" diff --git a/Formula/percona-toolkit.rb b/Formula/percona-toolkit.rb index 4f7a689984511..c528f644b73b3 100644 --- a/Formula/percona-toolkit.rb +++ b/Formula/percona-toolkit.rb @@ -8,6 +8,7 @@ class PerconaToolkit < Formula url "https://www.percona.com/downloads/percona-toolkit/3.2.0/source/tarball/percona-toolkit-3.2.0.tar.gz" sha256 "e7c7028631d5b1c66ba21841c55919537bd4ed2f3a5975f989fa4abd7d9d753d" head "lp:percona-toolkit", :using => :bzr + revision 1 unless OS.mac? bottle do cellar :any @@ -45,6 +46,14 @@ class PerconaToolkit < Formula sha256 "444a88755a89ffa2a5424ab4ed1d11dca61808ebef57e81243424619a9e8627c" end + unless OS.mac? + resource "DBI::DBD" do + url "https://cpan.metacpan.org/authors/id/T/TI/TIMB/DBI-1.639.tar.gz" + mirror "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.639.tar.gz" + sha256 "8e2cb3d6a8425bd68702aebbeee01e754ee11ad00e7f4f9a61b75483de104e8c" + end + end + def install ENV.prepend_create_path "PERL5LIB", buildpath/"build_deps/lib/perl5" ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" diff --git a/Formula/perkeep.rb b/Formula/perkeep.rb index 1a33859062b57..07fcd839a42fd 100644 --- a/Formula/perkeep.rb +++ b/Formula/perkeep.rb @@ -17,11 +17,11 @@ class Perkeep < Formula end bottle do - cellar :any_skip_relocation rebuild 1 sha256 "36f18ad54a3e656ac5da55fc438636aac922e107ad1082e0dad7353626f0db84" => :catalina sha256 "51f41c16b3c4ea80d6a77c5badf28dca0ec323bd5aa2f1f90e855ce568b1c8ca" => :mojave sha256 "b188c23945a51d253dc6c4435afaa509a2ddaf151124ef1f08a1186611041c92" => :high_sierra + sha256 "898a24470e101148d7b96ec5521cab6a1cb3ad051f251f1b21e0fb2b6113df4f" => :x86_64_linux end head do diff --git a/Formula/perl-build.rb b/Formula/perl-build.rb index 679127f9436ab..5f5a2159b45a0 100644 --- a/Formula/perl-build.rb +++ b/Formula/perl-build.rb @@ -10,10 +10,16 @@ class PerlBuild < Formula sha256 "f1f873c2ff9d0d82dc32342e4a048b0d766242128aa68c92c28b85e8ac7465ce" => :catalina sha256 "77795cc97a4a95805804fd05a9a73c3ee2e2fd807f032365d0bd7ebb57ae9117" => :mojave sha256 "6f32d771c449780efeca88dbb50f841ed15021053932958ce8bd6385a19b9f20" => :high_sierra + sha256 "739dff6bf090ca28b29f0894f0ad00463e120bd500ef4130d5497471d8c1d2b8" => :x86_64_linux end uses_from_macos "perl" + resource "inc::latest" do + url "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/inc-latest-0.500.tar.gz" + sha256 "daa905f363c6a748deb7c408473870563fcac79b9e3e95b26e130a4a8dc3c611" + end + resource "Module::Build" do url "https://cpan.metacpan.org/authors/id/L/LE/LEONT/Module-Build-0.4229.tar.gz" sha256 "1fe491a6cda914b01bc8e592faa2b5404e9f35915ca15322f8f2a8d8f9008c18" diff --git a/Formula/perl.rb b/Formula/perl.rb index 310c492b52ec8..fa90884dff41d 100644 --- a/Formula/perl.rb +++ b/Formula/perl.rb @@ -9,10 +9,16 @@ class Perl < Formula sha256 "bc6c97521b6edf723c8ee0742aebb1954b5c8fec81bf2d96861c3f8bcc4e404d" => :catalina sha256 "f09b3fefe2175b36e590ee13e7aa84d28ebcbce3ef8e252e24a0aebb752405ab" => :mojave sha256 "718a54da6e3b02c33d5230776aaa54eaaac710c09cf412078014c9c50dd0ac51" => :high_sierra + sha256 "82ccac650bfefacad6b1ce088d3b612c16ae3677cb0d3c3ea52a2d4f786a1cd8" => :x86_64_linux end uses_from_macos "expat" + unless OS.mac? + depends_on "gdbm" + depends_on "berkeley-db" + end + # Prevent site_perl directories from being removed skip_clean "lib/perl5/site_perl" @@ -30,16 +36,43 @@ def install -Duseshrplib -Duselargefiles -Dusethreads - -Dsed=/usr/bin/sed ] + args << "-Dsed=/usr/bin/sed" if OS.mac? args << "-Dusedevel" if build.head? + # Fix for https://github.com/Linuxbrew/homebrew-core/issues/405 + args << "-Dlocincpth=#{HOMEBREW_PREFIX}/include" if OS.linux? system "./Configure", *args system "make" - system "make", "install" + + # expose libperl.so to ensure we aren't using a brewed executable + # but a system library + if OS.linux? + perl_core = Pathname.new(`#{bin/"perl"} -MConfig -e 'print $Config{archlib}'`)+"CORE" + lib.install_symlink perl_core/"libperl.so" + end + end + + def post_install + unless OS.mac? + # Glibc does not provide the xlocale.h file since version 2.26 + # Patch the perl.h file to be able to use perl on newer versions. + # locale.h includes xlocale.h if the latter one exists + perl_core = Pathname.new(`#{bin/"perl"} -MConfig -e 'print $Config{archlib}'`)+"CORE" + inreplace "#{perl_core}/perl.h", "include ", "include ", :audit_result => false + + # CPAN modules installed via the system package manager will not be visible to + # brewed Perl. As a temporary measure, install critical CPAN modules to ensure + # they are available. See https://github.com/Linuxbrew/homebrew-core/pull/1064 + ENV.activate_extensions! + ENV.setup_build_environment(self) + ENV["PERL_MM_USE_DEFAULT"] = "1" + system bin/"cpan", "-i", "XML::Parser" + system bin/"cpan", "-i", "XML::SAX" + end end def caveats diff --git a/Formula/perl@5.18.rb b/Formula/perl@5.18.rb index f5b980ddc3e49..bb5bb988d72d0 100644 --- a/Formula/perl@5.18.rb +++ b/Formula/perl@5.18.rb @@ -9,6 +9,7 @@ class PerlAT518 < Formula sha256 "45b388773570fd4ef892caa7a0bb0312fd05dfcb3f73245a03eed16bf9187cc9" => :catalina sha256 "3e80537039afd47db55b42a09f34c2b1e6fc2a24581c16d09d76b5ad85997ed6" => :mojave sha256 "4ebffdb24ede27bf2fb4f844c87f4adc962942d399c6762b3c6cf90b929fa50a" => :high_sierra + sha256 "ca240d036e5c65e2240d744848d56c60fa37c0f95f43e3ead4b34f56d8885921" => :x86_64_linux end keg_only :versioned_formula @@ -24,8 +25,8 @@ def install -Duseshrplib -Duselargefiles -Dusethreads - -Dsed=/usr/bin/sed ] + args << "-Dsed=/usr/bin/sed" if OS.mac? system "./Configure", *args system "make" diff --git a/Formula/perltidy.rb b/Formula/perltidy.rb index e2273873b5e6c..4571948c2cfc7 100644 --- a/Formula/perltidy.rb +++ b/Formula/perltidy.rb @@ -9,6 +9,7 @@ class Perltidy < Formula sha256 "e74edc072defecc70cfeac14f6344c0008c8c457f120a377cad20326d7f80e90" => :catalina sha256 "eb9955c2edb97b5a401a62bda71329e6dead46d357b0357a8761a649bd062e01" => :mojave sha256 "e33764a067c1b6b7a2ac4b7f05ca7e4f8aab036f2c80964c9f38c3bb0095e0a4" => :high_sierra + sha256 "ffbca241265880d2386225374ff32c0841ecb344400004af5680817834ca25b4" => :x86_64_linux end def install diff --git a/Formula/peru.rb b/Formula/peru.rb index 7dbfb7f4eb5e6..3f2f6c0365a96 100644 --- a/Formula/peru.rb +++ b/Formula/peru.rb @@ -5,13 +5,14 @@ class Peru < Formula homepage "https://github.com/buildinspace/peru" url "https://files.pythonhosted.org/packages/14/ef/9226d6a47f34afacb241b3d8acf25e5cd958a17f7bdb9f24d3b284aa59e0/peru-1.2.0.tar.gz" sha256 "5bcf70b49fd5a6b089a23d49d93fd6deb05bde560219704de53ae5e48cb49acb" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any sha256 "0cdd82ec6457445261cafdf0a64f626f1c5f64a49313bcc6f9b2694e644d4ab3" => :catalina sha256 "9095dd68d7702875b8138efb6b1ba49a84e9c0ba60a7d8be56019acc5422c466" => :mojave sha256 "0e543115564fbebe21054c2b05913efb76b03ecceb41b12d8b2081b575459e39" => :high_sierra + sha256 "bbd887879c64d5000da25ddc25eb92463df364fd735a00664700147b2b85d042" => :x86_64_linux end depends_on "libyaml" diff --git a/Formula/pex.rb b/Formula/pex.rb index d385c800eed89..392bc859b7106 100644 --- a/Formula/pex.rb +++ b/Formula/pex.rb @@ -12,6 +12,7 @@ class Pex < Formula sha256 "ed1429f15df1e663735f27b1c7660e289953494b84a84bdd919a7eb077576a72" => :high_sierra sha256 "ed1429f15df1e663735f27b1c7660e289953494b84a84bdd919a7eb077576a72" => :sierra sha256 "ed1429f15df1e663735f27b1c7660e289953494b84a84bdd919a7eb077576a72" => :el_capitan + sha256 "0cbbe967cc7eaa7d8afa90225df6cec8a5a4c2505391ae20678bf69b7ecb872b" => :x86_64_linux end depends_on "postgresql" diff --git a/Formula/pfetch.rb b/Formula/pfetch.rb index 41fc22a992e96..2edeaa40f0de6 100644 --- a/Formula/pfetch.rb +++ b/Formula/pfetch.rb @@ -10,6 +10,7 @@ class Pfetch < Formula sha256 "f93914feee7f4e3cda77341c3bddf2cf51eb4b2aed01f6ace771db75078da570" => :catalina sha256 "f93914feee7f4e3cda77341c3bddf2cf51eb4b2aed01f6ace771db75078da570" => :mojave sha256 "f93914feee7f4e3cda77341c3bddf2cf51eb4b2aed01f6ace771db75078da570" => :high_sierra + sha256 "e7ad7744774ac27f1de27b66888679ed9516bdf2aba5a18666eeb4120fc98d43" => :x86_64_linux end def install diff --git a/Formula/pg_top.rb b/Formula/pg_top.rb index 500ec65d4af8b..cc692ea962886 100644 --- a/Formula/pg_top.rb +++ b/Formula/pg_top.rb @@ -13,6 +13,7 @@ class PgTop < Formula sha256 "32637c635d8da78d4910df2dabd474f4115c31cba57890ad053b3a43cb38a758" => :high_sierra sha256 "5f06ae8b8ef1c979143e19c0527c31c8d649d23e1e9612c63bc6c5ff05bf8276" => :sierra sha256 "6d0104d461d7187ad02e1085098f2dad4fa00c4f2db93b1b910a6a072517ca54" => :el_capitan + sha256 "34eb7a2bba5ff1956b47e5f8bf4309743eb7629bc32fb3ea75713075b5b6ed86" => :x86_64_linux end depends_on "postgresql" diff --git a/Formula/pgbadger.rb b/Formula/pgbadger.rb index af64cbd22b910..9a237e7a0663f 100644 --- a/Formula/pgbadger.rb +++ b/Formula/pgbadger.rb @@ -10,6 +10,7 @@ class Pgbadger < Formula sha256 "cecce520a3c653ba69b24eae89587565569fc25191378622704fc3913452a3d6" => :catalina sha256 "cecce520a3c653ba69b24eae89587565569fc25191378622704fc3913452a3d6" => :mojave sha256 "1233f5007ae53bbcc82a3bce3a1f7be459494e2d33adb4652eb7e9c484e4baf9" => :high_sierra + sha256 "853fd25998f73fcae6b64771ea83b98275694bfb9775b4221bdc0e65acc97706" => :x86_64_linux end def install @@ -18,7 +19,7 @@ def install system "make", "install" bin.install "usr/local/bin/pgbadger" - man1.install "usr/local/share/man/man1/pgbadger.1p" + man1.install "usr/local/man/man1/pgbadger.1p" end def caveats diff --git a/Formula/pgbouncer.rb b/Formula/pgbouncer.rb index 4fd0496bceaa3..200f12e9bb88e 100644 --- a/Formula/pgbouncer.rb +++ b/Formula/pgbouncer.rb @@ -9,6 +9,7 @@ class Pgbouncer < Formula sha256 "eaecbb143f281ccc047d7a63488038c2d53de7ffaf56b56e532dce7089e30106" => :catalina sha256 "c86c7f6b7fa11965e9427aeb36bc334b6f7f31323d826350736813187622844f" => :mojave sha256 "4e098f2929939ba16d03e194310df111929dd861e02e89f075ce726f8f67b49d" => :high_sierra + sha256 "216ccb29da7cde720fb74c45d85dcb4dcae6149e7e363adfd997cf25c010b238" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/pgcli.rb b/Formula/pgcli.rb index 6a2e6f80cf95c..2b3f379cf5c9d 100644 --- a/Formula/pgcli.rb +++ b/Formula/pgcli.rb @@ -5,12 +5,14 @@ class Pgcli < Formula homepage "https://pgcli.com/" url "https://files.pythonhosted.org/packages/33/d0/646dcdd819f6313c5b534bb41e2970968a1cbccba39e5f969a65858d0bb4/pgcli-3.0.0.tar.gz" sha256 "4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082" + revision 1 unless OS.mac? bottle do cellar :any sha256 "33762e29fe9be52d07d9500b3bb497afca3494ba73b7729e82047f531fe347ca" => :catalina sha256 "dfc4edc73356fb8059808ae8a502fccf3df013caec1a39e18e6766b39a42ae5c" => :mojave sha256 "42814524bbec67d415d06d991c17c0decd429c9a072d86c122d92bdf56affa5a" => :high_sierra + sha256 "578fb2ce60ec6d90060bcafcc33dd1b8531caa847a0ff8548d6605d79bbf2c55" => :x86_64_linux end depends_on "libpq" diff --git a/Formula/pgdbf.rb b/Formula/pgdbf.rb index ed14ee211c30e..7ef4402e0b095 100644 --- a/Formula/pgdbf.rb +++ b/Formula/pgdbf.rb @@ -13,6 +13,7 @@ class Pgdbf < Formula sha256 "72ad6b801d25db2008d0ab4badd2bb280f55eb6f6956925ee5620d62d8f06bbb" => :el_capitan sha256 "4042a284cac8abe88e7d1c9e6c003e00a9b8247905739829cd768a824df7993b" => :yosemite sha256 "c53298c57bb2d31d82ddce41ed65057d7781de2118857f5f795aaaefe3c00110" => :mavericks + sha256 "509fbdf2daf15fb64831f12619d4220deb82f9437a01c8dc50c819171af145fd" => :x86_64_linux end def install diff --git a/Formula/pgformatter.rb b/Formula/pgformatter.rb index c6414c32d6ed7..5dc921f422a54 100644 --- a/Formula/pgformatter.rb +++ b/Formula/pgformatter.rb @@ -9,12 +9,17 @@ class Pgformatter < Formula sha256 "c456132a750decd8e9283605f3c2315e00cdf1256cf82fd346205aaf46de3012" => :catalina sha256 "c456132a750decd8e9283605f3c2315e00cdf1256cf82fd346205aaf46de3012" => :mojave sha256 "a09bb4b78a53f3f953ac502388d198d837a84cb0aad9a2a8659b53f5f79eeb54" => :high_sierra + sha256 "69091e5df7d2d8d1fdb25ad5713b1f8a24417bbf02360a91922a461ab33edd83" => :x86_64_linux end def install system "perl", "Makefile.PL", "DESTDIR=." system "make", "install" + unless OS.mac? + mkdir "usr/local/share" + mv "usr/local/man", "usr/local/share" + end prefix.install (buildpath/"usr/local").children (libexec/"lib").install "blib/lib/pgFormatter" libexec.install bin/"pg_format" diff --git a/Formula/pgloader.rb b/Formula/pgloader.rb index 5493a31366a8d..35fe1b6e3cf6b 100644 --- a/Formula/pgloader.rb +++ b/Formula/pgloader.rb @@ -9,6 +9,7 @@ class Pgloader < Formula sha256 "218a59416c6f94c8e2855b59bf3ca942dbbfe8c3b62665f2dd9561ddd3d00aa8" => :catalina sha256 "850897627bcfe4367292696644f24d08674fec75a6a74269bca4b5c5d1d74a69" => :mojave sha256 "6abfe60b76b732f4492f898693ab03fac460848dc5c238c89af26720aa273ba3" => :high_sierra + sha256 "d119968db4d40cff46eab0952c05a083f44907e50ba4fac09db1028c36a67dbf" => :x86_64_linux end depends_on "buildapp" => :build diff --git a/Formula/pgpdump.rb b/Formula/pgpdump.rb index 00bba52422a6a..8b0d20dc2d2f4 100644 --- a/Formula/pgpdump.rb +++ b/Formula/pgpdump.rb @@ -12,6 +12,7 @@ class Pgpdump < Formula sha256 "2d5ad982f29c20cad30f5a90d4fcd8af3d369432e2c4ab4f35fcfa3b31712a1f" => :high_sierra sha256 "9c2ed5f4eb7e0c833a90d53fc8d96d613b781b36c3524959fa102ae62a4d167e" => :sierra sha256 "1cfd7cb5b0cdbc7e70031841d7efb1196ddbbd6f11f5af3cce4b38b6f7358ae2" => :el_capitan + sha256 "8aff5b4553f8db403d33fac7202a3d59cfab9f19bf6b630736eef81453c33913" => :x86_64_linux end def install diff --git a/Formula/pgpool-ii.rb b/Formula/pgpool-ii.rb index a7f7f7ec2b877..ba4ccd1c55bd4 100644 --- a/Formula/pgpool-ii.rb +++ b/Formula/pgpool-ii.rb @@ -8,6 +8,7 @@ class PgpoolIi < Formula sha256 "5f64f049dd3f0b8211dfda69c4099035e3dd5192907507329c5dc03b1deed3ac" => :catalina sha256 "a7415fcbf87a371ceb7545b24946e198982aa8af29583506ff6ffaeb0730c92b" => :mojave sha256 "d3a77fd114c9820e94ca5a16bfc450dffdc1960baaeeba7435eb03390d97f77b" => :high_sierra + sha256 "e1ae50e3fc1b3e2a47c1101751ce91719b1eb7364646cad7998055f7b0052294" => :x86_64_linux end depends_on "postgresql" diff --git a/Formula/pgweb.rb b/Formula/pgweb.rb index b44e3c9ef2ca3..5673a119e8751 100644 --- a/Formula/pgweb.rb +++ b/Formula/pgweb.rb @@ -9,6 +9,7 @@ class Pgweb < Formula sha256 "0e114aa64f94b8e64b6b26e314a38443c42a793e7e3c6f246b9b7219d2c1c905" => :catalina sha256 "8e2ff51513713949c869457d39c787ae7f5f13ba75abc11561914378e59fbb11" => :mojave sha256 "43637e2a033c04ffc96dff95b355e2b99e0fdd263ff432498dceac9f305cc03d" => :high_sierra + sha256 "fe9b09699720a6275f07d44b8a52e9359d38ae2ce8983577abafdba5dc06ec07" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/phoon.rb b/Formula/phoon.rb index 454c1c0350117..bdede1deece6d 100644 --- a/Formula/phoon.rb +++ b/Formula/phoon.rb @@ -14,6 +14,7 @@ class Phoon < Formula sha256 "ae91a1dc089678416ddeab9bd3dfbe76f0fd9f4789a86b187740167d0658926d" => :el_capitan sha256 "d6f259769364eab6cacb4e45301f0ab8cd6edab369da99b4ecfbef7927791adc" => :yosemite sha256 "378c1f09dcffbd0a0fd79cbcbe9a988d8505fa9b657fc803e6c0e5bb62545047" => :mavericks + sha256 "30f58889eb94968e784c27fe02e28ac5f868559eb9698496be9c8eb7eb79b5ca" => :x86_64_linux end def install diff --git a/Formula/php.rb b/Formula/php.rb index ed1d81fd1f2b0..ba4f9cda7f3a1 100644 --- a/Formula/php.rb +++ b/Formula/php.rb @@ -10,6 +10,7 @@ class Php < Formula sha256 "ccf94b39c146eb766a2f3bd250008fa13649814968c3dbd17a9801fd0d70a87e" => :catalina sha256 "eda05d8ddbcf4d611b64836bc7902ee1e2dad3e49eeb494ad3493f5c1589fcf9" => :mojave sha256 "f1409ba91d2446d9eabac8933ac102c64f6f5491ffea8c822ee0daff8572bd1c" => :high_sierra + sha256 "ae290e85a1380d6509817dc073461b664d6a6ec221b1a85fb380873fbcd64ca1" => :x86_64_linux end head do @@ -57,11 +58,11 @@ class Php < Formula # PHP build system incorrectly links system libraries # see https://github.com/php/php-src/pull/3472 - patch :DATA + patch :DATA if OS.mac? def install # Ensure that libxml2 will be detected correctly in older MacOS - ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :el_capitan || MacOS.version == :sierra + ENV["SDKROOT"] = MacOS.sdk_path if OS.mac? && (MacOS.version == :el_capitan || MacOS.version == :sierra) # buildconf required due to system library linking bug patch system "./buildconf", "--force" @@ -97,15 +98,28 @@ def install # system pkg-config missing ENV["KERBEROS_CFLAGS"] = " " - ENV["KERBEROS_LIBS"] = "-lkrb5" - ENV["SASL_CFLAGS"] = "-I#{MacOS.sdk_path_if_needed}/usr/include/sasl" - ENV["SASL_LIBS"] = "-lsasl2" + if OS.mac? + ENV["KERBEROS_LIBS"] = "-lkrb5" + ENV["SASL_CFLAGS"] = "-I#{MacOS.sdk_path_if_needed}/usr/include/sasl" + ENV["SASL_LIBS"] = "-lsasl2" + else + ENV["KERBEROS_LIBS"] = "-lkrb5 -I#{Formula["krb5"].opt_lib}" + end ENV["EDIT_CFLAGS"] = " " ENV["EDIT_LIBS"] = "-ledit" + unless OS.mac? + ENV["SQLITE_CFLAGS"] = "-I#{Formula["sqlite"].opt_include}" + ENV["SQLITE_LIBS"] = "-lsqlite3" + ENV["BZIP_DIR"] = Formula["bzip2"].opt_prefix + end # Each extension that is built on Mojave needs a direct reference to the # sdk path or it won't find the headers - headers_path = "=#{MacOS.sdk_path_if_needed}/usr" + headers_path = if OS.mac? + "=#{MacOS.sdk_path_if_needed}/usr" + else + "" + end args = %W[ --prefix=#{prefix} @@ -114,11 +128,9 @@ def install --with-config-file-path=#{config_path} --with-config-file-scan-dir=#{config_path}/conf.d --with-pear=#{pkgshare}/pear - --with-os-sdkpath=#{MacOS.sdk_path_if_needed} --enable-bcmath --enable-calendar --enable-dba - --enable-dtrace --enable-exif --enable-ftp --enable-fpm @@ -151,7 +163,6 @@ def install --with-kerberos --with-layout=GNU --with-ldap=#{Formula["openldap"].opt_prefix} - --with-ldap-sasl --with-libxml --with-libedit --with-mhash#{headers_path} @@ -179,6 +190,17 @@ def install --with-zlib ] + if OS.mac? + args << "--enable-dtrace" + args << "--with-ldap-sasl" + args << "--with-os-sdkpath=#{MacOS.sdk_path_if_needed}" + else + args << "--disable-dtrace" + args << "--without-ndbm" + args << "--without-gdbm" + args << "--without-ldap-sasl" + end + system "./configure", *args system "make" system "make", "install" @@ -333,8 +355,10 @@ def plist "Zend OPCache extension not loaded" # Test related to libxml2 and # https://github.com/Homebrew/homebrew-core/issues/28398 - assert_includes MachO::Tools.dylibs("#{bin}/php"), - "#{Formula["libpq"].opt_lib}/libpq.5.dylib" + if OS.mac? + assert_includes MachO::Tools.dylibs("#{bin}/php"), + "#{Formula["libpq"].opt_lib}/libpq.5.dylib" + end system "#{sbin}/php-fpm", "-t" system "#{bin}/phpdbg", "-V" system "#{bin}/php-cgi", "-m" @@ -412,7 +436,7 @@ def plist Process.wait(pid) fpm_pid = fork do - exec sbin/"php-fpm", "-y", "fpm.conf" + exec sbin/"php-fpm", *("--allow-to-run-as-root" if Process.uid.zero?), "-y", "fpm.conf" end pid = fork do exec Formula["httpd"].opt_bin/"httpd", "-X", "-f", "#{testpath}/httpd-fpm.conf" diff --git a/Formula/php@7.2.rb b/Formula/php@7.2.rb index ab8df64abebc2..ddd51c70424dd 100644 --- a/Formula/php@7.2.rb +++ b/Formula/php@7.2.rb @@ -11,6 +11,7 @@ class PhpAT72 < Formula sha256 "88e7932c8403e83c4b7ce1a5a5a704e2b45d0618f79ab568b0e92dc795b896d4" => :catalina sha256 "2d601cec4b57cefa451e9bd4892df9c8f406de09c1aaafbf7d3a9a88ab540e67" => :mojave sha256 "d1383e513d27510e4e8974460756cbef14a59c1fcbcd35c9dbeb6624689ea22f" => :high_sierra + sha256 "21cd67547b0abaf6e1b9a471d25a148ac4e28a9c879e8e342a258670c1cfec12" => :x86_64_linux end keg_only :versioned_formula @@ -42,6 +43,10 @@ class PhpAT72 < Formula depends_on "tidy-html5" depends_on "unixodbc" depends_on "webp" + unless OS.mac? + depends_on "xz" => :build + depends_on "libedit" + end uses_from_macos "bzip2" uses_from_macos "libxml2" @@ -50,7 +55,7 @@ class PhpAT72 < Formula # PHP build system incorrectly links system libraries # see https://github.com/php/php-src/pull/3472 - patch :DATA + patch :DATA if OS.mac? def install # Ensure that libxml2 will be detected correctly in older MacOS @@ -97,7 +102,11 @@ def install # Each extension that is built on Mojave needs a direct reference to the # sdk path or it won't find the headers - headers_path = "=#{MacOS.sdk_path_if_needed}/usr" + headers_path = if OS.mac? + "=#{MacOS.sdk_path_if_needed}/usr" + else + "" + end args = %W[ --prefix=#{prefix} @@ -109,7 +118,6 @@ def install --enable-bcmath --enable-calendar --enable-dba - --enable-dtrace --enable-exif --enable-ftp --enable-fpm @@ -131,7 +139,6 @@ def install --enable-wddx --enable-zip --with-apxs2=#{Formula["httpd"].opt_bin}/apxs - --with-bz2#{headers_path} --with-curl=#{Formula["curl-openssl"].opt_prefix} --with-fpm-user=_www --with-fpm-group=_www @@ -146,13 +153,10 @@ def install --with-layout=GNU --with-ldap=#{Formula["openldap"].opt_prefix} --with-ldap-sasl#{headers_path} - --with-libxml-dir#{headers_path} - --with-libedit#{headers_path} --with-libzip --with-mhash#{headers_path} --with-mysql-sock=/tmp/mysql.sock --with-mysqli=mysqlnd - --with-ndbm#{headers_path} --with-openssl=#{Formula["openssl@1.1"].opt_prefix} --with-password-argon2=#{Formula["argon2"].opt_prefix} --with-pdo-dblib=#{Formula["freetds"].opt_prefix} @@ -170,10 +174,28 @@ def install --with-unixODBC=#{Formula["unixodbc"].opt_prefix} --with-webp-dir=#{Formula["webp"].opt_prefix} --with-xmlrpc - --with-xsl#{headers_path} - --with-zlib#{headers_path} ] + if OS.mac? + args << "--enable-dtrace" + args << "--with-zlib#{headers_path}" + args << "--with-bz2#{headers_path}" + args << "--with-ndbm#{headers_path}" + args << "--with-libedit#{headers_path}" + args << "--with-libxml-dir#{headers_path}" + args << "--with-xsl#{headers_path}" + else + args << "--disable-dtrace" + args << "--with-zlib=#{Formula["zlib"].opt_prefix}" + args << "--with-bz2=#{Formula["bzip2"].opt_prefix}" + args << "--with-libedit=#{Formula["libedit"].opt_prefix}" + args << "--with-libxml-dir=#{Formula["libxml2"].opt_prefix}" + args << "--with-xsl=#{Formula["libxslt"].opt_prefix}" + args << "--without-ldap-sasl" + args << "--without-ndbm" + args << "--without-gdbm" + end + system "./configure", *args system "make" system "make", "install" @@ -328,8 +350,10 @@ def plist "Zend OPCache extension not loaded" # Test related to libxml2 and # https://github.com/Homebrew/homebrew-core/issues/28398 - assert_includes MachO::Tools.dylibs("#{bin}/php"), - "#{Formula["libpq"].opt_lib}/libpq.5.dylib" + if OS.mac? + assert_includes MachO::Tools.dylibs("#{bin}/php"), + "#{Formula["libpq"].opt_lib}/libpq.5.dylib" + end system "#{sbin}/php-fpm", "-t" system "#{bin}/phpdbg", "-V" system "#{bin}/php-cgi", "-m" @@ -401,7 +425,7 @@ def plist Process.wait(pid) fpm_pid = fork do - exec sbin/"php-fpm", "-y", "fpm.conf" + exec sbin/"php-fpm", *("--allow-to-run-as-root" if Process.uid.zero?), "-y", "fpm.conf" end pid = fork do exec Formula["httpd"].opt_bin/"httpd", "-X", "-f", "#{testpath}/httpd-fpm.conf" diff --git a/Formula/php@7.3.rb b/Formula/php@7.3.rb index fdbdd8600ee18..d882a0965c8eb 100644 --- a/Formula/php@7.3.rb +++ b/Formula/php@7.3.rb @@ -10,6 +10,7 @@ class PhpAT73 < Formula sha256 "93e0616d2e6dc4f651c94f24f223d0b396b4d6e5bac20ca5a2857dbb1156b5b2" => :catalina sha256 "a2df45acba621e4f5ea402a130da3423e516de19616fa3bd499cc8d52ada578f" => :mojave sha256 "d5f0acd387ab5cf4192abd09ae2727f7fb1fb37f4d42895b1be1ef731e0946a6" => :high_sierra + sha256 "ced2503a0b3321088b90aa49f2e0a1e79787381a9c281c4a40aa1038be5bd297" => :x86_64_linux end keg_only :versioned_formula @@ -41,6 +42,10 @@ class PhpAT73 < Formula depends_on "tidy-html5" depends_on "unixodbc" depends_on "webp" + unless OS.mac? + depends_on "xz" => :build + depends_on "libedit" + end uses_from_macos "bzip2" uses_from_macos "libxml2" @@ -49,7 +54,7 @@ class PhpAT73 < Formula # PHP build system incorrectly links system libraries # see https://github.com/php/php-src/pull/3472 - patch :DATA + patch :DATA if OS.mac? def install # Ensure that libxml2 will be detected correctly in older MacOS @@ -96,7 +101,11 @@ def install # Each extension that is built on Mojave needs a direct reference to the # sdk path or it won't find the headers - headers_path = "=#{MacOS.sdk_path_if_needed}/usr" + headers_path = if OS.mac? + "=#{MacOS.sdk_path_if_needed}/usr" + else + "" + end args = %W[ --prefix=#{prefix} @@ -108,7 +117,6 @@ def install --enable-bcmath --enable-calendar --enable-dba - --enable-dtrace --enable-exif --enable-ftp --enable-fpm @@ -130,8 +138,6 @@ def install --enable-wddx --enable-zip --with-apxs2=#{Formula["httpd"].opt_bin}/apxs - --with-bz2#{headers_path} - --with-curl=#{Formula["curl-openssl"].opt_prefix} --with-fpm-user=_www --with-fpm-group=_www --with-freetype-dir=#{Formula["freetype"].opt_prefix} @@ -144,14 +150,10 @@ def install --with-kerberos#{headers_path} --with-layout=GNU --with-ldap=#{Formula["openldap"].opt_prefix} - --with-ldap-sasl#{headers_path} - --with-libxml-dir#{headers_path} - --with-libedit#{headers_path} --with-libzip --with-mhash#{headers_path} --with-mysql-sock=/tmp/mysql.sock --with-mysqli=mysqlnd - --with-ndbm#{headers_path} --with-openssl=#{Formula["openssl@1.1"].opt_prefix} --with-password-argon2=#{Formula["argon2"].opt_prefix} --with-pdo-dblib=#{Formula["freetds"].opt_prefix} @@ -169,10 +171,28 @@ def install --with-unixODBC=#{Formula["unixodbc"].opt_prefix} --with-webp-dir=#{Formula["webp"].opt_prefix} --with-xmlrpc - --with-xsl#{headers_path} - --with-zlib#{headers_path} ] + if OS.mac? + args << "--enable-dtrace" + args << "--with-zlib#{headers_path}" + args << "--with-bz2#{headers_path}" + args << "--with-ndbm#{headers_path}" + args << "--with-libedit#{headers_path}" + args << "--with-libxml-dir#{headers_path}" + args << "--with-xsl#{headers_path}" + else + args << "--disable-dtrace" + args << "--with-zlib=#{Formula["zlib"].opt_prefix}" + args << "--with-bz2=#{Formula["bzip2"].opt_prefix}" + args << "--with-libedit=#{Formula["libedit"].opt_prefix}" + args << "--with-libxml-dir=#{Formula["libxml2"].opt_prefix}" + args << "--with-xsl=#{Formula["libxslt"].opt_prefix}" + args << "--without-ldap-sasl" + args << "--without-ndbm" + args << "--without-gdbm" + end + system "./configure", *args system "make" system "make", "install" @@ -332,8 +352,10 @@ def plist "Zend OPCache extension not loaded" # Test related to libxml2 and # https://github.com/Homebrew/homebrew-core/issues/28398 - assert_includes MachO::Tools.dylibs("#{bin}/php"), - "#{Formula["libpq"].opt_lib}/libpq.5.dylib" + if OS.mac? + assert_includes MachO::Tools.dylibs("#{bin}/php"), + "#{Formula["libpq"].opt_lib}/libpq.5.dylib" + end system "#{sbin}/php-fpm", "-t" system "#{bin}/phpdbg", "-V" system "#{bin}/php-cgi", "-m" @@ -405,7 +427,7 @@ def plist Process.wait(pid) fpm_pid = fork do - exec sbin/"php-fpm", "-y", "fpm.conf" + exec sbin/"php-fpm", *("--allow-to-run-as-root" if Process.uid.zero?), "-y", "fpm.conf" end pid = fork do exec Formula["httpd"].opt_bin/"httpd", "-X", "-f", "#{testpath}/httpd-fpm.conf" diff --git a/Formula/physfs.rb b/Formula/physfs.rb index 3e5636a9a6cab..69b64ae78b7df 100644 --- a/Formula/physfs.rb +++ b/Formula/physfs.rb @@ -11,9 +11,14 @@ class Physfs < Formula sha256 "cb97a3a17728f3173d4c19fde495cffbddce965bbf6015e45882e3c27f267cf3" => :mojave sha256 "296927566472c976a578f89c4bd6bf0f518427a53d586499a8e202896d469ee3" => :high_sierra sha256 "6742501c33943dcdab748b3c2188cf6292f462b82896da001cdbcfbbcc01e489" => :sierra + sha256 "cc8d21b7a07f64759a3e5c6eb840082a0eab761dad3246877da8c73266a6e731" => :x86_64_linux end depends_on "cmake" => :build + unless OS.mac? + depends_on "readline" + depends_on "zip" => :test + end def install mkdir "macbuild" do @@ -32,6 +37,10 @@ def install addarchive test.zip 1 cat test.txt EOS - assert_match /Successful\.\nhomebrew/, shell_output("#{bin}/test_physfs < test 2>&1") + if OS.mac? + assert_match /Successful\.\nhomebrew/, shell_output("#{bin}/test_physfs < test 2>&1") + else + assert_match /homebrew/, shell_output("#{bin}/test_physfs < test 2>&1") + end end end diff --git a/Formula/pianobar.rb b/Formula/pianobar.rb index 87dded88ed969..7255b3e2ce8b3 100644 --- a/Formula/pianobar.rb +++ b/Formula/pianobar.rb @@ -11,6 +11,7 @@ class Pianobar < Formula sha256 "49ad839da9e9d7b4f717838a52277b7ae304724127f3de8c404504764f15e921" => :catalina sha256 "eec3b381ec877cda4379026eb20bc3fd1cfe286e416eeb4c1565a1494550795d" => :mojave sha256 "accdc886da24381e27eeb176c07a73e5882a9f93dbdfffd4b2039bc3f5206cbb" => :high_sierra + sha256 "d80a934d8787782d0ac4975eded2b9b4b1dd10febf22c310a5d2bdc5299ad910" => :x86_64_linux end depends_on "pkg-config" => :build @@ -35,6 +36,9 @@ def install end test do + # Errno::EIO: Input/output error @ io_fread - /dev/pts/0 + return if ENV["CI"] + require "pty" PTY.spawn(bin/"pianobar") do |stdout, stdin, _pid| stdin.putc "\n" diff --git a/Formula/pianod.rb b/Formula/pianod.rb index 5dce18c323b1e..cf1259bf3cd12 100644 --- a/Formula/pianod.rb +++ b/Formula/pianod.rb @@ -8,12 +8,14 @@ class Pianod < Formula sha256 "6698a4353e50aed190386ccdf407af24f6b623691ebabdef7f8a0b7dca77b338" => :catalina sha256 "c0dfa015b5c5546a2fc4788d716c00520282773a93e7d6669f891f2b1126f587" => :mojave sha256 "d7c6ba07d0b46d393c4dc5de718e4dcd3130d6b0f8f2ee5aa5d00efd8ec69e93" => :high_sierra + sha256 "50b13a02b3aba6fb33fc38f66e1f370ebe60657ed7e5b59d2bc33e65d655a4c3" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "json-c" depends_on "libao" depends_on "libgcrypt" + depends_on "ffmpeg" unless OS.mac? def install ENV["OBJCXXFLAGS"] = "-std=c++11" diff --git a/Formula/picocom.rb b/Formula/picocom.rb index 335b8cfd9673e..871e5f5ba401e 100644 --- a/Formula/picocom.rb +++ b/Formula/picocom.rb @@ -11,6 +11,7 @@ class Picocom < Formula sha256 "7fec5e767653710fa87d0be9d97735550af70aeb32fdcba1c7c0159e9078ee1a" => :high_sierra sha256 "fb1bd439cb84f2667feee5e5c125ec9a51698e7d153c56decf95502848edc621" => :sierra sha256 "ec353723ddf1f785bd75bb3a0e9bd5e92adacbe5b4a86ed5dabe53d20b1a362c" => :el_capitan + sha256 "10875c8bcb8fb836a0ffae01574a84576558f7717d55c80c1b513fb60c5d4c49" => :x86_64_linux end def install diff --git a/Formula/pidof.rb b/Formula/pidof.rb index defa9ecce5621..4dc1e580b4035 100644 --- a/Formula/pidof.rb +++ b/Formula/pidof.rb @@ -16,6 +16,9 @@ class Pidof < Formula sha256 "54ffe0be6ef278aa45cacb856687df925bab1c117d1ab4c1a8f81ae835fb293e" => :mavericks end + # Hard dependency on sys/proc.h, which isn't available on Linux + depends_on :macos + def install system "make", "all", "CC=#{ENV.cc}", "CFLAGS=#{ENV.cflags}" man1.install gzip("pidof.1") diff --git a/Formula/pigz.rb b/Formula/pigz.rb index 775f0f67bbc86..dbe30d6f9b155 100644 --- a/Formula/pigz.rb +++ b/Formula/pigz.rb @@ -11,11 +11,14 @@ class Pigz < Formula sha256 "216e716eafd2786ed6fa672daf27bb77b420e05f92a14cfeccab28a6be6b7778" => :high_sierra sha256 "9173b4bdf36c787ad7a3b7d738236e0393430b607ba44d5a32fa387b008a347a" => :sierra sha256 "d0c4ec5ac96ab0262d5e67bd5df5432d7dc40ac1404341962c02835ca8451b5c" => :el_capitan + sha256 "447fa9c08dd2a52e68ece9408522cfdc6abd940467394de96b91bce20c2b2538" => :x86_64_linux end uses_from_macos "zlib" def install + inreplace "Makefile", "-lm", "-lz -lm" unless OS.mac? + # Fix dyld: lazy symbol binding failed: Symbol not found: _deflatePending # Reported 8 Dec 2016 to madler at alumni.caltech.edu if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0" @@ -35,7 +38,7 @@ def install assert (testpath/"example.gz").file? system bin/"unpigz", testpath/"example.gz" assert_equal test_data, (testpath/"example").read - system "/bin/dd", "if=/dev/random", "of=foo.bin", "bs=1m", "count=10" + system "/bin/dd", "if=/dev/random", "of=foo.bin", "bs=1M", "count=10" system bin/"pigz", "foo.bin" end end diff --git a/Formula/pijul.rb b/Formula/pijul.rb new file mode 100644 index 0000000000000..c7816740c7744 --- /dev/null +++ b/Formula/pijul.rb @@ -0,0 +1,47 @@ +class Pijul < Formula + desc "Patch-based distributed version control system" + homepage "https://pijul.org" + url "https://pijul.org/releases/pijul-0.12.0.tar.gz" + sha256 "987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6" + revision 1 + + bottle do + cellar :any + rebuild 1 + sha256 "c5cc98c1979e4e782685774e3e5ff449f6968123f6e79ff68ecf8c4cf8656266" => :catalina + sha256 "73bf314aa865452f0f7104430a64be1922f31553c2b41e36e8fc0ba8657ca7b2" => :mojave + sha256 "b5dbbecb1823507658c535c4d60d8374a0924169a1994bf68d0210a62f42ea17" => :high_sierra + sha256 "b06c621f11d72bf7d2d7b65b91393247950d6bbb0d18b7cf45f7eba4741e4b51" => :x86_64_linux + end + + depends_on "pkg-config" => :build + depends_on "rust" => :build + depends_on "libsodium" + depends_on "nettle" + depends_on "openssl@1.1" + depends_on "llvm" unless OS.mac? + + def install + # Applies a bugfix (0.20.7 -> 0.20.8) update to a dependency to fix compile. + # Remove with the next version. + system "cargo", "update", "-p", "thrussh", "--precise", "0.20.8" + + # Ensure that the `openssl` crate picks up the intended library. + # https://crates.io/crates/openssl#manual-configuration + ENV["OPENSSL_DIR"] = Formula["openssl@1.1"].opt_prefix + + cd "pijul" do + system "cargo", "install", "--locked", "--root", prefix, "--path", "." + end + end + + test do + system bin/"pijul", "init" + %w[haunted house].each { |f| touch testpath/f } + system bin/"pijul", "add", "haunted", "house" + system bin/"pijul", "record", "--all", + "--message='Initial Patch'", + "--author='Foo Bar '" + assert_equal "haunted\nhouse\n", shell_output("#{bin}/pijul ls") + end +end diff --git a/Formula/pike.rb b/Formula/pike.rb index d56ec4eb38c0b..f9dc86da2a033 100644 --- a/Formula/pike.rb +++ b/Formula/pike.rb @@ -10,6 +10,7 @@ class Pike < Formula sha256 "ae20ba3c7fd69c026892555798559bd2da90d53dc3cf07eb5d7423af505082d5" => :catalina sha256 "ff1e2f11d0beec51cc41d9eb566a80cbf53b51933158c6083054e3b91dfa251c" => :mojave sha256 "10eb373d72d3c178dc1f560a7e1c35f8b6dc51412d7eb4f4cf4f751109d4fd9d" => :high_sierra + sha256 "c8376f39d81c14629b0acd51b3e9e1d6ceadd351b0185ee456ca624836c29292" => :x86_64_linux end depends_on "gmp" @@ -17,6 +18,11 @@ class Pike < Formula depends_on "nettle" depends_on "pcre" + unless OS.mac? + depends_on "jpeg" + depends_on "linuxbrew/xorg/xorg" + end + def install ENV.append "CFLAGS", "-m64" ENV.deparallelize diff --git a/Formula/piknik.rb b/Formula/piknik.rb index 699c716c28575..0432e5e4ee37d 100644 --- a/Formula/piknik.rb +++ b/Formula/piknik.rb @@ -14,6 +14,7 @@ class Piknik < Formula sha256 "fffe6c2329ae0840061a464162703ec7cd26649cd985d1ff4de37315059b9357" => :sierra sha256 "40b1bdb322e89f3c955519a3156f8ab9ed7aa3833f0887f1bb1ccf6224038de8" => :el_capitan sha256 "c1bb1b4632aca54d93490f53b9142f7f808abec1cd6761418df63f11abeb80fe" => :yosemite + sha256 "cb474ac511340da4da79451b9caad7d41f5ccf4025aebac349be1c6f7b1fdb55" => :x86_64_linux end depends_on "glide" => :build diff --git a/Formula/pilosa.rb b/Formula/pilosa.rb index e8947a3361112..88095612896f4 100644 --- a/Formula/pilosa.rb +++ b/Formula/pilosa.rb @@ -10,6 +10,7 @@ class Pilosa < Formula sha256 "b07bcd3693cdc789a45fdce1b3257b3ca85b018eb65f1cbb45234d41ff935902" => :mojave sha256 "245160b3bc6e7e6a4b27d3081580c0616e8004ea1b9420367801c2193417caea" => :high_sierra sha256 "6b9489e424aca469bafc5e7c7ec20470009c713ce1a843efc7ee6b884fb216da" => :sierra + sha256 "a742a277fe46d0c8767cce132f12fc3c88e8d3119b1788ae4158b899fd52c634" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/pinboard-notes-backup.rb b/Formula/pinboard-notes-backup.rb index dc25c1344a5bd..fd11cae79d74c 100644 --- a/Formula/pinboard-notes-backup.rb +++ b/Formula/pinboard-notes-backup.rb @@ -6,15 +6,17 @@ class PinboardNotesBackup < Formula head "https://github.com/bdesham/pinboard-notes-backup.git" bottle do - cellar :any_skip_relocation sha256 "1735309c67f5ff12f212c8f780fe0cfb3d0409c53ce9376ee265597ceb517693" => :catalina sha256 "244865afa3cd3d89f059dd4e6a162de07ce8d404c9ea2c05dc92ef17869c75e8" => :mojave sha256 "cddc7122a3aa1aec17c18d2e50f471a154db42006684b7ba8d5fb4b2cfd5842f" => :high_sierra + sha256 "ad74e5c67b808cf54af1b5ab3353a052f81238509073e6d3a99891e3aa977b28" => :x86_64_linux end depends_on "cabal-install" => :build depends_on "ghc@8.6" => :build + uses_from_macos "zlib" + def install system "cabal", "v2-update" system "cabal", "v2-install", *std_cabal_v2_args diff --git a/Formula/pinentry-mac.rb b/Formula/pinentry-mac.rb index ee2fb73459733..1ab07f2909caf 100644 --- a/Formula/pinentry-mac.rb +++ b/Formula/pinentry-mac.rb @@ -16,7 +16,7 @@ class PinentryMac < Formula sha256 "c2538b57edce2eb7ccc10a32e16ccfbbbe8e61c384c4db8d5a62b04d3815c0ed" => :mavericks end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? patch do # patch header locations for macOS 10.14 diff --git a/Formula/pinentry.rb b/Formula/pinentry.rb index 2cde603cbf039..cbe9360568b86 100644 --- a/Formula/pinentry.rb +++ b/Formula/pinentry.rb @@ -13,11 +13,13 @@ class Pinentry < Formula sha256 "a1a0e526f622d7dc4e2b3e0dcde061dbb383050b8efbe424d916bf983ae66c74" => :high_sierra sha256 "fd93c11a28d38ba1b78c7fe646f027f98ce29c08ba02c7a0e14e69f355614e35" => :sierra sha256 "e8c6180d9d86f008d0d9cdf0bc9638f2c119bb426504955ecbd16ef6b108d01d" => :el_capitan + sha256 "6d3ee1989b32557f20342212e25d6168e1eb8e3c1a822a3b629a4d0b2ab379b2" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "libassuan" depends_on "libgpg-error" + depends_on "libsecret" unless OS.mac? def install args = %W[ diff --git a/Formula/pioneer.rb b/Formula/pioneer.rb index b94974f732355..6ce32f56d2499 100644 --- a/Formula/pioneer.rb +++ b/Formula/pioneer.rb @@ -9,6 +9,7 @@ class Pioneer < Formula sha256 "d6ef58a82bd5d0030f28db39103882a4da8416ba3b1dae5d3e98d09e2d06c5c6" => :catalina sha256 "837ce3dc518de05e3c50597252acf888b55ee341777f765bd4b1d88faf53592d" => :mojave sha256 "2d2d2aaeff7ec2231f7908504d4750f9fc2e60fd4d68f059d20808cea36370d7" => :high_sierra + sha256 "779c12838a8d6e3516b90dd46a58184b1ee6ff56d36388e2e5078f29f00fe33e" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/pipebench.rb b/Formula/pipebench.rb index 8954984ddabd6..d83f7148a4646 100644 --- a/Formula/pipebench.rb +++ b/Formula/pipebench.rb @@ -15,6 +15,7 @@ class Pipebench < Formula sha256 "353cabdaf04a41e2169c1e489cd038f9fbe7f33cfd24a5a0b3068449ccc3446d" => :el_capitan sha256 "a999c7ba2978e60d38bdeec63d1f1a8b2667cb0d77d35c4da2e57212a37b85ac" => :yosemite sha256 "c5b0805588d8a8d9047d30b9330dd0be0215bfe694ed662cf11fa84595bba85c" => :mavericks + sha256 "47b160fec5a4d67846d1f1916216ebeb4c27f5eb3d65137417ed8c1bf00261ce" => :x86_64_linux end def install diff --git a/Formula/pipemeter.rb b/Formula/pipemeter.rb index 6acb4ed7d5a33..5b5b0bd886a8d 100644 --- a/Formula/pipemeter.rb +++ b/Formula/pipemeter.rb @@ -13,6 +13,7 @@ class Pipemeter < Formula sha256 "bf99d50927a1277c1a481af0eea25314dfbd1449dbd1394368f7a933da367e9a" => :el_capitan sha256 "cee0b494c5f7647d0c597e90dbc8be2c7b759d53a12cd87f89f9620b9260c3ac" => :yosemite sha256 "a1bd1a5466eb44aeeba7ab2563f3bd34978d248deec50964624f985f066fe2bf" => :mavericks + sha256 "464fd74a6d4674581f7b416007baec492924646e87a8dd782b939fd9936688e4" => :x86_64_linux end def install diff --git a/Formula/pipenv.rb b/Formula/pipenv.rb index b9f777d9f1b5b..91b0cdb98c419 100644 --- a/Formula/pipenv.rb +++ b/Formula/pipenv.rb @@ -11,6 +11,7 @@ class Pipenv < Formula sha256 "12257ab59085420c2ad08dbe12236d9393d814ed387e8ab8f6e7acb730635321" => :catalina sha256 "82bd72857a8cebceca3f6ea44140d7391ac1d94c84406c6a5ea51e5e87b88a66" => :mojave sha256 "792be77485b744b5891613c4bf02b6d5544ff1da65b6a02b7c3c59c540e007b5" => :high_sierra + sha256 "d2ebde3a1ee587a04f83682cbd52c5d25057e119b8afeb9632d3e2ca171e7c66" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/pipes-sh.rb b/Formula/pipes-sh.rb index 5dde02366d726..1cc4fb3394ed7 100644 --- a/Formula/pipes-sh.rb +++ b/Formula/pipes-sh.rb @@ -12,6 +12,7 @@ class PipesSh < Formula sha256 "2793ad5fb825b4f805a4731c7028cbcb2ca5e9dd904133df0cce7481c5961322" => :high_sierra sha256 "2793ad5fb825b4f805a4731c7028cbcb2ca5e9dd904133df0cce7481c5961322" => :sierra sha256 "2793ad5fb825b4f805a4731c7028cbcb2ca5e9dd904133df0cce7481c5961322" => :el_capitan + sha256 "ff7abda2674bdddfaf0360e9e223b2e70f3657ef4fdf24937d158e9601ff4912" => :x86_64_linux end depends_on "bash" diff --git a/Formula/pipx.rb b/Formula/pipx.rb index 370e7d16398f7..1b7fe8833fe4d 100644 --- a/Formula/pipx.rb +++ b/Formula/pipx.rb @@ -10,6 +10,7 @@ class Pipx < Formula sha256 "9d3b8ecd4650b1877c489951f774c1a5eedcb289497cbf9d8b3102d1d71322c6" => :catalina sha256 "9d3b8ecd4650b1877c489951f774c1a5eedcb289497cbf9d8b3102d1d71322c6" => :mojave sha256 "9d3b8ecd4650b1877c489951f774c1a5eedcb289497cbf9d8b3102d1d71322c6" => :high_sierra + sha256 "fa70f56b4300da6e3adb65e01e8a27f85bb12b70b90389f4b6cf23b06f2bec2e" => :x86_64_linux end depends_on "python@3.8" @@ -29,6 +30,13 @@ class Pipx < Formula sha256 "8f555126f137c08c576f73e6a9d7089ee394e9ba00a53a75c37f05439ca3cf51" end + unless OS.mac? + resource "distro" do + url "https://files.pythonhosted.org/packages/a6/a4/75064c334d8ae433445a20816b788700db1651f21bdb0af33db2aab142fe/distro-1.5.0.tar.gz" + sha256 "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92" + end + end + def install xy = Language::Python.major_minor_version "python3" ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python#{xy}/site-packages" diff --git a/Formula/pius.rb b/Formula/pius.rb index de66878a9f94f..7d0d4e309364d 100644 --- a/Formula/pius.rb +++ b/Formula/pius.rb @@ -5,7 +5,7 @@ class Pius < Formula homepage "https://www.phildev.net/pius/" url "https://github.com/jaymzh/pius/archive/v3.0.0.tar.gz" sha256 "3454ade5540687caf6d8b271dd18eb773a57ab4f5503fc71b4769cc3c5f2b572" - revision 1 + revision OS.mac? ? 1 : 2 head "https://github.com/jaymzh/pius.git" bottle do @@ -13,6 +13,7 @@ class Pius < Formula sha256 "e94572eadd5e0adeda1fb16cb05f44afd486b9ba3667c0139ec5588e7f947775" => :catalina sha256 "499e1c8b31c8c1930cc8b6a7d187854302890ba51585fdba92515f0f014069ff" => :mojave sha256 "d0b7237e06c967976ff74ccdf110afe9712cda1b2e0dd870f43599eb337d2eb9" => :high_sierra + sha256 "68e8d9a6c317eedc9c5d00f2334e75e25999f8663b8703e92b8970a509da7606" => :x86_64_linux end depends_on "gnupg" diff --git a/Formula/pixman.rb b/Formula/pixman.rb index d0818d1b85b84..6e39c51bdc5d1 100644 --- a/Formula/pixman.rb +++ b/Formula/pixman.rb @@ -9,6 +9,7 @@ class Pixman < Formula sha256 "1862e6826a4bedb97af8dcb9ab849c69754226ed92e5ee19267fa33ee96f94f8" => :catalina sha256 "70a476e6b14fdfa42188d3df2797f8c13f25bd633528164b0d42c5fb70dfb431" => :mojave sha256 "e5b78e3dca71370ccc06a013ebda8b9f1c2b89a238e2f3ef11a8086560e3c07b" => :high_sierra + sha256 "a8ef4c0ead4f617b121f50f58d9cf777209e7ab7c193b398fdab87630a9bb5d6" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/pixz.rb b/Formula/pixz.rb index 0630706917009..81d5b79b42a08 100644 --- a/Formula/pixz.rb +++ b/Formula/pixz.rb @@ -12,6 +12,7 @@ class Pixz < Formula sha256 "1fba8335b8dd4b061f961ce2e5d03eafa550a7a92edc8b8a95b6129c55bd6b7b" => :mojave sha256 "4c971701c82c6444dec792341b49b8ce38e88b2d9e3d549c12433d2fef37cd0a" => :high_sierra sha256 "9d2f908cb1c21882c95f3c3284c9b4c1eea74c2b25d3ba6df9ad47fadbcc0813" => :sierra + sha256 "8d343e003b45b1048d2747c65d15c1242ac71ba58f890f3d365ac6024a740e14" => :x86_64_linux end depends_on "asciidoc" => :build diff --git a/Formula/pjproject.rb b/Formula/pjproject.rb index d8db8ec19b14c..855aac69e70b3 100644 --- a/Formula/pjproject.rb +++ b/Formula/pjproject.rb @@ -10,6 +10,7 @@ class Pjproject < Formula sha256 "e31037429a94ebfae5fa04dd72401621dcd7b7628ba4f3f8dd6c096b13de3e50" => :catalina sha256 "5c8504312c89836f834b61b9f006044e37e76606290965de8a0e8ffd57275303" => :mojave sha256 "bf68bae907d0ee4cc1accfd788e41a8fb8c558acd5fd781b81f5547571e04fa1" => :high_sierra + sha256 "dde95ea0a2710515586f697c05ad667f3a8ecd03af7aa47ba8d26644183419c6" => :x86_64_linux end depends_on :macos => :high_sierra # Uses Security framework API enum cases introduced in 10.13.4 @@ -22,8 +23,12 @@ def install system "make", "install" arch = Utils.safe_popen_read("uname -m").chomp - rel = Utils.safe_popen_read("uname -r").chomp - bin.install "pjsip-apps/bin/pjsua-#{arch}-apple-darwin#{rel}" => "pjsua" + if OS.mac? + rel = Utils.safe_popen_read("uname -r").chomp + bin.install "pjsip-apps/bin/pjsua-#{arch}-apple-darwin#{rel}" => "pjsua" + else + bin.install "pjsip-apps/bin/pjsua-#{arch}-unknown-linux-gnu" => "pjsua" + end end test do diff --git a/Formula/pkcs11-helper.rb b/Formula/pkcs11-helper.rb index dd6103c7a06c6..de0e5f909853d 100644 --- a/Formula/pkcs11-helper.rb +++ b/Formula/pkcs11-helper.rb @@ -10,6 +10,7 @@ class Pkcs11Helper < Formula sha256 "dc52806291729e3481bb2a90cabb9df77f21c30351ed2cc67213caaefed8c667" => :catalina sha256 "f2783434ebb595a4e9a9b570c05dcf030a7539d1008e988427e4cd36281b6917" => :mojave sha256 "6796ffb18fc1f6c22b800caf32e0e4698c1f82e10529ed6535b634afabf237fe" => :high_sierra + sha256 "74277c9d73ba7e6beeb995f0fb2b2ab5929011acb311b356b87c38543ab41c56" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/pkg-config.rb b/Formula/pkg-config.rb index 6e10d12c05bd5..7f300b1dd1cf9 100644 --- a/Formula/pkg-config.rb +++ b/Formula/pkg-config.rb @@ -4,13 +4,14 @@ class PkgConfig < Formula url "https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz" mirror "https://dl.bintray.com/homebrew/mirror/pkg-config-0.29.2.tar.gz" sha256 "6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591" - revision 3 + revision OS.mac? ? 3 : 4 bottle do cellar :any_skip_relocation sha256 "80f141e695f73bd058fd82e9f539dc67471666ff6800c5e280b5af7d3050f435" => :catalina sha256 "0d14b797dba0e0ab595c9afba8ab7ef9c901b60b4f806b36580ef95ebb370232" => :mojave sha256 "8c6160305abd948b8cf3e0d5c6bb0df192fa765bbb9535dda0b573cb60abbe52" => :high_sierra + sha256 "bc8ac04f3d8e42a748f40544f8e1b7f2471f32608f33e666e903d6108eb4dab2" => :x86_64_linux end pour_bottle? do @@ -20,13 +21,19 @@ class PkgConfig < Formula end def install - pc_path = %W[ - #{HOMEBREW_PREFIX}/lib/pkgconfig - #{HOMEBREW_PREFIX}/share/pkgconfig - /usr/local/lib/pkgconfig - /usr/lib/pkgconfig - #{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version} - ].uniq.join(File::PATH_SEPARATOR) + pc_path = if OS.mac? + %W[ + /usr/local/lib/pkgconfig + /usr/lib/pkgconfig + #{HOMEBREW_LIBRARY}/Homebrew/os/mac/pkgconfig/#{MacOS.version}" + ].uniq.join(File::PATH_SEPARATOR) + else + %W[ + #{HOMEBREW_PREFIX}/lib/pkgconfig + #{HOMEBREW_PREFIX}/share/pkgconfig + #{HOMEBREW_LIBRARY}/Homebrew/os/linux/pkgconfig + ].uniq.join(File::PATH_SEPARATOR) + end system "./configure", "--disable-debug", "--prefix=#{prefix}", diff --git a/Formula/pkgdiff.rb b/Formula/pkgdiff.rb index 70767cfe6199c..41f35873a12ea 100644 --- a/Formula/pkgdiff.rb +++ b/Formula/pkgdiff.rb @@ -13,6 +13,7 @@ class Pkgdiff < Formula sha256 "18895054433b4b050c3a863306c62a910be7fa4e36b0020a742c5c7541c0df65" => :el_capitan sha256 "c566b1a44ed89a1b7b3547adf0a0e0fa784174e1acc4a1dd46a240ea6d09bbff" => :yosemite sha256 "a9ccac49037c91c63af967e67256daa24e878f38fd17959ba30fffb8e1fcc2a2" => :mavericks + sha256 "f6596304719ef0ac8ef5d55f55eea6e2a6f7c55d4f5f3eb4f31023bd5e0c1fec" => :x86_64_linux end depends_on "binutils" diff --git a/Formula/planck.rb b/Formula/planck.rb index f5083aede7ce1..feb06fa0d6a03 100644 --- a/Formula/planck.rb +++ b/Formula/planck.rb @@ -16,7 +16,7 @@ class Planck < Formula depends_on "clojure" => :build depends_on "cmake" => :build depends_on "pkg-config" => :build - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "icu4c" depends_on "libzip" diff --git a/Formula/plank.rb b/Formula/plank.rb index d57caf916a359..671da7f85990c 100644 --- a/Formula/plank.rb +++ b/Formula/plank.rb @@ -11,7 +11,7 @@ class Plank < Formula sha256 "04d2dddb094914fa219304fea8f6e5aa3315c2e51b63ef4077fcf25a54c8b268" => :mojave end - depends_on :xcode => ["11.3", :build] + depends_on :xcode => ["11.3", :build] if OS.mac? def install system "make", "install", "PREFIX=#{prefix}" diff --git a/Formula/platformio.rb b/Formula/platformio.rb index c9e08d693b7fb..57aa03474f6dd 100644 --- a/Formula/platformio.rb +++ b/Formula/platformio.rb @@ -11,6 +11,7 @@ class Platformio < Formula sha256 "b31ae7f3a3e958a2bfde5ee2c063f2b37e76dbedba83bb54a0a65c48579899d6" => :catalina sha256 "be8b970478e406e3208b1bcd691bcf0790918ca98080b4bb34be0c02881958e2" => :mojave sha256 "fcef6a7f1eb39afbf29e92212d62fec5264e121ae90818e8b1809b7f82dabe11" => :high_sierra + sha256 "4210cb0239226acdf13fb568d4dc925878e3815988583b9b5b4336932add2087" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/platypus.rb b/Formula/platypus.rb index 3310aaadd085a..0f3e1edfd8a3a 100644 --- a/Formula/platypus.rb +++ b/Formula/platypus.rb @@ -13,7 +13,7 @@ class Platypus < Formula sha256 "d46dd428161d8ed7febf5ea4109f9bcddfa65c75d4e67619781745587c6b6f55" => :sierra end - depends_on :xcode => ["8.0", :build] + depends_on :xcode => ["8.0", :build] if OS.mac? def install xcodebuild "SYMROOT=build", "DSTROOT=#{buildpath}/dst", diff --git a/Formula/ploticus.rb b/Formula/ploticus.rb index ee79ff4a65884..1e7b38b97633d 100644 --- a/Formula/ploticus.rb +++ b/Formula/ploticus.rb @@ -13,6 +13,7 @@ class Ploticus < Formula sha256 "088f4ba0eea75ed4b401f94331b70dd64e23f02fa0d95731fbaccf6904c8cea5" => :el_capitan sha256 "b15be72d80abf16b348c625945de811bf1fb411b1cb329adc701bc04cfb41dd8" => :yosemite sha256 "c2b4982907f4a9de66973cf55729fed03f17c42704593d6dbcce955ce53cd9bb" => :mavericks + sha256 "bf5e7c4c9f1bf3689311b341d070bfc950f9d0a8fed63d8661ef1cf8af4c106d" => :x86_64_linux end depends_on "libpng" diff --git a/Formula/plotutils.rb b/Formula/plotutils.rb index 58f0c73873d59..e5ed08d508847 100644 --- a/Formula/plotutils.rb +++ b/Formula/plotutils.rb @@ -4,7 +4,7 @@ class Plotutils < Formula url "https://ftp.gnu.org/gnu/plotutils/plotutils-2.6.tar.gz" mirror "https://ftpmirror.gnu.org/plotutils/plotutils-2.6.tar.gz" sha256 "4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab" - revision 1 + revision OS.mac? ? 1 : 3 bottle do cellar :any @@ -16,9 +16,11 @@ class Plotutils < Formula sha256 "b734cdcbc7ce11c4a716bc96ee7671f3883a5d41dadceac28d994ad2c20292f9" => :el_capitan sha256 "fae89f252628820ac83a0896fa022b1c08cacca6e6234b2fb23c10554f424fd3" => :yosemite sha256 "e51b4b5c367e8f9ec533f54e20c9df0b887818ee35c4cde19ba8feb73d4d2ff2" => :mavericks + sha256 "40c9a61e453068bca346cf164ce3464c77a7b884a123a960f306d7fd08e69b81" => :x86_64_linux end depends_on "libpng" + depends_on "linuxbrew/xorg/xorg" unless OS.mac? def install # Fix usage of libpng to be 1.5 compatible diff --git a/Formula/plplot.rb b/Formula/plplot.rb index d1f74363df8de..1df964b071ec7 100644 --- a/Formula/plplot.rb +++ b/Formula/plplot.rb @@ -10,6 +10,7 @@ class Plplot < Formula sha256 "c9787b7555f0ccf504bdf2a457fb52699b03ecdacf09bd743f1b69158e556f75" => :mojave sha256 "c359058b80b9607c1dcae070f96f2fde9c080bdc7ba9903f9afcdb16a6388c77" => :high_sierra sha256 "bf4193d1d8f9beee8beb8163612df7a997b206dd8a97c5ab56265351d2ad84b4" => :sierra + sha256 "03bc5427a3f20a10121a1cbfa503803b412037651c535947b81abb980fa185a7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/plzip.rb b/Formula/plzip.rb index 64a059f267c88..4b8ebab0e9964 100644 --- a/Formula/plzip.rb +++ b/Formula/plzip.rb @@ -10,6 +10,7 @@ class Plzip < Formula sha256 "3e266c42c66babd4fbdfe82645ab876fc7224846e94b26a39183c57404e17c35" => :mojave sha256 "0a5df85c11e9afb266709a907980424cd60f1d1fd3adda71e8b0f9939ddf72a7" => :high_sierra sha256 "c26a4b45c09173a4cb8ab2a56d2c5bb9018e16332e637d4d617bfcd75f90c0ad" => :sierra + sha256 "814604d1403c40b36e714199c236f910105e87f4baa2646ee5746531a1456afe" => :x86_64_linux end depends_on "lzlib" diff --git a/Formula/pmccabe.rb b/Formula/pmccabe.rb index 16040b1504409..5320a05f86225 100644 --- a/Formula/pmccabe.rb +++ b/Formula/pmccabe.rb @@ -14,6 +14,7 @@ class Pmccabe < Formula sha256 "d6189f6ae7341da933653c687adec0bb8952b14ed8a2883b19aec4db90b65eea" => :el_capitan sha256 "cb369d2f04ce0fccdb22b2640f1f6e37fc056b6edda79767474040cb52f76936" => :yosemite sha256 "d64603cace1f97227e6efc2c26f628fece4e49f762e1e6d0903400a579be0a0f" => :mavericks + sha256 "7ca8ca868e22ba122e2c5cbc51a9cb753d27eb01fea55633990d5cf6d26470ed" => :x86_64_linux end def install diff --git a/Formula/pms.rb b/Formula/pms.rb index 56ebfc77d512e..d23cd619a0840 100644 --- a/Formula/pms.rb +++ b/Formula/pms.rb @@ -11,6 +11,7 @@ class Pms < Formula sha256 "0c43ee20313b6616c6ececb9c906da12720b035862a894a3f9dd11984c640b30" => :mojave sha256 "f01d2f4db91f6b6bcf35f86c7a0d2b0fbed17941d9556fe0ba71e855c7667638" => :high_sierra sha256 "fa90afc92fc9d1e57a9a0a74dc63d3ec5ba92f1430caf5cad8fa54362b0da298" => :sierra + sha256 "8696449a4eedb33228b49209278efbb68f90d13f9894cfea5cc37687d88d0b78" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/png++.rb b/Formula/png++.rb index c36335b089d5f..f521d2e0855cb 100644 --- a/Formula/png++.rb +++ b/Formula/png++.rb @@ -10,6 +10,7 @@ class Pngxx < Formula sha256 "536f9c2dd05cfd2ae8a4f7f5d0c5c38575cf91609498f98bd6c3f97c4de2c520" => :mojave sha256 "536f9c2dd05cfd2ae8a4f7f5d0c5c38575cf91609498f98bd6c3f97c4de2c520" => :high_sierra sha256 "cee110f568bae723e8e5172e8bab36c8f4c5adb8bf339a444926a572bfa13f89" => :sierra + sha256 "3705bec0c4e9ead00a245f3e173c7a2a6aedf4f886ec7aa4614900a217b4b7bf" => :x86_64_linux end depends_on "libpng" diff --git a/Formula/pngcrush.rb b/Formula/pngcrush.rb index b011445304898..4788528b51adf 100644 --- a/Formula/pngcrush.rb +++ b/Formula/pngcrush.rb @@ -12,6 +12,7 @@ class Pngcrush < Formula sha256 "f648ad0c664699f67bba8ba791358e8b294d0c1d975f026aa67fc1635badbc73" => :sierra sha256 "2633aff1e7cec8bb6c55da5c4daf9f555c74e516ebcc5f3027589588f76d3e17" => :el_capitan sha256 "5505ea179a71996eb4fab04feebd09ebbef7e8ea4c1efba1e0184333c1883d1b" => :yosemite + sha256 "ba6239bf4207630191192d93d9c56e59c7e3ff47bd1dd6a3cdf80154e73d1be1" => :x86_64_linux end def install diff --git a/Formula/pngpaste.rb b/Formula/pngpaste.rb index 0dfe654eb0333..5c802ea4d6e24 100644 --- a/Formula/pngpaste.rb +++ b/Formula/pngpaste.rb @@ -12,7 +12,7 @@ class Pngpaste < Formula end # Sierra's CLT is sufficient, but El Capitain's isn't - depends_on :xcode => ["8.0", :build] if MacOS.version < :sierra + depends_on :xcode => ["8.0", :build] if OS.mac? && MacOS.version < :sierra depends_on :macos => :el_capitan # needs NSBitmapImageFileTypePNG, etc. diff --git a/Formula/pngquant.rb b/Formula/pngquant.rb index d6ed700466819..45dee73a690a8 100644 --- a/Formula/pngquant.rb +++ b/Formula/pngquant.rb @@ -11,6 +11,7 @@ class Pngquant < Formula sha256 "6212657919215e9f140239aa7df37b97d1b9820543e884bc4af45ef0deda523a" => :catalina sha256 "0c90b318acdfa38b8fb7a0bea76c5932a9c1bfb00f2a866bbd30781631876e33" => :mojave sha256 "da0955f28f17ef1b50dc15256f80b5742c0c940d1c6ce683990edde6fffd642a" => :high_sierra + sha256 "b0b78bc304a4931cb4d240e047babe60a3e34c10607097d8c64d65da3bc2e160" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/pnpm.rb b/Formula/pnpm.rb index 594fbbd5429a6..f2e43120edf08 100644 --- a/Formula/pnpm.rb +++ b/Formula/pnpm.rb @@ -11,6 +11,7 @@ class Pnpm < Formula sha256 "4549c75d5c5f07cdaceb59c2d6c67ba2c2889d92dde338d1f15b0faa9775d7ca" => :catalina sha256 "8d0c9774d3304ca2ba4b355afb85d589bd984d6f2e48100b8b416d683283d27e" => :mojave sha256 "70822fb9aa42e7a7843e4cc6a838ff8ba015232ca2e698ec43c0d8ba1767e84e" => :high_sierra + sha256 "56db556263b97527a62f4dd899241c3019f39cfba05e910c2eb0c1cdbf44da31" => :x86_64_linux end depends_on "node" diff --git a/Formula/po4a.rb b/Formula/po4a.rb index b3819970ba8ad..6493b9b2364b8 100644 --- a/Formula/po4a.rb +++ b/Formula/po4a.rb @@ -14,11 +14,13 @@ class Po4a < Formula sha256 "62cd7a07c3f5bf0560672bafa0727c5b858f1b9ddfc3ee32a3cb72b6abb8a008" => :catalina sha256 "56ddf8fef92fcc1ec039a0cdd2bd5c7b748e11b34fdcc265af0a20094cd99309" => :mojave sha256 "3f77c12ae326c81ad64a5a1cdba22822abc551aaaa3bdc19338e706f7d40224b" => :high_sierra + sha256 "f8c8da962e5e3526c2da0c064114d40ee32fd70991cfdadc98fa0f105fb1cc6c" => :x86_64_linux end depends_on "docbook-xsl" => :build depends_on "gettext" + uses_from_macos "libxslt" uses_from_macos "perl" resource "Locale::gettext" do @@ -76,6 +78,8 @@ def install ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" + inreplace "Po4aBuilder.pm", "PERL5LIB=lib", "PERL5LIB=lib:#{ENV["PERL5LIB"]}" unless OS.mac? + system "perl", "Build.PL", "--install_base", libexec system "./Build" system "./Build", "install" diff --git a/Formula/poco.rb b/Formula/poco.rb index ed8c03e0b877a..ab271c1cce8e2 100644 --- a/Formula/poco.rb +++ b/Formula/poco.rb @@ -10,6 +10,7 @@ class Poco < Formula sha256 "0755dff1346ea80aa6202ce3e8269c608960abd4bf0a4566e56075cc99364b57" => :catalina sha256 "7abccb2c17823c6dda9dee9e5918fa28ef846d8095252681c83c47bbb674f5c8" => :mojave sha256 "70cea3a570e187c3e70a8dbbe1ad2e43be1c159d0d9118c1bfc1a8cc6441e2a4" => :high_sierra + sha256 "b37b8c0ada07503592acc52c57c24c3ed52df26908b520e4e5284c30453d1101" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/pod2man.rb b/Formula/pod2man.rb index 17c7c5ad1c4e0..112755d31ff14 100644 --- a/Formula/pod2man.rb +++ b/Formula/pod2man.rb @@ -9,6 +9,7 @@ class Pod2man < Formula sha256 "3befc44e77ae00da3acfe5f42a579ebc01ce376dde402404aa5496caaa81d572" => :catalina sha256 "8ba154647a2c2e44cce5251c0172fdb85ad51a7a6fd7f738dfcad9c30de1214d" => :mojave sha256 "bdff3cadfd2c7a5b017c82501b21c69865ce352d0044daafa07c294fac0865e6" => :high_sierra + sha256 "cdc87f8cf7851a4170e0c3a6421f7c780f9c5ed18c7fac10d994165824faff65" => :x86_64_linux end keg_only :provided_by_macos diff --git a/Formula/podiff.rb b/Formula/podiff.rb index 1387fc6e4e8fb..49121605850b5 100644 --- a/Formula/podiff.rb +++ b/Formula/podiff.rb @@ -13,6 +13,7 @@ class Podiff < Formula sha256 "24f385afff1c9074d995cd1374c005e8770a80ef11b06058f6024eee67a9de69" => :el_capitan sha256 "21cc248bf36ce685061e234f57c6fc5cbe0d207b201e7a8e485ee7b71d3d21c6" => :yosemite sha256 "c3a3b66344303ad473d8c6808eb9e2a2124bb0a801536870b739beba4de3d5ae" => :mavericks + sha256 "cce3e54a70334a0804fe4be7800efd8ac9b713a73227f7ce6f8876b6626448d0" => :x86_64_linux end def install diff --git a/Formula/podofo.rb b/Formula/podofo.rb index fd0021de1800b..bfb39ff7f7285 100644 --- a/Formula/podofo.rb +++ b/Formula/podofo.rb @@ -11,6 +11,7 @@ class Podofo < Formula sha256 "2ad60f4e4acd3fa9d1da1dcfeb7381696f126915bbea881d4bec9bb2cfd4fbab" => :mojave sha256 "00db9c24295276fa24909d417f2790105bccc990c23f80ffa906210ab70e5af8" => :high_sierra sha256 "30d51bd12657b4fe2defbe157c8dfea4c804318f13fa1f15011ebefaa7dec016" => :sierra + sha256 "600d1862685cb5aa3a377056cef99e1890d7e0a9244d2c66767b4cd8f347974d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/pokerstove.rb b/Formula/pokerstove.rb index 4f826b41c53ad..ca370710ccee1 100644 --- a/Formula/pokerstove.rb +++ b/Formula/pokerstove.rb @@ -10,6 +10,7 @@ class Pokerstove < Formula sha256 "60f469d6ec2b39eac5d801c7968f56b21ddd0464ebc074964f6dacb4cd151b74" => :mojave sha256 "49b7d8bcd4c54b42dbd311f94dcfb71ff04d3a1e273ecda213baaa562ad9b02b" => :high_sierra sha256 "c78b16c6cfd9981df7ba66dd367f3b25181350d317e0ec00704a3b837383a8e8" => :sierra + sha256 "887aaec60c630d764e42d96fc4517e8cd60c01529f0372317b31d794ab6bc426" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/polyglot.rb b/Formula/polyglot.rb index f0b0e973b9712..1325bea198d4d 100644 --- a/Formula/polyglot.rb +++ b/Formula/polyglot.rb @@ -13,6 +13,7 @@ class Polyglot < Formula sha256 "de7a79cd7b59fb412b245a50c601ec0546da345f5901b2bec260fba86fc27ce9" => :sierra sha256 "36d5170db384175c1f6f097f6d179243d265c3a06dcf34a11266cbd370be5aad" => :el_capitan sha256 "eff91a02101ab40e05f3479100120da2f54b1a9832cea957a054ed92872748a8" => :yosemite + sha256 "787891537bf894799cc6b31a0e3950ac21118c94b699528474fcfcb33b5501a7" => :x86_64_linux end def install diff --git a/Formula/polyml.rb b/Formula/polyml.rb index 7739cfbb660d8..cfdf85e8c5f01 100644 --- a/Formula/polyml.rb +++ b/Formula/polyml.rb @@ -10,13 +10,7 @@ class Polyml < Formula sha256 "1439f4258d7fa8adfab0b037ae43c5effaffd9b1c7793c05f73a0f130b65d403" => :catalina sha256 "356373c5c6483a552164e3aa815076688f37e41d74f8350a52321205f5d4547d" => :mojave sha256 "d69da52fe77cd77d079de8ba2b389ced34800cebf55202d023c6800d584a5212" => :high_sierra - end - - # Patch for Xcode 11 - # https://github.com/polyml/polyml/pull/119 - patch do - url "https://github.com/polyml/polyml/commit/44efa473.diff?full_index=1" - sha256 "0835165da3f0b540c13e06d79dfdc4bcbcc4cde17207ea2e02978582552ee4d0" + sha256 "1cd4c95878ee8cab396f2aa2521f80757318d1a50f5ad9acb23c52ee22499c62" => :x86_64_linux end def install diff --git a/Formula/pony-stable.rb b/Formula/pony-stable.rb index 2c6652c809162..0ca4911b1b6ff 100644 --- a/Formula/pony-stable.rb +++ b/Formula/pony-stable.rb @@ -10,6 +10,7 @@ class PonyStable < Formula sha256 "1375ab1923d90e07e05071bad1effb66aef547bd6d9fd98a40afbdb65596471e" => :catalina sha256 "1375ab1923d90e07e05071bad1effb66aef547bd6d9fd98a40afbdb65596471e" => :mojave sha256 "caf0c823ba581ab0e669d0372c06d1cb74262f05334814a5f49370659aa030d1" => :high_sierra + sha256 "a9fbfdd5f7ff7790718cd2c246a1e98a014ef6cdb03251b598f2df75769b9d6b" => :x86_64_linux end depends_on "ponyc" diff --git a/Formula/ponyc.rb b/Formula/ponyc.rb index 4ff71aff46f3b..a79295b379fff 100644 --- a/Formula/ponyc.rb +++ b/Formula/ponyc.rb @@ -6,17 +6,23 @@ class Ponyc < Formula :revision => "579475721b14487e225e57a64ecd44781d244b33" bottle do - cellar :any_skip_relocation sha256 "398704cb374f8197b391d1abe79f6937b47907ac79bff429c3c7c5436b7baf82" => :catalina sha256 "32a740aba344f2f864dab4e95ed811ec5274a5dc0f72760bc0dc916b749d0b48" => :mojave sha256 "4bff26ba76aef06e7d0f5aee757729d7494b8c98605fc06f994ea4de0b2f99f2" => :high_sierra + sha256 "dd4feaed5bd87116d85f54c8fabb234180ed01ec30acbe72d7f26dd174e0d0d2" => :x86_64_linux end depends_on "cmake" => :build + uses_from_macos "zlib" + def install ENV.cxx11 + unless OS.mac? + inreplace "CMakeLists.txt", "PONY_COMPILER=\"${CMAKE_C_COMPILER}\"", "PONY_COMPILER=\"/usr/bin/gcc\"" + end + ENV["MAKEFLAGS"] = "build_flags=-j#{ENV.make_jobs}" system "make", "libs" system "make", "configure" diff --git a/Formula/ponysay.rb b/Formula/ponysay.rb index b03486f34c6d8..59f98fe016f55 100644 --- a/Formula/ponysay.rb +++ b/Formula/ponysay.rb @@ -20,6 +20,7 @@ class Ponysay < Formula sha256 "77e5eb82496f017ceec2250b454b536964aff0609e3ab2a4a785b9d9b62c5393" => :catalina sha256 "30dbf5ef6f9aed9feaf26557e8c954eef25102e79c4c8c020d98d25bbb737bab" => :mojave sha256 "78743696032607c87bd59c95f765d6e10f2758be4b152728ae3b9ddbfb16e5cd" => :high_sierra + sha256 "a822b44c910cd1d97c15862430efa314cbc23396e52f7c89894b023053393a60" => :x86_64_linux end depends_on "gzip" => :build diff --git a/Formula/poppler.rb b/Formula/poppler.rb index c5f5a4d415618..c1448906b002c 100644 --- a/Formula/poppler.rb +++ b/Formula/poppler.rb @@ -61,16 +61,18 @@ def install system "make", "install", "prefix=#{prefix}" end - libpoppler = (lib/"libpoppler.dylib").readlink - [ - "#{lib}/libpoppler-cpp.dylib", - "#{lib}/libpoppler-glib.dylib", - "#{lib}/libpoppler-qt5.dylib", - *Dir["#{bin}/*"], - ].each do |f| - macho = MachO.open(f) - macho.change_dylib("@rpath/#{libpoppler}", "#{lib}/#{libpoppler}") - macho.write! + if OS.mac? + libpoppler = (lib/"libpoppler.dylib").readlink + [ + "#{lib}/libpoppler-cpp.dylib", + "#{lib}/libpoppler-glib.dylib", + "#{lib}/libpoppler-qt5.dylib", + *Dir["#{bin}/*"], + ].each do |f| + macho = MachO.open(f) + macho.change_dylib("@rpath/#{libpoppler}", "#{lib}/#{libpoppler}") + macho.write! + end end end diff --git a/Formula/popt.rb b/Formula/popt.rb index 7a766f14545b6..75b6c728b90c2 100644 --- a/Formula/popt.rb +++ b/Formula/popt.rb @@ -9,6 +9,7 @@ class Popt < Formula sha256 "a5cbf26e1779c73865c7785adc163117465d321338aa6970dd4980cff4a2ec91" => :catalina sha256 "5d602602f195811a3ea8c29ce4540cca6e1f36890a08b5a262facf3f74a85cf1" => :mojave sha256 "554ba881a515b18e53d1abd7f67a544af42d811ea14283e75b13ae5fc2056024" => :high_sierra + sha256 "572169bc1fc0bf9c89187593ff800782bb3f746eb6bfb3607806bc4f23a864f9" => :x86_64_linux end def install diff --git a/Formula/portaudio.rb b/Formula/portaudio.rb index b4242dd08496f..0de66d9f57d19 100644 --- a/Formula/portaudio.rb +++ b/Formula/portaudio.rb @@ -15,6 +15,7 @@ class Portaudio < Formula sha256 "4fb62387583b02607e013f376c02b4a1f6c2a2fa9b68ee43e79c9c04d12f9a45" => :sierra sha256 "96afa37e0de1723e4fa206360f189ed0486ecd74a5554dcab75eb47395be78db" => :el_capitan sha256 "64b21e55c28066264ee09918c045b77c0b1049a19f8df4636283ce17b1d84944" => :yosemite + sha256 "175fc4af5ca40580379232e32c825155049bd3dd6766ff84830ac2fadfc79da9" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/posh.rb b/Formula/posh.rb index 7702b83847ae4..79d0953bdb815 100644 --- a/Formula/posh.rb +++ b/Formula/posh.rb @@ -9,6 +9,7 @@ class Posh < Formula sha256 "9a30988f801e9c31ad6fefd48a232a5c95990300eb396a4c32a991176f8350b6" => :catalina sha256 "20157fe0e9ff5389d07f85079a3137112cd6ad5bff5081d247e8778a082281c8" => :mojave sha256 "bfee90257c267d2bd68ec3501887901179f4464d3e6d5b9afb42580ef1db4677" => :high_sierra + sha256 "ea130ddbdedb8a054c9ab270dd4b0ff98cdf4efff8d62f9f90e4792e9252c8b1" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/poster.rb b/Formula/poster.rb index d521dbd217679..0e9b24a487750 100644 --- a/Formula/poster.rb +++ b/Formula/poster.rb @@ -13,6 +13,7 @@ class Poster < Formula sha256 "07702fc6f1d43a3875637f8ff9d3509d6eb913abda301c24c23d824a76a858b6" => :el_capitan sha256 "718131fa123a69d0db610d95722d968fbda597da2477abe520146393ff0321c2" => :yosemite sha256 "5c109f3122d33b73aecbb3a7e5aaeece5c9e9d3be8aae9c6e39001b6a5feea4e" => :mavericks + sha256 "4deee4e40fde821451f8b9608620d05cf589dd5d26198b3e9ad55e86f9e7848d" => :x86_64_linux end def install diff --git a/Formula/postgresql.rb b/Formula/postgresql.rb index 78caaf5ad3529..efcb0daf7a331 100644 --- a/Formula/postgresql.rb +++ b/Formula/postgresql.rb @@ -3,22 +3,21 @@ class Postgresql < Formula homepage "https://www.postgresql.org/" url "https://ftp.postgresql.org/pub/source/v12.3/postgresql-12.3.tar.bz2" sha256 "94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41" - revision 4 + revision OS.mac? ? 4: 5 head "https://github.com/postgres/postgres.git" bottle do sha256 "069912aa3d10ecb548eb2dddd7e3e1be61d1689d236b5993bce3e1a31811bcd0" => :catalina sha256 "06eb65f3f17b6bf08344cbae35adc295f5c6da22420ee81d1e8fe2787e05a03b" => :mojave sha256 "93e3b484a26931374ece4ee4f5abd4b3eac0a6e519d2fba696871f2342f0e513" => :high_sierra + sha256 "0421eacedbb428cfa87cbbfd5dbdac318eea71d8a3e0fb4aab05b5e1a646e5a4" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "icu4c" - # GSSAPI provided by Kerberos.framework crashes when forked. # See https://github.com/Homebrew/homebrew-core/issues/47494. depends_on "krb5" - depends_on "openssl@1.1" depends_on "readline" @@ -43,18 +42,22 @@ def install --sysconfdir=#{etc} --docdir=#{doc} --enable-thread-safety - --with-bonjour - --with-gssapi --with-icu - --with-ldap --with-libxml --with-libxslt --with-openssl - --with-pam --with-perl - --with-tcl --with-uuid=e2fs ] + if OS.mac? + args += %w[ + --with-bonjour + --with-gssapi + --with-ldap + --with-pam + --with-tcl + ] + end # PostgreSQL by default uses xcodebuild internally to determine this, # which does not work on CLT-only installs. @@ -69,6 +72,12 @@ def install "pkgincludedir=#{include}/postgresql", "includedir_server=#{include}/postgresql/server", "includedir_internal=#{include}/postgresql/internal" + + unless OS.mac? + inreplace lib/"postgresql/pgxs/src/Makefile.global", + "LD = #{HOMEBREW_PREFIX}/Homebrew/Library/Homebrew/shims/linux/super/ld", + "LD = #{HOMEBREW_PREFIX}/bin/ld" + end end def post_install @@ -76,7 +85,7 @@ def post_install (var/"log").mkpath (var/"postgres").mkpath - unless File.exist? "#{var}/postgres/PG_VERSION" + if !Process.euid.zero? && !(File.exist? "#{var}/postgres/PG_VERSION") system "#{bin}/initdb", "--locale=C", "-E", "UTF-8", "#{var}/postgres" end end diff --git a/Formula/postgresql@10.rb b/Formula/postgresql@10.rb index 6ff26567208bc..0dc7f58b8d353 100644 --- a/Formula/postgresql@10.rb +++ b/Formula/postgresql@10.rb @@ -3,12 +3,13 @@ class PostgresqlAT10 < Formula homepage "https://www.postgresql.org/" url "https://ftp.postgresql.org/pub/source/v10.13/postgresql-10.13.tar.bz2" sha256 "4d701f450cd92ffb123cf6c296e9656abbc2ab7ea6507894ff1e2475ae0754e1" - revision 3 + revision OS.mac? ? 3 : 4 bottle do sha256 "c812a9a2c22c61cbf408572a1a038ae5bac1c745eba15df0b0edf93543844813" => :catalina sha256 "e4eb27c6604afda16097707ece291b7e4ce15d55f20e489c3a9d7e7d9bcc14da" => :mojave sha256 "63157238b665f29e47a1a27aab8d707279d0d8dda4a60540c57ff804ec5c7a2f" => :high_sierra + sha256 "86fb6918a59501d6ee140370a7f8bef71ffbd2609eb48d6368b7f2f16acbd1d5" => :x86_64_linux end keg_only :versioned_formula @@ -37,18 +38,22 @@ def install --sysconfdir=#{etc} --docdir=#{doc} --enable-thread-safety - --with-bonjour - --with-gssapi --with-icu - --with-ldap --with-libxml --with-libxslt --with-openssl - --with-pam --with-perl - --with-tcl --with-uuid=e2fs ] + if OS.mac? + args += %w[ + --with-bonjour + --with-gssapi + --with-ldap + --with-pam + --with-tcl + ] + end # PostgreSQL by default uses xcodebuild internally to determine this, # which does not work on CLT-only installs. @@ -75,6 +80,12 @@ def install else system "make", "install-world", *dirs end + + unless OS.mac? + inreplace lib/"pgxs/src/Makefile.global", + "LD = #{HOMEBREW_PREFIX}/Homebrew/Library/Homebrew/shims/linux/super/ld", + "LD = #{HOMEBREW_PREFIX}/bin/ld" + end end def post_install diff --git a/Formula/postgresql@11.rb b/Formula/postgresql@11.rb index fdf3eaa94dc11..ccf74ed80a898 100644 --- a/Formula/postgresql@11.rb +++ b/Formula/postgresql@11.rb @@ -3,12 +3,13 @@ class PostgresqlAT11 < Formula homepage "https://www.postgresql.org/" url "https://ftp.postgresql.org/pub/source/v11.8/postgresql-11.8.tar.bz2" sha256 "eaf2f4329ccc349c89e950761b81daf8c99bb8966abcab5665ccd6ee95c77ae2" - revision 3 + revision OS.mac? ? 3 : 4 bottle do sha256 "420e0588a9c7d13bd60dbd14cd825e3ab94e8190aceae83a326469c2069eccff" => :catalina sha256 "0f53a997e555a3dd79d58494b0b5d5e11d0d01bb20db2084d544cc750125ab2b" => :mojave sha256 "2e37db63328194a9445083afbbd2e6ef22535bd6b15ba4514ee231b75e5a74f0" => :high_sierra + sha256 "34dc0ba65a0c87f119ab808b07b3def560ed917c18d0c10e240b124c0347acf0" => :x86_64_linux end keg_only :versioned_formula @@ -39,18 +40,22 @@ def install --sysconfdir=#{etc} --docdir=#{doc} --enable-thread-safety - --with-bonjour - --with-gssapi --with-icu - --with-ldap --with-libxml --with-libxslt --with-openssl - --with-pam --with-perl - --with-tcl --with-uuid=e2fs ] + if OS.mac? + args += %w[ + --with-bonjour + --with-gssapi + --with-ldap + --with-pam + --with-tcl + ] + end # PostgreSQL by default uses xcodebuild internally to determine this, # which does not work on CLT-only installs. @@ -65,6 +70,12 @@ def install "pkgincludedir=#{include}", "includedir_server=#{include}/server", "includedir_internal=#{include}/internal" + + unless OS.mac? + inreplace lib/"pgxs/src/Makefile.global", + "LD = #{HOMEBREW_PREFIX}/Homebrew/Library/Homebrew/shims/linux/super/ld", + "LD = #{HOMEBREW_PREFIX}/bin/ld" + end end def post_install @@ -72,7 +83,7 @@ def post_install (var/"log").mkpath (var/name).mkpath - unless File.exist? "#{var}/#{name}/PG_VERSION" + if !Process.euid.zero? && !(File.exist? "#{var}/#{name}/PG_VERSION") system "#{bin}/initdb", "--locale=C", "-E", "UTF-8", "#{var}/#{name}" end end diff --git a/Formula/postgresql@9.4.rb b/Formula/postgresql@9.4.rb index cc0ea18c2c1b2..8c610140f5e88 100644 --- a/Formula/postgresql@9.4.rb +++ b/Formula/postgresql@9.4.rb @@ -9,6 +9,7 @@ class PostgresqlAT94 < Formula sha256 "86d9c75e0454e8285764827fb24b96dc0cc75e07dfe7bb808fa3682629467aa6" => :catalina sha256 "e90c1fd44cd76e40b5326fe7692466c4e21e2380e9856dea816ad8fc1a89ee5c" => :mojave sha256 "0900dd52dda6b761f64e553274c2d3da33fefd38bfa0e06ed7e6df1636642d28" => :high_sierra + sha256 "1b7e9a7c8ac9f1081357575be8924ae7477443b62cb21243bdfe42f183012d62" => :x86_64_linux end keg_only :versioned_formula @@ -27,11 +28,11 @@ class PostgresqlAT94 < Formula def install # Fix "configure: error: readline library not found" - ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra || MacOS.version == :el_capitan + ENV["SDKROOT"] = MacOS.sdk_path if OS.mac? && (MacOS.version == :sierra || MacOS.version == :el_capitan) ENV.prepend "LDFLAGS", "-L#{Formula["openssl@1.1"].opt_lib} -L#{Formula["readline"].opt_lib}" ENV.prepend "CPPFLAGS", "-I#{Formula["openssl@1.1"].opt_include} -I#{Formula["readline"].opt_include}" - ENV.prepend "PG_SYSROOT", MacOS.sdk_path + ENV.prepend "PG_SYSROOT", MacOS.sdk_path if OS.mac? ENV.append_to_cflags "-D_XOPEN_SOURCE" args = %W[ @@ -40,21 +41,18 @@ def install --datadir=#{pkgshare} --docdir=#{doc} --enable-thread-safety - --with-bonjour - --with-gssapi - --with-ldap --with-openssl - --with-pam --with-libxml --with-libxslt --with-perl --with-uuid=e2fs ] - - # The CLT is required to build tcl support on 10.7 and 10.8 because tclConfig.sh is not part of the SDK - args << "--with-tcl" - if File.exist?("#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework/tclConfig.sh") - args << "--with-tclconfig=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework" + if OS.mac? + # The CLT is required to build tcl support on 10.7 and 10.8 because tclConfig.sh is not part of the SDK + args << "--with-tcl" + if File.exist?("#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework/tclConfig.sh") + args << "--with-tclconfig=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework" + end end system "./configure", *args diff --git a/Formula/postgresql@9.5.rb b/Formula/postgresql@9.5.rb index 48290d5d24d25..c27f2d545a814 100644 --- a/Formula/postgresql@9.5.rb +++ b/Formula/postgresql@9.5.rb @@ -3,12 +3,13 @@ class PostgresqlAT95 < Formula homepage "https://www.postgresql.org/" url "https://ftp.postgresql.org/pub/source/v9.5.22/postgresql-9.5.22.tar.bz2" sha256 "48555470a17248cb204d25ab1ad4231ef16295db55161922f006b9942d69640f" - revision 2 + revision OS.mac? ? 2 : 3 bottle do sha256 "33a794b7202e738223650d25749061b779dba8a88f34078ed2d966635605d234" => :catalina sha256 "192a8daaddd008b006953bec273ae12e4c0238c4c0b34ec9f7008e15654234d3" => :mojave sha256 "5948803273679d81c357096eabca041fbbaaf7689b5caba8d7b2b745434750a9" => :high_sierra + sha256 "f920cc7b5e9b055a98021202b99d985b5a20dcafca53e200f3c3f1199f685814" => :x86_64_linux end keg_only :versioned_formula @@ -38,17 +39,21 @@ def install --sysconfdir=#{prefix}/etc --docdir=#{doc} --enable-thread-safety - --with-bonjour - --with-gssapi - --with-ldap --with-libxml --with-libxslt --with-openssl - --with-pam --with-perl - --with-tcl --with-uuid=e2fs ] + if OS.mac? + args += %w[ + --with-bonjour + --with-gssapi + --with-ldap + --with-pam + --with-tcl + ] + end # PostgreSQL by default uses xcodebuild internally to determine this, # which does not work on CLT-only installs. @@ -74,6 +79,12 @@ def install else system "make", "install-world", *dirs end + + unless OS.mac? + inreplace lib/"pgxs/src/Makefile.global", + "LD = #{HOMEBREW_PREFIX}/Homebrew/Library/Homebrew/shims/linux/super/ld", + "LD = #{HOMEBREW_PREFIX}/bin/ld" + end end def post_install diff --git a/Formula/postgresql@9.6.rb b/Formula/postgresql@9.6.rb index ff4feef8f9d44..8efb8a9db238a 100644 --- a/Formula/postgresql@9.6.rb +++ b/Formula/postgresql@9.6.rb @@ -3,12 +3,13 @@ class PostgresqlAT96 < Formula homepage "https://www.postgresql.org/" url "https://ftp.postgresql.org/pub/source/v9.6.18/postgresql-9.6.18.tar.bz2" sha256 "517ec282b785e6d22f360c30ba0c5e2a506fca5ca07dcc545427511d94c89999" - revision 2 + revision OS.mac? ? 2 : 3 bottle do sha256 "bb2dcc5e902d8a008ee4910b649859c9a1c36c379984fd154993f815845456b3" => :catalina sha256 "1f8222b21e01eb165b53c1a1cfdfbef3fdb669078ec4104294d4816da5ab5fda" => :mojave sha256 "10253285381fec67b3329251271a72e7d6011b6f622ad645b85b39a74a800ab8" => :high_sierra + sha256 "9571d0832cda1e0d5554a0653849e50820985a3467bc09e9971865e48842c2fa" => :x86_64_linux end keg_only :versioned_formula @@ -38,17 +39,21 @@ def install --sysconfdir=#{prefix}/etc --docdir=#{doc} --enable-thread-safety - --with-bonjour - --with-gssapi - --with-ldap --with-openssl - --with-pam --with-libxml --with-libxslt --with-perl - --with-tcl --with-uuid=e2fs ] + if OS.mac? + args += %w[ + --with-bonjour + --with-gssapi + --with-ldap + --with-pam + --with-tcl + ] + end # PostgreSQL by default uses xcodebuild internally to determine this, # which does not work on CLT-only installs. @@ -74,6 +79,12 @@ def install else system "make", "install-world", *dirs end + + unless OS.mac? + inreplace lib/"pgxs/src/Makefile.global", + "LD = #{HOMEBREW_PREFIX}/Homebrew/Library/Homebrew/shims/linux/super/ld", + "LD = #{HOMEBREW_PREFIX}/bin/ld" + end end def post_install diff --git a/Formula/postgrest.rb b/Formula/postgrest.rb index c5d3eeddfdcc6..0a4a35822a766 100644 --- a/Formula/postgrest.rb +++ b/Formula/postgrest.rb @@ -6,10 +6,10 @@ class Postgrest < Formula head "https://github.com/PostgREST/postgrest.git" bottle do - cellar :any sha256 "691546e89701fd582d47c697dc27551ef3284ee21933a5912f406e6fee4dd272" => :catalina sha256 "34c0413e71a41bc8550b7ea5286e0330aa888990d2e2a8fe6d81b57152c83d61" => :mojave sha256 "6ca3bb9cd14c9ab4ddd028493e4ffd70ddae571be74723997b677c6c67542c87" => :high_sierra + sha256 "eebd15397089be906915d5839a5e1b115f41c78f440158c92826f5d9a3c82765" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/postmark.rb b/Formula/postmark.rb index 9958d5b1cd6ba..9221aaee0f89e 100644 --- a/Formula/postmark.rb +++ b/Formula/postmark.rb @@ -13,6 +13,7 @@ class Postmark < Formula sha256 "784b46fe9883d27d347a44da73413ccf5c589088c0b57da577ebc1c79e64e1e6" => :el_capitan sha256 "7fb38c3960e124a836cdc48650fd5f4d1fc446897b590e0dd6b6b6b5cbdec522" => :yosemite sha256 "2ccb3812b371bc02e66d84ff853cb9684f8941485af3287424b4c183205bc649" => :mavericks + sha256 "1d7eb15c6a01d8bb40efdaeb2b228b8b7f6f816988d06a640d0dfaba97ffc925" => :x86_64_linux end def install diff --git a/Formula/povray.rb b/Formula/povray.rb index bb20e92b36647..5a5a9420390ba 100644 --- a/Formula/povray.rb +++ b/Formula/povray.rb @@ -12,6 +12,7 @@ class Povray < Formula sha256 "4472bb00380eb26d3045dd5e67effa4f75934936263129009f9a80bbf5290633" => :high_sierra sha256 "f21cb29c30c8367aa14f6a4485bf03377f23e30b2e7178be466d12bb84be26a9" => :sierra sha256 "f2f0bf20fbe2d5b1ce91ecdf4eca52e4a544323910febae396d8b9fb1c0044ec" => :el_capitan + sha256 "729ef80a9f3e052c897785ca83ad7ac199f59d9c096e3f1432e6a7cc957f715a" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/pow.rb b/Formula/pow.rb index 2679f14e2aff8..7c087ad9a9f4d 100644 --- a/Formula/pow.rb +++ b/Formula/pow.rb @@ -6,6 +6,9 @@ class Pow < Formula bottle :unneeded + # Linux is not supported and the DNS handling rules only work on macOS + # see https://github.com/basecamp/pow/wiki/FAQ#is-linux-supported + depends_on :macos depends_on "node" def install diff --git a/Formula/powerline-go.rb b/Formula/powerline-go.rb index 7f9796bb7ab68..320a9f50f637e 100644 --- a/Formula/powerline-go.rb +++ b/Formula/powerline-go.rb @@ -9,6 +9,7 @@ class PowerlineGo < Formula sha256 "85b3fb674ef3946a25e14c89239effff331e6fd9de986932537066d42e62072f" => :catalina sha256 "789998f2e911d299619dc48ef5065daa6c376ac79ecae129c7fa34bd1b5b95e8" => :mojave sha256 "48fb69d4fc789942392ee92d5c284c819cd02d50d101739f30a8f2a2506f16af" => :high_sierra + sha256 "ea7008072e3bffa347cc1fef4e3a3a1a65bcef8eb1ea978b2f52cce32245ef21" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/powerman.rb b/Formula/powerman.rb index 3842695035eca..9a3288909cd61 100644 --- a/Formula/powerman.rb +++ b/Formula/powerman.rb @@ -8,6 +8,7 @@ class Powerman < Formula sha256 "aaa93f0be2fa1d4092c2d06cec0b7fbcc00d4817ff2d6dc4601301a8cb3917fc" => :catalina sha256 "a2d26575a0a9816dc1f8b0b212531c8ea455a6c8322a42d5fb2630e3a2f85b1b" => :mojave sha256 "9dd898b2222ba55a6c2aeb4e4414d6eb68d9c9e19794da533b4d1bd6970e6469" => :high_sierra + sha256 "0e40b6c05cf085ebb58906d2d59cc7add2785d516b062d6dd377134539bb8397" => :x86_64_linux end head do diff --git a/Formula/ppsspp.rb b/Formula/ppsspp.rb index b82b9243aecf8..f5614713efb2c 100644 --- a/Formula/ppsspp.rb +++ b/Formula/ppsspp.rb @@ -11,6 +11,7 @@ class Ppsspp < Formula sha256 "2d105f4dee7ae29b1974fa2ebb4ce20958eba5d745205366a1c0358632990f22" => :catalina sha256 "8b2f9c147ad1253c0f78162b52b21d1566d88389ea8f8ae36f09f85a43c555ec" => :mojave sha256 "f467b15733290f1af196837f23bb8d6440ff1d79d8c178eee35fe476ec445d3e" => :high_sierra + sha256 "ead60f2b6a565c4d464167e5ee074427edd8634c7124503963ea91dabe673622" => :x86_64_linux end depends_on "cmake" => :build @@ -32,9 +33,13 @@ def install mkdir "build" do system "cmake", "..", *args system "make" - prefix.install "PPSSPPSDL.app" - bin.write_exec_script "#{prefix}/PPSSPPSDL.app/Contents/MacOS/PPSSPPSDL" - mv "#{bin}/PPSSPPSDL", "#{bin}/ppsspp" + if OS.mac? + prefix.install "PPSSPPSDL.app" + bin.write_exec_script "#{prefix}/PPSSPPSDL.app/Contents/MacOS/PPSSPPSDL" + mv "#{bin}/PPSSPPSDL", "#{bin}/ppsspp" + else + bin.install "PPSSPPSDL" => "ppsspp" + end end end end diff --git a/Formula/pqiv.rb b/Formula/pqiv.rb index 8fccb1fe93edd..b8f22f5974d4b 100644 --- a/Formula/pqiv.rb +++ b/Formula/pqiv.rb @@ -20,6 +20,7 @@ class Pqiv < Formula depends_on "libspectre" depends_on "poppler" depends_on "webp" + depends_on "libtiff" unless OS.mac? def install system "./configure", "--prefix=#{prefix}" diff --git a/Formula/pre-commit.rb b/Formula/pre-commit.rb index 77adba9e9f45f..1a484001b3c06 100644 --- a/Formula/pre-commit.rb +++ b/Formula/pre-commit.rb @@ -7,10 +7,11 @@ class PreCommit < Formula sha256 "91705d4ba683e707785683d4a0a02d2b6f1678529e49f6b8a5ca0f89e2a42af7" bottle do - cellar :any + cellar :any_skip_relocation sha256 "93058a2fa48812d5f9b3ff0fa394db5f409da24dc6e07e194be23a6135588fdd" => :catalina sha256 "6bac723478fd07a6cb12f79cc19a93679a84cd13c21dc16d56a1a1a70c842600" => :mojave sha256 "b54af2a9f3c3136b29f79f727d28eec3016829bdef0c707bf8f75386a356f3cd" => :high_sierra + sha256 "69d530feabc09a277cf78f1029ea090b237c7f5b2e96316dabddda3207b53906" => :x86_64_linux end depends_on "libyaml" diff --git a/Formula/precomp.rb b/Formula/precomp.rb index 9cac2bf107dd5..2e2a66259e448 100644 --- a/Formula/precomp.rb +++ b/Formula/precomp.rb @@ -11,6 +11,7 @@ class Precomp < Formula sha256 "7488435759867b2bb152cdd3ea78d2358659b34ff838e2cb97b54bd3a322147b" => :mojave sha256 "92824cc03c547d276436e1bdf55e905d402f77eeccf61f25a720d4315e5bd4cf" => :high_sierra sha256 "5d852d83cf57987a521471b74e450a65473ed20e32bb14e83b5d99e969e37458" => :sierra + sha256 "3783a6f19c30eef01d0946e9a3462f7f107a82ebc5e27f9448bbd6b0d6b29528" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/premake.rb b/Formula/premake.rb index 5d7012c8110f6..3fe8057c64773 100644 --- a/Formula/premake.rb +++ b/Formula/premake.rb @@ -12,6 +12,7 @@ class Premake < Formula sha256 "cf128251e2798e7fd65919002b3adc627537c969dfaf62021ec6cd78fb7eeb12" => :catalina sha256 "b5fe3f9495148d2f374b048e72cfc3114be0195a9954d57c8c298fca568d2896" => :mojave sha256 "79e1f3b9c8ba609685ee343f2022aae2fb02cacecc84e44d817014fe7d3dabfc" => :high_sierra + sha256 "4bc7cbf6374aa17a3f1635e706af61bf863102ec33562b9f0d6a65d1e1fc66be" => :x86_64_linux end # See: https://groups.google.com/g/premake-development/c/i1uA1Wk6zYM/m/kbp9q4Awu70J @@ -23,7 +24,7 @@ def install system "./premake5", "gmake" end - system "make", "-C", "build/gmake.macosx" + system "make", "-C", "build/gmake.#{OS.mac? ? "macosx" : "unix"}" if build.head? bin.install "bin/release/premake5" diff --git a/Formula/prest.rb b/Formula/prest.rb index 1411de61fa04e..34a7d20e1747c 100644 --- a/Formula/prest.rb +++ b/Formula/prest.rb @@ -11,6 +11,7 @@ class Prest < Formula sha256 "6a79ee6fc88b5a450348d977b8adf0d14c80aa5ba0bbd22375d1795cf3d8e070" => :high_sierra sha256 "3b6a51b5a9c9ee58510fd70416dc8953f037e3575a255b6171363d2364bce1be" => :sierra sha256 "e0ec971459deb768c19460db26246dcd2ea71baa34706052d0a4f572bff9606d" => :el_capitan + sha256 "1977ec1fcabd3cddb2faf3bc10ba7a1123b47f9a68555db5e35fcdabc26b6e70" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/prettier.rb b/Formula/prettier.rb index 9a1d2c68e8582..48ba5b6386b45 100644 --- a/Formula/prettier.rb +++ b/Formula/prettier.rb @@ -12,6 +12,7 @@ class Prettier < Formula sha256 "b1e20fc9be32da04ea3a5d5dbb4153a4589689a2ec5c1a696b0ae01d4c77422b" => :catalina sha256 "527a6b93bded9ee87b89d8fbb9b9116fcb5e93924e85189630754acf48565efa" => :mojave sha256 "26a0d0f1879743b66781123895941cb849b38a636be3213dd0dd2ed0b2685250" => :high_sierra + sha256 "0f4eaa48d1297a3fab915f5f12100e5a03b2a8018ec387cd2544780ee9050545" => :x86_64_linux end depends_on "node" diff --git a/Formula/primer3.rb b/Formula/primer3.rb index 74faddabb4006..ed443e9211d95 100644 --- a/Formula/primer3.rb +++ b/Formula/primer3.rb @@ -11,6 +11,7 @@ class Primer3 < Formula sha256 "f72fac01bb380b5ea55b41249b2d6bc2f799e9cb7cef55fae0a1f92e1de7ba64" => :high_sierra sha256 "0337aa96c5d5f25caa15177236c5f5d269adaaad01cb63a77c933eb01f7a6ed0" => :sierra sha256 "45ca3618888becc12b4d6be0ab9957ba5c8fdf2e818f74dc5312900c641b06c9" => :el_capitan + sha256 "c123e1e1b0e272e38d44f8afc734f0b61a657d2c5774c046d65f39552ee10042" => :x86_64_linux end def install diff --git a/Formula/primesieve.rb b/Formula/primesieve.rb index b93ae72c8046a..ec9feadb4d39a 100644 --- a/Formula/primesieve.rb +++ b/Formula/primesieve.rb @@ -9,6 +9,7 @@ class Primesieve < Formula sha256 "93a49e499f6cca69e9bc62e64e3bbf51fd9c8ab3c51e6ba15b6a1ab3feb4d2e8" => :catalina sha256 "7070ec9a601335d1844820e722c346b9d7003ce80af4450f631521a023c291bc" => :mojave sha256 "46185fc5980d6e411f4073ea330735498d918bb25dc65cb90909bb41749e8756" => :high_sierra + sha256 "22225df25a7edd0472168ddcdef2ffbf16a8f8c225964898909be1d98cac67c5" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/prips.rb b/Formula/prips.rb index 3bf3b196b881b..8b0dbb5ae2f65 100644 --- a/Formula/prips.rb +++ b/Formula/prips.rb @@ -10,6 +10,7 @@ class Prips < Formula sha256 "771e030cbbf61a7914af375462d24bc2fccb6e60e8959110906e23544aacbb17" => :mojave sha256 "ecf0f743bfaffc303c8f520f5f29f10917b63708866fc50553c10f6952c5e06e" => :high_sierra sha256 "65a400f8d42e7c38cbc26898dadf3110b0aad7e347ba40585f398d4bcc696d04" => :sierra + sha256 "19565969341e072d19968e0dbb9405f278bd774bdeb66f3a074e7bfde9195eaf" => :x86_64_linux end def install diff --git a/Formula/procmail.rb b/Formula/procmail.rb index d7c372aa7aafd..21a5c263cb112 100644 --- a/Formula/procmail.rb +++ b/Formula/procmail.rb @@ -14,6 +14,7 @@ class Procmail < Formula sha256 "3328bcda4649612afba606950e59f4cb0c22e10fe97a4f1e38f190e3e4115800" => :el_capitan sha256 "cd5a5cdfbe9d03067533df0ef3f09cc2c05bd16a9b75d2d19cd9c2d1da2986e5" => :yosemite sha256 "9e476567851a38caedbbb894afb83d3f5575bb494aaab296f884387feca9bf54" => :mavericks + sha256 "1304e36e6f63857224753a1bc2430fb79a530cabe875d82805caf1c024419d95" => :x86_64_linux end def install diff --git a/Formula/procps.rb b/Formula/procps.rb new file mode 100644 index 0000000000000..3ec7685da4d87 --- /dev/null +++ b/Formula/procps.rb @@ -0,0 +1,37 @@ +class Procps < Formula + desc "Utilities for browsing procfs" + homepage "https://gitlab.com/procps-ng/procps" + url "https://gitlab.com/procps-ng/procps/repository/archive.tar.gz?ref=v3.3.16" + sha256 "25eb11aefe6ecf3b4932e04d79b609bb0b9f735f31e15ddce86fcc9040ee48d1" + head "https://gitlab.com/procps-ng/procps.git" + + bottle do + sha256 "6a7a75292f1866a0e44e96bfe27325f1196f38a821325b74d400b3ae4279e5b7" => :x86_64_linux + end + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "gettext" => :build + depends_on "libtool" => :build + depends_on "pkg-config" => :build + depends_on :linux + depends_on "ncurses" + + def install + system "./autogen.sh" + system "./configure", + "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + + # kill and uptime are also provided by coreutils + rm [bin/"kill", bin/"uptime", man1/"kill.1", man1/"uptime.1"] + end + + test do + system "#{bin}/ps", "--version" + system "#{bin}/ps" + end +end diff --git a/Formula/procs.rb b/Formula/procs.rb index 9e08bb36f5312..522cd49d3883b 100644 --- a/Formula/procs.rb +++ b/Formula/procs.rb @@ -9,6 +9,7 @@ class Procs < Formula sha256 "e4d64cc107a0b3c5a897655778eb3a1b10a30e2ed065c57c8f7e566ad75eccfb" => :catalina sha256 "4885c058e98ae2a7a7bca686fb6ba1b9a14e760b4bcf4bd4aace931088b382a8" => :mojave sha256 "88010001010a5d2b4e30a5e3adf5ba4e75e72d4ccb7bf8da78c326e09e928d4f" => :high_sierra + sha256 "5685afaba6401d5d7853d1114e48965e1e18bb029f7608dfb920741c0df16af8" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/prodigal.rb b/Formula/prodigal.rb index c360f3705b976..a282614aef711 100644 --- a/Formula/prodigal.rb +++ b/Formula/prodigal.rb @@ -3,6 +3,7 @@ class Prodigal < Formula homepage "https://github.com/hyattpd/Prodigal" url "https://github.com/hyattpd/Prodigal/archive/v2.6.3.tar.gz" sha256 "89094ad4bff5a8a8732d899f31cec350f5a4c27bcbdd12663f87c9d1f0ec599f" + revision 1 bottle do cellar :any_skip_relocation @@ -11,8 +12,19 @@ class Prodigal < Formula sha256 "c120fed8e29bb3b1a4ff69d5ca05e051a0fe3822784b3d585e142da3452d1ac1" => :high_sierra sha256 "a27fe5316181d4826e5aa5291d0fc1b1a7087c32c7b4e6aedabf1209d5a8ac36" => :sierra sha256 "70b432e3d3da1f4089680b06c0745b7dac3611f05d8ec9440faa918bc82d6fe5" => :el_capitan + sha256 "226fe9c5d5b64136ac89da1e34aa4cb9a41226d37e94eeb1f30096d10135e5c9" => :x86_64_linux end + # Prodigal will have incorrect output if compiled with certain compilers. + # This will be fixed in the next release. Also see: + # https://github.com/hyattpd/Prodigal/issues/34 + # https://github.com/hyattpd/Prodigal/issues/41 + unless OS.mac? + patch do + url "https://github.com/hyattpd/Prodigal/pull/35.patch?full_index=1" + sha256 "fd292c0a98412a7f2ed06d86e0e3f96a9ad698f6772990321ad56985323b99a6" + end + end def install system "make", "install", "INSTALLDIR=#{bin}" end diff --git a/Formula/profanity.rb b/Formula/profanity.rb index a5e06d28dcd81..7ebba2f763be0 100644 --- a/Formula/profanity.rb +++ b/Formula/profanity.rb @@ -8,6 +8,7 @@ class Profanity < Formula sha256 "89025daa50333c84810735579f831819c09a6e0043573fbcf82e13d150615ed8" => :catalina sha256 "c4bda058ebb6568e26d0919b9ee559d00b9aa5de98c895244cf8865500dd835b" => :mojave sha256 "9ef87a8a9fc4ea8a90c2fb669be002cb5c5f4d506dc28cb4cb799d7c671dc389" => :high_sierra + sha256 "abc98f80d203bfc6259b77dcd1df25b744ac39bbbfa60a0a0dbd7fd460144d7c" => :x86_64_linux end head do @@ -28,7 +29,7 @@ class Profanity < Formula depends_on "libstrophe" depends_on "openssl@1.1" depends_on "readline" - depends_on "terminal-notifier" + depends_on "terminal-notifier" if OS.mac? uses_from_macos "curl" diff --git a/Formula/proftpd.rb b/Formula/proftpd.rb index ff5729924d99d..93f254036f155 100644 --- a/Formula/proftpd.rb +++ b/Formula/proftpd.rb @@ -10,6 +10,7 @@ class Proftpd < Formula sha256 "64921070d5fec1b23e70f1f94083278005c3075e60064e2bb6842837a5f47f70" => :catalina sha256 "c1152fa9b77042914ba1c3d80cc365058d0c497ff817d5f3028e4b61ee7fd5aa" => :mojave sha256 "1168e663193462a081b1f19cf9813ee007b80ed22187f2b81e3c8eaa84536d42" => :high_sierra + sha256 "97df072be1d39f7af8422b41ee6be5cfb3787fc72671ed87670960ce095c7181" => :x86_64_linux end def install diff --git a/Formula/progress.rb b/Formula/progress.rb index 1ec0c750d36cf..0430790d81dad 100644 --- a/Formula/progress.rb +++ b/Formula/progress.rb @@ -10,6 +10,7 @@ class Progress < Formula sha256 "104d62681c513b6c3e7d997245768d7e2e3941ab43dc37fb67b33bb188e4acc4" => :catalina sha256 "62ea2e563eac2c9c9ad6f8eb3d5565024b2e303313c6d5cf509901893ee01d32" => :mojave sha256 "699d0712e633d357dbd853e797e94f85bee3af00f70b9e206fe6335d620b8e5c" => :high_sierra + sha256 "385ee973bc032739cdd9d64e6a6673a17e330adc855eb887eb69bc0f3cf8d970" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/proj.rb b/Formula/proj.rb index 795b0743e43bf..7635313381138 100644 --- a/Formula/proj.rb +++ b/Formula/proj.rb @@ -8,6 +8,7 @@ class Proj < Formula sha256 "fdb7d2c46930c511e8fa1b90482844fece3389133fe76975289caa5ba9dd240d" => :catalina sha256 "0e1f0612e883f22be57a0e56ed9b0e41f1eab78a6ebfd82971adb0bbdc917ee3" => :mojave sha256 "0a9e92d03a7f49742887e67d5af87a5700f5dcce76aebe52c1304e8f0b0004fc" => :high_sierra + sha256 "235f8949f550800edd40e915e19c568adcab08cddb2d009017f3127b48fdb48f" => :x86_64_linux end head do diff --git a/Formula/prometheus.rb b/Formula/prometheus.rb index cc8287876996b..23b1c770e22ba 100644 --- a/Formula/prometheus.rb +++ b/Formula/prometheus.rb @@ -9,6 +9,7 @@ class Prometheus < Formula sha256 "8f12c62113b4add31c0563a7e138c0869cb79aabbb3bb0c7c42f23124a1059d5" => :catalina sha256 "7dab6c84d32701cb3b4af3280394a5e5ad2bebd9df0cef07c506a5d4e74b68ff" => :mojave sha256 "cb394f6c68700a46fcfe83cff5fb666d1212be1e9d84e70968d626c9570bfc09" => :high_sierra + sha256 "bca7e52dfc5c0900894e2e81d87c2729bd1af87bd94c2bc199889169ab18c70a" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/proper.rb b/Formula/proper.rb index 6d24965882111..852300b1d5b43 100644 --- a/Formula/proper.rb +++ b/Formula/proper.rb @@ -10,6 +10,7 @@ class Proper < Formula sha256 "a93bfdd9a7558b9ad0cc013f3aca0cadfe86535948730ab6861c10931cae4b92" => :mojave sha256 "f9f6404b3c025d06fb1b6ab0155716fe5f59f337ac6884b92d4ac01d6677b4c7" => :high_sierra sha256 "a80e754b0bb2ce17d223034734cd1aa473532ba743cf45cbff89fa154af18220" => :sierra + sha256 "8aef0136f96be9152759585a390e225674814d8273c28a8084cb337c89ac4ee9" => :x86_64_linux end depends_on "erlang" diff --git a/Formula/proselint.rb b/Formula/proselint.rb index 0ccfe5b0b3f66..5d2f42b42380f 100644 --- a/Formula/proselint.rb +++ b/Formula/proselint.rb @@ -5,7 +5,7 @@ class Proselint < Formula homepage "http://proselint.com" url "https://files.pythonhosted.org/packages/42/ff/8e7ad0108b8faffdf2ec7d170b4a8a3c9bc91f5077debf5381ef14702588/proselint-0.10.2.tar.gz" sha256 "3a87eb393056d1bc77d898e4bcf8998f50e9ad84f7b9ff7cf2720509ac8ef904" - revision 3 + revision OS.mac? ? 3 : 4 head "https://github.com/amperser/proselint.git" bottle do @@ -13,6 +13,7 @@ class Proselint < Formula sha256 "16677bb488b626f2a5ebab9c85b52e5aa34501861aaf146dd093fdeab9c8d7af" => :catalina sha256 "2cb69c3b259812c1eeb11cc83ec7fcd5d0e6a01485a784ecdb76c75e55a5ad18" => :mojave sha256 "51b225461669feb8926219f46de1fa4c438e875e9b6b9669f9191bd883679617" => :high_sierra + sha256 "bd89e661ead0970e14a67aa149af02f9d647b5990e80e1a3e1d3df39ce078396" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/proteinortho.rb b/Formula/proteinortho.rb index 5e2d9ad2a3e96..4859c33e000c7 100644 --- a/Formula/proteinortho.rb +++ b/Formula/proteinortho.rb @@ -9,6 +9,7 @@ class Proteinortho < Formula sha256 "0fcf6e8d97c506df8f11515c1b1612011a109a4193d8e0ebe8502ccc9318f61a" => :catalina sha256 "b4c0ff1c19c7b33e6734523c0366722e3c7f58e8b432d7f62fc326d0cffa9d5a" => :mojave sha256 "ae25e2ee3f4abee2b98cf274f60715e635a301867b852ab3c8c57bcf887cd615" => :high_sierra + sha256 "7d0853f523ad9316d008e39fe10106fea7b30faa0e383cd61ae4373ea5d2d875" => :x86_64_linux end depends_on "diamond" diff --git a/Formula/protobuf-c.rb b/Formula/protobuf-c.rb index 570aa26c3de44..d39adb3739497 100644 --- a/Formula/protobuf-c.rb +++ b/Formula/protobuf-c.rb @@ -10,6 +10,7 @@ class ProtobufC < Formula sha256 "2af1cf51bac889177c41922236c9a1433749952e4bc76e7a7493bb9c96745319" => :catalina sha256 "0a8fc62ce9acd99178e21afc4a994cb762c9e13a3d3fec887a19ab0706f9acc8" => :mojave sha256 "1a66fd256c32caaff9e52748fd7f9987580b36425682d5a6263c0c0db011c405" => :high_sierra + sha256 "85c352c6a8325b5c2cd8358dc58d93aeec4077b49691f638f80e1daf7e939e6e" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/protobuf-swift.rb b/Formula/protobuf-swift.rb index ab1d2a9efdbe8..82f235261497a 100644 --- a/Formula/protobuf-swift.rb +++ b/Formula/protobuf-swift.rb @@ -10,6 +10,7 @@ class ProtobufSwift < Formula sha256 "25b96487d0f0d21de51d379e8d81e2dcc9eaf0252e779c9b340de0d089918f26" => :mojave sha256 "33f57aa9d49598a5101de975b92507964493da967b7a3738e91a64dd8a663180" => :high_sierra sha256 "42327634f717f0f9276d61af56df6a4595eea57f17d779f405703fdecae55bed" => :sierra + sha256 "25abd3ce7c7cde73ef2df3663ffb418b14a497c7028557a821e4e5e96a2daed7" => :x86_64_linux end # https://github.com/Homebrew/homebrew-core/pull/54471#issuecomment-627430555 diff --git a/Formula/protobuf.rb b/Formula/protobuf.rb index 915b3dbaaac34..715a89bdaff2b 100644 --- a/Formula/protobuf.rb +++ b/Formula/protobuf.rb @@ -7,10 +7,10 @@ class Protobuf < Formula head "https://github.com/protocolbuffers/protobuf.git" bottle do - cellar :any sha256 "3ced83651f35574357814e547e6d83356464065a40a660be13b69154e6fd98be" => :catalina sha256 "b418f7e29dfff62eca17debe37dff8574295e480dc8607ec9c8591690478cd14" => :mojave sha256 "ffc0bc6e68a6c48774854de177443ca852c107fe4e6e470486fa9d497334c28f" => :high_sierra + sha256 "f7049702947f19f414cedfb04f68aa58016fec31515ee2711b03c889944fc03a" => :x86_64_linux end depends_on "autoconf" => :build @@ -23,6 +23,12 @@ class Protobuf < Formula sha256 "30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259" end + unless OS.mac? + fails_with :gcc => "4" + fails_with :gcc => "5" + depends_on "gcc@6" + end + def install # Don't build in debug mode. See: # https://github.com/Homebrew/homebrew/issues/9279 diff --git a/Formula/protobuf@3.7.rb b/Formula/protobuf@3.7.rb index 9e0c26e3adaf2..197562527cf5b 100644 --- a/Formula/protobuf@3.7.rb +++ b/Formula/protobuf@3.7.rb @@ -11,6 +11,7 @@ class ProtobufAT37 < Formula sha256 "de40ff1011be89e49ac1baf9a973349d7ec26b3a3ae0f94defe7230d07099ca5" => :mojave sha256 "cfe4d90579043bd7b4c4844c7a0154a936aada8cf173a78725d1e574547dd290" => :high_sierra sha256 "df1240601237fe2ae9b40be83c340e7527ab0e442727e4b47afe9468eeb357a7" => :sierra + sha256 "f96e9046de4c59be4e6da9e7e42b432eaad053f2d46c9ec4704e059e40da77fe" => :x86_64_linux end keg_only :versioned_formula diff --git a/Formula/protoc-gen-go.rb b/Formula/protoc-gen-go.rb index b9f4821fa0c42..f3f81794cb55e 100644 --- a/Formula/protoc-gen-go.rb +++ b/Formula/protoc-gen-go.rb @@ -10,6 +10,7 @@ class ProtocGenGo < Formula sha256 "82ce3ce8a8e158bc9202aebfa2cfcbd5b398aeed9530614ece2d101c7e3e01fb" => :catalina sha256 "82ce3ce8a8e158bc9202aebfa2cfcbd5b398aeed9530614ece2d101c7e3e01fb" => :mojave sha256 "82ce3ce8a8e158bc9202aebfa2cfcbd5b398aeed9530614ece2d101c7e3e01fb" => :high_sierra + sha256 "2133f24af66538d7e053e92e1d246f279e885e55bd03613b9a1f74b346ae6611" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/protoc-gen-grpc-web.rb b/Formula/protoc-gen-grpc-web.rb index aa6db45d22049..8abdd50742e7b 100644 --- a/Formula/protoc-gen-grpc-web.rb +++ b/Formula/protoc-gen-grpc-web.rb @@ -11,6 +11,7 @@ class ProtocGenGrpcWeb < Formula sha256 "6f73cc972d706c31d5f5a18aad3f7a0cc8568b2804dd9c713eed59bebb69aa39" => :catalina sha256 "296f7f6501fef507feb8e54243221cfa4212c90149efa11afcbccd1ba2b417a3" => :mojave sha256 "244fbadefd710b79f73f32fa08680053833d651e8ee57c924f6913f9f06f91d0" => :high_sierra + sha256 "3e53c4c2f4ffbed7cdab9fec494d21fd0ebdfed65f2006680546957b39641a6d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/prototool.rb b/Formula/prototool.rb index 2b0a4c893e78b..bbe04886c32ab 100644 --- a/Formula/prototool.rb +++ b/Formula/prototool.rb @@ -9,6 +9,7 @@ class Prototool < Formula sha256 "e7c678d2842ce666ddfbeee1092c2354a420c9b8b94244e8db2b382f6568e536" => :catalina sha256 "256435ac965872664fc2707b8188090c2a1d369308ef2b224d53e1b972ee7620" => :mojave sha256 "373cf39c37bd40c8eb4f9261129226bf0f276771872060ea3495d6a2d56fa911" => :high_sierra + sha256 "cce2631c1f7d5320cb0a2ca0b8b61af88143a6185058d937d700a3bee0623731" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/prover9.rb b/Formula/prover9.rb index b00d1a1502353..371314867e261 100644 --- a/Formula/prover9.rb +++ b/Formula/prover9.rb @@ -10,8 +10,12 @@ class Prover9 < Formula sha256 "1f637c295f07ddf31eedf6bcc73b957584da4d55cb92c7bfea3264d6c3780d1b" => :catalina sha256 "5ae1f642fa781841fc843a548b5327cf1dfb8d8c4fbe5ea83ddffef004282d57" => :mojave sha256 "055cf6646dd19effa87d7b9fa8e820c24710a023bcefc98c35604205530ab2c3" => :high_sierra + sha256 "53992499680447c0b9c964b08b1df4af419832f4473de27e1966f9bbd052ee36" => :x86_64_linux end + # Order of parameters passed to gcc matters + patch :DATA unless OS.mac? + def install ENV.deparallelize system "make", "all" @@ -46,3 +50,41 @@ def install system bin/"mace4", "-f", testpath/"group2.in" end end +__END__ +diff --git a/provers.src/Makefile b/provers.src/Makefile +index 78c2543..9c91b4e 100644 +--- a/provers.src/Makefile ++++ b/provers.src/Makefile +@@ -63,25 +63,25 @@ prover: + $(MAKE) prover9 + + prover9: prover9.o $(OBJECTS) +- $(CC) $(CFLAGS) -lm -o prover9 prover9.o $(OBJECTS) ../ladr/libladr.a ++ $(CC) $(CFLAGS) -o prover9 prover9.o $(OBJECTS) ../ladr/libladr.a -lm + + fof-prover9: fof-prover9.o $(OBJECTS) +- $(CC) $(CFLAGS) -lm -o fof-prover9 fof-prover9.o $(OBJECTS) ../ladr/libladr.a ++ $(CC) $(CFLAGS) -o fof-prover9 fof-prover9.o $(OBJECTS) ../ladr/libladr.a -lm + + ladr_to_tptp: ladr_to_tptp.o $(OBJECTS) +- $(CC) $(CFLAGS) -lm -o ladr_to_tptp ladr_to_tptp.o $(OBJECTS) ../ladr/libladr.a ++ $(CC) $(CFLAGS) -o ladr_to_tptp ladr_to_tptp.o $(OBJECTS) ../ladr/libladr.a -lm + + tptp_to_ladr: tptp_to_ladr.o $(OBJECTS) +- $(CC) $(CFLAGS) -lm -o tptp_to_ladr tptp_to_ladr.o $(OBJECTS) ../ladr/libladr.a ++ $(CC) $(CFLAGS) -o tptp_to_ladr tptp_to_ladr.o $(OBJECTS) ../ladr/libladr.a -lm + + autosketches4: autosketches4.o $(OBJECTS) +- $(CC) $(CFLAGS) -lm -o autosketches4 autosketches4.o $(OBJECTS) ../ladr/libladr.a ++ $(CC) $(CFLAGS) -o autosketches4 autosketches4.o $(OBJECTS) ../ladr/libladr.a -lm + + newauto: newauto.o $(OBJECTS) +- $(CC) $(CFLAGS) -lm -o newauto newauto.o $(OBJECTS) ../ladr/libladr.a ++ $(CC) $(CFLAGS) -o newauto newauto.o $(OBJECTS) ../ladr/libladr.a -lm + + newsax: newsax.o $(OBJECTS) +- $(CC) $(CFLAGS) -lm -o newsax newsax.o $(OBJECTS) ../ladr/libladr.a ++ $(CC) $(CFLAGS) -o newsax newsax.o $(OBJECTS) ../ladr/libladr.a -lm + + cgrep: cgrep.o $(OBJECTS) + $(CC) $(CFLAGS) -o cgrep cgrep.o $(OBJECTS) ../ladr/libladr.a diff --git a/Formula/proxychains-ng.rb b/Formula/proxychains-ng.rb index 2b3a02e084946..7e8b63572a14e 100644 --- a/Formula/proxychains-ng.rb +++ b/Formula/proxychains-ng.rb @@ -10,6 +10,7 @@ class ProxychainsNg < Formula sha256 "4b41340fc2a68c579b3ab30affbe82f9be545537f727507d19977b1b67193a96" => :mojave sha256 "42ba51b1578ff901987212d74e8b3a83ec6313f5ccfe3d554a9b32766f9b65c4" => :high_sierra sha256 "4c8e8c69bd10529a33b3f70e1a55504f79e3358fe834d521c95adafb2f4eea4a" => :sierra + sha256 "1645137ebcd3fbc19c0ae8300075622be26ddd797aa289267e0ad1f1c6298be0" => :x86_64_linux end def install diff --git a/Formula/proxytunnel.rb b/Formula/proxytunnel.rb index 5ab780b57aa16..150c4ae6948ca 100644 --- a/Formula/proxytunnel.rb +++ b/Formula/proxytunnel.rb @@ -9,6 +9,7 @@ class Proxytunnel < Formula sha256 "f356990b424dc670a68c753c072e1a008d772bf7e27025f34b343c4a63a590d9" => :catalina sha256 "045219106e5c4b06627cf57fd21b27c8a24d11c5375df3c028e9b23d719e4b0f" => :mojave sha256 "98cf5abe9bbb285c92ef1c0e504968707fa5106e2783fed2dbfc64fb2a5dafd4" => :high_sierra + sha256 "189f3f8da35614839ad63755ee39511d7d1ee4e9b6beb02df81753cac1db1e96" => :x86_64_linux end depends_on "asciidoc" => :build diff --git a/Formula/psc-package.rb b/Formula/psc-package.rb index b160d31b622cc..30f48973078b1 100644 --- a/Formula/psc-package.rb +++ b/Formula/psc-package.rb @@ -9,10 +9,10 @@ class PscPackage < Formula sha256 "96c3bf2c65d381c61eff3d16d600eadd71ac821bbe7db02acec1d8b3b6dbecfc" bottle do - cellar :any_skip_relocation sha256 "6cb82e86e3345b771e1cefa7ddc19f0a2cdad2708b9c313c0d6939d6935f68ee" => :catalina sha256 "bea963bcef4f13b0b43118ee5230ccc3df88fea815fcf55e455360406d5ae9a6" => :mojave sha256 "2254f260a569baeb84999bf42cf2ae5563dae197039a7c4c9ee6862996f2523c" => :high_sierra + sha256 "bc198703336e076b01d4c2fb7b70d168fb154cf4044dcb9c76fc8d2fb295409d" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/psftools.rb b/Formula/psftools.rb index 01d2d48a79bcd..df21bf1b86657 100644 --- a/Formula/psftools.rb +++ b/Formula/psftools.rb @@ -12,6 +12,7 @@ class Psftools < Formula sha256 "30d2a62f05343fbd172a0b7d094e84755d3441fae6e9a5734793cf363a9e8c40" => :catalina sha256 "9a04003b9ff3529c3e1e94f63b062c120b8a5e4af66a99965347d63827004128" => :mojave sha256 "cd1682c76f401ff6fc6c4dce3e4c5d31aeb50a2deb4b56a31b8bab5830c6ec4b" => :high_sierra + sha256 "63ac33a15174533a0cda7b273b9b9f6b0e84ff35e8c909c9e5da581b53527124" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/pspg.rb b/Formula/pspg.rb index 9cbb0ecd9f933..a1ea433996f03 100644 --- a/Formula/pspg.rb +++ b/Formula/pspg.rb @@ -10,6 +10,7 @@ class Pspg < Formula sha256 "6ac86e2f012a8d7e00c41097bc6b73351c6c32270a5bb32a0f6f82892303e648" => :catalina sha256 "b64dac55a7a70baa9d63bf605fc9a68282af547334ce0a437eac2289e2d110ea" => :mojave sha256 "062b5f7f8d9090b5de684b40e32bdd061fa8475351a2e60acf93f1fcd434a80c" => :high_sierra + sha256 "171a8e92822a684fd2cc48581a6c068bb6960ea81aeae543effa523fef00f33e" => :x86_64_linux end depends_on "libpq" diff --git a/Formula/psqlodbc.rb b/Formula/psqlodbc.rb index 443316a96e50f..d18a40d6f02e7 100644 --- a/Formula/psqlodbc.rb +++ b/Formula/psqlodbc.rb @@ -9,6 +9,7 @@ class Psqlodbc < Formula sha256 "6ecd918abfb4e8bc95299a8efaeb2d9b2d772caee48d14108a6eeb9781f84776" => :catalina sha256 "34900a66170b407b00a65824165fb0ddb2bc6d585ef4c9bba75729d73ee32775" => :mojave sha256 "3cb37c6a2885d5abbd75b74167b0e6a93f29edbd1d36ad074bdf438bd7d1cb39" => :high_sierra + sha256 "b36ceac9af6902cb9783fc33ba1f44a03e8823dc4ee91b7efdfd81a6bdfe084f" => :x86_64_linux end head do diff --git a/Formula/pssh.rb b/Formula/pssh.rb index 30e5464cc7dd1..4dfdab8dfb541 100644 --- a/Formula/pssh.rb +++ b/Formula/pssh.rb @@ -4,13 +4,14 @@ class Pssh < Formula homepage "https://code.google.com/archive/p/parallel-ssh/" url "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/parallel-ssh/pssh-2.3.1.tar.gz" sha256 "539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "62460d1e1e69472684b09842c05d80e9b6da5f9510815b6d40b527a452067c3c" => :catalina sha256 "5b456c61d419a842c5c979a41494c5e2d7c4beb71190a621635a89c9c603c772" => :mojave sha256 "c06b726eead0f61a02e2c0a8f6fcdf8cf78f437deb841112b08447829b828e90" => :high_sierra + sha256 "8621fa933a33000ebe4694d18799b0eb4f1cc7c63c5506698013d4eb144efa81" => :x86_64_linux end depends_on "python@3.8" @@ -29,7 +30,7 @@ def install # fixed in master, should be removed for versions > 2.3.1 inreplace "psshlib/cli.py", "import version", "from psshlib import version" - virtualenv_create(libexec, "python3") + virtualenv_create(libexec, "python3") if OS.mac? virtualenv_install_with_resources end diff --git a/Formula/pstoedit.rb b/Formula/pstoedit.rb index 34f9c63919c52..e95872863ec3d 100644 --- a/Formula/pstoedit.rb +++ b/Formula/pstoedit.rb @@ -8,6 +8,7 @@ class Pstoedit < Formula sha256 "f048d902c088f0625c0c9e18d84b159493775b40e742812b040e7b517900260a" => :catalina sha256 "1f3ec91e58d95e08081694b43e031ed83f13a73cecff15c55c532268282b0ad1" => :mojave sha256 "22710dd8997d40cec3492c40960a9966b80b386bdbd3fed46515c66bb25053d7" => :high_sierra + sha256 "75adb28562720aab3b02a1cd11ffa1dd0aa39a8e0ff26f398bcf0831d6c44c90" => :x86_64_linux end depends_on "pkg-config" => :build @@ -15,8 +16,17 @@ class Pstoedit < Formula depends_on "imagemagick" depends_on "plotutils" + # "You need a C++ compiler, e.g., g++ (newer than 6.0) to compile pstoedit." + unless OS.mac? + fails_with :gcc => "5" + fails_with :gcc => "6" + fails_with :gcc => "7" + fails_with :gcc => "8" + depends_on "gcc@9" => :build + end + def install - ENV.cxx11 + ENV.append "CXXFLAGS", "-std=c++17" system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" diff --git a/Formula/pstree.rb b/Formula/pstree.rb index e7e526c703c04..b56bcb3312014 100644 --- a/Formula/pstree.rb +++ b/Formula/pstree.rb @@ -18,6 +18,7 @@ class Pstree < Formula sha256 "624458274db8e826c170121061ad25547c5a245788c8108bd2bf0af4a3678dea" => :el_capitan sha256 "127b605bf4b20cbddf63f875bd15f78ad5fc31eaebb57d9ce2051a3b856a8bd5" => :yosemite sha256 "2334d959beae2171fe10f6781a060eab40d57b841aa1905ead0b0936fb4145ef" => :mavericks + sha256 "9011e38411f27f67cf2dfae4f42d74b17be5cbe8e77235bbb468ac4e29cda2d8" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/psutils.rb b/Formula/psutils.rb index 1e1307f059b2a..a35fed89fe24e 100644 --- a/Formula/psutils.rb +++ b/Formula/psutils.rb @@ -16,6 +16,7 @@ class Psutils < Formula sha256 "def5b3fc8cef9b4c532cc26ae216d1c6b0dae54da5a39acbdb818d53a04bf697" => :el_capitan sha256 "8fedc8290fdcbd5cb5f8042cc83e4c10c6c2a29888c2a89f72280d3b5b53946d" => :yosemite sha256 "032a98149e12af8c223532b01aa74a2ab57ab3c1b5b6d3f0762d2cd2b51d62ee" => :mavericks + sha256 "096cf231524d69e34b00382a617d3269e86926c78b8071752a568031b91a3258" => :x86_64_linux end def install diff --git a/Formula/ptex.rb b/Formula/ptex.rb index 06466ede1cbfd..194b2312201c6 100644 --- a/Formula/ptex.rb +++ b/Formula/ptex.rb @@ -11,6 +11,7 @@ class Ptex < Formula sha256 "309b9d77d69b2797d9161c8bf93d13fbc48db114b4e308674bf208006ad4c571" => :catalina sha256 "2c55851c7d65d7953fedeed3ca738b9ab80c0ef61a7239633d485fbde53fdb92" => :mojave sha256 "599291e5ea9a7972828818ac1e940ecbaca107f1ef36af556bf9de4c141fa5a8" => :high_sierra + sha256 "5688a158d64251227f1c9073b66ebc467b152bbeb6be5bdaa7d890ca47470057" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/pth.rb b/Formula/pth.rb index fcbad4b617137..34eca914ce24b 100644 --- a/Formula/pth.rb +++ b/Formula/pth.rb @@ -15,6 +15,7 @@ class Pth < Formula sha256 "bac7f73c061797768be28e21bec2e7773cfd70ff7c3f46eafd464b9632d5eae4" => :el_capitan sha256 "7b31c6d65a97c722e661feb4c73a59a9025f1eac6b297ff181931bbdbc894ff3" => :yosemite sha256 "4271f5c483e95641caa088059669dad1ab6d95774ff66eecae2af1c5c0ddaf0a" => :mavericks + sha256 "a1e2eafca56d3449338a0d2455b268329d11280dddb91db21864f0082390fe47" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/pueue.rb b/Formula/pueue.rb index 0f6ff766a86ec..d3efb511c31e1 100644 --- a/Formula/pueue.rb +++ b/Formula/pueue.rb @@ -10,6 +10,7 @@ class Pueue < Formula sha256 "801759298072f94496653cc498c1513ede1d0574d2d9bd81bcb46f331c257839" => :catalina sha256 "de5ecda424a1662b9c2b5fb9408e4979c447fedc0f9adf5aa5b9636e19c24f36" => :mojave sha256 "e0a63dc6a83558ce31105c7c74356b224437a00f1b7ba2759e72780a6d20477d" => :high_sierra + sha256 "235c827a834a7376635b7ce94b89b07148aa6488e38a32f904d32b55e5a19f22" => :x86_64_linux end depends_on "rust" => :build @@ -55,7 +56,7 @@ def plist end test do - mkdir testpath/"Library/Preferences" + mkdir OS.mac? ? testpath/"Library/Preferences" : testpath/".config" begin pid = fork do diff --git a/Formula/puf.rb b/Formula/puf.rb index 5f64fd036297f..b4b1a1f07ad73 100644 --- a/Formula/puf.rb +++ b/Formula/puf.rb @@ -13,6 +13,7 @@ class Puf < Formula sha256 "24952b79335eb08d7a8880a16714e6afe3b73a65f5f26c59b106020198c1b3f3" => :el_capitan sha256 "d96385896fd7831b71af3b05d55f3c5cd2c3a9565f9083c2efe96309989dcf15" => :yosemite sha256 "7b76565452fb4f2b03a8b01d6e7495634965ba0bad74906cb907c0642805e5e5" => :mavericks + sha256 "fa556fdf2fe6cf77c23cbfb0ada7f5ba6f14fe161d21c5b2970fc3d633694af7" => :x86_64_linux end def install diff --git a/Formula/pugixml.rb b/Formula/pugixml.rb index 735ee58b9823f..8bce3c35a2702 100644 --- a/Formula/pugixml.rb +++ b/Formula/pugixml.rb @@ -9,6 +9,7 @@ class Pugixml < Formula sha256 "ffcc56b93b63ac573480cdcafd859bdee76409e834e4e6b855c0ac4cfa9eb94c" => :catalina sha256 "ee86188a54388e0644fd3f90e0319c8c734fb6ae254b23da609af17e1f579c9a" => :mojave sha256 "2b5ce73035deb5e9557fca05fc6100c4a1c18acf33816316185d00d9bb2198fe" => :high_sierra + sha256 "1933b264dee5b64154ea834780fea9926e27ea2b9c7e513c696ddb1efa6d031b" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/pulseaudio.rb b/Formula/pulseaudio.rb index 4e2790babf680..7413a60adb6a1 100644 --- a/Formula/pulseaudio.rb +++ b/Formula/pulseaudio.rb @@ -3,12 +3,14 @@ class Pulseaudio < Formula homepage "https://wiki.freedesktop.org/www/Software/PulseAudio/" url "https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz" sha256 "961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057" + revision 1 unless OS.mac? bottle do sha256 "a638afdb2e14989110a52ab860804ec0c005461d80398b736a641a678371bc3d" => :catalina sha256 "819cb5b8dd86715db2285f647b1742611dd2a802447aea637f05adae33a6056b" => :mojave sha256 "a5c5442b2118b9e3e3b2cbd8a8a700a121e9264b11c7096a3b3c42ce780a7a0b" => :high_sierra sha256 "bc42617a58074e5631eae20559f6a043ee87c8dcfd9944ac45b47467a3cdca66" => :sierra + sha256 "5bc6b203d0bcd0b32def0323e1907954c10eb2ff4e50ec4899378ea13d1d1ff0" => :x86_64_linux end head do @@ -27,24 +29,61 @@ class Pulseaudio < Formula depends_on "libtool" depends_on "openssl@1.1" depends_on "speexdsp" + unless OS.mac? + depends_on "glib" + depends_on "libcap" + end uses_from_macos "perl" => :build uses_from_macos "expat" uses_from_macos "m4" + unless OS.mac? + # Depends on XML::Parser + # Using the host's Perl interpreter to install XML::Parser fails when using brew's glibc. + # Use brew's Perl interpreter instead. + # See Linuxbrew/homebrew-core#8148 + resource "XML::Parser" do + url "https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz" + sha256 "1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216" + end + end + def install + unless OS.mac? + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + resources.each do |res| + res.stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make", "PERL5LIB=#{ENV["PERL5LIB"]}", *("CC=#{ENV.cc}" unless OS.mac?) + system "make", "install" + end + end + end + args = %W[ --disable-dependency-tracking --disable-silent-rules --prefix=#{prefix} - --enable-coreaudio-output --disable-neon-opt --disable-nls --disable-x11 - --with-mac-sysroot=#{MacOS.sdk_path} - --with-mac-version-min=#{MacOS.version} ] + if OS.mac? + args << "--with-mac-sysroot=#{MacOS.sdk_path})" + args << "--with-mac-version-min=#{MacOS.version}" + end + + # Perl depends on gdbm. + # If the dependency of pulseaudio on perl is build-time only, + # pulseaudio detects and links gdbm at build-time, but cannot locate it at run-time. + # Thus, we have to + # - specify not to use gdbm, or + # - add a dependency on gdbm if gdbm is wanted (not implemented). + # See Linuxbrew/homebrew-core#8148 + args << "--with-database=simple" unless OS.mac? + if build.head? # autogen.sh runs bootstrap.sh then ./configure system "./autogen.sh", *args @@ -52,6 +91,9 @@ def install system "./configure", *args end system "make", "install" + + # https://stackoverflow.com/questions/56309056/is-gschemas-compiled-architecture-specific-can-i-ship-it-with-my-python-library + rm "#{share}/glib-2.0/schemas/gschemas.compiled" unless OS.mac? end plist_options :manual => "pulseaudio" diff --git a/Formula/pulumi.rb b/Formula/pulumi.rb index 441128675b1df..827630a8bc820 100644 --- a/Formula/pulumi.rb +++ b/Formula/pulumi.rb @@ -11,6 +11,7 @@ class Pulumi < Formula sha256 "f7cc20c0135e0bf40c372f63e1aca9a313e5409a334c6e04862d7811eac0f223" => :catalina sha256 "9f789bdef38e8099178635d7a4cc89e7f294e0c256a04620b97f768458fd06b3" => :mojave sha256 "68ac096ceb7024c6dcbe2523b97475e0ae2587df5a7c2ed14d66da512b8c13f2" => :high_sierra + sha256 "c2cf1f0da42ba44495a1e3a8b7034832068274d6afd92506167db94d33075f16" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/pumba.rb b/Formula/pumba.rb index 5b6eb53ddee6c..9b7731516dbec 100644 --- a/Formula/pumba.rb +++ b/Formula/pumba.rb @@ -10,6 +10,7 @@ class Pumba < Formula sha256 "1125e8ddb43443e025e01f151de6989df2cda91e2185820e785329a0eb6c8bde" => :catalina sha256 "b44858bb0ecb84dc2318d8ead146dd3ae3db36568ec9eacf1c049e24300b85bb" => :mojave sha256 "96f9bc0b4ad4dc2b505a30d3b9c05c40682fa3332d5c2becd2885e907296ac7d" => :high_sierra + sha256 "0211e3af6eca02377771635e07b7b66edc5e3b07c1c48fa28f9a50f1251aa215" => :x86_64_linux end depends_on "go" => :build @@ -22,6 +23,10 @@ def install test do output = pipe_output("#{bin}/pumba rm test-container 2>&1") - assert_match "Is the docker daemon running?", output + if OS.mac? + assert_match "Is the docker daemon running?", output + else + assert_match "no containers to remove", output + end end end diff --git a/Formula/pup.rb b/Formula/pup.rb index b97e8f6883eef..e20daef3e7d18 100644 --- a/Formula/pup.rb +++ b/Formula/pup.rb @@ -3,6 +3,7 @@ class Pup < Formula homepage "https://github.com/EricChiang/pup" url "https://github.com/ericchiang/pup/archive/v0.4.0.tar.gz" sha256 "0d546ab78588e07e1601007772d83795495aa329b19bd1c3cde589ddb1c538b0" + revision 1 unless OS.mac? head "https://github.com/EricChiang/pup.git" bottle do @@ -13,6 +14,7 @@ class Pup < Formula sha256 "f470de75187b994ef9612c5404dc7622a356c8ee6af21f6b2549b5d7c5d88d32" => :high_sierra sha256 "4ba84cffa7cfd01bd252223055abdf5fd8b6cfc27474131cf313e688ea8eeecf" => :sierra sha256 "a1aa49640871c127c76f4aea6db65487db964a055e2aa4d86ee2d8b7f5dcb561" => :el_capitan + sha256 "248c3290273660e3b2b43c62909d1674784a7dab7f538b8fc228ec17981b6bf3" => :x86_64_linux end depends_on "go" => :build @@ -22,10 +24,11 @@ def install ENV["GOPATH"] = buildpath dir = buildpath/"src/github.com/ericchiang/pup" dir.install buildpath.children + os = OS.mac? ? "darwin" : "linux" cd dir do - system "gox", "-arch", "amd64", "-os", "darwin", "./..." - bin.install "pup_darwin_amd64" => "pup" + system "gox", "-arch", "amd64", "-os", os, "./..." + bin.install "pup_#{os}_amd64" => "pup" end prefix.install_metafiles dir diff --git a/Formula/purescript.rb b/Formula/purescript.rb index af9e99a1136ad..fba75bcb08e43 100644 --- a/Formula/purescript.rb +++ b/Formula/purescript.rb @@ -6,10 +6,10 @@ class Purescript < Formula head "https://github.com/purescript/purescript.git" bottle do - cellar :any_skip_relocation sha256 "f9ae94071a81b727b303b9030db5bba1e6bdd62d9197f11792b36c63c24ea8f4" => :catalina sha256 "722db0bdf3894e87af760e1f04e1ac1c450d9e522c104471457b04675b07f62c" => :mojave sha256 "9daf0153a5ad5ae5a99030416c6d7f8cf6fb13f16aef52823f1d0c9f7682d6da" => :high_sierra + sha256 "e1035d59586d06e7b032493977f35a38fbe8c66fee41ebc4cec7674d40bafad0" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/putty.rb b/Formula/putty.rb index 52c05e96ca8f3..5b66ac1f5bc37 100644 --- a/Formula/putty.rb +++ b/Formula/putty.rb @@ -9,6 +9,7 @@ class Putty < Formula sha256 "d5e454c08c5d06394527aa7141a332eb721097068f25deff3b4affa847837178" => :catalina sha256 "5f9844fc7464fefd987780b3579a33b2ca37673be56c2a8249c312a19e20faea" => :mojave sha256 "6621f31a41a8eedbbb2fda99a0548deed80d432216469105bac8084df66dbcbf" => :high_sierra + sha256 "a653c9c394ab341c3b9fa7434a21b56adf9e651c7eb49f9b01cf4e248b9f91cb" => :x86_64_linux end head do @@ -53,8 +54,13 @@ def install end test do + expect_path = if OS.mac? + "/usr/bin/expect" + else + Formula["expect"].opt_bin/"expect" + end (testpath/"command.sh").write <<~EOS - #!/usr/bin/expect -f + #!#{expect_path} -f set timeout -1 spawn #{bin}/puttygen -t rsa -b 4096 -q -o test.key expect -exact "Enter passphrase to save key: " diff --git a/Formula/pv.rb b/Formula/pv.rb index 55dfe547dd1b0..64e58e58c5104 100644 --- a/Formula/pv.rb +++ b/Formula/pv.rb @@ -12,6 +12,7 @@ class Pv < Formula sha256 "231a659ee3aca5a6f474bc058ed02a0a5f2c366d04c8c56043d310644c46e393" => :sierra sha256 "d461d873a47091a52b6114ac0976f16b0ade9e13d02fa0609f574369b8cfc8f0" => :el_capitan sha256 "0c4d4a90c188370ed312490b7ff76fdb8a31399170cdc0ad5dfc1542af4c4fc0" => :yosemite + sha256 "7bb996047b05101f4895e5178f1a5fe01318f06747bcbdbb6cb0d45d6fe2e9b7" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/pwgen.rb b/Formula/pwgen.rb index 5149602cc83d6..d0929bf0a03a3 100644 --- a/Formula/pwgen.rb +++ b/Formula/pwgen.rb @@ -12,6 +12,7 @@ class Pwgen < Formula sha256 "01a0709f74923e7b86d680f03d3ec056d3175cb7e54be176a26d5bfae890fd21" => :sierra sha256 "7dade70b172cb91635afffe8bb1eadb251f9dbd3368ab9e4a37f98a7c0a14b01" => :el_capitan sha256 "1799bdbb42974d10e2ff3a4e382351b1f03f0a3be31c15ff718d8935d1226101" => :yosemite + sha256 "a5a8380949cd7d180139ddbdb3a657649d6107f00de5bedb63be8bbaeb4db5a9" => :x86_64_linux end def install diff --git a/Formula/pwnat.rb b/Formula/pwnat.rb index 0a4ad944b9cc4..59cb0118a7b27 100644 --- a/Formula/pwnat.rb +++ b/Formula/pwnat.rb @@ -14,6 +14,7 @@ class Pwnat < Formula sha256 "0149fc977622f2fd55db5845a377437028df31bb847230d3fd73d548e481e289" => :el_capitan sha256 "cf17568c4053240ffe61594bcc618577c0d0c569abda8b3b956a4e4b441a755e" => :yosemite sha256 "0baed31dc05b28a330501a0d4119e8997c1038d14311c64f2d7b367ebdf9f01e" => :mavericks + sha256 "1e574797edcea5484ea15e3c11a273386bcaa84e4b8552914a5eb89bc3b14c27" => :x86_64_linux end def install diff --git a/Formula/pwsafe.rb b/Formula/pwsafe.rb index 7d98df9943c07..d3f31081b52ef 100644 --- a/Formula/pwsafe.rb +++ b/Formula/pwsafe.rb @@ -11,6 +11,7 @@ class Pwsafe < Formula sha256 "94c4b9684c2709c7cbd168609db33271ede431f1f72c348bb508e65a07bf8faa" => :mojave sha256 "5d5a277678e752596a342712e46dd2e1ce015d6897ad7f74437509a39f47b5ce" => :high_sierra sha256 "e5fd7f0c41f73c0bdf2f455b7ad659d27931afc1e78536e11a0553be0e8cade1" => :sierra + sha256 "2bd524b2a2bd54036db46e507dc54bf1c40a60ca44fa810c2f5b8874574dbf5c" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/py2cairo.rb b/Formula/py2cairo.rb index 616c4915d777c..efe0ec429dc17 100644 --- a/Formula/py2cairo.rb +++ b/Formula/py2cairo.rb @@ -10,6 +10,7 @@ class Py2cairo < Formula sha256 "78ab70984d612ac9feba4d673615e3918110aebc4aa0b360a854e81fc7ac0ea7" => :catalina sha256 "f01c39e8f71339cdec156309fb7358f5bb3e292fb0a84a071c3a935b58234120" => :mojave sha256 "76dbdbbd42c2a59cae7e9ddc05ad26d331194c8a132e24e7316ceb551a40272b" => :high_sierra + sha256 "dfca1292bde3d42aac68bedc45e6feafa890222cec5d4483f8e109974401a0b4" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/py3cairo.rb b/Formula/py3cairo.rb index ea9ba0c748409..0212e7fcde5a0 100644 --- a/Formula/py3cairo.rb +++ b/Formula/py3cairo.rb @@ -10,6 +10,7 @@ class Py3cairo < Formula sha256 "bd80a6817e090c490c828d22359fbd97c38b46cca2b325c7c69e38de9df0e6ea" => :catalina sha256 "0b586e4cb4e391fcc263c2892d533dda388c1ca139082a486939b2bbc3953d0a" => :mojave sha256 "e440b8405e3fd9c0d964e74ce0cb02b421077e91f84fbb9d10b6c68f51be328b" => :high_sierra + sha256 "87fc25cfae12752a729a382324b6ba57dc2fe6b25cf73de323558fbb25d890ee" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/pybind11.rb b/Formula/pybind11.rb index 1a496145c0865..6e44f183fdd93 100644 --- a/Formula/pybind11.rb +++ b/Formula/pybind11.rb @@ -9,6 +9,7 @@ class Pybind11 < Formula sha256 "c154d564868492981456c9a4e3fa21b6cdb821d96ba14d1ca1f4825d642a1384" => :catalina sha256 "c154d564868492981456c9a4e3fa21b6cdb821d96ba14d1ca1f4825d642a1384" => :mojave sha256 "c154d564868492981456c9a4e3fa21b6cdb821d96ba14d1ca1f4825d642a1384" => :high_sierra + sha256 "519dc3e01bbf20d545434e14324f74019c13ef1386c67e68f14322529829b937" => :x86_64_linux end depends_on "cmake" => :build @@ -40,7 +41,8 @@ def install EOS python_flags = `#{Formula["python@3.8"].opt_bin}/python3-config --cflags --ldflags --embed`.split(" ") - system ENV.cxx, "-O3", "-shared", "-std=c++11", *python_flags, "example.cpp", "-o", "example.so" + system ENV.cxx, "-O3", "-shared", "-std=c++11", + *python_flags, *("-fPIC" unless OS.mac?), "example.cpp", "-o", "example.so" system Formula["python@3.8"].opt_bin/"python3", "example.py" end end diff --git a/Formula/pyenv.rb b/Formula/pyenv.rb index 711cd3a5ab7f7..971849d32bf7d 100644 --- a/Formula/pyenv.rb +++ b/Formula/pyenv.rb @@ -5,18 +5,21 @@ class Pyenv < Formula sha256 "e93466735ac9c34d68b7d5d71f32c16a2b4b1a6a1adffb85acc4126a3398b9d0" version_scheme 1 head "https://github.com/pyenv/pyenv.git" + revision 2 unless OS.mac? bottle do cellar :any sha256 "4090a7f985abe855d3725014be8c6922008d98ff2f5ff10983637b6a4ed3bb59" => :catalina sha256 "f537513011bf038e306282adce8c65e18dcbcc0a486106819bca019e746fc257" => :mojave sha256 "5066a95f9ab62623f012d4930171e41cbd1fef9be916c661dc6817c20ed5f97c" => :high_sierra + sha256 "d5f181ce2ec72efdcd6e9d380dcbb9bf37f2ee8d60325b601d987ddffe35a5a3" => :x86_64_linux end depends_on "autoconf" depends_on "openssl@1.1" depends_on "pkg-config" depends_on "readline" + depends_on "python@3.8" unless OS.mac? uses_from_macos "bzip2" uses_from_macos "libffi" @@ -26,6 +29,7 @@ class Pyenv < Formula def install inreplace "libexec/pyenv", "/usr/local", HOMEBREW_PREFIX + inreplace "libexec/pyenv-versions", "system pyenv-which python", "system pyenv-which python3" system "src/configure" system "make", "-C", "src" diff --git a/Formula/pygitup.rb b/Formula/pygitup.rb index 6029009afb20c..4975ee6dfc907 100644 --- a/Formula/pygitup.rb +++ b/Formula/pygitup.rb @@ -5,13 +5,14 @@ class Pygitup < Formula homepage "https://github.com/msiemens/PyGitUp" url "https://files.pythonhosted.org/packages/46/45/32dc0bf07c620644a8ed899e381309f4f25b50f20a91e555285522592833/git-up-1.6.1.tar.gz" sha256 "ea83441e7ab05011624e2e7333ef875c263124db5eed74507acd32b07c48473f" - revision 2 + revision OS.mac? ? 2 : 3 bottle do cellar :any_skip_relocation sha256 "8dff3146af82b507e97ba0305f76d4aa6296b53b1a094e6cb3ed8b5cd8a4608c" => :catalina sha256 "bb4c2a88b4063544712c1f8a9704d7af97b11fb76d18ff9c6150a63d9bd59c5b" => :mojave sha256 "9ca0aeb55d9722c77c77616f2b95d8d53a8c685f5a9c515ddce380b2ae5ad672" => :high_sierra + sha256 "8445ac5cbf21ea5197ab6d0f3f7f71b1e2057a2e12bfbb890e42f3e343f61e02" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/pygments.rb b/Formula/pygments.rb index 2717372ff8afc..c0b771d4452b4 100644 --- a/Formula/pygments.rb +++ b/Formula/pygments.rb @@ -5,7 +5,7 @@ class Pygments < Formula homepage "https://pygments.org/" url "https://files.pythonhosted.org/packages/6e/4d/4d2fe93a35dfba417311a4ff627489a947b01dc0cc377a3673c00cf7e4b2/Pygments-2.6.1.tar.gz" sha256 "647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44" - + revision 1 unless OS.mac? head "https://github.com/pygments/pygments.git" bottle do @@ -13,6 +13,7 @@ class Pygments < Formula sha256 "509010be01f39644658904cd9396824b6cee202083b4659d8dd7e03e7f8afd17" => :catalina sha256 "6c413d6695fc730fcc6e547e1de3bf55ed245f66059eebfa2e99a683b240dbe5" => :mojave sha256 "42cc8f55ba8f2ca0766f7d99b1921671ad6d6aa884f23f1fbe88192e92ec89cb" => :high_sierra + sha256 "21f80f0ccb1a87de19e8a627e8dff8df615a1d70f71cda68d05a5d83258cb8d9" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/pygobject3.rb b/Formula/pygobject3.rb index e7079d0550ebb..f21262c1166ea 100644 --- a/Formula/pygobject3.rb +++ b/Formula/pygobject3.rb @@ -5,10 +5,10 @@ class Pygobject3 < Formula sha256 "d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f" bottle do - cellar :any sha256 "174079a381809080c02d5720bc2538929bf571d28710f7ab3cb646bfcd2a5bbf" => :catalina sha256 "c2b276445ce99b5094cd6b68b03fb6dc47a8c2eefbc743b40eacc373b822345c" => :mojave sha256 "f462700d1cd736cc800d410ef3e4d2509527ca98cb7dc437ac80adb9bc04b6d6" => :high_sierra + sha256 "bf35aeb31311a70b86754441dbd279de5e2a73b7c3fb16df1e9b1fc33ac674b5" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/pyinstaller.rb b/Formula/pyinstaller.rb index bb58559c9f447..60fa5a41e6fd0 100644 --- a/Formula/pyinstaller.rb +++ b/Formula/pyinstaller.rb @@ -5,8 +5,7 @@ class Pyinstaller < Formula homepage "https://www.pyinstaller.org" url "https://files.pythonhosted.org/packages/3c/c9/c3f9bc64eb11eee6a824686deba6129884c8cbdf70e750661773b9865ee0/PyInstaller-3.6.tar.gz" sha256 "3730fa80d088f8bb7084d32480eb87cbb4ddb64123363763cf8f2a1378c1c4b7" - revision 1 - + revision OS.mac? ? 1 : 2 head "https://github.com/pyinstaller/pyinstaller.git", :branch => "develop" bottle do @@ -14,6 +13,7 @@ class Pyinstaller < Formula sha256 "f5b5c872f6ed44dee85485f97743f066aaba0de5a7ef5a1817330ae9ac3ae502" => :catalina sha256 "d169b298d3b87b48d0e53591deb6b794128705850a7b9a064786ea323953dda4" => :mojave sha256 "5ab59b261f6a112da5e0423e7fb08912d421ab2c0ff27f4f477f262e8c55a0f0" => :high_sierra + sha256 "0bbce05cb89601bade9f56f2075ba89bdeeac83b4daf799784ff03c4b2e9db38" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/pyinvoke.rb b/Formula/pyinvoke.rb index a8394ed66ae3c..8834581cf6d9c 100644 --- a/Formula/pyinvoke.rb +++ b/Formula/pyinvoke.rb @@ -5,7 +5,7 @@ class Pyinvoke < Formula homepage "https://www.pyinvoke.org/" url "https://github.com/pyinvoke/invoke/archive/1.4.1.tar.gz" sha256 "ac5880fb5d21f06cc1b29f89736cb8a43b85abea9204b4bb4277458ae025d0b7" - revision 1 + revision OS.mac? ? 1 : 2 head "https://github.com/pyinvoke/invoke.git" bottle do @@ -13,6 +13,7 @@ class Pyinvoke < Formula sha256 "6e576690387b7433b3795c926672cebc76f51c1a78d64798db3a9b4fba2a584e" => :catalina sha256 "576bd35748ea63fcc0a8bd6f42e68755e34c3736b5233adb0f86293dcaf912f3" => :mojave sha256 "44224c0c6d1c175ddccf9bc20dcc6a0b3c48bd7ab72a30fde8f40db055406eee" => :high_sierra + sha256 "93182e5165ee2968b405abf916991d59645c92b770506648af25374ffe26792d" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/pylint.rb b/Formula/pylint.rb index 1918b082ac4e8..176ef4fdc14d0 100644 --- a/Formula/pylint.rb +++ b/Formula/pylint.rb @@ -11,6 +11,7 @@ class Pylint < Formula sha256 "0276d309ef75310c6f769fd57bd1c0326c42ad167fada9985d9a18c5219111a8" => :catalina sha256 "7382a74b8dc90f0a89a09e525a76967c4872c685d8dae62be7bde0474e750bc3" => :mojave sha256 "8ecaf808929ee9c3a7ee76f707b2df886712a7be0c73b7c274f96d4dbd7ba304" => :high_sierra + sha256 "7961ba0a9652e97de1d8512c1db3081c012f26c4c6d8f7b225da7f193f8cca60" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/pympress.rb b/Formula/pympress.rb index 2059a8659be68..0bfd25e68cee7 100644 --- a/Formula/pympress.rb +++ b/Formula/pympress.rb @@ -5,13 +5,15 @@ class Pympress < Formula homepage "https://github.com/Cimbali/pympress/" url "https://files.pythonhosted.org/packages/92/80/c63ad7748e877dfeb5d7d756c1bdd4c2657e5a857814b4d6edf96d44678c/pympress-1.5.3.tar.gz" sha256 "d8c10c286d1de2210c19a3e752542b61c8bcc592c48553f7c7043e943a87d05d" + revision 1 unless OS.mac? head "https://github.com/Cimbali/pympress.git" bottle do - cellar :any + cellar :any_skip_relocation sha256 "0882199094438644ae2af8e60ea55f02272990cca88b4ae0cbcfbabc9a68465b" => :catalina sha256 "7594889ecb2cf373356f01c1eb4e56573ba26bd50fd5ed0de5ece83d75f1adca" => :mojave sha256 "e6634bc9a8213054574d6be0814ef0b8faf6209e20aafb721753418a718f68af" => :high_sierra + sha256 "5c4dce71c0b81f835664e2205137da0f4bc8b158dc45feefa39c6009fc1419d8" => :x86_64_linux end depends_on "gobject-introspection" @@ -52,6 +54,9 @@ def install end test do + # (pympress:48790): Gtk-WARNING **: 13:03:37.080: cannot open display + return if !OS.mac? && ENV["CI"] + system bin/"pympress", "--help" # Version info contained in log file only if all dependencies loaded successfully diff --git a/Formula/pypy.rb b/Formula/pypy.rb index 13f5ba672f4f1..a7f97561c13d6 100644 --- a/Formula/pypy.rb +++ b/Formula/pypy.rb @@ -11,6 +11,7 @@ class Pypy < Formula sha256 "61e8cfe37e26b93cd72b7fa8d758d71c52181bc1e2a04f6221811018237bade1" => :catalina sha256 "8b6ec82f015f6481f44f30d0d01907872129197efc03bebbc2c14edb54bf598d" => :mojave sha256 "08f78b30b0a831ce06cfa27f9d1f82efbffa3ff9a3997ba8e6129bfefe9e337d" => :high_sierra + sha256 "c814dd107f6e1b11bdf2e276f23b40df4f352c682071aee8c81f632dc8881cae" => :x86_64_linux end depends_on "pkg-config" => :build @@ -18,7 +19,7 @@ class Pypy < Formula depends_on "gdbm" # pypy does not find system libffi, and its location cannot be given # as a build option - depends_on "libffi" if DevelopmentTools.clang_build_version >= 1000 + depends_on "libffi" if OS.mac? && DevelopmentTools.clang_build_version >= 1000 depends_on "openssl@1.1" depends_on "sqlite" depends_on "tcl-tk" @@ -29,9 +30,13 @@ class Pypy < Formula uses_from_macos "zlib" resource "bootstrap" do - url "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-osx64.tar.bz2" - version "7.3.0" - sha256 "ca7b056b243a6221ad04fa7fc8696e36a2fb858396999dcaa31dbbae53c54474" + if OS.mac? + url "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-osx64.tar.bz2" + sha256 "ca7b056b243a6221ad04fa7fc8696e36a2fb858396999dcaa31dbbae53c54474" + else + url "https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-linux64.tar.bz2" + sha256 "f4950a54378ac637da2a6defa52d6ffed96af12fcd5d74e1182fb834883c9826" + end end resource "setuptools" do @@ -45,9 +50,11 @@ class Pypy < Formula end def install - ENV.prepend_path "PKG_CONFIG_PATH", "#{prefix}/opt/tcl-tk/lib/pkgconfig" - ENV.prepend "LDFLAGS", "-L#{prefix}/opt/tcl-tk/lib" - ENV.prepend "CPPFLAGS", "-I#{prefix}/opt/tcl-tk/include" + if OS.mac? + ENV.prepend_path "PKG_CONFIG_PATH", "#{prefix}/opt/tcl-tk/lib/pkgconfig" + ENV.prepend "LDFLAGS", "-L#{prefix}/opt/tcl-tk/lib" + ENV.prepend "CPPFLAGS", "-I#{prefix}/opt/tcl-tk/include" + end # Having PYTHONPATH set can cause the build to fail if another # Python is present, e.g. a Homebrew-provided Python 2.x # See https://github.com/Homebrew/homebrew/issues/24364 @@ -56,10 +63,15 @@ def install # Fix build on High Sierra inreplace "lib_pypy/_tkinter/tklib_build.py" do |s| - s.gsub! "/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/", - "#{prefix}/opt/tcl-tk/include" - s.gsub! "libdirs = []", - "libdirs = ['#{prefix}/opt/tcl-tk/lib']" + if OS.mac? + s.gsub! "/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/", + "#{prefix}/opt/tcl-tk/include" + s.gsub! "libdirs = []", + "libdirs = ['#{prefix}/opt/tcl-tk/lib']" + else + s.gsub! "/usr/include/tcl", Formula["tcl-tk"].opt_include.to_s + s.gsub! "'tcl' + _ver, 'tk' + _ver", "'tcl8.6', 'tk8.6'" + end end resource("bootstrap").stage buildpath/"bootstrap" @@ -67,7 +79,7 @@ def install cd "pypy/goal" do system python, buildpath/"rpython/bin/rpython", - "-Ojit", "--shared", "--cc", ENV.cc, "--verbose", + "-Ojit", "--shared", "--cc", ENV.cc, "--make-jobs", ENV.make_jobs, "targetpypystandalone.py" end @@ -78,17 +90,27 @@ def install system "tar", "-C", libexec.to_s, "--strip-components", "1", "-xf", "pypy.tar.bz2" end - (libexec/"lib").install libexec/"bin/libpypy-c.dylib" - MachO::Tools.change_install_name("#{libexec}/bin/pypy", - "@rpath/libpypy-c.dylib", - "#{libexec}/lib/libpypy-c.dylib") + dylib = OS.mac? ? "dylib" : "so" + (libexec/"lib").install libexec/"bin/libpypy-c.#{dylib}" + if OS.mac? + MachO::Tools.change_install_name("#{libexec}/bin/pypy", + "@rpath/libpypy-c.dylib", + "#{libexec}/lib/libpypy-c.dylib") + end # The PyPy binary install instructions suggest installing somewhere # (like /opt) and symlinking in binaries as needed. Specifically, # we want to avoid putting PyPy's Python.h somewhere that configure # scripts will find it. bin.install_symlink libexec/"bin/pypy" - lib.install_symlink libexec/"lib/libpypy-c.dylib" + lib.install_symlink libexec/"lib/libpypy-c.#{dylib}" + + # Delete two files shipped which we do not want to deliver + # These files make patchelf fail + unless OS.mac? + rm_f libexec/"bin/libpypy-c.so.debug" + rm_f libexec/"bin/pypy.debug" + end end def post_install @@ -118,7 +140,7 @@ def post_install %w[setuptools pip].each do |pkg| resource(pkg).stage do system bin/"pypy", "-s", "setup.py", "--no-user-cfg", "install", - "--force", "--verbose" + "--force" end end diff --git a/Formula/pypy3.rb b/Formula/pypy3.rb index 88f66ddeb584c..a269df890b6e6 100644 --- a/Formula/pypy3.rb +++ b/Formula/pypy3.rb @@ -11,6 +11,7 @@ class Pypy3 < Formula sha256 "384b960848c433008154103f8cdf57c77b8ee805115818cae4cb502e5485f043" => :catalina sha256 "de50ccf32775b38c4d1e2324fe7b9c0e23856fbe34eaf6ebd7b23e7d6d8f6459" => :mojave sha256 "ea4031fc8f85001fea131cc880108416f0d9bbac400655a7d8337ad8cb8f1547" => :high_sierra + sha256 "6eb2eaee59434b131729dddaf5dd2a31578128463c84afe4f5f111435c5023b0" => :x86_64_linux end depends_on "pkg-config" => :build @@ -19,7 +20,7 @@ class Pypy3 < Formula depends_on "gdbm" # pypy does not find system libffi, and its location cannot be given # as a build option - depends_on "libffi" if DevelopmentTools.clang_build_version >= 1000 + depends_on "libffi" if OS.mac? && DevelopmentTools.clang_build_version >= 1000 depends_on "openssl@1.1" depends_on "sqlite" depends_on "tcl-tk" @@ -65,18 +66,25 @@ class Pypy3 < Formula end def install - ENV.prepend_path "PKG_CONFIG_PATH", "#{prefix}/opt/openssl/lib/pkgconfig:#{prefix}/opt/tcl-tk/lib/pkgconfig" - ENV.prepend "LDFLAGS", "-L#{prefix}/opt/tcl-tk/lib" - ENV.prepend "CPPFLAGS", "-I#{prefix}/opt/tcl-tk/include" + if OS.mac? + ENV.prepend_path "PKG_CONFIG_PATH", "#{prefix}/opt/openssl/lib/pkgconfig:#{prefix}/opt/tcl-tk/lib/pkgconfig" + ENV.prepend "LDFLAGS", "-L#{prefix}/opt/tcl-tk/lib" + ENV.prepend "CPPFLAGS", "-I#{prefix}/opt/tcl-tk/include" + end # Work around "dyld: Symbol not found: _utimensat" - ENV.delete("SDKROOT") if MacOS.version == :sierra && MacOS::Xcode.version >= "9.0" + ENV.delete("SDKROOT") if OS.mac? && MacOS.version == :sierra && MacOS::Xcode.version >= "9.0" # Fix build on High Sierra inreplace "lib_pypy/_tkinter/tklib_build.py" do |s| - s.gsub! "/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/", - "#{prefix}/opt/tcl-tk/include" - s.gsub! "libdirs = []", - "libdirs = ['#{prefix}/opt/tcl-tk/lib']" + if OS.mac? + s.gsub! "/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/", + "#{prefix}/opt/tcl-tk/include" + s.gsub! "libdirs = []", + "libdirs = ['#{prefix}/opt/tcl-tk/lib']" + else + s.gsub! "/usr/include/tcl", Formula["tcl-tk"].opt_include.to_s + s.gsub! "'tcl' + _ver, 'tk' + _ver", "'tcl8.6', 'tk8.6'" + end end # Having PYTHONPATH set can cause the build to fail if another @@ -86,9 +94,10 @@ def install ENV["PYPY_USESSION_DIR"] = buildpath python = Formula["pypy"].opt_bin/"pypy" + cd "pypy/goal" do system python, buildpath/"rpython/bin/rpython", - "-Ojit", "--shared", "--cc", ENV.cc, "--verbose", + "-Ojit", "--shared", "--cc", ENV.cc, "--make-jobs", ENV.make_jobs, "targetpypystandalone.py" end @@ -98,13 +107,16 @@ def install system "tar", "-C", libexec.to_s, "--strip-components", "1", "-xf", "pypy3.tar.bz2" end - (libexec/"lib").install libexec/"bin/libpypy3-c.dylib" => "libpypy3-c.dylib" + dylib = OS.mac? ? "dylib" : "so" + (libexec/"lib").install libexec/"bin/libpypy3-c.#{dylib}" => "libpypy3-c.#{dylib}" - MachO::Tools.change_install_name("#{libexec}/bin/pypy3", - "@rpath/libpypy3-c.dylib", - "#{libexec}/lib/libpypy3-c.dylib") - MachO::Tools.change_dylib_id("#{libexec}/lib/libpypy3-c.dylib", - "#{opt_libexec}/lib/libpypy3-c.dylib") + if OS.mac? + MachO::Tools.change_install_name("#{libexec}/bin/pypy3", + "@rpath/libpypy3-c.dylib", + "#{libexec}/lib/libpypy3-c.dylib") + MachO::Tools.change_dylib_id("#{libexec}/lib/libpypy3-c.dylib", + "#{opt_libexec}/lib/libpypy3-c.dylib") + end (libexec/"lib-python").install "lib-python/3" libexec.install %w[include lib_pypy] @@ -115,7 +127,14 @@ def install # scripts will find it. bin.install_symlink libexec/"bin/pypy3" bin.install_symlink libexec/"bin/pypy" => "pypy3.6" - lib.install_symlink libexec/"lib/libpypy3-c.dylib" + lib.install_symlink libexec/"lib/libpypy3-c.#{dylib}" + + # Delete two files shipped which we do not want to deliver + # These files make patchelf fail + unless OS.mac? + rm_f libexec/"bin/libpypy3-c.so.debug" + rm_f libexec/"bin/pypy3.debug" + end end def post_install @@ -144,7 +163,7 @@ def post_install %w[appdirs six packaging setuptools pyparsing pip].each do |pkg| resource(pkg).stage do - system bin/"pypy3", "-s", "setup.py", "install", "--force", "--verbose" + system bin/"pypy3", "-s", "setup.py", "install", "--force" end end diff --git a/Formula/pyqt.rb b/Formula/pyqt.rb index 887e23b6d812c..de1d3d7ffa72c 100644 --- a/Formula/pyqt.rb +++ b/Formula/pyqt.rb @@ -42,7 +42,7 @@ def install system "#{bin}/pylupdate5", "-version" system Formula["python@3.8"].opt_bin/"python3", "-c", "import PyQt5" - %w[ + m = %w[ Gui Location Multimedia @@ -51,6 +51,8 @@ def install Svg Widgets Xml - ].each { |mod| system Formula["python@3.8"].opt_bin/"python3", "-c", "import PyQt5.Qt#{mod}" } + ] + m << "WebEngineWidgets" if OS.mac? + m.each { |mod| system Formula["python@3.8"].opt_bin/"python3", "-c", "import PyQt5.Qt#{mod}" } end end diff --git a/Formula/python-dbus.rb b/Formula/python-dbus.rb new file mode 100644 index 0000000000000..7453ef6dc60a6 --- /dev/null +++ b/Formula/python-dbus.rb @@ -0,0 +1,30 @@ +class PythonDbus < Formula + desc "Python bindings for libdbus" + homepage "https://dbus.freedesktop.org/doc/dbus-python/" + url "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.14.tar.gz" + sha256 "b10206ba3dd641e4e46411ab91471c88e0eec1749860e4285193ee68df84ac31" + + bottle do + cellar :any_skip_relocation + sha256 "c20d0729e24a65d7f202377775e92401df849d1bb203785b688e57263aaaba4a" => :x86_64_linux + end + + depends_on "pkg-config" => :build + depends_on "dbus" + depends_on "dbus-glib" + depends_on :linux + depends_on "python" + + def install + ENV["PYTHON"] = Formula["python"].opt_bin/"python3" + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make", "install" + end + + test do + system Formula["python"].opt_bin/"python3", "-c", "import dbus" + end +end diff --git a/Formula/python-markdown.rb b/Formula/python-markdown.rb index bff6f8528eca4..8f8bd2dc30f51 100644 --- a/Formula/python-markdown.rb +++ b/Formula/python-markdown.rb @@ -11,6 +11,7 @@ class PythonMarkdown < Formula sha256 "a5a1565cdb0c20aa5d1101039e8ed69110dd36262224ed6e2ee107a6d6a0cdc3" => :catalina sha256 "54d88c62588de8fef562e815b9cb0e83177798c9276b881401b4445e78605872" => :mojave sha256 "80a8cba20c744e0e49f211240883b9f8fbbd0676c95e9f43abbaf1b290f435b0" => :high_sierra + sha256 "03e92f77a4e2e0b5a184376868113d49a5fdddd0d97ceb385e111875f27a0241" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/python-yq.rb b/Formula/python-yq.rb index 87212c13c39f7..faed345590fbc 100644 --- a/Formula/python-yq.rb +++ b/Formula/python-yq.rb @@ -9,6 +9,7 @@ class PythonYq < Formula sha256 "01134f6bc2acd0c2cc57c572e8d17e31f16ec258f442a87c43a86a2e40839bc7" => :catalina sha256 "01134f6bc2acd0c2cc57c572e8d17e31f16ec258f442a87c43a86a2e40839bc7" => :mojave sha256 "01134f6bc2acd0c2cc57c572e8d17e31f16ec258f442a87c43a86a2e40839bc7" => :high_sierra + sha256 "527e5e9f87a09d6a6070f6f50afa16aaee5c1989484cdc162442672d90914ce8" => :x86_64_linux end depends_on "jq" diff --git a/Formula/python.rb b/Formula/python.rb index 4aa215c175244..d763e97577c2b 100644 --- a/Formula/python.rb +++ b/Formula/python.rb @@ -3,12 +3,14 @@ class Python < Formula homepage "https://www.python.org/" url "https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tar.xz" sha256 "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136" + revision 1 unless OS.mac? head "https://github.com/python/cpython.git" bottle do sha256 "acd595852aecc2bfa46c57d86db716e64d57bb2753c45ff7f745b46c7655dd65" => :catalina sha256 "cc8177d823b39d099e1f1a6f2e0fccb16e531508b59580f1fd44f659b54eeb84" => :mojave sha256 "079ace2d46b98d9931f14fbb6e02d883fedf0333faabcbaf552b12553325f4b6" => :high_sierra + sha256 "9ffe49b04a0035181663e41fd8b773a51220af7a6b23e1cab71a4654620df6dd" => :x86_64_linux end # setuptools remembers the build flags python is built with and uses them to @@ -19,7 +21,7 @@ class Python < Formula You can install them, if desired, with: xcode-select --install EOS - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end depends_on "pkg-config" => :build @@ -32,6 +34,7 @@ class Python < Formula uses_from_macos "bzip2" uses_from_macos "libffi" uses_from_macos "ncurses" + uses_from_macos "xz" uses_from_macos "zlib" skip_clean "bin/pip3", "bin/pip-3.4", "bin/pip-3.5", "bin/pip-3.6", "bin/pip-3.7" @@ -53,34 +56,51 @@ class Python < Formula sha256 "8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96" end + def lib_cellar + prefix / (OS.mac? ? "Frameworks/Python.framework/Versions/#{xy}" : "") / + "lib/python#{xy}" + end + + def site_packages_cellar + lib_cellar/"site-packages" + end + + # The HOMEBREW_PREFIX location of site-packages. + def site_packages + HOMEBREW_PREFIX/"lib/python#{xy}/site-packages" + end + def install + ENV.permit_weak_imports + # Unset these so that installing pip and setuptools puts them where we want # and not into some other Python the user has installed. ENV["PYTHONHOME"] = nil ENV["PYTHONPATH"] = nil - xy = (buildpath/"configure.ac").read.slice(/PYTHON_VERSION, (3\.\d)/, 1) - lib_cellar = prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}" - args = %W[ --prefix=#{prefix} --enable-ipv6 --datarootdir=#{share} --datadir=#{share} - --enable-framework=#{frameworks} + #{OS.mac? ? "--enable-framework=#{frameworks}" : "--enable-shared"} --enable-loadable-sqlite-extensions --without-ensurepip - --with-dtrace --with-openssl=#{Formula["openssl@1.1"].opt_prefix} ] + args << "--with-dtrace" unless OS.linux? args << "--without-gcc" if ENV.compiler == :clang + # Required for the _ctypes module + # see https://github.com/Linuxbrew/homebrew-core/pull/1007#issuecomment-252421573 + args << "--with-system-ffi" unless OS.mac? + cflags = [] ldflags = [] cppflags = [] - if MacOS.sdk_path_if_needed + if OS.mac? && MacOS.sdk_path_if_needed # Help Python's build system (setuptools/pip) to build things on SDK-based systems # The setup.py looks at "-isysroot" to get the sysroot (and not at --sysroot) cflags << "-isysroot #{MacOS.sdk_path}" << "-I#{MacOS.sdk_path}/usr/include" @@ -93,6 +113,19 @@ def install # Avoid linking to libgcc https://mail.python.org/pipermail/python-dev/2012-February/116205.html args << "MACOSX_DEPLOYMENT_TARGET=#{MacOS.version}" + # Python's setup.py parses CPPFLAGS and LDFLAGS to learn search + # paths for the dependencies of the compiled extension modules. + # See Linuxbrew/linuxbrew#420, Linuxbrew/linuxbrew#460, and Linuxbrew/linuxbrew#875 + unless OS.mac? + if build.bottle? + # Configure Python to use cc and c++ to build extension modules. + ENV["CC"] = "cc" + ENV["CXX"] = "c++" + end + cppflags << ENV.cppflags << " -I#{HOMEBREW_PREFIX}/include" + ldflags << ENV.ldflags << " -L#{HOMEBREW_PREFIX}/lib" + end + # We want our readline! This is just to outsmart the detection code, # superenv makes cc always find includes/libs! inreplace "setup.py", @@ -123,33 +156,44 @@ def install ENV.deparallelize do # Tell Python not to install into /Applications (default for framework builds) system "make", "install", "PYTHONAPPSDIR=#{prefix}" - system "make", "frameworkinstallextras", "PYTHONAPPSDIR=#{pkgshare}" + system "make", "frameworkinstallextras", "PYTHONAPPSDIR=#{pkgshare}" if OS.mac? end # Any .app get a " 3" attached, so it does not conflict with python 2.x. Dir.glob("#{prefix}/*.app") { |app| mv app, app.sub(/\.app$/, " 3.app") } - # Prevent third-party packages from building against fragile Cellar paths - inreplace Dir[lib_cellar/"**/_sysconfigdata_m_darwin_darwin.py", - lib_cellar/"config*/Makefile", - frameworks/"Python.framework/Versions/3*/lib/pkgconfig/python-3.?.pc"], - prefix, opt_prefix - - # Help third-party packages find the Python framework - inreplace Dir[lib_cellar/"config*/Makefile"], - /^LINKFORSHARED=(.*)PYTHONFRAMEWORKDIR(.*)/, - "LINKFORSHARED=\\1PYTHONFRAMEWORKINSTALLDIR\\2" - - # Fix for https://github.com/Homebrew/homebrew-core/issues/21212 - inreplace Dir[lib_cellar/"**/_sysconfigdata_m_darwin_darwin.py"], - %r{('LINKFORSHARED': .*?)'(Python.framework/Versions/3.\d+/Python)'}m, - "\\1'#{opt_prefix}/Frameworks/\\2'" + if OS.mac? + # Prevent third-party packages from building against fragile Cellar paths + inreplace Dir[lib_cellar/"**/_sysconfigdata_m_darwin_darwin.py", + lib_cellar/"config*/Makefile", + frameworks/"Python.framework/Versions/3*/lib/pkgconfig/python-3.?.pc"], + prefix, opt_prefix + + # Help third-party packages find the Python framework + inreplace Dir[lib_cellar/"config*/Makefile"], + /^LINKFORSHARED=(.*)PYTHONFRAMEWORKDIR(.*)/, + "LINKFORSHARED=\\1PYTHONFRAMEWORKINSTALLDIR\\2" + + # Fix for https://github.com/Homebrew/homebrew-core/issues/21212 + inreplace Dir[lib_cellar/"**/_sysconfigdata_m_darwin_darwin.py"], + %r{('LINKFORSHARED': .*?)'(Python.framework/Versions/3.\d+/Python)'}m, + "\\1'#{opt_prefix}/Frameworks/\\2'" + else + # Prevent third-party packages from building against fragile Cellar paths + inreplace Dir[lib_cellar/"**/_sysconfigdata_m_linux_x86_64-*.py", + lib_cellar/"config*/Makefile", + lib/"pkgconfig/python-3.?.pc"], + prefix, opt_prefix + end # Symlink the pkgconfig files into HOMEBREW_PREFIX so they're accessible. (lib/"pkgconfig").install_symlink Dir["#{frameworks}/Python.framework/Versions/#{xy}/lib/pkgconfig/*"] + # Remove 2to3 because python2 also installs it + rm bin/"2to3" + # Remove the site-packages that Python created in its Cellar. - (prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/site-packages").rmtree + site_packages_cellar.rmtree %w[setuptools pip wheel].each do |r| (libexec/r).install resource(r) @@ -171,13 +215,17 @@ def install end end + def xy + if OS.mac? && prefix.exist? + (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s + else + version.to_s[/^\d\.\d/] + end + end + def post_install ENV.delete "PYTHONPATH" - xy = (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s - site_packages = HOMEBREW_PREFIX/"lib/python#{xy}/site-packages" - site_packages_cellar = prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/site-packages" - # Fix up the site-packages so that user-installed Python software survives # minor updates, such as going from 3.3.2 to 3.3.3: @@ -233,7 +281,11 @@ def post_install library_dirs = [HOMEBREW_PREFIX/"lib", Formula["openssl@1.1"].opt_lib, Formula["sqlite"].opt_lib] - cfg = prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/distutils/distutils.cfg" + cfg = if OS.mac? + prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/distutils/distutils.cfg" + else + lib_cellar/"distutils/distutils.cfg" + end cfg.atomic_write <<~EOS [install] @@ -246,8 +298,6 @@ def post_install end def sitecustomize - xy = (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s - <<~EOS # This file is created by Homebrew and is executed on each python startup. # Don't print from here, or else python command line scripts may fail! @@ -278,7 +328,7 @@ def sitecustomize # the Cellar site-packages is a symlink to the HOMEBREW_PREFIX # site_packages; prefer the shorter paths long_prefix = re.compile(r'#{rack}/[0-9\._abrc]+/Frameworks/Python\.framework/Versions/#{xy}/lib/python#{xy}/site-packages') - sys.path = [long_prefix.sub('#{HOMEBREW_PREFIX/"lib/python#{xy}/site-packages"}', p) for p in sys.path] + sys.path = [long_prefix.sub('#{site_packages}', p) for p in sys.path] # Set the sys.executable to use the opt_prefix, unless explicitly set # with PYTHONEXECUTABLE: @@ -288,11 +338,6 @@ def sitecustomize end def caveats - xy = if prefix.exist? - (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s - else - version.to_s.slice(/(3\.\d)/) || "3.7" - end <<~EOS Python has been installed as #{HOMEBREW_PREFIX}/bin/python3 @@ -304,19 +349,18 @@ def caveats You can install Python packages with pip3 install They will install into the site-package directory - #{HOMEBREW_PREFIX/"lib/python#{xy}/site-packages"} + #{HOMEBREW_PREFIX/"lib/python3.7/site-packages"} See: https://docs.brew.sh/Homebrew-and-Python EOS end test do - xy = (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s # Check if sqlite is ok, because we build with --enable-loadable-sqlite-extensions # and it can occur that building sqlite silently fails if OSX's sqlite is used. system "#{bin}/python#{xy}", "-c", "import sqlite3" # Check if some other modules import. Then the linked libs are working. - system "#{bin}/python#{xy}", "-c", "import tkinter; root = tkinter.Tk()" + system "#{bin}/python#{xy}", "-c", "import tkinter; root = tkinter.Tk()" if OS.mac? system "#{bin}/python#{xy}", "-c", "import _gdbm" system "#{bin}/python#{xy}", "-c", "import zlib" system bin/"pip3", "list", "--format=columns" diff --git a/Formula/python@3.8.rb b/Formula/python@3.8.rb index 30041fd5454f8..7dfdc96ada2d1 100644 --- a/Formula/python@3.8.rb +++ b/Formula/python@3.8.rb @@ -8,6 +8,7 @@ class PythonAT38 < Formula sha256 "67cceb372f3b0f45ff90beb70d6e92ce1416fdd0b3df4df95643fa21451b4fec" => :catalina sha256 "6173014910a8902f0601a1b9e1c55bea85d25193bd64180f363e9f37c2d23244" => :mojave sha256 "d12c7edef5f2ab07ab7b685afb6cc083b42f45b71483311bc1a8198fef16b482" => :high_sierra + sha256 "4517039f539ca486cd95e1186fee57c424918230dd8a701887f7e5754e8f3cd0" => :x86_64_linux end # setuptools remembers the build flags python is built with and uses them to @@ -18,7 +19,7 @@ class PythonAT38 < Formula You can install them, if desired, with: xcode-select --install EOS - satisfy { MacOS::CLT.installed? } + satisfy { !OS.mac? || MacOS::CLT.installed? } end keg_only :versioned_formula @@ -34,6 +35,7 @@ class PythonAT38 < Formula uses_from_macos "libffi" uses_from_macos "ncurses" uses_from_macos "unzip" + uses_from_macos "xz" uses_from_macos "zlib" skip_clean "bin/pip3", "bin/pip-3.4", "bin/pip-3.5", "bin/pip-3.6", "bin/pip-3.7", "bin/pip-3.8" @@ -62,32 +64,47 @@ class PythonAT38 < Formula sha256 "c47680c85f201f5830bf71741f09ece031b99386040f3c70b20190b4c47fb81d" end + def lib_cellar + prefix / (OS.mac? ? "Frameworks/Python.framework/Versions/#{xy}" : "") / + "lib/python#{xy}" + end + + def site_packages_cellar + lib_cellar/"site-packages" + end + + # The HOMEBREW_PREFIX location of site-packages. + def site_packages + HOMEBREW_PREFIX/"lib/python#{xy}/site-packages" + end + def install # Unset these so that installing pip and setuptools puts them where we want # and not into some other Python the user has installed. ENV["PYTHONHOME"] = nil ENV["PYTHONPATH"] = nil - xy = (buildpath/"configure.ac").read.slice(/PYTHON_VERSION, (3\.\d)/, 1) - lib_cellar = prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}" - args = %W[ --prefix=#{prefix} --enable-ipv6 --datarootdir=#{share} --datadir=#{share} - --enable-framework=#{frameworks} + #{OS.mac? ? "--enable-framework=#{frameworks}" : "--enable-shared"} --enable-loadable-sqlite-extensions --without-ensurepip - --with-dtrace --with-openssl=#{Formula["openssl@1.1"].opt_prefix} ] + args << "--with-dtrace" if OS.mac? + + # Required for the _ctypes module + # see https://github.com/Linuxbrew/homebrew-core/pull/1007#issuecomment-252421573 + args << "--with-system-ffi" unless OS.mac? cflags = [] ldflags = [] cppflags = [] - if MacOS.sdk_path_if_needed + if OS.mac? && MacOS.sdk_path_if_needed # Help Python's build system (setuptools/pip) to build things on SDK-based systems # The setup.py looks at "-isysroot" to get the sysroot (and not at --sysroot) cflags << "-isysroot #{MacOS.sdk_path}" << "-I#{MacOS.sdk_path}/usr/include" @@ -100,6 +117,19 @@ def install # Avoid linking to libgcc https://mail.python.org/pipermail/python-dev/2012-February/116205.html args << "MACOSX_DEPLOYMENT_TARGET=#{MacOS.version}" + # Python's setup.py parses CPPFLAGS and LDFLAGS to learn search + # paths for the dependencies of the compiled extension modules. + # See Linuxbrew/linuxbrew#420, Linuxbrew/linuxbrew#460, and Linuxbrew/linuxbrew#875 + unless OS.mac? + if build.bottle? + # Configure Python to use cc and c++ to build extension modules. + ENV["CC"] = "cc" + ENV["CXX"] = "c++" + end + cppflags << ENV.cppflags << " -I#{HOMEBREW_PREFIX}/include" + ldflags << ENV.ldflags << " -L#{HOMEBREW_PREFIX}/lib" + end + # We want our readline! This is just to outsmart the detection code, # superenv makes cc always find includes/libs! inreplace "setup.py", @@ -130,33 +160,54 @@ def install ENV.deparallelize do # Tell Python not to install into /Applications (default for framework builds) system "make", "install", "PYTHONAPPSDIR=#{prefix}" - system "make", "frameworkinstallextras", "PYTHONAPPSDIR=#{pkgshare}" + system "make", "frameworkinstallextras", "PYTHONAPPSDIR=#{pkgshare}" if OS.mac? end # Any .app get a " 3" attached, so it does not conflict with python 2.x. Dir.glob("#{prefix}/*.app") { |app| mv app, app.sub(/\.app$/, " 3.app") } - # Prevent third-party packages from building against fragile Cellar paths - inreplace Dir[lib_cellar/"**/_sysconfigdata__darwin_darwin.py", - lib_cellar/"config*/Makefile", - frameworks/"Python.framework/Versions/3*/lib/pkgconfig/python-3.?.pc"], - prefix, opt_prefix - - # Help third-party packages find the Python framework - inreplace Dir[lib_cellar/"config*/Makefile"], - /^LINKFORSHARED=(.*)PYTHONFRAMEWORKDIR(.*)/, - "LINKFORSHARED=\\1PYTHONFRAMEWORKINSTALLDIR\\2" - - # Fix for https://github.com/Homebrew/homebrew-core/issues/21212 - inreplace Dir[lib_cellar/"**/_sysconfigdata__darwin_darwin.py"], - %r{('LINKFORSHARED': .*?)'(Python.framework/Versions/3.\d+/Python)'}m, - "\\1'#{opt_prefix}/Frameworks/\\2'" + if OS.mac? + # Prevent third-party packages from building against fragile Cellar paths + inreplace Dir[lib_cellar/"**/_sysconfigdata__darwin_darwin.py", + lib_cellar/"config*/Makefile", + frameworks/"Python.framework/Versions/3*/lib/pkgconfig/python-3.?.pc"], + prefix, opt_prefix + + # Help third-party packages find the Python framework + inreplace Dir[lib_cellar/"config*/Makefile"], + /^LINKFORSHARED=(.*)PYTHONFRAMEWORKDIR(.*)/, + "LINKFORSHARED=\\1PYTHONFRAMEWORKINSTALLDIR\\2" + + # Fix for https://github.com/Homebrew/homebrew-core/issues/21212 + inreplace Dir[lib_cellar/"**/_sysconfigdata__darwin_darwin.py"], + %r{('LINKFORSHARED': .*?)'(Python.framework/Versions/3.\d+/Python)'}m, + "\\1'#{opt_prefix}/Frameworks/\\2'" + + # A fix, because python and python3 both want to install Python.framework + # and therefore we can't link both into HOMEBREW_PREFIX/Frameworks + # https://github.com/Homebrew/homebrew/issues/15943 + ["Headers", "Python", "Resources"].each { |f| rm(prefix/"Frameworks/Python.framework/#{f}") } + rm prefix/"Frameworks/Python.framework/Versions/Current" + else + # Prevent third-party packages from building against fragile Cellar paths + inreplace Dir[lib_cellar/"**/_sysconfigdata_*linux_x86_64-*.py", + lib_cellar/"config*/Makefile", + bin/"python#{xy}-config", + lib/"pkgconfig/python-3.?.pc"], + prefix, opt_prefix + + inreplace bin/"python#{xy}-config", + 'prefix_real=$(installed_prefix "$0")', + "real_prefix=#{opt_prefix}" + + inreplace bin/"python#{xy}-config", ' | sed "s#$prefix#$prefix_real#"', "" + end # Symlink the pkgconfig files into HOMEBREW_PREFIX so they're accessible. (lib/"pkgconfig").install_symlink Dir["#{frameworks}/Python.framework/Versions/#{xy}/lib/pkgconfig/*"] # Remove the site-packages that Python created in its Cellar. - (prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/site-packages").rmtree + site_packages_cellar.rmtree %w[setuptools pip wheel].each do |r| (libexec/r).install resource(r) @@ -178,13 +229,17 @@ def install end end + def xy + if OS.mac? && prefix.exist? + (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s + else + version.to_s[/^\d\.\d/] + end + end + def post_install ENV.delete "PYTHONPATH" - xy = (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s - site_packages = HOMEBREW_PREFIX/"lib/python#{xy}/site-packages" - site_packages_cellar = prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/site-packages" - # Fix up the site-packages so that user-installed Python software survives # minor updates, such as going from 3.3.2 to 3.3.3: @@ -240,7 +295,11 @@ def post_install library_dirs = [HOMEBREW_PREFIX/"lib", Formula["openssl@1.1"].opt_lib, Formula["sqlite"].opt_lib] - cfg = prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/distutils/distutils.cfg" + cfg = if OS.mac? + prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/distutils/distutils.cfg" + else + lib_cellar/"distutils/distutils.cfg" + end cfg.atomic_write <<~EOS [install] @@ -252,8 +311,6 @@ def post_install end def sitecustomize - xy = (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s - <<~EOS # This file is created by Homebrew and is executed on each python startup. # Don't print from here, or else python command line scripts may fail! @@ -281,7 +338,7 @@ def sitecustomize # the Cellar site-packages is a symlink to the HOMEBREW_PREFIX # site_packages; prefer the shorter paths long_prefix = re.compile(r'#{rack}/[0-9\._abrc]+/Frameworks/Python\.framework/Versions/#{xy}/lib/python#{xy}/site-packages') - sys.path = [long_prefix.sub('#{HOMEBREW_PREFIX/"lib/python#{xy}/site-packages"}', p) for p in sys.path] + sys.path = [long_prefix.sub('#{site_packages}', p) for p in sys.path] # Set the sys.executable to use the opt_prefix, unless explicitly set # with PYTHONEXECUTABLE: if 'PYTHONEXECUTABLE' not in os.environ: @@ -290,11 +347,6 @@ def sitecustomize end def caveats - xy = if prefix.exist? - (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s - else - version.to_s.slice(/(3\.\d)/) || "3.8" - end <<~EOS Python has been installed as #{opt_bin}/python3 @@ -302,19 +354,18 @@ def caveats You can install Python packages with #{opt_bin}/pip3 install They will install into the site-package directory - #{prefix/"Frameworks/Python.framework/Versions/#{xy}/lib/python#{xy}/site-packages"} + #{site_packages_cellar} See: https://docs.brew.sh/Homebrew-and-Python EOS end test do - xy = (prefix/"Frameworks/Python.framework/Versions").children.min.basename.to_s # Check if sqlite is ok, because we build with --enable-loadable-sqlite-extensions # and it can occur that building sqlite silently fails if OSX's sqlite is used. system "#{bin}/python#{xy}", "-c", "import sqlite3" # Check if some other modules import. Then the linked libs are working. - system "#{bin}/python#{xy}", "-c", "import tkinter; root = tkinter.Tk()" + system "#{bin}/python#{xy}", "-c", "import tkinter; root = tkinter.Tk()" if OS.mac? system "#{bin}/python#{xy}", "-c", "import _gdbm" system "#{bin}/python#{xy}", "-c", "import zlib" system bin/"pip3", "list", "--format=columns" diff --git a/Formula/pytouhou.rb b/Formula/pytouhou.rb index 8109a0358de5b..7be66f4c94a7b 100644 --- a/Formula/pytouhou.rb +++ b/Formula/pytouhou.rb @@ -11,6 +11,7 @@ class Pytouhou < Formula sha256 "e0470e99f10a318e152eeb46e7e555271234e1ee256d26d9115d947bd810beca" => :catalina sha256 "038adcb10d7aa824288b6a67c85cdd7b950d6f3ec5bfefc9a2a37f55c6c96026" => :mojave sha256 "5222b26c38e279f14622baf64a1d2dfab9decf6920533b353eed61b9d9f6b411" => :high_sierra + sha256 "38a24451ea3f52f6cc0da2d197c592da4ecb0069cba6d8f0c5fbc454e629e0d1" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/pyvim.rb b/Formula/pyvim.rb index 62922a662f6cb..a5065c274730c 100644 --- a/Formula/pyvim.rb +++ b/Formula/pyvim.rb @@ -5,12 +5,14 @@ class Pyvim < Formula homepage "https://github.com/jonathanslenders/pyvim" url "https://files.pythonhosted.org/packages/7b/7c/4c44b77642e866bbbe391584433c11977aef5d1dc05da879d3e8476cab10/pyvim-3.0.2.tar.gz" sha256 "da94f7a8e8c4b2b4611196987c3ca2840b0011cc399618793e551f7149f26c6a" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation sha256 "00673aa2851bbd2112035bf5fcb7e4ee5a7a594f5b43c0cf14a27f3727058902" => :catalina sha256 "3526d256cf5ab2be293f7b3a0d80ef648b9847780456de3b21992ec79bb58af6" => :mojave sha256 "b2c764a4186e90c37d43af45fe31432f74ea12566af67a7a9a1103d388fd168c" => :high_sierra + sha256 "9f378efc39fa4d2eb5627963bb057420eaf26ad66820ee71c675c0d451e75ac8" => :x86_64_linux end depends_on "python@3.8" @@ -50,6 +52,8 @@ def install end test do + return if ENV["CI"] + # Need a pty due to https://github.com/jonathanslenders/pyvim/issues/101 require "pty" PTY.spawn(bin/"pyvim", "--help") do |r, _w, _pid| diff --git a/Formula/qca.rb b/Formula/qca.rb index 900a9c0710e23..08e1fec6031fb 100644 --- a/Formula/qca.rb +++ b/Formula/qca.rb @@ -16,7 +16,6 @@ class Qca < Formula end bottle do - cellar :any sha256 "5af8a815c4534787388cf0d11773e62d8ab906e4b68a52a7e3230bdb0dc97249" => :catalina sha256 "c8b2be92c664d56c6e4bc3ced579181127bf263cffcc900c62dc1943bf40cf69" => :mojave sha256 "3735156d4a76e9f18f01fd7c056698f914f2f932650349dda0bd543942057882" => :high_sierra diff --git a/Formula/qcachegrind.rb b/Formula/qcachegrind.rb index 9a30ebefa71ec..0fe14cbc853a1 100644 --- a/Formula/qcachegrind.rb +++ b/Formula/qcachegrind.rb @@ -15,12 +15,17 @@ class Qcachegrind < Formula depends_on "qt" def install - cd "qcachegrind" do + if OS.mac? + cd "qcachegrind" system "#{Formula["qt"].opt_bin}/qmake", "-spec", "macx-clang", "-config", "release" system "make" prefix.install "qcachegrind.app" bin.install_symlink prefix/"qcachegrind.app/Contents/MacOS/qcachegrind" + else + system "qmake", "-config", "release" + system "make" + bin.install "qcachegrind/qcachegrind" end end end diff --git a/Formula/qd.rb b/Formula/qd.rb index 56e412238bd06..6e4958afeb51b 100644 --- a/Formula/qd.rb +++ b/Formula/qd.rb @@ -10,6 +10,7 @@ class Qd < Formula sha256 "381d4980019ee68eb91b62aeea98bc75d481597ec69c05b2d3790eda84b2d979" => :catalina sha256 "686b9051338bcc167bf940beb8d6fbde45a47d5a9051ae61c80567ba998f35f8" => :mojave sha256 "669c57dbb78a65de4fb0001ea0ad5e6a95d506bdf3651d38880901ef691659c3" => :high_sierra + sha256 "db5524c719bb1e1683d8a1b73999dee3c6e0b93a84c3ef80121a54b8e8690280" => :x86_64_linux end depends_on "gcc" # for gfortran diff --git a/Formula/qdae.rb b/Formula/qdae.rb index 5c4e237b8cf88..1173fb8b083d5 100644 --- a/Formula/qdae.rb +++ b/Formula/qdae.rb @@ -9,6 +9,7 @@ class Qdae < Formula sha256 "d951231205b4f4faf3e4f829665d25c82d236f3f52339dd5664fb8adb46e68eb" => :catalina sha256 "290d931e61684c53227e0a16d808427eb7218fbec76c57eb250c03dbf15bb6b8" => :mojave sha256 "945b28c4354053f3ebd81bb868ef6a14d8fef1c32d6cebd73455bd17f17332ae" => :high_sierra + sha256 "741517aa60c4fc9356f075b46d40393d33dfd9987c1c1b51608a55d0e08a03bf" => :x86_64_linux end depends_on "libxml2" diff --git a/Formula/qdbm.rb b/Formula/qdbm.rb index 28c03269d594f..451ecf6c37697 100644 --- a/Formula/qdbm.rb +++ b/Formula/qdbm.rb @@ -22,9 +22,15 @@ def install "--enable-bzip", "--enable-zlib", "--enable-iconv" - system "make", "mac" - system "make", "check-mac" - system "make", "install-mac" + if OS.mac? + system "make", "mac" + system "make", "check-mac" + system "make", "install-mac" + else + system "make" + system "make", "check" + system "make", "install" + end end test do diff --git a/Formula/qemu.rb b/Formula/qemu.rb index 05417175cf807..0dda867839589 100644 --- a/Formula/qemu.rb +++ b/Formula/qemu.rb @@ -46,10 +46,12 @@ def install --enable-libssh --enable-vde --extra-cflags=-DNCURSES_WIDECHAR=1 - --enable-cocoa --disable-sdl --disable-gtk ] + + args << "--enable-cocoa" if OS.mac? + # Sharing Samba directories in QEMU requires the samba.org smbd which is # incompatible with the macOS-provided version. This will lead to # silent runtime failures, so we set it to a Homebrew path in order to diff --git a/Formula/qhull.rb b/Formula/qhull.rb index 47f47166b902a..53924f06264c9 100644 --- a/Formula/qhull.rb +++ b/Formula/qhull.rb @@ -11,6 +11,7 @@ class Qhull < Formula sha256 "45f8b6efc0a77e4fd613ef527d6c55545908f860106d4355bd753ad07a934bd1" => :catalina sha256 "61a2fab7f2854401bdffe54b889a1e2b9d90f6a11e52aba80688875b8f7d08a5" => :mojave sha256 "36e0e4a621e0c89746584562634768ccb93e71fc500230133620db030b1cc05a" => :high_sierra + sha256 "72dd36ad51ab9dc2d718a241f863dc8d4d55f24ba9e3eeed05e52ecfd73d8e29" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/qp.rb b/Formula/qp.rb index 82f54546a9316..23642a3da569f 100644 --- a/Formula/qp.rb +++ b/Formula/qp.rb @@ -9,6 +9,7 @@ class Qp < Formula sha256 "a65499deed12110ed5a21f3bbd657acdaaf1452dea48877caac93bda55759370" => :catalina sha256 "f119afd6bacbac5af055c398a2dfb5c4f62c8f113bcb9e12dab825800fd8e744" => :mojave sha256 "d9c595a53f82ddd9f086fac02a5f8da34e65d9b0e7564fce02148304704457ed" => :high_sierra + sha256 "587d90c062d242ba7bf3b632d2339444910cd94904ddedbad3b0cbbee9ed2596" => :x86_64_linux end depends_on "quickjs" => :build diff --git a/Formula/qpdf.rb b/Formula/qpdf.rb index 521d6a447f975..2023750dc32f3 100644 --- a/Formula/qpdf.rb +++ b/Formula/qpdf.rb @@ -9,6 +9,7 @@ class Qpdf < Formula sha256 "5ccc930f3c428ba0838eb50778c5e0fbe7c984fb43b468ba959714d70a7813eb" => :catalina sha256 "38a233da22d6a6e00fea01f8aff2f609c27915fdf9a86687b44153cdf2c07f07" => :mojave sha256 "4615f85d75741f053733eb37f12c35e3264492f00e9086530f2a40c710a0d7ea" => :high_sierra + sha256 "4627d98e41eda1d67b4dcd3575fbb8d1385792b4ef8707fc0bb4caf9e5c78308" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/qpid-proton.rb b/Formula/qpid-proton.rb index 479ad71a103e2..595dd93906d7d 100644 --- a/Formula/qpid-proton.rb +++ b/Formula/qpid-proton.rb @@ -11,6 +11,7 @@ class QpidProton < Formula sha256 "0a141799096c2d617e2a2c37a2878289b910b3519d1b1c67ad5f89f9258465fc" => :catalina sha256 "95cdc65b975386aeea18453d2459a74482d21af14f78d1258f70214b233c6dbc" => :mojave sha256 "04c42fdd07d1e9e489b7e42ac552aa48ddb0fc98fb71a71e4795dbfa348a3c2e" => :high_sierra + sha256 "52fa3975c9181fecc1db9dca9e28aafc1d5e0359c9ca996fe4ac755db9202f5a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/qpm.rb b/Formula/qpm.rb index 770788a550328..89d32ef2fbc00 100644 --- a/Formula/qpm.rb +++ b/Formula/qpm.rb @@ -11,6 +11,7 @@ class Qpm < Formula sha256 "5d5edc32931995dfa82429a1d8708e700de70208f36767808a433c1e9bb2ffb2" => :catalina sha256 "f8208ec60e2af6e9d1da2caa0ad1b48b5b027955c2daa51860fa1606b8c5acef" => :mojave sha256 "8c9d0dde0b7a4292f8fa04337805755ac16ce1aab08710463323afec2f73d551" => :high_sierra + sha256 "a92d70ed20863261641114d20ec7323a4447d7ef3e6c8b876d35498346f7d231" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/qprint.rb b/Formula/qprint.rb index 402f276adafe9..e7c61b8c63899 100644 --- a/Formula/qprint.rb +++ b/Formula/qprint.rb @@ -13,6 +13,7 @@ class Qprint < Formula sha256 "9660443356a1f9571b39ea496349482e17f7c0d06829dd06945ca7680291c0bf" => :el_capitan sha256 "92470bcb0bd97c4d13181969ebeb0339faa85338ad139bf4a5ac19550635f5c1" => :yosemite sha256 "fbf2eadbf60b30557e3741e28545070bb377602aa8f1c1c49b5f65375381a2c4" => :mavericks + sha256 "7b59ae91b286cf33e2a00853cf570d7d2113f46322383188a8419e06b7b86ea7" => :x86_64_linux end def install diff --git a/Formula/qrcp.rb b/Formula/qrcp.rb index b1b9cb759cc02..1d778930452f1 100644 --- a/Formula/qrcp.rb +++ b/Formula/qrcp.rb @@ -9,6 +9,7 @@ class Qrcp < Formula sha256 "857aa5ad50a7a2124a1c37f7f206b25a65d9f3c76bae0ec9223945238c83d0eb" => :catalina sha256 "5a1bede14f849cd49815b351325d5f375a9d7dc4d7ae8abd4053505f3fc1b6b0" => :mojave sha256 "aba7e5ceb1c788d2eeae3e117e6dcae5c14530e5b759832adac7a6f4296565cd" => :high_sierra + sha256 "b2c2e39e419678c35eb87516efa36c9f5f49e57c5272ff3ba7e611c41117edd7" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/qrencode.rb b/Formula/qrencode.rb index be0810fbdf21b..20624d6f8efdb 100644 --- a/Formula/qrencode.rb +++ b/Formula/qrencode.rb @@ -11,6 +11,7 @@ class Qrencode < Formula sha256 "a541a4b376c69168e1d3392c90810893e02bfc1ba235437453018495901a0171" => :high_sierra sha256 "9b876f9388c74c61e1d5a3c87663b424c4215e546c37a3a8e1543e5de976988d" => :sierra sha256 "83b2cb0f1f60421584a5e6694907ccb636834349a61a40dc8e1a40272a95cc9f" => :el_capitan + sha256 "99f0d2035fafe9951277c252e2b63db802dabf330244e05bac7e89a46a1ba407" => :x86_64_linux end head do diff --git a/Formula/qrupdate.rb b/Formula/qrupdate.rb index 83e6715100101..d907bb429d1ac 100644 --- a/Formula/qrupdate.rb +++ b/Formula/qrupdate.rb @@ -10,6 +10,7 @@ class Qrupdate < Formula sha256 "a889b3e1cc1687c9c66d4a211af53eca5b8e2df93f83bdd8d7f0e93d03181921" => :catalina sha256 "9777925cc61c2c29a9d0bae3681ac3afaa00de667c34b5fc2f37f4872acd1016" => :mojave sha256 "67079bff23bf70ed8688b65d18096f55f9f19eb405b1ef4e2b297072e4ea3c91" => :high_sierra + sha256 "39dc6b48d5fac1d54c9a4b569bb959522d120f6a55fa1a2d407b2c243ff733ca" => :x86_64_linux end depends_on "gcc" # for gfortran diff --git a/Formula/qt.rb b/Formula/qt.rb index 6036429f9f499..ee25543a788fc 100644 --- a/Formula/qt.rb +++ b/Formula/qt.rb @@ -19,9 +19,35 @@ class Qt < Formula keg_only "Qt 5 has CMake issues when linked" + disable! if ENV["CI"] + depends_on "pkg-config" => :build - depends_on :xcode => :build - depends_on :macos => :sierra + depends_on :xcode => :build if OS.mac? + depends_on :macos => :sierra if OS.mac? + + unless OS.mac? + depends_on "fontconfig" + depends_on "glib" + depends_on "gperf" + depends_on "icu4c" + depends_on "libproxy" + depends_on "libxkbcommon" + depends_on "linuxbrew/xorg/libdrm" + depends_on "linuxbrew/xorg/libice" + depends_on "linuxbrew/xorg/libsm" + depends_on "linuxbrew/xorg/libxcomposite" + depends_on "linuxbrew/xorg/wayland" + depends_on "linuxbrew/xorg/xcb-util" + depends_on "linuxbrew/xorg/xcb-util-image" + depends_on "linuxbrew/xorg/xcb-util-keysyms" + depends_on "linuxbrew/xorg/xcb-util-renderutil" + depends_on "linuxbrew/xorg/xcb-util-wm" + depends_on "mesa" + depends_on "pulseaudio" + depends_on "python" + depends_on "systemd" + depends_on "zstd" + end uses_from_macos "bison" uses_from_macos "flex" @@ -36,24 +62,46 @@ class Qt < Formula end def install + # Workaround for disk space issues on github actions + # https://github.com/Homebrew/linuxbrew-core/pull/19595 + system "/home/linuxbrew/.linuxbrew/bin/brew", "cleanup", "--prune=0" if ENV["CI"] + args = %W[ -verbose -prefix #{prefix} -release -opensource -confirm-license - -system-zlib -qt-libpng -qt-libjpeg -qt-freetype -qt-pcre -nomake examples -nomake tests - -no-rpath -pkg-config -dbus-runtime -proprietary-codecs ] + if OS.mac? + args << "-no-rpath" + args << "-system-zlib" + elsif OS.linux? + args << "-system-xcb" + args << "-R#{lib}" + # https://bugreports.qt.io/browse/QTBUG-71564 + args << "-no-avx2" + args << "-no-avx512" + args << "-qt-zlib" + # https://bugreports.qt.io/browse/QTBUG-60163 + # https://codereview.qt-project.org/c/qt/qtwebengine/+/191880 + args += %w[-skip qtwebengine] + args -= ["-proprietary-codecs"] + end + + inreplace %w[qtdeclarative/qtdeclarative.pro qtdeclarative/src/3rdparty/masm/masm.pri] do |s| + s.gsub! "python ", "python3 " + end + system "./configure", *args # Remove reference to shims directory diff --git a/Formula/qtfaststart.rb b/Formula/qtfaststart.rb index 7c17f30c2fe60..0455ebf01db4b 100644 --- a/Formula/qtfaststart.rb +++ b/Formula/qtfaststart.rb @@ -10,6 +10,7 @@ class Qtfaststart < Formula sha256 "abce3f470e0a8b62acd78aa2c58114a3e5b64d7b2117d8ffbaadc23c4eee186e" => :catalina sha256 "2fac027c66defdafcbaee5b346fd5c5e6c11b5e9a267de40d604b8e837f5d2c4" => :mojave sha256 "073794a6af64b0fe9f2bc22480b4c605f9497c5ae9087d26fa8e51bdc0230b00" => :high_sierra + sha256 "4c79b4b65fba2c35a78994ca5053be3c0a85dc45d6726352273d566aa89cd013" => :x86_64_linux end resource "mov" do diff --git a/Formula/qtkeychain.rb b/Formula/qtkeychain.rb index 0c5ab55ad5168..e321bd61048af 100644 --- a/Formula/qtkeychain.rb +++ b/Formula/qtkeychain.rb @@ -27,10 +27,19 @@ def install return 0; } EOS - system ENV.cxx, "test.cpp", "-o", "test", "-std=c++11", "-I#{include}", - "-L#{lib}", "-lqt5keychain", - "-I#{Formula["qt"].opt_include}", - "-F#{Formula["qt"].opt_lib}", "-framework", "QtCore" + args = ["test.cpp", "-o", "test", "-std=c++11", "-I#{include}", + "-L#{lib}", "-lqt5keychain", + "-I#{Formula["qt"].opt_include}"] + if OS.mac? + args += ["-F#{Formula["qt"].opt_lib}", "-framework", "QtCore"] + else + # Fix error: You must build your code with position independent code if Qt was built with -reduce-relocations. + args += [ + "-fPIC", "-L#{Formula["qt"].opt_lib}", + "-lQt5Core", "-Wl,-rpath=#{lib}/x86_64-linux-gnu:#{Formula["qt"].lib}" + ] + end + system ENV.cxx, *args system "./test" end end diff --git a/Formula/quantlib.rb b/Formula/quantlib.rb index 946b97964c9c1..d9b07b82df0c9 100644 --- a/Formula/quantlib.rb +++ b/Formula/quantlib.rb @@ -9,6 +9,7 @@ class Quantlib < Formula sha256 "1e89efdb70a7a64b10a475202070d39390fffabc0801227acf8723b6194037c4" => :catalina sha256 "f2bab0408cf9d6f412d6c6a9eeeab9e1ca776257eb2a6d30496bf4646eb76af3" => :mojave sha256 "ff0934abb2b65d970b00c7217d8563bd6757cf9cb8a02c5e9e5cec8428ecd661" => :high_sierra + sha256 "705e9c6126b10a9e74cbe338fd5a6100a5abae7f81ff7d6da7147ccbf5731cd3" => :x86_64_linux end head do diff --git a/Formula/quex.rb b/Formula/quex.rb index 8dbd0f7cdd212..025a20c45657d 100644 --- a/Formula/quex.rb +++ b/Formula/quex.rb @@ -10,6 +10,7 @@ class Quex < Formula sha256 "f3d39a7468e8c529ce1c0d6ab5b2d028f50771304993e9f2e996490f846c4b6c" => :catalina sha256 "f3d39a7468e8c529ce1c0d6ab5b2d028f50771304993e9f2e996490f846c4b6c" => :mojave sha256 "f3d39a7468e8c529ce1c0d6ab5b2d028f50771304993e9f2e996490f846c4b6c" => :high_sierra + sha256 "ef42df0a4413a021056ceb695796065a083651c29f89f9a2f78e707ae3a1b823" => :x86_64_linux end depends_on :macos # Due to Python 2 (Migration to Python 3 has started) diff --git a/Formula/quickjs.rb b/Formula/quickjs.rb index ef4b6ec64d45d..41a1cc889424d 100644 --- a/Formula/quickjs.rb +++ b/Formula/quickjs.rb @@ -8,6 +8,7 @@ class Quickjs < Formula sha256 "05d2f8998a2fd13bb606e0bb74d3eef3a0b80977edf6e543b98fd0320715733d" => :catalina sha256 "4c7dc36152c0a7d04ab3be8ef7f22c91332816dada0a1c66ad87df3537237dd7" => :mojave sha256 "49747bbada54cb4b97c218a5fbc202247a0820e5c7f6f9ccaf7001b7581a3fdc" => :high_sierra + sha256 "6354cf6567968e5aa2248da36014894f0b55467ea48d2a8a143bd2ed3833c537" => :x86_64_linux end # Fix build on macOS @@ -42,5 +43,5 @@ def install +#define environ (*_NSGetEnviron ()) #endif #endif - + #include "cutils.h" diff --git a/Formula/quicktype.rb b/Formula/quicktype.rb index 99fdfb22c1d28..c2b2d4ec8c064 100644 --- a/Formula/quicktype.rb +++ b/Formula/quicktype.rb @@ -13,6 +13,7 @@ class Quicktype < Formula sha256 "c6dcb4ca8f02a79d042691aa9780ff118421cbb00d6dd1dff170c0f5880e1e3e" => :catalina sha256 "b9a4a53503d75d0a6e31b67d52688aa484819abd5e539621cb0ddffd0892eeb2" => :mojave sha256 "840ae4619f54bb0f2e70e1b1580be76a1361c0fb15deb559d3897f2381bdd52c" => :high_sierra + sha256 "48c1b3ec64b953c24276bcf5b35ce005cec4a073c36304abf66ff64b2f81cf71" => :x86_64_linux end depends_on "node" diff --git a/Formula/quilt.rb b/Formula/quilt.rb index 3c0142b04ba16..d14d9f820f9aa 100644 --- a/Formula/quilt.rb +++ b/Formula/quilt.rb @@ -11,6 +11,7 @@ class Quilt < Formula sha256 "5d7f412108ec8831b8b6bfbc8e41d8b577523ffd66f9d095853a4680ec23b04f" => :mojave sha256 "691a01a091194910f0848aea529b331559fb98d44e9821c1ebafba51d2a2d62c" => :high_sierra sha256 "2305addd5b8f4b256701b2ec89ec9caffa4699dae48e63f8cac0478545b5d860" => :sierra + sha256 "65f43cc70c716b90cbdd3ca17db5dfbc81481ac650a1bacfa584231a706835af" => :x86_64_linux end depends_on "coreutils" @@ -18,7 +19,7 @@ class Quilt < Formula def install system "./configure", "--prefix=#{prefix}", - "--with-sed=#{HOMEBREW_PREFIX}/bin/gsed", + ("--with-sed=#{HOMEBREW_PREFIX}/bin/gsed" if OS.mac?), "--without-getopt" system "make" system "make", "install", "emacsdir=#{elisp}" diff --git a/Formula/quotatool.rb b/Formula/quotatool.rb index f85ec57c93ab3..506a0f6312cd3 100644 --- a/Formula/quotatool.rb +++ b/Formula/quotatool.rb @@ -13,6 +13,7 @@ class Quotatool < Formula sha256 "da5c90f85204fa90a38da073765ec5c0f0a20333bcdcd131d79b682afa74233f" => :el_capitan sha256 "8af3549d42247f0b79458c96978f8f5e5fbe04cc1c0dd86f84accdf03e8e510f" => :yosemite sha256 "724a3fc561188de5e0e050f7459480cc8c613d399faee5290ec7a68b9715960d" => :mavericks + sha256 "83ce70d23b5c84d09b07c26544c977e2f5ceb96efeb2f860c75256948b3c1efe" => :x86_64_linux end def install diff --git a/Formula/quvi.rb b/Formula/quvi.rb index 2fa35677d03a6..afe3f6f2acfc4 100644 --- a/Formula/quvi.rb +++ b/Formula/quvi.rb @@ -12,6 +12,7 @@ class Quvi < Formula sha256 "c5a8c9b53432e15b4ec31a9c1374bde130d56f73f8ee43e392917a52f34ab945" => :el_capitan sha256 "944922426376a9962bb90f032e02ef2404d3155ed3bba81a0b4d349ba1f1aec8" => :yosemite sha256 "631889c5bfbfa3741a33efb350b020abaffd163016d375bfa41aedf5cf93262e" => :mavericks + sha256 "701a97d35a6a548bc5bd466dc6664359a77594a9af049f60fa5dd3d93c2566f6" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/qwt.rb b/Formula/qwt.rb index eeb6212b8fb54..96f396257d9c4 100644 --- a/Formula/qwt.rb +++ b/Formula/qwt.rb @@ -27,10 +27,10 @@ def install end args = ["-config", "release", "-spec"] - args << if ENV.compiler == :clang - "macx-clang" - else - "macx-g++" + if ENV.compiler == :clang + args << "macx-clang" + elsif OS.mac? + args << "macx-g++" end system "qmake", *args diff --git a/Formula/r.rb b/Formula/r.rb index 47767a4c55753..8d395cf382f02 100644 --- a/Formula/r.rb +++ b/Formula/r.rb @@ -8,6 +8,7 @@ class R < Formula sha256 "ccbb18220233c6d55de69ca8a57a134305868d5e34438f9e939e5a6f1bedc464" => :catalina sha256 "91439cf61cb8236fa9354bf239d1ee38ecfb9843b4fb03d684e6dcaefa3ce84a" => :mojave sha256 "d452e16c7f1f6ddaac033ee01bf34c1a97987ce963a626a5da35fd3290179114" => :high_sierra + sha256 "c4519d7733e1a8c72a6a2a30e37cf621db789a1215ee4a1bdfc0526d5d18f182" => :x86_64_linux end depends_on "pkg-config" => :build @@ -20,6 +21,13 @@ class R < Formula depends_on "readline" depends_on "xz" + unless OS.mac? + depends_on "cairo" + depends_on "curl" + depends_on "pango" + depends_on "linuxbrew/xorg/xorg" + end + # needed to preserve executable permissions on files without shebangs skip_clean "lib/R/bin", "lib/R/doc" @@ -33,23 +41,40 @@ def install args = [ "--prefix=#{prefix}", "--enable-memory-profiling", - "--without-cairo", - "--without-tcltk", - "--without-x", - "--with-aqua", "--with-lapack", "--enable-R-shlib", - "SED=/usr/bin/sed", # don't remember Homebrew's sed shim "--disable-java", "--with-blas=-L#{Formula["openblas"].opt_lib} -lopenblas", ] + # don't remember Homebrew's sed shim + args << "SED=/usr/bin/sed" if File.exist?("/usr/bin/sed") + + if OS.mac? + args << "--without-cairo" + args << "--without-tcltk" + args << "--without-x" + args << "--with-aqua" + end + + unless OS.mac? + args << "--libdir=#{lib}" # avoid using lib64 on CentOS + args << "--with-cairo" + + # If LDFLAGS contains any -L options, configure sets LD_LIBRARY_PATH to + # search those directories. Remove -LHOMEBREW_PREFIX/lib from LDFLAGS. + ENV.remove "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib" + end + # Help CRAN packages find gettext and readline ["gettext", "readline"].each do |f| ENV.append "CPPFLAGS", "-I#{Formula[f].opt_include}" ENV.append "LDFLAGS", "-L#{Formula[f].opt_lib}" end + # Avoid references to homebrew shims + args << "LD=ld" unless OS.mac? + system "./configure", *args system "make" ENV.deparallelize do @@ -76,8 +101,10 @@ def install lib.install_symlink Dir[r_home/"lib/*"] # avoid triggering mandatory rebuilds of r when gcc is upgraded - inreplace lib/"R/etc/Makeconf", Formula["gcc"].prefix.realpath, - Formula["gcc"].opt_prefix + inreplace lib/"R/etc/Makeconf", + Formula["gcc"].prefix.realpath, + Formula["gcc"].opt_prefix, + OS.mac? end def post_install @@ -89,8 +116,9 @@ def post_install end test do + dylib_ext = OS.mac? ? ".dylib" : ".so" assert_equal "[1] 2", shell_output("#{bin}/Rscript -e 'print(1+1)'").chomp - assert_equal ".dylib", shell_output("#{bin}/R CMD config DYLIB_EXT").chomp + assert_equal dylib_ext, shell_output("#{bin}/R CMD config DYLIB_EXT").chomp system bin/"Rscript -e \'install.packages(\"gss\", \".\", \"https://cloud.r-project.org\")\'" assert_predicate testpath/"gss/libs/gss.so", :exist?, diff --git a/Formula/r3.rb b/Formula/r3.rb index 50298884737da..2550c0e5c1e8c 100644 --- a/Formula/r3.rb +++ b/Formula/r3.rb @@ -14,6 +14,7 @@ class R3 < Formula sha256 "6122bbc3566581f130e54cd563ed69f169598f5ce62d6319e7b5a95b10b802ef" => :el_capitan sha256 "56a37f8cab8af3833eb52c6fc739027ffd755fb0e60530bd96dc643bdb8e18ed" => :yosemite sha256 "26bd4bc4114b54d57d9f39bd00f15914f03eea7407fbcc50df4c1925b412a879" => :mavericks + sha256 "cf234e2c2adb20bf5e74b14b92fffa4ad3efd5446a0d68f1cc4810728ad9ba3f" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/rabbitmq-c.rb b/Formula/rabbitmq-c.rb index 58d6226fd7eba..b77a1d20c88f5 100644 --- a/Formula/rabbitmq-c.rb +++ b/Formula/rabbitmq-c.rb @@ -10,6 +10,7 @@ class RabbitmqC < Formula sha256 "6434a9100eeadfcd57d35fd31d1863d75b71ec163a3a1be29076c217712bda55" => :catalina sha256 "5f99c633ece8efad2ef2085955b22d0558d8fc2dedcac67b3ba8b58a2640c2c3" => :mojave sha256 "53d883744a185e5daab18c8bd18fd70fed56dd009cc507356f128663947c2453" => :high_sierra + sha256 "4c472bd2e1a7fd4b14ed0c0bf8a5a9a2bbfec53a398e1738dc65848fc7a3b3e9" => :x86_64_linux end depends_on "cmake" => :build @@ -22,6 +23,11 @@ def install "-DBUILD_TESTS=OFF", "-DBUILD_API_DOCS=OFF", "-DBUILD_TOOLS=ON" system "make", "install" + + if (lib/"x86_64-linux-gnu").directory? + lib.install Dir[lib/"x86_64-linux-gnu/*"] + rmdir lib/"x86_64-linux-gnu" + end end test do diff --git a/Formula/rabbitmq.rb b/Formula/rabbitmq.rb index 219e6a0e66611..b102438584399 100644 --- a/Formula/rabbitmq.rb +++ b/Formula/rabbitmq.rb @@ -44,7 +44,7 @@ def install # Extract rabbitmqadmin and install to sbin # use it to generate, then install the bash completion file - system "/usr/bin/unzip", "-qq", "-j", + system (OS.mac? ? "/usr/bin/unzip" : "unzip"), "-qq", "-j", "#{prefix}/plugins/rabbitmq_management-#{version}.ez", "rabbitmq_management-#{version}/priv/www/cli/rabbitmqadmin" diff --git a/Formula/rack.rb b/Formula/rack.rb index 4ed4bcee69c31..4a5495aa0ed51 100644 --- a/Formula/rack.rb +++ b/Formula/rack.rb @@ -15,6 +15,7 @@ class Rack < Formula sha256 "9e77b25dce5ebddece476a84fa04b32d3c904f4a825db343b128a8b3b4a4f4fd" => :sierra sha256 "7a17ae415465e10b0b5674218d5fb127c03782b5f49e741d8a84f94cde7c658a" => :el_capitan sha256 "d49a8f87439a1584e1662a570c7a40611d6cf13064e37f3a66cb7e1feaaa5719" => :yosemite + sha256 "ebb560d0e20167643d01c265c22ae1b83791e20a6cf4de7e8a1c9509e9ec7003" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/radamsa.rb b/Formula/radamsa.rb index 5dc88cf8fde38..3bb1a107178c5 100644 --- a/Formula/radamsa.rb +++ b/Formula/radamsa.rb @@ -9,6 +9,7 @@ class Radamsa < Formula sha256 "97fe42099e0b4278519ee560af5a38dd0cb5055e7542cd892d4c4f96d93960c5" => :catalina sha256 "a4d9d9e07ff76b8bb51333a04d645ea0213663dc635bdea890b1cffb7f2e6543" => :mojave sha256 "82d2231dcb25adb55f62690bd34d2b4b8978a3d22b956c0f0f2e20640d31c7a0" => :high_sierra + sha256 "8e8e06de456f7dc2ca7fe87333ae5346af50d283dc3ac4d9993abe2546133f9c" => :x86_64_linux end resource "owl" do diff --git a/Formula/radare2.rb b/Formula/radare2.rb index 0bae0b4f6ee93..c0905ee428968 100644 --- a/Formula/radare2.rb +++ b/Formula/radare2.rb @@ -9,6 +9,7 @@ class Radare2 < Formula sha256 "cbf47bb485878d4fda41e03e67493b0628ed1021ac97ea663736b3725f243f43" => :catalina sha256 "711e8178801c48a24b84a7ccae21491e07205735eb1e4bd693516a0bc13673eb" => :mojave sha256 "0893017e56d16e2e692a8928756b89e29df351852999d523f8a7f1c2f7e2e20d" => :high_sierra + sha256 "0294ecc6600103b3809263f6c7101b85e204b4813dd7b0fa385d05b29872fefe" => :x86_64_linux end def install diff --git a/Formula/ragel.rb b/Formula/ragel.rb index cd925c5acc1d8..08d0b1e40ffcd 100644 --- a/Formula/ragel.rb +++ b/Formula/ragel.rb @@ -12,6 +12,7 @@ class Ragel < Formula sha256 "69d6d65c2ef3da7b829e3391fd17b1ef088b92c2baf64979707033e2a7dd8c01" => :sierra sha256 "f4ea3a8c0476fd82000223fae69170ac9f266cd36334bd60d9d6cf4fab3273c1" => :el_capitan sha256 "dd8469ac3e08d5d8a257ce7fc7de05de398e8521abff83eceea0741099685b38" => :yosemite + sha256 "f3663a760b85bb4beb623a7cbd3954a4cf18120c6aee5b9abdcd04974cd15621" => :x86_64_linux end resource "pdf" do diff --git a/Formula/rakudo-star.rb b/Formula/rakudo-star.rb index 1ad67bae200a2..c35486f47d02a 100644 --- a/Formula/rakudo-star.rb +++ b/Formula/rakudo-star.rb @@ -9,6 +9,7 @@ class RakudoStar < Formula sha256 "3a2d22c17772726872aefb5afbf216f6640c0bcb441c98a9e27aab73b0edaeff" => :catalina sha256 "b53dab6ef44c73ea480ce74577a6b4f1593e124d2e5e502d3e134a6e81d7c054" => :mojave sha256 "e4ecc1142965f84eb7197d8388390d8968f5e7505628bed3b8e2c41a98c324f7" => :high_sierra + sha256 "576f85b0f20581ac0ca3bf96e443c12284e9f7498eede1b907a3cf8cb0fd62ec" => :x86_64_linux end depends_on "gmp" diff --git a/Formula/rancher-cli.rb b/Formula/rancher-cli.rb index 7c20df543a861..8869f18dfb798 100644 --- a/Formula/rancher-cli.rb +++ b/Formula/rancher-cli.rb @@ -10,6 +10,7 @@ class RancherCli < Formula sha256 "fc15fd956ef932aca1ea71f708e3825426d72d4d1de22f792f635f23fd7d58b2" => :catalina sha256 "a02a7621b1dc51132808e15af97ad598dcaf10b0aa20c9c140adf2b7e1a9eca6" => :mojave sha256 "1de5ece489498a95029d1740daba354fee2da5f955561fc67804ffcfc629b7d6" => :high_sierra + sha256 "0d25de44d7d7b392de0c156ab373cec3597cf0b7a52a2151d6078ab1e6355856" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/rancher-compose.rb b/Formula/rancher-compose.rb index 47ac99ea2603c..baf2cac065018 100644 --- a/Formula/rancher-compose.rb +++ b/Formula/rancher-compose.rb @@ -12,6 +12,7 @@ class RancherCompose < Formula sha256 "08f3fad4e6c1df545dd908b61afe47ed489e682ad2cadab384066237498a2a04" => :sierra sha256 "8503ea7d7ca208ca7fe8d0c0b81f9ab9b69d926c58f856ac9de4f9f3600cde17" => :el_capitan sha256 "23291133a0a775210ae1244ae594931ce04fab8e7c0a37ba90431d61d869317b" => :yosemite + sha256 "faf44369ddd3b4e994478751d1076b59aa6664cb433acb5ca5a6c6b0405a35c5" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/randomize-lines.rb b/Formula/randomize-lines.rb index 1e77a84aef947..c277755aa5e32 100644 --- a/Formula/randomize-lines.rb +++ b/Formula/randomize-lines.rb @@ -13,6 +13,7 @@ class RandomizeLines < Formula sha256 "e61c986a537a9f0c77b1382add72096e72f7447ef50ac8acc01320014681e691" => :el_capitan sha256 "fbffa3106ec600894f313f9770f1336227e2bf149f10c487344f26b4bf8f1093" => :yosemite sha256 "ec4fc7a2361d75b1b76d0b4edfdb39aae104a9c054eaae07f0b0ee55762fe485" => :mavericks + sha256 "ac2d00d7f7d21560f21586b4e9b50b1a5776251cf1c39c3ceca0117763ff3843" => :x86_64_linux end def install diff --git a/Formula/ranger.rb b/Formula/ranger.rb index b55cb6841d945..43e6b58ad05c3 100644 --- a/Formula/ranger.rb +++ b/Formula/ranger.rb @@ -7,6 +7,8 @@ class Ranger < Formula bottle :unneeded + depends_on "python" unless OS.mac? + def install man1.install "doc/ranger.1" libexec.install "ranger.py", "ranger" @@ -15,6 +17,7 @@ def install end test do - assert_match version.to_s, shell_output("script -q /dev/null #{bin}/ranger --version") + cmd = OS.mac? ? "script -q /dev/null #{bin}/ranger --version" : "#{bin}/ranger --version" + assert_match version.to_s, shell_output(cmd) end end diff --git a/Formula/rapidjson.rb b/Formula/rapidjson.rb index 2070e2c0cd295..71d533423b593 100644 --- a/Formula/rapidjson.rb +++ b/Formula/rapidjson.rb @@ -14,6 +14,7 @@ class Rapidjson < Formula sha256 "d0b949a9bd043535e2ff3e032b45b26de0083d319bc094db7ccc1edfea6cbdb3" => :el_capitan sha256 "252ec61e7d5cba129a888bb566d4f2b61bd1bd2886de637f48afa638e6764007" => :yosemite sha256 "806e4c788a675bbb0cff3cc9af68f8cdf46ac3d5bf49a47a94b331cc67ca0f4d" => :mavericks + sha256 "f086510b72c1c87960df0e6ad707afb46e0d59e6b8298209f20a1ec3d0a2007f" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/raptor.rb b/Formula/raptor.rb index 513a9a0c60632..448db07a9273f 100644 --- a/Formula/raptor.rb +++ b/Formula/raptor.rb @@ -13,6 +13,7 @@ class Raptor < Formula sha256 "cc2feb9cd1d6f9eb0f511853f19c43bc96d143de6a73edfd3cdb854647d1d14a" => :el_capitan sha256 "c23392012fb5edffbe800771eaee6ae81d288e62c477c27332474f2ed342d1b3" => :yosemite sha256 "5e640e01d5cdd6899ca00704ba581358d254f7cfb9b81d62c901c825bb347681" => :mavericks + sha256 "a04c8786feb2bc0715a9e3b1f1f306311840c1cae53a4251eb0dae25da22065e" => :x86_64_linux # glibc 2.19 end uses_from_macos "libxml2" diff --git a/Formula/rargs.rb b/Formula/rargs.rb index e6518f1ee49ca..44569ccf74d4a 100644 --- a/Formula/rargs.rb +++ b/Formula/rargs.rb @@ -9,6 +9,7 @@ class Rargs < Formula sha256 "37d5a3c2a5608eb4a10df0814a1334b88602a7200fdf99db60113f7aea598489" => :catalina sha256 "1c24f60f8b91301cd167b0040e2c9ec7895fe818eeb21f13d40fca94e6f4f08b" => :mojave sha256 "9cea3ec1abc342281b94649496e0d28275eead691238a2d03e47c2621afc9801" => :high_sierra + sha256 "25eba46b8fd020e3428667688f69136105c3dd92eff27b399e9cda3c61754127" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/rarian.rb b/Formula/rarian.rb index 2f64050ae8928..8786f429b49b7 100644 --- a/Formula/rarian.rb +++ b/Formula/rarian.rb @@ -12,6 +12,7 @@ class Rarian < Formula sha256 "7784dc13b95c0c2f5818bc3657da52f0365bbe9c6ddf8871d81b8638cb89390c" => :el_capitan sha256 "069ff9e17c252271d058e72f38eedb2e1196cee49598e1537c64bd45b7f356e6" => :yosemite sha256 "1a81d2fe1bb961b9b479da410046f24fa65df8db7cac5ee0853cc09f380f6bc4" => :mavericks + sha256 "ee0188851e808392329ccbf64a40eb43b03df5703fc83e74ab1a5f9fbec59235" => :x86_64_linux end conflicts_with "scrollkeeper", diff --git a/Formula/rasqal.rb b/Formula/rasqal.rb index 6241cdb0dc480..6744af1e4697b 100644 --- a/Formula/rasqal.rb +++ b/Formula/rasqal.rb @@ -13,6 +13,7 @@ class Rasqal < Formula sha256 "fa7368eb30256eb80ead76f7b551bc5980ed15ae8aa655d332a200edb073c2a3" => :el_capitan sha256 "c84ec1a4c837b4a30fe597c9cc728f5075764b87978c5977757e2836db3eca0b" => :yosemite sha256 "8bef11d9b2763b72cb5576926bd251175c2b0c4c7dec6ffc666f98720341ba27" => :mavericks + sha256 "64bb0e2402fb5667201207d1499b880dbea2add73bd00ca47d32d5f3b42fbe33" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/ratfor.rb b/Formula/ratfor.rb index b87b92dcea9e8..23d067d7c4f72 100644 --- a/Formula/ratfor.rb +++ b/Formula/ratfor.rb @@ -9,6 +9,7 @@ class Ratfor < Formula sha256 "053917ccdf191b7cb15adb1c207cb3f18553def7d4cc9584b09222be07754660" => :catalina sha256 "054cb6d92e13050233c54a5bbfdd1dc9fbaed09d63937b8426d543d9569ee07b" => :mojave sha256 "16c83b337e66de93f5e1b21d77242b849a4a1613e2c2e38d1971a77277924bce" => :high_sierra + sha256 "5469f16aeb09d9ede096088096bbec09f1b8d20351d7bbaf59b36f35eb7e44d0" => :x86_64_linux end depends_on "gcc" # for gfortran diff --git a/Formula/rav1e.rb b/Formula/rav1e.rb index 77414412ab623..5b806993e771c 100644 --- a/Formula/rav1e.rb +++ b/Formula/rav1e.rb @@ -9,6 +9,7 @@ class Rav1e < Formula sha256 "b8c0b0614f67553f771f709f0849479a9aa86883d5b7c5d59df60fc6544a9a11" => :catalina sha256 "fec7ae58dbdc997241a5337381d6523388e8e09b19e5e8e3db509aa5052df2fa" => :mojave sha256 "fe29e3982e41708784f0597c2f4a15ea217843a18b95f88e83f5d0f76a039ab6" => :high_sierra + sha256 "989b80d5db3393eaa325eb14feb0a3b8ded66c35bbe1035c5f62d3875f6a473f" => :x86_64_linux end depends_on "cargo-c" => :build diff --git a/Formula/raxml-ng.rb b/Formula/raxml-ng.rb index 9a30141119684..9106971af06f8 100644 --- a/Formula/raxml-ng.rb +++ b/Formula/raxml-ng.rb @@ -10,6 +10,7 @@ class RaxmlNg < Formula sha256 "3deb449ed9ce39343945ed4b003a8f0ed3caaf84cdd240e990f3a1262edaa1da" => :catalina sha256 "5b99cd4e7bbc3b688dc32e73c728fc5ff9c1cd7f567e584523c418285de77cd0" => :mojave sha256 "8e3e83381139bacde52257180a17a9928e6c9c0a833776b245925970570f1937" => :high_sierra + sha256 "1659ae7540aa047066312928b9fecbe3243b92e8b27d3442913c18b686820075" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/rbenv.rb b/Formula/rbenv.rb index 411c8681f4f06..c6e85c1cec34f 100644 --- a/Formula/rbenv.rb +++ b/Formula/rbenv.rb @@ -11,6 +11,7 @@ class Rbenv < Formula sha256 "d1019098dee8d037587069398e5ad04e6d736f834dc44ae73943bec46b10b260" => :mojave sha256 "b5984102794a9d39388ca1f6ec77965aeea29b971cc00cb5af8ede8ee6c926d6" => :high_sierra sha256 "873175a851e5aa4f5b3438072030b945c252f08a9a07760c64dc045e2cce4724" => :sierra + sha256 "b3c384b5d154ce9566e59760682035d3be05bf997e2c336942a9423f12eb74ef" => :x86_64_linux end depends_on "ruby-build" diff --git a/Formula/rbspy.rb b/Formula/rbspy.rb index 3ce96d74fbbfd..ecc7ea4abed53 100644 --- a/Formula/rbspy.rb +++ b/Formula/rbspy.rb @@ -9,6 +9,7 @@ class Rbspy < Formula sha256 "3c1cf783482e2b510aaff073a82ab4858b01feaa5327cc3f8666ca2cf2ea3756" => :catalina sha256 "e0867eac5b9f432fa1218271c1f4ced724e23c99e79d6692e127cb07aaafbe91" => :mojave sha256 "64e1e766071f1d8155011465545d66e78a20fc5fa0fb164a98c885eb3e452882" => :high_sierra + sha256 "91423e04832e8089eee81fbabd4179d61b68eca4786ab1355ab3be34c569fceb" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/rclone.rb b/Formula/rclone.rb index 32f31dc0466f7..ba246393e382c 100644 --- a/Formula/rclone.rb +++ b/Formula/rclone.rb @@ -10,6 +10,7 @@ class Rclone < Formula sha256 "f5853b3bac460032f54017dce763393f2e35297653d8ea5533402bf98147cef8" => :catalina sha256 "f024d2cd3dd8a06a4d2a2c855ec3a5640c4fe158abab6b9f231eb58b51515ad3" => :mojave sha256 "a713fb93e6d02b94b8a8dbe324269836b2f4e5b13ee53aa2acb996646aac3ba8" => :high_sierra + sha256 "18a5954a346c3cd111d67319e3323508dcd988fc72d815b73f65a0a524c916dc" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/rcm.rb b/Formula/rcm.rb index 56d88d7725284..fd72d4bc1b9a1 100644 --- a/Formula/rcm.rb +++ b/Formula/rcm.rb @@ -9,6 +9,7 @@ class Rcm < Formula sha256 "3fdc7266d9faa6015ef560254f036cc355445ee12861cb17a1c0bf5cc218b368" => :catalina sha256 "3fdc7266d9faa6015ef560254f036cc355445ee12861cb17a1c0bf5cc218b368" => :mojave sha256 "3fdc7266d9faa6015ef560254f036cc355445ee12861cb17a1c0bf5cc218b368" => :high_sierra + sha256 "2817bdd9ee36f5f321ac6b82e4d040d6e9bae08d8e7212b15555a31b432010cc" => :x86_64_linux end def install diff --git a/Formula/rdate.rb b/Formula/rdate.rb index a466d86143894..3a402ffb1c5d9 100644 --- a/Formula/rdate.rb +++ b/Formula/rdate.rb @@ -14,6 +14,7 @@ class Rdate < Formula sha256 "acb2ae5951a0f32cbdce39e02d86c63cdb85b41fd02aff74aac6ea4939d71d8d" => :el_capitan sha256 "553782017635be9c8d80bbf6fd033f294cddcb427a2d83fe82af8c069c60867f" => :yosemite sha256 "3a36b6feccd119c90db3373a3de1b67f4aa03fc72aacdf7b11165b538206ae14" => :mavericks + sha256 "88d88020b971c87d1b7a64388163350e76924e8cf990c2e0cb88c87906d8fd3b" => :x86_64_linux end def install diff --git a/Formula/rdfind.rb b/Formula/rdfind.rb index fb450b5fe64bc..a26e9afaf2677 100644 --- a/Formula/rdfind.rb +++ b/Formula/rdfind.rb @@ -10,6 +10,7 @@ class Rdfind < Formula sha256 "e890406a4cbbd8d026a4c583644efa537433ac71c095a1e582b0454d85a87d00" => :catalina sha256 "489e104d2c5e5d939439f5b100cd97e19ed070181d355b49fbd1ad2b3320d789" => :mojave sha256 "2ce91e3b8a129c0fadb57fba46074e74e0d896287c23eb1844cd99e5eef093b1" => :high_sierra + sha256 "dbd53f9086a0ed24cbc6281ba238477023c7c2d87d22da36ef095614537cc8d1" => :x86_64_linux end depends_on "nettle" diff --git a/Formula/rdup.rb b/Formula/rdup.rb index 8899f5f03075c..118e15a6f6bb0 100644 --- a/Formula/rdup.rb +++ b/Formula/rdup.rb @@ -11,6 +11,7 @@ class Rdup < Formula sha256 "cf02c3004b312a3d90c6e47227f35e39319736270be76d7e4b0705568a21abec" => :catalina sha256 "fb091d60536b72e20dc5e1448d9876e7b2eaefd16d40f2bfbf7bba48059af348" => :mojave sha256 "417244fe66e0f47ab1afea65e9a52db01c15ac2f5db5e150ad65d80b2e85e2cc" => :high_sierra + sha256 "f36ac1b1a38191b30575bdb3402d2196b92a485ca799b91ca6832cf4b19667d9" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/re2.rb b/Formula/re2.rb index 183e1501e3d82..761bf8195901b 100644 --- a/Formula/re2.rb +++ b/Formula/re2.rb @@ -11,6 +11,7 @@ class Re2 < Formula sha256 "48ad8c2246404a35143979d581775732ab8b7fd36e4ce46bdd56161461ff3d76" => :catalina sha256 "c9f8b50a653058ad70414e0e2e3380e62627a536933de636fa0d3e3a85026a94" => :mojave sha256 "018cc829f15a4e1ce8db138bed45cda78b890ed9bb9b93916ce8a12d68d9ad59" => :high_sierra + sha256 "d77874ce02fb478319276d541d5fc60dc8ea3110e4cd30809439d9120fe5a4e9" => :x86_64_linux end def install @@ -29,8 +30,8 @@ def install return 0; } EOS - system ENV.cxx, "-std=c++11", "-I#{include}", "-L#{lib}", "-lre2", - "test.cpp", "-o", "test" + system ENV.cxx, "-std=c++11", + "test.cpp", "-I#{include}", "-L#{lib}", "-pthread", "-lre2", "-o", "test" system "./test" end end diff --git a/Formula/re2c.rb b/Formula/re2c.rb index 160b9a1974cc2..d2bdfe16b7723 100644 --- a/Formula/re2c.rb +++ b/Formula/re2c.rb @@ -8,6 +8,7 @@ class Re2c < Formula sha256 "374376ae451fe0e6ca93f17634e6353e8503cffa16018fbe44007997b865965d" => :catalina sha256 "3cb716f9bcb81ad81cafc6e2e5a5be444caa297cec939213bcf2e805fb65f778" => :mojave sha256 "7d9b2456469379900fc2abddc732710b822241a8a7bd2f734766a18b47b704a9" => :high_sierra + sha256 "70ac947468a7a44c4045fc12af4e22723da2254ee61ee67e02434cd8c0d9b403" => :x86_64_linux end def install diff --git a/Formula/react-native-cli.rb b/Formula/react-native-cli.rb index aa0e1f0f8c338..e1ff8813d2964 100644 --- a/Formula/react-native-cli.rb +++ b/Formula/react-native-cli.rb @@ -12,6 +12,7 @@ class ReactNativeCli < Formula sha256 "8e6e253c7801cc276f89f2988245866080c1409602c5903dbb2984b1a645746b" => :mojave sha256 "387e6f8c0e9f20b4ae2007185d394ff73cc3392085a6a05045b669512780c55e" => :high_sierra sha256 "81ef6bdc246a412022d070b5020b567864b177a53fcfeb15c44f7be38e6130ab" => :sierra + sha256 "c22acbddd764a82310ec8273c1a00f8f5c9ba73c561a3d9c9a809331ae7912c1" => :x86_64_linux end depends_on "node" diff --git a/Formula/readline.rb b/Formula/readline.rb index 4eadbc820e4ca..9ea44bf404f99 100644 --- a/Formula/readline.rb +++ b/Formula/readline.rb @@ -24,6 +24,7 @@ class Readline < Formula sha256 "6ae1c8e7c783f32bd22c6085caa4d838fed7fb386da7e40ca47b87ec9b1237d6" => :catalina sha256 "29f7102a730ab39c8312cad1e7e439f6da2a67c452ce2b3380581eb185a5d8e8" => :mojave sha256 "896a3d50ce8962ba56e853bdd590fadeabc00ab36475d143d6c2bea5cc15bb28" => :high_sierra + sha256 "46da47db3da04b2f248e3cf2d6d14c55aa543555d1134f6cbbf07787a5bf0bd6" => :x86_64_linux end keg_only :shadowed_by_macos, "macOS provides BSD libedit" @@ -31,12 +32,15 @@ class Readline < Formula uses_from_macos "ncurses" def install - system "./configure", "--prefix=#{prefix}" + system "./configure", "--prefix=#{prefix}", + ("--with-curses" unless OS.mac?) + args = [] + args << "SHLIB_LIBS=-lcurses" unless OS.mac? # There is no termcap.pc in the base system, so we have to comment out # the corresponding Requires.private line. # Otherwise, pkg-config will consider the readline module unusable. inreplace "readline.pc", /^(Requires.private: .*)$/, "# \\1" - system "make", "install" + system "make", "install", *args end test do diff --git a/Formula/rebar.rb b/Formula/rebar.rb index 45f5a2695be05..633ffbec7de65 100644 --- a/Formula/rebar.rb +++ b/Formula/rebar.rb @@ -14,6 +14,7 @@ class Rebar < Formula sha256 "9deae896b5a7656fdbbbcdb134f17f776b9ba3b320a007a9ea84c97f1242ea76" => :sierra sha256 "dc9934c431b8435022a1b47400d04357ef1da4bc579e523c14d9e6ddf9d44715" => :el_capitan sha256 "30b03e9b4d9405d3131cbc4d4303797496d264fafed8f708a7a862e73e2e99ea" => :yosemite + sha256 "8f063e33c0ee383ac87804f69e896c35e6e34f3c743161d9366128dbc2bec7d5" => :x86_64_linux end depends_on "erlang" diff --git a/Formula/rebar3.rb b/Formula/rebar3.rb index dd39804ebd7c0..73337c5b7ce00 100644 --- a/Formula/rebar3.rb +++ b/Formula/rebar3.rb @@ -9,6 +9,7 @@ class Rebar3 < Formula sha256 "a3e0d373e2dd244b89478b684292c13653f70a88e1e808d2f636d8050504c6f5" => :catalina sha256 "40e2a7521a41345876e63f5426ff7be467bcc5331c47c0769b244a5e82834226" => :mojave sha256 "bdf484d6864b693b1f975b12d20cf4579259d6f905b4795a53006ad0587d5943" => :high_sierra + sha256 "e967277c66df66b79a105da610bdb819ff325612df9729ae26601008bc78a0fa" => :x86_64_linux end depends_on "erlang" diff --git a/Formula/recode.rb b/Formula/recode.rb index bde5201536df6..8ddc1e2f24631 100644 --- a/Formula/recode.rb +++ b/Formula/recode.rb @@ -10,15 +10,22 @@ class Recode < Formula sha256 "541408c872b2c16e999cb6f74fc94e8c340dfb1e2eb3a89aa21d3f118554219d" => :mojave sha256 "65d9921e28f36fe7a0755d1cab44e4c2d2e5752ab25ed6c35cc7ee9e9072aee3" => :high_sierra sha256 "d8d1838e5484c1bbdde1a1f4f57907a601ee32b6577c3c9364dde06e095a5605" => :sierra + sha256 "1d1f189414a5bff84e787a811f1b973de0f1d9ffbf68f911c161d607d481a9ba" => :x86_64_linux end depends_on "libtool" => :build + depends_on "python@3.8" => :build depends_on "gettext" + patch :DATA + def install # Missing symbol errors without these. - ENV.append "LDFLAGS", "-liconv" - ENV.append "LDFLAGS", "-lintl" + if OS.mac? + # Provided by glibc on Linux. + ENV.append "LDFLAGS", "-liconv" + ENV.append "LDFLAGS", "-lintl" + end # Fixed upstream in 2008 but no releases since. Patched by Debian also. # https://github.com/pinard/Recode/commit/a34dfd2257f412dff59f2ad7f714. @@ -32,10 +39,136 @@ def install "--prefix=#{prefix}", "--infodir=#{info}", "--mandir=#{man}" - system "make", "install" + system "make", "install", "PYTHON=python3" end test do assert_match version.to_s, shell_output("#{bin}/recode --version") end end +__END__ +diff --git a/tables.py b/tables.py +index 5c42f21..9e40bac 100755 +--- a/tables.py ++++ b/tables.py +@@ -197,12 +197,11 @@ class Charnames(Options): + + def digest_french(self, input): + self.preset_french() +- fold_table = range(256) +- for before, after in map( +- None, ++ fold_table = list(range(256)) ++ for before, after in zip( + u'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÂÇÈÉÊÎÏÑÔÖÛ'.encode('ISO-8859-1'), + u'abcdefghijklmnopqrstuvwxyzàâçèéêîïñôöû'.encode('ISO-8859-1')): +- fold_table[ord(before)] = ord(after) ++ fold_table[before] = after + folding = ''.join(map(chr, fold_table)) + ignorables = ( + u''.encode('ISO-8859-1'), +@@ -264,7 +263,7 @@ class Charnames(Options): + u"séparateur d'article (rs)", # 001E + u"séparateur de sous-article (us)", # 001F + ): +- self.declare(ucs, text.encode('ISO-8859-1')) ++ self.declare(ucs, text) + ucs += 1 + ucs = 0x007F + for text in ( +@@ -302,7 +301,7 @@ class Charnames(Options): + u"message privé (pm)", # 009E + u"commande de progiciel (apc)", # 009F + ): +- self.declare(ucs, text.encode('ISO-8859-1')) ++ self.declare(ucs, text) + ucs += 1 + + def declare(self, ucs, text): +@@ -329,17 +328,15 @@ class Charnames(Options): + # bytes, the first one running slowly from singles+1 to 255, + # the second cycling faster from 1 to 255. + sys.stderr.write(' sorting words...') +- pairs = map(self.presort_word, self.code_map.keys()) +- pairs.sort() +- words = map(lambda pair: pair[1], pairs) ++ pairs = sorted(map(self.presort_word, self.code_map.keys())) ++ words = list(map(lambda pair: pair[1], pairs)) + pairs = None + sys.stderr.write(' %d of them\n' % len(words)) + count = len(words) +- singles = (255 * 255 - count) / 254 ++ singles = (255 * 255 - count) // 254 + # Transmit a few values for further usage by the C code. + sys.stderr.write(' sorting names...') +- ucs2_table = self.charname_map.keys() +- ucs2_table.sort() ++ ucs2_table = sorted(self.charname_map.keys()) + sys.stderr.write(' %d of them\n' % len(ucs2_table)) + write('\n' + '#define NUMBER_OF_SINGLES %d\n' +@@ -389,7 +386,7 @@ class Charnames(Options): + if code < 256: + write('\\%0.3o' % code) + else: +- write('\\%0.3o\\%0.3o' % (code / 256, code % 256)) ++ write('\\%0.3o\\%0.3o' % (code // 256, code % 256)) + else: + sys.stderr.write('??? %s\n' % word) + write('"},\n') +@@ -659,8 +656,7 @@ class Mnemonics(Options): + 'static const struct entry table[TABLE_LENGTH] =\n' + ' {\n') + count = 0 +- indices = self.mnemonic_map.keys() +- indices.sort() ++ indices = sorted(self.mnemonic_map.keys()) + for ucs2 in indices: + text = self.mnemonic_map[ucs2] + inverse_map[text] = count +@@ -673,8 +669,7 @@ class Mnemonics(Options): + 'static const unsigned short inverse[TABLE_LENGTH] =\n' + ' {') + count = 0 +- keys = inverse_map.keys() +- keys.sort() ++ keys = sorted(inverse_map.keys()) + for text in keys: + if count % 10 == 0: + if count != 0: +@@ -1122,8 +1117,7 @@ class Strips(Options): + write = Output('fr-%s' % self.TEXINFO, noheader=True).write + else: + write = Output(self.TEXINFO, noheader=True).write +- charsets = self.remark_map.keys() +- charsets.sort() ++ charsets = sorted(self.remark_map.keys()) + for charset in charsets: + write('\n' + '@item %s\n' +@@ -1158,13 +1152,15 @@ class Input: + + def __init__(self, name): + self.name = name +- self.input = file(name) ++ self.input = open(name, encoding='latin-1') + self.line_count = 0 + sys.stderr.write("Reading %s\n" % name) + + def readline(self): + self.line = self.input.readline() + self.line_count += 1 ++ if type(self.line) == bytes: ++ self.line = self.line.decode('utf-8') + return self.line + + def warn(self, format, *args): +@@ -1189,7 +1185,7 @@ class Output: + + def __init__(self, name, noheader=False): + self.name = name +- self.write = file(name, 'w').write ++ self.write = open(name, 'w', encoding='utf-8').write + sys.stderr.write("Writing %s\n" % name) + if not noheader: + self.write("""\ diff --git a/Formula/recon-ng.rb b/Formula/recon-ng.rb index f4850fe627f04..fb8ebadb96b59 100644 --- a/Formula/recon-ng.rb +++ b/Formula/recon-ng.rb @@ -5,13 +5,14 @@ class ReconNg < Formula homepage "https://github.com/lanmaster53/recon-ng" url "https://github.com/lanmaster53/recon-ng/archive/v5.1.1.tar.gz" sha256 "470e293e931c23a0dc76e6915098e04db7f2e254a0639bb2c0383e0758c4fbc2" - revision 1 + revision OS.mac? ? 1 : 2 bottle do - cellar :any + cellar :any_skip_relocation sha256 "7b4b03cc22d532fa9dbef0f5b705bbf8fb2df69d75d124f06f171e7f9609c048" => :catalina sha256 "db7c9ed3ef46fb0b192f3fe4194902991b09afeeb56b766c9b212a8deed679b9" => :mojave sha256 "497f43629d955ccd254e1db15fa6ac4ebaea01a34023e8ffbfa5c0a1a0511af2" => :high_sierra + sha256 "cb64aff2e8edce7d5a338b901e0b0f60a5094e83c0f7bf1add677757bc130f66" => :x86_64_linux end depends_on "libyaml" diff --git a/Formula/recoverjpeg.rb b/Formula/recoverjpeg.rb index 69831ce3a10fe..cceca612e2847 100644 --- a/Formula/recoverjpeg.rb +++ b/Formula/recoverjpeg.rb @@ -10,6 +10,7 @@ class Recoverjpeg < Formula sha256 "89bd9fe522bc64508a3c2925edda2a3ae3cfc32e7ff59f7e70eb1069352129b2" => :mojave sha256 "ce460e293cc4c4c5bf3650cf9860e7b06654017473c414dc88c1df9d82e8466e" => :high_sierra sha256 "453b0d2c88be1b885407e38900ab0303481e9957ed5c160cb8e6456b6a2f81c2" => :sierra + sha256 "67c2439081c4c2ca88811f1c8e06067880dbb20b23c11eb385467dc7e37f1086" => :x86_64_linux end def install diff --git a/Formula/recutils.rb b/Formula/recutils.rb index 6a3f5c0cd6ff0..529cb4ac5c556 100644 --- a/Formula/recutils.rb +++ b/Formula/recutils.rb @@ -6,13 +6,15 @@ class Recutils < Formula sha256 "df8eae69593fdba53e264cbf4b2307dfb82120c09b6fab23e2dad51a89a5b193" bottle do - cellar :any sha256 "a55cbe91cc2c264fe53e5e6425c1f3bb0c090f097f16098fdce766807a38ea6d" => :catalina sha256 "1503a69c0ed988355b959c47b2c8a5e5a4f451d41027f5a06cdf5de19f7d171f" => :mojave sha256 "c2ca0221b7e7091c11840a000f02b130325a188aeb03b100947562aa8d9ce3ef" => :high_sierra sha256 "694cfda88a56f30c66d71080b8a1a4763a17789e0ea54b37c778ba84107f6430" => :sierra + sha256 "111ee4bf1d770f006189b126835f5b1767beccd98ac544303cb3a63017b5f0bb" => :x86_64_linux end + depends_on "libgcrypt" unless OS.mac? + def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", diff --git a/Formula/redis-leveldb.rb b/Formula/redis-leveldb.rb index ff579f80ab4cf..c172e59596839 100644 --- a/Formula/redis-leveldb.rb +++ b/Formula/redis-leveldb.rb @@ -14,6 +14,7 @@ class RedisLeveldb < Formula sha256 "c8cdcf2f80de6eda4f86e9a7c6726ef1a2e046378a28b72b52deb180a15d1916" => :sierra sha256 "5373414613caf193828f782883f835858a8c999943a542e9ec3ff735a918bb63" => :el_capitan sha256 "4cf802ff434be42c86043c45f539cfdb0f137cfd37df4815560e3495da5f9d1b" => :yosemite + sha256 "2c90cf622dcee9f866e1dbbc9c30059fa80b5aef07d0ae190e3e32b710be2212" => :x86_64_linux # glibc 2.19 end depends_on "gmp" diff --git a/Formula/redis.rb b/Formula/redis.rb index ebf78d3ab63a2..0f320e2a38e7f 100644 --- a/Formula/redis.rb +++ b/Formula/redis.rb @@ -6,10 +6,11 @@ class Redis < Formula head "https://github.com/antirez/redis.git", :branch => "unstable" bottle do - cellar :any + cellar :any_skip_relocation sha256 "c4c025a3642417b75e69be73cce61f05042107dd52b5f549d9c21eba8d2c2c1c" => :catalina sha256 "fc2ff703029e0dfceff2ecde31730b3c8766ecac2cac8dd309270c3aa7b417ae" => :mojave sha256 "be205c8cecbf8691db5f06b60e9a5dccbfe1e6bef2e1676fe0dbdf109b2fdf9f" => :high_sierra + sha256 "3499a82261a8f15f92ff121c973e8376c28aa59010afd01062511f508eeb9e55" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/redland.rb b/Formula/redland.rb index e5c2e02f0f666..dc94be8c957a2 100644 --- a/Formula/redland.rb +++ b/Formula/redland.rb @@ -13,6 +13,7 @@ class Redland < Formula sha256 "38eac3bae25aa65cbb7b688ecfaae91ab79c0c292e7505596ffc3b409bc8ca3b" => :el_capitan sha256 "6047842b51137c968df4787bbfcf2080b4f32b73bb9d3412fa117ee9c1ff22d2" => :yosemite sha256 "06d1c7c81a9803ad37cd40303987b90456fb565f4305965388bc8faff54c6db7" => :mavericks + sha256 "cd8a1242b37069da9a0eebff7add5461b7cede87afe747c619737ce4c7c22f32" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/redshift.rb b/Formula/redshift.rb index 6d3308744091c..b332ded0474c2 100644 --- a/Formula/redshift.rb +++ b/Formula/redshift.rb @@ -10,6 +10,7 @@ class Redshift < Formula sha256 "197ca4060616fbb79a6e64b93760f60ef581d5d76f838ab099b97076e3e569fe" => :mojave sha256 "f07311c326eb8c2310d509ffbcb5424d7783a1b0b675d47ac32026116086a39d" => :high_sierra sha256 "89ab02396a2d3694923f8496217a5d5a47c1cc35e167205cf4bb74033de92ab3" => :sierra + sha256 "8b60bc6f2bdffffe698961bc931c50061d1bf3bf6bd958ae69b137e4b8b33112" => :x86_64_linux end head do @@ -26,14 +27,17 @@ class Redshift < Formula depends_on "glib" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + args = %W[ --prefix=#{prefix} - --enable-corelocation + --#{OS.mac? ? "enable" : "disable"}-corelocation --disable-silent-rules --disable-dependency-tracking --disable-geoclue --disable-geoclue2 - --enable-quartz + --#{OS.mac? ? "enable" : "disable"}-quartz --with-systemduserunitdir=no --disable-gui ] diff --git a/Formula/redsocks.rb b/Formula/redsocks.rb index 5189c24afb8d5..d9027e3c571db 100644 --- a/Formula/redsocks.rb +++ b/Formula/redsocks.rb @@ -11,6 +11,7 @@ class Redsocks < Formula sha256 "0da35f33e9faaf37c59043a5f20d1e4a89f5b543644332b856a525183f31fe96" => :mojave sha256 "4f8630032cb62bc1cc9f318a837ea0f42964704e2310115696766c8a51f8b5f2" => :high_sierra sha256 "9b528c2ce745b2402d15073e7da4fb62789789caa70e5373946ae1699f663b8b" => :sierra + sha256 "a362fc218d64e3cd927ccde66a035a0cb4bb3d4be056ec1df853818478604b32" => :x86_64_linux end depends_on "libevent" diff --git a/Formula/regex-opt.rb b/Formula/regex-opt.rb index 3b7898c4c0871..0fab1db2d07c7 100644 --- a/Formula/regex-opt.rb +++ b/Formula/regex-opt.rb @@ -11,6 +11,7 @@ class RegexOpt < Formula sha256 "76b26dc9e766e7a8b0806660e966e3a49c593591b94d90439f89b7cbc797d019" => :mojave sha256 "0e46dec5d46b145e32ca597c00c75fea2e7097e57c5d3131be141e5bea2b96db" => :high_sierra sha256 "68b5f75c9fdb645334ae8a48a5b7e01620e19d5f103811579cb8bf96101c6ac7" => :sierra + sha256 "fd31e2648a4c0bb509b4f2424700dfba3386d91083bd37796adc009864f040b0" => :x86_64_linux end def install diff --git a/Formula/regina-rexx.rb b/Formula/regina-rexx.rb index 9a701a2e8cadf..83568187b3a71 100644 --- a/Formula/regina-rexx.rb +++ b/Formula/regina-rexx.rb @@ -8,6 +8,7 @@ class ReginaRexx < Formula sha256 "7d39d4158fe41ecbd85c8c05f27d1b291883730ae1b745e1920e14ab41dfa0dc" => :catalina sha256 "396fe213db316516ff28a135217b9c660969244494cb8807111e71b37d5451c9" => :mojave sha256 "c8e204d8fb1154c31a4be3d571f4bbcc9e9b9ec5406feb61be82f7c567f9c8a7" => :high_sierra + sha256 "d6cf179bb69a7c40af635e332914390ef64168e92a547b168496ea86746603cc" => :x86_64_linux end def install diff --git a/Formula/rem.rb b/Formula/rem.rb index 574773b0494b5..d208e6173a021 100644 --- a/Formula/rem.rb +++ b/Formula/rem.rb @@ -15,7 +15,8 @@ class Rem < Formula sha256 "bf65e89ec4ca486b95f04c1c737627b2e0091af8a5c137795e521b96664d75e2" => :mavericks end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? + depends_on :macos conflicts_with "remind", :because => "both install `rem` binaries" diff --git a/Formula/remake.rb b/Formula/remake.rb index ad64e73def20a..414802f117f56 100644 --- a/Formula/remake.rb +++ b/Formula/remake.rb @@ -10,8 +10,11 @@ class Remake < Formula sha256 "722bdd9f9f0326a73ac69e56efd7a5a9a15d71db1a7e3076ececa33d27f0a1d7" => :catalina sha256 "1c2ca8baa2d831524bc2abb0639d3ad91dd6b96de32863e99f8bba33174b98d1" => :mojave sha256 "ad4182037734bbaa6f4627598ba1358fb904d0fdcdebccb73e0dfdc8d2b6c780" => :high_sierra + sha256 "401d17a938db2e6eb1ebe6aa3cd7a7ce1761ba1e7565cc7c5952e7157a37516e" => :x86_64_linux end + depends_on "readline" unless OS.mac? + def install system "./configure", "--disable-debug", "--disable-dependency-tracking", diff --git a/Formula/remarshal.rb b/Formula/remarshal.rb index c26f8f5e2d9a0..92d03710f2b06 100644 --- a/Formula/remarshal.rb +++ b/Formula/remarshal.rb @@ -5,13 +5,15 @@ class Remarshal < Formula homepage "https://github.com/dbohdan/remarshal" url "https://files.pythonhosted.org/packages/a2/98/8becf6a4ead798c1a517715fddfb73a8867ac58d833179a30f0dfc3dadf0/remarshal-0.12.0.tar.gz" sha256 "1df0016b3ad47e78e0d4d016a0e0cc7ad5cd6a60232e8dcbc89af4ccc42eb172" + revision 1 unless OS.mac? head "https://github.com/dbohdan/remarshal.git" bottle do - cellar :any_skip_relocation + cellar :any sha256 "ff34ba0168dc79cb1d3c060817d8bd13be31061f3883a2ba5d4ea0098c5a9f76" => :catalina sha256 "5d09769f8c950743b049109c9f375746ead3d943c54eb4448ead95d1c8cbd76c" => :mojave sha256 "6e5ebcde81702cb6616be074402cae0e7609c78e3c3fe2eb7357339d73c7924e" => :high_sierra + sha256 "e42c1b4ef6bf4b947e304d033d8c0fec46fafaa20cceffb9622578b131917d5e" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/remind.rb b/Formula/remind.rb index 002043342b889..2c64b0d91cf54 100644 --- a/Formula/remind.rb +++ b/Formula/remind.rb @@ -9,6 +9,7 @@ class Remind < Formula sha256 "cb1470b7207336fee89f03b6a7d540ff21720ec27f3a18abb0c938a815efca05" => :catalina sha256 "09c627b85760732ba5a9e52e184458e1ea6be7b69d35cad34fe1c0e2d6189d4c" => :mojave sha256 "2c99a0b697e0b93cd8d43c39fd81f4c220c280ee2c260e573c39ff2f749e01b6" => :high_sierra + sha256 "ad31f15edae645fe6bffe6e3bd69ff2ddcf213c2ab23e5501484f8599f596400" => :x86_64_linux end conflicts_with "rem", :because => "both install `rem` binaries" diff --git a/Formula/reminiscence.rb b/Formula/reminiscence.rb index 5c493f5faee6f..e67f57665de40 100644 --- a/Formula/reminiscence.rb +++ b/Formula/reminiscence.rb @@ -10,6 +10,7 @@ class Reminiscence < Formula sha256 "a587449c5846115b5bb4100e1ec50af6256e48bc770c35dad4985850ab8e1b3c" => :catalina sha256 "a1a752e53d40822409ea80a273b38d307e6e6afdfc52d856dee8e8dcc6ae32d8" => :mojave sha256 "537b631728a9b8e322cc835d20b3d8bac832c5c14ebc0bdedde43fe0b607bcd2" => :high_sierra + sha256 "2eee98eb4ac2a1e39ac97ebbcf607c842f09e3bbd62858fc1a000d7c3a93adb3" => :x86_64_linux end depends_on "autoconf" => :build @@ -38,6 +39,7 @@ def install ENV.prepend "CPPFLAGS", "-I#{libexec}/include" ENV.prepend "LDFLAGS", "-L#{libexec}/lib" + ENV.append "LDFLAGS", "-Wl,-rpath=#{libexec}/lib" unless OS.mac? system "make" bin.install "rs" => "reminiscence" diff --git a/Formula/ren.rb b/Formula/ren.rb index 806979d94e456..e2d722e538c14 100644 --- a/Formula/ren.rb +++ b/Formula/ren.rb @@ -13,6 +13,7 @@ class Ren < Formula sha256 "966876dfcc9f36c4bc3d1358a9a8500c79d9324ebd8697033571146f1e482685" => :el_capitan sha256 "e8ca6bb656f8daca43c6ce446dfff66625fabdedda81604745f0960b419e422a" => :yosemite sha256 "c7be0857bfd182f310a700521b5989c36e98ea579a2cf14417d42aa4036448dd" => :mavericks + sha256 "61968e427310d1ed94551cbe757eeae7defcf310888eb506016b8b0a660cfe72" => :x86_64_linux end def install diff --git a/Formula/rename.rb b/Formula/rename.rb index 6b66120e6e77b..0fd9b023041c6 100644 --- a/Formula/rename.rb +++ b/Formula/rename.rb @@ -11,6 +11,7 @@ class Rename < Formula sha256 "13c919a8edd4935b7e5462a172b8336c0425a627f76fd3aa72c652c35ea233cc" => :mojave sha256 "86b4b8a450b749f6fd84d86334d2d9f3a1c57fa3832f6e69d602369b4c6e5300" => :high_sierra sha256 "ed4a9403e533b143f8f1ee307035b28c995a13970c64ed7646719e12688ec7a0" => :sierra + sha256 "86fbff102a1ba09c3a0ea3391134cde7ce56b000bc8687552bfcd0c9fcfe4886" => :x86_64_linux end conflicts_with "util-linux", :because => "both install `rename` binaries" diff --git a/Formula/reposurgeon.rb b/Formula/reposurgeon.rb index cb1c6bb7039e4..3dd0292f94e2e 100644 --- a/Formula/reposurgeon.rb +++ b/Formula/reposurgeon.rb @@ -11,6 +11,7 @@ class Reposurgeon < Formula sha256 "aba7163a5984e3fb606b59b70e6c4233cf3d0aa69e400bad156c2a41c4800f3e" => :catalina sha256 "7e3c1b86b32535b698098ffc82231ce1cde18512ffce1ea21cc7b70d0a85a535" => :mojave sha256 "22f79c6f4746a5fcffe63be2247c748e5335082384a9309bdba061ff686813d0" => :high_sierra + sha256 "e7aea71596137f631e48d96598bbc2d95157258eac757f15cd85d7a3fbcd836c" => :x86_64_linux end depends_on "asciidoc" => :build diff --git a/Formula/reprepro.rb b/Formula/reprepro.rb index 24ff1067ffa68..35a7e70aa96ee 100644 --- a/Formula/reprepro.rb +++ b/Formula/reprepro.rb @@ -6,11 +6,12 @@ class Reprepro < Formula revision 1 bottle do - cellar :any + cellar :any_skip_relocation sha256 "6c95891ff569737d0b636f74456b3194571b4b3b5ef3e781dde572317f58e941" => :catalina sha256 "0fe440a480fa2c723af48142ca77b2cc5fb733ba5e20c011f90c11a0a1f221a0" => :mojave sha256 "dfeae3f34e3cf85ed2a5242f2b692a647935b78bae036398e02595448eb82e69" => :high_sierra sha256 "6ab79c20ca3f9fc1d020edcc6909af83346501656a9918e0dee1d2b9ee260016" => :sierra + sha256 "0300c50700c9a6fc918449ba99ec204973e980fd6fbe975c60cc0220c7bcf952" => :x86_64_linux end depends_on "berkeley-db@4" diff --git a/Formula/restic.rb b/Formula/restic.rb index 3fdbede0d1b85..5997ae0fd5cff 100644 --- a/Formula/restic.rb +++ b/Formula/restic.rb @@ -10,6 +10,7 @@ class Restic < Formula sha256 "cfbf35af0c86f5893fbecfb60085c49edd22ed8eb0861e6921cd85922680de44" => :catalina sha256 "92b98a560b99f2a295e8e40689cd2fa9b8f04df62d6846fed8d13b63e0c2f960" => :mojave sha256 "736201b7e7014d36f9ccd79a1deee1f577b231975628a2c405ca424882f00e7f" => :high_sierra + sha256 "9a5b264681dc6dbdace9918afb9a7955c11f830775e2112bf4a38a0496bb09be" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/resty.rb b/Formula/resty.rb index 73ca5e070425b..ae4f06a7c4f4f 100644 --- a/Formula/resty.rb +++ b/Formula/resty.rb @@ -12,6 +12,7 @@ class Resty < Formula sha256 "e65c38b826157c35f2e3acd50846be691b6b1a6231a23c62567c24a052d0dc7e" => :high_sierra sha256 "fb754eb95b4cb573eef1807f5dcddab59e021a4326022a9fb8126fb8e80ff247" => :sierra sha256 "435854dd9bc54f09e46f3f895fc0801ce90a30b23b8d9f109f361f89666fcfe1" => :el_capitan + sha256 "1c6a12ebf97852447f6f16628fdf0acd3f9d156404ab3ca9aa680c2275f40538" => :x86_64_linux end resource "JSON" do diff --git a/Formula/rex.rb b/Formula/rex.rb index 4b4ac72ced783..bdf3f4f07af76 100644 --- a/Formula/rex.rb +++ b/Formula/rex.rb @@ -9,6 +9,7 @@ class Rex < Formula sha256 "de0ca43e439023982668c5563f41340a82d3ae8c45159b457749c1ab0f15d3c5" => :catalina sha256 "24da3a602c3b434d0069244f546ed33f14e8bd3bbee1f7a99b91ca97a48b0c37" => :mojave sha256 "dc0b2bb90327f2fc716eb95655366fd7a3ac36d7880f25a69777c9976260d508" => :high_sierra + sha256 "7d3341ecc6e08e242c0f92f5af2c7112ddda0368a614de20b8c63620f8f24c7a" => :x86_64_linux end uses_from_macos "perl" @@ -190,6 +191,13 @@ class Rex < Formula sha256 "daa905f363c6a748deb7c408473870563fcac79b9e3e95b26e130a4a8dc3c611" end + unless OS.mac? + resource "LWP::UserAgent" do + url "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz" + sha256 "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d" + end + end + def install ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" ENV.prepend_path "PERL5LIB", libexec/"lib" @@ -228,8 +236,12 @@ def perl_build system "./Build", "PERL5LIB=#{ENV["PERL5LIB"]}" system "./Build", "install" elsif File.exist? "Makefile.PL" - system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}", + if OS.mac? + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}", "INC=-I#{MacOS.sdk_path}/System/Library/Perl/5.18/darwin-thread-multi-2level/CORE" + else + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + end system "make", "PERL5LIB=#{ENV["PERL5LIB"]}" system "make", "install" else diff --git a/Formula/rgbds.rb b/Formula/rgbds.rb index 3d39033de6616..0a5485bd14f3f 100644 --- a/Formula/rgbds.rb +++ b/Formula/rgbds.rb @@ -10,11 +10,14 @@ class Rgbds < Formula sha256 "471290b03b60ce630234ba35fedd6108e77a212e9a87cb81998a7c64c9eeac0e" => :catalina sha256 "23c50475699f8699d083f39bdfc9ca4b60c703f0c818ba22e8112d05b71a70ae" => :mojave sha256 "4c719b61b59c50d80cae21b6ea5bc8d47d54a653d4ecf403650efefa30927c8f" => :high_sierra + sha256 "cfa82d9e685c02d330e4734f1c94da377ec7727709995f18b4ad0b9507c093db" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "libpng" + uses_from_macos "bison" => :build + def install system "make", "install", "PREFIX=#{prefix}", "mandir=#{man}" end diff --git a/Formula/rgxg.rb b/Formula/rgxg.rb index e909f42a857dd..84296378702b7 100644 --- a/Formula/rgxg.rb +++ b/Formula/rgxg.rb @@ -9,6 +9,7 @@ class Rgxg < Formula sha256 "4a07550d93bedfa3b2ac3cb77a8484951321697ca9384d2c2a0301ea261aa954" => :catalina sha256 "b410fe9ea150e0fb52326e4f7ce6642f946098b0713c5741c64699de3f55f762" => :mojave sha256 "286318be76fc55c094da739c44176d5babd814df1e4f0462711aea283db042f5" => :high_sierra + sha256 "ce534f086b07694e981db59a833fbf360004a5a1a01143d6e4231890c3f2ba18" => :x86_64_linux end def install diff --git a/Formula/rhash.rb b/Formula/rhash.rb index a5ea201ce24c8..5aea3c4dcdb5b 100644 --- a/Formula/rhash.rb +++ b/Formula/rhash.rb @@ -9,13 +9,14 @@ class Rhash < Formula sha256 "fc4f0d1311c5481c4b53bd1a05644531a986eb501aa1e853131125573cbd0d6a" => :catalina sha256 "cb70f24905e35fca8812456e91f34d24aa71c54f05bb72c04c4b94610564ab37" => :mojave sha256 "557acccf2751cbfdd83e6e8e2ec2c6cf5f87a90f0c7a0be9b3d99de0d2f0f6b6" => :high_sierra + sha256 "42c909851ec896cb1c833b298cff514400c45c7333f9e83b5dc4fd97a2f6b327" => :x86_64_linux end def install system "./configure", "--prefix=#{prefix}" system "make" system "make", "install" - lib.install "librhash/librhash.dylib" + lib.install "librhash/librhash.#{OS.mac? ? "dylib" : "so"}" system "make", "-C", "librhash", "install-lib-headers" end diff --git a/Formula/riemann-client.rb b/Formula/riemann-client.rb index eb88bc032781c..8055ca920609f 100644 --- a/Formula/riemann-client.rb +++ b/Formula/riemann-client.rb @@ -11,6 +11,7 @@ class RiemannClient < Formula sha256 "692dbcd6a5dbbbeb509d6022a18fcb7f20dd638722463e892359129bd55f10bf" => :mojave sha256 "be90a238e4e68d45b658c25ca96de21f9fab54e19832ae6dea06ec9c6fc5aa33" => :high_sierra sha256 "2052ba57754d3049747245a30caf32c81e5e7ec1b8f8de1790dde9c54f71548a" => :sierra + sha256 "655601c804d5f9c49f6279d48b1ad44abe41d983218820792a316216aaa59cf9" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/riff.rb b/Formula/riff.rb index 60431ea2ec551..a9e04f814d6e8 100644 --- a/Formula/riff.rb +++ b/Formula/riff.rb @@ -12,6 +12,7 @@ class Riff < Formula sha256 "cb64974514f8c764d7479cce8f92cd0a2cbc940e96300b823c684f4752d5b734" => :catalina sha256 "dd08e62ae58c92239ea1c321b7a3eda01b83912660f2769291cb0443fd128f9d" => :mojave sha256 "06f5da9420de8bf9aac4a16f93effeb2e3ceb83fedc44a5d1c375a2a6f9f52a4" => :high_sierra + sha256 "40e3cd0f33bd878bf4106c77a4ab76e61ccac5e80b1f3ebba4868da21720c37c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/rinetd.rb b/Formula/rinetd.rb index df5acbb5158d6..78b58015a1a8f 100644 --- a/Formula/rinetd.rb +++ b/Formula/rinetd.rb @@ -12,6 +12,7 @@ class Rinetd < Formula sha256 "44750b361b999c09a17a2bc8c576585a790c42bee66abe4df191b7b0cafe304c" => :high_sierra sha256 "7a52fc5d01d83fd186626a6cff981e65da8943186973a4314efa2c561480325e" => :sierra sha256 "30c72c1a5764aa20e7d8e232bcfe979f138e5029966c43468a886481304c39cb" => :el_capitan + sha256 "39334f5b2e554fe9172fe5316d68442119024110de634667726fe6d9918db148" => :x86_64_linux end def install diff --git a/Formula/ripgrep-all.rb b/Formula/ripgrep-all.rb index f5ced16e60919..3323c5b57edc0 100644 --- a/Formula/ripgrep-all.rb +++ b/Formula/ripgrep-all.rb @@ -10,10 +10,12 @@ class RipgrepAll < Formula sha256 "bc8ee7c7869c23b82cb1997e4f7f5024193b74cc282c20c6bf50af43b55ddbb4" => :catalina sha256 "b1b26781f754760e790ff28c7a26079eb9df86b983c786cd745eabac0232c861" => :mojave sha256 "59001d904ce02e54e23842a7d04f9729d41f1e6fd8b81a71676812be5c6a20f5" => :high_sierra + sha256 "fb4144e73596def0ced6274cd48ff8777af279baf63604261b31e87938f57207" => :x86_64_linux end depends_on "rust" => :build depends_on "ripgrep" + depends_on "zip" => :test unless OS.mac? def install system "cargo", "install", *std_cargo_args diff --git a/Formula/ripgrep.rb b/Formula/ripgrep.rb index dc9ac20a62f3f..4f493fbbbd540 100644 --- a/Formula/ripgrep.rb +++ b/Formula/ripgrep.rb @@ -6,10 +6,10 @@ class Ripgrep < Formula head "https://github.com/BurntSushi/ripgrep.git" bottle do - cellar :any sha256 "60460d422253113af3ed60332104f309638942821c655332211a6bc2213c472c" => :catalina sha256 "de4b18789f5d9bc4aaa4d906501200ae4ece7a1971dd1b86e2b2d0a2c8e0d764" => :mojave sha256 "cfea5335bf4eccfb7cd1d93bec234d96bd49dce8d593ea966687f777909ba291" => :high_sierra + sha256 "fe3b67bf15d9530bb7f33c33a3c3c5e6dc1ef93c283140620de55190af629a61" => :x86_64_linux end depends_on "asciidoctor" => :build diff --git a/Formula/ripmime.rb b/Formula/ripmime.rb index 8784b6c0aac0a..bed1a496a635e 100644 --- a/Formula/ripmime.rb +++ b/Formula/ripmime.rb @@ -13,10 +13,11 @@ class Ripmime < Formula sha256 "1151fa0bb8a10779979cec95c7039832eb81b7126f808ba9c89ccb73cf658814" => :el_capitan sha256 "6ef2fdabe468bc42be725020ef23cc924d1572c7446648e38dbd6de3f1399a38" => :yosemite sha256 "741b45ca155022fb6b540dd1cc0882f5f29330b6909e37fd5115e84705d9d6bb" => :mavericks + sha256 "67c4f5e95036bdb48769f3eedb4323fff39128f028996c352f6ed798aa0ef74c" => :x86_64_linux # glibc 2.19 end def install - system "make", "LIBS=-liconv", "CFLAGS=#{ENV.cflags}" + system "make", "CFLAGS=#{ENV.cflags}", *("LIBS=-liconv" if OS.mac?) bin.install "ripmime" man1.install "ripmime.1" end diff --git a/Formula/rke.rb b/Formula/rke.rb index 19d6104e3b48a..6a778df4a41a8 100644 --- a/Formula/rke.rb +++ b/Formula/rke.rb @@ -10,6 +10,7 @@ class Rke < Formula sha256 "9e32789bb442855f6012aa4b96a3d67ee315cdf0b8b851ceaa59a955f372e9ba" => :catalina sha256 "267e5bee1bc54be1c0f41336dac4b59f309fcf6cce836e0308c6c775eb4530eb" => :mojave sha256 "f98a5dbb85122f5dc8f0e33a377359b323b36447f9976eed94da0e0998f7a057" => :high_sierra + sha256 "1cc7a6db3c6c7874dc41b10a280a66826865501219de4572873e1a19b528f025" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/rkflashtool.rb b/Formula/rkflashtool.rb index 6c24a9204b57f..2e64dc30d5da9 100644 --- a/Formula/rkflashtool.rb +++ b/Formula/rkflashtool.rb @@ -13,6 +13,7 @@ class Rkflashtool < Formula sha256 "cbeb2509bcd210026250c915a9909e8f056e9e2da1f599d7a611695c334f4966" => :sierra sha256 "7a8b5c66395b179ce38845c36369b1a65c6eacc73fd29227809597257669af6d" => :el_capitan sha256 "cf5c51c7aa18c9304ade585c82d9083421eafde114ef6ab22736a24f45530226" => :yosemite + sha256 "37b218c0025a5a86b679e0cb051ca65069e32c09813d8f461f39a4d16f805c01" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/rkhunter.rb b/Formula/rkhunter.rb index b89617d867551..3a72da13ba0e9 100644 --- a/Formula/rkhunter.rb +++ b/Formula/rkhunter.rb @@ -11,6 +11,7 @@ class Rkhunter < Formula sha256 "35df7b4e420968fc71fc0fc0217716393c624594ff51245c80a969a5bb1569eb" => :high_sierra sha256 "8d00f31cf5150d841b22dd3c1cdda33dc8705075529f000d41678d05cb733e0f" => :sierra sha256 "1aca76cf8e890112cad63d353ca8369e301e0e990e5380bb5fc4236ded810147" => :el_capitan + sha256 "e49a856107315449b464b02b411394ce502352f68de8567772ce0624096b2760" => :x86_64_linux end def install diff --git a/Formula/rlog.rb b/Formula/rlog.rb index 7f2d0102296d7..6a11ef8f959d4 100644 --- a/Formula/rlog.rb +++ b/Formula/rlog.rb @@ -13,6 +13,7 @@ class Rlog < Formula sha256 "c95d8998639fd75131f923191eaa857bc3ff8f33ee64ca3b5d459ac1979e6fa2" => :el_capitan sha256 "44f3b8ee89802fb13674e3b60e873045a459bf13513b84f3f7b94c8a4444b2eb" => :yosemite sha256 "70c1faaac613087604231c7e30ba5dd458183c1dec4cfccb73b25a32fee6c603" => :mavericks + sha256 "5a43623a13c9b426ccb0d03fc1f0eb1317bc86d5e1a6ded67a47b7f33293ab75" => :x86_64_linux end patch :DATA diff --git a/Formula/rlwrap.rb b/Formula/rlwrap.rb index 0a098ee2b4a63..c51769b5e8660 100644 --- a/Formula/rlwrap.rb +++ b/Formula/rlwrap.rb @@ -11,6 +11,7 @@ class Rlwrap < Formula sha256 "1bd82e889c7f88df7b45b31201d563d7185c362c7a5d3814b5474d295de65f22" => :mojave sha256 "d8d5c5402f1b0041bc26c2161b2822cfd025e93674a7a5dc0046185d5870181d" => :high_sierra sha256 "3dd6233bbef1327553b5bd92d070c4d7bd24f5414628c1c367c4c3ad6f1acc76" => :sierra + sha256 "f837f0ccb8b8fecc59f1879eeb5dcfacbd94a16dac2094b1ac97177d51ce7bb2" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/rmcast.rb b/Formula/rmcast.rb index b402b500f12bb..5433889f87864 100644 --- a/Formula/rmcast.rb +++ b/Formula/rmcast.rb @@ -13,6 +13,7 @@ class Rmcast < Formula sha256 "4fe0a1745659bb99748972c2fa0640e6b864e92739ba192a89ed12c0614b1372" => :el_capitan sha256 "502e09994a9b455d9040f8e346419a2a3ef0156a73b0249bc161446448729292" => :yosemite sha256 "1afd20258226dc16873b567b1b5ab920b9e414f4733bfa99fa917074685f2b8a" => :mavericks + sha256 "66d26e6af4e5b3f82527e222677c68d724d461b1fc354bbcfdb04c3f981714ad" => :x86_64_linux end def install diff --git a/Formula/rmtrash.rb b/Formula/rmtrash.rb index e467b295d8053..72b7fb2c87f49 100644 --- a/Formula/rmtrash.rb +++ b/Formula/rmtrash.rb @@ -17,6 +17,8 @@ class Rmtrash < Formula sha256 "102f54f713574d7009e3b4fd33738b6b631608a0c38f6ad0945ca1af5a8d6ef5" => :mavericks end + depends_on :macos + def install # don't install as root inreplace "Makefile", "-o root -g wheel", "" diff --git a/Formula/rnv.rb b/Formula/rnv.rb index 4e8e045e78df3..a2d8b21e5b67c 100644 --- a/Formula/rnv.rb +++ b/Formula/rnv.rb @@ -13,6 +13,7 @@ class Rnv < Formula sha256 "1c1aa519b786f842b39720e33900e92a2f2f8deef403755e79e2d3b518897ff1" => :el_capitan sha256 "6d46cb2e6476e22b8bb04d00f599884aa8e44ba7e199ad860e4f15795b04e83b" => :yosemite sha256 "f9c4575d7384100b1cc97d9f421b5906ea5068f612c346ffa0238db6c8e855be" => :mavericks + sha256 "2d3abeb791ca8e31d1967aa1f13f89aff958a3b2c55a44adbbbbcf7e983e3b34" => :x86_64_linux end depends_on "expat" diff --git a/Formula/robodoc.rb b/Formula/robodoc.rb index 282137f2b90ec..d12a69a6bc62c 100644 --- a/Formula/robodoc.rb +++ b/Formula/robodoc.rb @@ -13,6 +13,7 @@ class Robodoc < Formula sha256 "54532e8e7629f4eeedbdef400f40997c25558b692755b816f6facc37a4975d4d" => :el_capitan sha256 "a5c2794eb7e02c27707aad1bbea593ddc0d21fbf197f6b4313f8d0ba84fb34a5" => :yosemite sha256 "cea580dd90f87075879dc722262668deac629673ed22dc1e2e5a6cb52e2439ca" => :mavericks + sha256 "31de9c95bf3cf9531e2480355d2b001910a19b46c927c953d98813e87b26f507" => :x86_64_linux end head do diff --git a/Formula/rocksdb.rb b/Formula/rocksdb.rb index b77b7caee490c..9524a8ef2697f 100644 --- a/Formula/rocksdb.rb +++ b/Formula/rocksdb.rb @@ -50,6 +50,11 @@ def install system "make", "static_lib" system "make", "shared_lib" system "make", "install", "INSTALL_PATH=#{prefix}" + + if OS.linux? + # Strip the binaries to reduce their size. + system "strip", *(Dir[bin/"*"] + Dir[lib/"*"]).select { |f| Pathname.new(f).elf? } + end end test do @@ -65,7 +70,8 @@ def install EOS system ENV.cxx, "test.cpp", "-o", "db_test", "-v", - "-std=c++11", "-stdlib=libc++", "-lstdc++", + "-std=c++11", + *(["-stdlib=libc++", "-lstdc++"] if OS.mac?), "-lz", "-lbz2", "-L#{lib}", "-lrocksdb_lite", "-L#{Formula["snappy"].opt_lib}", "-lsnappy", diff --git a/Formula/roll.rb b/Formula/roll.rb index 9c3ff4d144499..439a5c479ce27 100644 --- a/Formula/roll.rb +++ b/Formula/roll.rb @@ -10,6 +10,7 @@ class Roll < Formula sha256 "c1c2251d5ac3b6a03065877f6c211f326909c7710f85441adf0d9987815b6c35" => :mojave sha256 "0fe1da205f9d37a29489ac8b437cefcd915041c47ddf95cae577369b46d8d7ea" => :high_sierra sha256 "f9c7a833dad6d95fe4ee83fccf0890f49dee962e9965a624cf5d483d86c72eab" => :sierra + sha256 "cdd26ee1e182d5ca6b4a4d52c251a88a688cf6b0b9ab490961844d6a071eb7f6" => :x86_64_linux end head do diff --git a/Formula/root.rb b/Formula/root.rb index 5109b16fd67bc..4bfc020fdd29d 100644 --- a/Formula/root.rb +++ b/Formula/root.rb @@ -12,15 +12,17 @@ class Root < Formula sha256 "b34628d0657c3378870cedc065f72d9243249ec68c581ccae9eed7560adab795" => :high_sierra end - # https://github.com/Homebrew/homebrew-core/issues/30726 - # strings libCling.so | grep Xcode: - # /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 - # /Applications/Xcode.app/Contents/Developer - pour_bottle? do - reason "The bottle hardcodes locations inside Xcode.app" - satisfy do - MacOS::Xcode.installed? && - MacOS::Xcode.prefix.to_s.include?("/Applications/Xcode.app/") + if OS.mac? + # https://github.com/Homebrew/homebrew-core/issues/30726 + # strings libCling.so | grep Xcode: + # /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 + # /Applications/Xcode.app/Contents/Developer + pour_bottle? do + reason "The bottle hardcodes locations inside Xcode.app" + satisfy do + MacOS::Xcode.installed? && + MacOS::Xcode.prefix.to_s.include?("/Applications/Xcode.app/") + end end end @@ -44,6 +46,12 @@ class Root < Formula depends_on "xrootd" depends_on "xz" # for LZMA depends_on "zstd" + unless OS.mac? + depends_on "linuxbrew/xorg/libx11" + depends_on "linuxbrew/xorg/libxext" + depends_on "linuxbrew/xorg/libxft" + depends_on "linuxbrew/xorg/libxpm" + end skip_clean "bin" @@ -60,7 +68,6 @@ def install "https://lcgpackages" args = std_cmake_args + %W[ - -DCLING_CXX_PATH=clang++ -DCMAKE_INSTALL_ELISPDIR=#{elisp} -DPYTHON_EXECUTABLE=#{Formula["python@3.8"].opt_bin}/python3 -Dbuiltin_cfitsio=OFF @@ -84,6 +91,8 @@ def install -Dxrootd=ON ] + args << "-DCLING_CXX_PATH=clang++" if OS.mac? + cxx_version = (MacOS.version < :mojave) ? 14 : 17 args << "-DCMAKE_CXX_STANDARD=#{cxx_version}" @@ -128,6 +137,7 @@ def caveats EOS # Test ROOT command line mode + ENV.prepend_path "LD_LIBRARY_PATH", lib/"root" unless OS.mac? system "#{bin}/root", "-b", "-l", "-q", "-e", "gSystem->LoadAllLibraries(); 0" # Test ROOT executable diff --git a/Formula/roswell.rb b/Formula/roswell.rb index 0224c1dbaec82..4d74d40c8d4db 100644 --- a/Formula/roswell.rb +++ b/Formula/roswell.rb @@ -9,6 +9,7 @@ class Roswell < Formula sha256 "dcd9cf15c21d13724f36fd736529faba40dc0c2af2008c970b94049796d6d171" => :catalina sha256 "2d28ef4f1a1cbf94fba0132f7e1f05abb87854af6ce65f70c71877c7152d5622" => :mojave sha256 "a6d5d3ddafc4afefbb84d077b2157a1e7101c5c057bc7fe25714c19b83659017" => :high_sierra + sha256 "d1c77ef13b21cf70f86f15a729ea60c3a22c5d1231cb57e43b4924ab1814e2c5" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/roundup.rb b/Formula/roundup.rb index d1d68d9c3a3ce..054c557b1e79d 100644 --- a/Formula/roundup.rb +++ b/Formula/roundup.rb @@ -14,6 +14,7 @@ class Roundup < Formula sha256 "77ff95001e3a2de6eedd4d5702e5e418b7c4ecfa6855af7b479e1e978249882f" => :el_capitan sha256 "5dd0f6d1e64f54b3bb389411f95cd823b75e31f073e739d78793fca4b21e8e59" => :yosemite sha256 "42a3781280553b56fdd9330f2ef1f930b489c932ac0191313eb1cf6482e9728f" => :mavericks + sha256 "25f5948e9290fb0772b643fe0c57af708cfa61bd72bd8802dec570525565de17" => :x86_64_linux end def install diff --git a/Formula/rpcgen.rb b/Formula/rpcgen.rb index f2146c61ef9ab..72973f2b9454f 100644 --- a/Formula/rpcgen.rb +++ b/Formula/rpcgen.rb @@ -13,7 +13,7 @@ class Rpcgen < Formula keg_only :provided_by_macos - depends_on :xcode => ["7.3", :build] + depends_on :xcode => ["7.3", :build] if OS.mac? def install xcodebuild "-project", "developer_cmds.xcodeproj", diff --git a/Formula/rpg.rb b/Formula/rpg.rb index 32461e70b6e3d..7e96c158e12d5 100644 --- a/Formula/rpg.rb +++ b/Formula/rpg.rb @@ -14,6 +14,7 @@ class Rpg < Formula sha256 "be6550c915e361dcc0e020048f9a5f4ea37f1c5890a526282a3d70c610594981" => :el_capitan sha256 "5c1af29955697dcd46ff58fd70f9aca986b977f3cc17f638822c81289f180df2" => :yosemite sha256 "2ebf1a744c3c072c107883f565c04154b3e530c93868bb438bb90a1be35a4cb7" => :mavericks + sha256 "bcc40b8dc61fc47d0e0d92e1d4a67c144df422f74e0fb9fac4d9bc6456370a39" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/rpl.rb b/Formula/rpl.rb index 6a9658231df49..5cd599541bdb1 100644 --- a/Formula/rpl.rb +++ b/Formula/rpl.rb @@ -13,6 +13,7 @@ class Rpl < Formula sha256 "175e1f127c8c707b0d90c3c7e4399cc5c1e18410bf8b7f6ec9340dbca4c16e4b" => :el_capitan sha256 "d718355e56dd13c690f1d5a0541b5f051518f65b953aade9c525853a19266a61" => :yosemite sha256 "b0c4dbf06500053703ee4a8c8e751d43c435f0e3b0e25d2d328d310dcf490c23" => :mavericks + sha256 "b2be734558caef95df284a555a3a57ebc6521ad20c04f5d8720da78363b8af51" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/rpm.rb b/Formula/rpm.rb index c1bd6d8c09ca1..e86395f429823 100644 --- a/Formula/rpm.rb +++ b/Formula/rpm.rb @@ -60,8 +60,10 @@ def install def post_install (var/"lib/rpm").mkpath - # Attempt to fix expected location of GPG to a sane default. - inreplace lib/"rpm/macros", "/usr/bin/gpg2", HOMEBREW_PREFIX/"bin/gpg" + if OS.mac? + # Attempt to fix expected location of GPG to a sane default. + inreplace lib/"rpm/macros", "/usr/bin/gpg2", HOMEBREW_PREFIX/"bin/gpg" + end end def test_spec diff --git a/Formula/rpm2cpio.rb b/Formula/rpm2cpio.rb index 2e35385f7e067..afff9eccbefe6 100644 --- a/Formula/rpm2cpio.rb +++ b/Formula/rpm2cpio.rb @@ -11,6 +11,7 @@ class Rpm2cpio < Formula sha256 "081902485154a2061d890e6421a55d15bfe5072c05109c79e0ef50f2a11b96e5" => :mojave sha256 "804dccff2726a9ac18a1002cd8adb06aacd07ce1fff93b995c042d4e78775176" => :high_sierra sha256 "05f2a6011c554efb2c2196fdf08bfc6f7c6fd6d4e32530399888aabcc73ca339" => :sierra + sha256 "bba23286ffed07f93356651aeec6b1a3908b65eee528f24969fd101b9eafc930" => :x86_64_linux end depends_on "xz" diff --git a/Formula/rsnapshot.rb b/Formula/rsnapshot.rb index e6235a0c5a725..f50d033392eea 100644 --- a/Formula/rsnapshot.rb +++ b/Formula/rsnapshot.rb @@ -5,11 +5,14 @@ class Rsnapshot < Formula sha256 "2b0c7aad3e14e0260513331425a605d73c3bdd7936d66d418d7714a76bc55bd1" head "https://github.com/rsnapshot/rsnapshot.git" + depends_on "rsync" unless OS.mac? + bottle do cellar :any_skip_relocation sha256 "e195b17e2c28a787e6bc183c3f57397256fba91c8d5c490f3c24576033d39a74" => :catalina sha256 "e195b17e2c28a787e6bc183c3f57397256fba91c8d5c490f3c24576033d39a74" => :mojave sha256 "e195b17e2c28a787e6bc183c3f57397256fba91c8d5c490f3c24576033d39a74" => :high_sierra + sha256 "6f1afd70686726147492a9952d496e74c50d7016c5f6f962e446bb248b748663" => :x86_64_linux end def install diff --git a/Formula/rst-lint.rb b/Formula/rst-lint.rb index 12ddbfc787caa..d811afd35a5fd 100644 --- a/Formula/rst-lint.rb +++ b/Formula/rst-lint.rb @@ -11,6 +11,7 @@ class RstLint < Formula sha256 "45b5248c1e791f738f6cf2b645cec9d94d9992caa3a7d00594ad9ed2b12a11e6" => :catalina sha256 "e77f597dd712f47fe96b8b83130f9a85b51a1ce9113622443d36077b020bcd01" => :mojave sha256 "18c09b7c8bad5976c12dd900e827f2a036929a853707b2dd139c258278ccf548" => :high_sierra + sha256 "959e3f060b776de2148152a30aa46d4a511e4dd444e5d39710cd3eb8bfd0f7c2" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/rswift.rb b/Formula/rswift.rb index 1e21630cc82b7..3213c5a1dfc94 100644 --- a/Formula/rswift.rb +++ b/Formula/rswift.rb @@ -11,7 +11,7 @@ class Rswift < Formula sha256 "a344a394d9edece2c4737eec24ed2ed087719e0b95dfd269aae80b6b90040b44" => :mojave end - depends_on :xcode => "10.2" + depends_on :xcode => "10.2" if OS.mac? def install system "swift", "build", "--disable-sandbox", "-c", "release" diff --git a/Formula/rsync.rb b/Formula/rsync.rb index de697c43abd68..de895c066758b 100644 --- a/Formula/rsync.rb +++ b/Formula/rsync.rb @@ -7,10 +7,11 @@ class Rsync < Formula sha256 "95f2dd62979b500a99b34c1a6453a0787ada0330e4bec7fcffad37b9062d58d3" bottle do - cellar :any + cellar :any_skip_relocation sha256 "21895f23aed9113a620917e2eb1245a0b0391a5ac60c015961244a32d87af9b5" => :catalina sha256 "be472ad40b805c49164e72f8afaf08de36687431879549d107c8e9e8dc550ddc" => :mojave sha256 "6cc76004fca133f99d8eb7818d827ea5ac7fac6485bade98d9b7a3b0e3443fd3" => :high_sierra + sha256 "2c2f6827fbef0ffbdaed41d6feaa2275fb2415f4a034dd2f710b4334c4d0e986" => :x86_64_linux end depends_on "lz4" diff --git a/Formula/rsyslog.rb b/Formula/rsyslog.rb index c499e65598e24..c71e42565e25e 100644 --- a/Formula/rsyslog.rb +++ b/Formula/rsyslog.rb @@ -8,6 +8,7 @@ class Rsyslog < Formula sha256 "6e2da2c80153db338ae7acb282ee690fa888e11e3f2bc0c5d7cd86640e1d5264" => :catalina sha256 "a6292acf708905547dbaea460f92c59e5d1924506293afc751a349f8734a787b" => :mojave sha256 "fd426af7ddbe1611be30da51a5850f05d3496713b80c8f313e6763e9a245a2dd" => :high_sierra + sha256 "3f45614ffa82dc4fe10f0c613e440b6c64e965d7db21b7e71150b5a6c549205c" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/rtags.rb b/Formula/rtags.rb index 66770d3966059..3ad40be3ac5f5 100644 --- a/Formula/rtags.rb +++ b/Formula/rtags.rb @@ -20,7 +20,7 @@ class Rtags < Formula def install # Homebrew llvm libc++.dylib doesn't correctly reexport libc++abi - ENV.append("LDFLAGS", "-lc++abi") + ENV.append("LDFLAGS", "-lc++abi") if OS.mac? args = std_cmake_args << "-DRTAGS_NO_BUILD_CLANG=ON" diff --git a/Formula/rtf2latex2e.rb b/Formula/rtf2latex2e.rb index af89c2ec459fd..fcb838df0a60f 100644 --- a/Formula/rtf2latex2e.rb +++ b/Formula/rtf2latex2e.rb @@ -11,6 +11,7 @@ class Rtf2latex2e < Formula sha256 "b31c9387003920d4c27cb846da71203d69711638ed284825861a12247eeabca9" => :high_sierra sha256 "bbab54edbb07cbc3e16da33bdb0bd68258a330a3d1e2fceb175d1b753e6b81de" => :sierra sha256 "0aa7144c74e8af3a935a87c2b9c822581c38566e24351a50ae601bbedca4aec3" => :el_capitan + sha256 "dfdb13ccaca3107bd5fb77ace21bee8126911b4eb9473e8a8d51e0f85a2b75be" => :x86_64_linux end def install diff --git a/Formula/rtmpdump.rb b/Formula/rtmpdump.rb index 456cc0ca63279..911c3133b62e9 100644 --- a/Formula/rtmpdump.rb +++ b/Formula/rtmpdump.rb @@ -13,6 +13,7 @@ class Rtmpdump < Formula sha256 "97cf25d61d474c2115f6448940f924324d630b60776396398662b1368b4544da" => :mojave sha256 "7e95dc18fc03a6c1f19385e1507448f23e2e570c9b3ad60bd3fbc05c65295fb8" => :high_sierra sha256 "2118d007922d98ae71169be417106f594636e6ff979611b9e51dd2cf09c002b7" => :sierra + sha256 "422733ec0ea4c3884b781346333c9292c3042da1a36ae589f2ef680cb66458bd" => :x86_64_linux end depends_on "openssl@1.1" @@ -34,7 +35,7 @@ def install "XCFLAGS=#{ENV.cflags}", "XLDFLAGS=#{ENV.ldflags}", "MANDIR=#{man}", - "SYS=darwin", + "SYS=#{OS.mac? ? "darwin" : "posix"}", "prefix=#{prefix}", "sbindir=#{bin}", "install" diff --git a/Formula/rtorrent.rb b/Formula/rtorrent.rb index 37551273ff854..e55b9e7c91109 100644 --- a/Formula/rtorrent.rb +++ b/Formula/rtorrent.rb @@ -9,6 +9,7 @@ class Rtorrent < Formula sha256 "2040210e9850a74760c06cd96dab5e7dfbec58187e768127e657216f51f30e87" => :catalina sha256 "1e9e0d6926724f70776d19c39377c422e17cfa61729043853b48159e2df779c0" => :mojave sha256 "079eb5eee6d8844045cf37f88f153d0be37731caa53768a50799acbd13a2ef6b" => :high_sierra + sha256 "e51d70a7e0e81dbbb8b79cbc09b0d184b1e61e358abee761fddbbeebe64e20e1" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/rtptools.rb b/Formula/rtptools.rb index b1532b6a5009f..77d08994e23e9 100644 --- a/Formula/rtptools.rb +++ b/Formula/rtptools.rb @@ -10,6 +10,7 @@ class Rtptools < Formula sha256 "62a46aec907b497ca92c8a07731cf56b3a2b986850acbcb203aa87e94e945abe" => :catalina sha256 "51fe1b7831b60ee5ca438c11f72094149dbee5f96209a965997209fd6ac95742" => :mojave sha256 "e96df17dfe878ecb9e87a938579a21d514e31dbf8e5e6b743264dac23e42501c" => :high_sierra + sha256 "48f7b61c6619903ed813d21b9db5a78c5a507988e3812521555bd9ec11d6639a" => :x86_64_linux end def install diff --git a/Formula/rtv.rb b/Formula/rtv.rb index 37f5cbd7138aa..941695013807a 100644 --- a/Formula/rtv.rb +++ b/Formula/rtv.rb @@ -5,7 +5,7 @@ class Rtv < Formula homepage "https://github.com/michael-lazar/rtv" url "https://github.com/michael-lazar/rtv/archive/v1.27.0.tar.gz" sha256 "c57a6cbb2525160b6aaa9180aec0293962b6969675f8ac0f2cfacff3cbd00d7c" - revision 3 + revision OS.mac? ? 3 : 4 head "https://github.com/michael-lazar/rtv.git" bottle do @@ -13,6 +13,7 @@ class Rtv < Formula sha256 "c75871adcd642a2f80afc256b7718ee7b154acf165a5572d0b199ad57c92d947" => :catalina sha256 "178b8009cae28e82ca661ca016a414576dc5a24284e11960c85b37fedf8c8e99" => :mojave sha256 "2510e9e484f8eeff62d204b4ae4c21c1cacce11fba156eeb42d3450789b90452" => :high_sierra + sha256 "eea319a24672413f210c97414e44e65000b04ce178c16a4624e65a976f54535c" => :x86_64_linux end deprecate! :date => "2019-06-02" diff --git a/Formula/rubberband.rb b/Formula/rubberband.rb index cde639c5a3e6a..8038ae621b453 100644 --- a/Formula/rubberband.rb +++ b/Formula/rubberband.rb @@ -3,8 +3,8 @@ class Rubberband < Formula homepage "https://breakfastquay.com/rubberband/" url "https://breakfastquay.com/files/releases/rubberband-1.8.2.tar.bz2" sha256 "86bed06b7115b64441d32ae53634fcc0539a50b9b648ef87443f936782f6c3ca" - revision 1 - head "https://hg.sr.ht/~breakfastquay/rubberband", :using => :hg + revision OS.mac? ? 2 : 3 + head "https://bitbucket.org/breakfastquay/rubberband/", :using => :hg bottle do cellar :any @@ -12,21 +12,42 @@ class Rubberband < Formula sha256 "dcfa2c05cc251d0c5e810040646fb5f9511fda2d1cad20ccadce96544a1ad7e3" => :catalina sha256 "629837bd83bfcef1003bfb29759d15c29bb7c22740a70f6143bd4c16a5bd3362" => :mojave sha256 "f592baa6b5e82c542a92df87789a51b6603e7e8070dfa7f910349a388135b6da" => :high_sierra + sha256 "c625f9ddea3e31425331e05084ee2bc3d29c0aa4596107019c8152cdf04a5e06" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "libsamplerate" depends_on "libsndfile" + unless OS.mac? + depends_on "ladspa-sdk" + depends_on "fftw" + depends_on "vamp-plugin-sdk" + depends_on "adoptopenjdk" + end def install - system "make", "-f", "Makefile.osx" - # HACK: Manual install because "make install" is broken - # https://github.com/Homebrew/homebrew-core/issues/28660 - bin.install "bin/rubberband" - lib.install "lib/librubberband.dylib" => "librubberband.2.1.1.dylib" - lib.install_symlink lib/"librubberband.2.1.1.dylib" => "librubberband.2.dylib" - lib.install_symlink lib/"librubberband.2.1.1.dylib" => "librubberband.dylib" - include.install "rubberband" + unless OS.mac? + system "./configure", + "--disable-debug", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}" + system "make" + ENV["JAVA_HOME"] = Formula["adoptopenjdk"].opt_prefix + system "make", "jni" + system "make", "install" + end + + if OS.mac? + system "make", "-f", "Makefile.osx" + # HACK: Manual install because "make install" is broken + # https://github.com/Homebrew/homebrew-core/issues/28660 + bin.install "bin/rubberband" + lib.install "lib/librubberband.dylib" => "librubberband.2.1.1.dylib" + lib.install_symlink lib/"librubberband.2.1.1.dylib" => "librubberband.2.dylib" + lib.install_symlink lib/"librubberband.2.1.1.dylib" => "librubberband.dylib" + include.install "rubberband" + end cp "rubberband.pc.in", "rubberband.pc" inreplace "rubberband.pc", "%PREFIX%", opt_prefix diff --git a/Formula/ruby-install.rb b/Formula/ruby-install.rb index 19d6f6c15e5ab..af67ab54b127b 100644 --- a/Formula/ruby-install.rb +++ b/Formula/ruby-install.rb @@ -12,6 +12,7 @@ class RubyInstall < Formula sha256 "0e88bbe463d29a1e1cc0a91816023346a860a8a08c3daff660c24b313d2b4511" => :high_sierra sha256 "0e88bbe463d29a1e1cc0a91816023346a860a8a08c3daff660c24b313d2b4511" => :sierra sha256 "0e88bbe463d29a1e1cc0a91816023346a860a8a08c3daff660c24b313d2b4511" => :el_capitan + sha256 "60043e135e80cc104d8eb04fa14b53c72c6f651d90658d1133e7f7bc81398931" => :x86_64_linux end def install diff --git a/Formula/ruby.rb b/Formula/ruby.rb index 46812bde25ffc..9bb838f1feda8 100644 --- a/Formula/ruby.rb +++ b/Formula/ruby.rb @@ -3,12 +3,13 @@ class Ruby < Formula homepage "https://www.ruby-lang.org/" url "https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.1.tar.xz" sha256 "b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7" - revision 2 + revision OS.mac? ? 2 : 3 bottle do - sha256 "c9ee36823a8dfe2686c6d7a3faf5061a032ed0b8e08d484f3ff2cda72d210a08" => :catalina - sha256 "d597bee751f9419ea7b40d8125e4f58b2c1eb675b929fe85d8463a6e008b2250" => :mojave - sha256 "345677b922e40e7324bbab0d68593a2bbef7aa3e8f636fd850295f3414758ed7" => :high_sierra + sha256 "7f5ed2afb15b25f9616b617ecca2ee376eb67cf6c105790df22221b7be9c1ef9" => :catalina + sha256 "cc995a06e761acc8a807b040d8e7fe301902a4fc63d2beaaae40e04c710e7338" => :mojave + sha256 "2605ad1636e40d747878a8df7d1ef51a15e58e70ce03510b9ea582c02a448e26" => :high_sierra + sha256 "ff621c4d7d5024f9fa342c329b9c5063ab4194cf6bb22ca62ff6a224a6f05327" => :x86_64_linux end head do @@ -42,6 +43,13 @@ def rubygems_bindir end def install + if OS.linux? && build.bottle? + # The compiler used to build Ruby is stored in the bottle. + # See ruby <<<'print RbConfig::CONFIG["CC"]' + ENV["CC"] = "cc" + ENV["CXX"] = "c++" + end + # otherwise `gem` command breaks ENV.delete("SDKROOT") @@ -57,10 +65,14 @@ def install --with-opt-dir=#{paths.join(":")} --without-gmp ] - args << "--disable-dtrace" unless MacOS::CLT.installed? + args << "--disable-dtrace" if OS.mac? && !MacOS::CLT.installed? # Correct MJIT_CC to not use superenv shim - args << "MJIT_CC=/usr/bin/clang" + args << if OS.mac? + "MJIT_CC=/usr/bin/clang" + else + "MJIT_CC=/usr/bin/gcc" + end system "./configure", *args diff --git a/Formula/ruby@2.4.rb b/Formula/ruby@2.4.rb index 4c449f65dc90d..19e3344843a54 100644 --- a/Formula/ruby@2.4.rb +++ b/Formula/ruby@2.4.rb @@ -8,6 +8,7 @@ class RubyAT24 < Formula sha256 "0af834c6be2b5b377eb53b27895d0eb5cfcf9298b7613197f4d3cc83bc3fdad5" => :catalina sha256 "160204426fc18dfead0ceeb0be27eba371a68996792d6a8258b30bdfca8ef5f6" => :mojave sha256 "c8f457842cfc697ead2e961539742995bf1a6782de9cecd0b293c9fe6107b9d3" => :high_sierra + sha256 "dcf80fc8465820e72219a8b62c617279befb73ebbaccff0215faf3d86ca32f12" => :x86_64_linux end keg_only :versioned_formula @@ -41,7 +42,7 @@ def install --with-opt-dir=#{paths.join(":")} --without-gmp ] - args << "--disable-dtrace" unless MacOS::CLT.installed? + args << "--disable-dtrace" if OS.mac? && !MacOS::CLT.installed? system "./configure", *args diff --git a/Formula/ruby@2.5.rb b/Formula/ruby@2.5.rb index d2497a5becfaa..3c091c5864e04 100644 --- a/Formula/ruby@2.5.rb +++ b/Formula/ruby@2.5.rb @@ -8,6 +8,7 @@ class RubyAT25 < Formula sha256 "77c3f363f6d159824f6a6b1b80ac7e1d2bcb79528f79a0bf78ab3feaa837ad94" => :catalina sha256 "bbd75b74d1694bfb1378de37a21d692ca4ecdf3e4c5f6ad7f381ab1ac4942119" => :mojave sha256 "cb21f7f22afc2f304a9dc9ab7aba730563656a054b0407943ba0cb1f68b010a2" => :high_sierra + sha256 "36eda0e00533f77a25683399e6bf86da62d15b2b534485e608da855b7fc4a2aa" => :x86_64_linux end keg_only :versioned_formula @@ -41,7 +42,7 @@ def install --with-opt-dir=#{paths.join(":")} --without-gmp ] - args << "--disable-dtrace" unless MacOS::CLT.installed? + args << "--disable-dtrace" if OS.mac? && !MacOS::CLT.installed? system "./configure", *args diff --git a/Formula/ruby@2.6.rb b/Formula/ruby@2.6.rb index 7f71ae7aa2209..d3475a69e1721 100644 --- a/Formula/ruby@2.6.rb +++ b/Formula/ruby@2.6.rb @@ -9,6 +9,7 @@ class RubyAT26 < Formula sha256 "b9618a3e2b84a8364e2a9db594c8def107996030155908d1d2f932c97720ef46" => :catalina sha256 "e14b839ac8de2cbca1b7f67803a2cfd085159045102c2c073d8d90e7bbeaf81d" => :mojave sha256 "6be9583785d94e62384bb4642a5dd514653dbaab7acf77a6873b4e654c355ce9" => :high_sierra + sha256 "0b41514ee014864cf6069995dec9fdf1db71f03be11b51c11904410d5711f90b" => :x86_64_linux end keg_only :versioned_formula @@ -42,10 +43,14 @@ def install --with-opt-dir=#{paths.join(":")} --without-gmp ] - args << "--disable-dtrace" unless MacOS::CLT.installed? + args << "--disable-dtrace" if OS.mac? && !MacOS::CLT.installed? # Correct MJIT_CC to not use superenv shim - args << "MJIT_CC=/usr/bin/clang" + args << if OS.mac? + "MJIT_CC=/usr/bin/clang" + else + "MJIT_CC=/usr/bin/gcc" + end system "./configure", *args diff --git a/Formula/rubyfmt.rb b/Formula/rubyfmt.rb index 7cc69e0d77723..d0bd6555b6c5d 100644 --- a/Formula/rubyfmt.rb +++ b/Formula/rubyfmt.rb @@ -9,6 +9,7 @@ class Rubyfmt < Formula sha256 "8d9ed80d496220e02b9df146c41870079116cf798ab90734212d3cdc6080bb8b" => :catalina sha256 "8d9ed80d496220e02b9df146c41870079116cf798ab90734212d3cdc6080bb8b" => :mojave sha256 "8d9ed80d496220e02b9df146c41870079116cf798ab90734212d3cdc6080bb8b" => :high_sierra + sha256 "e8843c31665c63f1c243dce1b20f8d3c39c8d0037b5a47dc6a8e62b47db63dd0" => :x86_64_linux end uses_from_macos "ruby" diff --git a/Formula/run.rb b/Formula/run.rb index 4b7c51ea93c4c..3680a16bf2c77 100644 --- a/Formula/run.rb +++ b/Formula/run.rb @@ -9,6 +9,7 @@ class Run < Formula sha256 "4a2329ae36f59ed71c1b6364828c465a27f92506cd77e9a7c8217def3e2b7c9e" => :catalina sha256 "4a2329ae36f59ed71c1b6364828c465a27f92506cd77e9a7c8217def3e2b7c9e" => :mojave sha256 "4a2329ae36f59ed71c1b6364828c465a27f92506cd77e9a7c8217def3e2b7c9e" => :high_sierra + sha256 "9fb77719822989beec92148b81ddb2cd6e6f78dc270ffb51fec869915eae2763" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/rush.rb b/Formula/rush.rb index 0c6da7694fa6a..daa2d17ceb418 100644 --- a/Formula/rush.rb +++ b/Formula/rush.rb @@ -10,6 +10,7 @@ class Rush < Formula sha256 "5cdc9e464c7086e99e26063787dfefafd4805d90b0ea5aa40044b81f23d10db1" => :mojave sha256 "a76250fc5b34898050b9e18abd00dffbefd2c37dcd021b37d30bef75574abe49" => :high_sierra sha256 "55acb177bf3b6c2d041341b9a625ac10c6aba1237974febd66e40f1a7ec23319" => :sierra + sha256 "464e15df614617ebb7f00c043af7757d0bfcb87c53798a4eb0aae0385b114dbb" => :x86_64_linux end def install diff --git a/Formula/rust-analyzer.rb b/Formula/rust-analyzer.rb index ded1777cef65a..29fa58cc2759d 100644 --- a/Formula/rust-analyzer.rb +++ b/Formula/rust-analyzer.rb @@ -9,6 +9,7 @@ class RustAnalyzer < Formula sha256 "84c4d712170b890a2ae67bfc3ed3e0c6afae12e0b8a65e20a1209f134592e11d" => :catalina sha256 "59fd6cd2d4fed794ed0d635b3f048bfe20a4c6ddb44d3fd4ce7f649e1578bb91" => :mojave sha256 "b16b5d0193d85f89f6249b8063730779e7e039c6635b08392d77c7dddc9d47c7" => :high_sierra + sha256 "b100674ca7fff97892005ab53288fbce8667f31a0a1154c11992c1afa59a2509" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/rust.rb b/Formula/rust.rb index 069fa8c432979..ad32d99a6ad5c 100644 --- a/Formula/rust.rb +++ b/Formula/rust.rb @@ -14,10 +14,10 @@ class Rust < Formula end bottle do - cellar :any sha256 "352e3e4b03c90419a139eca2cc2628e99e827e5ca4550268f88e8b76f2cf692e" => :catalina sha256 "08a95ea4ccea36f0a18e24eeec71eed018be229b835c8c3ef959e6340f853842" => :mojave sha256 "e7388208f60bc2bd2615b50f377c43647da1f952fa899bcdfdba7821543d2a76" => :high_sierra + sha256 "f38d279ae1a45c5d923edab68a1a3fa6ff678249b3000f1bfc0a588af9c0d402" => :x86_64_linux end head do @@ -37,10 +37,21 @@ class Rust < Formula uses_from_macos "curl" uses_from_macos "zlib" + on_linux do + depends_on "binutils" + end + resource "cargobootstrap" do - # From https://github.com/rust-lang/rust/blob/#{version}/src/stage0.txt - url "https://static.rust-lang.org/dist/2020-05-07/cargo-0.44.0-x86_64-apple-darwin.tar.gz" - sha256 "1071c520204a9e8fe4dd0de66a07a083f06abba16ac88f1df72231328a6395e6" + if OS.mac? + # From https://github.com/rust-lang/rust/blob/#{version}/src/stage0.txt + url "https://static.rust-lang.org/dist/2020-05-07/cargo-0.44.0-x86_64-apple-darwin.tar.gz" + sha256 "1071c520204a9e8fe4dd0de66a07a083f06abba16ac88f1df72231328a6395e6" + end + unless OS.mac? + # From: https://github.com/rust-lang/rust/blob/#{version}/src/stage0.txt + url "https://static.rust-lang.org/dist/2020-05-07/cargo-0.44.0-x86_64-unknown-linux-gnu.tar.gz" + sha256 "e4c8533670a64a85ee1a367e4bb9d63a2d6b3e9949e116ec956cec15df9a67bd" + end end def install @@ -48,7 +59,7 @@ def install # Fix build failure for compiler_builtins "error: invalid deployment target # for -stdlib=libc++ (requires OS X 10.7 or later)" - ENV["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version + ENV["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version if OS.mac? # Ensure that the `openssl` crate picks up the intended library. # https://crates.io/crates/openssl#manual-configuration @@ -59,7 +70,7 @@ def install # libgit2-sys-0.6.12 "fatal error: 'os/availability.h' file not found # #include " on 10.11 and "SecTrust.h:170:67: error: # expected ';' after top level declarator" among other errors on 10.12 - ENV["SDKROOT"] = MacOS.sdk_path + ENV["SDKROOT"] = MacOS.sdk_path if OS.mac? args = ["--prefix=#{prefix}"] if build.head? @@ -80,6 +91,7 @@ def install resource("cargo").stage do ENV["RUSTC"] = bin/"rustc" args = %W[--root #{prefix} --path . --features curl-sys/force-system-lib-on-osx] + args -= %w[--features curl-sys/force-system-lib-on-osx] unless OS.mac? system "cargo", "install", *args end diff --git a/Formula/rustup-init.rb b/Formula/rustup-init.rb index c83b5368d72bc..4d5a2a8cac2c5 100644 --- a/Formula/rustup-init.rb +++ b/Formula/rustup-init.rb @@ -9,9 +9,15 @@ class RustupInit < Formula sha256 "a97694534834b8c87660c7d3ecf0cad6f030c39c50cd365c6a28ac167aaa4464" => :catalina sha256 "fad5c12bfcd7223aa445718df1427315fcc466df93c4c33f0629ecdf146191c8" => :mojave sha256 "6b52ab63b32993cfbcc9f5a2329b62c22501fbf9c4cb3b797b34d20d9641204d" => :high_sierra + sha256 "db47f128116b376bbe1207760bfd43c765285b4dcf1b223659f7bdeed60925c9" => :x86_64_linux end depends_on "rust" => :build + unless OS.mac? + depends_on "curl" + depends_on "openssl@1.1" + depends_on "pkg-config" => :build + end def install cargo_home = buildpath/"cargo_home" diff --git a/Formula/ry.rb b/Formula/ry.rb index a50cbd3c7faf5..47308d896a419 100644 --- a/Formula/ry.rb +++ b/Formula/ry.rb @@ -12,6 +12,7 @@ class Ry < Formula sha256 "835c360df374f5ca94a753b1ce79ba61dfc9fc14e54a2bf064367b9094909677" => :mojave sha256 "3e2e0b1e4104b9856ef6f5ad05caa4100ba209850c84c1db759f788eed042740" => :high_sierra sha256 "3e2e0b1e4104b9856ef6f5ad05caa4100ba209850c84c1db759f788eed042740" => :sierra + sha256 "3cc9803cede7bbf29016be97d86a7bd03f946eb3390ba20c79bbda540c34be6a" => :x86_64_linux end depends_on "bash-completion" diff --git a/Formula/s-lang.rb b/Formula/s-lang.rb index 5d9575cc96090..a2f0c1ef2db65 100644 --- a/Formula/s-lang.rb +++ b/Formula/s-lang.rb @@ -10,9 +10,11 @@ class SLang < Formula sha256 "05a3437702d5793c9bcac94151e8614878ca36cb1074ab330708021e59845346" => :mojave sha256 "52884a38833f21110f2ed22960f8f96ed5e3878fda45def8b67450e643ccfc97" => :high_sierra sha256 "e317f0ed56871fe293943faedfa44e6c744afb5a0187b7c81e201ce6921b0634" => :sierra + sha256 "b440d65ffa05e9ae112260d3f99bc4f8b6a451785bd7943730ddedc8b1fec3c8" => :x86_64_linux end depends_on "libpng" + depends_on "pcre" unless OS.mac? def install png = Formula["libpng"] diff --git a/Formula/s-search.rb b/Formula/s-search.rb index 9417e593c30b7..592d201459c72 100644 --- a/Formula/s-search.rb +++ b/Formula/s-search.rb @@ -13,6 +13,7 @@ class SSearch < Formula sha256 "04281fb66e28cf23c3ea1cd23ec6286432191fde31ac8c7b6c9c13bc6b365b0a" => :mojave sha256 "4a0c5595943e8b7b4892ff3caf4d03b29533405a411268a77e0a51272a3d7823" => :high_sierra sha256 "b9d547b1bcc45516396ed8398b624ac83a1c4ade7bf13f130b1b063b9aec1590" => :sierra + sha256 "570e25b19ec8da17b9d4691fa7ac311499cc8d8bcac2ad79748263d0a12ff972" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/s3cmd.rb b/Formula/s3cmd.rb index 96fab7bdd0456..7a3beb9e47995 100644 --- a/Formula/s3cmd.rb +++ b/Formula/s3cmd.rb @@ -5,6 +5,7 @@ class S3cmd < Formula homepage "https://s3tools.org/s3cmd" url "https://files.pythonhosted.org/packages/c7/eb/5143fe1884af2303cb7b23f453e5c9f337af46c2281581fc40ab5322dee4/s3cmd-2.1.0.tar.gz" sha256 "966b0a494a916fc3b4324de38f089c86c70ee90e8e1cae6d59102103a4c0cc03" + revision 1 unless OS.mac? head "https://github.com/s3tools/s3cmd.git" bottle do @@ -12,6 +13,7 @@ class S3cmd < Formula sha256 "ea18ab2445955c20de54537447b5930de60cf8e927fe291f662760d50c0df8db" => :catalina sha256 "737880ee8c7e9d73848eec50d87b1b7da7762a8b8d6172fd1f4be173888e18fe" => :mojave sha256 "4d2c498462eba573c43413ec16f4681a8e604b67ff6739351900e500e2be5923" => :high_sierra + sha256 "d3fef12558ac96314fd0c28670b6c73e9a3877d92bfe89659ef0425f5edaa01f" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/s6.rb b/Formula/s6.rb index 2edd8f83a807c..8fd765b89ba42 100644 --- a/Formula/s6.rb +++ b/Formula/s6.rb @@ -8,6 +8,7 @@ class S6 < Formula sha256 "94906378d458e78a0909dc89bd5672ca8d33645b1b070be4974ac7ebe0f3aa15" => :catalina sha256 "e4024234358147987f7f6f599b73ddfd9bbe5e5fd414efcbc53577045a1dbb78" => :mojave sha256 "d6be4dd0697c711c1e35fe25e4f1365bcb1c198ab8fc8c3f3d7169b29ccb4372" => :high_sierra + sha256 "2c6df1a6ff78142090330b0ec9f0e1f375a7fceb17fc2f75804d8109e4c43540" => :x86_64_linux end resource "skalibs" do diff --git a/Formula/sagittarius-scheme.rb b/Formula/sagittarius-scheme.rb index d7c881f5324e9..b3495e2fceb43 100644 --- a/Formula/sagittarius-scheme.rb +++ b/Formula/sagittarius-scheme.rb @@ -10,6 +10,7 @@ class SagittariusScheme < Formula sha256 "83845fdb59150a6c1bdd0e7f4fae012cf61179d66bb4187ab02cf8916230adbb" => :catalina sha256 "c49cdba71567af4f9ba0a65abd81cd60f7913afc614d5f2495fb5f10961c8a53" => :mojave sha256 "5c49ae9b83d175b6d65dab8ce262b4fd3a99d6bc6b8306da963054ade9f5ff3e" => :high_sierra + sha256 "f8e3ad0085c9a0f5102ad07bf38113becf36facc1503bf2b7b9327a45926a19d" => :x86_64_linux end depends_on "cmake" => :build @@ -18,6 +19,17 @@ class SagittariusScheme < Formula depends_on "openssl@1.1" depends_on "unixodbc" + uses_from_macos "zlib" + + # Remove with next release + # https://bitbucket.org/ktakashi/sagittarius-scheme/issues/271/sagittarius-socketso-not-found-by + unless OS.mac? + patch do + url "https://bitbucket.org/ktakashi/sagittarius-scheme/commits/d0d29a50b3f5022cec7dc49811f4532291970d7d/raw" + sha256 "4cf027942873a4e2a96ac5b1875e018aba9369d9c9eef7bc5a9fad0b897443fd" + end + end + def install system "cmake", ".", *std_cmake_args, "-DODBC_LIBRARIES=odbc" system "make", "install" diff --git a/Formula/salt.rb b/Formula/salt.rb index d4a87977f621f..b9e806c38dac3 100644 --- a/Formula/salt.rb +++ b/Formula/salt.rb @@ -8,9 +8,11 @@ class Salt < Formula head "https://github.com/saltstack/salt.git", :branch => "develop", :shallow => false bottle do + cellar :any sha256 "138cea32de23b64acb9467ab2fe8d9783d47d4a1a947ff83c30effa8aca9aa0b" => :catalina sha256 "048bd03fcb35fe5c027c8698bb3f303adc134ba72b529252f12a372ac05940ad" => :mojave sha256 "a05afcb8b6a34f2c6e35edc547cacd928bdba93e2843278882f85cd805308c65" => :high_sierra + sha256 "351ed31caf606f73c142d1c0ab546ae293601f28c301a26cb5d8b434419758ff" => :x86_64_linux end depends_on "swig" => :build @@ -20,8 +22,40 @@ class Salt < Formula depends_on "python@3.8" depends_on "zeromq" + uses_from_macos "libffi" + on_linux do depends_on "pkg-config" => :build + depends_on "gmp" + depends_on "pcre" + end + + # Saltstack's Git filesystem backend depends on pygit2 which depends on libgit2 + # pygit2 must be the same version as libgit2 - mismatched versions are incompatible + + resource "Jinja2" do + url "https://files.pythonhosted.org/packages/7b/db/1d037ccd626d05a7a47a1b81ea73775614af83c2b3e53d86a0bb41d8d799/Jinja2-2.10.3.tar.gz" + sha256 "9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de" + end + + resource "M2Crypto" do + url "https://files.pythonhosted.org/packages/74/18/3beedd4ac48b52d1a4d12f2a8c5cf0ae342ce974859fba838cbbc1580249/M2Crypto-0.35.2.tar.gz" + sha256 "4c6ad45ffb88670c590233683074f2440d96aaccb05b831371869fc387cbd127" + end + + resource "MarkupSafe" do + url "https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz" + sha256 "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b" + end + + resource "PyYAML" do + url "https://files.pythonhosted.org/packages/9e/a3/1d13970c3f36777c583f136c136f804d70f500168edc1edea6daa7200769/PyYAML-3.13.tar.gz" + sha256 "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf" + end + + resource "backports_abc" do + url "https://files.pythonhosted.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8/backports_abc-0.5.tar.gz" + sha256 "033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde" end # Homebrew installs optional dependencies: M2Crypto, pygit2 diff --git a/Formula/sampler.rb b/Formula/sampler.rb index cab679f1a5df0..72a2029e15c00 100644 --- a/Formula/sampler.rb +++ b/Formula/sampler.rb @@ -9,9 +9,11 @@ class Sampler < Formula sha256 "1b4a4c841691d8a6ca9ea4649092684511bff1f60d7d80e364db13115f2e6399" => :catalina sha256 "b50240b4f199da6d55d4645dfd3d2b0fc3406d20a504ba9af4d3b545196438b1" => :mojave sha256 "163b575ff369f264605bdc69c0fc838e44e706f8b6c527bb343cbfb18a9b1fdc" => :high_sierra + sha256 "f3a60c290fb91e2a621778e53865d71808db100e5590c114792c5c20687645ff" => :x86_64_linux end depends_on "go" => :build + depends_on "alsa-lib" unless OS.mac? def install system "go", "build", "-o", bin/"sampler" diff --git a/Formula/samtools.rb b/Formula/samtools.rb index ba4d77b8bdae3..cea28cc73c38a 100644 --- a/Formula/samtools.rb +++ b/Formula/samtools.rb @@ -9,6 +9,7 @@ class Samtools < Formula sha256 "53c31e536e1f0a98e2dba30eddb61a782bf14b45ebf12e56973788f3427c1bac" => :catalina sha256 "18abf7b1a130579066fa055116589cfc7ca4d20842408d7038470ebd612e8a85" => :mojave sha256 "b9be0c12847087c47e0a1d9776d77795d35f98ed3373963564453de15c40437a" => :high_sierra + sha256 "3ec896e125abfc5ab5bc0b4fe1fbd0952e56fb358773682b4749d1b06382b13a" => :x86_64_linux end depends_on "htslib" diff --git a/Formula/samurai.rb b/Formula/samurai.rb index a7948233b8f3c..36a075b4f9301 100644 --- a/Formula/samurai.rb +++ b/Formula/samurai.rb @@ -10,6 +10,7 @@ class Samurai < Formula sha256 "ef3f56caffb50416e4d708cea0910b1658811464b94697b850760bf6acc70e4a" => :catalina sha256 "90d42648667443f8bc1e9de25e221b2c16d8c973bac6cda33bfb1f611893144a" => :mojave sha256 "e9c857e0bf7f2713d90d21040ab28431c03fe0e560a17d8dab6a3b4d6c463111" => :high_sierra + sha256 "648628ecab1ffb7a744cb9da6d4ea3b6917018c6ace259541aa3399fe8005ca8" => :x86_64_linux end def install diff --git a/Formula/sane-backends.rb b/Formula/sane-backends.rb index 60fd192c0d955..069d1f420c873 100644 --- a/Formula/sane-backends.rb +++ b/Formula/sane-backends.rb @@ -19,6 +19,7 @@ class SaneBackends < Formula sha256 "4d9b0e82a282fc75379e56de828da1601a63bdc49afe7be8a0e685a1ec5f2f6a" => :catalina sha256 "52405560cb01a2b2cc6afdcc813d2ef57386b09790f36df3126a0764ece0005b" => :mojave sha256 "9911d3ac5aebaa5c7313d2076ddb355b4f9d4475fb94b774373445ef97313297" => :high_sierra + sha256 "d08be2635f20c43efb789e0f34456c56d551d7739e7c62de418dd89ff8f379d7" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/sassc.rb b/Formula/sassc.rb index 76343fa95718a..f9a6c30601ff0 100644 --- a/Formula/sassc.rb +++ b/Formula/sassc.rb @@ -12,6 +12,7 @@ class Sassc < Formula sha256 "34e0739d4967b537d4836780cefcb47910ce8c5b8201e9f864d10c3d34801237" => :mojave sha256 "4461eb8cf88f6fbbfe0d15b0efd0449cc95e3e46873af0f972769594786c32ea" => :high_sierra sha256 "e54c8d0ddc93a8212c9c39f9e8c853a6b19ae1fc2ba3bee650785215441aa60e" => :sierra + sha256 "5b04bef670dd3d5acf92b9897a0f0b7d9033db072ad35ee79fcdb5e9147b559f" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/sbcl.rb b/Formula/sbcl.rb index 17a9ba9b380f7..351456b254dfb 100644 --- a/Formula/sbcl.rb +++ b/Formula/sbcl.rb @@ -5,18 +5,23 @@ class Sbcl < Formula sha256 "fd92d64c1d97cc4f42fe3dcad2b183bcb225d01cdba4461634926f2f70adddae" bottle do - cellar :any_skip_relocation sha256 "a1a0712251e374d34d8b6a8c456ed45f24f94b1b7d5f90d237e4a54ea92f350b" => :catalina sha256 "2dfda3f01b4c7adb5c0ea65af79bbf164d8008bae56345242fee1be2b65c7556" => :mojave sha256 "e487ad7b1a86d025dd11bda24f780768c448012bae30199978ddd2ed2f2535e3" => :high_sierra + sha256 "9a47477204a789740712c4de11576df1d2edc6968dc5c50173d98c7089a2e4f5" => :x86_64_linux end uses_from_macos "zlib" # Current binary versions are listed at https://sbcl.sourceforge.io/platform-table.html resource "bootstrap64" do - url "https://downloads.sourceforge.net/project/sbcl/sbcl/1.2.11/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2" - sha256 "057d3a1c033fb53deee994c0135110636a04f92d2f88919679864214f77d0452" + if OS.mac? + url "https://downloads.sourceforge.net/project/sbcl/sbcl/1.2.11/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2" + sha256 "057d3a1c033fb53deee994c0135110636a04f92d2f88919679864214f77d0452" + elsif OS.linux? + url "https://downloads.sourceforge.net/project/sbcl/sbcl/1.3.3/sbcl-1.3.3-x86-64-linux-binary.tar.bz2" + sha256 "e8b1730c42e4a702f9b4437d9842e91cb680b7246f88118c7443d7753e61da65" + end end patch :p0 do diff --git a/Formula/sbjson.rb b/Formula/sbjson.rb index 24d430ef2dab8..9d8f2919c68e3 100644 --- a/Formula/sbjson.rb +++ b/Formula/sbjson.rb @@ -12,7 +12,8 @@ class Sbjson < Formula sha256 "649463e051c03596a72400a04b95f993222f5ba6d42a879241291660fef8605c" => :high_sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? + depends_on :macos def install xcodebuild "-project", "SBJson5.xcodeproj", diff --git a/Formula/scalapack.rb b/Formula/scalapack.rb index 95d45185534b1..ec2a119776a78 100644 --- a/Formula/scalapack.rb +++ b/Formula/scalapack.rb @@ -10,6 +10,7 @@ class Scalapack < Formula sha256 "697f1d928914df0d879813afd717597a2939dfa87f3828dd6014011ab3da0b06" => :catalina sha256 "a994dfe2b4d48861f4fa406266fe00a4c29039bd37b5e58f71893e3180b045bd" => :mojave sha256 "770b58ffe8486edf0fe5bdfa788f9f4612e0859af683393b170bfda37fcd7c82" => :high_sierra + sha256 "3c74a8a8549212277bba5189ce6466ad19bb1eccb514ee36620fabeb5d222262" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/scale2x.rb b/Formula/scale2x.rb index f94e8172dbc6b..19771ee14d31e 100644 --- a/Formula/scale2x.rb +++ b/Formula/scale2x.rb @@ -11,6 +11,7 @@ class Scale2x < Formula sha256 "2a3519bdbba8ff6caa1ca9b48d461866b8121dfd224a2c25da106087bb3cfd61" => :high_sierra sha256 "771e1b1ea660234e8bea89e774d0d802f7f1cb12c08e100cbb5b83d0a02a61ea" => :sierra sha256 "033e1adf0430ced99eef1b746842e9ca876b542f6fbd8f050e8f7c7e1b59f692" => :el_capitan + sha256 "caa20bd633f2b27b9f781cdb7148ded5edda2877dce1dc2825d17cb5730b976d" => :x86_64_linux end depends_on "libpng" diff --git a/Formula/scamper.rb b/Formula/scamper.rb index dbcd2bba28e0a..4c372a9e0cd09 100644 --- a/Formula/scamper.rb +++ b/Formula/scamper.rb @@ -9,6 +9,7 @@ class Scamper < Formula sha256 "ce4b06740377720808c70eedad0c3da7e99a5686ec34f68cb578b4644a78b14b" => :catalina sha256 "54d78388a155989fbb95dce2301f5ff72bb7bbc53ad3e067382c06600d63fc0b" => :mojave sha256 "0133b481958220fe1db704531da243d22a50b2ddb01a30513410037bc44cf613" => :high_sierra + sha256 "8b579314f1d83dc8da6c2bbfa44fa37eba4098de27dcf4fb50a5c66645b0673a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/scc.rb b/Formula/scc.rb index ee6c52356161b..4203f63829b3d 100644 --- a/Formula/scc.rb +++ b/Formula/scc.rb @@ -9,6 +9,7 @@ class Scc < Formula sha256 "108e239ccf083324267fa3e0afa28c0fa48314b48d1cb419ce6c188d3177de4c" => :catalina sha256 "f314664bcaff93ec70bc6bb3e63f1e51a1d4007ad9cf509de823efccdf57e536" => :mojave sha256 "7c246db3f85a08e99c6fe3c51224bd95f49dc4a737394c1c4ff002c050c9af24" => :high_sierra + sha256 "1955a7ca9a26a27f12bd3f01cba924f24c73049df486e0c6d9325a58816cf630" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/sccache.rb b/Formula/sccache.rb index 40a320bd0f5f5..35d5fa8d90279 100644 --- a/Formula/sccache.rb +++ b/Formula/sccache.rb @@ -10,6 +10,7 @@ class Sccache < Formula sha256 "a4e38444e682b90e9cea144347e5f1fc32ab309ba448d495b025bb9bb19906d4" => :catalina sha256 "80f2b3cfa57125f7fd927b8b312483ca91c146dd76702d1a2e0cefdac5ae25f5" => :mojave sha256 "071e45205799343d3f2be7c3779292cbcf32d1bfa1861f70af55e9cca50fe891" => :high_sierra + sha256 "979f057fca279eeb9167bc22a2531f3c6d391cd790194f5add894fb2bb88d57c" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/scdoc.rb b/Formula/scdoc.rb index e782ecd05fb75..89e3828cbde81 100644 --- a/Formula/scdoc.rb +++ b/Formula/scdoc.rb @@ -9,6 +9,7 @@ class Scdoc < Formula sha256 "cd14869a1ee30fb2cbb096f9a9f73438448fad68fbd048a4eed46394695f62ca" => :catalina sha256 "12f800d4af4950f91eceba248a2576dfc2eb6100d35e400ffcd043d0c6885a82" => :mojave sha256 "d6913f7e41d5e6f000a7b0e83d86d9d6975cd0d98769e73e88c0248be3b48685" => :high_sierra + sha256 "9e48bfde2f4ba09785940f07ffa7292879f108c3fb1ce1286127b88a38b2d9f8" => :x86_64_linux end def install diff --git a/Formula/sceptre.rb b/Formula/sceptre.rb index 37d269f09bf60..b8d853f0dba75 100644 --- a/Formula/sceptre.rb +++ b/Formula/sceptre.rb @@ -5,12 +5,14 @@ class Sceptre < Formula homepage "https://sceptre.cloudreach.com" url "https://files.pythonhosted.org/packages/97/8d/0072863a61ad36d386e934fc8580c0f7f63bfd49c3cf8754a601fa77df39/sceptre-2.3.0.tar.gz" sha256 "349e51e3bdc96f4f4aea214427f354f738c7658dc9eaa9dd1ffc5120a70a237d" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation sha256 "ef4f2e26d77e3bd069878477a87c95f8985b7a736971f46ab7ca65e386df8fa9" => :catalina sha256 "3e22726f0e63bd9425e65ddf4a46a727f8cc63311c048de564e3131ce48e54b2" => :mojave sha256 "1878a124ddbc98577fe7be58ec80c46ed114142abe3082d44a4a59720cf3672a" => :high_sierra + sha256 "c494e660aa8fe00a4e3edaadb0e4d4b7b6586b44c537130d85368ef0b851250a" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/schroedinger.rb b/Formula/schroedinger.rb index e8a16b0fb9864..bdf79e73a500c 100644 --- a/Formula/schroedinger.rb +++ b/Formula/schroedinger.rb @@ -15,6 +15,7 @@ class Schroedinger < Formula sha256 "1b990c49b7d72f3030bcee52bf70094a6cf16111867565cdb7541f670636cf05" => :el_capitan sha256 "5b1355803b730a9727c959261f0e2afc217f77502eac88120f77941c5cf373db" => :yosemite sha256 "64042317d9919652ab8577cec94435fb15d8eae3ad960196fc54bf9499b7c30e" => :mavericks + sha256 "6d9db51d5f058623b9a32b165b6308052de84f830d7e0ea022f679e026f910d6" => :x86_64_linux end head do diff --git a/Formula/scipy.rb b/Formula/scipy.rb index 1953b800cd32c..f512a5a37f874 100644 --- a/Formula/scipy.rb +++ b/Formula/scipy.rb @@ -6,10 +6,10 @@ class Scipy < Formula head "https://github.com/scipy/scipy.git" bottle do - cellar :any sha256 "0f0120345fc26234606b9c4ad4a82f57853b8c1b0bcdcb5f2a1acadd32868bf3" => :catalina sha256 "579071f49a51dd26c9d9ae7ff1eefe8932277747642accccf84bd286b5504c28" => :mojave sha256 "77e44c7c1ae45d22a66fe6298be9dd8b9ed1ad51e0e401c71fd95d9ed44690ac" => :high_sierra + sha256 "65ffefefc2065f6d34da544cd0c4df291bbdb2c223187571e2ef1305689749f3" => :x86_64_linux end depends_on "swig" => :build @@ -24,7 +24,8 @@ class Scipy < Formula def install openblas = Formula["openblas"].opt_prefix ENV["ATLAS"] = "None" # avoid linking against Accelerate.framework - ENV["BLAS"] = ENV["LAPACK"] = "#{openblas}/lib/libopenblas.dylib" + dylib = OS.mac? ? "dylib" : "so" + ENV["BLAS"] = ENV["LAPACK"] = "#{openblas}/lib/libopenblas.#{dylib}" config = <<~EOS [DEFAULT] @@ -41,7 +42,8 @@ def install version = Language::Python.major_minor_version Formula["python@3.8"].opt_bin/"python3" ENV["PYTHONPATH"] = Formula["numpy"].opt_lib/"python#{version}/site-packages" ENV.prepend_create_path "PYTHONPATH", lib/"python#{version}/site-packages" - system Formula["python@3.8"].opt_bin/"python3", "setup.py", "build", "--fcompiler=gnu95" + system Formula["python@3.8"].opt_bin/"python3", "setup.py", + "build", (OS.mac? ? "--fcompiler=gnu95" : "--fcompiler=gfortran") system Formula["python@3.8"].opt_bin/"python3", *Language::Python.setup_install_args(prefix) end diff --git a/Formula/scmpuff.rb b/Formula/scmpuff.rb index 77838f8618c9b..0b673b821a8a7 100644 --- a/Formula/scmpuff.rb +++ b/Formula/scmpuff.rb @@ -10,6 +10,7 @@ class Scmpuff < Formula sha256 "304cb27623cc21878468793b8b8375a8a89f4f050cda665d301ecc025690e712" => :mojave sha256 "604d1805e793cbf6e0b07e030389a0275ccc98db832ff7564522496302e04985" => :high_sierra sha256 "15a2fd8febc6ac36cb3429979fd5c8f88f230ae6276c073a0eedc5ac7e7abf69" => :sierra + sha256 "4fd664d53b178bee5a83ab3b85bcfeb2a0c79941898af4e2cf22c34e18b5baaf" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/scons.rb b/Formula/scons.rb index 959febda5c642..c460305efd18f 100644 --- a/Formula/scons.rb +++ b/Formula/scons.rb @@ -3,13 +3,14 @@ class Scons < Formula homepage "https://www.scons.org/" url "https://downloads.sourceforge.net/project/scons/scons/3.1.2/scons-3.1.2.tar.gz" sha256 "7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any_skip_relocation sha256 "d754617c360bfc6701d9b3e345ff08d28530adafb302227ec6fe8eea6760ca28" => :catalina sha256 "d754617c360bfc6701d9b3e345ff08d28530adafb302227ec6fe8eea6760ca28" => :mojave sha256 "d754617c360bfc6701d9b3e345ff08d28530adafb302227ec6fe8eea6760ca28" => :high_sierra + sha256 "e2a7b71e6a79f285b8376ccc76c055f507e3f4bfb4b4ad760d6509efa25b2f3a" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/scour.rb b/Formula/scour.rb index 7b237f4bc3ec4..d7bce85595cb7 100644 --- a/Formula/scour.rb +++ b/Formula/scour.rb @@ -5,7 +5,7 @@ class Scour < Formula homepage "https://www.codedread.com/scour/" url "https://github.com/scour-project/scour/archive/v0.37.tar.gz" sha256 "4fcb961586d8a6d98ac9343ca5647421b98fdc79b51d81a1d3d18576b7908823" - revision 3 + revision OS.mac? ? 3 : 4 head "https://github.com/scour-project/scour.git" bottle do @@ -13,6 +13,7 @@ class Scour < Formula sha256 "03bac92a88319ff21d807b0d7438284b299262003b592987b38dda5a49389e48" => :catalina sha256 "927a6beeb623f29806e592eed6e2e3ee99861bc946bc24d5fd711dab50c29d15" => :mojave sha256 "4c5956feecd0b017e5165a4602d3d42ef4403141f35280fd1e4a0bc2369b69ea" => :high_sierra + sha256 "e143811ec95a28dd0154225b2eee30cf43b6dc53127eda20f803997526a57c42" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/scrcpy.rb b/Formula/scrcpy.rb index 9863366ca7c0c..182fff91f71cf 100644 --- a/Formula/scrcpy.rb +++ b/Formula/scrcpy.rb @@ -9,6 +9,7 @@ class Scrcpy < Formula sha256 "cd68e22dbb71217ef2b2cfcb36c1805ee9c5e9502e0b8ec9401d12b620b5237f" => :catalina sha256 "e238570d316bf7b7cd644020320bd0cb548fd312a8a551567009ac870e7c8cb2" => :mojave sha256 "f89663e0942ec853ce720aaa3408a973aa5f14c4e858a869b9395728998bd0b7" => :high_sierra + sha256 "889981c63c275d0315c263d5c0b3d3b9945c52e8a9a752268f9ff280088aad3f" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/screen.rb b/Formula/screen.rb index 21754bef49922..71f697ae060bc 100644 --- a/Formula/screen.rb +++ b/Formula/screen.rb @@ -19,6 +19,7 @@ class Screen < Formula sha256 "f3787a0e1c889106ab14d89c4f1bed001716ce1eb79e44e56b20e71b7448e172" => :catalina sha256 "30dfe7b1bc6c74d64be57224852e50ebd5d4c6d4939872eaceac5f06d9935208" => :mojave sha256 "1e63b4fd4ae798111980a7d9ed47c3fcb867cbad2c4253164b55722efc65d53e" => :high_sierra + sha256 "090ace939980839facaeefb986074a6a564e31d8b0ddd0569c2fc35a26a07365" => :x86_64_linux end head do @@ -33,6 +34,9 @@ class Screen < Formula def install cd "src" if build.head? + # Fix error: dereferencing pointer to incomplete type 'struct utmp' + ENV.append_to_cflags "-include utmp.h" unless OS.mac? + # With parallel build, it fails # because of trying to compile files which depend osdef.h # before osdef.sh script generates it. diff --git a/Formula/screenresolution.rb b/Formula/screenresolution.rb index 9738ccf015cfa..22889f73b2818 100644 --- a/Formula/screenresolution.rb +++ b/Formula/screenresolution.rb @@ -16,6 +16,8 @@ class Screenresolution < Formula sha256 "9e6944af938c0c9ec9e1e4a79a6849fabb222baa0d977a9425bee6a2827595d0" => :mavericks end + depends_on :macos + def install system "make", "CC=#{ENV.cc}" system "make", "PREFIX=#{prefix}", "install" diff --git a/Formula/scriptcs.rb b/Formula/scriptcs.rb index 3239b269a1c1d..0ea623ffa6c32 100644 --- a/Formula/scriptcs.rb +++ b/Formula/scriptcs.rb @@ -12,13 +12,14 @@ class Scriptcs < Formula sha256 "9ccece2f779060ab23e699b07d6cc6ce0b2c2e0058cc995b1541e1170f69a6eb" => :sierra sha256 "e3b6cb117d23ccf9a745e0ac5e61fcb531d7e8a08476699d2ece6c31e564450e" => :el_capitan sha256 "21891cea519df48979320ba74660002d270fb414181e3f7087505169af15a471" => :yosemite + sha256 "bf4b996e78af471928d9669adf1ea8f7c76b3e277842f631079c64fd171dc9ec" => :x86_64_linux # glibc 2.19 end depends_on "mono" def install script_file = "scriptcs.sh" - system "sh", "./build_brew.sh" + system "bash", "./build_brew.sh" libexec.install Dir["src/ScriptCs/bin/Release/*"] (libexec/script_file).write <<~EOS #!/bin/bash diff --git a/Formula/scrollkeeper.rb b/Formula/scrollkeeper.rb index ac7b965fde197..13e830122163f 100644 --- a/Formula/scrollkeeper.rb +++ b/Formula/scrollkeeper.rb @@ -9,6 +9,7 @@ class Scrollkeeper < Formula sha256 "9bd348638b9e3492db3549c7ac0756975ca2c57303ec58685bb3e6694fff1dd1" => :catalina sha256 "0d7cbee6e25a46848d7c387ba07c4ee110ae2256953d2e5addd26f68e21c645d" => :mojave sha256 "efa4637b9d1b3942192dca6fb4602ef72ec6b285ba424c087d290c8feb5e2c5b" => :high_sierra + sha256 "1a3a135d005b278f52c8586e2c79ea7fc02faa8ccd4100dbb66ebaf32bb14581" => :x86_64_linux end depends_on "docbook" @@ -20,8 +21,25 @@ class Scrollkeeper < Formula conflicts_with "rarian", :because => "scrollkeeper and rarian install the same binaries." + resource "XML::Parser" do + url "https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz" + sha256 "1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216" + end + def install ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" + + unless OS.mac? + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + resources.each do |res| + res.stage do + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make", "PERL5LIB=#{ENV["PERL5LIB"]}" + system "make", "install" + end + end + end + system "./configure", "--prefix=#{prefix}", "--mandir=#{man}", "--with-xml-catalog=#{etc}/xml/catalog" diff --git a/Formula/scrub.rb b/Formula/scrub.rb index b920e9be5d2e3..c31736c966396 100644 --- a/Formula/scrub.rb +++ b/Formula/scrub.rb @@ -15,6 +15,7 @@ class Scrub < Formula sha256 "82343d8c3b64b876f8afb208059c3a916590b45fe7998ee412d91d3df161fc92" => :el_capitan sha256 "40363789d6def7a867c3268832449f4f2ae5b3394f84c9063af2417c024f0eca" => :yosemite sha256 "2439531406dc59f8358b9a3fe242fd867643dd30c67a810e18ffb12dc09d9954" => :mavericks + sha256 "a0772c34a577889d54b7c87d856d17ca051d8353469a5082c05ef98b1578b8fd" => :x86_64_linux end head do diff --git a/Formula/scummvm-tools.rb b/Formula/scummvm-tools.rb index 1bd2e6daf7d0e..02d9f3775cb05 100644 --- a/Formula/scummvm-tools.rb +++ b/Formula/scummvm-tools.rb @@ -10,6 +10,7 @@ class ScummvmTools < Formula sha256 "821010b2b6e9756d7207a5dd61cdac53c82b780ca9a17a8ae313f82501cfa5fb" => :catalina sha256 "47718a761f38f31677a6a02851be2b42e16fb891bdb02df704f32d8b84e93796" => :mojave sha256 "9f5a6820cf016444c995abd59119e7446b5b9342298b97b9767efbd8938a2579" => :high_sierra + sha256 "d8f8b49f0e1e8038de70023340dc932fa520f17aae1b49fbb13aabce88b1b0c3" => :x86_64_linux end depends_on "boost" diff --git a/Formula/scummvm.rb b/Formula/scummvm.rb index 5a1982f592a42..b1948a3eea8e4 100644 --- a/Formula/scummvm.rb +++ b/Formula/scummvm.rb @@ -10,6 +10,7 @@ class Scummvm < Formula sha256 "2d1de2f1efde7505ec7b06a2dfd90e287d6d816d5082f7a89ae2f44c6c25b9d8" => :catalina sha256 "5b28e8e3d52ce3b1d9a0a172483090a8926c4f9244915b6af5a38b3c02c1eca8" => :mojave sha256 "a31b470f92fa3f75ce56c01c45c4c6c09960b001e6b96e90149e58932e3c4bee" => :high_sierra + sha256 "906f89d1092b20ff2467f68ea5ab278ba3febf3f3c978b186e579ad2c32491e2" => :x86_64_linux end depends_on "a52dec" @@ -42,6 +43,9 @@ def install end test do + # Test fails on headless CI: Could not initialize SDL: No available video device + return if ENV["CI"] + system "#{bin}/scummvm", "-v" end end diff --git a/Formula/scw.rb b/Formula/scw.rb index 38d2dd8ca4be5..46551675e36f1 100644 --- a/Formula/scw.rb +++ b/Formula/scw.rb @@ -11,6 +11,7 @@ class Scw < Formula sha256 "1c7a69355bafd8c035bb2878f6c9c7a9a013dacc8cdbdc1997b66bc49f7fd7f0" => :mojave sha256 "87a2f754ab3e1c5434a2b24b855de6e5da39990bf9cf558416fc2e259d66d0ab" => :high_sierra sha256 "b5727720c3f4173012c81b8dfee1a942262d430ae6951c0f39a9c28aefc21b83" => :sierra + sha256 "7e6b279924e252a38406464a7f03840b43ebe1600e29622f52bd5cb836153a43" => :x86_64_linux end depends_on "go" => :build @@ -30,6 +31,7 @@ def install test do output = shell_output(bin/"scw version") - assert_match "OS/Arch (client): darwin/amd64", output + os = OS.mac? ? "darwin" : "linux" + assert_match "OS/Arch (client): #{os}/amd64", output end end diff --git a/Formula/scws.rb b/Formula/scws.rb index d14d97b7d810c..ded3b93ed03b8 100644 --- a/Formula/scws.rb +++ b/Formula/scws.rb @@ -10,6 +10,7 @@ class Scws < Formula sha256 "feb648d3c6c98b2e693086371dae419f88b56b6d58e5ede76ffa882a6f9be4b6" => :mojave sha256 "94977ce56fa0c3c9d2fb21fe52067b49be65247b41d723893ac8c91f0e2dbbf3" => :high_sierra sha256 "81e6665fd65aae5e35c3e0b3f9f80bdaaf8ac787dfe6fe9e8454a8cb5cbcba02" => :sierra + sha256 "169ec9115017e6dcacba1db25247360d54a4396ca8e7198c7c6a065c3d13da1e" => :x86_64_linux end def install diff --git a/Formula/sd.rb b/Formula/sd.rb index 8a90fe81a4ef7..318a5a56adcf8 100644 --- a/Formula/sd.rb +++ b/Formula/sd.rb @@ -10,6 +10,7 @@ class Sd < Formula sha256 "cc2d08fca64a765bc5df67fc69b23f4afa3350c0851fabd06d4e3b218c456bb2" => :catalina sha256 "6496955ab15f26f18111214c0b97c24143f752aa4b222b6c54b15e24c5ee1462" => :mojave sha256 "0cdf79c329703411f1e67a4ff85fd58f10bd6de5293c1a5b7983c56b3defd7a4" => :high_sierra + sha256 "676ac177d81c6a1548588b7d06d8c817827806c1466ad59d09fcbeaed62ddd2b" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/sdb.rb b/Formula/sdb.rb index 4e28d6e5d2919..285e61728b489 100644 --- a/Formula/sdb.rb +++ b/Formula/sdb.rb @@ -10,6 +10,7 @@ class Sdb < Formula sha256 "04aa601e84f7f4d95e17ca2675564d4d3027e9736e57d4db85461c7a843ea025" => :catalina sha256 "8b110c8f73ccbae52f0e600fb3b67bef8088c541710fbe690b0548e4c2f09703" => :mojave sha256 "baa2ae3e71b94ba5241956188b631ece503344129f41a407268bafd82a9b009d" => :high_sierra + sha256 "81a11ec6afb42fe9bb598302f02e921353a2b71d85f2853a6464ab5adb1cc4ad" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/sdcv.rb b/Formula/sdcv.rb index b1fd73ad5d990..a5969cf03e4f4 100644 --- a/Formula/sdcv.rb +++ b/Formula/sdcv.rb @@ -12,6 +12,7 @@ class Sdcv < Formula sha256 "d40dc4d63326ca5268f5b1d75a8a64ecc0081fe6e35d6279ee937774b39cfb33" => :mojave sha256 "322ec61f8ae7914f8a8f5da7fac01ef0ee69aa9f9844e1c876168f9fdf54887a" => :high_sierra sha256 "e0aa6779b49ae274e5a9da62a12caceaf2149b587d96ce051bd5c7d735c81fa4" => :sierra + sha256 "77df7917057d9bc8304d417dc06d06eeb91cc8882b8a7dd04779c3fef7425b03" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/sdl.rb b/Formula/sdl.rb index c4c9c693ee920..2efec12f9c014 100644 --- a/Formula/sdl.rb +++ b/Formula/sdl.rb @@ -34,6 +34,7 @@ class Sdl < Formula sha256 "98b91b216ee0a29425796e5ece1062b4d57535dd83c68d8ffd23dafd9ca102d3" => :catalina sha256 "b19b93f980a305d7e18b3f3d59b0679e4f91c11dd51334725cc9244a74a2e177" => :mojave sha256 "2580e605dc4d53ea5d321c8cf8451a16630199a01bdcb7c7e0b8f39bfd6ed068" => :high_sierra + sha256 "e951c13cf3a33cd50d77d5b9152d6ddaecbdc04f6e6a9537a926ed424971c8dd" => :x86_64_linux end head do diff --git a/Formula/sdl2.rb b/Formula/sdl2.rb index d5888071044c1..ca9b97b58cf70 100644 --- a/Formula/sdl2.rb +++ b/Formula/sdl2.rb @@ -10,6 +10,7 @@ class Sdl2 < Formula sha256 "4dcd635465d16372ca7a7bb2b94221aa21de02f681a22e9239d095b66fb00c63" => :catalina sha256 "8733b127dd4ba6179e6ad9e6336418df9dbad8eb13f05597c05e6916f2ff0543" => :mojave sha256 "b71346aebd499ed30f6de2f58a333c50575bc3bf73fbba6dcaef5a04c58282c5" => :high_sierra + sha256 "f8b79add67cd5cba1c73f7afa7df16291c934d6ebafa8ad7d3bee6a2512aefac" => :x86_64_linux end head do @@ -24,6 +25,16 @@ class Sdl2 < Formula depends_on "pkg-config" => :build end + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "linuxbrew/xorg/libice" + depends_on "linuxbrew/xorg/libxcursor" + depends_on "linuxbrew/xorg/libxscrnsaver" + depends_on "linuxbrew/xorg/libxxf86vm" + depends_on "linuxbrew/xorg/xinput" + depends_on "pulseaudio" + end + # Fix library extension in CMake config file. # https://bugzilla.libsdl.org/show_bug.cgi?id=5039 patch do @@ -39,7 +50,30 @@ def install system "./autogen.sh" if build.head? - args = %W[--prefix=#{prefix} --without-x] + args = if OS.mac? + %W[--prefix=#{prefix} --without-x] + else + %W[--prefix=#{prefix} --with-x] + end + + unless OS.mac? + args += %w[ + --enable-pulseaudio + --enable-pulseaudio-shared + --enable-video-dummy + --enable-video-opengl + --enable-video-opengles + --enable-video-x11 + --enable-video-x11-scrnsaver + --enable-video-x11-xcursor + --enable-video-x11-xinerama + --enable-video-x11-xinput + --enable-video-x11-xrandr + --enable-video-x11-xshape + --enable-x11-shared + ] + end + system "./configure", *args system "make", "install" end diff --git a/Formula/sdl2_gfx.rb b/Formula/sdl2_gfx.rb index a441112625187..40ea36e2f129d 100644 --- a/Formula/sdl2_gfx.rb +++ b/Formula/sdl2_gfx.rb @@ -11,6 +11,7 @@ class Sdl2Gfx < Formula sha256 "6563ae4bda51a996e537cfe88509da94402b52469e11b92211b5bca58800ab24" => :high_sierra sha256 "fba875841d99a80ba39af65733a0df33adf220d29fbd5e313dfcc695b61bc8e4" => :sierra sha256 "aaec64e6b0020e3a0b2faf6ca37e5bc4b27d7327125a58831b0cd34803935cc7" => :el_capitan + sha256 "dd069a3c46bdd66d77d9a16edc3dad36da4c10317e4dd5e9241dc685b391c692" => :x86_64_linux end depends_on "sdl2" diff --git a/Formula/sdl2_image.rb b/Formula/sdl2_image.rb index 8faa1f93521d5..e6eeade0ea707 100644 --- a/Formula/sdl2_image.rb +++ b/Formula/sdl2_image.rb @@ -10,6 +10,7 @@ class Sdl2Image < Formula sha256 "1b3a464579d9ef25b3bdd9276119efffd0134fda5c5dc27051a35f1b21c00cfd" => :mojave sha256 "55c1f996fb523c2727d2b103f0a5ecfd7a073f55ff9a7230bb609d22bbf5a576" => :high_sierra sha256 "e3c9cf45d97099e818c667d23af8352e6d1bba0e3b609cdddee654f2a9da80cf" => :sierra + sha256 "7716abd8d14c9ae0088ae97b5ee12c2e29cbb4a5c93eb02af4e82e939804608b" => :x86_64_linux end depends_on "pkg-config" => :build @@ -43,7 +44,11 @@ def install return success; } EOS - system ENV.cc, "-L#{lib}", "-lsdl2_image", "test.c", "-o", "test" + if OS.mac? + system ENV.cc, "-L#{lib}", "-lsdl2_image", "test.c", "-o", "test" + else + system ENV.cc, "test.c", "-L#{lib}", "-lSDL2_image", "-o", "test" + end system "./test" end end diff --git a/Formula/sdl2_mixer.rb b/Formula/sdl2_mixer.rb index f31e7db274405..9a0120045ed21 100644 --- a/Formula/sdl2_mixer.rb +++ b/Formula/sdl2_mixer.rb @@ -11,6 +11,7 @@ class Sdl2Mixer < Formula sha256 "411aebe8a4b960a900879efc9d871575156efc174863beb135359679f3e7a8bf" => :mojave sha256 "af842a740632725bec40acd7418fa21aafcce0bee03d11a283c8c3509a235c78" => :high_sierra sha256 "359d8bd99a88d06f9484eb76b87b021ce48c777ac4583a0301ae0449e693cbf9" => :sierra + sha256 "5587c0549b6b4aff368858ef7cf9e0dab9517d055b84f6e55464e41fc981ed12" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/sdl2_net.rb b/Formula/sdl2_net.rb index 3502bee205bfe..17b1941d5cf1e 100644 --- a/Formula/sdl2_net.rb +++ b/Formula/sdl2_net.rb @@ -13,6 +13,7 @@ class Sdl2Net < Formula sha256 "46d189ebe1f240381a9e8d99a2cb249e577cec98e6399e741e47275735a3471c" => :el_capitan sha256 "2e2bcc1e1aac84b37ebb44398e463d9004764aa369489926cd07bb97cb9f60c4" => :yosemite sha256 "ebabcb8f4df6fdee7855a6e19080aea42d9909205b287312015179bb9b3f472a" => :mavericks + sha256 "a8f5d11fec7bb5fe7ba1cbfec35ba08faaca60928271d7ea1bfd5cc77ea7665f" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/sdl_gfx.rb b/Formula/sdl_gfx.rb index 45a34cc66bd68..0c893d4223ee2 100644 --- a/Formula/sdl_gfx.rb +++ b/Formula/sdl_gfx.rb @@ -11,6 +11,7 @@ class SdlGfx < Formula sha256 "b1040e970fe68325a37c4a6af037206c28d12ae77f49851a0d28333e7c19a5e4" => :high_sierra sha256 "643210ccd7a2d9f2fc92d519900bbeb51c1f168729e40860c40e67629ce2ef8a" => :sierra sha256 "072983d26bc7e50acd12ef27adab047c3e14e45dff83e98be9ea005c7c107524" => :el_capitan + sha256 "8180b7aa9d29e8eb44d3d58a71f56aa9be0aba2d75034db7ba2370051682b252" => :x86_64_linux end depends_on "sdl" diff --git a/Formula/sdl_image.rb b/Formula/sdl_image.rb index 835e91775b4bf..36047af387868 100644 --- a/Formula/sdl_image.rb +++ b/Formula/sdl_image.rb @@ -13,6 +13,7 @@ class SdlImage < Formula sha256 "d74d6e853e78b65a7e7f266be6733bdb5839f956bcb19061b68a46c16e080a94" => :sierra sha256 "4304e6b83a7afa176a0462e8ba20485bc098731a16bd375261f9f449a8f8f7d3" => :el_capitan sha256 "3403edd53a6776bad8dc4390ef8204479f3af7c485e8a7a1f81f86f43b4a7b5c" => :yosemite + sha256 "60f326bffef334a867e83b623a416290b1deae519c2c83a7760d16611e916466" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/sdl_mixer.rb b/Formula/sdl_mixer.rb index b2aa6f29ac423..ab90f43cabfb1 100644 --- a/Formula/sdl_mixer.rb +++ b/Formula/sdl_mixer.rb @@ -12,6 +12,7 @@ class SdlMixer < Formula sha256 "e08902563c6265ac480323c9f22a26ee0e51f42fb1c36efb9b66b1f6b34a032d" => :high_sierra sha256 "69e8726e5b9bb858e069d244844411fc43930d3a7d0b78c6177bf36c76bb04c2" => :sierra sha256 "9c9a55fe416bc37a14e9a58439093b85274bf12c2bab24660a3f7c4b0fff70c3" => :el_capitan + sha256 "d60206b770d335d52ab2ec2eae8079a69d9597e25e08b7d29fca39c7f2090e45" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/sdl_net.rb b/Formula/sdl_net.rb index bc929558e1ed3..3a0422343e5cf 100644 --- a/Formula/sdl_net.rb +++ b/Formula/sdl_net.rb @@ -13,6 +13,7 @@ class SdlNet < Formula sha256 "036938975b4060fdc944c2258a8d1d5d73f536860a9c807116e6c4fb2aa65dc8" => :el_capitan sha256 "fe6b8eda1d640db450ed12f79feb731d49a62263c4b83601d69659498d697538" => :yosemite sha256 "99f9035f95e548ea81eb11ac9c06ae5eab8d2797ea9ca03ac074fe30bb357748" => :mavericks + sha256 "87fc30d267a0a872837825861424f72b6a8b47db016e99554a81452f4cc9ebb2" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/sdl_rtf.rb b/Formula/sdl_rtf.rb index 348880ff3cc5a..faa0cdacddeeb 100644 --- a/Formula/sdl_rtf.rb +++ b/Formula/sdl_rtf.rb @@ -14,6 +14,7 @@ class SdlRtf < Formula sha256 "6c7e9f7459ff062fbb48ee1a383a4fd4acc2c29f5ee9b57dea93710c94ccda11" => :el_capitan sha256 "8dd89df32c9ea02bcab36932c2f22bcb6de58d6002bd6fb9e95f9bbfe5ccf41e" => :yosemite sha256 "9d077d10fc0102738e3c7d445cf2c8290150f98b4fb92e1b72bb3e5857dc3b3e" => :mavericks + sha256 "387e1a87657e3cd634cd172140c29804a80dc807b2c8487c0680d0d64a81749e" => :x86_64_linux end depends_on "sdl" diff --git a/Formula/sdl_ttf.rb b/Formula/sdl_ttf.rb index 65040905e2e4c..2a69aa219de9c 100644 --- a/Formula/sdl_ttf.rb +++ b/Formula/sdl_ttf.rb @@ -13,6 +13,7 @@ class SdlTtf < Formula sha256 "22972859bc6ab2f2a6fd8a4cf5394e647336e4b83d982b02e7015ceb7799e59a" => :sierra sha256 "981960db1d2539b57bc42deb12ab59e163214d881612c1fffea72e4927e1c82a" => :el_capitan sha256 "cea0e7f2cb248778bc3af4cab3f3ddd7469d4b24d72780891d2cd54dbc9d7216" => :yosemite + sha256 "69a109b9c2030506f1d667c6f57080cb5287470d731d4d4cb2e89c16739ff284" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/sdlpop.rb b/Formula/sdlpop.rb index 3013babe06709..46686ccf7d7f4 100644 --- a/Formula/sdlpop.rb +++ b/Formula/sdlpop.rb @@ -9,6 +9,7 @@ class Sdlpop < Formula sha256 "54fd6bcb8f351a98cd38017bb3c2a6df7a607dbd13b32cbd2162ab168a2a7759" => :catalina sha256 "136ad2e3a3dfb37fa6e998ebcada2b35f1a41b8b31b4ac404038388bd2d6902b" => :mojave sha256 "40e3329a4043ea4da4e71ccfbea3c9f710e9fed5d61e1d91a5390f7505f6c5f5" => :high_sierra + sha256 "e18ceeff08920d4edbbf567cc55336bc0273f2e18593825fe57d0a032ba301b8" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/seal.rb b/Formula/seal.rb index a43761d34feda..d4365673ebd44 100644 --- a/Formula/seal.rb +++ b/Formula/seal.rb @@ -5,14 +5,24 @@ class Seal < Formula sha256 "0c325c3e3d9b77be63ef866a7c73de861be46b99b61a22be60518d34865a1f37" bottle do - cellar :any + cellar :any_skip_relocation sha256 "a6220dff48ac029ae26e262ac604267a9df4c36f444878af75864bee18f305c1" => :catalina sha256 "2e7ea5ac3e4c7f2771929d610cc2a4c4527d0687e9beb834484a408641dd6ef3" => :mojave sha256 "73e34c7c5517f9a57d9f6bfb94ce5902dca5af69bc05b20a8dd6fd5d3d2653dc" => :high_sierra + sha256 "949766f001624d5e5f3b6df73a40f0d9992647e8e41ca0a85efce464f585fef4" => :x86_64_linux end depends_on "cmake" => [:build, :test] + # #pragma GCC error "SEAL requires __GNUC__ >= 6" + # In reality gcc@6 does not work because of some missing C++17 features. + unless OS.mac? + fails_with :gcc => "5" + fails_with :gcc => "6" + fails_with :gcc => "7" + depends_on "gcc@8" => [:build, :test] + end + def install system "cmake", "-DBUILD_SHARED_LIBS=ON", ".", *std_cmake_args system "make" @@ -21,6 +31,7 @@ def install end test do + ENV["CXX"] = Formula["gcc@8"].opt_bin/"g++-8" unless OS.mac? cp_r (pkgshare/"examples"), testpath # remove the partial CMakeLists diff --git a/Formula/securefs.rb b/Formula/securefs.rb index 5b8bb28b3332d..8a0742c6c42c8 100644 --- a/Formula/securefs.rb +++ b/Formula/securefs.rb @@ -11,10 +11,15 @@ class Securefs < Formula sha256 "8a8c7dd74f9b3082b2b128cc058714a27206d910273e4148959a25b7d30c51b5" => :catalina sha256 "9bee23af87518f68df56b862ad0ef88f842ebe65f8feff02e90bf5ab8e91522e" => :mojave sha256 "632496d8e9ed9fe91d18e9a2c9fef49c920dc091e10108246f8ab2056f75ea38" => :high_sierra + sha256 "284e62bbc94eba3cfbe57561eb41ddc6c42b22c4c18da74190429fb13debeb74" => :x86_64_linux end depends_on "cmake" => :build - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end def install system "cmake", ".", *std_cmake_args diff --git a/Formula/sentencepiece.rb b/Formula/sentencepiece.rb index 2e194e7df24f2..6d1380ffe3ba4 100644 --- a/Formula/sentencepiece.rb +++ b/Formula/sentencepiece.rb @@ -9,6 +9,7 @@ class Sentencepiece < Formula sha256 "c169b40d2a856514440b4fdfa7f461b9f1b2bc8c7d5e6603c3e42e8e62f90c0f" => :catalina sha256 "c144cb6375e447c1aee9616ab22250830892aa7bfdf230b3edc0c0a41a0bfa96" => :mojave sha256 "eb919fd4dc87993b2f4b6f8a58683831a7c2fb0f3abbcdf4a320f8bf761cdb8e" => :high_sierra + sha256 "ab463d7d830cadff83d71a5add23eba3a5fedf2215ab6b0dc7fdc579eec21b4b" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/seqtk.rb b/Formula/seqtk.rb index 1222874a64713..72ff97071263d 100644 --- a/Formula/seqtk.rb +++ b/Formula/seqtk.rb @@ -11,6 +11,7 @@ class Seqtk < Formula sha256 "4f377caf93e5d334e739375a5dcf06782f1d85516988a26df3f8f53d172b1e6f" => :high_sierra sha256 "fd3ecced5ba8f5a9eab13f8f2184f6a69d08b58c1ef53ad6e74bb45cab9324f4" => :sierra sha256 "55541e7e9249ef15bd4423ad9a45903918c2b4b54f632bc0472fb24aee683701" => :el_capitan + sha256 "209ca284bed07359cdc9a934f9892bb3e61d0eeb8368b93c500fb6dda55128c1" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/ser2net.rb b/Formula/ser2net.rb index e17216b6e66d3..ab4c3215df61e 100644 --- a/Formula/ser2net.rb +++ b/Formula/ser2net.rb @@ -5,11 +5,11 @@ class Ser2net < Formula sha256 "02f5dd0abbef5a17b80836b0de1ef0588e257106fb5e269b86822bfd001dc862" bottle do - cellar :any_skip_relocation sha256 "212684df3012508da810e7cd273f1418debf734aacb39949b54aca7b592b1a76" => :catalina sha256 "83435a03046d3e3db9461ae4dcf9357f6809290bf91560f2f3d722cac22ee6ce" => :mojave sha256 "9be8a962e23275a1400a60f94b5e98fc311cf9c917320b5c03d13edcebe40f67" => :high_sierra sha256 "8b4c2e80e4fd884c9761a18684191f5d508c858330989a492922fdb231e1ea5d" => :sierra + sha256 "98d73255946b1d279a9ea4088b660339aedc7f29897573051b47e3ebe608dc81" => :x86_64_linux end depends_on :macos => :sierra # needs clock_gettime diff --git a/Formula/serf.rb b/Formula/serf.rb index 49f42b6367b3d..35dda41d4e65a 100644 --- a/Formula/serf.rb +++ b/Formula/serf.rb @@ -11,11 +11,13 @@ class Serf < Formula sha256 "3bd356983857810d36a2ea7c3ae785a93068a502c3c371ccbf9b5db5b43c7a77" => :catalina sha256 "8fc8a0b90605b7f45e55bbd3334aeedf02feec63f1b1e6d0de0ce473ad575be2" => :mojave sha256 "1b0dbf9abeb34aae2e0b1634f274d46b7bd95a166dfff360fe54599de68415c6" => :high_sierra + sha256 "65fcc4de75f8b161da89a581e352c0d7206751548cfbe224181e354c86e929e2" => :x86_64_linux end depends_on "go" => :build depends_on "govendor" => :build depends_on "gox" => :build + depends_on "zip" => :build unless OS.mac? def install contents = Dir["*"] @@ -23,8 +25,8 @@ def install (gopath/"src/github.com/hashicorp/serf").install contents ENV["GOPATH"] = gopath + ENV["XC_OS"] = OS.mac? ? "darwin" : "linux" ENV["XC_ARCH"] = "amd64" - ENV["XC_OS"] = "darwin" (gopath/"bin").mkpath diff --git a/Formula/sersniff.rb b/Formula/sersniff.rb index 1a021a5db782e..7b052a8e9e49d 100644 --- a/Formula/sersniff.rb +++ b/Formula/sersniff.rb @@ -15,6 +15,7 @@ class Sersniff < Formula sha256 "abde8af644fecfa883abf597486fd269b379001ae29161fbd21777d0506edc86" => :el_capitan sha256 "c0c00897dd19dc6f8dff05b57e961079c8f783ba9afc345cac9f064dd2ae6630" => :yosemite sha256 "cd8d98e4360a068975fa25f1816e1a79533b46e5da65e455a0498d334daa1761" => :mavericks + sha256 "9400957079dd90421a957e9f5c0d307017c1da1fd171ec083e6baa542633a54d" => :x86_64_linux end def install diff --git a/Formula/serve.rb b/Formula/serve.rb index fbb0b428f388b..28f6e8e0e81d1 100644 --- a/Formula/serve.rb +++ b/Formula/serve.rb @@ -11,6 +11,7 @@ class Serve < Formula sha256 "a339885f14479144ebe771f5caba2239290d89926a1a8bbbaa56751b9ef62f8f" => :mojave sha256 "2b1474e49ed747c67fde6ed65e404da4c4e4d2f39190995241e10e62a99cca17" => :high_sierra sha256 "c23f691164cbd2f96630d273215f300e1e05ad99427b63e830db52c01eb9ac08" => :sierra + sha256 "e6e12f8c0d18dae0d1251ab45f2508388750ff748fbf1c74012ac75a2d205978" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/serverless.rb b/Formula/serverless.rb index 4d5f8410cb085..1bbd1a412f1bd 100644 --- a/Formula/serverless.rb +++ b/Formula/serverless.rb @@ -11,10 +11,15 @@ class Serverless < Formula sha256 "bb0878eb909b0189fa425733a1463d7f20f114b43f852d4185ff5d5d4fccd158" => :catalina sha256 "c07b0341c92b0071d9c5305c81853cf34b77e137376565e2cadc98e109be2851" => :mojave sha256 "d7635bfe09811d4df6c02241ee86be366e627c11172df5edd62c8d161c4579ae" => :high_sierra + sha256 "cadca31c446ffa953496ac7a509ac194e590af46dee794af81cd86c3042eddd1" => :x86_64_linux end depends_on "node" + on_linux do + depends_on "python" + end + def install system "npm", "install", *Language::Node.std_npm_install_args(libexec) bin.install_symlink Dir["#{libexec}/bin/*"] diff --git a/Formula/sfcgal.rb b/Formula/sfcgal.rb index 5f21cc2c06702..90a2cd99d2a65 100644 --- a/Formula/sfcgal.rb +++ b/Formula/sfcgal.rb @@ -5,6 +5,7 @@ class Sfcgal < Formula sha256 "5154bfc67a5e99d95cb653d70d2b9d9293d3deb3c8f18b938a33d68fec488a6d" bottle do + cellar :any_skip_relocation sha256 "f78f5ccb5b6feb0e7530770d3411149e4335ead8a2bcd08e275cbe7748b3c396" => :catalina sha256 "39a00ba2c7681850a601053adcfd8f920e2037aee5ebe9abf0f9a1b89ac674a1" => :mojave sha256 "86c543cb703b1d7885045354917e7da1a1fa3e52ca6749359f64ea736af74aa0" => :high_sierra diff --git a/Formula/sfk.rb b/Formula/sfk.rb index 80306443a48ef..932455449e9db 100644 --- a/Formula/sfk.rb +++ b/Formula/sfk.rb @@ -10,6 +10,7 @@ class Sfk < Formula sha256 "008d880b4b2a3d06e60fb28bc9950d2774de8e1430c99922779ea3f81b8b3fd9" => :catalina sha256 "b4e4dfaf137db0eb4f759e707be3be8e2f8cf3bba2c98452e53d16006a3de5ee" => :mojave sha256 "708df4b05628a36d80a818ad487cce07b2ff6de924b7106df7dd31877a7354f1" => :high_sierra + sha256 "191d9ecdb54e135d647b0caca66c16567bd09e0162e10b5cb8c642c844710db1" => :x86_64_linux end def install diff --git a/Formula/sgrep.rb b/Formula/sgrep.rb index 64d77f0c31dcf..4da0920874b33 100644 --- a/Formula/sgrep.rb +++ b/Formula/sgrep.rb @@ -11,6 +11,7 @@ class Sgrep < Formula sha256 "29e528a52ae36131ded52bb08d9cf9b12b1455fbc715f7b7bbd3b97f637862e5" => :catalina sha256 "bfb1f484dd474727fec463b1b90ffe7250f5c82e0e65bec96903e38f6e0a8e48" => :mojave sha256 "a243589e79a4cde4f7bba21ec618e3c323c049589707bde6e2c20c4bf1014464" => :high_sierra + sha256 "ff024211da0c2b68e6f037a286c40c812d040aeb1c1bd1fda04791576d1f980e" => :x86_64_linux end uses_from_macos "m4" diff --git a/Formula/sha1dc.rb b/Formula/sha1dc.rb index 056f38fca56c6..d1d77702174e3 100644 --- a/Formula/sha1dc.rb +++ b/Formula/sha1dc.rb @@ -16,6 +16,7 @@ class Sha1dc < Formula sha256 "9eba4b19247672b715376e2086689e7418235d850a158636d2ba3deb46851933" => :sierra sha256 "32d59c039a26d232b35f3c1877ca8c78ba0a303866adefee002c017359b03267" => :el_capitan sha256 "939388a0fe029d8cba8080a778269322489c55f787301947c82fb30cf8433b08" => :yosemite + sha256 "0a0f7f393040e0469b52c6f8f14f663dfc9d59b8b33749ea09c469e68d779c65" => :x86_64_linux end depends_on "coreutils" => :build # GNU install diff --git a/Formula/sha2.rb b/Formula/sha2.rb index cc0726eed53d4..3065413a28f52 100644 --- a/Formula/sha2.rb +++ b/Formula/sha2.rb @@ -14,6 +14,7 @@ class Sha2 < Formula sha256 "84ce281185ba415257d8507e9b16ba8dc3189ec8b8414d21a6421d5979a025d2" => :el_capitan sha256 "da63b7e9be95c91bcdc3290e3c6caee12016c5d59960144ea26f8c6438dfe680" => :yosemite sha256 "34650fbb427aa57f452acc23a338696756792907bd7e127d7b495a7fd7e4573a" => :mavericks + sha256 "ae16045e57636f43a922640a66d76b7a291c7064cb088f9ce53b4a501519c069" => :x86_64_linux end def install diff --git a/Formula/shadowenv.rb b/Formula/shadowenv.rb index 4ab4f0fb7adc2..3d6d83601b399 100644 --- a/Formula/shadowenv.rb +++ b/Formula/shadowenv.rb @@ -9,6 +9,7 @@ class Shadowenv < Formula sha256 "a8e73028069e37003f2e019230e48947913b164ebb9cdb50ea088b6398fc352c" => :catalina sha256 "5022c65cf81ba99f8be31fdd879201e566f203f357e5ca88d14daaa0d9a83325" => :mojave sha256 "fe0a543dc0a0ce7adba2eebc9f8f224aa55a4f63b49a4474d576d6467d604065" => :high_sierra + sha256 "3b0ef65fd759b3d7c236fd3ab88177289a110e855a4fc4c78146c371ebcb840a" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/shairport-sync.rb b/Formula/shairport-sync.rb index 4cf9c2a2f8e5d..e8b691bd3f4ea 100644 --- a/Formula/shairport-sync.rb +++ b/Formula/shairport-sync.rb @@ -9,6 +9,7 @@ class ShairportSync < Formula sha256 "3c2a973fbbe200704e35737226fd4e7ed6edad9f389253602fe5d14c50bb171e" => :catalina sha256 "afe30af9e783c581888b525d7e3aab13e09e9812e9f717ad258c9cbb996da8a4" => :mojave sha256 "d08952f97ce3a3f7e10a602322d0fdb23d8553586b4a7ad6b01af927f9969e1f" => :high_sierra + sha256 "ee1e38ff28ddc1a554159f72afe4cdcce10ac38760428298a1a5a867b678a97b" => :x86_64_linux end depends_on "autoconf" => :build @@ -25,10 +26,8 @@ class ShairportSync < Formula def install system "autoreconf", "-fvi" args = %W[ - --with-os=darwin --with-libdaemon --with-ssl=openssl - --with-dns_sd --with-ao --with-stdout --with-pa @@ -39,6 +38,8 @@ def install --sysconfdir=#{etc}/shairport-sync --prefix=#{prefix} ] + args << "--with-dns_sd" if OS.mac? # Disable bonjour in Linux + args << "--with-os=darwin" if OS.mac? system "./configure", *args system "make", "install" end @@ -49,6 +50,10 @@ def post_install test do output = shell_output("#{bin}/shairport-sync -V") - assert_match "libdaemon-OpenSSL-dns_sd-ao-pa-stdout-pipe-soxr-metadata", output + if OS.mac? + assert_match "libdaemon-OpenSSL-dns_sd-ao-pa-stdout-pipe-soxr-metadata", output + else + assert_match "OpenSSL-ao-pa-stdout-pipe-soxr-metadata-sysconfdir", output + end end end diff --git a/Formula/shairport.rb b/Formula/shairport.rb index e9f49e8b93b8d..ff13858bebc10 100644 --- a/Formula/shairport.rb +++ b/Formula/shairport.rb @@ -12,6 +12,7 @@ class Shairport < Formula sha256 "af28167bdd30a30511476472429673db781b9234cd4c8225a2ed3f10b869588c" => :mojave sha256 "c819c407c218e35129dde1d00a0bb78e5cc85cf69cc0920f87f5a3f690e2cab5" => :high_sierra sha256 "f3449bbbd695f608673ecf618c55f5d41ac8edad59772888a128185b23395b7b" => :sierra + sha256 "824288888cb2b19ec801797561ec6701f90551ac0b8843e59b29d2301377ca71" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/shapelib.rb b/Formula/shapelib.rb index 591347b8bdfc1..31b0e289f886f 100644 --- a/Formula/shapelib.rb +++ b/Formula/shapelib.rb @@ -10,6 +10,7 @@ class Shapelib < Formula sha256 "90f9b9b0ccadf93be027e515be356d0b92f4dfb33979f11df9fc7570c3249d0e" => :mojave sha256 "f1242aaf566b272f69331d16441171b12d0b4cef8396b56e0a8246fe7618ca68" => :high_sierra sha256 "0add799fff38395de6300f1b18102270bd269b5dc37714e7cac1873849b2ced7" => :sierra + sha256 "bdb7d0db9d5bbb9d44cad1a102144620b3484c24e55cca719ab7200fbc609a2d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/shared-mime-info.rb b/Formula/shared-mime-info.rb index 6e1722597effd..60f95ee2be82d 100644 --- a/Formula/shared-mime-info.rb +++ b/Formula/shared-mime-info.rb @@ -5,10 +5,10 @@ class SharedMimeInfo < Formula sha256 "23c1cb7919f31cf97aeb5225548f75705f706aa5cc7d1c4c503364bcc8681e06" bottle do - cellar :any sha256 "5aefdc7964e569188cb67a49f4a428c64130f7c048ffd55106c656eb0c6caa25" => :catalina sha256 "26629464888f464e3aacfec50d6b5c28ecd91c9c56ae74a418eac49b07abc3a3" => :mojave sha256 "c548f5a23851ce6d807fd9e152c57e65ad99c3d0cf2cd40a473b55346935ec61" => :high_sierra + sha256 "d24978755a96d714675e58e3caaeb53108051e79d54cd32acba694873a8c5365" => :x86_64_linux end head do @@ -30,6 +30,9 @@ class SharedMimeInfo < Formula uses_from_macos "libxml2" def install + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" unless OS.mac? + ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" # Disable the post-install update-mimedb due to crash mkdir "build" do diff --git a/Formula/shc.rb b/Formula/shc.rb index 26e3ff3dd2357..3f91f6e9f012b 100644 --- a/Formula/shc.rb +++ b/Formula/shc.rb @@ -11,6 +11,7 @@ class Shc < Formula sha256 "ff3c55ef1d10c16066e97a20143dbd1e7781ceb9a2c5c8b46d140f6711bc79fa" => :mojave sha256 "c19f4586119be579006eace517045998138d83a17e2b5c8ec00ad73ea007b68c" => :high_sierra sha256 "6e1834ac7b4cc64ba972a59189512bb9ff9e0ec307df78f9e0fc1fee42378f6d" => :sierra + sha256 "07d4f2747a3777202794ca5d5fbcb1a79033df428ef6659d0cb4d83be3bd2c8b" => :x86_64_linux end def install diff --git a/Formula/shellcheck.rb b/Formula/shellcheck.rb index eba2a7fd3a38b..9b3c25da762a5 100644 --- a/Formula/shellcheck.rb +++ b/Formula/shellcheck.rb @@ -6,11 +6,11 @@ class Shellcheck < Formula head "https://github.com/koalaman/shellcheck.git" bottle do - cellar :any_skip_relocation rebuild 1 sha256 "0cd635d2172d5e6617be8cdfb2723b6aa6feb2aa22e36cb3172d8b6fa012f4a0" => :catalina sha256 "37201a49c0d7a5be49c5d97d4f6f8f5fcfef7d700b4694f74648a1addcd6783d" => :mojave sha256 "1b20aeaba4d5e2e3df5cbe27636d655b6f877ee05a41d25fe1e0b3f9d00afa81" => :high_sierra + sha256 "be8fe95fce36b481265aeafcabe86776d010e10bcfac7f609d326ee6dcc409e7" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/shellharden.rb b/Formula/shellharden.rb index 143b7ee9a6e99..124b7b45851e4 100644 --- a/Formula/shellharden.rb +++ b/Formula/shellharden.rb @@ -9,6 +9,7 @@ class Shellharden < Formula sha256 "85dd6255ff5f3410eafff6f5689bbcb7feac3f3f5d291139fc60597e2f46e5a5" => :catalina sha256 "fbe947b5d0596fb32bcbadddd904bf0b0d30c64053e00c13a41cc6ecf89d1e20" => :mojave sha256 "214a9dca5d9d013ada81c97e204c96815fd3376399c960d73973ffe4c7d653cf" => :high_sierra + sha256 "6a9c9d95b107588a4571ec40b751e97581b5eee604cff46d14a9c24f2ecba297" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/shelltestrunner.rb b/Formula/shelltestrunner.rb index 0febffddd289e..b0c36cce23466 100644 --- a/Formula/shelltestrunner.rb +++ b/Formula/shelltestrunner.rb @@ -14,6 +14,7 @@ class Shelltestrunner < Formula sha256 "330c8aeff49dc1901a460586c90ce7540ad33451a4fa94ec4917ad2959780adc" => :catalina sha256 "f1f921cc6c8fd64b1b99f483e47f1f06c4b8a39f74a823ac96df22cef9d5cf34" => :mojave sha256 "f494b35cab29e3a942562230b461c44a8274f7564e8863400fdf68176f3b292d" => :high_sierra + sha256 "2b45d7754293903b1b61b93f367f30ffcf518c926081a25c7a67a24d938cc0be" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/shellz.rb b/Formula/shellz.rb index 960708fc6f89a..1a471748306ba 100644 --- a/Formula/shellz.rb +++ b/Formula/shellz.rb @@ -10,6 +10,7 @@ class Shellz < Formula sha256 "aa5043471c26fba80ba9db128f5ff3e8b60051bd76a8d26c3ad114b59b24c8b3" => :mojave sha256 "83b7e5e52243efe75e302853574243667a8e9cf9899d480c12c27886e77a9788" => :high_sierra sha256 "b659a90bd79e516d71679e68d36a35038937f23ee9d1de1dfee313fd11b0169e" => :sierra + sha256 "846d5d66e131e82db999e636a7a807a2a1116a5ae947630d15a9c59cc2aed966" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/shfmt.rb b/Formula/shfmt.rb index 2ff1378ec2204..c2202e2b2bf5d 100644 --- a/Formula/shfmt.rb +++ b/Formula/shfmt.rb @@ -10,6 +10,7 @@ class Shfmt < Formula sha256 "42bd98e64ae352448f09fdc2b56a71e36e3659e382338447e94d20f4d7befcff" => :catalina sha256 "d58c28c678be4be515c4a22e99338f7b1120a9f9d2eb004b6d7863a284ad5295" => :mojave sha256 "127c0adf737c2de8d0a23850249b7cbc22fe5f864434c331ed521d4f00f3f3f7" => :high_sierra + sha256 "c26cf88a9d952b727696e55bd60f5a0a62d7a372ee5f7d1c2df5c4fe94dd454d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/shmcat.rb b/Formula/shmcat.rb index 91bf7f93a93e8..0dae99e96a689 100644 --- a/Formula/shmcat.rb +++ b/Formula/shmcat.rb @@ -11,6 +11,7 @@ class Shmcat < Formula sha256 "ff73e6df8b663b4f382098ce75a9ec4634d4658c5378b3ad122de135e30d44ab" => :high_sierra sha256 "5ee7bcafe69d653421e29b56cf2e48a55874dc1e092e817a83cb446cda4acf01" => :sierra sha256 "1b6ddaf528253df2e2d5b93e97b6f4ade717ff8f3f6bcf829ed7cf9d9e682539" => :el_capitan + sha256 "ba5d4d130846537f603b399ea5896daf4125b0d19bd143a130c0b68a4006acee" => :x86_64_linux end def install diff --git a/Formula/shmux.rb b/Formula/shmux.rb index b664ced6d23ef..bbfa1c5b7b857 100644 --- a/Formula/shmux.rb +++ b/Formula/shmux.rb @@ -10,6 +10,7 @@ class Shmux < Formula sha256 "e433bd14622d3f77a35042649d0d73e888b164ab4f04431864fb68c9ec64b62c" => :mojave sha256 "bc38ad3a6feddd116edd9d3ab00ac18bc6663d08b9d111414975bdd1543d1b79" => :high_sierra sha256 "13f8831248e646784dd3cefd82707c45966ea05528e0c836156dea98b9c8c870" => :sierra + sha256 "b9f5655875e42cc02cdc82f49a3aa29d2b9b3af7f5eff7f8c9dd8ffbe14262ed" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/shntool.rb b/Formula/shntool.rb index 07cee50853b20..3afbc4ffd04d6 100644 --- a/Formula/shntool.rb +++ b/Formula/shntool.rb @@ -14,6 +14,7 @@ class Shntool < Formula sha256 "910da256436f55ebf40c487ebd0e74da2979f01bf0adac83272b353c66ba99a8" => :el_capitan sha256 "46d99776bb02d9721f30a6cb9b2c44293d3fbc6b4e3f522df869a7106b09a448" => :yosemite sha256 "fa745e31b3c2aadb20d5c87f7175f00b3c5a39b6664ea0a9aa9d88d5767781c5" => :mavericks + sha256 "d1d999fc86c0dd29e9180c5bb18355378ab70bb94152c1fd952591e843a3beb1" => :x86_64_linux end def install diff --git a/Formula/shogun.rb b/Formula/shogun.rb index bf2b9bf711778..aaef609297463 100644 --- a/Formula/shogun.rb +++ b/Formula/shogun.rb @@ -11,6 +11,7 @@ class Shogun < Formula sha256 "0de59f1e8d351280d4937205d86f66b959623eefce5d42a9cea9c537e60eec1f" => :catalina sha256 "06710ff92b89fafa33e3b3899047da13234c90a7120c5429d84dd0a4fee8023e" => :mojave sha256 "96ea340475d86f72ea7e4078fc66918d4d59505789b1559b49dd8dd7589ef446" => :high_sierra + sha256 "41f12dace236c3fc289023d8e06622e159dd42933276b73f3168f2da264bf33a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/shorten.rb b/Formula/shorten.rb index f2f064cd41dd4..34c8a9f09bc11 100644 --- a/Formula/shorten.rb +++ b/Formula/shorten.rb @@ -13,6 +13,7 @@ class Shorten < Formula sha256 "66cf7cabae065035e9c3c4a8c139439384fb9f26ea0ee433e336c18ba2f8383e" => :el_capitan sha256 "5f48b61ce709915830f433dd381fe531c1354b56619bbdb441dc19f985df7467" => :yosemite sha256 "a802da618fffa3eb292705140c882fcedbffae09017f0efdf69085004952a148" => :mavericks + sha256 "9b9be4ed35f42072a08f6726eac9a520e7aa3b242aa8a0318af07425387607d4" => :x86_64_linux end def install diff --git a/Formula/shtool.rb b/Formula/shtool.rb index 091f2e23454be..e43daa4ac685e 100644 --- a/Formula/shtool.rb +++ b/Formula/shtool.rb @@ -14,6 +14,7 @@ class Shtool < Formula sha256 "17dcf1289dd178b75b670d8061d54e4b2004feeb7de0d9e1ea43ffb46220e4fd" => :el_capitan sha256 "de69e23a1e88799c78891298045bd8f79ef67ee48b7609fa065c7acdc1ddbde4" => :yosemite sha256 "14b7ea00fce6bf6df8e684f1f4db589ad4f6bc7051a4a29f34d51fb6d287d0a9" => :mavericks + sha256 "9ff3004ffa49fb1f5343e0378aef09f5fdd042383d1960f2c30384c647e251b2" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/shyaml.rb b/Formula/shyaml.rb index 8f3fb09da1a45..c77bbde418701 100644 --- a/Formula/shyaml.rb +++ b/Formula/shyaml.rb @@ -5,7 +5,7 @@ class Shyaml < Formula homepage "https://github.com/0k/shyaml" url "https://files.pythonhosted.org/packages/bc/ca/d8c47fad7a6ce01ddd2b7093673433dbfae414015f971ea7ffda56da125f/shyaml-0.6.1.tar.gz" sha256 "3a57e380f66043c661d417106a0f101f8068c80caa2afef57c90447b88526c3d" - revision 1 + revision OS.mac? ? 1 : 2 head "https://github.com/0k/shyaml.git" bottle do @@ -13,6 +13,7 @@ class Shyaml < Formula sha256 "510026ded6fc62625ee9bd2cab4d94d03155e94270ae0aa38947b894282c2808" => :catalina sha256 "c850436b06215814c879e02db80331c3b94e63ccfa03df8bd25915ef4dfac668" => :mojave sha256 "d52705a99a5f376d41d2ead578d73f5eb309b0efa595215364ea42cb4191eed6" => :high_sierra + sha256 "6868de73b9fedf20e0d1fd59cb17a52419b984823b52bc1545a796876e17c7be" => :x86_64_linux end depends_on "libyaml" diff --git a/Formula/sic.rb b/Formula/sic.rb index c79d279eb58ec..04eb69fe3f503 100644 --- a/Formula/sic.rb +++ b/Formula/sic.rb @@ -14,6 +14,7 @@ class Sic < Formula sha256 "efeb0f7a31a6d4f0ac4c065a4646b5a523788b5edbddd9f99ffa04f00aa41f97" => :el_capitan sha256 "99c98bba7ce3793f8f5431cdaee24a0bead3a1a2335bce10dc9cf6d53213c249" => :yosemite sha256 "23bfa1932017f0c189e6e3ab1345260d8b5a98697999d6548b9046e7662112db" => :mavericks + sha256 "d46528021026a0efa2e4886d0bbc0cde8e51a4c365153554128f3a451346940f" => :x86_64_linux end def install diff --git a/Formula/sickle.rb b/Formula/sickle.rb index b0fe12ede04a0..e711207ac5cb7 100644 --- a/Formula/sickle.rb +++ b/Formula/sickle.rb @@ -11,6 +11,7 @@ class Sickle < Formula sha256 "3aeaaa4393148876cc55cc9defbe82ae0fe0dabea18e418413b2aa8cff23dd0b" => :high_sierra sha256 "844b063d1496d2a7c7f8a12b2239ae32766a538557d44f712c584a30b9775fae" => :sierra sha256 "138b38a20aefc55ec4005ee4c4622ec332cbb13ff4ebc39ff45d91a2c12afde8" => :el_capitan + sha256 "844f7c565e7d2cce34318080b0fd4eeb25bcead46fb7ed5c673b54aebdc368c5" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/sift.rb b/Formula/sift.rb index 05d78d24d438b..a2eddc6db14ec 100644 --- a/Formula/sift.rb +++ b/Formula/sift.rb @@ -14,6 +14,7 @@ class Sift < Formula sha256 "42fbf76075951fd28a27b4e2763b3af58eb93b0260c3a3c82719d7a32ef7baec" => :sierra sha256 "6ee1bdf8b60fe3c3528a4a2698f19518a7bf71838ceba58ab9a199a6624f3dba" => :el_capitan sha256 "170f9861eb8843932556284268f1a00e3e0a0c455e35b55c11e44c5b325ced85" => :yosemite + sha256 "58b6e690ee18b65ebbe43da3b2b8114bfb498adafaf44d3d6a9eedf870a06514" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/silk.rb b/Formula/silk.rb index ab2c011f892ed..4e557445cb901 100644 --- a/Formula/silk.rb +++ b/Formula/silk.rb @@ -8,6 +8,7 @@ class Silk < Formula sha256 "4a88b111ce742a948b91b9441f2bbc7e821ffd3691673086ff46e8e27fbda31e" => :catalina sha256 "923bc8b774f207d23073195b49befba72e378e79846b6809066f55f3df87c329" => :mojave sha256 "663d2a858210750b8650e4f0e516dd6530fb5d08a7c501f8daa937572d8a81ee" => :high_sierra + sha256 "eb8903c42baee1027e8df1337c46ce65e8ef61faab3eb9908e8cd7eade7a5d71" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/simgrid.rb b/Formula/simgrid.rb index 649988e42f961..3e768b993e0f6 100644 --- a/Formula/simgrid.rb +++ b/Formula/simgrid.rb @@ -11,6 +11,7 @@ class Simgrid < Formula sha256 "5f6acdf27e6f658a180026c72c52b36de25ee08d9eac609f762358277613ae0b" => :catalina sha256 "66357d6bbddedef44f1f35db0870592b1d4a1786d4f7ff87417ce0a88e1f0486" => :mojave sha256 "9fab4d4bb4eadbb23a20295d29c0fe2bd2823a85790c0287b315d80615eed649" => :high_sierra + sha256 "4f6f69d6a7489fba459341a5fbebe87be1d6381d696008518f6216f403dd969c" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/simh.rb b/Formula/simh.rb index dc438b958509e..d70d8c9d79a11 100644 --- a/Formula/simh.rb +++ b/Formula/simh.rb @@ -11,6 +11,7 @@ class Simh < Formula sha256 "790feb234cf193ae6de2c076ad10024e5d9bd6d301020392a79cffc7ff6ccb15" => :catalina sha256 "76246ba12f6771a031a092ccbc67f0f6fbe8dacda0e5c1e41bbaa8d4a7918680" => :mojave sha256 "77ac8e9ea8a1589d4caa38f2cc9f21de2f4e66a836d316117926378080d09124" => :high_sierra + sha256 "5185bca77b3670df8694607967c35d30b42d1e87edd4ebd5f1181b7e4ab47173" => :x86_64_linux end def install diff --git a/Formula/simple-amqp-client.rb b/Formula/simple-amqp-client.rb index 110f1e84d2649..953f86ba05f6d 100644 --- a/Formula/simple-amqp-client.rb +++ b/Formula/simple-amqp-client.rb @@ -11,6 +11,7 @@ class SimpleAmqpClient < Formula sha256 "3afc1f1345a391514200462825dcecf87bde3d25476d5f9bf87b787877c632c5" => :mojave sha256 "fa561d92f855cf6613343e33741ac715d3fb42fce6ac2adf1fbc00fc641434df" => :high_sierra sha256 "4f9fc0338fe628eaeb02c4cfb377a8f5e90da37896e6ec91968f30649069b129" => :sierra + sha256 "f9c60e1a3d7b685c61d49a3ea61d972709911dabf00c7b8dccf7d40924d46efd" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/simple-obfs.rb b/Formula/simple-obfs.rb index 080259579b1ea..5878c28b95141 100644 --- a/Formula/simple-obfs.rb +++ b/Formula/simple-obfs.rb @@ -13,6 +13,7 @@ class SimpleObfs < Formula sha256 "08024887dc9fba3f56425181dd34dba1ecf185dad688b85d20a7b70ec07afbae" => :high_sierra sha256 "831de4a180d61c801397ead63a0130d8d2eb102afb526ef81bcecb2f9d1d029b" => :sierra sha256 "eccfcd8d4016297999d730fd185624b42e903f7dfac43bd6227c337c2b3aafea" => :el_capitan + sha256 "1e6100821cd18c5579eb2f55d2ca71d0ee0dda8bf84e062f02387e66036f0c45" => :x86_64_linux end depends_on "asciidoc" => :build diff --git a/Formula/since.rb b/Formula/since.rb index e7c767f911cae..e24fd09e1a298 100644 --- a/Formula/since.rb +++ b/Formula/since.rb @@ -13,6 +13,7 @@ class Since < Formula sha256 "ec4898462899cb632329f71dc0b4dd9a13a051aafd6da7dfd22e940e9d1ce01a" => :el_capitan sha256 "e92218f17ac1926f4651b3e70d3fe42d43b7024e1f10d0ab6f1c7c9dd6bad606" => :yosemite sha256 "bfd7889688facdf732cf0bf2bb8c7a917df71e80615a5f367468708437c0519e" => :mavericks + sha256 "606f75f34e3690b1f38dfbe519ac9362e91ef226aaeac62840ff00fc11561de1" => :x86_64_linux end def install diff --git a/Formula/singular.rb b/Formula/singular.rb index 7bfd4d08c271f..b6a912a9ff000 100644 --- a/Formula/singular.rb +++ b/Formula/singular.rb @@ -10,6 +10,7 @@ class Singular < Formula sha256 "ec4a73d624d17771e510be59ee936fdb6575a6651292a95797f3f92f167042c3" => :catalina sha256 "b1f33f87b56645ba798dddc2ed4492d50dacb02aa8142e6052802e6b6197a711" => :mojave sha256 "ffc36b5ecccb30537bf16f92e1321d51eaaa9d5faabca727eb4ba2a2f3d555c3" => :high_sierra + sha256 "5453526a0bc9975f7df5257be927fb8b98692bb85b4c56c712705a84f2e11e71" => :x86_64_linux end head do diff --git a/Formula/singularity.rb b/Formula/singularity.rb new file mode 100644 index 0000000000000..995638296e894 --- /dev/null +++ b/Formula/singularity.rb @@ -0,0 +1,31 @@ +class Singularity < Formula + desc "Application containers for Linux" + homepage "https://www.sylabs.io/singularity/" + url "https://github.com/sylabs/singularity/releases/download/v3.5.0/singularity-3.5.0.tar.gz" + sha256 "849c699eb3569c1b9e4e0824223ea6c0fea8b0805b33ddd3400b7c795d07809e" + + bottle do + cellar :any_skip_relocation + sha256 "d736d58bcb753bc0859f43973af2d4952766257a1a23e84bcfb943a8f57027d4" => :x86_64_linux + end + + depends_on "go" => :build + depends_on "openssl@1.1" => :build + depends_on "libarchive" + depends_on :linux + depends_on "pkg-config" + depends_on "squashfs" + depends_on "util-linux" # for libuuid + + def install + system "./mconfig", "--prefix=#{prefix}" + cd "./builddir" do + system "make" + system "make", "install" + end + end + + test do + assert_match "Usage", shell_output("#{bin}/singularity --help") + end +end diff --git a/Formula/sip.rb b/Formula/sip.rb index a57a6f9df72e1..db40d57a106ad 100644 --- a/Formula/sip.rb +++ b/Formula/sip.rb @@ -10,6 +10,7 @@ class Sip < Formula sha256 "b2dcfcc119e157da7aa3865e90f4f7a083129b2a4e4a30523570aa54ca3db47f" => :catalina sha256 "6a092e82f96e2898713e83aca3ee9d9782fc2a9baa1d6a4ac665cb784fdef5a1" => :mojave sha256 "85cfd373309794850293defa3921a23d010b2ef011bb4a93851fd45349bf2a27" => :high_sierra + sha256 "c4d19d5b3e358c4cab82862d29c091d512988e157528eb513b0b413e33f6fc74" => :x86_64_linux end depends_on "python@3.8" @@ -28,7 +29,7 @@ def install version = Language::Python.major_minor_version "python3" system "python3", "configure.py", - "--deployment-target=#{MacOS.version}", + *("--deployment-target=#{MacOS.version}" if OS.mac?), "--destdir=#{lib}/python#{version}/site-packages", "--bindir=#{bin}", "--incdir=#{include}", @@ -71,9 +72,13 @@ class Test { void test(); }; EOS - - system ENV.cxx, "-shared", "-Wl,-install_name,#{testpath}/libtest.dylib", + if OS.mac? + system ENV.cxx, "-shared", "-Wl,-install_name,#{testpath}/libtest.dylib", "-o", "libtest.dylib", "test.cpp" + else + system ENV.cxx, "-fPIC", "-shared", "-Wl,-soname,#{testpath}/libtest.so", + "-o", "libtest.so", "test.cpp" + end system bin/"sip", "-b", "test.build", "-c", ".", "test.sip" end end diff --git a/Formula/sipcalc.rb b/Formula/sipcalc.rb index 832545daec7d6..fe5b645abd6c1 100644 --- a/Formula/sipcalc.rb +++ b/Formula/sipcalc.rb @@ -13,6 +13,7 @@ class Sipcalc < Formula sha256 "56aa686252ac703ed3dbe91f5737ec4d4b95d52516f4ab52947df15b77d1c58f" => :el_capitan sha256 "6b2fc300755693d382fd5ea971c272a7c8c7bff49614dd88d8db4270aa496012" => :yosemite sha256 "7ddf7b200984de97143828faf6385314a2ff3f4436432d810e5aaf7dfe44e78c" => :mavericks + sha256 "2b46fe939cfe356d7558edec86f1e7a2f4988d32a92c40ba8c9b4095294c309a" => :x86_64_linux end def install diff --git a/Formula/sipsak.rb b/Formula/sipsak.rb index ef4801f550de6..98d29983951e0 100644 --- a/Formula/sipsak.rb +++ b/Formula/sipsak.rb @@ -11,6 +11,7 @@ class Sipsak < Formula sha256 "5da0bb6fc866723e423714b275cbc6c64ac1e57f171cfe112bda6f9779385ae3" => :mojave sha256 "6cc0007fe520e225bc0a6b9b646817468acbc1383cb6a4382ae8bf1243ae3e5b" => :high_sierra sha256 "0d074a6356f127485211b79741fd7f45e7ed9435e4d708e539088a9e9154daea" => :sierra + sha256 "3047d9be18d21a9c1e8c8236612d936b5d0bb22eb23ee9f7de56b0d918e912f4" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/sispmctl.rb b/Formula/sispmctl.rb index 68000a74cfb0e..9d29bace0cc93 100644 --- a/Formula/sispmctl.rb +++ b/Formula/sispmctl.rb @@ -8,6 +8,7 @@ class Sispmctl < Formula sha256 "81744e45749770c78d2faf4dbbca0acafcfafbcddd13490aa34bc4b0f85376f5" => :catalina sha256 "99772ae9b4243338477c550297e5c21bddab9ceaee225c92ed4ea0d5a5877eca" => :mojave sha256 "4acb337efca6d3efb2e6b18457ba8e957ae493869f96f230d1555fcb2db354b8" => :high_sierra + sha256 "89fdda99cafd51a3296f28bea6311fe2927dffac409558c56e29ed34895dc82d" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/sk.rb b/Formula/sk.rb index c1b9778fd4699..a4f072bc6add3 100644 --- a/Formula/sk.rb +++ b/Formula/sk.rb @@ -10,6 +10,7 @@ class Sk < Formula sha256 "5292b952619fdff305f8124e8ff7342487c2b8904582d21d7d36ee70552e55cb" => :catalina sha256 "88cd830c34f998238c0bc89e435fa114fd89081bada5e6c04baed79d5f97f2c9" => :mojave sha256 "cdf01b18bb6d20bbe3063246520e09caf0591490212e1ced07e996027a87dc32" => :high_sierra + sha256 "06666c0cf5b91a7ed556cf756b5af02c3a3f50f5e5cb7b575da6bb3ca9179f3e" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/skaffold.rb b/Formula/skaffold.rb index 9433c5dd4f1f1..719b2c7b685cd 100644 --- a/Formula/skaffold.rb +++ b/Formula/skaffold.rb @@ -11,6 +11,7 @@ class Skaffold < Formula sha256 "556ed4c247daa2984c5ca579762165498010001c69be13dec946ef1c74a4497e" => :catalina sha256 "1fcbae9dbdfe5df2a10366e3894dbb21c973ab76a7972bb76be026d5550ee059" => :mojave sha256 "a5663b3146e187620e2e78205106334a73ddc7fd70513e6eb61f4cd4a6f8f047" => :high_sierra + sha256 "a72f71eb8b2de076410ce68952f4bf3ccf28836d2378bade91310d84c37b3880" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/skopeo.rb b/Formula/skopeo.rb index c6e87883ed887..5a79b035a1511 100644 --- a/Formula/skopeo.rb +++ b/Formula/skopeo.rb @@ -8,10 +8,15 @@ class Skopeo < Formula sha256 "885d21169cea53b1cdd54de0d8c666b57c1d68b5139da59dfcb6db995c174e79" => :catalina sha256 "d6fd2de27f126f86aefbb49b1cd6287a4f1f96ae16831b351db2b9a86f54709a" => :mojave sha256 "09f7f5b5df8faf7db92b057c59eecc547bf1e685f7d1cd483ed2cc4cd01449d1" => :high_sierra + sha256 "bf7030505c0534ec36c5b30fd31d47c1d22960b4e06965057a47e938192974fa" => :x86_64_linux end depends_on "go" => :build depends_on "gpgme" + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "device-mapper" + end on_linux do depends_on "pkg-config" => :build diff --git a/Formula/skymaker.rb b/Formula/skymaker.rb index 78f850a2d7a68..7e25180d37fb1 100644 --- a/Formula/skymaker.rb +++ b/Formula/skymaker.rb @@ -9,6 +9,7 @@ class Skymaker < Formula sha256 "af78e7af9c84517e8f7db071ef3718a34eafc39d6eac3357d77ee183d4fe2cdf" => :catalina sha256 "ef2182885eb6952289057ce2756ac56ec9a88397e746b694529a937eaa28b943" => :mojave sha256 "6e7aa4c817624d5631293d0421b25eec132e41bfe3d75f9044a85dd02f73de4a" => :high_sierra + sha256 "4a641bb5bd1b089282393e43d6458ef8a2955c0833ddb6262bb14a4b17431b6a" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/sl.rb b/Formula/sl.rb index ab79ad81a1ddb..d083d3f47b560 100644 --- a/Formula/sl.rb +++ b/Formula/sl.rb @@ -14,6 +14,7 @@ class Sl < Formula sha256 "f186cb86f4d48929aa671434dbd6be0a861069608098a30dc952697bcca85972" => :el_capitan sha256 "696104243a18e08279d461e66e6a696791e6c36b67df43e361ad6f6de1200440" => :yosemite sha256 "c7d4432bfc169f7338eeb0c8300a975495b229d6e85bfff4fdd6bbd11eb8da17" => :mavericks + sha256 "4496112f89e9706de41635e99f28775a8366b0e4daa7a9d46d2ba4f28a3b971c" => :x86_64_linux # glibc 2.19 end uses_from_macos "ncurses" diff --git a/Formula/slackcat.rb b/Formula/slackcat.rb index 0ba613e78f254..4f725648c8c92 100644 --- a/Formula/slackcat.rb +++ b/Formula/slackcat.rb @@ -10,6 +10,7 @@ class Slackcat < Formula sha256 "b8fb7acbcb922af01da7e97b7c3ef303dcda92762996d2ad9a12ffec1bfea608" => :mojave sha256 "4a5566659aedb0453c68c468c65521b53d0602113a940b50afab759488b4997c" => :high_sierra sha256 "80ed662db0f0e057a2346e25244b52fd3019fdb6f1af1e809b03392a82d0dcd9" => :sierra + sha256 "ad0787bb5f746b0a52f7d3bee890c49394d144d57bb332b667afd858f9d531e1" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/slacknimate.rb b/Formula/slacknimate.rb index 3004479bcb134..254f8e5200e98 100644 --- a/Formula/slacknimate.rb +++ b/Formula/slacknimate.rb @@ -14,6 +14,7 @@ class Slacknimate < Formula sha256 "e07155d74980ed24bf07acce56c890a86668eb359aecae8dae6eb6973c38cfd8" => :el_capitan sha256 "f97ea26560c72c550780b81a124f8c69c8588c27e0f87eef65201676f2666672" => :yosemite sha256 "cf81016bb94d8d2369c98a529b575d3115a263139502294b528197e1ac293ae9" => :mavericks + sha256 "802008fbaa3b18149b681a2d5af7ea7785bb8d7b02c172024257db8e02211880" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/sleepwatcher.rb b/Formula/sleepwatcher.rb index 1440203e4a7ae..d4e29290769c2 100644 --- a/Formula/sleepwatcher.rb +++ b/Formula/sleepwatcher.rb @@ -12,6 +12,8 @@ class Sleepwatcher < Formula sha256 "0cecea617ee9334f717a2e2e0424b944dedcc7cd403776c1cf6ff67352b96f4c" => :sierra end + depends_on :macos + def install # Adjust Makefile to build native binary only inreplace "sources/Makefile" do |s| diff --git a/Formula/sloc.rb b/Formula/sloc.rb index 831f488e824cf..f1999f3b1068a 100644 --- a/Formula/sloc.rb +++ b/Formula/sloc.rb @@ -12,6 +12,7 @@ class Sloc < Formula sha256 "f241a7bf03cb7bb97bb061f5f46442d7a40de893697a5335c821049d471e9466" => :mojave sha256 "345308d671b83edb390c143554c64958135cf37bc7cd365ce613011da682a8b7" => :high_sierra sha256 "1386a024efebe74829d85c8d75d07ae9f09f8c8a8104aa41424a5ea8c425fca5" => :sierra + sha256 "dd4e6910fdca3cfee695f4f3e67e1e32ed04122fd50c6409fd3aec6dc2efafde" => :x86_64_linux end depends_on "node" diff --git a/Formula/sloccount.rb b/Formula/sloccount.rb index 411826e6b962b..7498c2aa0adb6 100644 --- a/Formula/sloccount.rb +++ b/Formula/sloccount.rb @@ -13,6 +13,7 @@ class Sloccount < Formula sha256 "9fe12539b280711faac5e0950b617ed91f35942311aab112607850645b5696bd" => :el_capitan sha256 "8ee5aab0e8aba23cb6d949c84760fa775473b32b6ce3e245ccb5acfd715f8d68" => :yosemite sha256 "16433612bab2bc3fd6d3b804210c1d71980756b02e5e034aa9402c8229e1c968" => :mavericks + sha256 "44eaafb4cbfe3d8fc77301cd849efbcfdf181a5a4c450c12f0255ac4062044f8" => :x86_64_linux # glibc 2.19 end depends_on "md5sha1sum" diff --git a/Formula/slowhttptest.rb b/Formula/slowhttptest.rb index 8a0885e9dc975..918c5af441f6d 100644 --- a/Formula/slowhttptest.rb +++ b/Formula/slowhttptest.rb @@ -10,6 +10,7 @@ class Slowhttptest < Formula sha256 "579f26294a1ed9ddf40957b71df0c5663951229264e38d040d705aafdc202cee" => :catalina sha256 "8049b768fa761db677a06931d0ed19676be4783afa67950e498fa2136a175990" => :mojave sha256 "52b9a275cc949a58917c33aa839dbeb7f0c4b932e5b432ac1b3e05ed445141af" => :high_sierra + sha256 "643d29e9cdc5bd8558407c084d840dbb4086f1c2acc86c01c8ddbeea5c67cdac" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/slrn.rb b/Formula/slrn.rb index e9c0400e835e2..f9802362f0be3 100644 --- a/Formula/slrn.rb +++ b/Formula/slrn.rb @@ -11,6 +11,7 @@ class Slrn < Formula sha256 "9dcfea5ecabef7b65a480fec81ab5b1dcc7a67d45bb8fab0d35821684ab56d0e" => :mojave sha256 "417197dcbd30a8330f2a3a1e5171b2f3c2ed7869cca8d2fb302108ae391f4072" => :high_sierra sha256 "dac0b018eb8f1d53b69ae27ca121510806f0eb9bbdcdbdd119295bd022a8faaf" => :sierra + sha256 "a86b359e069d47034f6cffd5df3d4198c79360b10411023c8f1da4b86b9616c2" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/smake.rb b/Formula/smake.rb index a582b35a54fb0..98bb74ceeb5da 100644 --- a/Formula/smake.rb +++ b/Formula/smake.rb @@ -12,6 +12,7 @@ class Smake < Formula sha256 "a5cb6ea4fab2d0ce67342f482fd0efb4dcc20483722e56ae120880d2a97ebab0" => :el_capitan sha256 "c1420a59ceba43481eac2b2046a7d3c4aac967a12ff52bccb3b4697eca8d5c8f" => :yosemite sha256 "4e8157c27f8ab0d5ad2c9673a86357f38acfabea1ac4eef80c54e8141dfdb336" => :mavericks + sha256 "07e29bed6bf75f8c192744ec1fa65816fc72ac04ec76657dc763baf7db2d2898" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/smartmontools.rb b/Formula/smartmontools.rb index b6ef6ba7a557d..323c50ed42447 100644 --- a/Formula/smartmontools.rb +++ b/Formula/smartmontools.rb @@ -8,6 +8,7 @@ class Smartmontools < Formula sha256 "cc34524c76ff39abb4afc6794fe404e257cf04816c1d2c33f8edd158e5677239" => :catalina sha256 "cce7b82f81c999afcd180dd7fb1ef471bfb24d9934dc3ad326d86db7ea478f2c" => :mojave sha256 "77b4722b7ffc997a2b5482518f291640fcabc45468ae5fca12520943869263be" => :high_sierra + sha256 "36c8be8c4d0edb399204e31eed371d7e00152645aa7386d28ae6e8235c918ac5" => :x86_64_linux end def install diff --git a/Formula/sn0int.rb b/Formula/sn0int.rb index 7248f0b0c9197..79568a0ceb87a 100644 --- a/Formula/sn0int.rb +++ b/Formula/sn0int.rb @@ -5,16 +5,18 @@ class Sn0int < Formula sha256 "4720736805bec49102f0622ba6b68cc63da0a023a029687140d5b4d2a4d637dc" bottle do - cellar :any + cellar :any_skip_relocation sha256 "618417dd910df3bb10c461c4e5b41f202c23ce24bf39043e5b88e544bc56df0a" => :catalina sha256 "cff5e42d3b5e9e44b92f437601ef1764f93df0f5bb259ec0d683cd4d2be59e83" => :mojave sha256 "66382b358f95db51620653c1120e903dd009a8a2e4be25c759593a01956df48d" => :high_sierra + sha256 "51e37b841efd35b29f3b2f41759e30d6e53b0fefac2d02ae8c470538ef8b7b31" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "rust" => :build depends_on "sphinx-doc" => :build depends_on "libsodium" + depends_on "libseccomp" unless OS.mac? uses_from_macos "sqlite" diff --git a/Formula/snag.rb b/Formula/snag.rb index ca18521181db2..3254744d95127 100644 --- a/Formula/snag.rb +++ b/Formula/snag.rb @@ -14,6 +14,7 @@ class Snag < Formula sha256 "18a6d589a0b416ee502a8dacd6f919959d25cc08d9bbaad152fdade4c72634dc" => :el_capitan sha256 "00edba081c3a56f6cda3a4fc5bb1125d8ce93a8239c3cae89346b1893df12025" => :yosemite sha256 "df63529c6ec2ff4f38f0fb7900687b9362ce710a13013d4bac4bb9cdea5190da" => :mavericks + sha256 "1d8aeab0c2481c1e5382094c1e1e8eb88562223fa6bdcbf73cc5694761cf97ad" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/snakemake.rb b/Formula/snakemake.rb index a504eaa3d4cb0..d605dbd85ca23 100644 --- a/Formula/snakemake.rb +++ b/Formula/snakemake.rb @@ -12,6 +12,7 @@ class Snakemake < Formula sha256 "4f28f4cc4ac60686bdf12944480c826739c9c0186dc538e863a2f3a89ce49ec7" => :catalina sha256 "076e3a9147c99202bc1d96f85b9ad0feb1758e898028fd6ea7d2eded841652ea" => :mojave sha256 "e8c76d4611240c653e62ffcefd85df218f23089b6a1451f01536a9d4ddf593be" => :high_sierra + sha256 "a454a42b6816632473c118d4d7dd3c16b3c99101f05c842c9c1270b2703fd25e" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/snap-telemetry.rb b/Formula/snap-telemetry.rb index ca691b9b6a797..65c851ce371c2 100644 --- a/Formula/snap-telemetry.rb +++ b/Formula/snap-telemetry.rb @@ -12,6 +12,7 @@ class SnapTelemetry < Formula sha256 "066cf3014caa27b6c3327f983cbe632cb85476c0731ec3fda40e85205c1a5f71" => :high_sierra sha256 "1ff53b8b2f1827e2a607d81dd3db246eb1388dfd1aa7110dcf59a8e4ba606d17" => :sierra sha256 "50ce1be7d6e83f309d8fd62bf2b36cb03c29b726d575abfbeef895b3f628fb46" => :el_capitan + sha256 "88fc6b67ef8f1a47044ed06ea2744d51193e7fd26fdee82df38c8782ba99ef68" => :x86_64_linux end depends_on "glide" => :build diff --git a/Formula/snapcraft.rb b/Formula/snapcraft.rb index e276705b4a412..95b7f8cd885f4 100644 --- a/Formula/snapcraft.rb +++ b/Formula/snapcraft.rb @@ -17,6 +17,7 @@ class Snapcraft < Formula depends_on "libsodium" depends_on "libyaml" depends_on "lxc" + depends_on :macos depends_on "python@3.8" depends_on "squashfs" depends_on "xdelta" diff --git a/Formula/snappy.rb b/Formula/snappy.rb index 878aae10431d8..69340ed77de37 100644 --- a/Formula/snappy.rb +++ b/Formula/snappy.rb @@ -10,6 +10,7 @@ class Snappy < Formula sha256 "b15a258346dc93bd5c6900a405ccb2e9e02ebfeb5b16607b340cc6a5a021eba3" => :catalina sha256 "e996c3b0dfac02c8cdd06d849db47e853800389ff7d18fa66526d7d51d305589" => :mojave sha256 "77276307037cc20bf44c86fef60b1745c1d8f84d6f963332535b34868f5fc2b4" => :high_sierra + sha256 "974fd12573f3a9e37740b62938ac2c62e03fd1030340dc007db88abdc2e8e2c3" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/snappystream.rb b/Formula/snappystream.rb index 0e8f5cfc7dab7..53a65ea543d37 100644 --- a/Formula/snappystream.rb +++ b/Formula/snappystream.rb @@ -11,6 +11,7 @@ class Snappystream < Formula sha256 "3b4546ed797d251364320b9da77640c4980e913bb08b3376b7394a65833d8aa4" => :mojave sha256 "75b9c1672f271ec42ca15cb6fa9b327bc3f081a2497804142961633a0ca57884" => :high_sierra sha256 "0993bdf488fd8a1d59de3b5ecf3080d7ff4a6dee895dd801aff3687c5809d0ae" => :sierra + sha256 "220498f3d21fa4af45d663b047731b6b92395f9dd9348688f20905c253212241" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/snapraid.rb b/Formula/snapraid.rb index 48b41afe12bf9..535285d883c7a 100644 --- a/Formula/snapraid.rb +++ b/Formula/snapraid.rb @@ -9,6 +9,7 @@ class Snapraid < Formula sha256 "d92da7dbdf737efbbeee7025c7d1ed0bc01c1f3cbaf29f0b8ded4b264ff627e8" => :catalina sha256 "8ccbba9450a1f49a2d1b9d0424d9dee7ffaac4348f0cf4edf0bfb2b8858f5885" => :mojave sha256 "db38538cd61796483d63bb4cf8aa687f8801796abb4074e2a5a69e8cefcaae96" => :high_sierra + sha256 "95c413eadcaffc767b23f0392bb3f4ce0593ddafa524b4ba5c4ef427d23462ed" => :x86_64_linux end head do diff --git a/Formula/sniffglue.rb b/Formula/sniffglue.rb index a64a3ca820448..2a63da20895fa 100644 --- a/Formula/sniffglue.rb +++ b/Formula/sniffglue.rb @@ -9,9 +9,11 @@ class Sniffglue < Formula sha256 "9eb84327d14362e98f5c28bc8de59d85fb975348206d7d17d2e9ca601743a4b2" => :catalina sha256 "7cf69e349503bc79fd6143df0ade8e5e2afb7bbe08b25374da4507216fd90a3f" => :mojave sha256 "765e71bbc155e4aca03eba31e3827564413114e7812d33769e8b91c3bfc9f761" => :high_sierra + sha256 "b3d79da07b68c8c19dd0071eb2c5ed6e5d36e8e5334e84c9e2e115ecb8b7c6e6" => :x86_64_linux end depends_on "rust" => :build + depends_on "libseccomp" unless OS.mac? uses_from_macos "libpcap" diff --git a/Formula/snort.rb b/Formula/snort.rb index 0f8464f92c6f7..6cb1ae4edfdcc 100644 --- a/Formula/snort.rb +++ b/Formula/snort.rb @@ -10,6 +10,7 @@ class Snort < Formula sha256 "41f8545fadaf23b86aaa02fe5d3e3e6904eae8055f7ca9b766fc377dfa4f1678" => :catalina sha256 "bd3fce63dafd1dc91b9fcffb184f6e3a5719998dd003860915db92aa810490c0" => :mojave sha256 "fbf46b9ec8c98e6b1cab4828f392168ca51086e63ccc5d67bbe41b108854cdd0" => :high_sierra + sha256 "523082b75e62cb47c216cf441c26a4a4845d35b3be000e41264830533e0e8c92" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/snow.rb b/Formula/snow.rb index aa602d18d3f56..9f7dc011aff65 100644 --- a/Formula/snow.rb +++ b/Formula/snow.rb @@ -16,6 +16,7 @@ class Snow < Formula sha256 "5121a5196c5ed20b7496a5190830bf2e49bdd18c3950fc6b1b8fabb239c9ef7c" => :el_capitan sha256 "f4e949f65f946916a5f0b018a75e741336fed9e6434f1802d906e003e9da6b65" => :yosemite sha256 "4d6bd4ca3de8ee330802495bdb04b0928afa21bb47a8fb1cde71d8a0c7919ada" => :mavericks + sha256 "d61f0e62a8326ad9029d20a880804947efdd14a4d7dee36fd93dba24acf1d48f" => :x86_64_linux end def install diff --git a/Formula/snownews.rb b/Formula/snownews.rb index a2d31ec626fc5..a49ba785d3451 100644 --- a/Formula/snownews.rb +++ b/Formula/snownews.rb @@ -9,6 +9,7 @@ class Snownews < Formula sha256 "db1d20c1468867a2eeb77b521fdfac4e167393797506afd6bbd603fb40c435bf" => :mojave sha256 "0e1eed435b2c94a95e35ee89c3b68be6cfa9867d75dc9fbb46b19a66ff6da915" => :high_sierra sha256 "6437a67fb63f92f3c4d57b69505cb5146e2d7325da0d6fd73b57ac0f1461c807" => :sierra + sha256 "2497c6cef58124f4ca3b47c1e0eeabd335a15efe125df722c9489ae5452930a1" => :x86_64_linux end depends_on "coreutils" => :build diff --git a/Formula/snzip.rb b/Formula/snzip.rb index 6e9d07e555091..ddc939ef6665f 100644 --- a/Formula/snzip.rb +++ b/Formula/snzip.rb @@ -13,6 +13,7 @@ class Snzip < Formula sha256 "953a79f0aa028d4b5f13cc606ead6e225c290972db683947dabed58bb6748257" => :sierra sha256 "fdc031ce925717ee49048f3ffab3015f1039a06299f5093f7949e9a41cab975e" => :el_capitan sha256 "68247e4d0d0520d9a2615acd906d079951b84e4138b27a69c2aa7ce6a286dd9e" => :yosemite + sha256 "1959b9c53e258d72f61e2c8c31deec3168fb19b96ae961a1c9cd56e265a14f08" => :x86_64_linux # glibc 2.19 end depends_on "snappy" diff --git a/Formula/socat.rb b/Formula/socat.rb index 95dad24ec30e2..df2ae2e184848 100644 --- a/Formula/socat.rb +++ b/Formula/socat.rb @@ -9,6 +9,7 @@ class Socat < Formula sha256 "78e28a89b73b096849654b737ea66b730738cb24f8217c25acd71ba3cb75a70c" => :catalina sha256 "5f057eb82e1700ae32da92d5c114fabd6238cba21503f5eaf7190b56aaa35ded" => :mojave sha256 "90ee610e6e72158e5e2322ae198f48025f80b351b89029621fdf4b9861391ddb" => :high_sierra + sha256 "609e01679b6a4be6a51839c2c9e9afc874e51de91f39f7ebc663254af9f94c8e" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/sofia-sip.rb b/Formula/sofia-sip.rb index b090c40683b82..6689ee1c8a62a 100644 --- a/Formula/sofia-sip.rb +++ b/Formula/sofia-sip.rb @@ -11,6 +11,7 @@ class SofiaSip < Formula sha256 "a7d98db04406b64b6c84fbee215cccb8f44b3342318d22c8adef65865096df22" => :mojave sha256 "52d32ecd60bcc55d2e4569be650e9b11fd1c75e1b14d44145773717bb6693a6c" => :high_sierra sha256 "95a892ab2ae71eb09d5aa22c6e30a2336376d34321c54032b6d03106a96dc631" => :sierra + sha256 "8ae168f4209d3b0b7e20781424c7dd2c6c0711a6a7bee7945088ad92e1006e3a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/softhsm.rb b/Formula/softhsm.rb index 0c0f9e88ac494..a3de1563517b7 100644 --- a/Formula/softhsm.rb +++ b/Formula/softhsm.rb @@ -8,10 +8,17 @@ class Softhsm < Formula sha256 "69963f95aad110c6dcadab15613ee928f1358b714d71f4e7252da9b885eac7cd" => :catalina sha256 "4a17c51934b0adc317cfc49069d52b3fa2fcb9a852808a7b0dfe2de28cf4b3b3" => :mojave sha256 "cd17fa2e8538ca99b5963d60074578c91839740e7f87cc292b9b8f4f67dd99d8" => :high_sierra + sha256 "b392f3f3fc407a66f0a96667d599b404da900cef32bb4debfc84e884122068d9" => :x86_64_linux end depends_on "openssl@1.1" + unless OS.mac? + fails_with :gcc => "5" + fails_with :gcc => "6" + depends_on "gcc@7" + end + def install system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", diff --git a/Formula/solid.rb b/Formula/solid.rb index 0990fd3792775..9c186c36ff3a0 100644 --- a/Formula/solid.rb +++ b/Formula/solid.rb @@ -11,6 +11,7 @@ class Solid < Formula sha256 "8c7fd219da510e1821b50069ffbcc3025bee102a1ada47fe4b3f9464507fb1bc" => :mojave sha256 "30954dffe6674f98523b3cb299f909aefbe554b70000cd777df75c326edf80d0" => :high_sierra sha256 "2836475cd2195c3906950c2a62ed618302e3f57ba4c348a82b737fcb0956fc07" => :sierra + sha256 "b95a66e0bb7461f55791cc0708bcc37b2e121e8efe94cacb5ea1cdbd9bc356ca" => :x86_64_linux end # This patch fixes a broken build on clang-600.0.56. diff --git a/Formula/somagic-tools.rb b/Formula/somagic-tools.rb index 17af947038496..2b614c9f4ee4c 100644 --- a/Formula/somagic-tools.rb +++ b/Formula/somagic-tools.rb @@ -13,6 +13,7 @@ class SomagicTools < Formula sha256 "b73262d08d3ec9e10645290555b5fb0c5fd95492c9d5db2ab451285ccb69eac6" => :el_capitan sha256 "0b0b6840133039a9f7c33579d45fbd93e68dc00e6eabe0bd4d36d7d4da56fc06" => :yosemite sha256 "0fad2574c7dbb306c975cb68b84a3c317965d9fab4c5b0e0787533cacf8f7988" => :mavericks + sha256 "8b1df959c8448bb0e648462c203ed784829dfc42bec0dafaebe953f72f128dfc" => :x86_64_linux end depends_on "libgcrypt" diff --git a/Formula/somagic.rb b/Formula/somagic.rb index 8ec7d4d247a9b..2e8593dd85873 100644 --- a/Formula/somagic.rb +++ b/Formula/somagic.rb @@ -13,6 +13,7 @@ class Somagic < Formula sha256 "ed8a82423daaabaca0a7ab203edc68b3c0a1a1d617eb24d46486dfa974e9eb4f" => :el_capitan sha256 "9c87f9d7a694509b446ce726cedcb731c0185b589a1cdfa96c0346f883a75e5d" => :yosemite sha256 "0684417c6e1f1b498d10c5d24171217fb2e70ed0c8f9bacdd7365e8be8af20fc" => :mavericks + sha256 "113453858754829930f91f5a86a784975c6e4b7c78065b353b90246349d6122b" => :x86_64_linux end depends_on "libgcrypt" diff --git a/Formula/sonarqube.rb b/Formula/sonarqube.rb index f83e5805c08f1..64f1573422344 100644 --- a/Formula/sonarqube.rb +++ b/Formula/sonarqube.rb @@ -12,11 +12,15 @@ class Sonarqube < Formula def install # Delete native bin directories for other systems - rm_rf Dir["bin/{linux,windows}-*"] + rm_rf "bin/linux-x86-32" + rm_rf "bin/linux-x86-64" if OS.mac? + rm_rf "bin/macosx-universal-32" + rm_rf "bin/macosx-universal-64" unless OS.mac? + rm_rf Dir["bin/windows-*"] libexec.install Dir["*"] - (bin/"sonar").write_env_script libexec/"bin/macosx-universal-64/sonar.sh", + (bin/"sonar").write_env_script libexec/"bin/#{OS.mac? ? "macosx-universal-64" : "linux-x86-64"}/sonar.sh", :JAVA_HOME => Formula["openjdk"].opt_prefix end diff --git a/Formula/sonobuoy.rb b/Formula/sonobuoy.rb index d113ea93d33b6..2aa2f23d4e921 100644 --- a/Formula/sonobuoy.rb +++ b/Formula/sonobuoy.rb @@ -9,6 +9,7 @@ class Sonobuoy < Formula sha256 "bdc8f8081c9551b7173923f9276f7903a1ade71d3f19858a183ad18fecee3cc0" => :catalina sha256 "29a498c03d5d0b9d0d1040fe000664167834498e041350203fcbcfc81ef03141" => :mojave sha256 "ecb8e73c10ccb15afbd6d5338ff3f900b30a1a192023ebffe9df6797ac51eae7" => :high_sierra + sha256 "567f401e2bce531e9c3bdb08bc88463217cf4793367dcd845be76ace9253af17" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/sops.rb b/Formula/sops.rb index 0285fa85d77b1..47a3e9d07ff8c 100644 --- a/Formula/sops.rb +++ b/Formula/sops.rb @@ -11,6 +11,7 @@ class Sops < Formula sha256 "55e5624ed3a1c5ccd2113d663483e8c6fabbb45dede9b691f8921d698549e39e" => :catalina sha256 "7df3685379929174b605e1767b13a19af0db45c4d7f27bbf6d3b6ac905235258" => :mojave sha256 "67541150ddec0ae37ad7b7f4df4ecca8eb8814bf49708abe8cf1e94099f398bb" => :high_sierra + sha256 "a07f782a2284e08e7f1b5300b0d8a3beebdb1949c6d2940178e059886ddd7b0b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/sound-touch.rb b/Formula/sound-touch.rb index f34ae3cfb4120..6f5c966be2fc1 100644 --- a/Formula/sound-touch.rb +++ b/Formula/sound-touch.rb @@ -10,6 +10,7 @@ class SoundTouch < Formula sha256 "39081044f19ddcb8982560fb86e8c9b621c94e8bfc2de6eb4e398ba0fb2a2b9e" => :mojave sha256 "6d6651a6a7cc88c83279a49d2d676f8baf7731316f41dff3b0c77ac2d2fe7fb6" => :high_sierra sha256 "4b55c5ffffbba6f1c16f9a82860d3a0316b1d2bc478a6f7ac59e4cb36d70342a" => :sierra + sha256 "c37535989a4e4e99f25ef7642f2c8a5015cc8762ee98a6364916024a694800e6" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/source-highlight.rb b/Formula/source-highlight.rb index ab47d3df82c10..d9b27549d4926 100644 --- a/Formula/source-highlight.rb +++ b/Formula/source-highlight.rb @@ -10,6 +10,7 @@ class SourceHighlight < Formula sha256 "fac19971a1a63d2b16842157b4941e61d73a46318633ce185b2ed71df9a5db09" => :catalina sha256 "4459bbef81e9a9d8872bd4ef9ebf5d70620f2723956ae028ce5542288793f753" => :mojave sha256 "0ea7ec70be5c0e02a211f7079afd181568f2085c0982b1d4bf7a27ceac8f2347" => :high_sierra + sha256 "c53856970189d54765a7e5b14dcacfc9a02b7709238e3b2989b351279a3ef1a6" => :x86_64_linux end depends_on "boost" diff --git a/Formula/source-to-image.rb b/Formula/source-to-image.rb index 1a93a1df60378..104d0816c836d 100644 --- a/Formula/source-to-image.rb +++ b/Formula/source-to-image.rb @@ -12,13 +12,14 @@ class SourceToImage < Formula sha256 "1082f391a8b448d93865d97431856b29ca5c2d845686f04c5ae4425dc0ead5c5" => :catalina sha256 "db15e9cff473ac13375703f67b00907016001d2888b4a89c6ec065b2dc460d76" => :mojave sha256 "3c107497236774e24628577c13c67372d9814967c9a6f97651d8c05935bd8aa0" => :high_sierra + sha256 "984f33483ffb4713a7a323160eafe7405ca2704a748c999e12f751422946385d" => :x86_64_linux end depends_on "go" => :build def install system "hack/build-go.sh" - bin.install "_output/local/bin/darwin/amd64/s2i" + bin.install "_output/local/bin/#{OS.mac? ? "darwin" : "linux"}/amd64/s2i" end test do diff --git a/Formula/sourcekitten.rb b/Formula/sourcekitten.rb index e4300deb62d0d..72b284024cf56 100644 --- a/Formula/sourcekitten.rb +++ b/Formula/sourcekitten.rb @@ -12,8 +12,11 @@ class Sourcekitten < Formula sha256 "2afc89c640799f55759d6b72b1e2ba694711ff434a7e883a052263b9e83d7692" => :mojave end - depends_on :xcode => ["10.2", :build] - depends_on :xcode => "6.0" + depends_on :macos + if OS.mac? + depends_on :xcode => ["10.2", :build] + depends_on :xcode => "6.0" + end def install system "make", "prefix_install", "PREFIX=#{prefix}", "TEMPORARY_FOLDER=#{buildpath}/SourceKitten.dst" diff --git a/Formula/sourcery.rb b/Formula/sourcery.rb index 2cfde08076537..87ba1fafdf7bd 100644 --- a/Formula/sourcery.rb +++ b/Formula/sourcery.rb @@ -11,7 +11,7 @@ class Sourcery < Formula sha256 "debaf5a493f59bb3860806ffc3c9a9fb7e52805f1fc9c84d2c4b42e447670473" => :mojave end - depends_on :xcode => "10.2" + depends_on :xcode => "10.2" if OS.mac? def install system "swift", "build", "--disable-sandbox", "-c", "release", "-Xswiftc", diff --git a/Formula/sox.rb b/Formula/sox.rb index 5e98c11f92237..2f52bf8928db4 100644 --- a/Formula/sox.rb +++ b/Formula/sox.rb @@ -11,6 +11,7 @@ class Sox < Formula sha256 "4906207f83bd0f4ea1a67d040891711e9a9e8830216e451072f2957ca566b83d" => :mojave sha256 "c0bb4ba7ec922d9a8c71c2ba84e28c66c67e4fdeae970011ea45e937f43c18bd" => :high_sierra sha256 "dc8c294bb96c0b7ebc3ade73476c6031664bb8e81a32ece87ce84f815deeced5" => :sierra + sha256 "ea9f5cb4b488cf0e5f1e84d10326de3195b378565e5f9c563ea37c0aa6976d79" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/spaceinvaders-go.rb b/Formula/spaceinvaders-go.rb index 2bf9c0603a148..2f6fca4d5839a 100644 --- a/Formula/spaceinvaders-go.rb +++ b/Formula/spaceinvaders-go.rb @@ -1,5 +1,3 @@ -require "language/go" - class SpaceinvadersGo < Formula desc "Space Invaders in your terminal written in Go" homepage "https://github.com/asib/spaceinvaders" @@ -14,36 +12,15 @@ class SpaceinvadersGo < Formula sha256 "672db5956f42626d3e9fc18defe431c4f2c18cd647f8cd534f9f522c314a0c49" => :sierra sha256 "2ac0b623df41e8c9e9da05fc7f21e842bce1e71c0b9d4db52ef685cca9e040b0" => :el_capitan sha256 "99a7e2c353d5dbb310fa03e4a430d05e0092cb0aee1c19e38bd592492ae16487" => :yosemite + sha256 "720fe6d4f6871b7f1aa5de6024806d00c9dee67a65cbcbf60be8c184cf0e55c9" => :x86_64_linux end depends_on "go" => :build - go_resource "github.com/mattn/go-runewidth" do - url "https://github.com/mattn/go-runewidth.git", - :revision => "12e0ff74603c9a3209d8bf84f8ab349fe1ad9477" - end - - go_resource "github.com/nsf/termbox-go" do - url "https://github.com/nsf/termbox-go.git", - :revision => "347ab0bc907040257edaf8b580f729e12c93ab6b" - end - - go_resource "github.com/simulatedsimian/joystick" do - url "https://github.com/simulatedsimian/joystick.git", - :revision => "6aa8abe045a796cf36b720d0484809e3f70dc5bd" - end - def install - # This builds with Go. - ENV["GOPATH"] = buildpath - sipath = buildpath/"src/github.com/asib/spaceinvaders" - sipath.install Dir["{*,.git}"] - Language::Go.stage_deps resources, buildpath/"src" - cd "src/github.com/asib/spaceinvaders/" do - system "go", "build" - bin.install "spaceinvaders" - prefix.install_metafiles - end + system "go", "mod", "init", "github.com/asib/spaceinvaders" + system "go", "build" + bin.install "spaceinvaders" end test do diff --git a/Formula/spades.rb b/Formula/spades.rb index f572260348807..3e3c7646bf50f 100644 --- a/Formula/spades.rb +++ b/Formula/spades.rb @@ -10,12 +10,19 @@ class Spades < Formula sha256 "c2a3bcd1c2b83517676f45d3381b72e4644beeb98af2add918d8b30271eb8012" => :catalina sha256 "a3074628545245497991275ef869a42fa30b465f523fc63c69c37fecdc5e4349" => :mojave sha256 "c6d252bcbfe704a634cfbd929d87c003f1c2023abab767db6cd04e2c778c227b" => :high_sierra + sha256 "f37448145ebe732de8b6359fb4184895fd1aa2eae5e4732ce5bb98f8ada1adc6" => :x86_64_linux end depends_on "cmake" => :build - depends_on "libomp" + depends_on "libomp" if OS.mac? depends_on "python@3.8" + # Fix cmake error: + # Performing Test HAVE_CPU_SPINWAIT + # Performing Test HAVE_CPU_SPINWAIT - Failed + depends_on "jemalloc" unless OS.mac? + depends_on "readline" unless OS.mac? + uses_from_macos "bzip2" uses_from_macos "ncurses" uses_from_macos "zlib" diff --git a/Formula/spandsp.rb b/Formula/spandsp.rb index 78cdb6cf6f07b..767c79bee4daa 100644 --- a/Formula/spandsp.rb +++ b/Formula/spandsp.rb @@ -13,6 +13,7 @@ class Spandsp < Formula sha256 "c0b8349525680304f99e464d328df804279be85398969974f2b708e5167c89fe" => :sierra sha256 "428120be3841ca77961f2d19fe8f98f1615972db4f568e3cfa2c0a44cae44e77" => :el_capitan sha256 "65fd095ea758180f18ca9c39864dbd3432115610b0db2439dbc923d3c0002f7b" => :yosemite + sha256 "fbfef7cc4ea42ef6fbab88703fc1caa6091b4e6bed0762a044859c27f95bd42d" => :x86_64_linux end depends_on "libtiff" diff --git a/Formula/sparkey.rb b/Formula/sparkey.rb index 8c1568dd07c67..3c42fe1a22e34 100644 --- a/Formula/sparkey.rb +++ b/Formula/sparkey.rb @@ -10,6 +10,7 @@ class Sparkey < Formula sha256 "b7e64101995d257df010edb67bafcd60745f09c7b0ebb9650c817eb7343f1899" => :catalina sha256 "438c323c343b7aade2da46316d24bcc4d5c7a95910a43914d70125af14a17636" => :mojave sha256 "4acbb473ce3be942b808af45789ccb7ede8199c728f7c381cd0dda1a105c8a9e" => :high_sierra + sha256 "dc7ea6fc5b34d26e5f5c1bdbbd610143aa6327a0af210fc495ad556f22b19efa" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/sparse.rb b/Formula/sparse.rb index 0f1b0027e729a..d86a9de6ebaf2 100644 --- a/Formula/sparse.rb +++ b/Formula/sparse.rb @@ -9,6 +9,7 @@ class Sparse < Formula sha256 "d2ef22c9e1333a70053230705caff9baf80075c4039a485e3a778abc0ca3b415" => :catalina sha256 "cbd74528c1f37f44079f866fa8da5e6571929e35afd4102244cbfa103e5f2950" => :mojave sha256 "c81ad2c94b22452119bcf5c6347ef6426ee245afbd750bf0c0f6c35f3c8c6b75" => :high_sierra + sha256 "d4e47a2015df16335510520873c4600cda7426acc133db509bb28a26773bca4c" => :x86_64_linux end depends_on "gcc" if DevelopmentTools.clang_build_version < 1100 diff --git a/Formula/spatialindex.rb b/Formula/spatialindex.rb index a48ebeca7a1cf..59f3da5fbdea3 100644 --- a/Formula/spatialindex.rb +++ b/Formula/spatialindex.rb @@ -9,6 +9,7 @@ class Spatialindex < Formula sha256 "fbcbfaf6510137f3168a0dc57cbac8c8b1435094b1ede9d35a30fa6ccaea28f4" => :catalina sha256 "a5cbdfb3acddb053e596fc56e7653559581923e48ed6815503fffc47c7a16660" => :mojave sha256 "cace27981cc1e5143a48e8b700d6823dff9d8049140683e0e536c476894ede91" => :high_sierra + sha256 "8dfd42763d47df94150084d18107674bd6494358f58b92a1f7ccde542385956c" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/spawn-fcgi.rb b/Formula/spawn-fcgi.rb index 3bd3885e9e9b7..7db6469e66305 100644 --- a/Formula/spawn-fcgi.rb +++ b/Formula/spawn-fcgi.rb @@ -14,6 +14,7 @@ class SpawnFcgi < Formula sha256 "4e6f999ebcad8b7ce84473379b6358ec569559f9e4b772d31ef1a5b0e01fc865" => :el_capitan sha256 "7473e3e2cd5322b2f09011e2b5119622e145d136cd0a8d4ce7adcb255a13d83b" => :yosemite sha256 "a19a14cae6fbacdc5aa1a8132f5d290743ba7385c2d76903dbd172ca07b38680" => :mavericks + sha256 "ee59e74ca0da8cfc5e0aff2d8075e8fc789caec70987e3429b057c195c83b048" => :x86_64_linux end def install diff --git a/Formula/spdlog.rb b/Formula/spdlog.rb index 45e27f358e474..b15b2e755f2ed 100644 --- a/Formula/spdlog.rb +++ b/Formula/spdlog.rb @@ -10,6 +10,7 @@ class Spdlog < Formula sha256 "63dec5d3109417affd92cad8ed695c389e20da60531bc0b22f13826833ccf9f9" => :catalina sha256 "19f5bc7e791fd794467a305039157acafa4d8a209a87ea8c137ce0a2909ee20c" => :mojave sha256 "d47ec48d568261f83d2c7b67439b463346fd0ed3038c19392974b6efd9cbfa99" => :high_sierra + sha256 "ba4acb5bd5e799c3684e779f51bdee496348e2810e1df8731aa38262f5e99154" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/spdylay.rb b/Formula/spdylay.rb index 58f6fc3588788..7cdfd63f26a9a 100644 --- a/Formula/spdylay.rb +++ b/Formula/spdylay.rb @@ -11,6 +11,7 @@ class Spdylay < Formula sha256 "9906d0abfcd17c86df23c18b1ed112de0266ccbc7a50c24f741f78bffa552540" => :mojave sha256 "c89edde9d9229dbe524d28b661265349af72a2dac0b85f066751d4716effe1ab" => :high_sierra sha256 "2f24051eb854a2345e88a1e023aa76fa6c2cb7522ec0fd7644af15694b456f27" => :sierra + sha256 "25602239d3bbc9ff4bafe432e3f287379f4348270d460a2da32d4fc5a063cc56" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/speex.rb b/Formula/speex.rb index fff9b59f6705d..6c88051d0b3f3 100644 --- a/Formula/speex.rb +++ b/Formula/speex.rb @@ -12,6 +12,7 @@ class Speex < Formula sha256 "5aa61761fb5426de78297fdc83579515dda1a880f47c925cb3405b7175079b92" => :sierra sha256 "056781a4d7c5fe9a05f30160c059352bda0a4f8a759820df7dde7233aa08cba5" => :el_capitan sha256 "a0b3c91782b8242508adac3ebc0cd86688e75b043ea0d84f4ef7ac9940f8a21b" => :yosemite + sha256 "5ffa186c67f07ab749421df3785bd6e778b19f5bc6ed3678029be4979206eca8" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/speexdsp.rb b/Formula/speexdsp.rb index 2f2a81ad017b5..b99be184ef20e 100644 --- a/Formula/speexdsp.rb +++ b/Formula/speexdsp.rb @@ -10,6 +10,7 @@ class Speexdsp < Formula sha256 "0d61efd09b255e0856833e51bdbdaabcaaa325824a71ec326da61ffd8e200675" => :mojave sha256 "7473fce6835c55f0547e60ff32b9ee1d16c2d3a490f618310dd276e34126bd1f" => :high_sierra sha256 "b96155ea177b81d37a86a9b57dc38643680bbf6b22a6a2b826734f3cb2b5aa93" => :sierra + sha256 "28d09d987f4bb098afe2bfb9865e9646f04d0a746f0606c0b7459ae857285929" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/sphinx-doc.rb b/Formula/sphinx-doc.rb index 3ab1b4a769229..3c5c74f493bbd 100644 --- a/Formula/sphinx-doc.rb +++ b/Formula/sphinx-doc.rb @@ -11,6 +11,7 @@ class SphinxDoc < Formula sha256 "d147960294ab0a1f68491c22b718ca2797c180758d368cedac431d3d72fccb2d" => :catalina sha256 "f6ee326cac28e8c2a12682e46672357d508a619d137e6fc4ddec76de0a73e56b" => :mojave sha256 "14f9d7451631fdbb14ae909325586b2373acefb9191b643d7dd7b982cd10672e" => :high_sierra + sha256 "1f179f6a8f185fd315c63156b7680e864c2a9b6cc3f1ee27259560c153abec72" => :x86_64_linux end keg_only <<~EOS diff --git a/Formula/sphinx.rb b/Formula/sphinx.rb index 6339e6c693247..4287d2ef8f128 100644 --- a/Formula/sphinx.rb +++ b/Formula/sphinx.rb @@ -11,6 +11,7 @@ class Sphinx < Formula sha256 "f3d89ffcd2926373af5a35bb7ae6f16e59074699eeacfb4d358a0dc5742729cc" => :catalina sha256 "61f1ae14e253c8c84f0e8a9f3a26833ca4a1da887d97c0df8ecebb6096222546" => :mojave sha256 "3daf6e565c7c12803c13b6439a872e61335b3b27c06719ca6f8cec93dcd2176e" => :high_sierra + sha256 "231d104e3a780a5228da3109c40b42af91c2f57c3e1504aafc5c28c0804a9a20" => :x86_64_linux end depends_on "mysql@5.7" diff --git a/Formula/spice-protocol.rb b/Formula/spice-protocol.rb index ae0744978eeff..3e14dee3ee3d6 100644 --- a/Formula/spice-protocol.rb +++ b/Formula/spice-protocol.rb @@ -9,6 +9,7 @@ class SpiceProtocol < Formula sha256 "e1ade135b57cc78000d754e20b86ac2ce39f3a6bb466095995cc1dd1b57f7e96" => :catalina sha256 "e1ade135b57cc78000d754e20b86ac2ce39f3a6bb466095995cc1dd1b57f7e96" => :mojave sha256 "e1ade135b57cc78000d754e20b86ac2ce39f3a6bb466095995cc1dd1b57f7e96" => :high_sierra + sha256 "2e663218d3d7af6bb02013a5972be57fa0a258ca161371b9d8e9c4b566ec5990" => :x86_64_linux end depends_on "meson" => :build diff --git a/Formula/spidermonkey.rb b/Formula/spidermonkey.rb index cc497a2a321c1..f8c8ce2b54739 100644 --- a/Formula/spidermonkey.rb +++ b/Formula/spidermonkey.rb @@ -4,7 +4,8 @@ class Spidermonkey < Formula url "https://archive.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz" version "1.8.5" sha256 "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687" - revision 3 + revision OS.mac? ? 3 : 4 + head "https://hg.mozilla.org/mozilla-central", :using => :hg bottle do @@ -16,7 +17,13 @@ class Spidermonkey < Formula end depends_on "nspr" - depends_on "readline" + # Readline support is disabled; fails with: + # No rule to make target '-lreadline', needed by 'js'. Stop. + depends_on "readline" if OS.mac? + unless OS.mac? + depends_on "python" => :build + depends_on "zip" => :build + end conflicts_with "narwhal", :because => "both install a js binary" @@ -30,7 +37,7 @@ def install mkdir "brew-build" do system "../js/src/configure", "--prefix=#{prefix}", - "--enable-readline", + *("--enable-readline" if OS.mac?), "--enable-threadsafe", "--with-system-nspr", "--with-nspr-prefix=#{Formula["nspr"].opt_prefix}", diff --git a/Formula/spigot.rb b/Formula/spigot.rb index 9b4681a0cd1cf..a8f67192499e9 100644 --- a/Formula/spigot.rb +++ b/Formula/spigot.rb @@ -10,8 +10,11 @@ class Spigot < Formula sha256 "9a299a2e71a741633af321e38fc7067a7d71fa8f6e8ce6d7a5ec2cf255dc97d9" => :catalina sha256 "95d2316186eea757662e9a9ec8f2f45107ef64ce28b2a6bc2a669c6d05e15bea" => :mojave sha256 "043c9efcd99db4dbac2c10573e573f326b13ca1b411d1e2492411fa327741972" => :high_sierra + sha256 "194d61d27c60aebec6db81ab6c9f29fab2923dea96abb0f7f97e84d101e6e0d1" => :x86_64_linux end + depends_on "gmp" unless OS.mac? + def install system "./configure", "--disable-debug", "--disable-dependency-tracking", diff --git a/Formula/spin.rb b/Formula/spin.rb index 794e289546cc9..1f769dcc0d226 100644 --- a/Formula/spin.rb +++ b/Formula/spin.rb @@ -9,6 +9,7 @@ class Spin < Formula sha256 "6432ab186b64f64851fa0f60dae53c13b6c9bfbc6195c41abc08f1ddfd824bf6" => :catalina sha256 "eae932021ba8a15f713dd60ca2a29267f5df53a832895c5ab1a342d2568c6f45" => :mojave sha256 "3ffbbe34633fa0e177bd25343b3bbd35d706988ab04c4a617fff530cf3dc542a" => :high_sierra + sha256 "e1301a7a73b5dce1a61afc251890ed77fc5b53fa5e8d7a9cea51611c95248ce1" => :x86_64_linux end uses_from_macos "bison" => :build diff --git a/Formula/spirv-cross.rb b/Formula/spirv-cross.rb index e3625e0cda737..45b31fc7de13a 100644 --- a/Formula/spirv-cross.rb +++ b/Formula/spirv-cross.rb @@ -10,6 +10,7 @@ class SpirvCross < Formula sha256 "e23ad5f26f55793c665977deecea85f7d1ac92a9f80bef9c86eaf8195709007a" => :catalina sha256 "33675bde9b1f2e5861d6c5b37f027ac9be2f9a1783d2efdc84f7756c483b085e" => :mojave sha256 "51295b9f28b4bff7807d938c741c7a0c5a807d22808dd84df97457bbcde9f621" => :high_sierra + sha256 "0ca7a8140bbe1f8cbc9eadd604d15452a18ad81add3704b7463d9b6e915aa8e8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/splint.rb b/Formula/splint.rb index 1a50303f4ac2a..eb4ba3e369be6 100644 --- a/Formula/splint.rb +++ b/Formula/splint.rb @@ -11,6 +11,7 @@ class Splint < Formula sha256 "98cc2bfccef60b21ec014ff35e71cc91a85e77435b4e429090e2767d0696bef8" => :catalina sha256 "abe5a5d75a01fa272839dbc219a5fde2c76c7c7593e7dd365c152e4cb02a2c59" => :mojave sha256 "b95c7e4981cb11c23b686dbb01dcc01c1317909371b5d21ba0aa155e47569eec" => :high_sierra + sha256 "6132cf1e74b5fc0b6be6ef69d193dbf53fd72d5f67f90013f84bcbfd01f26c0e" => :x86_64_linux end uses_from_macos "flex" @@ -24,6 +25,7 @@ def install "--prefix=#{prefix}", "--infodir=#{info}", "--mandir=#{man}" + inreplace "src/Makefile", /^LIBS = $/, "LIBS = -lfl" unless OS.mac? system "make" system "make", "install" end diff --git a/Formula/sql-translator.rb b/Formula/sql-translator.rb index 78f4baa449be5..2c6ddb723d0e1 100644 --- a/Formula/sql-translator.rb +++ b/Formula/sql-translator.rb @@ -13,6 +13,7 @@ class SqlTranslator < Formula sha256 "cf06c23d417650d888cf49edd10ae3697e92cb7c0dc33ef07c530d33493155aa" => :catalina sha256 "d581943f0e91e5623b1ab053e212b6351513c81e04a77bc32b9626929f4e4667" => :mojave sha256 "185ef1f4c9feb68f4b8f65a9cda078cdc8a9600163ba67caf60f91d3dc62ce76" => :high_sierra + sha256 "9d57ce2f3b593d5f147ab38eb9cecde4dac9e2650162358362d021c4bdc44395" => :x86_64_linux end uses_from_macos "perl" @@ -32,6 +33,58 @@ class SqlTranslator < Formula sha256 "09d57974a6d1b2380c802870fed471108f51170da81458e2751859f2714f8d57" end + unless OS.mac? + resource "Moo" do + url "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz" + sha256 "bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472" + end + + resource "Module::Runtime" do + url "https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz" + sha256 "68302ec646833547d410be28e09676db75006f4aa58a11f3bdb44ffe99f0f024" + end + + resource "Sub::Quote" do + url "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz" + sha256 "6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d" + end + + resource "Try::Tiny" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz" + sha256 "da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b" + end + + resource "Import::Into" do + url "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz" + sha256 "bd9e77a3fb662b40b43b18d3280cd352edf9fad8d94283e518181cc1ce9f0567" + end + + resource "Role::Tiny" do + url "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-2.001004.tar.gz" + sha256 "92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687" + end + + resource "Class::Method::Modifiers" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz" + sha256 "ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63" + end + + resource "DBI" do + url "https://cpan.metacpan.org/authors/id/T/TI/TIMB/DBI-1.643.tar.gz" + sha256 "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa" + end + + resource "Carp::Clan" do + url "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Carp-Clan-6.08.tar.gz" + sha256 "c75f92e34422cc5a65ab05d155842b701452434e9aefb649d6e2289c47ef6708" + end + + resource "Parse::RecDescent" do + url "https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz" + sha256 "1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37" + end + end + def install ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" @@ -53,7 +106,7 @@ def install # Disable dynamic selection of perl which may cause segfault when an # incompatible perl is picked up. # https://github.com/Homebrew/homebrew-core/issues/4936 - bin.find { |f| rewrite_shebang detected_perl_shebang, f } + bin.find { |f| rewrite_shebang detected_perl_shebang, f } if OS.mac? bin.env_script_all_files libexec/"bin", :PERL5LIB => ENV["PERL5LIB"] end diff --git a/Formula/sqldiff.rb b/Formula/sqldiff.rb index 79a6c07310f84..e990c2b20530d 100644 --- a/Formula/sqldiff.rb +++ b/Formula/sqldiff.rb @@ -10,6 +10,7 @@ class Sqldiff < Formula sha256 "505cf291b499c91daa6613435ed54e1d19f6d84fa3bd7a664c8b60d2040125d0" => :catalina sha256 "430b27651e0dcdff06eae788c238b42a7ec4b2779eb3aaa7987287b6269e686f" => :mojave sha256 "29e1767b313f6983f2481077710ffbff2ebc71e48f31b855df12376df9b4bf6a" => :high_sierra + sha256 "91434dba3255009d5884a51020994073f26499bfa3174781cbffed7f641c95d1" => :x86_64_linux end uses_from_macos "tcl-tk" => :build @@ -24,8 +25,9 @@ def install test do dbpath = testpath/"test.sqlite" sqlpath = testpath/"test.sql" + sqlite = OS.mac? ? "/usr/bin/sqlite3" : Formula["sqlite"].bin/"sqlite3" sqlpath.write "create table test (name text);" - system "/usr/bin/sqlite3 #{dbpath} < #{sqlpath}" + system "#{sqlite} #{dbpath} < #{sqlpath}" assert_equal "test: 0 changes, 0 inserts, 0 deletes, 0 unchanged", shell_output("#{bin}/sqldiff --summary #{dbpath} #{dbpath}").strip end diff --git a/Formula/sqlite.rb b/Formula/sqlite.rb index 04e8269200d6d..7ba5f12f5fcf2 100644 --- a/Formula/sqlite.rb +++ b/Formula/sqlite.rb @@ -10,6 +10,7 @@ class Sqlite < Formula sha256 "faebdccaba17c8d4579a7f72cc1d1874fdd63b8a8d1d21d7c5a2c9585cc59cfa" => :catalina sha256 "22e0a663417031dff9bf37b6aa68823c340b8ff688ce1c6c878db4cf5b544d74" => :mojave sha256 "72c88000e2cc79db19cb130e031212114c4438729ef3986b0c4e222cbbcf3dbb" => :high_sierra + sha256 "0f8ab5b2efc799a0eaf6d58dc908569b2b6e93f4b05b42414a6359a2850705cb" => :x86_64_linux end keg_only :provided_by_macos diff --git a/Formula/sqliteodbc.rb b/Formula/sqliteodbc.rb index 6439248b290ad..cdc5b45053654 100644 --- a/Formula/sqliteodbc.rb +++ b/Formula/sqliteodbc.rb @@ -21,13 +21,27 @@ class Sqliteodbc < Formula def install ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra + unless OS.mac? + # sqliteodbc ships its own version of libtool, which breaks superenv. + # Therefore, we set the following enviroment to help it find superenv. + ENV["CC"] = which("cc") + ENV["CXX"] = which("cxx") + end lib.mkdir - system "./configure", "--prefix=#{prefix}", - "--with-odbc=#{Formula["unixodbc"].opt_prefix}", - "--with-sqlite3=#{Formula["sqlite"].opt_prefix}" + args = ["--prefix=#{prefix}", "--with-odbc=#{Formula["unixodbc"].opt_prefix}"] + unless OS.mac? + args += ["--with-sqlite3=#{Formula["sqlite"].opt_prefix}", + "--with-libxml2=#{Formula["libxml2"].opt_prefix}"] + end + + if OS.mac? + ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra + end + system "./configure", *args + system "make" system "make", "install" - lib.install_symlink "#{lib}/libsqlite3odbc.dylib" => "libsqlite3odbc.so" + lib.install_symlink "#{lib}/libsqlite3odbc.dylib" => "libsqlite3odbc.so" if OS.mac? end test do diff --git a/Formula/sqlparse.rb b/Formula/sqlparse.rb index b541694373f76..b44d41b9bdb1d 100644 --- a/Formula/sqlparse.rb +++ b/Formula/sqlparse.rb @@ -5,12 +5,14 @@ class Sqlparse < Formula homepage "https://github.com/andialbrecht/sqlparse" url "https://files.pythonhosted.org/packages/67/4b/253b6902c1526885af6d361ca8c6b1400292e649f0e9c95ee0d2e8ec8681/sqlparse-0.3.1.tar.gz" sha256 "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation sha256 "a886da74810f4112ac16b08840eac4ebd3ccd3daf5b7219ba1ad84d2981b8478" => :catalina sha256 "cbd26ba6872f20f79ccb9545f2329697e3f2611c124040502cd751fa4efd5432" => :mojave sha256 "c3e7934f912db3b38d16bd6adb86a496568040bcbd66f646822679b233d3d193" => :high_sierra + sha256 "d8bea310442e23fcb9fbe3fbb068efde0ac31b1fe2de4252710ccc1854c46d15" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/squashfs.rb b/Formula/squashfs.rb index 99f25076b7f71..e41ce165dd298 100644 --- a/Formula/squashfs.rb +++ b/Formula/squashfs.rb @@ -13,6 +13,7 @@ class Squashfs < Formula sha256 "f3e200ecf28cf1fec5fb11e1cd210d8e935db314c39bda62095614e08d9e7477" => :mojave sha256 "855306e06f9eeaa7b3cb8960f0c75fe097921a2b99efe8064a6cc97c8b2f579b" => :high_sierra sha256 "e318da56d36a0edbf1095a795f4a797d4919f8f859116fc8dc2448088ea0dfe1" => :sierra + sha256 "7dd927d35cb864cf95dd71f8e41a5267d8fbde83c4658cbf139813668d10d3a8" => :x86_64_linux end depends_on "lz4" @@ -29,6 +30,13 @@ class Squashfs < Formula sha256 "eb399705d259346473ebe5d43b886b278abc66d822ee4193b7c65b4a2ca903da" end + # Fixes the following compilation issue of squash4.3 with newer versions of gcc: + # "mksquashfs.c:987:24: error: called object 'major' is not a function or function pointer" + patch do + url "https://raw.githubusercontent.com/rchikhi/formula-patches/14e9deef14117908e24c17b81b60b11996688991/squashfs/squashfs-new-gcc.diff" + sha256 "24e51ef16f6e6101b59f4913aa4acbd6ff541a1953e923019e8648f6e6bdd582" + end + def install args = %W[ EXTRA_CFLAGS=-std=gnu89 diff --git a/Formula/squid.rb b/Formula/squid.rb index 8da27fcbd0d03..6a124c4a65e90 100644 --- a/Formula/squid.rb +++ b/Formula/squid.rb @@ -8,6 +8,7 @@ class Squid < Formula sha256 "9910eea9598125a80e3282a09781dda3bb73b5edc9b3a155e2e41361b672c9b3" => :catalina sha256 "afb188d816e0ca55a082d5dfc79cb48c0dbd879be1835bf8f774e4949cd71817" => :mojave sha256 "65900a2c2ba2f9fcef8b294ec2dc26c76157e972796458fffd20b07c69e64150" => :high_sierra + sha256 "99afe10dac82c12bf09cc26cb9ad87b6cf9b4e62e435a4746264da215603e0a8" => :x86_64_linux end head do diff --git a/Formula/squirrel.rb b/Formula/squirrel.rb index 901c7136bb508..7871455d69d3d 100644 --- a/Formula/squirrel.rb +++ b/Formula/squirrel.rb @@ -13,6 +13,7 @@ class Squirrel < Formula sha256 "c57b21bbdcac5cbaf3d7319d64f08c150d16592138bdf1027e7032f579e10091" => :high_sierra sha256 "f4d3e6db56838a29cd7247f0933de64bb35a6dac581a9ade879205cbfc9d93f7" => :sierra sha256 "0b6dab6fc2a9a9a9d68d8310977041bd20a492cfe91a6daef07638b0cea55aad" => :el_capitan + sha256 "fa94ee448ffaac90769281ecccfc8904763bd076eb365e6928b35d569cdd51d9" => :x86_64_linux end # Upstream patch to fix compilation with Xcode 9 diff --git a/Formula/sratoolkit.rb b/Formula/sratoolkit.rb index e1c000c8dc11f..b63d9dee41f47 100644 --- a/Formula/sratoolkit.rb +++ b/Formula/sratoolkit.rb @@ -6,10 +6,10 @@ class Sratoolkit < Formula head "https://github.com/ncbi/sra-tools.git" bottle do - cellar :any_skip_relocation sha256 "5666b45a693e675a145503ee348aa9be199b6dd53d8e3582e6a2af2f4f647b94" => :catalina sha256 "8d9a22d8cc446e66d66b44e8d8e2bbdf60faaa9cc8166e9c7cad1dd5e98abf8b" => :mojave sha256 "3dc2db39ac207dc8ba786ba808105cba4128cc9cb5573a02c28e9a71208886c9" => :high_sierra + sha256 "a197279f37e61683a000e951b0ec25a8fa5b95e7fe29b394dddf2c3387663b1f" => :x86_64_linux end depends_on "hdf5" @@ -32,7 +32,49 @@ class Sratoolkit < Formula sha256 "a6cc88e8d12f536dc96d5f60698d0ef4cf2f63e31d3d12d23da39b1de39563e1" end + unless OS.mac? + resource "which" do + url "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz" + sha256 "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078" + end + + resource "build" do + url "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-1.92.tar.gz" + sha256 "cd95173a72e988bdd7270a22699e6c9764b6aed6e6c4c022c623b1ce72040a79" + end + + resource "tiny" do + url "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz" + sha256 "3c49482be2b3eb7ddd7e73a5b90cff648393f5d5de334ff126ce7a3632723ff5" + end + + resource "chdir" do + url "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz" + sha256 "efc121f40bd7a0f62f8ec9b8bc70f7f5409d81cd705e37008596c8efc4452b01" + end + + resource "capture" do + url "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz" + sha256 "6c23113e87bad393308c90a207013e505f659274736638d8c79bac9c67cc3e19" + end + + resource "libxml2" do + url "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.11.tar.gz" + sha256 "aa583d8e7677f944476bd595e3a25a99935ba15ca0b6a50927951e2ab8415ff3" + end + + resource "libxml" do + url "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0201.tar.gz" + sha256 "e008700732502b3f1f0890696ec6e2dc70abf526cd710efd9ab7675cae199bc2" + end + end + def install + # sratoolkit seems to have race conditions during the build and exhibit + # during pacbio util builds + # Issue: https://github.com/Linuxbrew/homebrew-core/issues/5323 + ENV.deparallelize unless OS.mac? + ngs_sdk_prefix = buildpath/"ngs-sdk-prefix" resource("ngs-sdk").stage do cd "ngs-sdk" do @@ -59,6 +101,10 @@ def install # Upstream PR: https://github.com/ncbi/sra-tools/pull/105 inreplace "tools/copycat/Makefile", "-smagic-static", "-smagic" + # Fix the error: undefined reference to `SZ_encoder_enabled' + # Issue: https://github.com/Linuxbrew/homebrew-core/issues/5323 + inreplace "tools/pacbio-load/Makefile", "-shdf5 ", "-shdf5 -ssz " unless OS.mac? + system "./configure", "--prefix=#{prefix}", "--with-ngs-sdk-prefix=#{ngs_sdk_prefix}", @@ -69,7 +115,38 @@ def install system "make", "install" # Remove non-executable files. - rm_r [bin/"magic", bin/"ncbi"] + rm_rf [bin/"magic", bin/"ncbi"] + + unless OS.mac? + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + ENV.prepend_path "PERL5LIB", libexec/"lib" + + %w[ + which + build + tiny + chdir + capture + libxml2 + libxml + ].each do |r| + resource(r).stage do + if File.exist?("Makefile.PL") + system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}" + system "make" + system "make", "install" + elsif File.exist?("Build.PL") + system "perl", "Build.PL", "--install_base", libexec + system "./Build" + system "./Build", "install" + else + raise "UNKNOWN BUILD SYSTEM" + end + end + end + + bin.env_script_all_files(libexec/"bin", :PERL5LIB => ENV["PERL5LIB"]) + end end test do diff --git a/Formula/srmio.rb b/Formula/srmio.rb index 3010b1cdaf8f9..f2842fb8013ce 100644 --- a/Formula/srmio.rb +++ b/Formula/srmio.rb @@ -14,6 +14,7 @@ class Srmio < Formula sha256 "9e45cba0daaa89683552f1feb19cd49c42d27a311113ecb204ae8c2e48231f3f" => :el_capitan sha256 "e71a6c2fac5115cae2fe1a8b7eea9fb5800b96f908adf357a667b5df70bd7089" => :yosemite sha256 "d0c35e531e9defc37adc487e00a18ce46b59181bbdf74d46cbc9f5618153d5e4" => :mavericks + sha256 "091c31156bdb1f487a811255982cd6e2ba0cbaa10124d152443c53340c5a6e77" => :x86_64_linux end head do diff --git a/Formula/srt.rb b/Formula/srt.rb index fa35897c04b24..dcd56ada295fe 100644 --- a/Formula/srt.rb +++ b/Formula/srt.rb @@ -10,6 +10,7 @@ class Srt < Formula sha256 "bbadac0b96337c84604feba7fc654cf1c1bb8040a616e0ee2603e580da5e5df5" => :catalina sha256 "5a689897fa108ad3976d609fba6b9233e1cdab7eab5e90a45ec6b52e899718c0" => :mojave sha256 "01039fd82d968be00949e93af2e1eb5ad16152099975e1e00d355641b7eacd01" => :high_sierra + sha256 "c1f9d89b4c1fb21f5a99e63b8438ecb364e232a39c1299e66f63010dddb153bf" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/srtp.rb b/Formula/srtp.rb index 149e22b9b3201..04fd4b022dc18 100644 --- a/Formula/srtp.rb +++ b/Formula/srtp.rb @@ -10,6 +10,7 @@ class Srtp < Formula sha256 "b96d4c3bb159a6f43d5bdd9cc0be0d8deecb06c95df19f2d9cc1f517ffc64ad6" => :catalina sha256 "4bbad999b46dd545aa32882e968d441f5d5e709dc8549ef79e3885dd49fcb964" => :mojave sha256 "5c70c41484064bbe25c31a19fc2cffc5cbea3de27e837a039b17767aeb1b57b8" => :high_sierra + sha256 "6127178b734c7c1a686398eafcaf619219d31d80cc5db73edb477c7a044135ed" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/ssdb.rb b/Formula/ssdb.rb index 7bda6dfcb435d..cc384044dedac 100644 --- a/Formula/ssdb.rb +++ b/Formula/ssdb.rb @@ -10,6 +10,7 @@ class Ssdb < Formula sha256 "adc9b1c421a96f617d53eb9b2750730a2f94470b96bbbffd42171034b42f50e3" => :catalina sha256 "17baf0ab0b2d11d987ff8bf3b9de6a19bf6839a4b23bcd76d01a0d62421141d9" => :mojave sha256 "5ab4ecd6c2d2df8996fc71477e4abe970a48b53999ddc291ceeb06b261ae21d0" => :high_sierra + sha256 "39e21d6e429436a2c5baa249d13730ef6a6c781d22f62285b4b1196a00ba8f8b" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/ssdeep.rb b/Formula/ssdeep.rb index d1d4a656ba1fe..62c86fbbb1542 100644 --- a/Formula/ssdeep.rb +++ b/Formula/ssdeep.rb @@ -11,6 +11,7 @@ class Ssdeep < Formula sha256 "1c8a9a487676961755daf5688ec478a5925f3a0dfe36faeb7027878600ef2384" => :high_sierra sha256 "84677545f87098d9c5d74719044c56616a8788f1320c9258794807dac2343328" => :sierra sha256 "c07f5558ed32f7de17f349cbc62e56cf277d3d30c83fa7844bdf41000729dcba" => :el_capitan + sha256 "196f6fbb9e5b008ab981b091d867361b43f07c29bbacc840f7c23f1f8ffd7161" => :x86_64_linux end def install diff --git a/Formula/ssed.rb b/Formula/ssed.rb index 6866281541e22..d6e8b05d3ab91 100644 --- a/Formula/ssed.rb +++ b/Formula/ssed.rb @@ -5,11 +5,11 @@ class Ssed < Formula sha256 "af7ff67e052efabf3fd07d967161c39db0480adc7c01f5100a1996fec60b8ec4" bottle do - cellar :any_skip_relocation rebuild 1 sha256 "21b9139163cd1f1ddf11ad063e4e9c2409d7c73cba2473912d9117a1631205b8" => :catalina sha256 "3684fa95549fe291253881be5f173e9cff43940be146842f3576a48c7052e234" => :mojave sha256 "cc8945d2f1d9849181c61650958ba6f90a1ff4f4d7dfacf265b5d13921d0a91b" => :high_sierra + sha256 "f0529bc27f6ff9e94107401286bdc933cd9d1024314cfc0689028afc25d8a953" => :x86_64_linux end conflicts_with "gnu-sed", :because => "both install share/info/sed.info" diff --git a/Formula/ssh-permit-a38.rb b/Formula/ssh-permit-a38.rb index 8965be1931f09..d324b98976c04 100644 --- a/Formula/ssh-permit-a38.rb +++ b/Formula/ssh-permit-a38.rb @@ -11,6 +11,7 @@ class SshPermitA38 < Formula sha256 "3eefd64fbbe3e4d500a69352091da85ca685a435094facc30e6942d9d5e89a1d" => :catalina sha256 "683ebbe9a6a845802f825f1775e6d861387be41fd520b648275f97a580e92398" => :mojave sha256 "7d82d59932bb6d721a31726efc231d043d54d180995d0119d8f8bf9fc37f3e9b" => :high_sierra + sha256 "d563f22a553c7f4d45678adaf9190103d3b93ae2ddfc7d8b9efa7a6fcc2cf5fc" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ssh-vault.rb b/Formula/ssh-vault.rb index f248bebd5a8b6..a4e58a0a68251 100644 --- a/Formula/ssh-vault.rb +++ b/Formula/ssh-vault.rb @@ -11,6 +11,7 @@ class SshVault < Formula sha256 "d12a7148614bb8fbc97e0e7f72fe04e18da0cd7fb54ee1e5b9308757a2377e83" => :catalina sha256 "7b7874972e68f117d14f5027895b6259320abe8db5deda72da09875c507755b1" => :mojave sha256 "c6cf671474c67600ddac7bbcae909797c8ba26e16692533b5e82faa153ea9d77" => :high_sierra + sha256 "efe8693c4c70cee26691c9387f9241366bd736fe612966696f44eb439172bed9" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/sshfs.rb b/Formula/sshfs.rb index b67c02d9747a4..38d5909853371 100644 --- a/Formula/sshfs.rb +++ b/Formula/sshfs.rb @@ -11,6 +11,7 @@ class Sshfs < Formula sha256 "5f69267c0f1f2489989e108919d66210e058423d0d1f1661812c0194b164619c" => :mojave sha256 "58d222f37622b399352f16eaf823d3e564445d9e951629e965281ac31de5ef4a" => :high_sierra sha256 "dc4a7f24c2cbebd7c35891200b043d737ba6586a28992708ef849ffedff7bb01" => :sierra + sha256 "24e776a28e635c10a7be5e1d87711c844a3b96148acf80696d3ad4b0830b1491" => :x86_64_linux end depends_on "autoconf" => :build @@ -18,7 +19,11 @@ class Sshfs < Formula depends_on "libtool" => :build depends_on "pkg-config" => :build depends_on "glib" - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end # Apply patch that clears one remaining roadblock that prevented setting # a custom I/O buffer size on macOS. With this patch in place, it's diff --git a/Formula/sshguard.rb b/Formula/sshguard.rb index 819d78132a916..829c3158fc434 100644 --- a/Formula/sshguard.rb +++ b/Formula/sshguard.rb @@ -11,6 +11,7 @@ class Sshguard < Formula sha256 "63af5b9fe223253a1798e8500475af1675c8a36d987628b9e195a5da33bad252" => :mojave sha256 "54bb8831aaf7de0a2ba0ee3780e34a76dd67e90d3db8bcf5e3496ec78e4d5b56" => :high_sierra sha256 "94c8ecf69111d23d51cc2e61ecfc0438dd9006236340e659ed094b8d7e3fd699" => :sierra + sha256 "6e1c2d15ad2a53a7a144ade502ed6862d8113ecc1919f087f86f5769c66a78af" => :x86_64_linux end head do diff --git a/Formula/sshtrix.rb b/Formula/sshtrix.rb index c31b6f7ac80f9..c97588a13c235 100644 --- a/Formula/sshtrix.rb +++ b/Formula/sshtrix.rb @@ -10,6 +10,7 @@ class Sshtrix < Formula sha256 "a54f2c867dd6539824cc69888975d3cd2041b4b922183262d29fcdf655391cfa" => :mojave sha256 "dd567f106a7fe8a7a6f9e2474b284109e1dbcb14ed847163d1f65f4d69467f93" => :high_sierra sha256 "dafb3bc8c14e729cbbfbf8dc6a9ce789e01732a644aa84b243af24f2bd92ce19" => :sierra + sha256 "8ee35a1901249a614771c8cfbdcc15adf8b2a583b912debe6fb0eb6b06335327" => :x86_64_linux end depends_on "libssh" diff --git a/Formula/sshuttle.rb b/Formula/sshuttle.rb index 8dcf233d9411f..f3492b4365850 100644 --- a/Formula/sshuttle.rb +++ b/Formula/sshuttle.rb @@ -13,6 +13,7 @@ class Sshuttle < Formula sha256 "4ed29a3e61c9b1faa65f336e9942f200a53b22dd8c0690da411c80c8817f02c9" => :catalina sha256 "7d95976338b60398fa655967997e5ca3731d1af20f3f1fc7d41aef7143ccbca9" => :mojave sha256 "6bb0dd8552477a173c6015ec75b2a05ccd3806500546bb490ea9d26e51a06d5e" => :high_sierra + sha256 "d5cbce59419f433e034ae01032337af609a6c5440545811a37e894fbf90a9be7" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/ssldump.rb b/Formula/ssldump.rb index 66b716539e0d6..29b3d93557056 100644 --- a/Formula/ssldump.rb +++ b/Formula/ssldump.rb @@ -10,6 +10,7 @@ class Ssldump < Formula sha256 "4227a45957205b7e183b9f66f4ad2cd57abd7eda44db220d0feadf4de03b5778" => :catalina sha256 "940b872d8dd649cc7ef309bb169a02a48425b7059c44c012831fafd5cbe8b61e" => :mojave sha256 "096ee72c50d64cddefb9d90f2b9c904322eaf36eab4c76bb914a60387b75baf9" => :high_sierra + sha256 "69fe536f34e8e6be26df73172c1f5253d0e9aac6d0fe0d4da2a63348932335a0" => :x86_64_linux end depends_on "libpcap" @@ -18,21 +19,23 @@ class Ssldump < Formula # reorder include files # https://sourceforge.net/p/ssldump/bugs/40/ # increase pcap sample size from an arbitrary 5000 the max TLS packet size 18432 + # pcap-bpf.h instead of net/bpf.h patch :DATA def install ENV["LIBS"] = "-lssl -lcrypto" + ENV.prepend "CFLAGS", "-DLINUX=1" unless OS.mac? - # .dylib, not .a + # .dylib (.so), not .a inreplace "configure", "if test -f $dir/libpcap.a; then", - "if test -f $dir/libpcap.dylib; then" + "if test -f $dir/libpcap.#{OS.mac? ? "dylib" : "so"}; then" system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", "--mandir=#{man}", "--with-pcap=#{Formula["libpcap"].opt_prefix}", - "osx" + ("osx" if OS.mac?) system "make" # force install as make got confused by install target and INSTALL file. system "make", "install", "-B" @@ -51,10 +54,10 @@ def install static char *RCSSTRING="$Id: pcap-snoop.c,v 1.14 2002/09/09 21:02:58 ekr Exp $"; - -+#include #include #include -#include ++#include #ifndef _WIN32 #include #endif diff --git a/Formula/sslh.rb b/Formula/sslh.rb index 26c22f4f6cad0..2d2a4d22341fa 100644 --- a/Formula/sslh.rb +++ b/Formula/sslh.rb @@ -11,6 +11,7 @@ class Sslh < Formula sha256 "cee0f6398a940312dd3198dda55d949955aa1374cd15fb5841c0446c67508e4d" => :mojave sha256 "b1d1ea3c654defbd69cc850ecb9b5b97b09e3b8c991faf48cb22d4190e0791b6" => :high_sierra sha256 "8a4b0d4715358a714c8f3ef86496e91416bcfe70067f3d71db30f97616b71080" => :sierra + sha256 "aee3a46dc6d7969974987615808c9e20180651f68941c36a805c9fc801fe7b04" => :x86_64_linux end depends_on "libconfig" diff --git a/Formula/ssllabs-scan.rb b/Formula/ssllabs-scan.rb index cfbcb5fb864fe..b7e804464ce7f 100644 --- a/Formula/ssllabs-scan.rb +++ b/Formula/ssllabs-scan.rb @@ -10,6 +10,7 @@ class SsllabsScan < Formula sha256 "eab95a02c320153e8bcc68bcbc960665fd7b755d9a339d4bdd6618d5d33714e6" => :mojave sha256 "91041d74d4bd340c53f15bab9c43fb6d7757601e0da00d810cdc2733a6e6c9a5" => :high_sierra sha256 "a2e66ec0c5e565428d2cc33906d8eecf38697e503cedb95f4817c8f186537f73" => :sierra + sha256 "964d23a4bccc18bebb06f975cba0b5dc0b101cf893ccfb3b132c18623a0c3444" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/sstp-client.rb b/Formula/sstp-client.rb index 39e1850b3af7a..8ef2739e285b4 100644 --- a/Formula/sstp-client.rb +++ b/Formula/sstp-client.rb @@ -8,6 +8,7 @@ class SstpClient < Formula sha256 "07d9e21c21591a675d760f059838f26bbbe02a04b27518bce5d3a9b0d0069194" => :catalina sha256 "0c32039442cbe0c26bc90660fd99e19940b71677637b60d03350a4c90b3ca35c" => :mojave sha256 "cfc794cfd038b84da0b1f329bc7eb6f5c5165e1727ec53c259a5d93ab48d47b0" => :high_sierra + sha256 "e8c04923ff3b62df9139a1746604f6129317de2eea38e216b39f0256fbc4eac2" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/star.rb b/Formula/star.rb index 7363e5eae7dae..3ea9f25748918 100644 --- a/Formula/star.rb +++ b/Formula/star.rb @@ -13,6 +13,7 @@ class Star < Formula sha256 "64288e33524b1d1afcc5ae7e6ff5dc1488f1793eba9452e54279054d55e93db3" => :el_capitan sha256 "e3b77b33bc2c8ec917ddf41a29d937de1492253c7d039f5747e44e2361cfadd4" => :yosemite sha256 "410f5637ccdf115373b5a08c5037cdb8c66cb113719ead191070d087eae43285" => :mavericks + sha256 "4ca6fd2d63832acd4f4f97ffff5bceeb9d462e9a3733a803a0168ba994e2aff3" => :x86_64_linux # glibc 2.19 end depends_on "smake" => :build diff --git a/Formula/starship.rb b/Formula/starship.rb index 7903f66c7e03c..b24c7f97de456 100644 --- a/Formula/starship.rb +++ b/Formula/starship.rb @@ -10,9 +10,14 @@ class Starship < Formula sha256 "a3a34f4edf92bc367f3db5da9579be06d616bcc774119a115c97641b849a805a" => :catalina sha256 "1d04e06d566895e65579c71eb27d9810ac6048877d06e6c088be377a67129844" => :mojave sha256 "2238d71f7941e44782966a1836d455b76d11eabc015f3afed70f27210d1c297c" => :high_sierra + sha256 "75528e279d6620d375f5fe0b9b8773e618262fd1dd2e067be518054a5c5e2160" => :x86_64_linux end depends_on "rust" => :build + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "openssl@1.1" + end uses_from_macos "zlib" diff --git a/Formula/statik.rb b/Formula/statik.rb index 54b13b0bbf3c8..b3ac5f86f3a27 100644 --- a/Formula/statik.rb +++ b/Formula/statik.rb @@ -5,7 +5,7 @@ class Statik < Formula homepage "https://getstatik.com" url "https://github.com/thanethomson/statik/archive/v0.23.0.tar.gz" sha256 "6159066f486811e5773da318d6e8d1b1dd4c99ac140f1a3c660ef1c1f5e7124f" - revision 1 + revision OS.mac? ? 1 : 3 head "https://github.com/thanethomson/statik.git" bottle do @@ -13,6 +13,7 @@ class Statik < Formula sha256 "cab701f93b5c776a91b46f83140f92fd39885e0ce99d50374116c3b437b2fe8e" => :catalina sha256 "9b83cfba38b5dec6a411291ec401908fa7e5017c22ebbfb269c78094edfd41a7" => :mojave sha256 "87917f38bc4ef1f2121d82f8f697b451d5ef46e0e10df7b6538348f5b8a39d97" => :high_sierra + sha256 "1315d00703bd37b2afeb5e1792b743e4d675619a185d68c807ce6f57151e3d41" => :x86_64_linux end depends_on "libpq" diff --git a/Formula/stdman.rb b/Formula/stdman.rb index 99499a24fd0cf..4ff0aa3928345 100644 --- a/Formula/stdman.rb +++ b/Formula/stdman.rb @@ -3,6 +3,7 @@ class Stdman < Formula homepage "https://github.com/jeaye/stdman" url "https://github.com/jeaye/stdman/archive/2018.03.11.tar.gz" sha256 "d29e6b34cb5ba9905360cee6adcdf8c49e7f11272521bf2e10b42917486840e8" + revision 1 unless OS.mac? version_scheme 1 head "https://github.com/jeaye/stdman.git" @@ -13,8 +14,11 @@ class Stdman < Formula sha256 "0f795424e68e066cc1f6c567a5513001481cd610cded75dfab77aa8db42cf9ed" => :high_sierra sha256 "d3e640c191d2cf471b37b2121d20ebab97ff353f2d69616cfa7f7227db069beb" => :sierra sha256 "d4b15103ae4011c1f2c9a4e3dcb0b205bfa45595d7ad25d6cb87ec1dc4f395ab" => :el_capitan + sha256 "896792691a9723846f4e01d5fb1e5d882650bcde6a0842f499a509cd954a5922" => :x86_64_linux end + depends_on "man-db" => :test unless OS.mac? + def install system "./configure", "--prefix=#{prefix}" system "make", "install" diff --git a/Formula/stella.rb b/Formula/stella.rb index bfdcc143b87be..5a659c3985827 100644 --- a/Formula/stella.rb +++ b/Formula/stella.rb @@ -10,12 +10,21 @@ class Stella < Formula sha256 "905c36cc2c68968ffcedb83867474bd757f9b6188a9d49f7fd94d22f0e479b0d" => :catalina sha256 "482b97a5ebe760bb2793c95d0c51c3ac356417eb1c8479c4539086cc9ad203e9" => :mojave sha256 "ff69cdd3d5a5def9e99557b0d327e16da16b3b37298f769ec66bed2c0ff18003" => :high_sierra + sha256 "5f698811afd8686eaa81b17158676e424682331fb0deedef0faff6a229a41dfe" => :x86_64_linux end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? depends_on "libpng" depends_on "sdl2" + # Stella is using c++14 + unless OS.mac? + fails_with :gcc => "5" + fails_with :gcc => "6" + fails_with :gcc => "7" + depends_on "gcc@8" + end + uses_from_macos "zlib" def install @@ -31,13 +40,21 @@ def install "\\1 = (#{sdl2.opt_lib}, #{libpng.opt_lib}, \\2);" s.gsub! /(OTHER_LDFLAGS) = "((-\w+)*)"/, '\1 = "-lSDL2 -lpng \2"' end - xcodebuild "SYMROOT=build" - prefix.install "build/Release/Stella.app" - bin.write_exec_script "#{prefix}/Stella.app/Contents/MacOS/Stella" end + system "./configure", "--prefix=#{prefix}", + "--bindir=#{bin}", + "--with-sdl-prefix=#{sdl2.prefix}", + "--with-libpng-prefix=#{libpng.prefix}", + "--with-zlib-prefix=#{Formula["zlib"].prefix}" + system "make", "install" end test do - assert_match /Stella version #{version}/, shell_output("#{bin}/Stella -help").strip + assert_match /Stella version #{version}/, shell_output("#{bin}/Stella -help").strip if OS.mac? + # Test is disabled for Linux, as it is failing with: + # ERROR: Couldn't load settings file + # ERROR: Couldn't initialize SDL: No available video device + # ERROR: Couldn't create OSystem + # ERROR: Couldn't save settings file end end diff --git a/Formula/stellar-core.rb b/Formula/stellar-core.rb index 56f37349b85f3..86ad78afa4b34 100644 --- a/Formula/stellar-core.rb +++ b/Formula/stellar-core.rb @@ -11,6 +11,7 @@ class StellarCore < Formula sha256 "be37793c1041c8d01fb3c038f2042a8f02887f53decee5f9b5ba19891214d0c0" => :catalina sha256 "77f0e8ac437a797320c8351e7aa0cfddd296a1299b5ba1994f34641eb6ec3c63" => :mojave sha256 "5d576008e89a26149afaae80971823f59b474bf3ae55f01e8ceca491e5d812e5" => :high_sierra + sha256 "4efc36e0743bf295adda3ebce4461728efed9bcbf0023910643eea35cf310eca" => :x86_64_linux end depends_on "autoconf" => :build @@ -22,6 +23,12 @@ class StellarCore < Formula depends_on "libpq" depends_on "libpqxx" depends_on "libsodium" + unless OS.mac? + # Needs libraries at runtime: + # /usr/lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.22' not found + depends_on "gcc@6" + fails_with :gcc => "5" + end uses_from_macos "bison" => :build uses_from_macos "flex" => :build diff --git a/Formula/step.rb b/Formula/step.rb index 1a5207208f72c..428317aff2667 100644 --- a/Formula/step.rb +++ b/Formula/step.rb @@ -9,6 +9,7 @@ class Step < Formula sha256 "c782cdbce5ca41cde43000a273e4d4e906e28c03083221244760eb0a55dabcb5" => :catalina sha256 "bcd1da4331084133d1c3bb3d37d8fce899b383ec4ebaeab42833bb9fbf28a841" => :mojave sha256 "84292f7430ba31f38cce86049fd08ef8a2ab5a92368e018f90372439f23aebd2" => :high_sierra + sha256 "62c761bdbf855631aeefd0a29218565c921a8bb49015b866c5538c8004f71f6a" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/stern.rb b/Formula/stern.rb index 1f8d67e33cdaf..78f2a62406ad8 100644 --- a/Formula/stern.rb +++ b/Formula/stern.rb @@ -12,6 +12,7 @@ class Stern < Formula sha256 "f862bab034a7d05b995e762e7feae5d840db9099faba8465e4e20daa548f02f7" => :mojave sha256 "fd68b5ceb1ef3a1cbdb51653530f0ac0625e59adb55b02c1b7dad2268db7e4b3" => :high_sierra sha256 "01a7f817326d1172201d36df18cbee1ceca864d83e9cc528e301018b1510872f" => :sierra + sha256 "35a6495a2154cb0a53a844a1b9c13476a80cc089f9e88fbc0791b3c6d137f523" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/stgit.rb b/Formula/stgit.rb index dc64c24ea3b81..516df565d919b 100644 --- a/Formula/stgit.rb +++ b/Formula/stgit.rb @@ -10,6 +10,7 @@ class Stgit < Formula sha256 "a99d7f5ad5fbc099095f3579faa5f7356f180469aff11546c45caf37823afee9" => :catalina sha256 "a99d7f5ad5fbc099095f3579faa5f7356f180469aff11546c45caf37823afee9" => :mojave sha256 "a99d7f5ad5fbc099095f3579faa5f7356f180469aff11546c45caf37823afee9" => :high_sierra + sha256 "8077b9ebcb11ff82ec16190bbae5fe99745ad918bf16e7bed7df7fde20a955ec" => :x86_64_linux end depends_on "asciidoc" => :build diff --git a/Formula/stlink.rb b/Formula/stlink.rb index fa8927ce5e82e..9a9ebc424251e 100644 --- a/Formula/stlink.rb +++ b/Formula/stlink.rb @@ -10,6 +10,7 @@ class Stlink < Formula sha256 "e24c7913e29b627142d892c8dacfcbb077cea4a8abdb021d2b6624cd7ce61865" => :catalina sha256 "85fa59905d566f85a1f7b4dc86a2f770181550ac7402907c326b050f09053272" => :mojave sha256 "ca0da39790dc0a876555f19cbf227a05490c126a8f071e971118bdbbd2147787" => :high_sierra + sha256 "5599d5ab3b75e36296bfe8de5aed09b0405271590d5e2a113452d463b1ee8a15" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/stm32flash.rb b/Formula/stm32flash.rb index cd6c3ecc7ce9b..49dda766c5c5c 100644 --- a/Formula/stm32flash.rb +++ b/Formula/stm32flash.rb @@ -11,6 +11,7 @@ class Stm32flash < Formula sha256 "2cbbf094a7f2777b674909a5f846bba0cb613a5c2c38e980b67bd769b924e5f5" => :high_sierra sha256 "74a92cff8b8099a2b8ee8aa0a2a360639400eb53a24b625c149b052e3f26521e" => :sierra sha256 "1e49a9386e4aac0260e3b24872714e59f3984c7f6fb2779e9bd89e0d23bc1655" => :el_capitan + sha256 "de118b39545d6fbdacb7e037efd38de3466ac0428b39c06ec476afc139a1b31e" => :x86_64_linux end def install diff --git a/Formula/stockfish.rb b/Formula/stockfish.rb index c465087e59056..305eecaea4e55 100644 --- a/Formula/stockfish.rb +++ b/Formula/stockfish.rb @@ -10,6 +10,7 @@ class Stockfish < Formula sha256 "f6bcd62e239cdd9779771367e32137045772d90b6ab3dae858a85bfbe104a95e" => :catalina sha256 "f6bcd62e239cdd9779771367e32137045772d90b6ab3dae858a85bfbe104a95e" => :mojave sha256 "5debb14a1764281072d0ad4c350a1ce4014904a9956dfa5046347965486573c2" => :high_sierra + sha256 "0fdc56a0ea2141af8356230ec7fc7ce3acb8b463eb9076594e897c1aa3e95b4f" => :x86_64_linux end def install diff --git a/Formula/stoken.rb b/Formula/stoken.rb index 7908aeec315df..92933e23658aa 100644 --- a/Formula/stoken.rb +++ b/Formula/stoken.rb @@ -10,6 +10,7 @@ class Stoken < Formula sha256 "423dbce4e76710fe932fc4d86fa25b39ced8f138d781fcccbc3982ce83136216" => :catalina sha256 "59ee230b63a707bf9c1fd966ec003c14ca16c7e61a331b765e31a1ba4b7db867" => :mojave sha256 "6c6b704e5f9830e0192383c53717f64b0af48119d6f0d96d78de521820a6c84b" => :high_sierra + sha256 "bb36935bef860c89a3d57ede15d330171e967453c0dfc0722dc34ac882d1fb5e" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/stolon.rb b/Formula/stolon.rb index f39cf6e16a927..1b78d6b010272 100644 --- a/Formula/stolon.rb +++ b/Formula/stolon.rb @@ -10,6 +10,7 @@ class Stolon < Formula sha256 "8bbf533b32cba6f798e17aad03e6268c6fe66be84cac9801226217e40c9cc0a9" => :catalina sha256 "fac96dde0102d1b0b7cd6e6dad8cb3bb3b7dfdee16f0fe98cbb439e4602a48e5" => :mojave sha256 "3f82acb97ffd0f586b5c6c643237205f0df3c5d03ed2cbd01143aba404d0e1b7" => :high_sierra + sha256 "f9a42e2d84e9a0a7e6edbe81878b02e25f8e1ce62129e3e45b7b696bbcdbe17c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/stormlib.rb b/Formula/stormlib.rb index 53e751016f94c..57ffedfbd873e 100644 --- a/Formula/stormlib.rb +++ b/Formula/stormlib.rb @@ -12,6 +12,7 @@ class Stormlib < Formula sha256 "b76d57a2af0971b96c0cc46b3e24078486f732131b6845e92cbd776b4d5c20c7" => :high_sierra sha256 "aa27fedf8877032a52c85f9a7a57a94149e9fd2c18f25351fd6a61203e5a797d" => :sierra sha256 "71e3d5e94f69c23c8f0d5181b4bc130c3202aa6c99e0e42c4b6508b71be0167a" => :el_capitan + sha256 "29de1152bd547973e6f70c7fe1473d19c7c7e3fd5fc340891cee0522c942fc5d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/stormssh.rb b/Formula/stormssh.rb index fdfc092c6f340..b91b6395787f2 100644 --- a/Formula/stormssh.rb +++ b/Formula/stormssh.rb @@ -3,14 +3,14 @@ class Stormssh < Formula homepage "https://github.com/emre/storm" url "https://files.pythonhosted.org/packages/0a/18/85d12be676ae0c1d98173b07cc289bbf9e0c67d6c7054b8df3e1003bf992/stormssh-0.7.0.tar.gz" sha256 "8d034dcd9487fa0d280e0ec855d08420f51d5f9f2249f932e3c12119eaa53453" - revision 3 + revision OS.mac? ? 3 : 4 head "https://github.com/emre/storm.git" bottle do - cellar :any sha256 "ea320fc79f2b33f81f123833bcd77212cca1a2fb93fd4094ddc4b175f31fdaed" => :catalina sha256 "0517af91bef9ee09a89d36105786eae1068aa66e81988636bae1c2e279660156" => :mojave sha256 "e69de64df1e5e1285fbd26ac1651d2ab1ad964237531151de7b3e05dbd23161e" => :high_sierra + sha256 "86b4379c69a0d899bdd932f59b9ee774fe9070d4637e45fda2036e86ac08f138" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/stout.rb b/Formula/stout.rb index 3692629a7748d..d603e785db021 100644 --- a/Formula/stout.rb +++ b/Formula/stout.rb @@ -10,6 +10,7 @@ class Stout < Formula sha256 "7d90dec0fbc23cfc58b56261957818a0fb1af5c77086b1979b77ea1196484a25" => :mojave sha256 "cfff658fcb5319cd6a5053c645a9679d3db94e9dff4fbe91ae488ca31658a1fc" => :high_sierra sha256 "26554af96b6044316abecb1a2142e81b1aab8315bff941cbdad9b39fe143b74e" => :sierra + sha256 "aa21db52532605409b01f2ec0f2bc821eecfb172ed2427cd9ef37b215ea22179" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/stow.rb b/Formula/stow.rb index 4a2daccb4c5c6..9435f235710bd 100644 --- a/Formula/stow.rb +++ b/Formula/stow.rb @@ -11,6 +11,7 @@ class Stow < Formula sha256 "409987564f7779d6a1db75f64e54c4713ecd9b9e006abac931f8e8d645bdac92" => :mojave sha256 "409987564f7779d6a1db75f64e54c4713ecd9b9e006abac931f8e8d645bdac92" => :high_sierra sha256 "cbc7a61940a343aff46fdb6190dc26a359d26c9c468c05b1dbde2484a066ceb6" => :sierra + sha256 "d9c9d729eedfc866f0303dddf4ad36e94cf0e5711846724bebdda4b0e1acbf61" => :x86_64_linux end def install diff --git a/Formula/strace.rb b/Formula/strace.rb new file mode 100644 index 0000000000000..80a1c0da680aa --- /dev/null +++ b/Formula/strace.rb @@ -0,0 +1,36 @@ +class Strace < Formula + desc "Diagnostic, instructional, and debugging tool for the Linux kernel" + homepage "https://strace.io/" + url "https://github.com/strace/strace/releases/download/v5.4/strace-5.4.tar.xz" + sha256 "f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741" + + bottle do + cellar :any_skip_relocation + sha256 "2ae590529c1b6b471cdfac864b523d23825ef4ddb41df9d5351ead74bf14500a" => :x86_64_linux + end + + head do + url "https://github.com/strace/strace.git" + depends_on "autoconf" => :build + depends_on "automake" => :build + end + + depends_on :linux + depends_on "linux-headers" + + def install + system "./bootstrap" if build.head? + system "./configure", + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}", + "--enable-mpers=no" # FIX: configure: error: Cannot enable m32 personality support + system "make", "install" + end + + test do + out = `"strace" "true" 2>&1` # strace the true command, redirect stderr to output + assert_match "execve(", out + assert_match "+++ exited with 0 +++", out + end +end diff --git a/Formula/streamlink.rb b/Formula/streamlink.rb index b5909c2227c51..f018609ea5c15 100644 --- a/Formula/streamlink.rb +++ b/Formula/streamlink.rb @@ -11,6 +11,7 @@ class Streamlink < Formula sha256 "541472aab0629e0b2ad66168a962b985c9a09a6c7ac620aa96ac7c7f2119c3a0" => :catalina sha256 "475434dab231841da0a3f99f8d1a78882f46f6fd697e2c651badfa5bce1b64fa" => :mojave sha256 "ad9c580399f80f4c6dc8869680c3a3c589c9c9b0b5831bd4c69014e2c7e42718" => :high_sierra + sha256 "0e8432d65ea80ab1af1b54fcdad962ca3dae50bb29d4c6f61debe5abcaa1b5a3" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/streamripper.rb b/Formula/streamripper.rb index d40c2662e9e96..63547944742df 100644 --- a/Formula/streamripper.rb +++ b/Formula/streamripper.rb @@ -11,6 +11,7 @@ class Streamripper < Formula sha256 "559e6ce06f450c306178c1e361154f134c3478ad1bc35ca70d0d3f000938043d" => :mojave sha256 "9df7827f89ef7f517ccfdb52be976b358ede1ceb2690f8617b4cc52da7c4cf41" => :high_sierra sha256 "2ccd049ca0ce6720055a86b726bfb1388b4e3784b2cd597bc7b26fd1e593a60c" => :sierra + sha256 "22f71b3f01f71134c947a5ae2e95a634fac12b626d222607a560948066708d1a" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/stress-ng.rb b/Formula/stress-ng.rb index ab842f759d054..e84552c201464 100644 --- a/Formula/stress-ng.rb +++ b/Formula/stress-ng.rb @@ -9,12 +9,15 @@ class StressNg < Formula sha256 "a770ad23d8ea44676d36920a511707fc8a2696d978a8911370e1ef04ffdd7c25" => :catalina sha256 "880650bca21eefa4a8e903b9b1fc0ffc3454449ab5927e6993a430e950efafba" => :mojave sha256 "77f19860f13cc93aef0bc28471a402bf491e745b89285d8949eebf07d3498e85" => :high_sierra + sha256 "34c9f6a035401e02f307e126ef4fc8d0a0585baf201821adbdcd315051799ac6" => :x86_64_linux end - depends_on :macos => :sierra - uses_from_macos "zlib" + on_macos do + depends_on :macos => :sierra + end + def install inreplace "Makefile", "/usr", prefix system "make" diff --git a/Formula/stubby.rb b/Formula/stubby.rb index a247e3cbad77a..f66f5abc14557 100644 --- a/Formula/stubby.rb +++ b/Formula/stubby.rb @@ -72,7 +72,7 @@ def plist end sleep 2 - output = shell_output("dig @127.0.0.1 -p 5553 getdnsapi.net") - assert_match "status: NOERROR", output + output = shell_output("dig @127.0.0.1 -p 5553 getdnsapi.net") if OS.mac? + assert_match "status: NOERROR", output if OS.mac? end end diff --git a/Formula/stunnel.rb b/Formula/stunnel.rb index 7b153a1310933..d03b1b9ebdd2f 100644 --- a/Formula/stunnel.rb +++ b/Formula/stunnel.rb @@ -9,6 +9,7 @@ class Stunnel < Formula sha256 "90d65b410dfcabbc5d4b586449ae92b23cbe3f9e087a7075ec66b81807c17b7b" => :catalina sha256 "61d66e0c5c5d411becd8b7d1f9ba913c1a15b9d15ec70e1253ca2e7fbdb0e516" => :mojave sha256 "22548c4f8f3a15ebe6cd79aa2162dc7af8abaacf3e94d32d7cc8afc8f2049318" => :high_sierra + sha256 "f1083f37b4ffbb63c80e6162c585faa69019eea419a8f2caa40706e29e62f9df" => :x86_64_linux end depends_on "openssl@1.1" @@ -79,8 +80,8 @@ def plist (testpath/"tstunnel.conf").write <<~EOS cert = #{etc}/stunnel/stunnel.pem - setuid = nobody - setgid = nobody + setuid = #{ENV["USER"]} + setgid = #{ENV["USER"]} [pop3s] accept = 995 diff --git a/Formula/stuntman.rb b/Formula/stuntman.rb index 3be0d744891d8..d0e67ff99e0b3 100644 --- a/Formula/stuntman.rb +++ b/Formula/stuntman.rb @@ -12,6 +12,7 @@ class Stuntman < Formula sha256 "87375257e1d4c3964587b59ef34a1800e9e9b7e6028a506a22b8cd695f39bf42" => :mojave sha256 "b5541fc2478ed4b97cdc5cf97ddbcbc4d76255b0ba9e834666c548612e9b758d" => :high_sierra sha256 "51f40332e70148118ca22eb7f393c002188e73fb59c82a44c689430f86b2bf7f" => :sierra + sha256 "61829f744b7924f730a735aa65cfb03a77ded3da9e48455714d4db2f70a08083" => :x86_64_linux end depends_on "boost" => :build diff --git a/Formula/subliminal.rb b/Formula/subliminal.rb index a8d392797acf8..89c43ef6093b9 100644 --- a/Formula/subliminal.rb +++ b/Formula/subliminal.rb @@ -12,6 +12,7 @@ class Subliminal < Formula sha256 "acb2c64ce2c6bebcedda7841217ad4e3d2c3f7c0818da57dd6d881236e97f573" => :catalina sha256 "a3bb9afb7a47164726675b04a85b50263f2a771e9b53ae833eccf44c63ad1c02" => :mojave sha256 "a3bb9afb7a47164726675b04a85b50263f2a771e9b53ae833eccf44c63ad1c02" => :high_sierra + sha256 "403ed64de452d00fba62d31d8260e268e9996c9db053244335df2d7c612891e1" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/subnetcalc.rb b/Formula/subnetcalc.rb index 034db35c6bce0..f1104c4040427 100644 --- a/Formula/subnetcalc.rb +++ b/Formula/subnetcalc.rb @@ -6,10 +6,11 @@ class Subnetcalc < Formula head "https://github.com/dreibh/subnetcalc.git" bottle do - cellar :any_skip_relocation + cellar :any sha256 "3292425456f8c87e8d3d468421de889ac20f859e4d00530646c973581ffc4543" => :catalina sha256 "d8537fab1388a387ab985bfdd841b106bccd663fbc0d53062af8cbdcaa9c7d35" => :mojave sha256 "367c6a6f8104ecee70216a06545e2b7e1eb81ffb887b6b4e335cd5acd1d56e67" => :high_sierra + sha256 "4424a4fd2efe7d7555f8f2f2c46e512178346a69c366c63b3da2cde7d6a89ccb" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/subversion.rb b/Formula/subversion.rb index a4f840f4b56f4..558c53117565d 100644 --- a/Formula/subversion.rb +++ b/Formula/subversion.rb @@ -10,6 +10,7 @@ class Subversion < Formula sha256 "430434e1c09f259eb8b6f1537385e3a193f577458e48e105dab4522f0e696493" => :catalina sha256 "da552e48ed24e71c789a5019419a768273e90cd853e94e916ac8652409387350" => :mojave sha256 "b7f55e0fe6bc94010c2587756d2e7208ec680a225c70de344cecb1f0f01f36af" => :high_sierra + sha256 "b1b411d35b11dd23d6aafe443fdb01f83ca822beec5d4840dc77bd83f83dc358" => :x86_64_linux end head do @@ -34,9 +35,12 @@ class Subversion < Formula depends_on "lz4" depends_on "openssl@1.1" # For Serf depends_on "perl" + depends_on "python@3.8" unless OS.mac? depends_on "sqlite" depends_on "utf8proc" + depends_on "libtool" unless OS.mac? + uses_from_macos "expat" uses_from_macos "krb5" uses_from_macos "ruby" @@ -54,7 +58,8 @@ class Subversion < Formula end # Prevent "-arch ppc" from being pulled in from Perl's $Config{ccflags} - patch :DATA + # Prevent linking into a Python Framework + patch :DATA if OS.mac? def install py3c_prefix = buildpath/"py3c" @@ -62,31 +67,43 @@ def install resource("py3c").unpack py3c_prefix resource("serf").stage do - inreplace "SConstruct" do |s| - s.gsub! "print 'Warning: Used unknown variables:', ', '.join(unknown.keys())", - "print('Warning: Used unknown variables:', ', '.join(unknown.keys()))" - s.gsub! "match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'", - "match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'" - s.gsub! "'SERF_MINOR_VERSION ([0-9]+).*'", - "b'SERF_MINOR_VERSION ([0-9]+).*'" - s.gsub! "'SERF_PATCH_VERSION ([0-9]+)'", - "b'SERF_PATCH_VERSION ([0-9]+)'" + unless OS.mac? + inreplace "SConstruct" do |s| + s.gsub! "env.Append(LIBPATH=['$OPENSSL\/lib'])", + "\\1\nenv.Append(CPPPATH=['$ZLIB\/include'])\nenv.Append(LIBPATH=['$ZLIB/lib'])" + end + inreplace "SConstruct" do |s| + s.gsub! "print 'Warning: Used unknown variables:', ', '.join(unknown.keys())", + "print('Warning: Used unknown variables:', ', '.join(unknown.keys()))" + s.gsub! "match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'", + "match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'" + s.gsub! "'SERF_MINOR_VERSION ([0-9]+).*'", + "b'SERF_MINOR_VERSION ([0-9]+).*'" + s.gsub! "'SERF_PATCH_VERSION ([0-9]+)'", + "b'SERF_PATCH_VERSION ([0-9]+)'" + end end # scons ignores our compiler and flags unless explicitly passed args = %W[ - PREFIX=#{serf_prefix} GSSAPI=/usr CC=#{ENV.cc} + PREFIX=#{serf_prefix} GSSAPI=#{Formula["krb5"].opt_prefix} CC=#{ENV.cc} CFLAGS=#{ENV.cflags} LINKFLAGS=#{ENV.ldflags} OPENSSL=#{Formula["openssl@1.1"].opt_prefix} APR=#{Formula["apr"].opt_prefix} APU=#{Formula["apr-util"].opt_prefix} + ZLIB=#{Formula["zlib"].opt_prefix} ] system "scons", *args system "scons", "install" end + # svn can't find libserf-1.so.1 at runtime without this + ENV.append "LDFLAGS", "-Wl,-rpath=#{serf_prefix}/lib" unless OS.mac? + # Use existing system zlib # Use dep-provided other libraries # Don't mess with Apache modules (since we're not sudo) + zlib = OS.mac? ? "#{MacOS.sdk_path_if_needed}/usr" : Formula["zlib"].opt_prefix + ruby = OS.mac? ? "/usr/bin/ruby" : "#{Formula["ruby"].opt_bin}/ruby" args = %W[ --prefix=#{prefix} --disable-debug @@ -101,24 +118,26 @@ def install --with-py3c=#{py3c_prefix} --with-serf=#{serf_prefix} --with-sqlite=#{Formula["sqlite"].opt_prefix} - --with-zlib=#{MacOS.sdk_path_if_needed}/usr + --with-zlib=#{zlib} --without-apache-libexecdir --without-berkeley-db --without-gpg-agent --enable-javahl --without-jikes PYTHON=#{Formula["python@3.8"].opt_bin}/python3 - RUBY=/usr/bin/ruby + RUBY=#{ruby} ] inreplace "Makefile.in", "toolsdir = @bindir@/svn-tools", "toolsdir = @libexecdir@/svn-tools" + # regenerate configure file as we patched `build/ac-macros/swig.m4` system "./autogen.sh" if build.head? system "./configure", *args system "make" - system "make", "install" + # Fix ld: cannot find -lsvn_delta-1 + ENV.deparallelize { system "make", "install" } bash_completion.install "tools/client-side/bash_completion" => "subversion" system "make", "tools" @@ -138,10 +157,12 @@ def install perl_core = Pathname.new(archlib)/"CORE" onoe "'#{perl_core}' does not exist" unless perl_core.exist? - inreplace "Makefile" do |s| - s.change_make_var! "SWIG_PL_INCLUDES", - "$(SWIG_INCLUDES) -arch x86_64 -g -pipe -fno-common " \ - "-DPERL_DARWIN -fno-strict-aliasing -I#{HOMEBREW_PREFIX}/include -I#{perl_core}" + if OS.mac? + inreplace "Makefile" do |s| + s.change_make_var! "SWIG_PL_INCLUDES", + "$(SWIG_INCLUDES) -arch x86_64 -g -pipe -fno-common " \ + "-DPERL_DARWIN -fno-strict-aliasing -I#{HOMEBREW_PREFIX}/include -I#{perl_core}" + end end system "make", "swig-pl" system "make", "install-swig-pl" diff --git a/Formula/suite-sparse.rb b/Formula/suite-sparse.rb index cbd909cc59fe4..143af415f26b7 100644 --- a/Formula/suite-sparse.rb +++ b/Formula/suite-sparse.rb @@ -5,10 +5,10 @@ class SuiteSparse < Formula sha256 "fe3bc7c3bd1efdfa5cffffb5cebf021ff024c83b5daf0ab445429d3d741bd3ad" bottle do - cellar :any sha256 "a58c0cffed5bb4cdb5d4d8b91e2be407d3c0d2ad89bc000281374232c9de0b5d" => :catalina sha256 "c1c8fb4c8acddc05c8bc70c5fa687b7a9b4865922f97ebc91de15bd3e601e322" => :mojave sha256 "083961ebb0a6e06104384e33fd29bdbdec3eed273c9a1353b28308f80cae2f9d" => :high_sierra + sha256 "2b694ae458e8df1c9ab2275c54a1ae664e09c985a7ee2f8eefe2d31f80ff7b09" => :x86_64_linux end depends_on "cmake" => :build @@ -32,7 +32,13 @@ def install "MY_METIS_LIB=-L#{Formula["metis"].opt_lib} -lmetis", "MY_METIS_INC=#{Formula["metis"].opt_include}", ] + system "make", "library", *args + unless OS.mac? + args << "INSTALL_LIB=#{lib}" + args << "INSTALL_INCLUDE=#{include}" + args << "DESTDIR=#{prefix}" + end system "make", "install", *args lib.install Dir["**/*.a"] pkgshare.install "KLU/Demo/klu_simple.c" diff --git a/Formula/sundials.rb b/Formula/sundials.rb index 29765c682b5e8..626e98b7ab750 100644 --- a/Formula/sundials.rb +++ b/Formula/sundials.rb @@ -10,6 +10,7 @@ class Sundials < Formula sha256 "fff1df3841c80eb3c2a6471e53ad2e8f29f97eb1e8498f8e85dc919616c68d0f" => :catalina sha256 "63e63e0f7f928cd656613dc6344aaaaf11acd25e8c3148d3ac9a5b86dfe6c3df" => :mojave sha256 "04f549daeb21124cfa74aeddb7c7baf58f7f482faec96cd4f5bc96f206414896" => :high_sierra + sha256 "097917ed17fecd99b2a9c79d44286ba6da0ac2ddb95a8ad3641c1f6420b2e2bc" => :x86_64_linux end depends_on "cmake" => :build @@ -48,7 +49,8 @@ def install test do cp Dir[pkgshare/"examples/*"], testpath system ENV.cc, "-I#{include}", "test_nvector.c", "sundials_nvector.c", - "test_nvector_serial.c", "-L#{lib}", "-lsundials_nvecserial" + "test_nvector_serial.c", "-L#{lib}", "-lsundials_nvecserial", + ("-lm" unless OS.mac?) assert_match "SUCCESS: NVector module passed all tests", shell_output("./a.out 42 0") end diff --git a/Formula/superlu.rb b/Formula/superlu.rb index 84299c3ee4ba7..74b9cbf79ce23 100644 --- a/Formula/superlu.rb +++ b/Formula/superlu.rb @@ -11,6 +11,7 @@ class Superlu < Formula sha256 "d47a98b1d94b041aa93835c10e024f2e3bb4f6535f1dd5c142343e5cf395e785" => :mojave sha256 "5e02b75c1053a83ae4d07e3450d1cff929b825e2296327cbae038ace4d077e3a" => :high_sierra sha256 "f2038e0b4edb755631cc4f9b42dc362996d8161fa9aad306a412c7e8ff39d9f8" => :sierra + sha256 "78669a46ef9c4d2dbe65dcb743d5dd8fbc846396309748748e43d6b15d0fca18" => :x86_64_linux end depends_on "gcc" diff --git a/Formula/supervisor.rb b/Formula/supervisor.rb index a2b4c0964a988..6e37acc9c3e35 100644 --- a/Formula/supervisor.rb +++ b/Formula/supervisor.rb @@ -11,6 +11,7 @@ class Supervisor < Formula sha256 "2e3d14abf6e8b63001bfe0b128da3853db20bec5e99073eeac7b5e6b63b8bd1e" => :catalina sha256 "2d860cc6e534901d1c9c9d330955aa5b7e3c5e4bb9d460180eca222742545957" => :mojave sha256 "cf5c9fe0c5d1af7d39000624b00b96d5b945da9a79b3273bc245237f477ac105" => :high_sierra + sha256 "7bd3b6269ea96eec8e85474434f365930f385269600df0248aa9c57a76fb6bef" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/surfraw.rb b/Formula/surfraw.rb index a14a831229e55..a71e77ceb0fd0 100644 --- a/Formula/surfraw.rb +++ b/Formula/surfraw.rb @@ -11,6 +11,7 @@ class Surfraw < Formula sha256 "69920395cbde5fdc2492aa27fc765d4dafe910e26d9d3a05777888425310a0a9" => :high_sierra sha256 "69920395cbde5fdc2492aa27fc765d4dafe910e26d9d3a05777888425310a0a9" => :sierra sha256 "69920395cbde5fdc2492aa27fc765d4dafe910e26d9d3a05777888425310a0a9" => :el_capitan + sha256 "48b20736aae201046c9fdd3f0952ee5776be80c7eb0a7b68b3c75b837eca9285" => :x86_64_linux end def install diff --git a/Formula/suricata.rb b/Formula/suricata.rb index 821a5ba19e6d5..b206401c438e6 100644 --- a/Formula/suricata.rb +++ b/Formula/suricata.rb @@ -8,6 +8,7 @@ class Suricata < Formula sha256 "ce6e9acf117b139febc73ae854aa279c1bab29981c107524ee3ff7c1b3c780a8" => :catalina sha256 "033c282b979418b4356b4f208781bcea7fd9100c62e4981a8980b396424aefc9" => :mojave sha256 "6943af9391e189cd28c441645aeec26f48782eaf1c7760c30bdd9ef2e5cf3c7d" => :high_sierra + sha256 "42ff284671816c93afcfea4c5d56a9b1cb568062b6b4055a7814d9cd8dd46aef" => :x86_64_linux end depends_on "pkg-config" => :build @@ -22,6 +23,8 @@ class Suricata < Formula depends_on "pcre" depends_on "python@3.8" + uses_from_macos "libpcap" + resource "argparse" do url "https://files.pythonhosted.org/packages/18/dd/e617cfc3f6210ae183374cd9f6a26b20514bbb5a792af97949c5aacddf0f/argparse-1.4.0.tar.gz" sha256 "62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4" @@ -63,8 +66,12 @@ def install --with-libmagic-libraries=#{libmagic.opt_lib} --with-libnet-includes=#{libnet.opt_include} --with-libnet-libraries=#{libnet.opt_lib} - --enable-ipfw ] + args << "--enable-ipfw" if OS.mac? + unless OS.mac? + args << "--with-libpcap-includes=#{Formula["libpcap"].opt_include}" + args << "--with-libpcap-libraries=#{Formula["libpcap"].opt_lib}" + end system "./configure", *args system "make", "install-full" diff --git a/Formula/svgcleaner.rb b/Formula/svgcleaner.rb index 2547d1a73e9c6..c3dfaacf25efb 100644 --- a/Formula/svgcleaner.rb +++ b/Formula/svgcleaner.rb @@ -11,6 +11,7 @@ class Svgcleaner < Formula sha256 "43533727baf2ed09cdce9fe64357c1bc1f70fed57d70f37cfd824b664ab1266f" => :catalina sha256 "bf18c353316b7a46ed2cecad188a638e359ce77acdcf501f578e5f96149ed667" => :mojave sha256 "7e6df86bb8f994b157ff6de9bb7f43605b813a6a476f6f2d3af4d3483c1b6483" => :high_sierra + sha256 "8357ea0709abd6d2794a1b7430c57e09a080cb28a87e4d4e6f08172d7c3d76bd" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/svgo.rb b/Formula/svgo.rb index 467cb0e55ed55..c8ce81048722b 100644 --- a/Formula/svgo.rb +++ b/Formula/svgo.rb @@ -11,6 +11,7 @@ class Svgo < Formula sha256 "48a66950681297bed8bf89dbcfeab2c34147784bccdd5ac92f5664b73f530457" => :catalina sha256 "631a5e5bf726f9f3a2c53ddfc7fd5061953bf905208972091c77ea7a10e41599" => :mojave sha256 "5fe6407fa998ce2431d435e24bd565332d939b680fb624ddbfd5ad2316799305" => :high_sierra + sha256 "f3f392d5032cf8fa59cc52f1f60b3be043472ba28034f50766b6ac6f070031e6" => :x86_64_linux end depends_on "node" diff --git a/Formula/swi-prolog.rb b/Formula/swi-prolog.rb index c42bdda59c2ec..b02adbc459dd7 100644 --- a/Formula/swi-prolog.rb +++ b/Formula/swi-prolog.rb @@ -29,8 +29,8 @@ def install "-DSWIPL_PACKAGES_JAVA=OFF", "-DSWIPL_PACKAGES_X=OFF", "-DCMAKE_INSTALL_PREFIX=#{libexec}", - "-DCMAKE_C_COMPILER=/usr/bin/clang", - "-DCMAKE_CXX_COMPILER=/usr/bin/clang++" + *("-DCMAKE_C_COMPILER=/usr/bin/clang" if OS.mac?), + *("-DCMAKE_CXX_COMPILER=/usr/bin/clang++" if OS.mac?) system "make", "install" end diff --git a/Formula/swift-protobuf.rb b/Formula/swift-protobuf.rb index 9f4f8ef264e79..8799e01c70f63 100644 --- a/Formula/swift-protobuf.rb +++ b/Formula/swift-protobuf.rb @@ -12,7 +12,7 @@ class SwiftProtobuf < Formula sha256 "45df1e5f49d254d4855302cb0c95b4f326b441266545dd4e4d73de4d73bc0a9b" => :high_sierra end - depends_on :xcode => ["8.3", :build] + depends_on :xcode => ["8.3", :build] if OS.mac? depends_on "protobuf" conflicts_with "protobuf-swift", diff --git a/Formula/swift.rb b/Formula/swift.rb index 979be99872df2..98fa084c6c95c 100644 --- a/Formula/swift.rb +++ b/Formula/swift.rb @@ -16,7 +16,7 @@ class Swift < Formula # Has strict requirements on the minimum version of Xcode # https://github.com/apple/swift#system-requirements - depends_on :xcode => ["11.2", :build] + depends_on :xcode => ["11.2", :build] if OS.mac? uses_from_macos "icu4c" diff --git a/Formula/swiftformat.rb b/Formula/swiftformat.rb index 2aa5d6250115a..c474d301e8ba1 100644 --- a/Formula/swiftformat.rb +++ b/Formula/swiftformat.rb @@ -12,7 +12,8 @@ class Swiftformat < Formula sha256 "28a68db09910540790cfcf63271d1f5ab86c12453cbbde8f25915ce4bfa29930" => :high_sierra end - depends_on :xcode => ["10.1", :build] + depends_on :xcode => ["10.1", :build] if OS.mac? + depends_on :macos def install xcodebuild "-project", diff --git a/Formula/swiftgen.rb b/Formula/swiftgen.rb index f674948ea75eb..b1b683d6ad45c 100644 --- a/Formula/swiftgen.rb +++ b/Formula/swiftgen.rb @@ -13,6 +13,7 @@ class Swiftgen < Formula depends_on "ruby" => :build if MacOS.version <= :sierra depends_on :xcode => ["11.4", :build] + depends_on :macos def install # Disable swiftlint build phase to avoid build errors if versions mismatch diff --git a/Formula/swiftlint.rb b/Formula/swiftlint.rb index 0f15ec0f61267..76f0e24b6b609 100644 --- a/Formula/swiftlint.rb +++ b/Formula/swiftlint.rb @@ -13,6 +13,7 @@ class Swiftlint < Formula end depends_on :xcode => ["10.2", :build] + depends_on :macos depends_on :xcode => "8.0" def install diff --git a/Formula/swiftplate.rb b/Formula/swiftplate.rb index d326363a52786..d7b60a4e77270 100644 --- a/Formula/swiftplate.rb +++ b/Formula/swiftplate.rb @@ -13,7 +13,7 @@ class Swiftplate < Formula sha256 "73c1b35ad98f1d4872bc467b1a027dad41815e336c0c86aebb0d09d9562ddde5" => :el_capitan end - depends_on :xcode => "8.2" + depends_on :xcode => "8.2" if OS.mac? def install xcodebuild "-project", diff --git a/Formula/swig.rb b/Formula/swig.rb index 955b0fa4d1587..51619da211da1 100644 --- a/Formula/swig.rb +++ b/Formula/swig.rb @@ -8,6 +8,7 @@ class Swig < Formula sha256 "530e80b7e7dcd28469b52fc3b668683a97b72642ebf2b6d4e6708d14f05e7286" => :catalina sha256 "50afb5930cb37af2e400f0369f6da15b1d4922c1f72f45d13e7e3f8bd9d6d27b" => :mojave sha256 "8bab440005b048ce454a3dd50ba608e1f85391edd73e9e40510269e923cad238" => :high_sierra + sha256 "39c044d1f12dfc0fd0f6cb02eb4a7a3830f91f252c09fe82fe3c03379f3635d1" => :x86_64_linux end head do @@ -47,9 +48,24 @@ def install puts Test.add(1, 1) EOS system "#{bin}/swig", "-ruby", "test.i" - system ENV.cc, "-c", "test.c" - system ENV.cc, "-c", "test_wrap.c", "-I#{MacOS.sdk_path}/System/Library/Frameworks/Ruby.framework/Headers/" - system ENV.cc, "-bundle", "-undefined", "dynamic_lookup", "test.o", "test_wrap.o", "-o", "test.bundle" - assert_equal "2", shell_output("/usr/bin/ruby run.rb").strip + if OS.mac? + system ENV.cc, "-c", "test.c" + system ENV.cc, "-c", "test_wrap.c", + "-I#{MacOS.sdk_path}/System/Library/Frameworks/Ruby.framework/Headers/" + system ENV.cc, "-bundle", "-undefined", "dynamic_lookup", "test.o", "test_wrap.o", "-o", "test.bundle" + assert_equal "2", shell_output("/usr/bin/ruby run.rb").strip + else + include_dir1 = "#{Formula["ruby"].opt_include}/ruby-2.7.0" + include_dir2 = "#{Formula["ruby"].opt_include}/ruby-2.7.0/x86_64-linux/" + args = Utils.safe_popen_read( + Formula["ruby"].opt_bin/"ruby", "-e", "'puts RbConfig::CONFIG[\"LIBRUBYARG\"]'" + ).chomp + system ENV.cc, "-c", "-fPIC", "test.c" + system ENV.cc, "-c", "-fPIC", "test_wrap.c", + "-I#{include_dir1}", "-I#{include_dir2}" + system ENV.cc, "-shared", "test.o", "test_wrap.o", "-o", "test.so", + *args.delete("'").split + assert_equal "2", shell_output("ruby run.rb").strip + end end end diff --git a/Formula/swig@3.rb b/Formula/swig@3.rb index 9c7edc6f8bc65..d04d5e58a506c 100644 --- a/Formula/swig@3.rb +++ b/Formula/swig@3.rb @@ -42,9 +42,20 @@ def install puts Test.add(1, 1) EOS system "#{bin}/swig", "-ruby", "test.i" - system ENV.cc, "-c", "test.c" - system ENV.cc, "-c", "test_wrap.c", "-I#{MacOS.sdk_path}/System/Library/Frameworks/Ruby.framework/Headers/" - system ENV.cc, "-bundle", "-undefined", "dynamic_lookup", "test.o", "test_wrap.o", "-o", "test.bundle" - assert_equal "2", shell_output("/usr/bin/ruby run.rb").strip + if OS.mac? + system ENV.cc, "-c", "test.c" + system ENV.cc, "-c", "test_wrap.c", + "-I#{MacOS.sdk_path}/System/Library/Frameworks/Ruby.framework/Headers/" + system ENV.cc, "-bundle", "-undefined", "dynamic_lookup", "test.o", + "test_wrap.o", "-o", "test.bundle" + assert_equal "2", shell_output("/usr/bin/ruby run.rb").strip + else + system ENV.cc, "-c", "-fPIC", "test.c" + system ENV.cc, "-c", "-fPIC", "test_wrap.c", + "-I#{RbConfig::CONFIG["rubyhdrdir"]}", "-I#{RbConfig::CONFIG["rubyarchhdrdir"]}" + system ENV.cc, "-shared", "test.o", "test_wrap.o", "-o", "test.so", + *RbConfig::CONFIG["LIBRUBYARG"].delete("'").split + assert_equal "2", shell_output("ruby run.rb").strip + end end end diff --git a/Formula/swimat.rb b/Formula/swimat.rb index 14f4dc9d0c4dd..1cad7a995528a 100644 --- a/Formula/swimat.rb +++ b/Formula/swimat.rb @@ -11,7 +11,8 @@ class Swimat < Formula sha256 "197ba3d1db2bfbee29a10e4735925b4fdac3035c486b7899bc564cea5f019839" => :mojave end - depends_on :xcode => ["10.2", :build] + depends_on :xcode => ["10.2", :build] if OS.mac? + depends_on :macos def install xcodebuild "-target", "CLI", diff --git a/Formula/switchaudio-osx.rb b/Formula/switchaudio-osx.rb index f933d74043e2d..8f74246042e7e 100644 --- a/Formula/switchaudio-osx.rb +++ b/Formula/switchaudio-osx.rb @@ -15,7 +15,8 @@ class SwitchaudioOsx < Formula sha256 "515b762164648d739ae36f8c5013d250d84af1264bf3ee366ed35adae2f44208" => :el_capitan end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? + depends_on :macos def install xcodebuild "-project", "AudioSwitcher.xcodeproj", diff --git a/Formula/sword.rb b/Formula/sword.rb index d8931e13b9a93..7f77bb2ded349 100644 --- a/Formula/sword.rb +++ b/Formula/sword.rb @@ -10,6 +10,7 @@ class Sword < Formula sha256 "3279c77477c21d1636f573202df976bd37fbaca39ed7e3b310158dad4e961641" => :high_sierra sha256 "794afe687eb7933fd3aeaee7e480224295614fc0138b8d89b7d9b81be55239a1" => :sierra sha256 "032c83b3302b78c198d1e346258a1d09c542a1361e1b0f000f82306d8c82acb4" => :el_capitan + sha256 "daa1f0360c2a9b72ecdba5ca9574bfe9688f4c852d1313456502a2538b93b1e7" => :x86_64_linux end def install diff --git a/Formula/sylpheed.rb b/Formula/sylpheed.rb index 9ad80c01ecc1b..a124756172a00 100644 --- a/Formula/sylpheed.rb +++ b/Formula/sylpheed.rb @@ -11,6 +11,7 @@ class Sylpheed < Formula sha256 "744efdd95f6dc3152ab39da781d5cc9ef81a5caa7310097b00a903e1e595e188" => :mojave sha256 "0ec10e9ba748c3ce1bbb2502b8f9736fcdd1c72d492fdf4c58e2e3c0f6442f4b" => :high_sierra sha256 "df7c4f2ede961688c72b588cb4e08702603caf19ad08d2c00721e95c9a503716" => :sierra + sha256 "3a1c2c21503f8e11b8f1cea52e5ce39e1aa627806edc1c10d8dea6aa9b5c78fd" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/syncthing.rb b/Formula/syncthing.rb index 7fd7dbc320a46..c97709e714d04 100644 --- a/Formula/syncthing.rb +++ b/Formula/syncthing.rb @@ -11,6 +11,7 @@ class Syncthing < Formula sha256 "7dfe7cead65065aec937e634e1719d8230bd95adeb27340e4562ee7bdfafb8a7" => :catalina sha256 "bbafe13bf10ffe211df232bfcaec2ff25ac0a5ebeccdd7f039ce5270eb15b050" => :mojave sha256 "1f0d2a288d4aabddbb9016afb28c5cc763d0247d83cadbfaa2b8b0435526284f" => :high_sierra + sha256 "4909e7a9a0399ce5ae34e73c9dccc9e0d64182a71516b465343170b646845960" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/synscan.rb b/Formula/synscan.rb index 5c3bd6fa26aa6..b28c5d30777d9 100644 --- a/Formula/synscan.rb +++ b/Formula/synscan.rb @@ -10,6 +10,7 @@ class Synscan < Formula sha256 "0e99e8f964f270377bd7dc6c0ecfae64682f3b2831776d7723f200c159623ac6" => :catalina sha256 "aba139d4f46b1248a796f26dccb6399fd6f6eadd94b7777f5218d3a0599f0bad" => :mojave sha256 "4364e517dd2b231cd711be4ccebdfe802e1ef6f7cacfaff46e987790c90c21f8" => :high_sierra + sha256 "5cb2509711aa818da6301f8af04e2902b3a42ebc7a60951daaae72d98b952456" => :x86_64_linux end depends_on "libpcap" @@ -21,7 +22,7 @@ def install ENV.append "LIBS", "-L#{Formula["libpcap"].opt_lib} -lpcap" system "./configure", "--prefix=#{prefix}", "--with-libpcap=yes" - system "make", "macos" + system "make", OS.mac? ? "macos" : "linux" system "make", "install" end diff --git a/Formula/syntaxerl.rb b/Formula/syntaxerl.rb index ab4443b53e8c5..5864dfc7a7bb8 100644 --- a/Formula/syntaxerl.rb +++ b/Formula/syntaxerl.rb @@ -12,6 +12,7 @@ class Syntaxerl < Formula sha256 "0e0ac8402dd61720eeca50047b173f7500dc38bd7cceb37915c4425b7492044e" => :sierra sha256 "648f30c4fb2db062f4c9f27d3c73cf679181e7183a5b7b83b5670624d88b27d5" => :el_capitan sha256 "80ea1737253a2115722350d6a6456ba48ae853674bb91f7a8b685e7b8311eb74" => :yosemite + sha256 "836a9b40a7a8ec9cb533091e78a154e1efc85d98591fa64cd16832acbdee1042" => :x86_64_linux end depends_on "erlang" diff --git a/Formula/sysbench.rb b/Formula/sysbench.rb index fbf0fc5ed367c..cde1703e0513f 100644 --- a/Formula/sysbench.rb +++ b/Formula/sysbench.rb @@ -9,6 +9,7 @@ class Sysbench < Formula sha256 "2ca0e854823e63ecf84b27d81d0ea722aeae784fed39b436fed738fcd4450489" => :catalina sha256 "ec55acf85be8a3cfbd57a72f1d67aad2104e545ec32464010d673c205075c809" => :mojave sha256 "84363a4b7267f936a6e168fb4ed30fa21970ff1483bb81a5fba2bbe25d611cfc" => :high_sierra + sha256 "2d342f5909a7f4f29e3743044187205154d02d1549ee0c6d04e7cdf33b8b8e70" => :x86_64_linux end depends_on "autoconf" => :build @@ -17,6 +18,7 @@ class Sysbench < Formula depends_on "pkg-config" => :build depends_on "mysql-client" depends_on "openssl@1.1" + uses_from_macos "vim" # needed for xxd def install system "./autogen.sh" diff --git a/Formula/sysdig.rb b/Formula/sysdig.rb index 2ebcc348e7610..2ff4a2bd64c8e 100644 --- a/Formula/sysdig.rb +++ b/Formula/sysdig.rb @@ -9,12 +9,21 @@ class Sysdig < Formula sha256 "c3b1b55e16c9e7d143138c0b824872f000e92a9323c43683877da83c0eeeeda0" => :catalina sha256 "de3c1cedda2cdc14ba06892f556161c25f023975ff4a9b8a38ad47a13bcdc13d" => :mojave sha256 "41b0016def49ba75c9d48dcc4d017fe684aedb79e2a35132952cee85ec1c0b33" => :high_sierra + sha256 "2e4711f7a46f39275d8563ebcff4207a5d3e9ee2893f3e63e2a1f309d8a285b1" => :x86_64_linux end depends_on "cmake" => :build depends_on "jsoncpp" depends_on "luajit" depends_on "tbb" + unless OS.mac? + depends_on "c-ares" + depends_on "curl" + depends_on "elfutils" + depends_on "grpc" + depends_on "jq" + depends_on "protobuf" + end # More info on https://gist.github.com/juniorz/9986999 resource "sample_file" do @@ -27,6 +36,8 @@ def install system "cmake", "..", "-DSYSDIG_VERSION=#{version}", "-DUSE_BUNDLED_DEPS=OFF", "-DCREATE_TEST_TARGETS=OFF", + ("-DUSE_BUNDLED_B64=ON" unless OS.mac?), + ("-DBUILD_DRIVER=OFF" unless OS.mac?), *std_cmake_args system "make" system "make", "install" diff --git a/Formula/sysstat.rb b/Formula/sysstat.rb new file mode 100644 index 0000000000000..1edb935c7717d --- /dev/null +++ b/Formula/sysstat.rb @@ -0,0 +1,26 @@ +class Sysstat < Formula + desc "Performance monitoring tools for Linux" + homepage "https://github.com/sysstat/sysstat" + url "https://github.com/sysstat/sysstat/archive/v12.2.0.tar.gz" + sha256 "614ab9fe8e7937a3edb7b2b6760792a3764ea3a7310ac540292dd0e3dfac86a6" + head "https://github.com/sysstat/sysstat.git" + + bottle do + sha256 "8748787763eb4a6601ef3ba439c9d33ddec179328afaf042e4369cbba8a5d39d" => :x86_64_linux + end + + depends_on :linux + + def install + system "./configure", + "--disable-file-attr", # Fix install: cannot change ownership + "--prefix=#{prefix}", + "conf_dir=#{etc}/sysconfig", + "sa_dir=#{var}/log/sa" + system "make", "install" + end + + test do + system "#{bin}/sar", "-V" + end +end diff --git a/Formula/systemc.rb b/Formula/systemc.rb index 21f4fcc9b02a8..555cb1c33a464 100644 --- a/Formula/systemc.rb +++ b/Formula/systemc.rb @@ -11,6 +11,7 @@ class Systemc < Formula sha256 "7d189564e4277390f8fa0c2e067f17dc31148e33af65c0998b6242405f761a18" => :high_sierra sha256 "257ab0155a4e4f5d6dea22696f265d1a523efa24627487a5fad4ad70d43e7fd0" => :sierra sha256 "8dbfcaef7cbca7116bacb300288520ed357768c148a612de2f9a3483266add87" => :el_capitan + sha256 "b7625cf642ee677ba097b904d5aa98c372caf53e1c31f95e558abd7aed8d8642" => :x86_64_linux end def install diff --git a/Formula/systemd.rb b/Formula/systemd.rb new file mode 100644 index 0000000000000..80ade7e5d560b --- /dev/null +++ b/Formula/systemd.rb @@ -0,0 +1,68 @@ +class Systemd < Formula + desc "System and service manager" + homepage "https://wiki.freedesktop.org/www/Software/systemd/" + url "https://github.com/systemd/systemd/archive/v244.tar.gz" + sha256 "2207ceece44108a04bdd5459aa74413d765a829848109da6f5f836c25aa393aa" + revision 3 + head "https://github.com/systemd/systemd.git" + + bottle do + sha256 "ae26fdbe001f77a7b3c5f764bd7ad1571073ab5b0ba6743596e2438d92348f57" => :x86_64_linux + end + + depends_on "coreutils" => :build + depends_on "docbook-xsl" => :build + depends_on "gettext" => :build + depends_on "gperf" => :build + depends_on "intltool" => :build + depends_on "libgpg-error" => :build + depends_on "libtool" => :build + depends_on "meson" => :build + depends_on "ninja" => :build + depends_on "pkg-config" => :build + depends_on "libcap" + depends_on :linux + depends_on "lz4" + depends_on "openssl@1.1" + depends_on "util-linux" # for libmount + depends_on "xz" + + uses_from_macos "libxslt" => :build + uses_from_macos "m4" => :build + uses_from_macos "expat" + + def install + Language::Python.rewrite_python_shebang(Formula["python@3.8"].opt_bin/"python3") + + ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5" + + # Needed by intltool (xml::parser) + ENV.prepend_path "PERL5LIB", "#{Formula["intltool"].libexec}/lib/perl5" + + # Fix compilation error: file ./man/custom-html.xsl line 24 element import + ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" + + args = %W[ + --prefix=#{prefix} + --sysconfdir=#{etc} + --localstatedir=#{var} + -Drootprefix=#{prefix} + -Dsysvinit-path=#{prefix}/etc/init.d + -Dsysvrcnd-path=#{prefix}/etc/rc.d + -Dpamconfdir=#{prefix}/etc/pam.d + -Dcreate-log-dirs=false + -Dhwdb=false + -Dlz4=true + ] + + mkdir "build" do + system "meson", *args, ".." + system "ninja", "-v" + system "ninja", "install", "-v" + end + end + + test do + system "#{bin}/systemd-path" + end +end diff --git a/Formula/szip.rb b/Formula/szip.rb index 513e85b174ee6..6e0c08b5af334 100644 --- a/Formula/szip.rb +++ b/Formula/szip.rb @@ -12,6 +12,7 @@ class Szip < Formula sha256 "3b84fc3869965a5851cd13554ab46283a13adfa568ca7df1288728b2cfde0c4a" => :high_sierra sha256 "c57296964a6ac43991c5f3a6b0b14e3deb99e14f3d1214427385dc4112e803af" => :sierra sha256 "a4b1f903019aaa2e1d53e661aaf90f0e91937b3ad4b71126483feffb4c2d2e13" => :el_capitan + sha256 "607f95722c26f88e12ca47db91b334cd2b8447c2710c4452dca8fbdce2081c98" => :x86_64_linux end def install diff --git a/Formula/t1lib.rb b/Formula/t1lib.rb index 3e517270cf458..6389fed54ff9b 100644 --- a/Formula/t1lib.rb +++ b/Formula/t1lib.rb @@ -14,6 +14,7 @@ class T1lib < Formula sha256 "fa356a5405f5b0cf57c15ebd5b680c215e1e498189914e9b9663eb132655a8c1" => :el_capitan sha256 "6d1bf242eb7a5201180b9d4b505a7f83663802383d358180cea696714ae57fc8" => :yosemite sha256 "ec107b30d4b9a95bbc094a7a944cab862ed78a875c5ed0002aa7232ec514e9d7" => :mavericks + sha256 "a6946d44932900ae0218f48f9f56c3353f66b11ce1b947c2d832f55f0d5964de" => :x86_64_linux end def install diff --git a/Formula/t1utils.rb b/Formula/t1utils.rb index cc31658ab3080..dedd5c080e679 100644 --- a/Formula/t1utils.rb +++ b/Formula/t1utils.rb @@ -12,6 +12,7 @@ class T1utils < Formula sha256 "40e108fcb6088b1c4d1fc1061de851efe3fb826d7353c21d8862216ef8857cd2" => :sierra sha256 "fc81594a73833517058d954a208275328ac7e90867ca6b3ca8d4a4553aa34be4" => :el_capitan sha256 "0983d0a649572d241ba27ae239888f56c3fe108bf00e2ca9faffd2306a44988f" => :yosemite + sha256 "c8585753f1fb8e7b1e289d9f1b8727d1258142b456d9139145fea8964572d3a6" => :x86_64_linux # glibc 2.19 end head do diff --git a/Formula/ta-lib.rb b/Formula/ta-lib.rb index 05aa535601e88..9c0033e7a322a 100644 --- a/Formula/ta-lib.rb +++ b/Formula/ta-lib.rb @@ -14,6 +14,7 @@ class TaLib < Formula sha256 "3b5927cdb5f69cdc57d8ecbdf5b6fc95a5b6aad7c626c79d1893f2d824030e65" => :el_capitan sha256 "bb40b6d09be26ee497aae27abea5808730af29e6387fa347996eae49c32c448d" => :yosemite sha256 "da1457eb5a09c71f90da185b954aff3d399e61a20ff78ad0bd9d177ad11ad1b7" => :mavericks + sha256 "a0e63e983fc33d3873ffffe62ad90ddd2be2305ba87317aae3887f4eb2d142de" => :x86_64_linux end def install diff --git a/Formula/taglib.rb b/Formula/taglib.rb index 992c663659f83..f5a750f04f7d5 100644 --- a/Formula/taglib.rb +++ b/Formula/taglib.rb @@ -13,6 +13,7 @@ class Taglib < Formula sha256 "a0a374439cbf94a6fb57d791abf0bc6fb974eef1cf21f66c2731d1fc83d2428d" => :sierra sha256 "edaf79d2a2ec72ae32d9b46621697626a27299226a6b4d963431da8c37d3af52" => :el_capitan sha256 "bfda081fd34cb47bcdfd41e814612dbdf330166e30e69867cf43fcac60e5ed1a" => :yosemite + sha256 "21e6f4544e28589b0a503990ddf167f8dc6e8b69728a1906a076e2f6be3475eb" => :x86_64_linux # glibc 2.19 end depends_on "cmake" => :build diff --git a/Formula/taktuk.rb b/Formula/taktuk.rb index 2f933a1fdfc3b..c59a7ef1a3adc 100644 --- a/Formula/taktuk.rb +++ b/Formula/taktuk.rb @@ -11,6 +11,7 @@ class Taktuk < Formula sha256 "9cc466f8a75eea1974143fedecd42547eb14401d772e527776f387aec4832f77" => :high_sierra sha256 "0ffc0bb09703bbf32afbcd302850803f94ecbb311eaa77353275e7dcb1549f62" => :sierra sha256 "4a731d243e6915729240deb75dc99cfee513bb7d0f69169981623b14ce6601c1" => :el_capitan + sha256 "209fb6acfe7019c707a7f7e1779c3bfb4cdd0de237145e35970e938e8e88de4a" => :x86_64_linux end def install diff --git a/Formula/tal.rb b/Formula/tal.rb index 82410be68e3b7..4bf51df30497c 100644 --- a/Formula/tal.rb +++ b/Formula/tal.rb @@ -15,6 +15,7 @@ class Tal < Formula sha256 "bbdef6b2c92650352b7199cc2a9e3bc4698bf2a14fce46397eebcee72c1de419" => :el_capitan sha256 "e6b6f315bc14f5e001893371d18fb0ba88bea4c4d76dd657820eecf509103f9e" => :yosemite sha256 "26945b8471e2731ce34604a19f8bdb046770d961422969999a789168aa7ee25b" => :mavericks + sha256 "bed18e6050393e8b1ac1f29e6740d732dbd97db7c42631f661f88a28d0d05b16" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/talloc.rb b/Formula/talloc.rb index 8f0d94442ab47..5960272463dbd 100644 --- a/Formula/talloc.rb +++ b/Formula/talloc.rb @@ -10,6 +10,7 @@ class Talloc < Formula sha256 "82822d910206a4ad8e90bfc61b04c0fb6c744bf76e9bf0aa06e35ecc08b34ae4" => :catalina sha256 "8ee812d0bf59bb34fd25b0c294c642e921b1af65f8d94e649e1d824e7b5dbb03" => :mojave sha256 "91ece067e0ac677d93fa1bdfa3e7db825e2950dd1feae0ee031d8e2522260155" => :high_sierra + sha256 "3efdc0acfd0497501508220d948cd2a9a35393adc59b89123ab81020fdf3edc0" => :x86_64_linux end depends_on "python@3.8" => :build @@ -39,7 +40,7 @@ def install return ret; } EOS - system ENV.cc, "-I#{include}", "-L#{lib}", "-ltalloc", "test.c", "-o", "test" + system ENV.cc, "-I#{include}", "-L#{lib}", "test.c", "-o", "test", "-ltalloc" system testpath/"test" end end diff --git a/Formula/tanka.rb b/Formula/tanka.rb index 59a673168ecde..21f93e3968298 100644 --- a/Formula/tanka.rb +++ b/Formula/tanka.rb @@ -11,6 +11,7 @@ class Tanka < Formula sha256 "a54f8f418c6ecdfe47395565087a4cd178e6e1a88e211c9af09ac65088e24125" => :catalina sha256 "e6dea5997e1f3d171eb3ab3dfe3ece611ac47a89b94e46aa679e1ed407a3d475" => :mojave sha256 "c540615f2c51aa62fd70c6b0ca31686c2b24216c5873c0e93520ef349296f8db" => :high_sierra + sha256 "92d38c71cb23f6c52829b3059da5d72ac148b6968864c4e5b5848676c04ca8fb" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/task-spooler.rb b/Formula/task-spooler.rb index 1d5f9d86ffab1..d96e249c958f8 100644 --- a/Formula/task-spooler.rb +++ b/Formula/task-spooler.rb @@ -11,6 +11,7 @@ class TaskSpooler < Formula sha256 "8045397e275ade52621a1ab3a21e3eddf277fafd1beea60db2d10bc15d11b8f2" => :high_sierra sha256 "e0f7e33946d3f8c93782692b3bab5833cb2e882f1fb47a4473b69e39ce3e7378" => :sierra sha256 "9403d0c240bad09d576288d6b5ed94057dad03ceb30a4893a935c13f9e58af7f" => :el_capitan + sha256 "ecb5d5c109434f54192d7e02a3d51651571694159b83a21053214d6c827fa786" => :x86_64_linux end conflicts_with "moreutils", :because => "both install a `ts` executable." diff --git a/Formula/task.rb b/Formula/task.rb index a21913e56ba3d..1b2e70a939235 100644 --- a/Formula/task.rb +++ b/Formula/task.rb @@ -13,10 +13,16 @@ class Task < Formula sha256 "07aa2c19ae6d7a9a46b286bfc48fa970aa9a9e0237e034bbaab354dcfc4f6848" => :el_capitan sha256 "113fc7ce057c51ea14021006a4106c25d29e361e4b70113e33fb7a83e57ee8d1" => :yosemite sha256 "7888e42210edb6691ff57d056585536abd318d62b43a898bb98e286373519164" => :mavericks + sha256 "8ef84bc6520fe829996effd80d992c4ea192fa5199e29603a0a4ca35ad2d1b1c" => :x86_64_linux end depends_on "cmake" => :build depends_on "gnutls" + unless OS.mac? + depends_on "util-linux" # for libuuid + depends_on "linux-headers" + depends_on "readline" + end on_linux do depends_on "util-linux" diff --git a/Formula/taskell.rb b/Formula/taskell.rb index 3f458699cda2e..5bf2215bb2ec5 100644 --- a/Formula/taskell.rb +++ b/Formula/taskell.rb @@ -13,6 +13,7 @@ class Taskell < Formula sha256 "d5200196154ab64b1a13f30db9817404fb77f79711ff89baa9ce85847d445dcb" => :catalina sha256 "70b0634eb2c510398866d27ff49256055a0ec68ba26945e53991ba460970b862" => :mojave sha256 "ea408b6153f32196363a71c920c240b95d2fbc8d86de3c88e9d22afd645972e7" => :high_sierra + sha256 "d53fd7bdbe20fc40b7a4371f9e9547afe2d5bf4fec45432db4f3393ed270905e" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/tasksh.rb b/Formula/tasksh.rb index e4ad723c73cdc..c965456057f20 100644 --- a/Formula/tasksh.rb +++ b/Formula/tasksh.rb @@ -4,6 +4,7 @@ class Tasksh < Formula url "https://taskwarrior.org/download/tasksh-1.2.0.tar.gz" sha256 "6e42f949bfd7fbdde4870af0e7b923114cc96c4344f82d9d924e984629e21ffd" head "https://github.com/GothenburgBitFactory/taskshell.git", :branch => "1.3.0" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -12,6 +13,7 @@ class Tasksh < Formula sha256 "17f99be8d0aea4c43877fbfb121b7989047f04650ccffa85e948859e8ee51e0b" => :high_sierra sha256 "fd1b333c777401c53d5ddc8aaf52150a2a15fea4230a91d457d9d99ce2819ee7" => :sierra sha256 "d695adcf10582123053612d98ed4bf988b22c50919598bf167bc2e62db142352" => :el_capitan + sha256 "9d52363618677613a79ecfc035b32590d12c218d36ab50262e327e1bd2f8a4d8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/tass64.rb b/Formula/tass64.rb index 967306981c827..7c4926e75e7a8 100644 --- a/Formula/tass64.rb +++ b/Formula/tass64.rb @@ -9,6 +9,7 @@ class Tass64 < Formula sha256 "afefda676ae81f3340850d132e17fa408505d79da25fd50c42c3042ca3b4f7f2" => :catalina sha256 "4a1a224e806b0f9827ffe1f4e5e8ce792e616e6b2e829c278fad5c8a5ee958af" => :mojave sha256 "1aa51c3d25cf651f7d4725d89a022ab2510963684dc3b3ebe4845b488b3bb5d7" => :high_sierra + sha256 "9e17d9d9b9708340f0a3852c3cc9cc2852c5603c4f494f7ce30e875553be01a7" => :x86_64_linux end def install diff --git a/Formula/tbb.rb b/Formula/tbb.rb index b629e206b6b88..42e8ed0a4473f 100644 --- a/Formula/tbb.rb +++ b/Formula/tbb.rb @@ -11,6 +11,7 @@ class Tbb < Formula sha256 "d601aa195a3baf397390550894de8d39e6602a082154fa5facdfcbe64e3abffc" => :catalina sha256 "2e1004341c9ea81972212ce180a258bc162528b6eac46e67c8bc03538c3cfe40" => :mojave sha256 "e1efb8aec2b87e2facdb824971718d6fa531caa5043b10e811dc86a6c5e1e797" => :high_sierra + sha256 "0fc77ed241a54a80f9034ae5c581d17f5cc6071f4852406c21f0cd6dac3507fa" => :x86_64_linux end depends_on "cmake" => :build @@ -19,8 +20,17 @@ class Tbb < Formula def install compiler = (ENV.compiler == :clang) ? "clang" : "gcc" - system "make", "tbb_build_prefix=BUILDPREFIX", "compiler=#{compiler}" - lib.install Dir["build/BUILDPREFIX_release/*.dylib"] + args = %W[tbb_build_prefix=BUILDPREFIX compiler=#{compiler}] + + # Fix /usr/bin/ld: cannot find -lirml by building rml + system "make", "rml", *args unless OS.mac? + + system "make", *args + if OS.mac? + lib.install Dir["build/BUILDPREFIX_release/*.dylib"] + else + lib.install Dir["build/BUILDPREFIX_release/*.so*"] + end # Build and install static libraries system "make", "tbb_build_prefix=BUILDPREFIX", "compiler=#{compiler}", diff --git a/Formula/tccutil.rb b/Formula/tccutil.rb index 9037fce4f6bd1..e5b4b62ed4f70 100644 --- a/Formula/tccutil.rb +++ b/Formula/tccutil.rb @@ -7,6 +7,8 @@ class Tccutil < Formula bottle :unneeded + depends_on :macos + def install bin.install "tccutil.py" => "tccutil" end diff --git a/Formula/tcl-tk.rb b/Formula/tcl-tk.rb index 469cff3d37c09..fbff38860a97c 100644 --- a/Formula/tcl-tk.rb +++ b/Formula/tcl-tk.rb @@ -4,17 +4,23 @@ class TclTk < Formula url "https://downloads.sourceforge.net/project/tcl/Tcl/8.6.10/tcl8.6.10-src.tar.gz" mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/tcl/tcl8.6.10-src.tar.gz" sha256 "5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed" + revision 1 unless OS.mac? bottle do rebuild 1 sha256 "4740b30b97f0308ecc59c1308945c38ddca5d3da528d779f38199a2dad905fa1" => :catalina sha256 "1851fee12a3ee44648845d8663a192712ce6827ef8fe167301d2638ac9ddb96c" => :mojave sha256 "d1d689cc3e9cf08b2a42d487db3c4142e7ee4ff322bef22d6187fc67a5b776b7" => :high_sierra + sha256 "0de2a7527b765b2cc4de33d8c9ee8676b33116bbda67eeb40bbcfce9d96e35c1" => :x86_64_linux end keg_only :provided_by_macos depends_on "openssl@1.1" + unless OS.mac? + depends_on "linuxbrew/xorg/xorg" + depends_on "pkg-config" => :build + end on_linux do depends_on "pkg-config" => :build @@ -67,7 +73,7 @@ def install resource("tk").stage do cd "unix" do - system "./configure", *args, "--enable-aqua=yes", + system "./configure", *args, *("--enable-aqua=yes" if OS.mac?), "--without-x", "--with-tcl=#{lib}" system "make" system "make", "install" @@ -83,10 +89,10 @@ def install resource("tcllib").stage do system "./configure", "--prefix=#{prefix}", "--mandir=#{man}" system "make", "install" - ENV["SDKROOT"] = MacOS.sdk_path + ENV["SDKROOT"] = MacOS.sdk_path if OS.mac? system "make", "critcl" cp_r "modules/tcllibc", "#{lib}/" - ln_s "#{lib}/tcllibc/macosx-x86_64-clang", "#{lib}/tcllibc/macosx-x86_64" + ln_s "#{lib}/tcllibc/macosx-x86_64-clang", "#{lib}/tcllibc/macosx-x86_64" if OS.mac? end resource("tcltls").stage do @@ -110,11 +116,17 @@ def install system "make" system "make", "install" end + + # Conflicts with perl + mv man/"man3/Thread.3", man/"man3/ThreadTclTk.3" unless OS.mac? end test do assert_equal "honk", pipe_output("#{bin}/tclsh", "puts honk\n").chomp + # Fails with: no display name and no $DISPLAY environment variable + return if ENV["CI"] + test_itk = <<~EOS # Check that Itcl and Itk load, and that we can define, instantiate, # and query the properties of a widget. diff --git a/Formula/tclap.rb b/Formula/tclap.rb index 8e61e990357ac..b9a94b0ee1cf3 100644 --- a/Formula/tclap.rb +++ b/Formula/tclap.rb @@ -11,6 +11,7 @@ class Tclap < Formula sha256 "8e85cfa71594680dc52d5ff18d93cf585fc5990c28316f0b60f42584ff3a2697" => :high_sierra sha256 "8e85cfa71594680dc52d5ff18d93cf585fc5990c28316f0b60f42584ff3a2697" => :sierra sha256 "8e85cfa71594680dc52d5ff18d93cf585fc5990c28316f0b60f42584ff3a2697" => :el_capitan + sha256 "07dcfd5a5be305cdf6b1d773dadd6b0ba1bf59b784964518fd03989262f6eb1e" => :x86_64_linux end def install diff --git a/Formula/tcpdump.rb b/Formula/tcpdump.rb index f2b8a458893da..36bff24bda985 100644 --- a/Formula/tcpdump.rb +++ b/Formula/tcpdump.rb @@ -10,6 +10,7 @@ class Tcpdump < Formula sha256 "d4a3781175e0ce1d1a1048a3e211b8775dcec91e362fb51b3384e7404be3b4b6" => :catalina sha256 "6cd2cafe6229e2ccb97ba0b636e19a89c9e2f0ec85778910ed55498a30c03eb3" => :mojave sha256 "22f03cae37a35d6369292efd2c661f781df8dc21184046e768e13c148dbb3f19" => :high_sierra + sha256 "019a0224c29a377ee82ad9985496f4aa2a8851ef13f25b0caea0c3d9189d39c7" => :x86_64_linux end depends_on "libpcap" diff --git a/Formula/tcptunnel.rb b/Formula/tcptunnel.rb index b4a6dccf37a2a..100f58229abd2 100644 --- a/Formula/tcptunnel.rb +++ b/Formula/tcptunnel.rb @@ -13,6 +13,7 @@ class Tcptunnel < Formula sha256 "e387a861c4a9ceb3014883c851cdc43a56eddba635e1d313d976095ff78bb686" => :el_capitan sha256 "513995a3f0a331a06ac6531ddad6e1812a9c32add2252852c81d8abe6714c5aa" => :yosemite sha256 "d8b4b1fc5969c71bdf24c0793df0d0bcf77475ffd6eeb12a74304d2c6e1c3b1c" => :mavericks + sha256 "fe1ce98768c8cd3c3d13547a0afd901efa937b86ece7a2791142e04b1f1d9c51" => :x86_64_linux end def install diff --git a/Formula/tcsh.rb b/Formula/tcsh.rb index cd30c003cc037..15d9e05f6ae00 100644 --- a/Formula/tcsh.rb +++ b/Formula/tcsh.rb @@ -10,6 +10,7 @@ class Tcsh < Formula sha256 "d885eaa1411e8fc46cb39e4a11254d37c8dc90aded6684631bfc312d7115c9fa" => :catalina sha256 "a070c8c6b4f2ce38be5a84109d307078545911f2a731b0e5e140856a6711bce4" => :mojave sha256 "2f81edc8ce902ce12e722003aec60d62d21ca7be7a944b3b2f571b9e9d7d1282" => :high_sierra + sha256 "d86b9778f37ae249a2e892818a4c01b80a6bdcd07d43fcea41b687d199c235a7" => :x86_64_linux end uses_from_macos "ncurses" @@ -17,6 +18,7 @@ class Tcsh < Formula def install system "./configure", "--prefix=#{prefix}", "--sysconfdir=#{etc}" system "make", "install" + bin.install_symlink "tcsh" => "csh" unless OS.mac? end test do diff --git a/Formula/td.rb b/Formula/td.rb index 85995c9e7e8e1..0ed01ac358d6f 100644 --- a/Formula/td.rb +++ b/Formula/td.rb @@ -12,6 +12,7 @@ class Td < Formula sha256 "55f7d879795bcf5cde8af98b463f4751c6c5426ceed96a46a0c1531b1324a60f" => :sierra sha256 "e740be06065aac7f578e47d0bbf6ef803993a6246d0d7fa74c90367b5f3ea080" => :el_capitan sha256 "e608e79004fe1cfbefb2f9963ed4a4e86aad8e8c751e12a97ff3a03325bddd2b" => :yosemite + sha256 "8cfc0fda507f06f4bd6f1983df289196435c43435a3938ffe4731daad5023124" => :x86_64_linux # glibc 2.19 end depends_on "go" => :build diff --git a/Formula/tdkjs.rb b/Formula/tdkjs.rb index 6830fe0056dc7..2604c5e381e79 100644 --- a/Formula/tdkjs.rb +++ b/Formula/tdkjs.rb @@ -11,6 +11,7 @@ class Tdkjs < Formula sha256 "d59d6292d1982f2bfb6fac6f3e25d638b131b2ad9c36598ef5ad5ee4f5eb76e3" => :catalina sha256 "9edeabf99f8d427626ee1500981ed3bb3738be523abcfa600457588afca605c7" => :mojave sha256 "09ace9b6ab20a91e582b8d95ba05abe45b046231cb457cf87c7d2704352778f8" => :high_sierra + sha256 "8df35f57f00e24aa7ed6abbf2090f1f99faad5d3cb491cbf832f5495db0a3c29" => :x86_64_linux end depends_on "node" diff --git a/Formula/tealdeer.rb b/Formula/tealdeer.rb index 2a303c4aa145d..580bf0c7d4429 100644 --- a/Formula/tealdeer.rb +++ b/Formula/tealdeer.rb @@ -10,9 +10,14 @@ class Tealdeer < Formula sha256 "9db1cd67e060652967a899a4266758bf0b460b1426bea40a822f217c4edf4d80" => :catalina sha256 "379f9775e19bf959868350869913b83458b3f14b4aacdd4e5432c2a4cdcf8e9d" => :mojave sha256 "fd5d4b07815554a32fc161accc1145d1a7ef761bd20f2f94bdb94eca57563e32" => :high_sierra + sha256 "39ab755b22831705f38e0b2dc3f81a4787e5a5eeea0e645ca31eb73e31910ecb" => :x86_64_linux end depends_on "rust" => :build + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "openssl@1.1" + end on_linux do depends_on "pkg-config" => :build @@ -22,6 +27,7 @@ class Tealdeer < Formula conflicts_with "tldr", :because => "both install `tldr` binaries" def install + ENV["OPENSSL_DIR"] = Formula["openssl@1.1"].opt_prefix unless OS.mac? system "cargo", "install", *std_cargo_args bash_completion.install "bash_tealdeer" => "tldr" zsh_completion.install "zsh_tealdeer" => "_tldr" diff --git a/Formula/tectonic.rb b/Formula/tectonic.rb index 790dddac1efd6..f76a3356ee87d 100644 --- a/Formula/tectonic.rb +++ b/Formula/tectonic.rb @@ -10,6 +10,7 @@ class Tectonic < Formula sha256 "bd48e4e17779696ca1e647b1809ffbe65821e6387e1c787acf0ab1168bd6c059" => :catalina sha256 "b01e0fad7b78afa074addd3e4e423211a4c66b327a6365639fb1f70b20af2f1e" => :mojave sha256 "1a9f68211f8f9e8268652eb367d1cbafcab3bfcd5779a0be9d71ef456b326de9" => :high_sierra + sha256 "9cd3ca2cb2b996379f5d317349e97f5e2f65f2cd6f2bd316db20543513e67975" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/tektoncd-cli.rb b/Formula/tektoncd-cli.rb index 7de6bf2b24155..4452a7078ea09 100644 --- a/Formula/tektoncd-cli.rb +++ b/Formula/tektoncd-cli.rb @@ -9,6 +9,7 @@ class TektoncdCli < Formula sha256 "535ec002c95d1fd0c0ee84828d3844ea9845493e55e099941366d004bdfa6b55" => :catalina sha256 "c56a08ee17e686bc22a17b9982d5879848660e9472464dfdae3bb7dd0d5b55f3" => :mojave sha256 "f19731f06d92e88fe464b72b14457b85230c926e20e5a428e8fcf2500e357fd5" => :high_sierra + sha256 "14f5cb61d2629917db9f7fb24b50bd35d840a23362ab9b6b9cef632e5a2a8f37" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/teleconsole.rb b/Formula/teleconsole.rb index 8d13c3c423388..02c6ed07875e0 100644 --- a/Formula/teleconsole.rb +++ b/Formula/teleconsole.rb @@ -12,6 +12,7 @@ class Teleconsole < Formula sha256 "4a5a767d1097e9e8580e3d3ad77d01b8b840ef622092983d713333ed90d2db0d" => :mojave sha256 "d53e81606f1e85b59bd3ee364e006989187f5cce884b33fb77b104b931a7e3c5" => :high_sierra sha256 "c74fa8ac5e92c39a3f0d869b9e8bd44d32ab67ed0748b5548a0700287dfbe817" => :sierra + sha256 "755c2ad0d13fbb7f1c492fc726d0656b92d58a8195ff24b37ad809d4911cdeb2" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/telegraf.rb b/Formula/telegraf.rb index 0186c45e33b89..c65db70b1aa43 100644 --- a/Formula/telegraf.rb +++ b/Formula/telegraf.rb @@ -10,6 +10,7 @@ class Telegraf < Formula sha256 "45b942611a1205835c3a99a84fe4d267dc763a2dda5b1f5c4fcfaf17c8ee6d5d" => :catalina sha256 "8c046bd178ed2e082a4613ad5a3bdeb618c066fd7d58e05a940bef94aaa85285" => :mojave sha256 "90fe453c6c58e411db1a48f83cc31f1ae19ce5e6ef3e2571652db52868eccad6" => :high_sierra + sha256 "488413a8583a7d2f4b8d697a9145eb093ed7c611be48fa66aeae08cf9ccf10b8" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/telegram-cli.rb b/Formula/telegram-cli.rb index 56fb199d7eacc..2ed6e2104e791 100644 --- a/Formula/telegram-cli.rb +++ b/Formula/telegram-cli.rb @@ -12,6 +12,7 @@ class TelegramCli < Formula sha256 "4c1a9d233c3b46d75badb6e89e007ff9763e55071474ce11d0e109e7ee24aefe" => :catalina sha256 "da9d09f1f4a317ed14c97e67fc2def18c4cd728a7023ab80424a8d548437ee74" => :mojave sha256 "410b56cc04620c7a1f495b500b41fa61339cc68444c1c65939bb4fb0c4cc96ef" => :high_sierra + sha256 "9d3b9f41345e1779d79245622e158c26ab032c3bad2dd290d6257a4fe3f0049d" => :x86_64_linux end depends_on "pkg-config" => :build @@ -25,9 +26,11 @@ class TelegramCli < Formula # Look for the configuration file under /usr/local/etc rather than /etc on OS X. # Pull Request: https://github.com/vysheng/tg/pull/1306 - patch do - url "https://github.com/vysheng/tg/pull/1306.patch?full_index=1" - sha256 "1cdaa1f3e1f7fd722681ea4e02ff31a538897ed9d704c61f28c819a52ed0f592" + if OS.mac? + patch do + url "https://github.com/vysheng/tg/pull/1306.patch?full_index=1" + sha256 "1cdaa1f3e1f7fd722681ea4e02ff31a538897ed9d704c61f28c819a52ed0f592" + end end # Patch for OpenSSL 1.1 compatibility diff --git a/Formula/teleport.rb b/Formula/teleport.rb index aa64cad107202..ecbbf108a5e20 100644 --- a/Formula/teleport.rb +++ b/Formula/teleport.rb @@ -10,9 +10,15 @@ class Teleport < Formula sha256 "494b370c875f70c96850b7ca9cce61e123ea99f505d3ffa4727733662bb67af1" => :catalina sha256 "3dee689ea167e7b0b90d9af37464165ec65d9f80bf16e3961f76828545d52b2c" => :mojave sha256 "cf63c1ffaaccfde7c732aab770c328bc925360b0ff4a24cba7200f8cfb440ebb" => :high_sierra + sha256 "82a83a3c208eb2caa901b68d733009f9d62dd85eac1e18b574c7a6c99bf56a04" => :x86_64_linux end depends_on "go" => :build + unless OS.mac? + depends_on "zip" + depends_on "curl" => :test + depends_on "netcat" => :test + end uses_from_macos "curl" => :test uses_from_macos "zip" @@ -41,13 +47,25 @@ def install .gsub("/var/lib/teleport", testpath) .gsub("/var/run", testpath) .gsub(/https_(.*)/, "") + unless OS.mac? + inreplace testpath/"config.yml", "/usr/bin/hostname", "/bin/hostname" + inreplace testpath/"config.yml", "/usr/bin/uname", "/bin/uname" + end begin - pid = spawn("#{bin}/teleport start -c #{testpath}/config.yml") - sleep 5 - system "/usr/bin/curl", "--insecure", "https://localhost:3080" - system "/usr/bin/nc", "-z", "localhost", "3022" - system "/usr/bin/nc", "-z", "localhost", "3023" - system "/usr/bin/nc", "-z", "localhost", "3025" + debug = OS.mac? ? "" : "DEBUG=1 " + pid = spawn("#{debug}#{bin}/teleport start -c #{testpath}/config.yml") + if OS.mac? + sleep 5 + path = OS.mac? ? "/usr/bin/" : "" + system "#{path}curl", "--insecure", "https://localhost:3080" + # Fails on Linux: + # Failed to update cache: \nERROR REPORT:\nOriginal Error: + # *trace.NotFoundError open /tmp/teleport-test-20190120-15973-1hx2ui3/cache/auth/localCluster: + # no such file or directory + system "#{path}nc", "-z", "localhost", "3022" + system "#{path}nc", "-z", "localhost", "3023" + system "#{path}nc", "-z", "localhost", "3025" + end ensure Process.kill(9, pid) end diff --git a/Formula/telnet.rb b/Formula/telnet.rb index 8a3a2d8182624..cca9b1ef8829f 100644 --- a/Formula/telnet.rb +++ b/Formula/telnet.rb @@ -11,7 +11,7 @@ class Telnet < Formula sha256 "af38f3c6dd4ff5eda2248671958e66595b39e74cdeecca52af4efb495bc659a7" => :high_sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? conflicts_with "inetutils", :because => "both install 'telnet' binaries" diff --git a/Formula/telnetd.rb b/Formula/telnetd.rb index 184c53d23427b..5a2161cd9d60b 100644 --- a/Formula/telnetd.rb +++ b/Formula/telnetd.rb @@ -11,7 +11,7 @@ class Telnetd < Formula sha256 "d31eb6a8f79b8f9eb2417dce87c6508b8837207d4f8df48bdd5fd1d833f1b757" => :high_sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? resource "libtelnet" do url "https://opensource.apple.com/tarballs/libtelnet/libtelnet-13.tar.gz" diff --git a/Formula/tepl.rb b/Formula/tepl.rb index 4ac63c4bba1f7..31d38b81c3e95 100644 --- a/Formula/tepl.rb +++ b/Formula/tepl.rb @@ -52,6 +52,8 @@ def install pixman = Formula["pixman"] uchardet = Formula["uchardet"] flags = (ENV.cflags || "").split + (ENV.cppflags || "").split + (ENV.ldflags || "").split + amtklib = OS.mac? ? "amtk-5.0" : "amtk-5" + gtksourceviewlib = OS.mac? ? "gtksourceview-4.0" : "gtksourceview-4" flags += %W[ -I#{atk.opt_include}/atk-1.0 -I#{amtk.opt_include}/amtk-5 @@ -84,8 +86,8 @@ def install -L#{gtkx3.opt_lib} -L#{lib} -L#{pango.opt_lib} + -l#{amtklib} -latk-1.0 - -lamtk-5.0 -lcairo -lcairo-gobject -lgdk-3 @@ -94,12 +96,12 @@ def install -lglib-2.0 -lgobject-2.0 -ltepl-4 + -l#{gtksourceviewlib} -lgtk-3 - -lgtksourceview-4.0 - -lintl -lpango-1.0 -lpangocairo-1.0 ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/terminal-notifier.rb b/Formula/terminal-notifier.rb index f6754f1da25e5..409c3228b82e9 100644 --- a/Formula/terminal-notifier.rb +++ b/Formula/terminal-notifier.rb @@ -14,7 +14,9 @@ class TerminalNotifier < Formula sha256 "75ce68fd95fb502e20ccb25be72f7db12112ac1a4bdf5a70c140cd174ecbacf5" => :el_capitan end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? + # https://github.com/julienXX/terminal-notifier/issues/184 + depends_on :macos def install xcodebuild "-project", "Terminal Notifier.xcodeproj", diff --git a/Formula/termius.rb b/Formula/termius.rb index 53f99ec30c1ae..d8b01381eb0aa 100644 --- a/Formula/termius.rb +++ b/Formula/termius.rb @@ -5,7 +5,7 @@ class Termius < Formula homepage "https://termius.com" url "https://github.com/Crystalnix/termius-cli/archive/v1.2.12.tar.gz" sha256 "89be6d35e5c4918c0d9e3f2410620d3a84c7108e52c2c87cfa6166c5612e08ee" - revision 2 + revision OS.mac? ? 2 : 3 head "https://github.com/Crystalnix/termius-cli.git", :branch => "master" bottle do @@ -13,6 +13,7 @@ class Termius < Formula sha256 "6cf57f123ac50976b3d4439a14046489c42173f606bc750de90c8ab7bd84bf4d" => :catalina sha256 "82a302b40d54d5652fe16aad8e22ebc64d05b7f459fe304fe7da43cb4834de6a" => :mojave sha256 "7f7fe23ce8e5f082efe10c406176a5393e16ca9ae711736713f00fe239fdf4ee" => :high_sierra + sha256 "2b3b8281a5eae2d23c1cd3021528ed6c540e0d121ac0ef049da21e309b4d90ea" => :x86_64_linux end depends_on "libyaml" diff --git a/Formula/termrec.rb b/Formula/termrec.rb index 510d36f81b742..c4706c79f678e 100644 --- a/Formula/termrec.rb +++ b/Formula/termrec.rb @@ -10,6 +10,7 @@ class Termrec < Formula sha256 "1d93149ec34c0bf531da76b0137390ed1f05bf2e35e806f1fe875fe6648c4c2b" => :catalina sha256 "e3f9f241763a05de367da2ee91727674e18a126a99480a750b901a21bdad0ffb" => :mojave sha256 "d6cb43ed14ec0531824bd4eb55ddc625b5711c28b274ce78eb815501e5f3ebf2" => :high_sierra + sha256 "8e69b3b9c275945b60d2e67ab8b165ce485de75c372a76f321f7579878b229c6" => :x86_64_linux end depends_on "autoconf" => :build @@ -17,6 +18,8 @@ class Termrec < Formula depends_on "libtool" => :build depends_on "xz" + uses_from_macos "zlib" + def install system "./autogen.sh" system "./configure", "--disable-debug", diff --git a/Formula/termshare.rb b/Formula/termshare.rb index c5b68e1cb9a94..8d2156ba83117 100644 --- a/Formula/termshare.rb +++ b/Formula/termshare.rb @@ -18,6 +18,7 @@ class Termshare < Formula sha256 "c540732aab70ec29b60459c19bb4ee55c0584b3a63476473219a115d2ec380af" => :el_capitan sha256 "c3b9c2784b02536ce97a2a3b3a205314e7ada8e727ac60b54577d933a04aa808" => :yosemite sha256 "aa9131a7eae6efe7e7d3bac1e73711f7bfe52f1dd246389bdbb137c70c815310" => :mavericks + sha256 "dfba00eac1170972c2fb35a2d9481693b0ac344ccd2e0f792518ba5873e94b32" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/termshark.rb b/Formula/termshark.rb index ecd780bffc11d..f3f48569583ef 100644 --- a/Formula/termshark.rb +++ b/Formula/termshark.rb @@ -9,6 +9,7 @@ class Termshark < Formula sha256 "04877a693f8f87f4120847862fa35642b5d862c7b93603b11d330015316efe03" => :catalina sha256 "ec8e1526dd3ba7cb58bbcc510eee873c10fd11f428d12b54950d1dcfa5603a1a" => :mojave sha256 "ef6bfc089550e3ba2afb02510ff7d5d3a8364079970a4f223a8b84801f1c0b93" => :high_sierra + sha256 "0a878e9351230352bcf70c2dedceaa19c40a2c408b59f22d5231a0b70a81ea40" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/termtosvg.rb b/Formula/termtosvg.rb index 6c8a7f0c6aa54..95e7e990c7357 100644 --- a/Formula/termtosvg.rb +++ b/Formula/termtosvg.rb @@ -5,13 +5,14 @@ class Termtosvg < Formula homepage "https://nbedos.github.io/termtosvg" url "https://github.com/nbedos/termtosvg/archive/1.1.0.tar.gz" sha256 "53e9ad5976978684699d14b83cac37bf173d76c787f1b849859ad8aef55f22d2" - revision 1 + revision OS.mac? ? 1 : 2 bottle do cellar :any_skip_relocation sha256 "f882539d594efc11647207ad81eed3c1a2f365c6c9a3b7be1401dffbab6ea98d" => :catalina sha256 "860ca46763f9cfeb387a806e380d6a680fc39f13d31795ebed68e7c2df087aaa" => :mojave sha256 "6cb7b9688575469970762f3ecdee882a30051a4b6d42f41af0e6aed159d97b0b" => :high_sierra + sha256 "ea0cd674da54e2489e60f5c699150f7d9659398aed598b7561a7a361ec9dbb76" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/terraform-docs.rb b/Formula/terraform-docs.rb index 69c4dd50fa56e..3ffe07887b00d 100644 --- a/Formula/terraform-docs.rb +++ b/Formula/terraform-docs.rb @@ -9,13 +9,14 @@ class TerraformDocs < Formula sha256 "07e6bc6850459581f65fc59b0bc1152fbd917c7a760fc2e7203c55bc581bcbc7" => :catalina sha256 "a91bb362006421c48eb1f6c251b5515bce6930f9611d116469fea0390966531d" => :mojave sha256 "27b5477a3af7c8cdd53ba80fbf86309a65deeb8668dc010cd88cb0cb872272fb" => :high_sierra + sha256 "6e334093765074a15463191e498dbe0fb269a95fed52b54234bd689308ba6f94" => :x86_64_linux end depends_on "go" => :build def install system "make", "build" - bin.install "bin/darwin-amd64/terraform-docs" + bin.install "bin/#{OS.mac? ? "darwin" : "linux"}-amd64/terraform-docs" prefix.install_metafiles end diff --git a/Formula/terraform-inventory.rb b/Formula/terraform-inventory.rb index 4a98a823265db..823dc8abc3d38 100644 --- a/Formula/terraform-inventory.rb +++ b/Formula/terraform-inventory.rb @@ -13,6 +13,7 @@ class TerraformInventory < Formula sha256 "9f34bba5205c0fc87ddf7c95ce8532b85fc7cbb515dea9cc211f70fab2aeb643" => :mojave sha256 "a9500dab587c5078fe62ae2ab5eff2376ecad8d29208a60fe195debfdeea5e78" => :high_sierra sha256 "6b30bf29fe2e83c3bb75c16ce83731c7b212f5f48c3db787501cf1fbb8c37d19" => :sierra + sha256 "123d1b7b3f66edec8096bb327447274afa06ee347b2eda541ed21afd1fa52b68" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/terraform-provisioner-ansible.rb b/Formula/terraform-provisioner-ansible.rb index bc876cd129ae4..27f36e1eeb18d 100644 --- a/Formula/terraform-provisioner-ansible.rb +++ b/Formula/terraform-provisioner-ansible.rb @@ -15,6 +15,7 @@ class TerraformProvisionerAnsible < Formula sha256 "a56474f71703f7d660a17ed6faf039e98ccf50d32ce82b2c92fcc907f012ad78" => :sierra sha256 "2b96de2a84016f1637fd428d40fcdcf16c960e795ce9307c2fb58672be2d21c0" => :el_capitan sha256 "2b9f182b17571e29b4b6767db5974e39d3b5e2e5e1bb87b83b6cf1f28f855a10" => :yosemite + sha256 "e63f913481d372db46d923d90b2b45553e015df1f6407610a5dd26b850d3ad5c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/terraform.rb b/Formula/terraform.rb index 0288aee4edadd..4ce43da09b46b 100644 --- a/Formula/terraform.rb +++ b/Formula/terraform.rb @@ -10,6 +10,7 @@ class Terraform < Formula sha256 "33bccc922a2204ce317e553dcc6cfc2106cd8ff72c9e12ada102100741c5242d" => :catalina sha256 "bc46af39ad947e0ae428ef8605f8cf38e55330860423440ae8dee147d363bdcc" => :mojave sha256 "c1ea4d4491aded438793b5857a81fc1557de4d6d3117029b2fd7a9a0af7ca3d1" => :high_sierra + sha256 "f672dcb1195a79eeb9173b74f491d503ca384c5733b9476782384a199e19f101" => :x86_64_linux end depends_on "go@1.13" => :build diff --git a/Formula/terraform@0.11.rb b/Formula/terraform@0.11.rb index 0654457d0162b..6c4d3d401e387 100644 --- a/Formula/terraform@0.11.rb +++ b/Formula/terraform@0.11.rb @@ -10,6 +10,7 @@ class TerraformAT011 < Formula sha256 "4460e332118c477f7389093d533e63752469973487275f1d656a80974d723888" => :mojave sha256 "a7b28af5ba3c9f06614eef3ca71653fbfacc3ff62abbaa75f4c187f996584af8" => :high_sierra sha256 "eb5d3500ed06ce55c984e79a317050b4483b25774bf6a77147dfdb2c3746fa25" => :sierra + sha256 "08c82d763499c2bfb2af815bedf79777c7591152bc5943f8911fa01681ba2e24" => :x86_64_linux end keg_only :versioned_formula @@ -19,6 +20,7 @@ class TerraformAT011 < Formula def install ENV["GOPATH"] = buildpath + ENV["GO111MODULE"] = "on" unless OS.mac? ENV.prepend_create_path "PATH", buildpath/"bin" dir = buildpath/"src/github.com/hashicorp/terraform" @@ -29,12 +31,13 @@ def install ENV.delete "AWS_ACCESS_KEY" ENV.delete "AWS_SECRET_KEY" - ENV["XC_OS"] = "darwin" + os = OS.mac? ? "darwin" : "linux" + ENV["XC_OS"] = os ENV["XC_ARCH"] = "amd64" system "go", "mod", "vendor" # Needed for Go 1.14+ system "make", "tools", "bin" - bin.install "pkg/darwin_amd64/terraform" + bin.install "pkg/#{os}_amd64/terraform" prefix.install_metafiles end end diff --git a/Formula/terraform_landscape.rb b/Formula/terraform_landscape.rb index 12a067832c5c1..88e7bf65a01ec 100644 --- a/Formula/terraform_landscape.rb +++ b/Formula/terraform_landscape.rb @@ -9,6 +9,7 @@ class TerraformLandscape < Formula sha256 "e621a330795fc10591b1eccb2048f64b10d38564a2c5cb21823f195fed768239" => :catalina sha256 "c364081610b7d9de7913c77ed10368f843b6c0dfa5c8a19ad069da9594007c7c" => :mojave sha256 "ed113c64ee8bbcf265633ae8b6d5839e2a4b91d003247e42c71b8ff7b6c36cc2" => :high_sierra + sha256 "9710b576f22eb67387e18457dcd54929400f156764489f98f425592fa6eab075" => :x86_64_linux end depends_on "ruby" diff --git a/Formula/terraformer.rb b/Formula/terraformer.rb index c51834cedc1f6..48bdec081af8b 100644 --- a/Formula/terraformer.rb +++ b/Formula/terraformer.rb @@ -10,6 +10,7 @@ class Terraformer < Formula sha256 "e8df5d868473fa864a82e2c643257317565b4329472e1e3f1abd5d57c370eef6" => :catalina sha256 "1f2329c2ab0200adadb0a83e1073ff6e38984cbbee74450f62649c61734cf618" => :mojave sha256 "b9fbd65c0319b54db123e71062ab23d85c01c9200e0cf7d8b460302a78565660" => :high_sierra + sha256 "a2fcfd0594ff16035f5792c9d968160592fdbe1e5c78ead01720b0690319773f" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/terragrunt.rb b/Formula/terragrunt.rb index 81014f318050a..92a8500444cf4 100644 --- a/Formula/terragrunt.rb +++ b/Formula/terragrunt.rb @@ -9,6 +9,7 @@ class Terragrunt < Formula sha256 "bf8d9e8070eedf0b2628ddd033c67f6d0b1775ba5f7a7621dd1ba1d4baf7bde3" => :catalina sha256 "c268597473dc7b086bfe740600dd5e76e57ed065b1578d364b469a0462e84350" => :mojave sha256 "2601f8dfbceba87cfe69e181dea647901bd990195f2c25dc67d44b34073285fb" => :high_sierra + sha256 "0dd906b816477ff8494fce3c74bcb7414a0c7141063e7c5c3fd2934b28914032" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/terrahub.rb b/Formula/terrahub.rb index 9f545124d476e..4d827719b80bd 100644 --- a/Formula/terrahub.rb +++ b/Formula/terrahub.rb @@ -11,6 +11,7 @@ class Terrahub < Formula sha256 "a39fbab6315372412a7a26b02ee9e7365e2ed1f1c52359c943f94065ee236cd3" => :catalina sha256 "16253bbcc02bd5c9566ca7fc17768bc5251eed1c921b5d42269464d24635ecb3" => :mojave sha256 "88cd7c7ce98a571424ec39f1f4ccc53200d4be39beb4629d293ec99f57ca5f4d" => :high_sierra + sha256 "fa99b77d079b5c1a8e669bb09faec267795d1adec6a57fab291b3fcbf996ea22" => :x86_64_linux end depends_on "node" diff --git a/Formula/tesseract-lang.rb b/Formula/tesseract-lang.rb index ee57d00e99596..8bc3831d84276 100644 --- a/Formula/tesseract-lang.rb +++ b/Formula/tesseract-lang.rb @@ -10,6 +10,7 @@ class TesseractLang < Formula sha256 "631211ef37fcafa9a3fac6a7cd6ca94aaeca83ae28543716a7aaa9cf1072d414" => :mojave sha256 "631211ef37fcafa9a3fac6a7cd6ca94aaeca83ae28543716a7aaa9cf1072d414" => :high_sierra sha256 "4c69eedd24721f0e47a645ae20a08bf8c8083f805615c7b46a73406a9f593cb1" => :sierra + sha256 "b47317ba23b98ed8c7e8eb32c78d274f4833d2c183035ba30a1b689c3ef99c15" => :x86_64_linux end depends_on "tesseract" diff --git a/Formula/tesseract.rb b/Formula/tesseract.rb index 9885c4dff5448..be69f3f10b85e 100644 --- a/Formula/tesseract.rb +++ b/Formula/tesseract.rb @@ -6,10 +6,11 @@ class Tesseract < Formula head "https://github.com/tesseract-ocr/tesseract.git" bottle do - cellar :any + cellar :any_skip_relocation sha256 "81ff467946d9c85151c86819034cd183a983b4a3fa10374c7f039a5ec3ef0d82" => :catalina sha256 "34eee505fccec07eaab30f14c46f9688db9f3aa578306d47bbcd31801b0b849d" => :mojave sha256 "6b64585454bcca9b62945b284000723d76afad15b5e80109ca6cdc699ae50e25" => :high_sierra + sha256 "c8ebfc3e13144818224ca4bd8048630dead1714f376b4bab0e59a4e5b2fe914b" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/texapp.rb b/Formula/texapp.rb index 38dec92c58570..5e33232bf3103 100644 --- a/Formula/texapp.rb +++ b/Formula/texapp.rb @@ -11,6 +11,7 @@ class Texapp < Formula sha256 "6615c40b9f733227163ad90b0082c40e7a5885c8ffa36dcb6c5892c09367c279" => :high_sierra sha256 "6615c40b9f733227163ad90b0082c40e7a5885c8ffa36dcb6c5892c09367c279" => :sierra sha256 "6615c40b9f733227163ad90b0082c40e7a5885c8ffa36dcb6c5892c09367c279" => :el_capitan + sha256 "84560f05d9dff6dfec4878d4393c248e210ec29f3081edf35078bcb7018bfca7" => :x86_64_linux end def install diff --git a/Formula/texi2html.rb b/Formula/texi2html.rb index 966cb172fb5d6..20420c8dc936a 100644 --- a/Formula/texi2html.rb +++ b/Formula/texi2html.rb @@ -10,6 +10,7 @@ class Texi2html < Formula sha256 "10f6d76de400799fb21dc900a2344ef444d43658dd502f0c040ad7c0a4bf0fbb" => :catalina sha256 "10f6d76de400799fb21dc900a2344ef444d43658dd502f0c040ad7c0a4bf0fbb" => :mojave sha256 "10f6d76de400799fb21dc900a2344ef444d43658dd502f0c040ad7c0a4bf0fbb" => :high_sierra + sha256 "7f306764ce0a5c0d3db56c36806cf61b596bc762ba558108b568095329f0a1dd" => :x86_64_linux end depends_on "gettext" diff --git a/Formula/texinfo.rb b/Formula/texinfo.rb index 19d5ff9d601a9..bc2d163625faa 100644 --- a/Formula/texinfo.rb +++ b/Formula/texinfo.rb @@ -5,10 +5,13 @@ class Texinfo < Formula mirror "https://ftpmirror.gnu.org/texinfo/texinfo-6.7.tar.xz" sha256 "988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa" + revision 1 unless OS.mac? + bottle do sha256 "0686381d97b0448c10d11eaba59722c029d17c8423c17ad524b76ec086790f44" => :catalina sha256 "419fccc89f850de008e954984c65eea9b7f82940178f7ee439e42c2c892a2e52" => :mojave sha256 "a634a1bd15d3d7735e4934fcf26bfa295ce17108912ae7451d2761c6d578de6a" => :high_sierra + sha256 "1127fa6649f3d5b8d8aaffa2a662841ecf20d13976838a2c4b34cea9414ce2ed" => :x86_64_linux end depends_on "gettext" if MacOS.version <= :high_sierra @@ -21,6 +24,7 @@ class Texinfo < Formula def install system "./configure", "--disable-dependency-tracking", "--disable-install-warnings", + *("--disable-perl-xs" unless OS.mac?), "--prefix=#{prefix}" system "make", "install" doc.install Dir["doc/refcard/txirefcard*"] diff --git a/Formula/texlive.rb b/Formula/texlive.rb new file mode 100644 index 0000000000000..43338b7364c38 --- /dev/null +++ b/Formula/texlive.rb @@ -0,0 +1,55 @@ +class Texlive < Formula + desc "TeX Live is a free software distribution for the TeX typesetting system" + homepage "https://www.tug.org/texlive/" + url "http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz" + version "20190406" + sha256 "c7742ea5b0bc22fe2742e9fa2bf9aeb8ff88175722fcfb2b72c00a29c06e2fc9" + + bottle do + cellar :any_skip_relocation + sha256 "4e24715e406a78243cc4391aabc6dc7776390b43fd57d21315a002776ea8994a" => :x86_64_linux + end + + depends_on "wget" => :build + depends_on "fontconfig" + depends_on :linux + depends_on "linuxbrew/xorg/libice" + depends_on "linuxbrew/xorg/libsm" + depends_on "linuxbrew/xorg/libx11" + depends_on "linuxbrew/xorg/libxaw" + depends_on "linuxbrew/xorg/libxext" + depends_on "linuxbrew/xorg/libxmu" + depends_on "linuxbrew/xorg/libxpm" + depends_on "linuxbrew/xorg/libxt" + depends_on "perl" + + def install + ohai "Downloading and installing TeX Live. This will take a few minutes." + ENV["TEXLIVE_INSTALL_PREFIX"] = libexec + system "./install-tl", "-scheme", "small", "-portable", "-profile", "/dev/null" + + man1.install Dir[libexec/"texmf-dist/doc/man/man1/*"] + man5.install Dir[libexec/"texmf-dist/doc/man/man5/*"] + rm Dir[libexec/"bin/*/man"] + bin.install_symlink Dir[libexec/"bin/*/*"] + end + + def caveats + <<~EOS + The small (~500 MB) distribution (scheme-small) is installed by default. + You may install a larger (medium or full) scheme using one of: + + tlmgr install scheme-medium # 1.5 GB + tlmgr install scheme-full # 6 GB + + For additional information use command: + + tlmgr info schemes + EOS + end + + test do + assert_match "Usage", shell_output("#{bin}/tex --help") + assert_match "revision", shell_output("#{bin}/tlmgr --version") + end +end diff --git a/Formula/texmath.rb b/Formula/texmath.rb index c0054a04b8793..1f8e5ccc3fff9 100644 --- a/Formula/texmath.rb +++ b/Formula/texmath.rb @@ -9,10 +9,10 @@ class Texmath < Formula sha256 "2fec285a2266e56bba17914c122045f31b38de3efcd202dcf32a4f8b830bd184" bottle do - cellar :any_skip_relocation sha256 "5d87a2122991899db8297059dad21aef07d3d74f21659ffb49387b4f8d5f7670" => :catalina sha256 "76ee2dc264cb8697ceb21c7a52132af5fd2fa46c1340055e7e778a98047cf807" => :mojave sha256 "c73f655501e17551219bf6bd028aedaa09b40464b3706db4d1a0d12b673c824e" => :high_sierra + sha256 "ae6d7f474146ab16d59134bcdc572c743de3af54d2a04014df4fb1a08de68c4c" => :x86_64_linux end depends_on "cabal-install" => :build diff --git a/Formula/textql.rb b/Formula/textql.rb index c80d4f028c9c7..c1c07d52544c5 100644 --- a/Formula/textql.rb +++ b/Formula/textql.rb @@ -12,6 +12,7 @@ class Textql < Formula sha256 "38cbf8cacc0dd7e29831c8c7fe9f0437473c164bee549defb8744d6ca3e53fcb" => :high_sierra sha256 "f7bcfcacbd0b3076037e4715dabd1d925ef52ec66a3018d7a0124d091a7711c5" => :sierra sha256 "9950b83cf4d7bf59d3bf54711a845ddcf27f31dd004150acce3b8011ca2874a5" => :el_capitan + sha256 "ce423f3987a4a8175276fee09d94d3697878781a52bd9ca3285775f12bb191e0" => :x86_64_linux end depends_on "glide" => :build diff --git a/Formula/tflint.rb b/Formula/tflint.rb index f835b4798391c..94afb6fcb85a5 100644 --- a/Formula/tflint.rb +++ b/Formula/tflint.rb @@ -10,6 +10,7 @@ class Tflint < Formula sha256 "e8418093a3b01343484b145321c0f88dcea704b4755433a16918b30c37036080" => :catalina sha256 "81e76a5716c6a32316c45496cad502e20bdc7adc77fe7b175057ad0a3b87f2c5" => :mojave sha256 "71703bb43d3a7b2f3e798a07a8494e30cc06b3cb533b41e01c8c6b36781338b2" => :high_sierra + sha256 "51510a7a4e10e4700f09b97e3370a2394940812cf2d3e54d530e5df9648d6832" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/the_platinum_searcher.rb b/Formula/the_platinum_searcher.rb index d9e14fdb80b11..6bfd6aad4e124 100644 --- a/Formula/the_platinum_searcher.rb +++ b/Formula/the_platinum_searcher.rb @@ -12,6 +12,7 @@ class ThePlatinumSearcher < Formula sha256 "5b85047b2b893e8ec45e3f68b37c09cfb80ceb0a7c2b9c70937f2f2ca1f6f0bc" => :high_sierra sha256 "1e952c6a666f180343cfdc1afa859f702638276e597d4292520fa6cf91ac82b8" => :sierra sha256 "3439437518655cdd74c95eda5a161c01d5fe80604ef9c3e8936449a96ba3dcc1" => :el_capitan + sha256 "72f6aa602956c5711bbea7ab536935d9ec8937eef34ffee7369b84b3f6af8bb4" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/the_silver_searcher.rb b/Formula/the_silver_searcher.rb index 9d29cc9440689..8a7b2dde0bebd 100644 --- a/Formula/the_silver_searcher.rb +++ b/Formula/the_silver_searcher.rb @@ -12,6 +12,7 @@ class TheSilverSearcher < Formula sha256 "0bf5394d8ab5f61b8fbb593249f556f13b358d16eb0d3c97215be3da0476e94b" => :high_sierra sha256 "2365e24e5d0b1bef64b35c6a8f9e4f61d1f38eafe38c06d6e0acefc6a9a955db" => :sierra sha256 "1f35dcee133d638a16462db711560b624020e9dd8f732ac5a6f13a09b694421a" => :el_capitan + sha256 "2fe5f77621c6b94e9ff7e6c6e0799b90cdd6bfdd5b6f7b66e03ebfb0162f5dab" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/thefuck.rb b/Formula/thefuck.rb index cdaaa228fdd2d..940e81e446496 100644 --- a/Formula/thefuck.rb +++ b/Formula/thefuck.rb @@ -5,6 +5,7 @@ class Thefuck < Formula homepage "https://github.com/nvbn/thefuck" url "https://files.pythonhosted.org/packages/46/ed/11176f81a85876f4016c18907d6e085862df464a76628b91b3e91f080c7e/thefuck-3.30.tar.gz" sha256 "32b41db4360a810d8e761e80fe09868ce634476ee1829e26869d49484b7a95cc" + revision 1 unless OS.mac? head "https://github.com/nvbn/thefuck.git" bottle do @@ -12,6 +13,7 @@ class Thefuck < Formula sha256 "9101f88f96d66615970b00405f06430176fb827922363530abb33f3d22341ff3" => :catalina sha256 "fde50d03f97cf18dbdf89d86469f7c7c2794d40e639ad3c2c926466b98e455ee" => :mojave sha256 "272cc963d34074daf27ca24dcb16f7f2a47aaafe955ff0e259dd38191274d1d1" => :high_sierra + sha256 "56abac8e520f4e3608ba77cb3e230a9aae4cb9429864fe46deb1ce8ae401d462" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/theora.rb b/Formula/theora.rb index 21a072513a80c..2953b91d26351 100644 --- a/Formula/theora.rb +++ b/Formula/theora.rb @@ -10,6 +10,7 @@ class Theora < Formula sha256 "69f9b7922ddae2c007ad5329d53067838e2208051f3a54926f8cb46a7753b1a3" => :catalina sha256 "243d34cb232ae0f7b45d7e2973c247ae68a57d8a4c50a2ee9e2bc7aeeabe5c78" => :mojave sha256 "4b5021649d047cbd556387ca6a8bd535cd8f9129be0a48f2d21bde8fb957a3b1" => :high_sierra + sha256 "734173b4b0e2a70db8041fd445de9239c3af9244724d2d6da5fd51e7aff1ebb2" => :x86_64_linux end head do @@ -54,7 +55,11 @@ def install return 0; } EOS - system ENV.cc, "-L#{lib}", "-ltheora", "test.c", "-o", "test" + if OS.mac? + system ENV.cc, "-L#{lib}", "-ltheora", "test.c", "-o", "test" + else + system ENV.cc, "test.c", "-L#{lib}", "-ltheora", "-o", "test" + end system "./test" end end diff --git a/Formula/thrift.rb b/Formula/thrift.rb index 6cdebfbd2065a..a2e75d0e55c34 100644 --- a/Formula/thrift.rb +++ b/Formula/thrift.rb @@ -11,6 +11,7 @@ class Thrift < Formula sha256 "9fff4084e59bf612da35f7e731c82f5a1d714aec8ba860a2521c0ca1d73731d4" => :catalina sha256 "840fbc8db938bc1b8e50d16f733bcd22a8918efee276cbf969fc79f779380b5d" => :mojave sha256 "bec0a20279bf36bcd960c71b9e417e41a53479e8a575034bef426994e7ecc546" => :high_sierra + sha256 "4120ac01e7b84804261f75fd878cccc53ef87f11a8fc2b4305b680160e731c08" => :x86_64_linux end head do diff --git a/Formula/thrulay.rb b/Formula/thrulay.rb index 36482d9642ef9..90bfd68afec6a 100644 --- a/Formula/thrulay.rb +++ b/Formula/thrulay.rb @@ -13,6 +13,7 @@ class Thrulay < Formula sha256 "74f52b9eaa39092931b68630eef408db6b53e1b0c538ec52950b89d0a4ea5563" => :el_capitan sha256 "f0a9bb5aa42ee3ce25965c50163e190ba13c220d91d4855fd38655cb91aae138" => :yosemite sha256 "558dc8e0634a811bab7dd9608dcb2e1ed95375e0cd3d37a4e3be6e9c30f94ed1" => :mavericks + sha256 "69b070c0ffcceebf433b3837d083be1d690aa77cd56427183e13fef4847109c5" => :x86_64_linux end def install diff --git a/Formula/tidy-html5.rb b/Formula/tidy-html5.rb index 59276892b3da6..df10437fdf3fc 100644 --- a/Formula/tidy-html5.rb +++ b/Formula/tidy-html5.rb @@ -12,6 +12,7 @@ class TidyHtml5 < Formula sha256 "af9633f1578980fe3d4351c3d71b4b83cc79f814d87310e4b7d05830c53c9621" => :high_sierra sha256 "6c8f843d25d6964b18d4c2fa15aaf2606b36decbbe65c31b38a7982e499a9d28" => :sierra sha256 "48416711a2f1a080e9eae1ecba30773ee48eae98181e25c6ae5ace07cb7ac8ee" => :el_capitan + sha256 "a9e3d3b4b49df633a5a58fbee141c2e309e93e467f23d0c728a17ce3d8b69b5a" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/tidyp.rb b/Formula/tidyp.rb index 3db2b15213b06..16b4f73d2b5e7 100644 --- a/Formula/tidyp.rb +++ b/Formula/tidyp.rb @@ -13,6 +13,7 @@ class Tidyp < Formula sha256 "5274bb4cd33d9c15d8c73dbe4cfb54e686da29cd29093adba549024fe520b82c" => :el_capitan sha256 "710962782d909bf11987f8b147d7e141ccba48643ab2db02c7f267d6cf871dd9" => :yosemite sha256 "7501f78d5f8e549fec7f689cd24aafa716e2097744ec78359d8092183469e4c8" => :mavericks + sha256 "a67e93cc14f51fd0ed5668b04f7c7de13c679d3713ea1fa236f35fc7f9f10674" => :x86_64_linux # glibc 2.19 end uses_from_macos "libxslt" => :build @@ -31,7 +32,8 @@ def install resource("manual").stage do system "#{bin}/tidyp -xml-help > tidyp1.xml" system "#{bin}/tidyp -xml-config > tidyp-config.xml" - system "/usr/bin/xsltproc tidyp1.xsl tidyp1.xml > tidyp.1" + xsltproc_dir = OS.mac? ? "/usr/bin/" : Formula["libxslt"].bin + system "#{xsltproc_dir}/xsltproc tidyp1.xsl tidyp1.xml > tidyp.1" man1.install gzip("tidyp.1") end end diff --git a/Formula/tiff2png.rb b/Formula/tiff2png.rb index f433f173d83f9..3d73a3689ca3d 100644 --- a/Formula/tiff2png.rb +++ b/Formula/tiff2png.rb @@ -13,6 +13,7 @@ class Tiff2png < Formula sha256 "19951f2ec63fa3c77a43fe2c2444251686ad4fcc1038fbeeb8873fcd528d8954" => :sierra sha256 "43f0afaca7d61a7f55489260deb233c0a35619d3101d362f80dc7a765a877599" => :el_capitan sha256 "bf11412cac81c328f8e8de50c182be049696d053ac900b56302685e858562811" => :yosemite + sha256 "b9f1b92319077578dfffd02a1d72c2ff53f2ed316cd7eaaaab50f223d1931538" => :x86_64_linux end depends_on "jpeg" diff --git a/Formula/tig.rb b/Formula/tig.rb index 4fc591cf98284..5e1a02964e210 100644 --- a/Formula/tig.rb +++ b/Formula/tig.rb @@ -9,6 +9,7 @@ class Tig < Formula sha256 "e3dd84d1883ca04013d72311c248f623a3e55fa8fa31456f5fe956ae19ccd4de" => :catalina sha256 "0fbc0ae28aed58f73b1e798cbe75c8d131762c91371bd00e5a257c3a6fda7f85" => :mojave sha256 "9f6983f67cbbe6d551c8ab39131ca1e91e9f3e57ffe1f1791e6c182fd017fbf8" => :high_sierra + sha256 "f5663bf7a9336264784c63ab82fd2ea7011df3718cf1e965f2cfe916ff3494d0" => :x86_64_linux end head do diff --git a/Formula/tile38.rb b/Formula/tile38.rb index d7bd62b42d89c..25e3d5bbc2a58 100644 --- a/Formula/tile38.rb +++ b/Formula/tile38.rb @@ -10,6 +10,7 @@ class Tile38 < Formula sha256 "c7d557f4881ecc7cd8a50fa3f516155e973e8cf88ab437d0dbd0714f99f6e764" => :catalina sha256 "843f06a5b431814a4a7e8c96e4bcbf4f02c33acf3c3baacfca3ef06638fdf573" => :mojave sha256 "c387f4bdff3facf50abb35fc06f52ff64d8a976de7c22d3075e7581b82df766c" => :high_sierra + sha256 "b63907cbbcc690b9eb6671dcc6269f1ba08be6ee64ebcd04ce59fed67c178687" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/timedog.rb b/Formula/timedog.rb index b9e58ffc6cedc..00f9e84d02271 100644 --- a/Formula/timedog.rb +++ b/Formula/timedog.rb @@ -7,6 +7,8 @@ class Timedog < Formula bottle :unneeded + depends_on :macos + def install bin.install "timedog" end diff --git a/Formula/timelimit.rb b/Formula/timelimit.rb index 2804bb0661e3e..76c6757d83b09 100644 --- a/Formula/timelimit.rb +++ b/Formula/timelimit.rb @@ -11,6 +11,7 @@ class Timelimit < Formula sha256 "872dbbd21820c6d08513f29bc0c024f8584c7d7b7b6b4b436553414d08fd6950" => :high_sierra sha256 "5fdeeb6ef9c0306f7195187b8068bc4f84de79d6f6716977a262ce26abb3b1db" => :sierra sha256 "d36206d7c4ba1431fb592ad9335e9ae3bea8b983245cec1e65cc24318088bd86" => :el_capitan + sha256 "06c8bc26194174d1ac8bf52c7086f76378b469b015bd2ca422ce093290faa578" => :x86_64_linux end def install diff --git a/Formula/timewarrior.rb b/Formula/timewarrior.rb index 90cbd92f95169..5ebc5d9fe0c29 100644 --- a/Formula/timewarrior.rb +++ b/Formula/timewarrior.rb @@ -10,6 +10,7 @@ class Timewarrior < Formula sha256 "b31a1b3ffe25ae8e006e172a228a6c02b749fc0a121957b076a2ed0125ad434e" => :catalina sha256 "b09c7933fd20dae4a309a6cf278b63ff6317944e2298a3dd290acbb62dc87fb6" => :mojave sha256 "6a4ec380d1c382da7e67bed6072ebe20365a72a1f098e62e25d4840488e5718c" => :high_sierra + sha256 "0e15f2a77536b5fc607917e4dc85986406b1c4002a21c922d7f8b357f3d34aab" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/tinc.rb b/Formula/tinc.rb index 4228457c6946a..dfe13a1e03ebc 100644 --- a/Formula/tinc.rb +++ b/Formula/tinc.rb @@ -10,6 +10,7 @@ class Tinc < Formula sha256 "ba34dc41517f617c4d61d61e2f76cbafd9b75aa5edacc894e5b24e97cfb269f5" => :mojave sha256 "a5ec2ae5f1e6252f80f33158bb0a1140e29764ed1f2e8754dcedf50e4fb49290" => :high_sierra sha256 "923b15d1dcd7aafbb566f83edc9cced61b13379e857243bbe28b2755270b542d" => :sierra + sha256 "c17497ed44d3cfaebba6f45742d70897443bf6fe761687477e3a1d03be073d65" => :x86_64_linux end depends_on "lzo" diff --git a/Formula/tintin.rb b/Formula/tintin.rb index bb9db96f0fdfa..010db1a5bee93 100644 --- a/Formula/tintin.rb +++ b/Formula/tintin.rb @@ -9,6 +9,7 @@ class Tintin < Formula sha256 "5655e2bfaf4fb9932f2b9317745f97b73162bd12d926a8fd9783002449d8ed3a" => :catalina sha256 "b10d78dd09e94adac5f9a4aaeddc756b7ee578e9a77ef9f81f8c4f1941f90c3c" => :mojave sha256 "9f4a88c8da68bde84fc56b34ef86b53e1691d33a59e340c54aa18b50c7c88f46" => :high_sierra + sha256 "0ec3e73d4252b9addaaf36fe5aeb16f2dd5e70017bd3dc5f1d8599507f1c6827" => :x86_64_linux end depends_on "gnutls" diff --git a/Formula/tiny-fugue.rb b/Formula/tiny-fugue.rb index 850102d416764..dfd17810199cb 100644 --- a/Formula/tiny-fugue.rb +++ b/Formula/tiny-fugue.rb @@ -10,12 +10,15 @@ class TinyFugue < Formula sha256 "d10777dd98ae76a048caed1179f7a65f8ee59256dcb94cfcd89ac1da0e135209" => :catalina sha256 "ea162f2b1644a44d95a2847ec34133661008fff66306e3eda790a25f253f2165" => :mojave sha256 "b1ddefa5c2a52f3399f5a90c0586d65e5e7ccc9940715cbe682a1a30e8dc6e76" => :high_sierra + sha256 "d0966131e4d68d0ec304a18982662fd91a41ee6f4ebd06202c0c16b68a115b85" => :x86_64_linux end depends_on "libnet" depends_on "openssl@1.1" depends_on "pcre" + uses_from_macos "ncurses" + conflicts_with "tee-clc", :because => "both install a `tf` binary" # pcre deprecated pcre_info. Switch to HB pcre-8.31 and pcre_fullinfo. diff --git a/Formula/tinycdb.rb b/Formula/tinycdb.rb index 8cee8bb2e5d52..85ac9b930a5d8 100644 --- a/Formula/tinycdb.rb +++ b/Formula/tinycdb.rb @@ -13,6 +13,7 @@ class Tinycdb < Formula sha256 "4f4341c31d1ed6eddce4dfa57360e339f27f37a0db5b5b6df8df46f5ccda65c2" => :el_capitan sha256 "d73abbd1439c1579c3ab925d2110fee60f287bb9b262850e030c74f7c356bcaa" => :yosemite sha256 "b35dda3e5219c993140f7ed6244f483b0159cbd4458fb3ee4461e25daa368d41" => :mavericks + sha256 "f419ec9c471b27f14e73075c9e5d2a8dfcfa244ac2a8bf7aa8111172228d0366" => :x86_64_linux end def install diff --git a/Formula/tinysvm.rb b/Formula/tinysvm.rb index 729e2069aa69d..4a84b9db93f63 100644 --- a/Formula/tinysvm.rb +++ b/Formula/tinysvm.rb @@ -13,6 +13,7 @@ class Tinysvm < Formula sha256 "2b84b75043ba1d97172e2756e3da870a8ec8e074167ab5402e7a4e1b4c923864" => :el_capitan sha256 "ea90446332244176d4ec3bc4ff0c6175810c3a39d942f225bb55c0fb6252858d" => :yosemite sha256 "c3464518eb4a82d123939aca024c328d885c3f14e74df31b4deed9588bb495b1" => :mavericks + sha256 "da24a024f780ac04419a10ae65c6f50361391485a4fc848c7ed2d300ac08cad2" => :x86_64_linux end # Use correct compilation flag, via MacPorts. diff --git a/Formula/tinyxml.rb b/Formula/tinyxml.rb index 5748929584ef2..d3d025f9b191d 100644 --- a/Formula/tinyxml.rb +++ b/Formula/tinyxml.rb @@ -3,6 +3,7 @@ class Tinyxml < Formula homepage "http://www.grinninglizard.com/tinyxml/" url "https://downloads.sourceforge.net/project/tinyxml/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz" sha256 "15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593" + revision 1 unless OS.mac? bottle do cellar :any @@ -13,6 +14,7 @@ class Tinyxml < Formula sha256 "16e6052892b43e68c45f5122b6802e9bc32001dc9478dfcd89511a24544660e5" => :el_capitan sha256 "4b1df9cb229b04f9968621a52737d96e86fcd6c2ad8904ae8a5c324347845f50" => :yosemite sha256 "75f79bb5d502e7be74de20e1cd3e3dcdd4702b37ef7de53d9d9a546a51776b50" => :mavericks + sha256 "58b44f9ef1275fa22bd9d907a2f4bb59d8de971ff514664c3e7157ebc4ac944d" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/tinyxml2.rb b/Formula/tinyxml2.rb index c7b5944b2b09a..41f537b008b35 100644 --- a/Formula/tinyxml2.rb +++ b/Formula/tinyxml2.rb @@ -6,10 +6,11 @@ class Tinyxml2 < Formula head "https://github.com/leethomason/tinyxml2.git" bottle do - cellar :any + cellar :any_skip_relocation sha256 "de43d8d170826747b593e29cff70f84fba2e35aef5c25bec5c02c406c29bbf84" => :catalina sha256 "65527a3b8385c01fabbaeef1ff1dc3cc301dcf5f49e0875d210d80fc5181379d" => :mojave sha256 "eaacca900292a86dc5d4e95e2a71042a6e2fe7e766341d0b5078cf99cd25c0da" => :high_sierra + sha256 "8444b2056b5eaeb4f758c80b3c383d26fe1119b6f5d89b0385477049939d471e" => :x86_64_linux end depends_on "cmake" => :build @@ -27,7 +28,10 @@ def install return 0; } EOS - system ENV.cc, "test.cpp", "-L#{lib}", "-ltinyxml2", "-o", "test" + system ENV.cc, "test.cpp", "-L#{lib}", "-ltinyxml2", + *("-I#{include}" unless OS.mac?), + *("-Wl,-rpath=#{lib}" unless OS.mac?), + "-o", "test" system "./test" end end diff --git a/Formula/tio.rb b/Formula/tio.rb index c86f39bbe35dc..c542b402aca6f 100644 --- a/Formula/tio.rb +++ b/Formula/tio.rb @@ -9,6 +9,7 @@ class Tio < Formula sha256 "a630b860983adbd4c2691538739850ef934aeafcfa33c5561a00e3db2b355e88" => :catalina sha256 "f33b4bc0d653c0f2111f0c30865395d2cadfe524f33ab1c84c843e54ec432ed9" => :mojave sha256 "1241b11c102b527fd43225a3283290fe5488889a9e0919e7b4b536ddcb4a4d83" => :high_sierra + sha256 "204f139cbc573038264c0b660f29fb128d2a785f5a9532698d7379781c430453" => :x86_64_linux end def install @@ -23,6 +24,11 @@ def install test do # Test that tio emits the correct error output when run with an argument that is not a tty. # Use `script` to run tio with its stdio attached to a PTY, otherwise it will complain about that instead. - assert_match /Error: Not a tty device/, shell_output("script -q /dev/null #{bin}/tio /dev/null", 1).strip + test_str = /Error: Not a tty device/ + if OS.mac? + assert_match test_str, shell_output("script -q /dev/null #{bin}/tio /dev/null", 1).strip + else + assert_match test_str, shell_output("script -q /dev/null -e -c \"#{bin}/tio /dev/null\"", 1).strip + end end end diff --git a/Formula/tippecanoe.rb b/Formula/tippecanoe.rb index 27eef04ed57d9..fb357cd70e160 100644 --- a/Formula/tippecanoe.rb +++ b/Formula/tippecanoe.rb @@ -9,6 +9,12 @@ class Tippecanoe < Formula sha256 "7e8caa72c197b02617da5b5867ba3c67c208e59d92aba074914958274eee57e5" => :catalina sha256 "1432b2d4ad11132cdb97dde0b77ccb3c95de1556a2852d9911e7978222fa9555" => :mojave sha256 "a1c78f268f0e54f6856f9e6be6dd9225d2f79ef0fc6905b60d69ef53fd542828" => :high_sierra + sha256 "fa3e3b3dd39fb914d1059bb1ad8338275e08f84be675a78a33ad1d1cf9c8382d" => :x86_64_linux + end + + unless OS.mac? + depends_on "sqlite" + depends_on "zlib" end uses_from_macos "sqlite" diff --git a/Formula/tj.rb b/Formula/tj.rb index 4c7f520efd434..b1226e534d330 100644 --- a/Formula/tj.rb +++ b/Formula/tj.rb @@ -11,6 +11,7 @@ class Tj < Formula sha256 "6e47b0d410b1a9aafc4b31bf6f397e5b6194faf2aea88e0fc0f45a4584adbf37" => :high_sierra sha256 "f62d1e6bebec485f947355a7a0a79fd9f3986396ac5f79c96e630693533a5c9d" => :sierra sha256 "679f41ee55f109604f19583683f43406e4af88f86b60534ab4e758d5b2192940" => :el_capitan + sha256 "c7486821bd35ae016c533c2b8a49839ede4754bf2405e5f192a431dc8b50fa99" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/tldr.rb b/Formula/tldr.rb index 00e729430f3ab..080f23f6e7306 100644 --- a/Formula/tldr.rb +++ b/Formula/tldr.rb @@ -12,6 +12,7 @@ class Tldr < Formula sha256 "41a6db2e28eeae00ff6d1888948d8b7d0f01cd67b3f271341b856cded07ba6ca" => :catalina sha256 "7f10022d0c6648741457c2562bc5e521d8dd88dfc4c4d68d1c886739ffd7eb45" => :mojave sha256 "c932bd8516b6690c45dcbf90ced6ad94d4a0aa5a366de532fe90c4ab82b9a2ad" => :high_sierra + sha256 "5783e97f5eca1bd13f00c7bbce75db77d8340f677d1344aaa0aa7d4547035d41" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/tlx.rb b/Formula/tlx.rb index 3cb769104c65e..754ada4e7e637 100644 --- a/Formula/tlx.rb +++ b/Formula/tlx.rb @@ -9,6 +9,7 @@ class Tlx < Formula sha256 "5feb247e39d672770af736845dcf642619eaef47816252f085a855e61479b258" => :catalina sha256 "d9306942815fa8499df14ad4e5de524acd0fb85ce3055ae344be4bce10720dfb" => :mojave sha256 "37a9d67e4cc9a36137d339bd7ebebcc2a351ff3bff631dd0d358db03cf8a6e2a" => :high_sierra + sha256 "a5a22896dfac6c622bf17e97f561b1a369f3e54d47481ea6eb922ad0dd9fa447" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/tmate.rb b/Formula/tmate.rb index c97551ac0b0bd..9c6ad820a51db 100644 --- a/Formula/tmate.rb +++ b/Formula/tmate.rb @@ -10,6 +10,7 @@ class Tmate < Formula sha256 "a278bcb401068bed2434ec48bfb059a86d793a6daa4877574ac0ed7168cb1ebc" => :catalina sha256 "7e5158460b898422b4c6e84390d0e8446e2ad52789a30f9942288c5c32acc8a1" => :mojave sha256 "0f4f06d0ab7715adc7f6d33cf7d3c08fd057e7f038a666b360ac4ad6a3449ad9" => :high_sierra + sha256 "3e401e67d62d19c1e11fc1859a8d0331bf6b1e42e426d8a7fd93350d41ca5dd0" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/tmpwatch.rb b/Formula/tmpwatch.rb index 77f7e1fe46fff..08f8445b52d11 100644 --- a/Formula/tmpwatch.rb +++ b/Formula/tmpwatch.rb @@ -10,6 +10,7 @@ class Tmpwatch < Formula sha256 "d2e77af7339bd09c9b7352a1646c79e15db6b43c27537b4af59efbc51e23f114" => :catalina sha256 "4f7b1e540daebe79e1ad64b2e4e4b7214074c05150dcd9de7a5ffe9c12e6b9bb" => :mojave sha256 "24a734b4cf32ce5720e1c089060fa66dcc2d9dde437804a4dc147f81d9cd8512" => :high_sierra + sha256 "ad948fff4e49cb83eaec2e20f57f8038a6a0ffa9c8cc2ca8657e91a2e201aee1" => :x86_64_linux end def install diff --git a/Formula/tmux-mem-cpu-load.rb b/Formula/tmux-mem-cpu-load.rb index 1a1784e5a274e..a4abe26714256 100644 --- a/Formula/tmux-mem-cpu-load.rb +++ b/Formula/tmux-mem-cpu-load.rb @@ -14,6 +14,7 @@ class TmuxMemCpuLoad < Formula sha256 "9e2c7e5fd03feb98cead3f366a9cc35375cee80c30fd570c742440d69319c296" => :el_capitan sha256 "abd6293238671268ea1f0362518cd82c4b3133cb42b0327d579c93768ea81110" => :yosemite sha256 "24e52a177d0201edf30621a648c7cbbf1f2cc7e4bd9f9145a7f8c258d9219725" => :mavericks + sha256 "4cce3994daa61fd1ae41bfa7be339c13ea01b561c417eaab578b806ed18ec1c5" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/tmux.rb b/Formula/tmux.rb index 327975760922d..a2b89aaec9286 100644 --- a/Formula/tmux.rb +++ b/Formula/tmux.rb @@ -9,6 +9,7 @@ class Tmux < Formula sha256 "f26bd0c3f5696350dcaf229d0fadaf6ab677c0ebbb550fc499ca0a37da59ab55" => :catalina sha256 "e9995ca765078be9cfdef4f1b6a628bcded0e96e36649e084a7f5480d165547a" => :mojave sha256 "7a04ece8143c0647be18bb14c160a984a5a9f855fa2ee888d21fc19374790ee5" => :high_sierra + sha256 "661641854a9bc8b9c45e868901f7ec0a480ceecbf430d4f212082256e85c27ce" => :x86_64_linux end head do diff --git a/Formula/tmuxinator.rb b/Formula/tmuxinator.rb index 8f30bdc0a7784..be63d3d9ca46e 100644 --- a/Formula/tmuxinator.rb +++ b/Formula/tmuxinator.rb @@ -10,6 +10,7 @@ class Tmuxinator < Formula sha256 "fcc792f9e1fabe3929f4d2a0b88122d29c429eab0d6434ec6ed0cddbceb14fdb" => :catalina sha256 "d18e3a7480fa572c8945a6b029a0dd5015556c701c39cfcb1e697eeb6d89e364" => :mojave sha256 "62fc87ed0bd20aac6a3d3867ba999358daf7e0a1316996187a9e1961a39c7a2a" => :high_sierra + sha256 "3921337491777a22a30b2a71d65007a25a25e6936a493019a36a2034bb580d53" => :x86_64_linux end depends_on "ruby" @@ -54,7 +55,13 @@ def install version_output = shell_output("#{bin}/tmuxinator version") assert_match "tmuxinator #{version}", version_output - completion = shell_output("source #{bash_completion}/tmuxinator && complete -p tmuxinator") + cmd = if OS.mac? + "source #{bash_completion}/tmuxinator && complete -p tmuxinator" + else + "bash -c \"source #{bash_completion}/tmuxinator && complete -p tmuxinator\"" + end + + completion = shell_output(cmd) assert_match "-F _tmuxinator", completion commands = shell_output("#{bin}/tmuxinator commands") diff --git a/Formula/tmx.rb b/Formula/tmx.rb index 9d5e7a5e76e13..78383abbbf373 100644 --- a/Formula/tmx.rb +++ b/Formula/tmx.rb @@ -9,6 +9,7 @@ class Tmx < Formula sha256 "e751f5545befe34c2e3b531c6c1adb6b256539ed613c1cd4bd3c44be05d5a3a3" => :catalina sha256 "20b8c3c1335eb81aace022bbf1086faaaff0aa5aa4e6d6f8858ec62a834e702a" => :mojave sha256 "71310fb31b83e16bd21269c8a4c7f396f8e47eda535ede4fc01b61108867c9a6" => :high_sierra + sha256 "c5a4073e8f796eafe1ebac017a43727a0050500499d04fd029ea189e3211218e" => :x86_64_linux end depends_on "cmake" => :build @@ -50,7 +51,7 @@ def install return 0; } EOS - system ENV.cc, "test.c", "#{lib}/libtmx.dylib", "-lz", "-lxml2", "-o", "test" + system ENV.cc, "test.c", "#{lib}/libtmx.#{OS.mac? ? "dylib" : "so"}", "-lz", "-lxml2", "-o", "test" system "./test" end end diff --git a/Formula/tnef.rb b/Formula/tnef.rb index 64c33178a47cf..01885de2ca2f8 100644 --- a/Formula/tnef.rb +++ b/Formula/tnef.rb @@ -9,6 +9,7 @@ class Tnef < Formula sha256 "ff92eb820b2efae9e87e42491a590601f400160f27ea2804b176b02b1648be66" => :catalina sha256 "2700f31ebcc1e2ba9219d6b6ac040846eba21ccc25baca4fea8b7d630b6673d2" => :mojave sha256 "842ba6bbe666302bd39c1cf7d29caa7d5180c20757b8dfe91b99d3fe1d3da841" => :high_sierra + sha256 "15a0c084a7f3a8a830201b4de92c6e250a155fc49546d8dffc003dedead98630" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/tnftp.rb b/Formula/tnftp.rb index 0df0cb93f2776..03a569505d17d 100644 --- a/Formula/tnftp.rb +++ b/Formula/tnftp.rb @@ -9,6 +9,7 @@ class Tnftp < Formula sha256 "92c012e712577f8241e239849d4b73dd5dba36a74b6bd66db6b834488a8d82cf" => :catalina sha256 "54e3a99702280bcc89879a9f520441113686869981ec534fa74db2df3fa7b774" => :mojave sha256 "ba323276cf1be330ad3fccab6cd4339e11bb67428ead33128b809b7fdfd7bf80" => :high_sierra + sha256 "925083cf63f151a7f217b39e8e1f182c59c809f28ed393cc1adbdd326a5245e5" => :x86_64_linux end uses_from_macos "bison" => :build diff --git a/Formula/toast.rb b/Formula/toast.rb index fc767f402dc72..86f4bc01a36fe 100644 --- a/Formula/toast.rb +++ b/Formula/toast.rb @@ -9,6 +9,7 @@ class Toast < Formula sha256 "1a941a71fbbab8e21f41756a0d3b63e6e3ee859547cc4a99c3042cdc4485d6dd" => :catalina sha256 "23905ffe680fe8babd9650b0cc306ddec5ec279adfc36a41add793d571e49d8a" => :mojave sha256 "b02f8e3bd163f086ff3575917b9b775f61027b3ee5436de836d90f39a1f2f9c3" => :high_sierra + sha256 "82d43f4b9a9f4165ac140615d7d80af52db85aea07587f6911ede8bca158037e" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/todoman.rb b/Formula/todoman.rb index 8f4fee0f68207..12131e1c6c48a 100644 --- a/Formula/todoman.rb +++ b/Formula/todoman.rb @@ -12,6 +12,7 @@ class Todoman < Formula sha256 "83d07e2585542b259ca6924cefa286dcee686ea03e4890ef3e5d834a1b7e7879" => :catalina sha256 "1b136f162af604d40c4155bf060dadd8ec2ddd90b0b094f5241a325cd4cc6e5f" => :mojave sha256 "e22d61bf9b21f362883d704c952fb54b4b1d37ecb12ba0227a6fb9bd17c120ed" => :high_sierra + sha256 "12c4aa645fd8744ab01128b1d7c98d249598fb730dd849da8cbd4a81db93e112" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/tofrodos.rb b/Formula/tofrodos.rb index 95bf6eee4b0e1..f69df836ab1b5 100644 --- a/Formula/tofrodos.rb +++ b/Formula/tofrodos.rb @@ -13,6 +13,7 @@ class Tofrodos < Formula sha256 "4a2b22ff08d0fb65c80be7359be2f04d12b70f4e6d490b96cb819ea69b3e3d88" => :el_capitan sha256 "4a5427c6870c3d4822ef4da3ddd8d79c18b91e5b7f14edb4aa449a53da70114e" => :yosemite sha256 "c9759ec570e6a284b250563b8d66076401641f40c1836e293f4eab82cc9fe4ff" => :mavericks + sha256 "a1d2241aa8c8eb51383156e8aad1385dd9b34e6900f6c3940bdd4c04b1e3d963" => :x86_64_linux end def install diff --git a/Formula/toilet.rb b/Formula/toilet.rb index c686054f39a39..9ca6fae6df6d2 100644 --- a/Formula/toilet.rb +++ b/Formula/toilet.rb @@ -12,6 +12,7 @@ class Toilet < Formula sha256 "93822fde3d2e69f46143dcb9d8551e7e4301c7a470ae53b3fda8ec6cb44584dd" => :el_capitan sha256 "7362333eea743740a9cdb064c5a74829e37b3f15645797622bb283b9cf3f3b1a" => :yosemite sha256 "ef2c34f742b366f84d2aeeb6d83fb94d6bd443f210e56968fb8b2b5700eab759" => :mavericks + sha256 "e4bf79430421dcc707d3f7ad0b49020ece999ae67ea00e9fb50c0a45299037d9" => :x86_64_linux end head do diff --git a/Formula/tokei.rb b/Formula/tokei.rb index a9abd5f5c3055..c8e44f5418816 100644 --- a/Formula/tokei.rb +++ b/Formula/tokei.rb @@ -9,6 +9,7 @@ class Tokei < Formula sha256 "c5864a5bcefee2ab0819cd07449839ab9189d04aa8ac3302c0bab85536b6c508" => :catalina sha256 "c40027988a8081bcd64f3fb5b4905d2efbba7d55231b0084d38578c268ea924a" => :mojave sha256 "3c2cb79394bdc792fb1880842077dabfc7b038f1126e29e66d4acba5349b0253" => :high_sierra + sha256 "f38ce4eafe56acdfac779289d1b26cf5af481ec1e00920b3d814d5257a014ed6" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/tokyo-cabinet.rb b/Formula/tokyo-cabinet.rb index 145effd5c9420..93253af0395ea 100644 --- a/Formula/tokyo-cabinet.rb +++ b/Formula/tokyo-cabinet.rb @@ -14,6 +14,7 @@ class TokyoCabinet < Formula sha256 "a209fa62fdb84a86784de5eb9699a9a6811c962afab2ebf418b2a712f51852d8" => :el_capitan sha256 "3267823914e250aff7c8d3a5a686a010f0fc96242a417dbf47bb1502aa020ad6" => :yosemite sha256 "8d8e93ed60945cfb729395882e69d3924d899c8f792eab73a6094aa78b47c75c" => :mavericks + sha256 "afa59c59ae2f2ffe0450d2dc4c34211ce645115ab6295e88daefbb2ce1991a95" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/topgit.rb b/Formula/topgit.rb index 9631d6d2898e5..875f469c48e0d 100644 --- a/Formula/topgit.rb +++ b/Formula/topgit.rb @@ -10,6 +10,7 @@ class Topgit < Formula sha256 "30c348bcfbdcfc5fe3a91b0bb8889841a5e492f2fed7626577cda1523d815dc2" => :mojave sha256 "30c348bcfbdcfc5fe3a91b0bb8889841a5e492f2fed7626577cda1523d815dc2" => :high_sierra sha256 "ec7f9140e122265f34c03469803cf7eb932006d240ab158cb9ee5a27f53b3b38" => :sierra + sha256 "391eb1a64174e3f7042d2617b31d11008fa25dfa5a9f126bbe003ea3a952bf65" => :x86_64_linux end def install diff --git a/Formula/topgrade.rb b/Formula/topgrade.rb index fd5d093e92852..6c2f30aa49d9b 100644 --- a/Formula/topgrade.rb +++ b/Formula/topgrade.rb @@ -9,10 +9,11 @@ class Topgrade < Formula sha256 "427143c2fc6d3f12608590a1a6eb3c7fcf4b0a4e2f8b7e7a596685297e6b42c6" => :catalina sha256 "10706af6c3d2220045fe5ab4c4977fe1a5ad08a5d52601ca0dc2477d95bfba1f" => :mojave sha256 "0deafb0c9c7fca254e521cc9cad7fe1fd36ee138878680059d0503a6d2c1326b" => :high_sierra + sha256 "0a977b6cebbcada0436370ba22d701cea7b57a432facd5593c5fc347ea91e99f" => :x86_64_linux end depends_on "rust" => :build - depends_on :xcode => :build if MacOS::CLT.version >= "11.4" # libxml2 module bug + depends_on :xcode => :build if OS.mac? && MacOS::CLT.version >= "11.4" # libxml2 module bug def install system "cargo", "install", *std_cargo_args @@ -31,6 +32,7 @@ def install assert_match version.to_s, shell_output("#{bin}/topgrade --version") + mkdir testpath/".config" unless OS.mac? output = shell_output("#{bin}/topgrade -n") assert_match "Dry running: #{HOMEBREW_PREFIX}/bin/brew upgrade", output assert_not_match /\sSelf update\s/, output diff --git a/Formula/tor.rb b/Formula/tor.rb index 159306fcbcba9..2ea519fe7e2c0 100644 --- a/Formula/tor.rb +++ b/Formula/tor.rb @@ -9,6 +9,7 @@ class Tor < Formula sha256 "1a358ca1ea1c73cbc52b0a011314954da92fed0fa8e5bffd01b3ed1f97a6fc62" => :catalina sha256 "0f21e143f0d968ab33014e2c5ac101addb3de0cb4299722e0674eb4d29972064" => :mojave sha256 "96465afffe32f2dbb9284406e145297f583cb8c5fdfceec3c133371975f824b0" => :high_sierra + sha256 "e54f6a58e857a97a31fe0a3edb80cc9a8826d0e199cdfac845397fe0d79d6567" => :x86_64_linux end depends_on "pkg-config" => :build @@ -62,7 +63,11 @@ def plist end test do - pipe_output("script -q /dev/null #{bin}/tor-gencert --create-identity-key", "passwd\npasswd\n") + if OS.mac? + pipe_output("script -q /dev/null #{bin}/tor-gencert --create-identity-key", "passwd\npasswd\n") + else + pipe_output("script -q /dev/null -e -c \"#{bin}/tor-gencert --create-identity-key\"", "passwd\npasswd\n") + end assert_predicate testpath/"authority_certificate", :exist? assert_predicate testpath/"authority_signing_key", :exist? assert_predicate testpath/"authority_identity_key", :exist? diff --git a/Formula/torrentcheck.rb b/Formula/torrentcheck.rb index f904ddf0e0bea..91cb37ac7de91 100644 --- a/Formula/torrentcheck.rb +++ b/Formula/torrentcheck.rb @@ -13,6 +13,7 @@ class Torrentcheck < Formula sha256 "ea6fbaa86be1c799c3baa4405aa1a750c2b3e1deb4bea0a412027d427f0922da" => :el_capitan sha256 "46426cdf1c627f448d54895b7f08379b90948030be346753104f5f6a5fabca3b" => :yosemite sha256 "ed300dfc8d1f7f7fe3c9c161b8f86cc6a379c7a4cca3914bb0c665d66ec6596a" => :mavericks + sha256 "32958ad4089386b2c5dd4c60980943d13c37a3fdef39f69d9bba087b59190fd0" => :x86_64_linux end def install diff --git a/Formula/torsocks.rb b/Formula/torsocks.rb index fb029c30f3cb4..9820a8cf864cb 100644 --- a/Formula/torsocks.rb +++ b/Formula/torsocks.rb @@ -11,6 +11,7 @@ class Torsocks < Formula sha256 "a69a7a23628c4a79c216b114ccdd0bbd20b76513f5f16eaea2eab8be17473323" => :mojave sha256 "14a21746072ddb73f7fc3157dbe41bcce90e0bcb0a3761646faf421294e3ecff" => :high_sierra sha256 "c2eb93f0ef7d44ca1c74ccc210d0a2a3fa2a45a7ef46c7ec68f68fb4162e5905" => :sierra + sha256 "9fbc9210bbd1705fe35121ceee6f3979e48ee72a56089cef1f544758e2f154e7" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/tox.rb b/Formula/tox.rb index 78faf23cac7ae..450e5b09aaf6b 100644 --- a/Formula/tox.rb +++ b/Formula/tox.rb @@ -11,6 +11,7 @@ class Tox < Formula sha256 "217687f11315be952a5a0f031b88803af0f28e67eb8303192f698e7859e1ba09" => :catalina sha256 "bb71e4917969db2264120b14fae1a63492ceff0732ee6554f19021dc678488e1" => :mojave sha256 "9c74568440738a148e9784ae4bf07472e445fe339f5e5136c395d0efaaed9424" => :high_sierra + sha256 "ec651611d1c3693ef86cab4bd8fc2a24f16da7dc9b6091743e27869afa593fc1" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/tractorgen.rb b/Formula/tractorgen.rb index a0492d1fea7bd..554b4720ac3ab 100644 --- a/Formula/tractorgen.rb +++ b/Formula/tractorgen.rb @@ -13,6 +13,7 @@ class Tractorgen < Formula sha256 "ccac503b4577fc81e69d3e778c27c31fad9a1c5fa8627e97f293d87ab1177f8d" => :el_capitan sha256 "e50de2fd2d9015873282a62fc7a21f3ef419d527d07eeab3830ace52ec25c3c9" => :yosemite sha256 "acbfbe90462924fbc6f2658ca0ee591a122639356ce6ff042b558199b477bf4a" => :mavericks + sha256 "82f73ee51bdb80b3f227beaadb77bb6c50ced655a6bc75922d23a7ffcf5c2f52" => :x86_64_linux end def install diff --git a/Formula/trader.rb b/Formula/trader.rb index f4484ea966599..072b7bf96199b 100644 --- a/Formula/trader.rb +++ b/Formula/trader.rb @@ -8,6 +8,7 @@ class Trader < Formula sha256 "661f7dc5534bda2b721f00c12b868343a762d4f4b2cd8f6c869c2681b7a9c091" => :catalina sha256 "1e78bde8014188f21cc16fdf99e52128e3e135031d447c71f1c39fa8d1135b70" => :mojave sha256 "8175870d189ac87e617dda58fd61d4cd56109876bc5bf7fe55718ac9db137a27" => :high_sierra + sha256 "46fd5ba0c584487e8263c82d78de5e1d0379cbf67a7c44a244690984ac032d57" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/traefik.rb b/Formula/traefik.rb index e4b6ae6b2d0cd..dbfbb18b26064 100644 --- a/Formula/traefik.rb +++ b/Formula/traefik.rb @@ -11,6 +11,7 @@ class Traefik < Formula sha256 "87ce6a068e0b31a5bf9ff83e8a2872547c1cf0eda8ee6c4e083d84a74fe55f6b" => :catalina sha256 "696befdb36b4836bd100742dda7054beb99ab2f3b7a39a5567fdbded3832645d" => :mojave sha256 "05cb35de1482b5407f9c78684127c13557444042d4017ca8b5115338c1035959" => :high_sierra + sha256 "c2df7f24d73b56ac4751332b63ce96745832586af418a676901d30932416179d" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/traefik@1.rb b/Formula/traefik@1.rb index cf638bab9b863..859c47b436f11 100644 --- a/Formula/traefik@1.rb +++ b/Formula/traefik@1.rb @@ -10,6 +10,7 @@ class TraefikAT1 < Formula sha256 "f50589618ba4147731cadda2451d08f95a6d56ad79f823b657ab64db73f590ed" => :catalina sha256 "993885ac94857dd2828fdf05188326a6ebd9e8da38d5deaafbcfa4094b4738d2" => :mojave sha256 "2c00bae6b3c468a32cdaaa59f58d33cc3de61899723a355d99cf34f0bd93c773" => :high_sierra + sha256 "f1e942a945e45ffdb77df73e55623269acde2298bad1a4e86045138a5c4ba376" => :x86_64_linux end keg_only :versioned_formula diff --git a/Formula/trailscraper.rb b/Formula/trailscraper.rb index 472865101142f..f3cd63f349c92 100644 --- a/Formula/trailscraper.rb +++ b/Formula/trailscraper.rb @@ -11,6 +11,7 @@ class Trailscraper < Formula sha256 "9d91cab0673155227938faa11a4eb961bcd13c20ffc96b013ae7873c1a5a2435" => :catalina sha256 "19e452793c27d450ae9b010ae44bab6221e993e86c824883908fcda6007e0d90" => :mojave sha256 "df511d725019e58f9d3e6945fe4cac6c6b54a665028ca64c337fc461397720ff" => :high_sierra + sha256 "95bf01ca261bedd978c5bc7cc2d2be00d7f3d86e9283e98ac1472baaf1e37483" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/translate-shell.rb b/Formula/translate-shell.rb index f22487b85d06b..ba7d05abf6b03 100644 --- a/Formula/translate-shell.rb +++ b/Formula/translate-shell.rb @@ -10,6 +10,7 @@ class TranslateShell < Formula sha256 "858d52386202bbcb1313a72b642d9d5f4cbfe2ca35fd9556f6cf5275d7d2b9a1" => :catalina sha256 "858d52386202bbcb1313a72b642d9d5f4cbfe2ca35fd9556f6cf5275d7d2b9a1" => :mojave sha256 "858d52386202bbcb1313a72b642d9d5f4cbfe2ca35fd9556f6cf5275d7d2b9a1" => :high_sierra + sha256 "ffe16e87c199b968042ec4a74d7f54609a5cdb457fa16f5a820dc40e153b3d07" => :x86_64_linux end depends_on "fribidi" diff --git a/Formula/translate-toolkit.rb b/Formula/translate-toolkit.rb index 2cfed0375b7b7..d2e8b2a169f95 100644 --- a/Formula/translate-toolkit.rb +++ b/Formula/translate-toolkit.rb @@ -12,6 +12,7 @@ class TranslateToolkit < Formula sha256 "ea2f48f2d845370599c79250cff84803ebcf726bd31692d1c97cd2596d1e0f22" => :catalina sha256 "247a179be9f3125d7a87bf2c6cbace25cec702b39197c7f021f0eba2730b1dfb" => :mojave sha256 "f24e86898ef8e33d9090c369a4c9fbb235fa18307f8fda529a63b965f005c9a8" => :high_sierra + sha256 "9b8b4b51fd8c26eda8df4c95c85e892eb862f4a1114e618860a8472297c804ea" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/transmission-cli.rb b/Formula/transmission-cli.rb index 00d93cefe23f9..6e6eb798255dd 100644 --- a/Formula/transmission-cli.rb +++ b/Formula/transmission-cli.rb @@ -8,6 +8,7 @@ class TransmissionCli < Formula sha256 "576f0f5017a86da149292b6da4fde251ad7a77bd9a88e82639ed4fc586cb08e7" => :catalina sha256 "d56c90e32e206cdcf5ec8591fcb79de80c9b41483946c354fac4b9f09020c236" => :mojave sha256 "d8ded603c8aae8b4eaf59c1c078dfdfb44b97191d4ce42439f6b02984ccf16b3" => :high_sierra + sha256 "4346986f08e64cded6e5b91db903e0d06e385dd288fa642ae78f1a42a97652af" => :x86_64_linux end depends_on "pkg-config" => :build @@ -18,8 +19,8 @@ class TransmissionCli < Formula uses_from_macos "zlib" def install - ENV.append "LDFLAGS", "-framework Foundation -prebind" - ENV.append "LDFLAGS", "-liconv" + ENV.append "LDFLAGS", "-framework Foundation -prebind" if OS.mac? + ENV.append "LDFLAGS", "-liconv" if OS.mac? args = %W[ --disable-dependency-tracking diff --git a/Formula/trash-cli.rb b/Formula/trash-cli.rb index 26dcb6ffad61c..dd1079780ad2c 100644 --- a/Formula/trash-cli.rb +++ b/Formula/trash-cli.rb @@ -5,7 +5,7 @@ class TrashCli < Formula homepage "https://github.com/andreafrancia/trash-cli" url "https://github.com/andreafrancia/trash-cli/archive/0.17.1.14.tar.gz" sha256 "8fdd20e5e9c55ea4e24677e602a06a94a93f1155f9970c55b25dede5e037b974" - revision 3 + revision OS.mac? ? 3 : 4 head "https://github.com/andreafrancia/trash-cli.git" bottle do @@ -14,6 +14,7 @@ class TrashCli < Formula sha256 "abef6ba69850e6dfa74ed7ed5d5a21b9c93aa45822fa7561b298e70889a6ca7f" => :catalina sha256 "3e1575beadbf5223f948d050b792671755874ad645c852c3ce2f5c3495a5cd21" => :mojave sha256 "14a43467042890dd35c6ae2f832a5a91c5d8b4d7fa0b731c7f9eeb9dee2d8a15" => :high_sierra + sha256 "fbba724da07550d77b02747f0504ff7e1b864dcd1ec9c900521f5af2f80a570f" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/travis.rb b/Formula/travis.rb index dcaa97ab79df3..952c3e32d76a6 100644 --- a/Formula/travis.rb +++ b/Formula/travis.rb @@ -5,10 +5,11 @@ class Travis < Formula sha256 "efe64321ba52e1ce62e46209a70c27d7909129bd0dd7c6166657e871b149a692" bottle do - cellar :any + cellar :any_skip_relocation sha256 "e73ded3bc90d895c4210b55d99589fd5b440e0c9fe655b9aeb923b79c061af56" => :catalina sha256 "322f16ef370e8130d009d09da3538a779fcc9c96e642b9baf5dc65970f61a95b" => :mojave sha256 "201f7ddbd12e090edcabc22264b0029d3063cd423301d7b82a7aeceb0107ccd0" => :high_sierra + sha256 "4ddeca7be1cd616dba8605cfbf234f3d4732ada353c06f89fcb57af4787ab6e0" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/tre.rb b/Formula/tre.rb index 6c6103b68beef..757ebc42c486d 100644 --- a/Formula/tre.rb +++ b/Formula/tre.rb @@ -13,6 +13,7 @@ class Tre < Formula sha256 "8a1762dbd40b98869e01a19c29cdb1cfa5a127543b3e132fb0fdff996e46f566" => :el_capitan sha256 "6fada15a2fd1c5905f8ed45d3c966da5e14efeb10522f82c26d2a23a918abaad" => :yosemite sha256 "c57f9bfa724cd20843a672f5e8bd384e05e65bac062dd7d7b676db9b1c11f998" => :mavericks + sha256 "946afb33c1e2159798dd0f60d9e7654e65eb4b08d10e7b3fa41893665d3eae3c" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/tree.rb b/Formula/tree.rb index 340c4304b9360..44bd6e6f1a963 100644 --- a/Formula/tree.rb +++ b/Formula/tree.rb @@ -10,6 +10,7 @@ class Tree < Formula sha256 "7152288c457dd893de50fa9d6ac9a8599748564e1b3586eec8eff7057089051a" => :mojave sha256 "107d965994381d34e90b58a62f1c306c1b8a698db2696cdd905ba65c801ecc3b" => :high_sierra sha256 "07d980571469a0cc699c69a8726eee338f782ba61c041e58f01ddb2924d08aeb" => :sierra + sha256 "3d8879638ad61487220090225bff52e1f5a4332e75b4b699bb85bccc9921193b" => :x86_64_linux end def install diff --git a/Formula/treecc.rb b/Formula/treecc.rb index 9344ca4f147e7..518096b7c71d4 100644 --- a/Formula/treecc.rb +++ b/Formula/treecc.rb @@ -13,6 +13,7 @@ class Treecc < Formula sha256 "e74d23594113e594ad8021fe55b0f0f863fcd4b01140c3fd8b1a5f2bb6c8ad74" => :el_capitan sha256 "595dada9ecb2cef6d3e225e99a98997968d15f8009038511c464b6499cbcd872" => :yosemite sha256 "9f9a9e6a66c9e0a60888ad2af502070683637b5cd19dec6e080211a45c3313e6" => :mavericks + sha256 "7188105af687c1a9ef6c8e146931eb51ffb5513ac788247395483def96d4289c" => :x86_64_linux end def install diff --git a/Formula/treefrog.rb b/Formula/treefrog.rb index 07449e4990569..ec7baf636b2a4 100644 --- a/Formula/treefrog.rb +++ b/Formula/treefrog.rb @@ -11,8 +11,8 @@ class Treefrog < Formula sha256 "a690eac1c340e7695a25b2f561d86b33cb5d2c970f6b6961799257787af89a65" => :high_sierra end - depends_on :xcode => ["8.0", :build] - depends_on :macos => :el_capitan + depends_on :xcode => ["8.0", :build] if OS.mac? + depends_on :macos => :el_capitan if OS.mac? depends_on "mongo-c-driver" depends_on "qt" diff --git a/Formula/triangle.rb b/Formula/triangle.rb index aa19a4f20ea2c..fef91f0648f8e 100644 --- a/Formula/triangle.rb +++ b/Formula/triangle.rb @@ -9,6 +9,7 @@ class Triangle < Formula sha256 "a90c331e51936a58d69e47b7ce4d9925072b6024ad6b1d1fe9d75b17f2becf15" => :catalina sha256 "6dc2d0aba307e988e2d4205881be47aef561ab3cea7d7bc5c378e23414782ad9" => :mojave sha256 "d8859fc5b05f1faac1db7cd3130e6e8c8359724fc2162e5d6dc97d3e5198651d" => :high_sierra + sha256 "c680c5a3bf252f325554769784947d2ed71936bb5a36d355f03328ee814d57dc" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/triton.rb b/Formula/triton.rb index 6ceff9d5375de..0c8c19a2f202e 100644 --- a/Formula/triton.rb +++ b/Formula/triton.rb @@ -11,6 +11,7 @@ class Triton < Formula sha256 "21d5112b9f248c6a305953dd5cd3d2295baacf8b8c19fc247a10889ede4265ce" => :catalina sha256 "45a55e0e4e85d81fb6a731778a418b82b543ad23e193b43ee466f79a91fe2468" => :mojave sha256 "ff03483801c0896b7a147ca42204208a70b846c97f16dd30119f2c8c96ebc73e" => :high_sierra + sha256 "70f173d42692dde93dc832d9c2d01ce0a7eeecc8bc96559059518249c7665215" => :x86_64_linux end depends_on "node" diff --git a/Formula/truecrack.rb b/Formula/truecrack.rb index eae219f0b01cd..f272c0de6aaa1 100644 --- a/Formula/truecrack.rb +++ b/Formula/truecrack.rb @@ -15,6 +15,7 @@ class Truecrack < Formula sha256 "2905997955799043b8f07c7cb28854d0a0acd3a84131b92b6c49780570dd198f" => :el_capitan sha256 "d7d6879b7132093ebcc716ffe115dc20974c68e7e629f7f7cc3bce5030d153d3" => :yosemite sha256 "8357dddf047bdd2180f241edb5848e49a48083300484143a245f41e5def1888d" => :mavericks + sha256 "0d8af072631fa8be0d5a0e45c80090db360f2cec16f5a12d04f9d787dd6f0c43" => :x86_64_linux end # Fix missing return value compilation issue diff --git a/Formula/truncate.rb b/Formula/truncate.rb index c1a1724959132..f2297deb676a6 100644 --- a/Formula/truncate.rb +++ b/Formula/truncate.rb @@ -14,6 +14,7 @@ class Truncate < Formula sha256 "299b80454c20134c5d0916da25fb3d5f0b6843e620dac6babebe01a899253a69" => :el_capitan sha256 "a9d1c87d6cfec42674f0e7db25b786ba100a04c8c0da318fd5f6299a7418843f" => :yosemite sha256 "d8751674842b772bd3a5318c1234f262518d05d66a7fe3b06ce5f59b2176bba8" => :mavericks + sha256 "41e96e4e675dec121553ea5ecae40f39d3495610c5c35632c7862b7731488107" => :x86_64_linux end conflicts_with "coreutils", :because => "both install `truncate` binaries" diff --git a/Formula/tsung.rb b/Formula/tsung.rb index 5158f304e6fa9..556ce2f6b972a 100644 --- a/Formula/tsung.rb +++ b/Formula/tsung.rb @@ -13,6 +13,7 @@ class Tsung < Formula sha256 "64dba403e11577b28f3a80114158b96d8c74f58d09a4d9930801674031d4a7d9" => :high_sierra sha256 "e52abdb35507ceff03804d29a1ecf4e64d11e3345a9f095462cb653bba6cac6d" => :sierra sha256 "11f06a010b1a56d7a751bf5379d7d053c1befdf41f73aabeb79330761566724d" => :el_capitan + sha256 "d37fdb75dabcd7066eda5e2c77906c51281892b7495a7481b19a7f017d3461e5" => :x86_64_linux end depends_on "erlang" diff --git a/Formula/tta.rb b/Formula/tta.rb index 77a4c349b4708..dcb35267af06e 100644 --- a/Formula/tta.rb +++ b/Formula/tta.rb @@ -13,6 +13,7 @@ class Tta < Formula sha256 "0543d1561fe44fc6137f90076d247f16e6ac28e72413a7ba3bac08d422bb4e9c" => :el_capitan sha256 "e25b0a3c395c62d2cb130f4817e405a9e09494c92c17fc71bf123d72b6da5f06" => :yosemite sha256 "1b4bdda9786729fffe279cd17faea744108198064d2effcc42b078eb85862671" => :mavericks + sha256 "aca2a5f136f9dce50d27b1e7c4bfae6f58f2b8f510a1f46fc940e0fbfa3cdc0c" => :x86_64_linux end def install diff --git a/Formula/ttf2eot.rb b/Formula/ttf2eot.rb index aa6589bd11cba..6ac57f81e3a98 100644 --- a/Formula/ttf2eot.rb +++ b/Formula/ttf2eot.rb @@ -11,6 +11,7 @@ class Ttf2eot < Formula sha256 "7b44ec925ee2bbeeaba775befc77c0c22f2f690ecd94edb72e471c631da80f43" => :high_sierra sha256 "26f40d7a58de2ee396fc04dd47c41e9b65640570fa1ca8b71134dd88e6e88c06" => :sierra sha256 "5fc89e642b7d51c0c7965d9a952d1b697f94b4ec16d7711ff37387979ce47f5d" => :el_capitan + sha256 "8e4f7d96ed88ff6f073c3e990b99adee42fc12681e2fede952f06d4cc4088c14" => :x86_64_linux end def install diff --git a/Formula/ttf2pt1.rb b/Formula/ttf2pt1.rb index af22a507e1b1f..bf6e6b0869945 100644 --- a/Formula/ttf2pt1.rb +++ b/Formula/ttf2pt1.rb @@ -13,6 +13,7 @@ class Ttf2pt1 < Formula sha256 "0ef606dfb439ad46c5442b35458f009e864ee3270145c7be940581a5d272bc54" => :el_capitan sha256 "65c1456cab73a91161e4dddbc4f04842029a810a8e4e4c396e90fbf039e61f60" => :yosemite sha256 "c81f56318e2311c422c1a53647650478660ec16fc935380c01cf10c1f53edd73" => :mavericks + sha256 "883fb6c81ba624665ed010961147d06503ddfdc4abce7d343e460808e048d33d" => :x86_64_linux end def install diff --git a/Formula/ttfautohint.rb b/Formula/ttfautohint.rb index 3d5790fe13544..9cd4c83d94191 100644 --- a/Formula/ttfautohint.rb +++ b/Formula/ttfautohint.rb @@ -10,6 +10,7 @@ class Ttfautohint < Formula sha256 "04ca530843887602e80fde17d24f4ed8e19d1248bd71c81c925c161770dbdf56" => :mojave sha256 "a6573ae816a7555d62308759c2d64f9fb955ba056d856d904a522996ba0a0c83" => :high_sierra sha256 "d45d8d85d3ffa162326ea8e2f63778f4fe583c41bc316c15c5a63b3625beb0ff" => :sierra + sha256 "9d32d489204ed2dc3d745a68729411bcb197fd2f0503e9766f1ebd5121027daa" => :x86_64_linux end head do diff --git a/Formula/tth.rb b/Formula/tth.rb index f70282e037326..80d887f1ae994 100644 --- a/Formula/tth.rb +++ b/Formula/tth.rb @@ -9,6 +9,7 @@ class Tth < Formula sha256 "ee1d635ae810913a1a1651452f4d3f94249f2c757353ae3d34bdc17404dc81e5" => :catalina sha256 "04da16c55583ce0eb533ec931475fb1e7af82cf028bdbb458515f0cf9984ff74" => :mojave sha256 "76384c1ea48529e728ff50998b0d6bb4d9fbe920ed75cb4bfb9ee1da6309421b" => :high_sierra + sha256 "99252db5894e096f994280643084a6053707b082b8f678da8ceec5833f83985c" => :x86_64_linux end def install diff --git a/Formula/tty-share.rb b/Formula/tty-share.rb index 2a2d48911db9f..0b1cfa0f916aa 100644 --- a/Formula/tty-share.rb +++ b/Formula/tty-share.rb @@ -9,6 +9,7 @@ class TtyShare < Formula sha256 "adfa3de302df681f3e236d28f69dcb7cd63143582d26b698a034adc5337fe18a" => :catalina sha256 "b9b97a2733c85508451799419dfbc36326c8d9bfe30c26800bc22ddf2bd7b30f" => :mojave sha256 "6820c38434e99f26e0cc247ae89831376c914a6eb1ee0d4b20056a2ca2e7c0e3" => :high_sierra + sha256 "1b3b2cfee287bff8cf0ee7192d78d8915ee85aeb0a795e2188eb3efde80ee7cf" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ttyd.rb b/Formula/ttyd.rb index 5b742c0ba02df..1c928c3744d8c 100644 --- a/Formula/ttyd.rb +++ b/Formula/ttyd.rb @@ -10,6 +10,7 @@ class Ttyd < Formula sha256 "fcee8b0eba8796215e26ed96dd75d045c2c5ad799b2a19529a2b4b2d1300e04b" => :catalina sha256 "641c9906011d497631c1abfd40a18c94c98b01a7f01f3242c22f86fa1b2678ba" => :mojave sha256 "cd20960e64da5512ac6630ed04bf21aad7cb09c2b3ca5430b68006b7b5e61704" => :high_sierra + sha256 "f65437529e8c8ad275c130799e2b8c6beb7d9fa76b435f67b8015d62a5ce0e9e" => :x86_64_linux end depends_on "cmake" => :build @@ -19,7 +20,7 @@ class Ttyd < Formula depends_on "libwebsockets" depends_on "openssl@1.1" - uses_from_macos "vim" + uses_from_macos "vim" # needed for xxd def install system "cmake", ".", diff --git a/Formula/ttyplot.rb b/Formula/ttyplot.rb index 5111f0b9dba4a..314483dede2e8 100644 --- a/Formula/ttyplot.rb +++ b/Formula/ttyplot.rb @@ -9,6 +9,7 @@ class Ttyplot < Formula sha256 "760b571d2cc940c6a1ad14655f2e2c0cac4aa64dea8e63d37454528cf969d8b2" => :catalina sha256 "b31388536afde7ef669c334f520e73f95ceef82d0c9f73f5390a65d13d3235ef" => :mojave sha256 "6d01769af5216ac128e8cb9a0a55397959594fa8f20fafcf65780db4b66ac090" => :high_sierra + sha256 "b1eb4429c41791d5811e0f57dba784f6fd28dd4ba1f87643e2c7f9b120eed710" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/tundra.rb b/Formula/tundra.rb index f8bef2be033e1..72c2afb933bb7 100644 --- a/Formula/tundra.rb +++ b/Formula/tundra.rb @@ -9,6 +9,7 @@ class Tundra < Formula sha256 "bafe878e5e83d8edb27eac2b645afd1898045c50d50d169a65398a31a7c23baf" => :catalina sha256 "3f22d2d8ee09acdb42cb4c9c6b0a87496696999ee0ce95c26842d0200f26d356" => :mojave sha256 "37c6abc51fbabc29bed3c7e7dbb7d7264d0113f98470ce8a82449227da172433" => :high_sierra + sha256 "d5786d31b88755395ba0c2119d023cc2df4dd8c801944c1a0af5e9d8f01db4b8" => :x86_64_linux end resource "gtest" do @@ -30,25 +31,50 @@ def install return 0; } EOS - (testpath/"tundra.lua").write <<~'EOS' - Build { - Units = function() - local test = Program { - Name = "test", - Sources = { "test.c" }, - } - Default(test) - end, - Configs = { - { - Name = "macosx-clang", - DefaultOnHost = "macosx", - Tools = { "clang-osx" }, + if OS.mac? + (testpath/"tundra.lua").write <<~'EOS' + Build { + Units = function() + local test = Program { + Name = "test", + Sources = { "test.c" }, + } + Default(test) + end, + Configs = { + { + Name = "macosx-clang", + DefaultOnHost = "macosx", + Tools = { "clang-osx" }, + }, }, - }, - } - EOS + } + EOS + else + (testpath/"tundra.lua").write <<~'EOS' + Build { + Units = function() + local test = Program { + Name = "test", + Sources = { "test.c" }, + } + Default(test) + end, + Configs = { + { + Name = "linux-gcc", + DefaultOnHost = "linux", + Tools = { "gcc" }, + }, + }, + } + EOS + end system bin/"tundra2" - system "./t2-output/macosx-clang-debug-default/test" + if OS.mac? + system "./t2-output/macosx-clang-debug-default/test" + else + system "./t2-output/linux-gcc-debug-default/test" + end end end diff --git a/Formula/tunnel.rb b/Formula/tunnel.rb index 405760c811961..37ab109a10367 100644 --- a/Formula/tunnel.rb +++ b/Formula/tunnel.rb @@ -9,6 +9,7 @@ class Tunnel < Formula sha256 "b13e5a208e756bc66a56f9e85ed2d5f1456b5a58055213b1c1579223da0c4ba3" => :catalina sha256 "d4d2c6b802eb2f4fb03628481ec7251b52fb05e536ef161ae9e6eb96d4afb8b1" => :mojave sha256 "8425650fbc2fad854ab561a0590e4a899e235882a72f40d95fae4bcb1115c094" => :high_sierra + sha256 "178130a89254ebb3c0cece07c3efcf406ca61745e9a7d65b7a99ed47c36aa31c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/tvnamer.rb b/Formula/tvnamer.rb index 4b518ec323a1b..a615dee442cac 100644 --- a/Formula/tvnamer.rb +++ b/Formula/tvnamer.rb @@ -10,6 +10,7 @@ class Tvnamer < Formula sha256 "b03c31d1d4d46357e64a1e579e7a64286ea92c05db2edcb13b25c370173e5984" => :catalina sha256 "b03c31d1d4d46357e64a1e579e7a64286ea92c05db2edcb13b25c370173e5984" => :mojave sha256 "b03c31d1d4d46357e64a1e579e7a64286ea92c05db2edcb13b25c370173e5984" => :high_sierra + sha256 "9075b5d858a6230d57e22f75347dead2d7a081de64f6eec91715d43c7ba6794f" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/twarc.rb b/Formula/twarc.rb index 09d6358cb1278..91affc8264f90 100644 --- a/Formula/twarc.rb +++ b/Formula/twarc.rb @@ -11,6 +11,7 @@ class Twarc < Formula sha256 "b933a7356d48007df172af1dca63ef19bacde743eb89186d06ec2d86228c4aa9" => :catalina sha256 "8c6e4d3f144ce6a274bd2a41fad84c0e09d5dfc65d640d71bf7ed4e91379c662" => :mojave sha256 "669a7ea57379c8dfe93208c82d7cf5df9dd69246549f1642be20912368a9a1f4" => :high_sierra + sha256 "03ecd1992f5aebd3bd34219d630543f37d71aba6df33d4aa6b3b66a74134ca4d" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/tweak.rb b/Formula/tweak.rb index b68a9bdf6354a..adee4390281eb 100644 --- a/Formula/tweak.rb +++ b/Formula/tweak.rb @@ -9,6 +9,7 @@ class Tweak < Formula sha256 "a38441e05b3953b324cee772161ebb1ccf12bf2262c476af921fee963fdee413" => :catalina sha256 "82ec40f5ceaee7630a9bba6652c350388176c38908681fe4389a37d2e9605009" => :mojave sha256 "e36456b9e78dafa97c7c972a9c26bc274cc30dff8f50c2a736d2aaca8068dfa8" => :high_sierra + sha256 "3d83d6aa06b9b9c130d0e69a95a37e830cf677bb96c93a101ab83996c55a75c5" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/twemcache.rb b/Formula/twemcache.rb index dc24c043ed3ae..252c4e6b10591 100644 --- a/Formula/twemcache.rb +++ b/Formula/twemcache.rb @@ -12,6 +12,7 @@ class Twemcache < Formula sha256 "2c7fd2ce03cc16859264882f478137de35ece42a26ad9b10f23d668ddc1883d4" => :mojave sha256 "9cc173642f9e53b723321a3013f2327b8a712c528c53ac5bd9fd2b9420244fcb" => :high_sierra sha256 "ec7e5d41f887db3a41d89eadb64d16119a2d86427afd45de92e7a8ca55ce7ef2" => :sierra + sha256 "8af52d72baa82aa688966c52259d2e1f767461bd832e97840aa1bfb42b63113e" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/two-lame.rb b/Formula/two-lame.rb index 3c437680a8a31..82c25e116b05d 100644 --- a/Formula/two-lame.rb +++ b/Formula/two-lame.rb @@ -9,6 +9,7 @@ class TwoLame < Formula sha256 "9ba9f3afb14f2ac2fa911046a83ee50ed6a93d747f0c305788a61b4138e5fe5a" => :catalina sha256 "77d5c37574ecdf0d857e09f47e9de5eda3049fe8cd1486942a6a62a4baae6f06" => :mojave sha256 "153c7085434a1bce73b0ce704f37997179d6e53614a7014546b9b4d3f80dec97" => :high_sierra + sha256 "72e2ef2dbcec532dda31f4eaf82f32ae7d74561b9659f62829c6fcafd40fc156" => :x86_64_linux end def install diff --git a/Formula/twoping.rb b/Formula/twoping.rb index 210f10c24624b..b8c2e64fe11f9 100644 --- a/Formula/twoping.rb +++ b/Formula/twoping.rb @@ -10,6 +10,7 @@ class Twoping < Formula sha256 "2e76c2949b024e9d3bb26d2f2861b859a51d3f8b0508f5ba8f76d1b2e1d63f3e" => :catalina sha256 "2e76c2949b024e9d3bb26d2f2861b859a51d3f8b0508f5ba8f76d1b2e1d63f3e" => :mojave sha256 "2e76c2949b024e9d3bb26d2f2861b859a51d3f8b0508f5ba8f76d1b2e1d63f3e" => :high_sierra + sha256 "8e1400a238fe4fa96c58bd3f5ceeccb3c82bfcc18cae9ca59d80387cd61e2776" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/twtxt.rb b/Formula/twtxt.rb index f75c3769f8e85..913011e4bcc36 100644 --- a/Formula/twtxt.rb +++ b/Formula/twtxt.rb @@ -10,6 +10,7 @@ class Twtxt < Formula sha256 "f02a3756e562ada9942eeac14cadb2113f22b67935b4d1e3a30a2890b3312855" => :catalina sha256 "42f444d72bfcb08a0f105628d4883e03c5ff522b6eda4f390f9434b79bc1fdb6" => :mojave sha256 "93e9cd335a6dd161246501db8e5fcbc9d38d5c4ab07136e47a3742359c043c59" => :high_sierra + sha256 "41b4f086190c4df9085d66df6796ab65d97a3386450502378386f0016be83222" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/typescript.rb b/Formula/typescript.rb index 85325d1f536e1..90ba415df1071 100644 --- a/Formula/typescript.rb +++ b/Formula/typescript.rb @@ -12,6 +12,7 @@ class Typescript < Formula sha256 "779039544d1368e6ec44f113ba767c79b4e1076962e62a09bf7e5bb0fe1f3b27" => :catalina sha256 "ab53bdb6c982c386ba60d4d8181d72ad1f9d2a104327c4ad5e51c26945a1945a" => :mojave sha256 "fa630d551345769bbd4a87cf3b6b588b9dee142f5391e78fa01c52f0e464cc51" => :high_sierra + sha256 "2b3bfb4225797cbc1e53bf6fba8f250227f7af8ba4bc0a3049198f0dd79ea13d" => :x86_64_linux end depends_on "node" diff --git a/Formula/u-boot-tools.rb b/Formula/u-boot-tools.rb index 026e3133b44c2..d32160a87e6fe 100644 --- a/Formula/u-boot-tools.rb +++ b/Formula/u-boot-tools.rb @@ -9,6 +9,7 @@ class UBootTools < Formula sha256 "bfbf1bae659e2da917d7839cd71584af6c4908f64a2be71def873c65e8a5578a" => :catalina sha256 "8bb5bdd813f60c047610f356636bc6167a09a4f13827453087e59fc29dbf1871" => :mojave sha256 "0cc829f876955bcd937e3ff793270b74819d07efba9ef6fd04bd1d7d538edd1b" => :high_sierra + sha256 "67e323028d6f3ec692c6f33cda215db499a4109400bb5e95085b229130436bb8" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/uade.rb b/Formula/uade.rb index 0cffe189c181d..0ede729f86d68 100644 --- a/Formula/uade.rb +++ b/Formula/uade.rb @@ -18,6 +18,7 @@ class Uade < Formula sha256 "59ddaa5a6d841f436a5d297330ff62b613e446785ad17666c8fb4157d3a7c8db" => :el_capitan sha256 "454945f35580b0b2bc8f0c7ddeecfae091634f54ee3a367eb14acce7251e5779" => :yosemite sha256 "807b7f5cb5a83348c778003d781d715cec73d37da537e0b11b8138c93aad4938" => :mavericks + sha256 "97fb6d86bdb2372c60b425b571064aea4c0498b958e2d416704b4982cf7cdb33" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/ubertooth.rb b/Formula/ubertooth.rb index 2049e2d44ea8c..26c2bb2a97b84 100644 --- a/Formula/ubertooth.rb +++ b/Formula/ubertooth.rb @@ -12,6 +12,7 @@ class Ubertooth < Formula sha256 "9e6dcaeeff6974606332371fc0ce861d679bc9d00471f4185a7531b320e581fb" => :mojave sha256 "d3891c8cd1e395c8d7acd9f364d6d42d3bcb7d9d1ddd5adea9dfabc7f0aead69" => :high_sierra sha256 "b4e68f3183b67bd99d276c0889e6c36ea6a1c99931446bec237d9bf7b4cc5d81" => :sierra + sha256 "ccd69baa13c025d9a8a15c17384dabe38546b293fdbfda7c9e9fe407ffd7f571" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ucg.rb b/Formula/ucg.rb index b6f7fbba637c7..00a49db67883f 100644 --- a/Formula/ucg.rb +++ b/Formula/ucg.rb @@ -13,9 +13,10 @@ class Ucg < Formula sha256 "3642e741bc9ffd1cf1982bfc2c373e0ed54a417c08ac46f43e4cf8a09a0a1a8a" => :high_sierra sha256 "dddf2d62a2e582a9356a4da6434ddb0432ce6d6b1d50a5dc6728f9b6254531a5" => :sierra sha256 "e4699a681ae9d2e9d68ce7da85fc050907070bc9650fad0c4f76faf991f3a422" => :el_capitan + sha256 "3bd072acfa65d6fcecd97f3546c6c4b93db1acfe59dc5659f3a20f6660be38e1" => :x86_64_linux end - depends_on "argp-standalone" => :build + depends_on "argp-standalone" => :build if OS.mac? depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build diff --git a/Formula/uchardet.rb b/Formula/uchardet.rb index cf14ea33459f4..9905014630c38 100644 --- a/Formula/uchardet.rb +++ b/Formula/uchardet.rb @@ -10,6 +10,7 @@ class Uchardet < Formula sha256 "34bd4791834a762da961de136a3cad253800a98deea2d1dededf8efb465f215d" => :catalina sha256 "a254139ee777de77d5907dfeb47d4306f2e5e5f0b3775edfedcbf1fcf217fdbe" => :mojave sha256 "a89237dd88e4190826ce6fb4a8a625711636db7d6c4ba10d5ddd56d37347e868" => :high_sierra + sha256 "6d5d176e4f2caae139d5f42376a08da54913f4018f26504267677f6ab319b641" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ucl.rb b/Formula/ucl.rb index 4d717965b312f..122b8c814f538 100644 --- a/Formula/ucl.rb +++ b/Formula/ucl.rb @@ -13,6 +13,7 @@ class Ucl < Formula sha256 "d56b0d36a68a2bc558742eac0c6632612180797cc45520389b5d87f09c23b1bd" => :el_capitan sha256 "32a54309c092854fc5a4a443a1e9d33fb677ff257d983ea7d5b0eb7bb90d3b2e" => :yosemite sha256 "3c334012766dce80dac49d279be1be1ae4a1fc5df188cc19a25ba1bec84305a9" => :mavericks + sha256 "07864b07361fc18ca17ff2c8e4bdfc04a51bdc440f289bd824faadaf3fdd28b5" => :x86_64_linux end def install diff --git a/Formula/ucloud.rb b/Formula/ucloud.rb index 2effc82150b1c..387f200707272 100644 --- a/Formula/ucloud.rb +++ b/Formula/ucloud.rb @@ -9,6 +9,7 @@ class Ucloud < Formula sha256 "64d956c8d49a0b66d8bd06b63c305c83ff3b8102c7071f3ab354ec9d00548b99" => :catalina sha256 "5f450755e1e86a66268739cffb040cd028b57bdb8ad7602e761d3778c17292d1" => :mojave sha256 "d8d2c7e981ae2900decacaf0623639a2cf221e969f084e6c7d37a0bd18608dfb" => :high_sierra + sha256 "ac9006df3707e35f2ec0624b1c535bd76e7e3db2d7fde600ec31dc6e7c7988b9" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/ucommon.rb b/Formula/ucommon.rb index 8ac4f02db5b37..feb9519740b8d 100644 --- a/Formula/ucommon.rb +++ b/Formula/ucommon.rb @@ -10,6 +10,7 @@ class Ucommon < Formula sha256 "650bda43b289012df676190269cde7bb3be3e1337f4f2eddc6f472ae38bbda1c" => :high_sierra sha256 "0546fbc44ac1e17d8757b41a67b2d68b15bc872b4b19fea649e5d7fe54a4d2d4" => :sierra sha256 "57756d7809936ed885ef8fc7a284498ab12a5be6cc1ad41ad148dd45074fc322" => :el_capitan + sha256 "a49fe93e60a6eb5b93c6f2c64db995085739c55e715d1c9b5a0f2d0b17c496ae" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/ucon64.rb b/Formula/ucon64.rb index 3a8bbf93e0606..34f6bab6f95d8 100644 --- a/Formula/ucon64.rb +++ b/Formula/ucon64.rb @@ -9,6 +9,7 @@ class Ucon64 < Formula sha256 "f0bf36d7828e138e2fe1068b4b5bf1b9e70f80cef564c186950a30ab2cb1df85" => :catalina sha256 "893570e77b17c3400f391fc0a710958b3599d5ad0c5971897d84c7e4552e2ca6" => :mojave sha256 "30d2d85dba7891d5eb5b43c69c5b6ac0ad0606d279c6a30e254f6ffd819356f8" => :high_sierra + sha256 "f42d1062bd7c4f5e405b4fc6d9f4d8b556275e1b5cbef6cfe132e4f986255e82" => :x86_64_linux end uses_from_macos "unzip" => [:build, :test] @@ -28,13 +29,15 @@ class Ucon64 < Formula end def install + ext = OS.mac? ? "dylib" : "so" + # ucon64's normal install process installs the discmage library in # the user's home folder. We want to store it inside the prefix, so # we have to change the default value of ~/.ucon64rc to point to it. # .ucon64rc is generated by the binary, so we adjust the default that # is set when no .ucon64rc exists. - inreplace "src/ucon64_misc.c", 'PROPERTY_MODE_DIR ("ucon64") "discmage.dylib"', - "\"#{opt_prefix}/libexec/libdiscmage.dylib\"" + inreplace "src/ucon64_misc.c", "PROPERTY_MODE_DIR (\"ucon64\") \"discmage.#{ext}\"", + "\"#{opt_prefix}/libexec/libdiscmage.#{ext}\"" cd "src" do system "./configure", "--disable-debug", @@ -43,7 +46,7 @@ def install "--prefix=#{prefix}" system "make" bin.install "ucon64" - libexec.install "libdiscmage/discmage.dylib" => "libdiscmage.dylib" + libexec.install "libdiscmage/discmage.#{ext}" => "libdiscmage.#{ext}" end end diff --git a/Formula/udns.rb b/Formula/udns.rb index f13aa4b50f2c5..7cc2995b7602f 100644 --- a/Formula/udns.rb +++ b/Formula/udns.rb @@ -13,24 +13,32 @@ class Udns < Formula sha256 "59939957b47912ebb286426391a4e2c904ecc416e9de18dc8c0a74052ac82ffe" => :el_capitan sha256 "342aff7270a4251655eb7cfc538b39db1805cfe965ada5cad1a2819b727d9107" => :yosemite sha256 "d6be7acb570845e63c6ac69b8169c4ce1d5a31f5f76f60bad10168a5b13126ff" => :mavericks + sha256 "eb334a17a24b5246087dfd86ce1740d66def683e9e3516c96b100fd37d7b1933" => :x86_64_linux # glibc 2.19 end # Build target for dylib. See: # https://www.corpit.ru/pipermail/udns/2011q3/000154.html - patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/udns/0.4.patch" - sha256 "4c3de5d04f93e7d7a9777b3baf3905707199fce9c08840712ccb2fb5fd6d90f9" + if OS.mac? + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/udns/0.4.patch" + sha256 "4c3de5d04f93e7d7a9777b3baf3905707199fce9c08840712ccb2fb5fd6d90f9" + end end def install system "./configure" system "make" - system "make", "dylib" + system "make", OS.mac? ? "dylib" : "sharedlib" bin.install "dnsget", "rblcheck" doc.install "NOTES", "TODO", "ex-rdns.c" include.install "udns.h" - lib.install "libudns.a", "libudns.0.dylib", "libudns.dylib" + if OS.mac? + lib.install "libudns.a", "libudns.0.dylib", "libudns.dylib" + else + lib.install "libudns.a", "libudns.so.0" + lib.install_symlink "libudns.so.0" => "libudns.so" + end man1.install "dnsget.1", "rblcheck.1" man3.install "udns.3" end diff --git a/Formula/udptunnel.rb b/Formula/udptunnel.rb index e30ff61215336..ef717480c7bdc 100644 --- a/Formula/udptunnel.rb +++ b/Formula/udptunnel.rb @@ -14,6 +14,7 @@ class Udptunnel < Formula sha256 "acbc74c384071aa6be92bea754274c5025de0123afd389d1b174e444a7beec42" => :el_capitan sha256 "8c4b8fb805fa94098925417a8fa61ced0d546b1b77330fd03cd5a72ee6e43b70" => :yosemite sha256 "8f0051f653f62bef0e85f8ced4806a8bae244a911e05129e4fc2bf05912c9412" => :mavericks + sha256 "7b61046eb375d1abe286e360557ee85c7bd697a42317203074dde73819331e12" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/udpxy.rb b/Formula/udpxy.rb index 29c6287b5d144..5fadac3c6280f 100644 --- a/Formula/udpxy.rb +++ b/Formula/udpxy.rb @@ -13,6 +13,7 @@ class Udpxy < Formula sha256 "46de795b585d88c658554fb943931885db85d75c7f838d9db6d11d98e46538d0" => :high_sierra sha256 "ee35787b2877b8ac1a9fa967e9f8fbf466f8c107e28cc61fee59c26aef9bf44d" => :sierra sha256 "0d4a899340bdee7f4497d68fe3bc59213ad83382d205aa08ada871d9d08c010d" => :el_capitan + sha256 "890386c37032bad683813bad94554b5ef47d5c59fa8e6af7f3d5136f2e02bd98" => :x86_64_linux end def install diff --git a/Formula/udunits.rb b/Formula/udunits.rb index 11f4492220707..a3830802bd37c 100644 --- a/Formula/udunits.rb +++ b/Formula/udunits.rb @@ -9,11 +9,20 @@ class Udunits < Formula sha256 "176548e1d698baf5187088bf16b273af3e3e585f5f765963c396187491ea5fe1" => :mojave sha256 "3c12f59317ded4bdc6f89c24a0eec9260a499371c9c92b2d5e34c1b1a9f50a2c" => :high_sierra sha256 "ad941124a4952ebc353f03601d3da5670155a1eb8271e290bc96b0a54ec87e9e" => :sierra + sha256 "4243dd63fc3decf1f529e86fd19897a2e4311f9d91ebfc812ceeec13cab9149a" => :x86_64_linux end depends_on "cmake" => :build uses_from_macos "expat" + uses_from_macos "texinfo" + + unless OS.mac? + patch :p1 do + url "https://github.com/Unidata/UDUNITS-2/commit/0bb56200221ad960bc2da11fc0b4a70ec3c5d7c9.diff?full_index=1" + sha256 "302fc33a7df84d8a60a21a0024d2676d5d16c08d3eb61d48e04d70f9499616f2" + end + end def install mkdir "build" do diff --git a/Formula/ufraw.rb b/Formula/ufraw.rb index 54f7c3fcfd5d4..c445e9c236785 100644 --- a/Formula/ufraw.rb +++ b/Formula/ufraw.rb @@ -10,6 +10,7 @@ class Ufraw < Formula sha256 "19a95667ecb2a9bab8a108e539ef229b945f727bca7e8651af80cca1d355a196" => :catalina sha256 "d880967d58bbbefb118148da4c959e38a3409a67504f21ae9b53560884da192f" => :mojave sha256 "e09fbf5a78f3b461637d21e13575330232de1c70dd3e63026ab0dcc5669905e3" => :high_sierra + sha256 "864af3889d66a1693abe22c5381ffe5c4e28584e22cb80dbf5cfa8239a7aaa80" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/uftp.rb b/Formula/uftp.rb index 6d3651169eb42..86546f3ab74c7 100644 --- a/Formula/uftp.rb +++ b/Formula/uftp.rb @@ -9,6 +9,7 @@ class Uftp < Formula sha256 "7df0c64b08cd3377837185003849b7d86d11021dc34546f78eedcac3e73a46c6" => :catalina sha256 "618dc8e47d069f19c4aeb1c18cdc12317196ebcfbe6e7c9d1be8b30472e19c92" => :mojave sha256 "35b999e28214d336f0e6224fd92dfa824874c1e08ab520b9643d3fbc75c33b4a" => :high_sierra + sha256 "47ee697e933a40b522e75a725a9b643e42bbbc70506522bf68eded44d76e76c2" => :x86_64_linux end depends_on "openssl@1.1" diff --git a/Formula/uggconv.rb b/Formula/uggconv.rb index be4f485a7acba..d4b2aef605418 100644 --- a/Formula/uggconv.rb +++ b/Formula/uggconv.rb @@ -12,6 +12,7 @@ class Uggconv < Formula sha256 "a22594f94bf7baa1908bd1225f52f1db3dd01daa17f99038ecfbd60e22d12b5d" => :sierra sha256 "5ab8b271f2ccc17e5229921f01b92ff7b0c297908902c83d24612bb47592af3c" => :el_capitan sha256 "a40a8a1adee9286acedba6e8eedf20bc53e4bf291fc73478bd3ba0314792c6ce" => :yosemite + sha256 "870b52f9831401649041b513817db058a8d100007e043ed797e0eaa6b01bce5d" => :x86_64_linux end def install diff --git a/Formula/uhd.rb b/Formula/uhd.rb index 8ca180a5b583c..b8161b2c461c1 100644 --- a/Formula/uhd.rb +++ b/Formula/uhd.rb @@ -10,6 +10,7 @@ class Uhd < Formula sha256 "b0988b31234da20fde7aceb5656316fccc3def16516391e5fcb818bd9d9cb563" => :catalina sha256 "eff5ec072e00e4ed6b7ccdceda1fdd68a672f8cea36a64046c4e4c348b361146" => :mojave sha256 "ded2d939eea70a0ca8e6275552a64fe6a6f9d55cc5b56e6cbed6ceea0394f549" => :high_sierra + sha256 "7b1198d0d922c96a9a06a9258a34c099b19c657c1de6aa5cdaa65428130fc648" => :x86_64_linux end depends_on "cmake" => :build @@ -38,7 +39,7 @@ def install end mkdir "host/build" do - system "cmake", "..", *std_cmake_args, "-DENABLE_STATIC_LIBS=ON", "-DENABLE_TESTS=OFF" + system "cmake", "..", *std_cmake_args, "-DENABLE_STATIC_LIBS=#{OS.mac? ? "ON" : "OFF"}", "-DENABLE_TESTS=OFF" system "make" system "make", "install" end diff --git a/Formula/ultralist.rb b/Formula/ultralist.rb index e8bb7f07d4947..58f193cf6a480 100644 --- a/Formula/ultralist.rb +++ b/Formula/ultralist.rb @@ -9,6 +9,7 @@ class Ultralist < Formula sha256 "d4200e85acf5aab3d023c07a6237c48919d8410beceee83e1fb83f022d914425" => :catalina sha256 "218dd99addf3829f208d0c4705dd331b1cc3be224812938c7c2f5065c27fc011" => :mojave sha256 "9a641de380de1f1f58a60d58d7ed42246ce56254636a4d8639e105c87113dab0" => :high_sierra + sha256 "106c2b69609fb2da205b7657494f4bd5c68c98f8f788be81ac4758d66b1f1203" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/um.rb b/Formula/um.rb index 8cd306351ff51..9e7febdbe1d66 100644 --- a/Formula/um.rb +++ b/Formula/um.rb @@ -9,9 +9,10 @@ class Um < Formula sha256 "266b397cd3e24060e7926f438279325aed89643070618add3db64175e348c04b" => :catalina sha256 "a4d8c9ddc2b46076eaccf3e3d4eaa43918f3d156e8abd16ad1415ea85f2da8f5" => :mojave sha256 "a479ed6f535f228d1bfa15a7292e58d06a4f07d1238c4fa83f1b99c80564a24e" => :high_sierra + sha256 "965706a7846d6e06e1c21f592c477a597cd7ccf78d266a3ef5d3ab811fd1020b" => :x86_64_linux end - depends_on "ruby" if MacOS.version <= :sierra + depends_on "ruby" if !OS.mac? || MacOS.version <= :sierra resource "kramdown" do url "https://rubygems.org/gems/kramdown-1.17.0.gem" diff --git a/Formula/unar.rb b/Formula/unar.rb index 101e6e49fe3e4..06792f940a100 100644 --- a/Formula/unar.rb +++ b/Formula/unar.rb @@ -13,7 +13,7 @@ class Unar < Formula sha256 "26a7dc14db6b28cc896f5692fd1ba6b3434656c80df5e28fecb41dfa952f31d8" => :sierra end - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? # Fix build for Xcode 10 but remove libstdc++.6.dylib and linking libc++.dylib instead patch do diff --git a/Formula/unbound.rb b/Formula/unbound.rb index d012c6dba3e99..4cdecdbaaa55d 100644 --- a/Formula/unbound.rb +++ b/Formula/unbound.rb @@ -9,6 +9,7 @@ class Unbound < Formula sha256 "7f66893bc42c776fb8437ae87c27b744fa30ebbea4dc349cb43aa72114b79937" => :catalina sha256 "04dfb0c9becb94b0e76ad11ba6b0ba70fae5bf5101533e57ac4ec2f9c8d31f5d" => :mojave sha256 "ba37bc57cd6a16c16e10ecd79c159849ffd16ef90845d0d50253c45b958fb8b3" => :high_sierra + sha256 "f0d42e97902625627bf4235c9bb3c9cb9a2405dc7fc5582561df9ac395d4965a" => :x86_64_linux end depends_on "libevent" @@ -27,7 +28,11 @@ def install --with-ssl=#{Formula["openssl@1.1"].opt_prefix} ] - args << "--with-libexpat=#{MacOS.sdk_path}/usr" if MacOS.sdk_path_if_needed + if OS.mac? + args << "--with-libexpat=#{MacOS.sdk_path}/usr" if MacOS.sdk_path_if_needed + else + args << "--with-libexpat=#{Formula["expat"].prefix}" + end system "./configure", *args inreplace "doc/example.conf", 'username: "unbound"', 'username: "@@HOMEBREW-UNBOUND-USER@@"' diff --git a/Formula/uncrustify.rb b/Formula/uncrustify.rb index 897036673420a..369e16c8329c6 100644 --- a/Formula/uncrustify.rb +++ b/Formula/uncrustify.rb @@ -10,6 +10,7 @@ class Uncrustify < Formula sha256 "8071c9d74d2ed2fdd69c8b9f665dbbcf364cb961796d014adcee6ad71be37e67" => :catalina sha256 "9ede4664a01943bc10c07e643a2c4af2de8c1d91a534a954c78d92780f235b35" => :mojave sha256 "60ffa3330811d4499f928eb7124d6981c1afb24ec0c86a4325d2804c65189828" => :high_sierra + sha256 "e91fae15a3c6e7f48f0f0841c004a768e8e4841d6e22a3e46d2acadf22300134" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/ungit.rb b/Formula/ungit.rb index 0a3ffcbe06ca8..07c11a8bed645 100644 --- a/Formula/ungit.rb +++ b/Formula/ungit.rb @@ -11,6 +11,7 @@ class Ungit < Formula sha256 "4210b3b1082139f8d42e2b3e6388e477420c8e396088556183d9ce6d776219cf" => :catalina sha256 "c6b3457e7cda7771420163813257abba2d66fcd1c2a8b13707b423e27fab65c0" => :mojave sha256 "9a584dd96e46c15743a8e84bc5ceb3c9092369752f284d29b91df27b1768e97e" => :high_sierra + sha256 "971cfa82042c82cb498e0174877cbccbd421206ebf3ce521288d8487d0d1dfb9" => :x86_64_linux end depends_on "node" diff --git a/Formula/uni.rb b/Formula/uni.rb index 665f4df713fe8..787f6a480254c 100644 --- a/Formula/uni.rb +++ b/Formula/uni.rb @@ -9,6 +9,7 @@ class Uni < Formula sha256 "d6a995e94c8bc6f9b74a1eb370b5aa348a7377e9170453820400da83641cef66" => :catalina sha256 "1a2f04a3dd21f6d2c2ea16d3683f936e1d8310dd4b2d503aa8a60d67b6f24367" => :mojave sha256 "e4b8e98523d14eb9cba3991946deb0cea86c09acfb65d175c04d4233ec32eceb" => :high_sierra + sha256 "9846eaccc0cafdb44225000c57b7c2164bb3af48a5ae0a07e73b28f12b2381fc" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/unibilium.rb b/Formula/unibilium.rb index 60318f32ff1f1..02421192284e8 100644 --- a/Formula/unibilium.rb +++ b/Formula/unibilium.rb @@ -11,6 +11,7 @@ class Unibilium < Formula sha256 "5c29d645cd3e0ad950a7054c73b89cb76114b369476eb8bca26587c38571861d" => :high_sierra sha256 "15338d452e5e09e7b8f3bedd6d557d735d06bfbc53204487d11b6c225a04ad71" => :sierra sha256 "d8caea872f5f8ed11503e46fc37f17fafbc8a4c64a5382e2bf9e6d84feda2f98" => :el_capitan + sha256 "c43425f4ba428af07a7cb77dd3dc76c9011425a2f195793cd6f905a52f90dfa6" => :x86_64_linux end depends_on "libtool" => :build diff --git a/Formula/unison.rb b/Formula/unison.rb index 6ec9ac3d47fb2..bd1bd5426f21f 100644 --- a/Formula/unison.rb +++ b/Formula/unison.rb @@ -11,6 +11,7 @@ class Unison < Formula sha256 "045499eab89d6b0d3faa898fe91c71bc7cba031c5a244c2f7367bc3825c958b5" => :catalina sha256 "58e3ccf3e3f0ac6b331b786fdb7bbe9f0e22babec094279f2c715bef256daacb" => :mojave sha256 "0cce7f269f0458a4ce1318fce5af58f9bcbfd29e314211fc8dedb6b4d8a7f1fb" => :high_sierra + sha256 "5b5ced66cdae09301229ef380102acd7f374506f1e9f89992de486cabad43fca" => :x86_64_linux end depends_on "ocaml" => :build diff --git a/Formula/unittest-cpp.rb b/Formula/unittest-cpp.rb index 61a57b264a4ff..e91e7c8444bca 100644 --- a/Formula/unittest-cpp.rb +++ b/Formula/unittest-cpp.rb @@ -12,6 +12,7 @@ class UnittestCpp < Formula sha256 "91d028b464f32fcf6edda6b791be2b70d9b770934edd7af7d2b8ff24e9c5eb06" => :sierra sha256 "6136d8cdc420681130c59d9f77327ddad6b46a35d29da5be760b522c7456e2a2" => :el_capitan sha256 "573f6f3a83ba0d2d0e3b54314a5eb93affd11f03bcc409d381ef8253d7e03c4c" => :yosemite + sha256 "26cedbcb10ae3056e770e1b791a243a950d8b00a979b48c662febcc721db2ee6" => :x86_64_linux end head do diff --git a/Formula/unittest.rb b/Formula/unittest.rb index 75f297bde9844..6eeb52dd69cdc 100644 --- a/Formula/unittest.rb +++ b/Formula/unittest.rb @@ -13,6 +13,7 @@ class Unittest < Formula sha256 "501b61d05de70cfb53116c66daf380cb35a1665eeecf34dfc6b27ab945458f43" => :el_capitan sha256 "8e26d281818bdf26ae2876004f5388fee9bd954589f57a6a25c979949e5f5bf1" => :yosemite sha256 "2acbb80540c9ff3c17cf4ab95db16657947761813915a94fa4afc0204e4b09b3" => :mavericks + sha256 "faec1beb9a391c122fb62f9268ffc34fc8a77869fc32b12f1f00c96e664de503" => :x86_64_linux end def install diff --git a/Formula/uniutils.rb b/Formula/uniutils.rb index 02c23cfeb63c9..efe2f59d1ecd9 100644 --- a/Formula/uniutils.rb +++ b/Formula/uniutils.rb @@ -12,6 +12,7 @@ class Uniutils < Formula sha256 "5f6609e92596f48fbb20bd0245437f4e967ebc9d06d9fc5e130584f394dce21a" => :sierra sha256 "9e83bffe9268c4be17f6e37254da13d2edfeee19869bd075580eeaa8f770078b" => :el_capitan sha256 "8707e4003370e82a9dc93f928f35f7160b4fa52d6954df916f292020bf9a790b" => :yosemite + sha256 "be9d28c8dc342f7c763a5da12b90f721efaf19b94d5e0003b1f73f4dff3d59cd" => :x86_64_linux end # Allow build with clang. This patch was reported to debian here: diff --git a/Formula/unixodbc.rb b/Formula/unixodbc.rb index 2562fece504e5..c9ba1f0da8703 100644 --- a/Formula/unixodbc.rb +++ b/Formula/unixodbc.rb @@ -10,6 +10,7 @@ class Unixodbc < Formula sha256 "d9f30688c0639d73b9e3a4b4b94d3679b2762e2cf0bff6b2ad64fcd175cc30ca" => :mojave sha256 "0b30b166c0e6bbd9df375a018d0f2a80b944617230b15531093d20eb015971e6" => :high_sierra sha256 "44407c41dc2c5cc58fcd2c254fa54ede75e7782b82567f4f1ba421d357203105" => :sierra + sha256 "e0354e6df99a8aa332c55259884e32126625cee40a8de37c68ba9897aec7d5d6" => :x86_64_linux end depends_on "libtool" diff --git a/Formula/unoconv.rb b/Formula/unoconv.rb index c8260192e0482..e6b899ea53606 100644 --- a/Formula/unoconv.rb +++ b/Formula/unoconv.rb @@ -11,11 +11,14 @@ class Unoconv < Formula sha256 "b8926bf449026133df038d3f6fa221803173193765a1de2de70da7b1e9ea4c7a" => :catalina sha256 "b8926bf449026133df038d3f6fa221803173193765a1de2de70da7b1e9ea4c7a" => :mojave sha256 "b8926bf449026133df038d3f6fa221803173193765a1de2de70da7b1e9ea4c7a" => :high_sierra + sha256 "1baebd24b729f0f3c87570995d31572ee230a2fbde9526056231f64deb21a6e0" => :x86_64_linux end depends_on "python@3.8" def install + # /usr/bin/env: 'python': No such file or directory + inreplace "unoconv", "#!/usr/bin/env python", "#!/usr/bin/env python3" unless OS.mac? system "make", "install", "prefix=#{prefix}" end diff --git a/Formula/unp64.rb b/Formula/unp64.rb index 9564518ab95f6..6bd6e29fae694 100644 --- a/Formula/unp64.rb +++ b/Formula/unp64.rb @@ -11,6 +11,7 @@ class Unp64 < Formula sha256 "966cbf5ee30ed72e472df6fa40c80adc623a18c3ab9764e22185cb0b48da4e46" => :mojave sha256 "d84f3af986ace7e131687c719d399212ca7c8e5bb4fc5f7bc9d0910db4116132" => :high_sierra sha256 "60f32f5261a3a7cf7f0b7058a53163267a026fb03886875403c7ebae12eb0b34" => :sierra + sha256 "5469119680466e08d1aed239b1ef178fbf36be3b578bdc9bcb34d10bbb535066" => :x86_64_linux end def install diff --git a/Formula/unpaper.rb b/Formula/unpaper.rb index 7fa575895c4e1..03244f6af1e82 100644 --- a/Formula/unpaper.rb +++ b/Formula/unpaper.rb @@ -10,6 +10,7 @@ class Unpaper < Formula sha256 "c72b06d6ed960566861cfdd9e01949fe3b532c21efb380606f2b0820d7592c47" => :catalina sha256 "e391cb0121a88acbadb26933c12c6066c638e802578650655260507e0dea490f" => :mojave sha256 "d347977d11838ca92f9f648eda8b35da43e2b0fc5973f025081b55c1a11b0d2b" => :high_sierra + sha256 "6dd949be14d0778912695528f9a19947e1cb2297529a610d68709610c4f82b32" => :x86_64_linux end head do @@ -20,6 +21,10 @@ class Unpaper < Formula depends_on "pkg-config" => :build depends_on "ffmpeg" + unless OS.mac? + depends_on "autoconf" => :build + depends_on "automake" => :build + end uses_from_macos "libxslt" @@ -29,7 +34,7 @@ class Unpaper < Formula end def install - system "autoreconf", "-i" if build.head? + system "autoreconf", "-i" if build.head? || !OS.mac? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" end diff --git a/Formula/unrar.rb b/Formula/unrar.rb index fd8f58ddd7182..cb5779b7b1e53 100644 --- a/Formula/unrar.rb +++ b/Formula/unrar.rb @@ -9,13 +9,14 @@ class Unrar < Formula sha256 "90e0f209046471dda292a622ded80ed410e237cb7fc8e1d2653f0d57c470fc6b" => :catalina sha256 "a45568c9d67db8866971aec111e9e6d9d606549099f60240f2cf7c7096680270" => :mojave sha256 "ca9a590d0bce2de6e35ce02fdc7a6bb2d32265a945949e278fb7ae4c8d3c2dca" => :high_sierra + sha256 "6e1ec91159ab82ece7d9117070407be733c055389860e6e55090944191f90961" => :x86_64_linux end def install # upstream doesn't particularly care about their unix targets, # so we do the dirty work of renaming their shared objects to # dylibs for them. - inreplace "makefile", "libunrar.so", "libunrar.dylib" + inreplace "makefile", "libunrar.so", "libunrar.dylib" if OS.mac? system "make" bin.install "unrar" @@ -24,7 +25,8 @@ def install # apparent implicit clean which confuses the dependencies. system "make", "clean" system "make", "lib" - lib.install "libunrar.dylib" + + lib.install "libunrar.#{OS.mac? ? "dylib" : "so"}" end test do diff --git a/Formula/unrtf.rb b/Formula/unrtf.rb index aaa6851ae6820..26f3251b708e2 100644 --- a/Formula/unrtf.rb +++ b/Formula/unrtf.rb @@ -11,6 +11,7 @@ class Unrtf < Formula sha256 "b038c53ba7341cc9365db6cf9d46c6f7c3feba843643168e24a12856a29a6dbb" => :mojave sha256 "9abc63bdeae500637c8e1d6d31c72be013d0f2cf8ad8e3f1cb6e3babe5b6d94a" => :high_sierra sha256 "4c9e869dad1a76bf4077d9e19cabf9d383ed914b5a1c348dadc1eb0961c23b0a" => :sierra + sha256 "135d610d2247d621362c4d39e73ee9ea1153948313a4f39c24bf92258c67a499" => :x86_64_linux end depends_on "autoconf" => :build @@ -18,7 +19,7 @@ class Unrtf < Formula def install system "./bootstrap" - system "./configure", "LIBS=-liconv", "--prefix=#{prefix}" + system "./configure", *("LIBS=-liconv" if OS.mac?), "--prefix=#{prefix}" system "make", "install" end diff --git a/Formula/unyaffs.rb b/Formula/unyaffs.rb index 95260281e79d1..220122a3e223e 100644 --- a/Formula/unyaffs.rb +++ b/Formula/unyaffs.rb @@ -11,6 +11,7 @@ class Unyaffs < Formula sha256 "4bcff00c990f1376a4a14084a7e4c5c47a9abd1411140071a8f32820b24bc0c3" => :catalina sha256 "9ffaad154e3119644c754d02544e386f9d5b6f7d06aceba76e972cb321608deb" => :mojave sha256 "c215b5e405c842ca4a82dc120b8a3c9b9a1868303ab740d4d8973b1cd0160eb9" => :high_sierra + sha256 "fc0caba0c1fea96f2bc95e1a0472a5a483b84ff47ea7d7e1e216fbef32ca03d4" => :x86_64_linux end def install diff --git a/Formula/unzip.rb b/Formula/unzip.rb index ddfa086d71181..eb9d231aacda3 100644 --- a/Formula/unzip.rb +++ b/Formula/unzip.rb @@ -12,6 +12,7 @@ class Unzip < Formula sha256 "f0b95f2d5c664f45686f3aa318384906014ed28939da28020d12138f025aaeb6" => :mojave sha256 "6dd7d0862f5a8b954dd94b3c91378209e0086eec7c5be367af0d8c330bc099da" => :high_sierra sha256 "f4d59c04a44f93a30a23ec403784c73f9c06db9b72f3277679f66b1870a94331" => :sierra + sha256 "8e4c87b31e3a8ee65eb3ab346d527a256e5081c1504e98d9540f4a0ba7063a84" => :x86_64_linux end keg_only :provided_by_macos @@ -58,16 +59,22 @@ def install "D_USE_BZ2=-DUSE_BZIP2", "L_BZ2=-lbz2", "macosx", - "LFLAGS1=-liconv" + *("LFLAGS1=-liconv" if OS.mac?) system "make", "prefix=#{prefix}", "MANDIR=#{man1}", "install" end test do + zip = OS.mac? ? "/usr/bin/zip" : which("zip") + if zip.nil? + opoo "Not testing unzip, because it requires zip, which is unavailable." + return + end + (testpath/"test1").write "Hello!" (testpath/"test2").write "Bonjour!" (testpath/"test3").write "Hej!" - system "/usr/bin/zip", "test.zip", "test1", "test2", "test3" + system zip, "test.zip", "test1", "test2", "test3" %w[test1 test2 test3].each do |f| rm f refute_predicate testpath/f, :exist?, "Text files should have been removed!" diff --git a/Formula/up.rb b/Formula/up.rb index 9071fca1118d4..a7c8a5c4cc2e9 100644 --- a/Formula/up.rb +++ b/Formula/up.rb @@ -10,6 +10,7 @@ class Up < Formula sha256 "0c453761279cdc6a995ae471841b2e8513215c3d30f4f448c3cf82f548376fa5" => :mojave sha256 "f9ea40f11e458e2bda259fa428a9f390d9a9efce1d7983f9325eda17b4655501" => :high_sierra sha256 "558f89d83bd23a28ef31a1d72f7749521f68ebf0d767a8cffb2c6b9311461e13" => :sierra + sha256 "76219e31703806b0c911b10f8edb5077f6ec423c6bc6d6882445e439c452f54c" => :x86_64_linux end depends_on "go" => :build @@ -26,6 +27,9 @@ def install end test do + # error: terminal entry not found + return if ENV["TERM"] == "dumb" + shell_output("#{bin}/up --debug 2&>1", 1) assert_predicate testpath/"up.debug", :exist?, "up.debug not found" assert_includes File.read(testpath/"up.debug"), "checking $SHELL" diff --git a/Formula/uptimed.rb b/Formula/uptimed.rb index 0e9a405522aea..de27150c31b03 100644 --- a/Formula/uptimed.rb +++ b/Formula/uptimed.rb @@ -5,11 +5,12 @@ class Uptimed < Formula sha256 "5f803eccc1247b4a22171de4670a896e05adb9a82f018facda1b2cc5b19dbc97" bottle do - cellar :any + cellar :any_skip_relocation sha256 "8a60913d8acaf592560c0b6f42b77cd83b69adf5fbeee77e0e095f7e4b413f65" => :catalina sha256 "ed7ff6b62654f5514d2657f07ed2dc83d5046a2219eb651b6423609fac961f28" => :mojave sha256 "128fb7d767fc12e12917cbc761a942158f0fd75a5a9e209508670287cb5d00ed" => :high_sierra sha256 "195a89c67e7e09ba690f1cfc8fd91ce07d0623ca9b5da4f2fc70dc7f1f81c9a7" => :sierra + sha256 "e2481a16a0e48999807492e3631591453bb0fa6b755cf766d2dbf692284ea07d" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/upx.rb b/Formula/upx.rb index f70b9385200b4..d6c405525919f 100644 --- a/Formula/upx.rb +++ b/Formula/upx.rb @@ -10,6 +10,7 @@ class Upx < Formula sha256 "1089a067bec1387bfa8080565f95601493291933b83a510057ba6f1e7fd06d91" => :catalina sha256 "20ab82b69b19ac0886bd202459b652d85f7bc5c288009dd7caf09017be940d37" => :mojave sha256 "4773fc3b7ccb35aad163549a7c5b37813dea9e5c2f1cdfd67a00e7da36691b69" => :high_sierra + sha256 "d3cb3607477c42a28e35ec0a737fdd25399432ac685c3d78b2c000bb228e595b" => :x86_64_linux end depends_on "ucl" => :build diff --git a/Formula/urdfdom.rb b/Formula/urdfdom.rb index f5c7f8e3c9cfe..0138e18a9c281 100644 --- a/Formula/urdfdom.rb +++ b/Formula/urdfdom.rb @@ -10,6 +10,7 @@ class Urdfdom < Formula sha256 "1a4cf15eac5ab20085f401c827511eddd6075f2d4511f9b4a72c7388d587a91b" => :catalina sha256 "8f9f55abf13706344949050a7fb077e4394daef2556a09b03deef1481eef432f" => :mojave sha256 "a80e9b0bb93db5384993499150c28c883cc1f839e4e9fa7e933bf85067be1818" => :high_sierra + sha256 "43d705373ba79db2aa725c1f903766aae5fbde000a044409dce1d3fe6e91ab89" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/urdfdom_headers.rb b/Formula/urdfdom_headers.rb index 6d092e06f73a6..0410f85940ce5 100644 --- a/Formula/urdfdom_headers.rb +++ b/Formula/urdfdom_headers.rb @@ -9,6 +9,7 @@ class UrdfdomHeaders < Formula sha256 "c6840c3177042a718ae29bc8238e5ec20dbcde4f9269b3042f8eed1a2aa6292c" => :catalina sha256 "c6840c3177042a718ae29bc8238e5ec20dbcde4f9269b3042f8eed1a2aa6292c" => :mojave sha256 "c6840c3177042a718ae29bc8238e5ec20dbcde4f9269b3042f8eed1a2aa6292c" => :high_sierra + sha256 "4b5b3895b60956758d68c7e103cab0cff66abd0039a68d8c1b8eca125d3d9719" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/uriparser.rb b/Formula/uriparser.rb index 2706fc1c0acbc..5571ac68d831e 100644 --- a/Formula/uriparser.rb +++ b/Formula/uriparser.rb @@ -10,6 +10,7 @@ class Uriparser < Formula sha256 "0fac36c34a537dd29050a29003d5e4a1c34ce8d00d964c7e8ebdeaafa99f6268" => :catalina sha256 "5440ffb9d3363007478193e0ed4653d8f5eaf27fd36b5c0968968b73d14af2f9" => :mojave sha256 "b25005697a3acc8cd6921189f41e6f7fa1c6667a9e259a3d85f8f1dea6915460" => :high_sierra + sha256 "605966e54e847e0d304583c69c1e0844096ab5614e99445dc1cf88d6cf109737" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/uru.rb b/Formula/uru.rb index 2e737bdb3896e..063f44e6bd7b5 100644 --- a/Formula/uru.rb +++ b/Formula/uru.rb @@ -10,6 +10,7 @@ class Uru < Formula sha256 "25c90f23ff4d5225d439f8783d25d440ee2b7fc6e8afdc5772914deab0ae3184" => :mojave sha256 "d6da062bd8e0d7134a9d98285344064a82329b138bd7e0ed14fbc01a27530079" => :high_sierra sha256 "fb1b6ac6bd09955f072e9b65e92cc992b6da4a14640694d8a830aaacad944518" => :sierra + sha256 "a59052d6214594f6fa64b0d36bd79b77c00e6493ff0b99686e7c00be404ee50b" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/urweb.rb b/Formula/urweb.rb index 7f8d043ecf042..aabe70d61a6c4 100644 --- a/Formula/urweb.rb +++ b/Formula/urweb.rb @@ -9,6 +9,7 @@ class Urweb < Formula sha256 "ea2ccdf37715d601fb22b301e9646d8a56bd408b88c8f83e2feda08d3695712c" => :catalina sha256 "edfad2dea9f27c87d7a68396f50cbbf6d345edf6059abf555ad6c7d2d0bc2177" => :mojave sha256 "ccc6d329298c6d3f3f4ba7e67b8be51017b7f95dad00de35d63fe49c670f1ee2" => :high_sierra + sha256 "3b70c49e27c926267a8ab803c6dccc494c6fc2920525bad0fb1a21a20b3f2034" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/usbredir.rb b/Formula/usbredir.rb index 36dbfd353cff0..18ddcd30694e7 100644 --- a/Formula/usbredir.rb +++ b/Formula/usbredir.rb @@ -10,6 +10,7 @@ class Usbredir < Formula sha256 "579f1db366d50c027cfd6ea92149878b358d86bb6a9d491320e5f7fd62dfd2e8" => :mojave sha256 "0d83ca33451b2c382dcf4b70be515549db139b0960712dc7f213e993ba7973d7" => :high_sierra sha256 "7feac9566048e308877ef3f3d1b93660433dc8f1611e3daf031eaa4dd90c7238" => :sierra + sha256 "15e3f79c40cd5ed9c0e9443d6a77badacc4f298db4ba1e5205fc8a1d5c9b924a" => :x86_64_linux end depends_on "libtool" => :build diff --git a/Formula/userspace-rcu.rb b/Formula/userspace-rcu.rb index 241a4b0b61a66..46eb94370ffcc 100644 --- a/Formula/userspace-rcu.rb +++ b/Formula/userspace-rcu.rb @@ -9,6 +9,7 @@ class UserspaceRcu < Formula sha256 "ddb5e2f5e985cba860f36a5730d933d88b4b0e76b1a450a3e76b244a5a6f1935" => :catalina sha256 "09cbfc5e663214ad2df4e95cb2cf022ea6c153c6bc49d6918ec5c2e69e28a97b" => :mojave sha256 "501a8f37d104b1a8f5cb625d2e1a17615114caf57054b9df9fb52df62761f138" => :high_sierra + sha256 "e0d633513a646bbbe34f2db6214ba55c1b623e2fab1d237fdfc6172a68fdd9c4" => :x86_64_linux end def install @@ -28,6 +29,6 @@ def install test do cp_r "#{doc}/examples", testpath - system "make", "-C", "examples" + system "make", ("CFLAGS=-pthread" unless OS.mac?), "-C", "examples" end end diff --git a/Formula/utf8proc.rb b/Formula/utf8proc.rb index 83cf56d70cf86..67e44d387d357 100644 --- a/Formula/utf8proc.rb +++ b/Formula/utf8proc.rb @@ -9,6 +9,7 @@ class Utf8proc < Formula sha256 "f215acf62769b7036110950b65285742b6550c631b0606befa12b98f32c53130" => :catalina sha256 "1bd0f29df929fff62b33895ca76162b9d376aefea09115c84a3841793fa7a9a3" => :mojave sha256 "12b05c0477b8f6fd029f3723d74712f267960fb9d212a21520f9a557d3cd516c" => :high_sierra + sha256 "7a3ec8a2ecf38cc5162005df79dd73e60ef70e631e7cd847c51e589ff185d05a" => :x86_64_linux end def install diff --git a/Formula/util-linux.rb b/Formula/util-linux.rb index c9cb6df94e694..69f30c4ce6fbf 100644 --- a/Formula/util-linux.rb +++ b/Formula/util-linux.rb @@ -3,42 +3,73 @@ class UtilLinux < Formula homepage "https://github.com/karelzak/util-linux" url "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz" sha256 "21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a" + revision 1 unless OS.mac? bottle do - cellar :any sha256 "8f9f0592f1135621eb61133f986c9372e6fa718d4137dfdaa63f2c212d729564" => :catalina sha256 "10530ca9de44cb341b50114f3c740b58b7daaf030568662ac2a174feb1c25e49" => :mojave sha256 "458ece9b1190f761a6fc42bf66484eec1e67cafb5ef44d6ccd40ee9a0b05cc7c" => :high_sierra + sha256 "1b15b7f9207ea4f5f7f93beaa391783ca0fcf78d6e40452b38880b2b845e2b87" => :x86_64_linux end - keg_only "macOS provides the uuid.h header" + keg_only "macOS provides the uuid.h header" if OS.mac? uses_from_macos "ncurses" uses_from_macos "zlib" def install - system "./configure", "--disable-dependency-tracking", - "--disable-silent-rules", - "--prefix=#{prefix}", - "--disable-ipcs", # does not build on macOS - "--disable-ipcrm", # does not build on macOS - "--disable-wall", # already comes with macOS - "--enable-libuuid" # conflicts with ossp-uuid + args = [ + "--disable-dependency-tracking", + "--disable-silent-rules", + "--prefix=#{prefix}", + ] + if OS.mac? + args << "--disable-ipcs" # does not build on macOS + args << "--disable-ipcrm" # does not build on macOS + args << "--disable-wall" # already comes with macOS + args << "--enable-libuuid" # conflicts with ossp-uuid + else + args << "--disable-use-tty-group" # Fix chgrp: changing group of 'wall': Operation not permitted + args << "--disable-kill" # Conflicts with coreutils. + args << "--disable-cal" # Conflicts with bsdmainutils + args << "--without-systemd" # Do not install systemd files + args << "--with-bashcompletiondir=#{bash_completion}" + args << "--disable-chfn-chsh" + args << "--disable-login" + args << "--disable-su" + args << "--disable-runuser" + args << "--disable-makeinstall-chown" + args << "--disable-makeinstall-setuid" + args << "--without-python" + end + + system "./configure", *args system "make", "install" - # Remove binaries already shipped by macOS - %w[cal col colcrt colrm getopt hexdump logger nologin look mesg more renice rev ul whereis].each do |prog| - rm_f bin/prog - rm_f sbin/prog - rm_f man1/"#{prog}.1" - rm_f man8/"#{prog}.8" - rm_f share/"bash-completion/completions/#{prog}" + if OS.mac? + # Remove binaries already shipped by macOS + %w[cal col colcrt colrm getopt hexdump logger nologin look mesg more renice rev ul whereis].each do |prog| + rm_f bin/prog + rm_f sbin/prog + rm_f man1/"#{prog}.1" + rm_f man8/"#{prog}.8" + end + else + # these conflict with bash-completion-1.3 + %w[chsh mount rfkill rtcwake].each do |prog| + rm_f bash_completion/prog + end end # install completions only for installed programs Pathname.glob("bash-completion/*") do |prog| - bash_completion.install prog if (bin/prog.basename).exist? || (sbin/prog.basename).exist? + if (bin/prog.basename).exist? || (sbin/prog.basename).exist? + # these conflict with bash-completion on Linux + next if !OS.mac? && %w[chsh mount rfkill rtcwake].include?(prog.basename.to_s) + + bash_completion.install prog + end end end diff --git a/Formula/uudeview.rb b/Formula/uudeview.rb index 3f48614ff9480..988d72781b820 100644 --- a/Formula/uudeview.rb +++ b/Formula/uudeview.rb @@ -11,6 +11,7 @@ class Uudeview < Formula sha256 "9b5990b5b763e90614bd2d074e670c20e834541d60082a4e78f90d67a65da5c3" => :catalina sha256 "2869df0b09975172227dc83be6d667b3d0f8e4f2cf0f6d9ec0cd3fdca02727f4" => :mojave sha256 "7bb4c57755efed1b4208d234a0017d785757da04ca8f8e43c92980f3fe16b85c" => :high_sierra + sha256 "d4baa6b550891384a0a771d33082e52d819b4271f60cac54750aa03f17280920" => :x86_64_linux end # Fix function signatures (for clang) diff --git a/Formula/uwsgi.rb b/Formula/uwsgi.rb index 875f5b98e0ef2..0f0cdac05ac56 100644 --- a/Formula/uwsgi.rb +++ b/Formula/uwsgi.rb @@ -20,6 +20,7 @@ class Uwsgi < Formula sha256 "6c82bba2d7564bd3409867d304c578c7823d7c1db019d8b4c8223ae569a5f247" => :catalina sha256 "2a3b1c26400d68491409b8625f56c730a2f69bbb5acc2596c80ea4cba3435fad" => :mojave sha256 "2c511739e0317173b7c82b15a87a0eade429ed88be667801b477c95dc2affd72" => :high_sierra + sha256 "d3731ee20915309ecd99197fbe1fffbac596ddb8979c1a1cf22f3689709e73d9" => :x86_64_linux end depends_on "pkg-config" => :build @@ -33,10 +34,12 @@ class Uwsgi < Formula uses_from_macos "openldap" uses_from_macos "perl" + depends_on "linux-pam" unless OS.mac? + def install # Fix file not found errors for /usr/lib/system/libsystem_symptoms.dylib and # /usr/lib/system/libsystem_darwin.dylib on 10.11 and 10.12, respectively - ENV["SDKROOT"] = MacOS.sdk_path if MacOS.version == :sierra || MacOS.version == :el_capitan + ENV["SDKROOT"] = MacOS.sdk_path if OS.mac? && (MacOS.version == :sierra || MacOS.version == :el_capitan) openssl = Formula["openssl@1.1"] ENV.prepend "CFLAGS", "-I#{openssl.opt_include}" @@ -55,7 +58,7 @@ def install system "python3", "uwsgiconfig.py", "--verbose", "--build", "brew" - plugins = %w[airbrake alarm_curl alarm_speech asyncio cache + plugins = %w[airbrake alarm_curl asyncio cache carbon cgi cheaper_backlog2 cheaper_busyness corerouter curl_cron cplusplus dumbloop dummy echo emperor_amqp fastrouter forkptyrouter gevent @@ -71,6 +74,7 @@ def install transformation_chunked transformation_gzip transformation_offload transformation_tofile transformation_toupper ugreen webdav zergpool] + plugins << "alarm_speech" if OS.mac? (libexec/"uwsgi").mkpath plugins.each do |plugin| diff --git a/Formula/v2ray-plugin.rb b/Formula/v2ray-plugin.rb index 946854846af16..939e62182de7e 100644 --- a/Formula/v2ray-plugin.rb +++ b/Formula/v2ray-plugin.rb @@ -10,6 +10,7 @@ class V2rayPlugin < Formula sha256 "891f541e150a393ff20caa78eb79ef12f60929fb9e5b35826e2e639c46a61dc2" => :catalina sha256 "cb8ff7b812aa561f9e23935461968ba1c26cbe393c599aab4e1753b37702748b" => :mojave sha256 "f11b330c3dc9c445b757188057c93ce94de89f03f4adfa1a8c6405f5ba66b400" => :high_sierra + sha256 "9f166878ef3c67edc8db5f733ce4efce0ab1112fd9e41d8efc80bc595065fef7" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/vala.rb b/Formula/vala.rb index 0bca5c1344a16..5837e84d5af17 100644 --- a/Formula/vala.rb +++ b/Formula/vala.rb @@ -8,6 +8,7 @@ class Vala < Formula sha256 "1edbc682f36ded21abfb1019dba562e1f10511dd9aa85711e85c686c33199585" => :catalina sha256 "f7da791d95349efeea8d5d91a2e32dfdfc13e4a352fdccb3761aef10c945b17a" => :mojave sha256 "655823ba6fc369543776d44d80a5ce5176086fc7a2f801b7af1f301f0517ed24" => :high_sierra + sha256 "c8f8ee9e0838e617bc1be534b4cd3e5f1f8c29730aadb6e28b19e128ef9066e6" => :x86_64_linux end depends_on "gettext" @@ -18,6 +19,8 @@ class Vala < Formula uses_from_macos "bison" => :build uses_from_macos "flex" => :build + depends_on "linuxbrew/xorg/libx11" unless OS.mac? + def install system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", diff --git a/Formula/valabind.rb b/Formula/valabind.rb index e06910f99d5fa..c7ca459fcb41c 100644 --- a/Formula/valabind.rb +++ b/Formula/valabind.rb @@ -11,6 +11,7 @@ class Valabind < Formula sha256 "c5ad6fe97fa944521c3848f282a940aa3f37d22bc96a472d6f320715f679b38b" => :catalina sha256 "e120768e4de31c6d5efcfd3e09eacf59c9b8d2388f3a402a296fc13a50c35263" => :mojave sha256 "90ee3663f74b52b5efb182792bbb4bd76780929bc7444dd319dcf51d27888390" => :high_sierra + sha256 "79291b34f041db65c837dab983807a658bfd715fc9d001673f7597c38276b6f9" => :x86_64_linux end depends_on "pkg-config" => :build @@ -27,6 +28,19 @@ class Valabind < Formula end def install + unless OS.mac? + # Valabind depends on the Vala code generator library during execution. + # The `libvala` pkg-config file installed by brew isn't pointing to Vala's + # opt_prefix so Valabind will break as soon as Vala releases a new + # patchlevel. This snippet modifies the Makefile to point to Vala's + # `opt_prefix` instead. + vala = Formula["vala"] + pre_ver = vala.prefix(vala.version) + inreplace "Makefile", + /^VALA_PKGLIBDIR=(.*$)/, + "VALA_PKGLIBDIR_=\\1\nVALA_PKGLIBDIR=$(subst #{pre_ver},#{vala.opt_prefix},$(VALA_PKGLIBDIR_))" + end + system "make" system "make", "install", "PREFIX=#{prefix}" end diff --git a/Formula/vale.rb b/Formula/vale.rb index 88acba130133e..1ff60c726b6b5 100644 --- a/Formula/vale.rb +++ b/Formula/vale.rb @@ -9,6 +9,7 @@ class Vale < Formula sha256 "9adcdb7c49fec71387a0cd4a4beb8c81e0bb5467eb2e16db27a02ab94c0d4b2f" => :catalina sha256 "fcf77f5465bef0f72403fe09154e591cecc03637d85bd0bad767fd66c6ce9a3c" => :mojave sha256 "2294ed7b45cfd56714e540a89f408345e925cba457b64f5dd177b64257a218fb" => :high_sierra + sha256 "0b4fcdf40814fd88224d32e934af1eaf87ab15f595a4310d94c718785b121702" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/valgrind.rb b/Formula/valgrind.rb index db13e382f4cd2..342e38bfd9615 100644 --- a/Formula/valgrind.rb +++ b/Formula/valgrind.rb @@ -1,16 +1,18 @@ class Valgrind < Formula desc "Dynamic analysis tools (memory, debug, profiling)" homepage "https://www.valgrind.org/" + revision 1 unless OS.mac? stable do url "https://sourceware.org/pub/valgrind/valgrind-3.16.0.tar.bz2" sha256 "582d5127ba56dfeaab4c6ced92a742b2921148e28a5d55055aedd8f75f1cf633" - depends_on :maximum_macos => :high_sierra + depends_on :maximum_macos => :high_sierra if OS.mac? end bottle do sha256 "52f01d383ca2a8515840aeef2af133a7f12ced48bc0077e01de71b5eb7c44b04" => :high_sierra + sha256 "5a60b6ba5be7ad3cdb5373ffeb33826d20efe53fcc0e2a5c456c33dea0f3f559" => :x86_64_linux end head do @@ -29,9 +31,11 @@ def install args = %W[ --disable-dependency-tracking --prefix=#{prefix} - --enable-only64bit - --build=amd64-darwin ] + + args << "--enable-only64bit" + args << "--build=amd64-darwin" if OS.mac? + system "./autogen.sh" if build.head? system "./configure", *args @@ -40,6 +44,8 @@ def install end test do - system "#{bin}/valgrind", "ls", "-l" + assert_match "usage", shell_output("#{bin}/valgrind --help") + # Fails without the package libc6-dbg or glibc-debuginfo installed. + system "#{bin}/valgrind", "ls", "-l" if OS.mac? end end diff --git a/Formula/vamp-plugin-sdk.rb b/Formula/vamp-plugin-sdk.rb index b92ce942f046a..98ef6fbbf7153 100644 --- a/Formula/vamp-plugin-sdk.rb +++ b/Formula/vamp-plugin-sdk.rb @@ -10,6 +10,7 @@ class VampPluginSdk < Formula sha256 "b31926ceedbd7f79dc9783da8092b543c549d800705d9d8e8d8d0fd451d093de" => :catalina sha256 "ee8d69d0b8c72e3e9ed1c79bfa7ca6650d10e36a2b110215b3d803f841ae2ec0" => :mojave sha256 "834812edc745c782511f1397fb5e3e6995b9fd25b42426ec784cd5610dbc9eb4" => :high_sierra + sha256 "95b6cb12f447a52eb0c5104ca640898e0cd773e924ac998ccba7ffa91aac77d4" => :x86_64_linux end depends_on "automake" => :build @@ -34,10 +35,14 @@ class MyPlugin : public Vamp::Plugin { }; vampGetPluginDescriptor(unsigned int version, unsigned int index) { return NULL; } EOS - system ENV.cxx, "test.cpp", "-I#{include}", "-Wl,-dylib", "-o", "test.dylib" + if OS.mac? + system ENV.cxx, "test.cpp", "-I#{include}", "-Wl,-dylib", "-o", "test.dylib" + else + system ENV.cxx, "test.cpp", "-I#{include}", "-shared", "-fPIC", "-o", "test.so" + end assert_match /Usage:/, shell_output("#{bin}/vamp-rdf-template-generator 2>&1", 2) - cp "#{lib}/vamp/vamp-example-plugins.so", testpath/"vamp-example-plugins.dylib" + cp "#{lib}/vamp/vamp-example-plugins.so", testpath/"vamp-example-plugins.#{OS.mac? ? "dylib" : "so"}" ENV["VAMP_PATH"]=testpath assert_match /amplitudefollower/, shell_output("#{bin}/vamp-simple-host -l") end diff --git a/Formula/vaulted.rb b/Formula/vaulted.rb index cfd8b7488936d..26cc0b708f7a4 100644 --- a/Formula/vaulted.rb +++ b/Formula/vaulted.rb @@ -10,6 +10,7 @@ class Vaulted < Formula sha256 "6e28a27d6d1c24b2cd7d3ca0ff147a8309425dcd1d405861378bd40c191af5d2" => :catalina sha256 "246a6e46d12ceb79f4406802a72860a4d4e381bf34b8228c10773898b33dbb3e" => :mojave sha256 "24f80eafb9d738391a99724915f07a546ebc822d5e3ab725fc90bfa690cc4ee7" => :high_sierra + sha256 "fdd37416a9eb4d04734b586477651b275adbcb01d6060bda18e47fc4a75e815e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/vavrdiasm.rb b/Formula/vavrdiasm.rb index c7f11a0e8a516..53ac90050106e 100644 --- a/Formula/vavrdiasm.rb +++ b/Formula/vavrdiasm.rb @@ -13,6 +13,7 @@ class Vavrdiasm < Formula sha256 "0671b1062a86e8d596a9f404fd843cb37d6d2d1bb28ebb2b8a8f6cbdd763c97c" => :el_capitan sha256 "ce57062586ca9cb91290141376f1da1f5de3c6efb6fe4687585a3e64cc29c014" => :yosemite sha256 "f881c5a6d94581c4fc9efb13118c84c40700f13d130302f6ee4cb16968d1f6b0" => :mavericks + sha256 "0612ed5b89def054568d3ef98a157aaa941d6a82c169950080dfc12bfa2ea84b" => :x86_64_linux end # Patch: diff --git a/Formula/vc4asm.rb b/Formula/vc4asm.rb index 9f62cb6901334..73c4224d2a1f5 100644 --- a/Formula/vc4asm.rb +++ b/Formula/vc4asm.rb @@ -12,6 +12,7 @@ class Vc4asm < Formula sha256 "2547c982e3fde40316d01d802bd01bf49af208e6737ecafeaeb8ad988ea3255d" => :sierra sha256 "72d54a4237c4e0f952fd1a3d913725d84814ed5b657affa1d6dcafa19e1cdc44" => :el_capitan sha256 "871b3b109ac49b09056f83e4488105196060d2388dc5052c679776b43fab5927" => :yosemite + sha256 "adc9f29aec1987af9be4278ed1838bdc6903dc71e5985f9dc7aecca4b1803b8e" => :x86_64_linux # glibc 2.19 end # Fixes "ar: illegal option combination for -r" diff --git a/Formula/vcdimager.rb b/Formula/vcdimager.rb index eeb85f21cdb2d..ccb5227e3bb98 100644 --- a/Formula/vcdimager.rb +++ b/Formula/vcdimager.rb @@ -12,6 +12,7 @@ class Vcdimager < Formula sha256 "cb45bd1a48e551a60e8b344668a79e24414012ebc76a141ee6c0677ec21ad594" => :mojave sha256 "993b40efcd1af1844ed14064de2551cecbdacc3a1c4d39f9fe1d8b289b3b6eb9" => :high_sierra sha256 "2e8567e154610bb1c3c29a50c6fc9f150ddf84c36d6c94fc35a1f8ab3a495f13" => :sierra + sha256 "1c4a6a6f2531cf0a8b48b2a6087cfe000861752c2951dee9e60b8efcd25e77e2" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/vcftools.rb b/Formula/vcftools.rb index 3a4ca64766a8c..b4e8d74689807 100644 --- a/Formula/vcftools.rb +++ b/Formula/vcftools.rb @@ -11,6 +11,7 @@ class Vcftools < Formula sha256 "2fc4ca7c7c23841a1eed8539910737b5986079be6d22d1ff8375f052266bf478" => :high_sierra sha256 "32c81874b5d34dee1e36f2dd628cb7eaba8ecef3d612985d7c02c61d6790c5b6" => :sierra sha256 "866bc9927660b97ae5bc34dc38db397212163ab289b3284db2d8c610b2aff3d4" => :el_capitan + sha256 "a7b9d3edda42d29733f381bc82fdd9a835f15c3b23b24771dfa28f7d329647d5" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/vcprompt.rb b/Formula/vcprompt.rb index a7c3bb7c8d4ad..9d86477101c1b 100644 --- a/Formula/vcprompt.rb +++ b/Formula/vcprompt.rb @@ -14,6 +14,7 @@ class Vcprompt < Formula sha256 "11e4de5f008aec3510274ef2265d6d30d214249e127cc1d3045b01b47232c96b" => :el_capitan sha256 "a6b02f96a018c993568e4ee43bfa23343c88aa4c6aa58b4727b69c01340f59ff" => :yosemite sha256 "ee133ff8277ce6d7792acd261ba3f27259e677badfe73b80ffd6fd08c6cd3665" => :mavericks + sha256 "b6601f9986b7cde626bdfc08792865e1001f5e820d308ada3916b56341650ae1" => :x86_64_linux end head do diff --git a/Formula/vcs.rb b/Formula/vcs.rb index 351242cc2a8e0..f7e2f11b8c9da 100644 --- a/Formula/vcs.rb +++ b/Formula/vcs.rb @@ -9,6 +9,7 @@ class Vcs < Formula sha256 "d93ff1a5972e0f9e961bf66ee8bbd99e6037505de83d73f22e69f8683d0ad1b6" => :catalina sha256 "d93ff1a5972e0f9e961bf66ee8bbd99e6037505de83d73f22e69f8683d0ad1b6" => :mojave sha256 "0873f5c80cc698e7b2ce6d653a43bb51ef363c5e0325997565b30d540e87cb86" => :high_sierra + sha256 "5f45fe03512d81108352042588affc0784cc46c82c70b0c942b00e1afe12768a" => :x86_64_linux end depends_on "ffmpeg" diff --git a/Formula/vde.rb b/Formula/vde.rb index 52e3d73b3c05d..d54ee359c9875 100644 --- a/Formula/vde.rb +++ b/Formula/vde.rb @@ -12,6 +12,7 @@ class Vde < Formula sha256 "97989b0577f7a1fbd13c916aff1e61391cf3d7b886c4ef965f0b765e034c8bbc" => :el_capitan sha256 "5ca4100e3dae3df4704e2fdf9ae07a1fb0637d2cb2e916e7db931a4cb84a0c55" => :yosemite sha256 "ab336b6d84a03dd981d70ab8b377ec3a61dcb9abfffd233c84a0e74c8fadc8b8" => :mavericks + sha256 "fba80b136b9f003701249ddacf6c2d7b1c7f9ce8e28c66bcf5903ac69ebcdcf8" => :x86_64_linux end def install diff --git a/Formula/vdirsyncer.rb b/Formula/vdirsyncer.rb index cca47a2416221..fc0fc89f9e8ff 100644 --- a/Formula/vdirsyncer.rb +++ b/Formula/vdirsyncer.rb @@ -13,6 +13,7 @@ class Vdirsyncer < Formula sha256 "68a313f863d08adfb913b5530606ef32c85c2e9ce20dfac6d42185b0d18e4670" => :catalina sha256 "ef27647042f45a65bf2f8ebb0170cea3b124f98ce4a9200d5a6f82b50a2a7de4" => :mojave sha256 "d9f144fba5c2de241806ade0e5141a2ed13cd17aaa00233e2f2397315f65f47e" => :high_sierra + sha256 "8d5d33ca240276c5b13def1f653982cc575a57f481cc4d35edb1de19f6a5d934" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/veclibfort.rb b/Formula/veclibfort.rb index 68a5ef8f26245..9933877a1d559 100644 --- a/Formula/veclibfort.rb +++ b/Formula/veclibfort.rb @@ -16,6 +16,7 @@ class Veclibfort < Formula end depends_on "gcc" # for gfortran + depends_on :macos def install system "make", "all" diff --git a/Formula/vegeta.rb b/Formula/vegeta.rb index 19f7d3c383312..62403c83c0391 100644 --- a/Formula/vegeta.rb +++ b/Formula/vegeta.rb @@ -9,6 +9,7 @@ class Vegeta < Formula sha256 "f93a70561ffc7d97fb58638e1555148058036f1b65ee3b0891352346a256c8d5" => :catalina sha256 "f3496b02858387a32051d015677ca417c04251b2a98b6d36d8611836908dd23e" => :mojave sha256 "d03417e5f8bf936b8fa726f6ec25607809db1e284a4ca98ebf884fea3825ec49" => :high_sierra + sha256 "e721e47acff7f252b5fe36061292f242613f9df4bb0df48eaa7abb5577300954" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/velero.rb b/Formula/velero.rb index 073e31bbafd29..e75ef1a2a5bf3 100644 --- a/Formula/velero.rb +++ b/Formula/velero.rb @@ -9,6 +9,7 @@ class Velero < Formula sha256 "c1af83293cc86379b0e1b636b60471a5526903ba0d39f95926025b31d88d3f88" => :catalina sha256 "0f6029061d476cf08155316302720e67c2314db9308af9224b5008b9a11e91bd" => :mojave sha256 "97aaf6c788952789041bf1745870eeffd1050f5af21079fd76917616281714a3" => :high_sierra + sha256 "644fc2e7d4896f04d557869f7e886d09d087999de59ef298e21393faa4247807" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/vert.rb b/Formula/vert.rb index c11751a8352ae..89011d27c6a87 100644 --- a/Formula/vert.rb +++ b/Formula/vert.rb @@ -11,6 +11,7 @@ class Vert < Formula sha256 "b7c63c671335e19afca83f08091a987c35576eb4cb94f1d7b00490d1448f3e77" => :high_sierra sha256 "e189a592a062ef9e2cc19506f99272ffc9f97f3e529a54eddd7287f0c9574935" => :sierra sha256 "534043c69cbd56a22d656ba873e180e628b3a0ace433d8f020b886212afa050e" => :el_capitan + sha256 "916f756c60905850e023b2f4ababf182503fca57ea80f811d211e5b77e3cdf1b" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/vgmstream.rb b/Formula/vgmstream.rb index c4ab15f93fb1e..af6aba7f67f01 100644 --- a/Formula/vgmstream.rb +++ b/Formula/vgmstream.rb @@ -11,6 +11,7 @@ class Vgmstream < Formula sha256 "27cb2df8b0a88d31507695a9b8711bbeca66ac9a09f8e34de399a45b7f2c216a" => :catalina sha256 "8a52d5fdc81f87c709c0f41c90b02cba2788f7429402a327fcf343d331346018" => :mojave sha256 "513761e04c72ecf6300222bd06d662b7ab0ae74b56f37cc586dcd514e5f2ffc3" => :high_sierra + sha256 "bffced1c31aaeec4559d60dbc3239ccd16a3fb0cbab15de072628db5ac6555b9" => :x86_64_linux end depends_on "libao" diff --git a/Formula/vifm.rb b/Formula/vifm.rb index f1bbf4c3cfcf7..37cad2ac22ec3 100644 --- a/Formula/vifm.rb +++ b/Formula/vifm.rb @@ -8,11 +8,14 @@ class Vifm < Formula sha256 "0495acdf812f89f23c7fafcccef47589249477c5c38dd0e47049c3421edc712a" => :mojave sha256 "8371dea589590796e0f1c6b7b5ce263e18b9a1619551d5967deefd5035e512e0" => :high_sierra sha256 "ded145b46f48c79712b12e7f8d14ab8b219778fcd6d0b436d0c156dd0b15129d" => :sierra + sha256 "03b37512da7f4c19a7fd72c73f8e2d623404765d86303a56296d43ec6c44e0a3" => :x86_64_linux end uses_from_macos "groff" => :build uses_from_macos "ncurses" + depends_on "groff" => :build unless OS.mac? + def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", @@ -20,7 +23,7 @@ def install "--without-libmagic", "--without-X11" system "make" - system "make", "check" + system "make", "check" if OS.mac? ENV.deparallelize { system "make", "install" } end diff --git a/Formula/vilistextum.rb b/Formula/vilistextum.rb index 3961f1718030d..a3ea0ce13c606 100644 --- a/Formula/vilistextum.rb +++ b/Formula/vilistextum.rb @@ -13,6 +13,7 @@ class Vilistextum < Formula sha256 "d46bae51c7e9a7193a735660af8583960c98e50f03aa33c8a9d81c22b2d9bf61" => :el_capitan sha256 "77ab66b58db8649e9444584b5ee85e6c6c7badeb665425263c50282367eea003" => :yosemite sha256 "be608cbb3892c81f92392253a86456f042e804b55c58e1331a01531781137f74" => :mavericks + sha256 "02e351bc8ccd19bf766514f585d1c8184ab7ad9d137dd10005e78cbd56ae9bb8" => :x86_64_linux end def install diff --git a/Formula/vim.rb b/Formula/vim.rb index 69d32ea7017c5..3c3d4046e30db 100644 --- a/Formula/vim.rb +++ b/Formula/vim.rb @@ -10,6 +10,7 @@ class Vim < Formula sha256 "e393362c8fcfa5a8c8218623234087c44a516527e3841dcc255bcac73007aaf1" => :catalina sha256 "febf45b80d0f46f17f559842813dcb6948bb17fdeb87c1cde64fc8be82d38bd5" => :mojave sha256 "4baa72387e81f56002710accc0aedf540d5b93b89431ecb0d9d7b16c3abc1887" => :high_sierra + sha256 "0bce5296ebebac3aa50880252e85908c02c7b75771c47bf9ad2bf21e300a00d0" => :x86_64_linux end depends_on "gettext" diff --git a/Formula/vimpager.rb b/Formula/vimpager.rb index 013d54c9f2102..2e69fcbec6a6a 100644 --- a/Formula/vimpager.rb +++ b/Formula/vimpager.rb @@ -13,6 +13,7 @@ class Vimpager < Formula sha256 "eccfe695299ff91b489e0385b2024e6f383426f696dc4a5462fe2e0bc6f875b1" => :el_capitan sha256 "be8ae8e77106e1fa95821b59171b982af74365693be0b416e41bb807a07c6c60" => :yosemite sha256 "4e751d2207b8925e1c229edb88a7f635d41aa611a576a1b7a9bf0b9b701df341" => :mavericks + sha256 "30604f02c981295f1cd967cb1ecf5a2afd3c4c51f5d751383c78eafb085e0f10" => :x86_64_linux # glibc 2.19 end depends_on "pandoc" => :build diff --git a/Formula/virgil.rb b/Formula/virgil.rb index a0026d32b12f7..f3fc6ada378ef 100644 --- a/Formula/virgil.rb +++ b/Formula/virgil.rb @@ -11,6 +11,7 @@ class Virgil < Formula sha256 "bc2f75b6c78464e896f574abe240fc54dea029450ffcee2d2d087d0fc67c2091" => :catalina sha256 "f9ca3b004661ab12821c133655c5b50dc06ef0f18d444a5b8dc1a58dbc003b52" => :mojave sha256 "5398b66d72d5e25aaa3c10ef70818073a6cd3b38ecc688bdf0ee44979fcd5f1d" => :high_sierra + sha256 "9501b0e1e115c1d0de245aa600f48bf80dceb60904cbc123d5449463d01e3a64" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/virtuoso.rb b/Formula/virtuoso.rb index b414483ac48f4..66fd654fb1e13 100644 --- a/Formula/virtuoso.rb +++ b/Formula/virtuoso.rb @@ -14,6 +14,7 @@ class Virtuoso < Formula sha256 "c4904ae739141d51638c3f33064c85498c20d32169053daa61203ff6706c1fa8" => :catalina sha256 "3a2375ce75d34e6fa2568aeb4bc3ac0239a4052c811eb3afeb7536166b05e67b" => :mojave sha256 "3abcc2f1444324d675af9014ac20555124c875d7e9a4ba9b021fd1ad7c570845" => :high_sierra + sha256 "f03a0ddc47b6b550c2057e4bd5f17f1eac0844d49a2e228c13767c9b2f889011" => :x86_64_linux end depends_on "autoconf" => :build @@ -22,6 +23,10 @@ class Virtuoso < Formula depends_on "gawk" => :build depends_on "libtool" => :build depends_on "openssl@1.1" + unless OS.mac? + depends_on "gperf" => :build + depends_on "net-tools" => :build + end uses_from_macos "bison" => :build uses_from_macos "flex" => :build diff --git a/Formula/virustotal-cli.rb b/Formula/virustotal-cli.rb index cc5ea8372cb86..28ce891a9369f 100644 --- a/Formula/virustotal-cli.rb +++ b/Formula/virustotal-cli.rb @@ -9,6 +9,7 @@ class VirustotalCli < Formula sha256 "36fcf039fa5264b8841ba3ba954816031cb1b6ac42aacd26b1e5791b643fae30" => :catalina sha256 "be3fd19af1b5004ccf95ef0996fa387b88e7bfa30ca651dd69b94700fb92dcec" => :mojave sha256 "118eaafec3d20e709091266c786d5121b27e0d1c8d8ded2f5c21c77046b571d5" => :high_sierra + sha256 "02960c7ed31733109d7650880d563b9b9b610ac6ec68d3fb5859e6ba911d32b3" => :x86_64_linux end depends_on "dep" => :build diff --git a/Formula/vis.rb b/Formula/vis.rb index d0f68dd0d23d8..6a56e53dc54d6 100644 --- a/Formula/vis.rb +++ b/Formula/vis.rb @@ -9,6 +9,7 @@ class Vis < Formula sha256 "370791e6f8c70327d9afc8049fe8f8ff16a9e843835efe9f606dbdef6c2319f3" => :catalina sha256 "3f39518139d63c87a5a499a3ae53829bde4ed1b1eecbc5344d1bfe883ea16b7c" => :mojave sha256 "166b64aad19e64712cfbf1f3da60cebf1fb6351b3f32921aa10060081cbcef3a" => :high_sierra + sha256 "283bddc7847fbed054f3d63c613bc61be37337b9386e1506246fc43e7d5b00d1" => :x86_64_linux end depends_on "luarocks" => :build diff --git a/Formula/visionmedia-watch.rb b/Formula/visionmedia-watch.rb index deabfcec39827..2bbd3becaf588 100644 --- a/Formula/visionmedia-watch.rb +++ b/Formula/visionmedia-watch.rb @@ -15,6 +15,7 @@ class VisionmediaWatch < Formula sha256 "b43dbb305fcb6c681d2208456a1f39dd0aa5b97790b629ac907a666869119f20" => :el_capitan sha256 "4d31b501672801394c687aa45a44741f3461fb4730e96fe94197a1e7952fe2e0" => :yosemite sha256 "941cd639bf71a7d0e7397b77a3eebce4bd06fbc4ef30aac69147b04b3f6569f8" => :mavericks + sha256 "68a722d117062e597afb10adbeb46eb1eb0535e0b22b875b6b894bb7ed7f1160" => :x86_64_linux end conflicts_with "watch" diff --git a/Formula/visitors.rb b/Formula/visitors.rb index bffbc52d4788e..a9e765309a062 100644 --- a/Formula/visitors.rb +++ b/Formula/visitors.rb @@ -14,6 +14,7 @@ class Visitors < Formula sha256 "60d139c48a4d3c8b457462530893ff11c681e512cf707ba6819a783eb17d3c4c" => :el_capitan sha256 "2d0a3e1a40e08ae6b4892731b0cd1f3a495e8eba42476630b7863fc057e85df3" => :yosemite sha256 "c94f334e326f511b486e4b63b5e62ee7a59121ea5d790a8e5854ff4b57abb5e6" => :mavericks + sha256 "dd61381b6d4befd771c6dc526b9aa5c3b1dafdfd65479e06306175230e31f6f4" => :x86_64_linux end def install diff --git a/Formula/vitetris.rb b/Formula/vitetris.rb index 7212824ed8e86..f617873c9c3fa 100644 --- a/Formula/vitetris.rb +++ b/Formula/vitetris.rb @@ -10,6 +10,7 @@ class Vitetris < Formula sha256 "5cfebdcea81b5e7720d1941f3973b0b47c1fd510234b09f81e9098c1132c0b92" => :mojave sha256 "175da9ed672d62d7c5409d94f299a67ab8499020283a4ea1ca21f6efc6470809" => :high_sierra sha256 "6cb9f1f8d9492c7a652d32115ae488dd19282aa94261957115b50e97c74f06f4" => :sierra + sha256 "a7c431cfffee36712d6f47dc56b3afa4f09b43280c9df541f77b4eeaa52f9b6b" => :x86_64_linux end # remove a 'strip' option not supported on OS X and root options for diff --git a/Formula/vmtouch.rb b/Formula/vmtouch.rb index a6b427bc82b12..4f7b053152d30 100644 --- a/Formula/vmtouch.rb +++ b/Formula/vmtouch.rb @@ -11,6 +11,7 @@ class Vmtouch < Formula sha256 "020d4e624a448e4e1b9a6e26b8f506bd65ab789ae1c0f23f25beda78b09bc6dd" => :mojave sha256 "edb14ca1ff4cbd4ab535ca9099ea113a36e280ddaf2957a65bdef10f4a7a1b88" => :high_sierra sha256 "7359ed3256886940e6fb1883141c495d5b3e6ab28130ed16553e0f6ab57ac3db" => :sierra + sha256 "55ec1c830415be7e6e7b01947028f631fa3674d178f09959ae5f58b42a9594d1" => :x86_64_linux end # Upstream change broke macOS support in 1.3.1, patch submitted upstream and accepted. diff --git a/Formula/vnstat.rb b/Formula/vnstat.rb index b9a29c4c1835e..830e308be883e 100644 --- a/Formula/vnstat.rb +++ b/Formula/vnstat.rb @@ -9,6 +9,7 @@ class Vnstat < Formula sha256 "c4087b24e69aa3bbf9ccb7f58ca3d942bc3403bcfff47df7657cac00e8c9fc75" => :catalina sha256 "795d67ae3e4d0f8683ee0812d29a4205aab38a2f453a09cd714adac7f00aaea8" => :mojave sha256 "5e873fe1cb03aecfc02e0a5224f2fa222ef9e3f2a2e8a007a031cf4a1f9cf3ee" => :high_sierra + sha256 "0cff69af2c373c36bcae73018ad8c77fc7f3e8350ab028a58866329ea66a3867" => :x86_64_linux end depends_on "gd" @@ -77,7 +78,7 @@ def plist test do cp etc/"vnstat.conf", testpath - inreplace "vnstat.conf", "/usr/local/var", testpath/"var" + inreplace "vnstat.conf", "#{HOMEBREW_PREFIX}/var", testpath/"var" (testpath/"var/db/vnstat").mkpath begin diff --git a/Formula/volatility.rb b/Formula/volatility.rb index e9de897dbf1ca..7af9407c722a5 100644 --- a/Formula/volatility.rb +++ b/Formula/volatility.rb @@ -5,7 +5,7 @@ class Volatility < Formula homepage "https://github.com/volatilityfoundation/volatility" url "https://github.com/volatilityfoundation/volatility/archive/2.6.1.tar.gz" sha256 "a8dfdbdb2aaa0885387b709b821bb8250e698086fb32015bc2896ea55f359058" - revision 2 + revision OS.mac? ? 2 : 3 head "https://github.com/volatilityfoundation/volatility.git" bottle do @@ -155,9 +155,17 @@ def install resource("Pillow").stage do inreplace "setup.py" do |s| - sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" + if OS.mac? + sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" + else + zlib_prefix = Formula["zlib"].opt_prefix + end s.gsub! "openjpeg.h", "probably_not_a_header_called_this_eh.h" - s.gsub! "ZLIB_ROOT = None", "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + if OS.mac? + s.gsub! "ZLIB_ROOT = None", "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + else + s.gsub! "ZLIB_ROOT = None", "ZLIB_ROOT = ('#{zlib_prefix}/lib', '#{zlib_prefix}/include')" + end s.gsub! "JPEG_ROOT = None", "JPEG_ROOT = ('#{Formula["jpeg"].opt_prefix}/lib', " \ "'#{Formula["jpeg"].opt_prefix}/include')" @@ -169,7 +177,7 @@ def install begin # avoid triggering "helpful" distutils code that doesn't recognize Xcode 7 .tbd stubs deleted = ENV.delete "SDKROOT" - unless MacOS::CLT.installed? + if OS.mac? && !MacOS::CLT.installed? ENV.append "CFLAGS", "-I#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers" end venv.pip_install Pathname.pwd @@ -181,7 +189,8 @@ def install res = resources.map(&:name).to_set - ["Pillow"] res.each do |r| - venv.pip_install resource(r) + # appnope is only intended for macOS and refuses to install elsewhere + venv.pip_install resource(r) unless r == "appnope" end venv.pip_install_and_link buildpath diff --git a/Formula/voldemort.rb b/Formula/voldemort.rb index 866b482601caf..444bd48556326 100644 --- a/Formula/voldemort.rb +++ b/Formula/voldemort.rb @@ -10,6 +10,7 @@ class Voldemort < Formula sha256 "25ce694b1f816f5004a21399d514cf44be904f8e575d8df4f0911370ac1fba19" => :mojave sha256 "9a4436d48d7908470727c7c4bbc9d6ed34ef45f2512646823418651f4aa6a991" => :high_sierra sha256 "e1509d1ec241f1d5c693ba6aeb00938fb0cbc7d7f4e92bab54d2dafdbe631849" => :sierra + sha256 "c2239a35ce888e4a5b43980ba780a06f1590d247b867d36774422a32eca10bea" => :x86_64_linux end depends_on "gradle" => :build diff --git a/Formula/volt.rb b/Formula/volt.rb index 34e09b9536a42..8659afb15a726 100644 --- a/Formula/volt.rb +++ b/Formula/volt.rb @@ -12,6 +12,7 @@ class Volt < Formula sha256 "9db9e940c124e8e655cdd84b7d143f526535c588ebd6503acb3960143d08f905" => :mojave sha256 "7fd8887efcdc3a9816b2dea510c2e3ba218e0e719390841d3b0b416fde53378e" => :high_sierra sha256 "4edc3f1130757ddbf0a7b3c018825f68f2ecb24417f3afc3fd54b532e8c72c46" => :sierra + sha256 "4240f91c96fac27606cb8f538aa7c1d3d2db9eb94810dfdf149b1c1a97deaf6e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/vorbis-tools.rb b/Formula/vorbis-tools.rb index ccdc0645be475..6a14a550e8ddc 100644 --- a/Formula/vorbis-tools.rb +++ b/Formula/vorbis-tools.rb @@ -6,11 +6,12 @@ class VorbisTools < Formula revision 2 bottle do - cellar :any + cellar :any_skip_relocation rebuild 1 sha256 "71a81bbeec2d79ddd7f39858cf66a450fac9d542824c30a064298229d6637594" => :catalina sha256 "c3e402519ad170a0a37d80d394d8afbe905985784f8ea5d93fcc84a4486a9977" => :mojave sha256 "e929c31331ffcb58d21cb086184ed747185dd8d0f4b7ee1b98134cabe44490bc" => :high_sierra + sha256 "6e90abe127bc9b07a52c6103137536bc4355f74a67c83e9e9364e72dc5348f32" => :x86_64_linux end depends_on "pkg-config" => :build @@ -24,7 +25,10 @@ class VorbisTools < Formula def install # Fix `brew linkage --test` "Missing libraries: /usr/lib/libnetwork.dylib" # Prevent bogus linkage to the libnetwork.tbd in Xcode 7's SDK - ENV.delete("SDKROOT") if MacOS.version == :yosemite + ENV.delete("SDKROOT") if OS.mac? && MacOS.version == :yosemite + + # Fixes: /usr/bin/ld: vgfilter.o: undefined reference to symbol 'tanh@@GLIBC_2.2.5' + ENV.prepend "LDFLAGS", "-lm" unless OS.mac? args = %W[ --disable-debug diff --git a/Formula/vorbisgain.rb b/Formula/vorbisgain.rb index ade6c46b07948..106e82c356911 100644 --- a/Formula/vorbisgain.rb +++ b/Formula/vorbisgain.rb @@ -13,6 +13,7 @@ class Vorbisgain < Formula sha256 "00f7047e5d884dbf22ed036154961b41d4ad6ae8295c55043929b008ae82a9f7" => :el_capitan sha256 "a1315eaaaf667f7486deb2b899c422e3cc9caa8f9e771221dca12b0ecc085dc7" => :yosemite sha256 "7bff88a3512ff2d28846b89b89f1cfd130e5934f1f6301d36e66ccc26b896281" => :mavericks + sha256 "acaa8afad6cd0e01b23b88c6c7cb1736e08b315c827bafe3603fb1e413451046" => :x86_64_linux end depends_on "libogg" diff --git a/Formula/voro++.rb b/Formula/voro++.rb index 547f71e23102e..5d294ec8aef17 100644 --- a/Formula/voro++.rb +++ b/Formula/voro++.rb @@ -13,6 +13,7 @@ class Voroxx < Formula sha256 "9d522e672d8f551439c18b536e0ca2d0dc94a6036722eba12bbaba37d2aa3428" => :sierra sha256 "b10e4cccc62a7fff1a34c6f80174e2f62cb12dfcaf2782b2c81cc567f0928943" => :el_capitan sha256 "d7ce06fd7ebd51a8a592c2409f80eae0bbc6a5fc0d906ffa324534c805249af1" => :yosemite + sha256 "5d85269b238071c06300df8766e1f8b3f58b8c87cc1bf05e50bcf2cb2657060d" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/vpcs.rb b/Formula/vpcs.rb index d6685f13ba10f..dbcfb857f6a8b 100644 --- a/Formula/vpcs.rb +++ b/Formula/vpcs.rb @@ -11,11 +11,12 @@ class Vpcs < Formula sha256 "ac52b231d875679e7bd4da3a09c6b5bc833e5b93fe5a77749dc834b1d82d21d5" => :high_sierra sha256 "78c7e415e9bcbdf28cfdda5d37fce9cc7d735b01d61400b41239e0cdee17ada5" => :sierra sha256 "0f1a65e672fd1d2dbc866279835231ec3737e64c514f38a08bf409807e910222" => :el_capitan + sha256 "8fbfdc99c4e42b01c655d68cd2fc0a7a23ecd9b9d2df6a7e414e00498ba38c5c" => :x86_64_linux end def install cd "src" do - system "make", "-f", "Makefile.osx" + system "make", "-f", "Makefile.#{OS.mac? ? "osx" : "linux"}" bin.install "vpcs" end end diff --git a/Formula/vramsteg.rb b/Formula/vramsteg.rb index f9d3bff5f9d72..91cbab49b1421 100644 --- a/Formula/vramsteg.rb +++ b/Formula/vramsteg.rb @@ -14,6 +14,7 @@ class Vramsteg < Formula sha256 "e4b3e2e66c2f772a38de529b884091a2ffa1f920af6604696129d21cc9e70b99" => :el_capitan sha256 "9285766e0502b88c62d3d295402a41c46b8d9d2707a492bb5d70484b1080c212" => :yosemite sha256 "f9ea5a2984d676db153d2128b1aa84a413edb93692e9c6be8147e5a856d42972" => :mavericks + sha256 "993d951d168210668304d0363b9f8eba6e7f5037537fc49bb12dc013c0e518e1" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/vrpn.rb b/Formula/vrpn.rb index 36e9a206f71ba..d26c815b94c7f 100644 --- a/Formula/vrpn.rb +++ b/Formula/vrpn.rb @@ -12,6 +12,7 @@ class Vrpn < Formula sha256 "9b9f4a31161dbc0a4a9ea0759122f0a3725a361dde0b5f1def9bab4e59de12e7" => :high_sierra sha256 "4e03c131adba54f74742151ee269d2d0c1716e307294679ed2366c0e6cb5fd41" => :sierra sha256 "36e5273f8006b1fe5f1655e258f8937e06e9abc4ad849e2c9b1e7a1462fe790d" => :el_capitan + sha256 "30030b05ef8bc7a36a3fe44167566c800ac46362c4c5fbf4bdb77d03efa89c1e" => :x86_64_linux end depends_on "cmake" => :build @@ -19,7 +20,7 @@ class Vrpn < Formula def install mkdir "build" do - system "cmake", "..", *std_cmake_args, + system "cmake", "..", *args, "-DCMAKE_OSX_SYSROOT=#{MacOS.sdk_path}", "-DVRPN_BUILD_CLIENTS:BOOL=OFF", "-DVRPN_BUILD_JAVA:BOOL=OFF" diff --git a/Formula/vsts-cli.rb b/Formula/vsts-cli.rb index d0185d2c25dcd..be6e5270fe872 100644 --- a/Formula/vsts-cli.rb +++ b/Formula/vsts-cli.rb @@ -5,13 +5,14 @@ class VstsCli < Formula homepage "https://docs.microsoft.com/en-us/cli/vsts" url "https://files.pythonhosted.org/packages/f9/c2/3ed698480ab30d2807fc961eef152099589aeaec3f1407945a4e07275de5/vsts-cli-0.1.4.tar.gz" sha256 "27defe1d8aaa1fcbc3517274c0fdbd42b5ebe2c1c40edfc133d98fe4bb7114de" - revision 2 + revision OS.mac? ? 2 : 4 bottle do - cellar :any + cellar :any_skip_relocation sha256 "b37f51f73b543f2c9403e0a982aa1ae625f170b971a75b1ab07a23a62aa01949" => :catalina sha256 "27a52ac2afc49b4392804ce47984f8ea1986dde0a221d599d2f3afa0e93ca6b3" => :mojave sha256 "59d1ccaa24e3356771bd998de79c226803957811170765933d5ca03f3547f99a" => :high_sierra + sha256 "fb811b5fdcfcd5e86766bd0c509365813d19ac27ed670bfe4b5b05a161fe2322" => :x86_64_linux end depends_on "python@3.8" @@ -207,6 +208,33 @@ class VstsCli < Formula sha256 "ec023e69d88292024e6bd5ac34b9d5913aa92c4ce148751c33fdf9da13e0d522" end + unless OS.mac? + resource "pycparser" do + url "https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a/pycparser-2.19.tar.gz#sha256=a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" + sha256 "a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" + end + + resource "cffi" do + url "https://files.pythonhosted.org/packages/2d/bf/960e5a422db3ac1a5e612cb35ca436c3fc985ed4b7ed13a1b4879006f450/cffi-1.13.2.tar.gz#sha256=599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346" + sha256 "599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346" + end + + resource "cryptography" do + url "https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4/cryptography-2.8.tar.gz#sha256=3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651" + sha256 "3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651" + end + + resource "jeepney" do + url "https://files.pythonhosted.org/packages/3a/b6/28c665d48e48b5b7e6a26853d6b4595c4031de7798a6c4985b14492ebd14/jeepney-0.4.1.tar.gz#sha256=13806f91a96e9b2623fd2a81b950d763ee471454aafd9eb6d75dbe7afce428fb" + sha256 "13806f91a96e9b2623fd2a81b950d763ee471454aafd9eb6d75dbe7afce428fb" + end + + resource "secretstorage" do + url "https://files.pythonhosted.org/packages/a6/89/df343dbc2957a317127e7ff2983230dc5336273be34f2e1911519d85aeb5/SecretStorage-3.1.1.tar.gz#sha256=20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92" + sha256 "20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92" + end + end + def install virtualenv_install_with_resources bin.install_symlink "#{libexec}/bin/vsts" => "vsts" @@ -214,8 +242,11 @@ def install test do system "#{bin}/vsts", "configure", "--help" - output = shell_output("#{bin}/vsts logout 2>&1", 1) - assert_equal "ERROR: The credential was not found", output.chomp + # ERROR: No recommended backend was available. + if OS.mac? + output = shell_output("#{bin}/vsts logout 2>&1", 1) + assert_equal "ERROR: The credential was not found", output.chomp + end output = shell_output("#{bin}/vsts work 2>&1", 2) assert_match "vsts work: error: the following arguments are required", output end diff --git a/Formula/vte3.rb b/Formula/vte3.rb index c128905b1fbb6..1dd997e03d602 100644 --- a/Formula/vte3.rb +++ b/Formula/vte3.rb @@ -107,12 +107,12 @@ def install -lgnutls -lgobject-2.0 -lgtk-3 - -lintl -lpango-1.0 -lpangocairo-1.0 -lvte-2.91 -lz ] + flags << "-lintl" if OS.mac? system ENV.cc, "test.c", "-o", "test", *flags system "./test" end diff --git a/Formula/vtk.rb b/Formula/vtk.rb index 2391cc98fdd37..e1f188989d2ab 100644 --- a/Formula/vtk.rb +++ b/Formula/vtk.rb @@ -1,7 +1,7 @@ class Vtk < Formula desc "Toolkit for 3D computer graphics, image processing, and visualization" homepage "https://www.vtk.org/" - revision 10 + revision OS.mac? ? 10 : 11 head "https://github.com/Kitware/VTK.git" stable do @@ -39,6 +39,16 @@ class Vtk < Formula depends_on "python@3.8" depends_on "qt" + unless OS.mac? + depends_on "expat" + depends_on "libxml2" + depends_on "szip" + depends_on "zlib" + depends_on "tcl-tk" + depends_on "mesa" + depends_on "linuxbrew/xorg/xorg" + end + def install pyver = Language::Python.major_minor_version "python3" args = std_cmake_args + %W[ @@ -50,7 +60,6 @@ def install -DModule_vtkInfovisBoostGraphAlgorithms=ON -DModule_vtkRenderingFreeTypeFontConfig=ON -DVTK_REQUIRED_OBJCXX_FLAGS='' - -DVTK_USE_COCOA=ON -DVTK_USE_SYSTEM_EXPAT=ON -DVTK_USE_SYSTEM_HDF5=ON -DVTK_USE_SYSTEM_JPEG=ON @@ -68,6 +77,7 @@ def install -DVTK_WRAP_PYTHON_SIP=ON -DSIP_PYQT_DIR='#{Formula["pyqt5"].opt_share}/sip' ] + args << "-DVTK_USE_COCOA=" + (OS.mac? ? "ON" : "OFF") mkdir "build" do system "cmake", "..", *args diff --git a/Formula/vttest.rb b/Formula/vttest.rb index 11edc179972e3..b3a8bd107a704 100644 --- a/Formula/vttest.rb +++ b/Formula/vttest.rb @@ -9,6 +9,7 @@ class Vttest < Formula sha256 "3203719ed3132e7f57b3e5bab9341640a4626697a8b2c2fb01cccfad004b688d" => :catalina sha256 "ed6fc309514156d4253b0ad03f809c326095f413033a18c38a49c46281396075" => :mojave sha256 "2bfa2183868d51e54212a0d8b71fca79e583b8850547407056e853e3f52b293b" => :high_sierra + sha256 "4858946fa444be6883a8fa4bfe4da1ddd7f6ee67fef7b996def73afacd68c253" => :x86_64_linux end def install diff --git a/Formula/vulkan-headers.rb b/Formula/vulkan-headers.rb index c7f842c7b3b9c..59f4c309c6753 100644 --- a/Formula/vulkan-headers.rb +++ b/Formula/vulkan-headers.rb @@ -9,6 +9,7 @@ class VulkanHeaders < Formula sha256 "f6755cfa8655a26943b49675de9aeb4edfb4936fb5f4a05ad5b4a314a42060ec" => :catalina sha256 "f6755cfa8655a26943b49675de9aeb4edfb4936fb5f4a05ad5b4a314a42060ec" => :mojave sha256 "f6755cfa8655a26943b49675de9aeb4edfb4936fb5f4a05ad5b4a314a42060ec" => :high_sierra + sha256 "c881c0020d71e34493c052a70845f7593c641c44d6cd4efcd05da6d1e91de3c4" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/vultr.rb b/Formula/vultr.rb index a68479480bffa..dad28cf885916 100644 --- a/Formula/vultr.rb +++ b/Formula/vultr.rb @@ -11,6 +11,7 @@ class Vultr < Formula sha256 "af7d3754f0136c4ed3f0067920c0351931df48f487457ba6f12741e745e636e4" => :mojave sha256 "9384a5df861603c74301e8500d70c170f806348fbfdf5117b1c6d91bed7d26d2" => :high_sierra sha256 "a49908fc98bd2c2e2322e1d9511352ece67dbedc02879c71811d82b7c9bdaa3e" => :sierra + sha256 "97b064b4c4c1313a0c5f1abe4fe5526e05916dda251a4e31b0368fdfe565bcff" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/w3m.rb b/Formula/w3m.rb index f07184445d07e..64e2f3858226e 100644 --- a/Formula/w3m.rb +++ b/Formula/w3m.rb @@ -24,11 +24,16 @@ class W3m < Formula sha256 "c2a4f7208e98f575eadaff6af3dc9a93305008b93d2f069c53d687ba61b85d64" => :mojave sha256 "bc46bb9b70d7149058d2c757aa0b8ea68c7c6836faee26da0b697d81cca0927d" => :high_sierra sha256 "809a34cb2c14b98827cfe9f18008b0ebc545e359c5f8c1279e71948ac336bdd1" => :sierra + sha256 "120e4e608f97058318ca2f8ebff4393fd928ef3efdcca2ff4c4008569012c93c" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "bdw-gc" depends_on "openssl@1.1" + unless OS.mac? + depends_on "libbsd" + depends_on "gettext" + end uses_from_macos "ncurses" uses_from_macos "zlib" diff --git a/Formula/wabt.rb b/Formula/wabt.rb index 1c222d83b7387..9ff3ad3734435 100644 --- a/Formula/wabt.rb +++ b/Formula/wabt.rb @@ -10,6 +10,7 @@ class Wabt < Formula sha256 "fdb227c18043e0bb2beb7c1ee8010e725172e8e3667725d73b263cea00442479" => :catalina sha256 "b8084b828d5a15dea3c67b6a74420921a46ffeea7d8a7868384b0691d6e414e4" => :mojave sha256 "3e252aab05b7623daffc44967874ba0efa1ca1785004b99912fe0eb0898e1563" => :high_sierra + sha256 "d0094719a697efce273f48562c6e4dcc3cf09c4955c4895bbe7ae9247eae0b13" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/wagyu.rb b/Formula/wagyu.rb index 219d508fd907b..aaa1c066032c7 100644 --- a/Formula/wagyu.rb +++ b/Formula/wagyu.rb @@ -11,6 +11,7 @@ class Wagyu < Formula sha256 "69e6539d7e3801aaea4cd14acd48684f703a4c1cac0f04790d3ada827daf77f9" => :catalina sha256 "0b6fd9b45280ecac2586b191303e0e643ef14c85cad06b6aca73e51e7af6ae46" => :mojave sha256 "c2175413a53a69da950ca7b879afc882f2181a34cb633e823bf2a3dc29675fc4" => :high_sierra + sha256 "c2612ab493ca4cedcd37cfa62a329bc8ce1d0cce227a2e854aae8e3849505a6c" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/wakatime-cli.rb b/Formula/wakatime-cli.rb index afb4f40425af0..5007974d09193 100644 --- a/Formula/wakatime-cli.rb +++ b/Formula/wakatime-cli.rb @@ -9,6 +9,7 @@ class WakatimeCli < Formula sha256 "6415adc12bbcea7ae69fa5ca29848dac754e9f09cc0f21a2c246d4118e8aa90a" => :catalina sha256 "6415adc12bbcea7ae69fa5ca29848dac754e9f09cc0f21a2c246d4118e8aa90a" => :mojave sha256 "6415adc12bbcea7ae69fa5ca29848dac754e9f09cc0f21a2c246d4118e8aa90a" => :high_sierra + sha256 "52fc6744dbba67d6af6c7a1de84c899e4579a2630109359082cc207a98236c0a" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/wal2json.rb b/Formula/wal2json.rb index 31b5dee73d4ea..40397f8b5c97d 100644 --- a/Formula/wal2json.rb +++ b/Formula/wal2json.rb @@ -10,6 +10,7 @@ class Wal2json < Formula sha256 "f8d15f5d13d6e4942ccd4baa3ec633a39cd62337224eb1a165689cd2aebcbe51" => :catalina sha256 "9f7218381271a905d4da6a943599cc1db3bbe92965dadc49ac2ae94a35350003" => :mojave sha256 "18182f272c0ada8069adc54d65b3607c51c12e144b0cbe2620ee8fb3fb09c00f" => :high_sierra + sha256 "d93a95ba39d1c96174690d5fbd6778a23b6de7bb4027bf337fc114a6ef00cf45" => :x86_64_linux end depends_on "postgresql" diff --git a/Formula/wallpaper.rb b/Formula/wallpaper.rb index 45cbd41a6664d..3bf29ac54fc28 100644 --- a/Formula/wallpaper.rb +++ b/Formula/wallpaper.rb @@ -11,8 +11,10 @@ class Wallpaper < Formula sha256 "2a2ca640dde6aed8dab04983c680d60532eefcadc11f3c0b379e7754d4d9a662" => :catalina end - depends_on :xcode => ["11.4", :build] - depends_on :macos => :sierra + if OS.mac? + depends_on :xcode => ["11.4", :build] + depends_on :macos => :sierra + end def install system "swift", "build", "--disable-sandbox", "-c", "release" diff --git a/Formula/wapm.rb b/Formula/wapm.rb index 4dc1e9248eaef..eb83de794ef0a 100644 --- a/Formula/wapm.rb +++ b/Formula/wapm.rb @@ -10,6 +10,7 @@ class Wapm < Formula sha256 "4f1c18ce08a6f4a483a50888ad9769898a203bd826b992f877010f38a80ca710" => :catalina sha256 "db34bd4d679207ae7d903a4beada8e30e3568f16c55fd610a196931c440716ef" => :mojave sha256 "70e4c8f038838547a2e70116567c1042f2f4cec53542e0750d4d061f80dc7b23" => :high_sierra + sha256 "2d1f0aefbc0b7f6264e5fb6852edbda5bc9e0235288f7112fae691956b6ee51d" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/wartremover.rb b/Formula/wartremover.rb index 7a227304db402..89f6a06f13406 100644 --- a/Formula/wartremover.rb +++ b/Formula/wartremover.rb @@ -10,6 +10,7 @@ class Wartremover < Formula sha256 "b035124c934d0df9387b761b5072207b1d1dc0b1191b4e5e56accfa3c70b3eaf" => :catalina sha256 "b8625d2e85cbaa9dc94398f40d80d3ff864e7982e6dba4d1316c5299d229a484" => :mojave sha256 "9e22985585006d2ed0cac559dd8c1af5b77072cfe5a3a98f97563c1aa6afe145" => :high_sierra + sha256 "7bfff60332118cc11e3812357772a9397a7f11005334ef51efcf915aef33aa52" => :x86_64_linux end depends_on "sbt" => :build diff --git a/Formula/wasmer.rb b/Formula/wasmer.rb index ac91889ca31d3..83f88c8ded73e 100644 --- a/Formula/wasmer.rb +++ b/Formula/wasmer.rb @@ -10,6 +10,7 @@ class Wasmer < Formula sha256 "751b4b059036dbca254eef935bc03240e1fd559465a376a0cff8f5a41dcd3980" => :catalina sha256 "725d2b857e0954b1e2fd8a01021847e168d5daec33cd76c32f90a0ae12fdf422" => :mojave sha256 "42ea898c1ebd9c0ac58bf21117c05df6a4726123590444c19173a01586c80c63" => :high_sierra + sha256 "d8c67a8b09c5699a8533db6ce5099c5bd9332789e43dd1259be4e83b82fa6703" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/watch-sim.rb b/Formula/watch-sim.rb index 06f13434f103f..d6ecc8411bd06 100644 --- a/Formula/watch-sim.rb +++ b/Formula/watch-sim.rb @@ -16,7 +16,7 @@ class WatchSim < Formula sha256 "b04846befdb378679cdd93bdf182784a8ed0da3957cb0b4a124576b3cd06e54c" => :mavericks end - depends_on :xcode => "6.2" + depends_on :xcode => "6.2" if OS.mac? def install system "make" diff --git a/Formula/watch.rb b/Formula/watch.rb index e49f6cbcf373b..0f80fa17dc826 100644 --- a/Formula/watch.rb +++ b/Formula/watch.rb @@ -7,10 +7,11 @@ class Watch < Formula head "https://gitlab.com/procps-ng/procps.git" bottle do - cellar :any + cellar :any_skip_relocation sha256 "011e48363fe62c7a4ba0dec746d5964ee25545bde7855a31db0cb411420df190" => :catalina sha256 "d17aba6f80c530e6b91b30e088df60aab3dc84b2f57ca7499928322438b9f0d2" => :mojave sha256 "13d63ebc419965182d98f10b25cc99961679e1ba5ce6118e66b7037eb4e78de8" => :high_sierra + sha256 "5e354a0971729694c7d641fcde59ae6f63788e004b1557a13dd5db8f204788de" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/watchexec.rb b/Formula/watchexec.rb index 0df72ebc8fe54..21cdffbf1f912 100644 --- a/Formula/watchexec.rb +++ b/Formula/watchexec.rb @@ -9,6 +9,7 @@ class Watchexec < Formula sha256 "43c3f38e62625349663cd00cab118153a4140f146dace6a330af33d1d27fc166" => :catalina sha256 "79daa1917e6d83b149ee92827707089e15e43aa09b89d79af39aca63899cd9a7" => :mojave sha256 "9a0593e6b952996d1d6dcab6d83d39218ef0218486e442b5bd1e0e79cee7dbfd" => :high_sierra + sha256 "be852daf1f42c83244333ec57db18089a825754f2cb88cadb6b368a0972ce7e0" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/watchman.rb b/Formula/watchman.rb index 8e28309e35437..ea954cc9eefd7 100644 --- a/Formula/watchman.rb +++ b/Formula/watchman.rb @@ -19,6 +19,7 @@ class Watchman < Formula sha256 "7840f564c11d33425c9eb8985f9156e782e66ef2a3578329dba83ee15a9bf0be" => :catalina sha256 "ba2338b0f23c8b8817fd7bfa92466b7a97ab416e93ec6c3a400041aef013de86" => :mojave sha256 "150468653b5c5a8e4eb92a3ecf420f157ed0e4772513ee93425bb3f635964dad" => :high_sierra + sha256 "c511d8aab0be3913b5154b043b571948fbd09841aed677aeeee339d1c619e798" => :x86_64_linux end depends_on "autoconf" => :build @@ -63,8 +64,10 @@ def post_install # support; while there are still folks with watchman <4.8 this is still an # upgrade concern. home = ENV["HOME"] - system "launchctl", "unload", - "-F", "#{home}/Library/LaunchAgents/com.github.facebook.watchman.plist" + if OS.mac? + system "launchctl", "unload", + "-F", "#{home}/Library/LaunchAgents/com.github.facebook.watchman.plist" + end end test do diff --git a/Formula/watson.rb b/Formula/watson.rb index 552d7d94cffdf..9c20d3d529663 100644 --- a/Formula/watson.rb +++ b/Formula/watson.rb @@ -12,6 +12,7 @@ class Watson < Formula sha256 "29b32a7863743cdf3e4b8b0a7c543b400ca7c05523e3a914ca87115b298b63f0" => :catalina sha256 "031e4c49ed943b9c03c740eb8ed3494511bfd2917e4c4041db9e79d0d00c982f" => :mojave sha256 "969b4eb4d80210c89a06ae935fe066f25e6f9ebfa97dde45fa4c5cabf757ade9" => :high_sierra + sha256 "02118152848a72c145554388d862c28147b2392e6e1debf759b157d6aaedd059" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/wavpack.rb b/Formula/wavpack.rb index bd6bc3ac97537..fa53612721734 100644 --- a/Formula/wavpack.rb +++ b/Formula/wavpack.rb @@ -9,6 +9,7 @@ class Wavpack < Formula sha256 "299242c1b63c8c7fa4119fd2bf4308f8cb0b49ac04f4d5502f64555be2cf06e2" => :catalina sha256 "6985e1becaf974e8686208a038ade4eb333b68f0166c26cecf3b69f4a84797f0" => :mojave sha256 "e767c61eade23b1624dd4d78ee67817ee2175fd42600680aae731b58a4024d12" => :high_sierra + sha256 "8b68ef90e1df8732dedcccbee4c76dd787922bbe77dce7d0a8f2af37733155a2" => :x86_64_linux end head do diff --git a/Formula/wbox.rb b/Formula/wbox.rb index 7d0dc5ec9c629..3cb76d4dc9a01 100644 --- a/Formula/wbox.rb +++ b/Formula/wbox.rb @@ -13,6 +13,7 @@ class Wbox < Formula sha256 "0e813a0982d6b9228217f14352812d9e6880cce44757f8af9a0447bf5e4a1e63" => :el_capitan sha256 "ee2bd7599a73c3a9f3fe9f8c2d441d753914981b2420e591050780d436bbf011" => :yosemite sha256 "35b640ce39cd36f75ec595215099f121feb517672fb11abf30b36a1e567fc117" => :mavericks + sha256 "463120cebca012c9f72083a5e01dea8ceb47f1987f1854159cf0512eab7e4408" => :x86_64_linux end def install diff --git a/Formula/wcslib.rb b/Formula/wcslib.rb index 130a5c9062d99..4a5827325ab89 100644 --- a/Formula/wcslib.rb +++ b/Formula/wcslib.rb @@ -9,6 +9,7 @@ class Wcslib < Formula sha256 "a0e15ea5ee23106c24960feed0c7dad6762d8e75cb9d42445c197fb38f079965" => :catalina sha256 "d8b3561a7e87031d7d6f8042af1c75f21663874921da17d5061d3ffe558263f1" => :mojave sha256 "941ce001ceb21e53dc6af78e8e09ebc52a24b57efcd51c009f8416789674f8ee" => :high_sierra + sha256 "a398ac370732838e136277a93392ba7a30960121c6dd2bec2ca97a27a6171eef" => :x86_64_linux end depends_on "cfitsio" diff --git a/Formula/wdc.rb b/Formula/wdc.rb index 4d9d3f10025f0..251c206a881d7 100644 --- a/Formula/wdc.rb +++ b/Formula/wdc.rb @@ -9,6 +9,7 @@ class Wdc < Formula sha256 "18365f76dafd05a312e9a7862f2fa747caa8c63e881469719a8ef45d07dce3c6" => :catalina sha256 "fbcaccbaa2440ac38f9efa41a342eef4d883e522fa5df7d642aaa1563d38f28b" => :mojave sha256 "92dcb68d02f64ff51446052bf5c41fa178cc48ade406a9533199461476f7c849" => :high_sierra + sha256 "4c21710c2179857f5e8b45c6090e8ef50cf44cea42ce657c10befa814ff8c839" => :x86_64_linux end depends_on "cmake" => :build @@ -49,12 +50,24 @@ def install EOS pugixml = Formula["pugixml"] openssl = Formula["openssl@1.1"] - system ENV.cxx, "test.cpp", "-o", "test", "-lcurl", "-std=c++11", - "-L#{lib}", "-lwdc", "-I#{include}", - "-L#{openssl.opt_lib}", "-lssl", "-lcrypto", - "-I#{openssl.opt_include}", - "-L#{pugixml.opt_lib}", "-lpugixml", - "-I#{pugixml.opt_include}" + if OS.mac? + system ENV.cxx, "test.cpp", "-o", "test", "-lcurl", "-std=c++11", + "-L#{lib}", "-lwdc", "-I#{include}", + "-L#{openssl.opt_lib}", "-lssl", "-lcrypto", + "-I#{openssl.opt_include}", + "-L#{pugixml.opt_lib}", "-lpugixml", + "-I#{pugixml.opt_include}" + else + curl = Formula["curl"] + system ENV.cxx, "test.cpp", "-o", "test", "-std=c++11", "-pthread", + "-L#{lib}", "-lwdc", "-I#{include}", + "-L#{curl.opt_lib}", "-lcurl", + "-I#{curl.opt_include}", + "-L#{openssl.opt_lib}", "-lssl", "-lcrypto", + "-I#{openssl.opt_include}", + "-L#{pugixml.opt_lib}", "-lpugixml", + "-I#{pugixml.opt_include}" + end system "./test" end end diff --git a/Formula/wdiff.rb b/Formula/wdiff.rb index 3e022dc687107..1905238918932 100644 --- a/Formula/wdiff.rb +++ b/Formula/wdiff.rb @@ -11,10 +11,12 @@ class Wdiff < Formula sha256 "89e0de3859b91c4dcdc4a9ac2ae4569f72cd472658e6d3dfa82e6acc919c68a1" => :mojave sha256 "579a8972310d39ac2e660f3114fc6d1536df7ad9f7659a9b00619cc7c50a2191" => :high_sierra sha256 "fcfe6296c4b9879895a4977274f56474faa84ca74c792866ea3149a2f02df553" => :sierra + sha256 "915a7d9113b2cfd41dbe57344425599165b6891f4f5f0fdaf134009abf7aba73" => :x86_64_linux end depends_on "gettext" + uses_from_macos "texinfo" => :build uses_from_macos "ncurses" conflicts_with "montage", :because => "Both install an mdiff executable" diff --git a/Formula/weaver.rb b/Formula/weaver.rb index 2caf399db65b8..9db58c7b42a15 100644 --- a/Formula/weaver.rb +++ b/Formula/weaver.rb @@ -10,7 +10,7 @@ class Weaver < Formula sha256 "3db8730a06cb3ddd12a35097239afd85ea365c3e291a73422f37f23955230007" => :mojave end - depends_on :xcode => ["11.2", :build] + depends_on :xcode => ["11.2", :build] if OS.mac? def install system "make", "install", "PREFIX=#{prefix}" diff --git a/Formula/webalizer.rb b/Formula/webalizer.rb index 51ea9fb0ff7f6..f27235718e96f 100644 --- a/Formula/webalizer.rb +++ b/Formula/webalizer.rb @@ -12,6 +12,7 @@ class Webalizer < Formula sha256 "e27c0dd7038a5a82e6fa127428c0b98750801e343b1b973b05bb08f38b055cdd" => :high_sierra sha256 "cb42abb300bb5dc9639c811a13e24cca1be2cceee01d02eabb1ec149414569d4" => :sierra sha256 "2bae3de97730aa72807cadcfda25ac395f3e30608d865df998fb474e75d4c780" => :el_capitan + sha256 "77debeb1469a80a86e5268914116a495c273eab5131231a14cd35e4f39acd942" => :x86_64_linux end depends_on "berkeley-db" diff --git a/Formula/webarchiver.rb b/Formula/webarchiver.rb index 010b0f2afc9fd..14b44efb135a1 100644 --- a/Formula/webarchiver.rb +++ b/Formula/webarchiver.rb @@ -12,7 +12,7 @@ class Webarchiver < Formula sha256 "fe85ee50f8a3da76dcbcd8bb24c1bea05bde33525055c4d471c8b07fccadfa65" => :high_sierra end - depends_on :xcode => ["6.0.1", :build] + depends_on :xcode => ["6.0.1", :build] if OS.mac? def install # Force 64 bit-only build, otherwise it fails on Mojave diff --git a/Formula/webdis.rb b/Formula/webdis.rb index 91a0399975ed3..6d269cb5cb93a 100644 --- a/Formula/webdis.rb +++ b/Formula/webdis.rb @@ -9,6 +9,7 @@ class Webdis < Formula sha256 "d0f5052f9479bba534cdc8f5acfb047207d46b7e03aa3bea8bc9b17a07a27948" => :catalina sha256 "e27da82c3099bbc9194c2a53dd3113580874e06ac8dc206f1523636cb678d3a2" => :mojave sha256 "1947a8b3ffcb642053eefc5fa48aca88604148713fe8ae57eb4ab80a6991b097" => :high_sierra + sha256 "ec517832e6f7e84a90e1b21d4672469f4630f7e6f6377f5e8c7b80c010b61cae" => :x86_64_linux end depends_on "libevent" diff --git a/Formula/webkit2png.rb b/Formula/webkit2png.rb index cf05616d9a6d3..75a61a9824329 100644 --- a/Formula/webkit2png.rb +++ b/Formula/webkit2png.rb @@ -6,6 +6,9 @@ class Webkit2png < Formula bottle :unneeded + # Requires Quartz, as well as other potentially Mac-only libraries + depends_on :macos + def install bin.install "webkit2png" end diff --git a/Formula/webp.rb b/Formula/webp.rb index f803c0ce59143..231ec18bf2e36 100644 --- a/Formula/webp.rb +++ b/Formula/webp.rb @@ -9,6 +9,7 @@ class Webp < Formula sha256 "27c76a7054277ff5a2e844c5996fc731d8644acbaaa505d35dba42c4a48a0c51" => :catalina sha256 "819c76cbf75c1d1d51db88602b69a9d9cd24975cc65834a9eb5a804c4b96ee35" => :mojave sha256 "069cac577750d53095cc43a05a3eab54310c35ea819ea05fa6bf425bcb0313d2" => :high_sierra + sha256 "64afca205e56b93eff81b30de3128c8fc9e34e578521d154bcd36bcf79a8e141" => :x86_64_linux end head do @@ -20,7 +21,6 @@ class Webp < Formula depends_on "jpeg" depends_on "libpng" - depends_on "libtiff" def install system "./autogen.sh" if build.head? diff --git a/Formula/webpack.rb b/Formula/webpack.rb index 1434c5f26ddac..c4216e006649a 100644 --- a/Formula/webpack.rb +++ b/Formula/webpack.rb @@ -12,6 +12,7 @@ class Webpack < Formula sha256 "137a3c31a4207a5d89d0daa3623d2f43ea91df21cac555c3756318d10f9daeca" => :catalina sha256 "e07262fae60d677ad1420e71ea613fe3b50588aaf00a352aaa0b0c54ffb83c4f" => :mojave sha256 "dde296728283eb40c80175a6911c181223ae94c137f0b2eee1a2ca855d75a682" => :high_sierra + sha256 "4f7b7e4eb8d3ed8042e026456b86c3cc539c1d0d8cf5d78a55c5113b31e7f202" => :x86_64_linux end depends_on "node" diff --git a/Formula/websocat.rb b/Formula/websocat.rb index 56de384fa8465..698037da25909 100644 --- a/Formula/websocat.rb +++ b/Formula/websocat.rb @@ -3,6 +3,7 @@ class Websocat < Formula homepage "https://github.com/vi/websocat" url "https://github.com/vi/websocat/archive/v1.5.0.tar.gz" sha256 "3ffdb25e937095d95b564eafd805cb7ca141570f95c1296b6dd336d4d016445f" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -10,6 +11,7 @@ class Websocat < Formula sha256 "fd1061d818e394d5678661b0c8559bcd61d586e0a0498e1a58a6a72d271adc33" => :catalina sha256 "011b0892734d27b6a978b372fd342bbecccd75e9f29d8d2cf8e9944b30d2ff50" => :mojave sha256 "b59d7c3fc70e1e643986c0414b7d8cc4897f611cb15affa21092f43d69ccbab2" => :high_sierra + sha256 "bbda75d2a4793faf5ae42bba2326bb74964c1f7e729fb1acb2946959eb488ecb" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/websocketd.rb b/Formula/websocketd.rb index 753773c9f1559..befaa613c6fa9 100644 --- a/Formula/websocketd.rb +++ b/Formula/websocketd.rb @@ -10,6 +10,7 @@ class Websocketd < Formula sha256 "a0ad536184c0f12c3c65710be453e810eda0ffa3b0109a56f69b364c05439703" => :mojave sha256 "a2b5e17e00e1c74b52cf0d44ba802bc6e0eb450e950530cedd7cef38e83437ca" => :high_sierra sha256 "5200608539895835b8faa52b886fe9181c23e94c560c4ef9f2f6afe842de3626" => :sierra + sha256 "f769e4208c6174cf28f597053b805620895ec181fe4258a76d476afccd5d53c6" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/webtorrent-cli.rb b/Formula/webtorrent-cli.rb index ec776580deea7..8e009b58470e3 100644 --- a/Formula/webtorrent-cli.rb +++ b/Formula/webtorrent-cli.rb @@ -7,9 +7,11 @@ class WebtorrentCli < Formula sha256 "0690fc5f02163edcb1f7175d30bc637a9252e210e02284e2162c7fb2b20044ec" bottle do + cellar :any_skip_relocation sha256 "33106a951bca768ff80530e4aad0add3e0837ca780c6af83f08277bee1b14b87" => :catalina sha256 "04d9b89601b80660e69b55e0fd0009652fae8f16bcace18e2f35dacb22bad1f8" => :mojave sha256 "c3f9b2aa7330a8e28830967300468aba27f34a7382c93272fe66e37c0845e8bf" => :high_sierra + sha256 "ca894369a4d96af7f90e20ce18ed59025d0564b149a095ead926bd613308d939" => :x86_64_linux end depends_on "node" diff --git a/Formula/weechat.rb b/Formula/weechat.rb index c215552955622..42f2d72102a2b 100644 --- a/Formula/weechat.rb +++ b/Formula/weechat.rb @@ -10,6 +10,7 @@ class Weechat < Formula sha256 "7ed7a9b41fc85455fd858d42f92055d72df8a67fef28ffda7eb5a12bb6dea890" => :catalina sha256 "b073952ee52a2bd0aea1fdc0520ca693be05e0e9aa031b254cd1fe95665b8787" => :mojave sha256 "454c8b6cff73afd673fc4ad5626ea1bc740b4f4aefeb8c860ebe5c09028854b6" => :high_sierra + sha256 "9cf2508a8a55ed8eb5f933abc3732110c6c52b591feadb6b3b5b1775cd50397e" => :x86_64_linux end depends_on "asciidoctor" => :build @@ -19,7 +20,7 @@ class Weechat < Formula depends_on "gettext" depends_on "gnutls" depends_on "libgcrypt" - depends_on "libiconv" + depends_on "libiconv" if OS.mac? depends_on "lua" depends_on "ncurses" depends_on "perl" diff --git a/Formula/wego.rb b/Formula/wego.rb index 0e8e39bd43b83..4b3347e6a1adf 100644 --- a/Formula/wego.rb +++ b/Formula/wego.rb @@ -16,6 +16,7 @@ class Wego < Formula sha256 "ccdba75878ffe9b62b49265f6f4b375da80f44e6c5b7c5a40294501fda8903b1" => :el_capitan sha256 "97e7c2edfa9b1a312a0f4f4bce9553b1c8e884409aca3f7acfed2dc99fcef05d" => :yosemite sha256 "6bc11cdcd939b5361704f1575f297a152da2e3de79e94392c33cf5e22ec40715" => :mavericks + sha256 "f1132563798055a2e83e87938e08e462710fe7cca934d65d1c3f417cdf539a20" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/wellington.rb b/Formula/wellington.rb index 4418733702397..5c519f51a28b0 100644 --- a/Formula/wellington.rb +++ b/Formula/wellington.rb @@ -13,6 +13,7 @@ class Wellington < Formula sha256 "a0ba1b9d9b495bf840140087276b501c0458b0d9d64a7bd83d19208e5787a569" => :sierra sha256 "f681adb615a82377c1855000ac57c26c7403df8f8a1371646630afaddb922e63" => :el_capitan sha256 "224a5a7d40b14cbd89e6cec80c73fd775aaf660c94fba53d651b70aab56524e9" => :yosemite + sha256 "992f8d0630ab5719786069d3fafc88b48cab7dde665a1c8339e6d9ad6e840587" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/wemux.rb b/Formula/wemux.rb index 529f9773d8079..16f912686e2d8 100644 --- a/Formula/wemux.rb +++ b/Formula/wemux.rb @@ -11,6 +11,7 @@ class Wemux < Formula sha256 "5fb4eaf177d1766716003032bfc632d02ebed302c57e00dc752ed3de4b9cf1f6" => :catalina sha256 "5fb4eaf177d1766716003032bfc632d02ebed302c57e00dc752ed3de4b9cf1f6" => :mojave sha256 "5fb4eaf177d1766716003032bfc632d02ebed302c57e00dc752ed3de4b9cf1f6" => :high_sierra + sha256 "547d23982ba1711c8d8a5d5a11595e5801ff52eb1a1a31d50096910a4b029db1" => :x86_64_linux end depends_on "tmux" diff --git a/Formula/wget.rb b/Formula/wget.rb index 1b31ada90e615..b4e8eb085a4ac 100644 --- a/Formula/wget.rb +++ b/Formula/wget.rb @@ -9,6 +9,7 @@ class Wget < Formula sha256 "ef65c759c5097a36323fa9c77756468649e8d1980a3a4e05695c05e39568967c" => :catalina sha256 "28f4090610946a4eb207df102d841de23ced0d06ba31cb79e040d883906dcd4f" => :mojave sha256 "91dd0caca9bd3f38c439d5a7b6f68440c4274945615fae035ff0a369264b8a2f" => :high_sierra + sha256 "c6cd0e129ff133307530846f45280872d516b82bb5346f5193e1603f3b3dc34a" => :x86_64_linux end head do @@ -23,6 +24,7 @@ class Wget < Formula depends_on "pkg-config" => :build depends_on "libidn2" depends_on "openssl@1.1" + depends_on "util-linux" if OS.linux? # for libuuid on_linux do depends_on "util-linux" diff --git a/Formula/whalebrew.rb b/Formula/whalebrew.rb index 4fe33360be6e1..c2c8efdc36fec 100644 --- a/Formula/whalebrew.rb +++ b/Formula/whalebrew.rb @@ -12,6 +12,7 @@ class Whalebrew < Formula sha256 "9abfd2e5951f589dde2cc9847b44e77741785a8b9ff5208c958bd8233def74b8" => :mojave sha256 "66e059ff26ef8e1a7d15416bf0b3a946716e03e60cf7f1281e572dcd78b1f4d8" => :high_sierra sha256 "a6357b16b2285d65c523902fa90180f3b6e77b08196cf6edce3f32b38202ff54" => :sierra + sha256 "2c9aded52aa7f5457948df8bf5dd6f713e5950d13965e05b35df0a560a42acb8" => :x86_64_linux end depends_on "go" => :build @@ -22,6 +23,10 @@ def install test do output = shell_output("#{bin}/whalebrew install whalebrew/whalesay -y", 255) - assert_match "Cannot connect to the Docker daemon", output + if File.exist?("/var/run/docker.sock") && ENV["CI"] + assert_match "Unable to find image", output + else + assert_match "Cannot connect to the Docker daemon", output + end end end diff --git a/Formula/whatmask.rb b/Formula/whatmask.rb index 7c79021f6379d..5327023c558a7 100644 --- a/Formula/whatmask.rb +++ b/Formula/whatmask.rb @@ -13,6 +13,7 @@ class Whatmask < Formula sha256 "acf751e4893268ccbee1e48e9f7a147cc38f64a9d178fc50c810d65c0466a648" => :el_capitan sha256 "428a92b2ba5a3f6f39009a7d3a7fc503b4308fadaeddc287b39fd6b5bdddef74" => :yosemite sha256 "c07eb39e586dbc2b78b4c8cf8173c701ac654e4db0fd5fe12b3c7f80ee3ef577" => :mavericks + sha256 "5e7c57cac58aea707bc90397257724caa74349e0f3eceb6082a90d369cfaae19" => :x86_64_linux end def install diff --git a/Formula/whatmp3.rb b/Formula/whatmp3.rb index 4c2570065ddef..c70e38e829250 100644 --- a/Formula/whatmp3.rb +++ b/Formula/whatmp3.rb @@ -13,6 +13,7 @@ class Whatmp3 < Formula sha256 "04408ee4a9e3dc0fefe1430dd09a736d35c8a78dc2ccf600894f5f3600ad5ae5" => :catalina sha256 "04408ee4a9e3dc0fefe1430dd09a736d35c8a78dc2ccf600894f5f3600ad5ae5" => :mojave sha256 "04408ee4a9e3dc0fefe1430dd09a736d35c8a78dc2ccf600894f5f3600ad5ae5" => :high_sierra + sha256 "383a5ca439b98ca4ef37864c5bfaeff003bf4a7babb80505a388a22dd4301785" => :x86_64_linux end depends_on "flac" diff --git a/Formula/when.rb b/Formula/when.rb index ec137401a6f43..c7780e972dcfd 100644 --- a/Formula/when.rb +++ b/Formula/when.rb @@ -10,6 +10,7 @@ class When < Formula sha256 "88a5d4653d7062e0ac6d9913d35390126c1739fe04f0f458624f0199046d0fcd" => :catalina sha256 "18c0460162e7dcb98d499fb8622a471162897a91f4f844fe46f42a52182cc69e" => :mojave sha256 "a0623fd31e458f82217956bd98e72964634f5d632025336386e824a27fe654ae" => :high_sierra + sha256 "d03dcac46258b1009b911a1475f23580d67035190aecb38e22b59842cdb74dd6" => :x86_64_linux end def install diff --git a/Formula/whistle.rb b/Formula/whistle.rb index cca442c5cbe13..11e078b4bdcf3 100644 --- a/Formula/whistle.rb +++ b/Formula/whistle.rb @@ -11,6 +11,7 @@ class Whistle < Formula sha256 "70e80f17737196a2b6ec3d77dc0cf0a13e20be178ad0e4369bad6cf58861d930" => :catalina sha256 "a406bfb1c14dd88d5ebe25e49173e910ad9e499bdc029320e84c5f43c317295e" => :mojave sha256 "1ffc310d2341b9a2d04954abce3fbcc045b09967e59e620780a178f139e88122" => :high_sierra + sha256 "641cfe6dba3e525a754516879b8d5c9f9cd1c42b21a667ed61f521cf6c2163df" => :x86_64_linux end depends_on "node" diff --git a/Formula/whois.rb b/Formula/whois.rb index 169d8e145b334..728e531cb6882 100644 --- a/Formula/whois.rb +++ b/Formula/whois.rb @@ -10,15 +10,16 @@ class Whois < Formula sha256 "3ec43301d8d08ee38261cdee9800c2763301022277ec71360a70c48001733d86" => :catalina sha256 "7ec2c7361aef77544b3f5b86a0773710c22da824f0c198479bf68bae8681c0fe" => :mojave sha256 "79bc883f7bbf41fe2e28eb1edb319fa6f62a2dde5ca1308d653f160f1ecc0e25" => :high_sierra + sha256 "c19df3d9520e0f848e2ebec67c36c14cfa822bdb5732de6e929a3413887b5010" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "libidn2" def install - ENV.append "LDFLAGS", "-L/usr/lib -liconv" + ENV.append "LDFLAGS", "-L/usr/lib -liconv" if OS.mac? - system "make", "whois", "HAVE_ICONV=1" + system "make", "whois", *(OS.mac? ? "HAVE_ICONV=1" : "HAVE_ICONV=0") bin.install "whois" man1.install "whois.1" man5.install "whois.conf.5" @@ -32,6 +33,6 @@ def caveats end test do - system "#{bin}/whois", "brew.sh" + system "#{bin}/whois", "brew.sh" if Pathname.new("/etc/services").readable? end end diff --git a/Formula/wifi-password.rb b/Formula/wifi-password.rb index 8f5c3b414a18d..929b6760af5ac 100644 --- a/Formula/wifi-password.rb +++ b/Formula/wifi-password.rb @@ -6,6 +6,8 @@ class WifiPassword < Formula bottle :unneeded + depends_on :macos + def install bin.install "wifi-password.sh" => "wifi-password" end diff --git a/Formula/wiki.rb b/Formula/wiki.rb index 2f371d862eb3c..f65757b71bfb4 100644 --- a/Formula/wiki.rb +++ b/Formula/wiki.rb @@ -9,6 +9,7 @@ class Wiki < Formula sha256 "ff424f6afbc0d2baab91cee289157d9c90623fa19b7d51574b75df455da76cd6" => :catalina sha256 "316687b381ca23ee0e81eb6e396d2c8c21a5eeaf05a9219ec56dd0024a8d9722" => :mojave sha256 "bd1b52730bbf5bc503d3fece003b069e248261616d9d02767ef019d87659bdd8" => :high_sierra + sha256 "f9d508afc498cbebb8ba71e06b71a21d467c85a62fce277ac85db40395edee2e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/wimlib.rb b/Formula/wimlib.rb index c0fde27f7fb71..574da380850de 100644 --- a/Formula/wimlib.rb +++ b/Formula/wimlib.rb @@ -9,6 +9,7 @@ class Wimlib < Formula sha256 "9b1f59782b773025346f9e466926467035c3e007f54acc77caa332b73a9308bf" => :catalina sha256 "9c516e253677057ba243d2d0c30894df407c5d24a23d055d8b7152f6f3267991" => :mojave sha256 "543e598241edae31ae469dd6da5ceaf10f1ef658ea051e1be0d5241393d167b6" => :high_sierra + sha256 "cfec451c3ebd1d7268a0463ecc00b23c50b5636e33eb0fbb5c308c1219553b0c" => :x86_64_linux end depends_on "pkg-config" => :build @@ -34,7 +35,7 @@ def install test do # make a directory containing a dummy 1M file mkdir("foo") - system "dd", "if=/dev/random", "of=foo/bar", "bs=1m", "count=1" + system "dd", "if=/dev/random", "of=foo/bar", (OS.mac? ? "bs=1m" : "bs=1M"), "count=1" # capture an image ENV.append "WIMLIB_IMAGEX_USE_UTF8", "1" diff --git a/Formula/wiredtiger.rb b/Formula/wiredtiger.rb index d4921bcb1a3ff..cbb926d88e403 100644 --- a/Formula/wiredtiger.rb +++ b/Formula/wiredtiger.rb @@ -10,6 +10,7 @@ class Wiredtiger < Formula sha256 "6346862c90443a6fc72cb214e2b657fcd69980dcd3d622b9017c150b955d4891" => :mojave sha256 "c831e84a17cc41fbb4a4571aad5460fc989fd865c0e770b9bf65399bfeb46f4b" => :high_sierra sha256 "27744de01928c6f529028861fb5b443885f8fc320deb0c61ac2a7bd754d44d7e" => :sierra + sha256 "fe5f5eb689b100462d20e86347da6d86eee81fed3042830bd23912c3e8ff7c97" => :x86_64_linux end depends_on "snappy" diff --git a/Formula/wireguard-go.rb b/Formula/wireguard-go.rb index 6a4eecc0da006..a689709a35afe 100644 --- a/Formula/wireguard-go.rb +++ b/Formula/wireguard-go.rb @@ -10,6 +10,7 @@ class WireguardGo < Formula sha256 "783b1eeb0aba2c336e91fe59ef9e8d5d449e51ef3a5ed313f96666c7d055fb02" => :catalina sha256 "baf1cc2e7f0795747bcaed6856ce3a4075083356cc557497adf06ceaf28e0514" => :mojave sha256 "23d0d338dddebcecc58aa5f1e651fbde03494b0d49071937c4cff0b4d19961c2" => :high_sierra + sha256 "168b97cf56b028ecf953768dcd06bd894aa1fc2daedb63a5074bfb5b60df99e5" => :x86_64_linux end depends_on "go" => :build @@ -21,6 +22,9 @@ def install end test do + # ERROR: (notrealutun) Failed to create TUN device: no such file or directory + return if ENV["CI"] + assert_match "be utun", pipe_output("WG_PROCESS_FOREGROUND=1 #{bin}/wireguard-go notrealutun") end end diff --git a/Formula/wireguard-tools.rb b/Formula/wireguard-tools.rb index b4d1cd87475a8..b93cbb925f032 100644 --- a/Formula/wireguard-tools.rb +++ b/Formula/wireguard-tools.rb @@ -10,10 +10,12 @@ class WireguardTools < Formula sha256 "d8f18c2d3f4e08b616a8621367adfc30881d5bf5a5de19daca1b7828a59c5e96" => :catalina sha256 "b00ca10dd4dc519a8dae57cff6df2cb224f52018334ed8464810329c28677520" => :mojave sha256 "71ebb1ada0ede665499754dc5b2af1dc524714c0eb35e631e3dd7aca18a71d02" => :high_sierra + sha256 "fb40dbde17291294a3ed9649b1d2c0ef0300e3d71ed8c0a11bbfe1574e613df8" => :x86_64_linux end depends_on "bash" depends_on "wireguard-go" + depends_on "libmnl" unless OS.mac? def install system "make", "BASHCOMPDIR=#{bash_completion}", "WITH_BASHCOMPLETION=yes", "WITH_WGQUICK=yes", diff --git a/Formula/wireshark.rb b/Formula/wireshark.rb index 0f0c6fc919ebc..ba5f264b5e1da 100644 --- a/Formula/wireshark.rb +++ b/Formula/wireshark.rb @@ -4,12 +4,14 @@ class Wireshark < Formula url "https://www.wireshark.org/download/src/all-versions/wireshark-3.2.4.tar.xz" mirror "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-3.2.4.tar.xz" sha256 "d17d461e849e2d0b033431c45f71d8ee8ec3c8faa232a6ad63069a47927db8aa" + revision 1 unless OS.mac? head "https://code.wireshark.org/review/wireshark", :using => :git bottle do sha256 "92ee317ff4290c3c93a6bbfda5de62095da7cca4f0cc881914632fbbdfc3528e" => :catalina sha256 "3efa164bfe9b96f82c54334fc9b665a781fa4bdacd14626f4c8433521e0105f8" => :mojave sha256 "b8c334c790c9ba8923d5ebccdc0199a120cb07f265dd70aad6e1faf6360233cc" => :high_sierra + sha256 "52f772d8b1e2da04307233848e323b41f499fd7f5af5ec1517b7b9a72b350e80" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/wla-dx.rb b/Formula/wla-dx.rb index a2f0fcccfbb7a..c6d6a1a8cf627 100644 --- a/Formula/wla-dx.rb +++ b/Formula/wla-dx.rb @@ -9,6 +9,7 @@ class WlaDx < Formula sha256 "4c5a8c948703a0ac4b10a50b01fba6b175b412512afa49b0ca06bd5470fe95ae" => :catalina sha256 "bae03cdacfcbb537e7ee12fb419f87133d9554122994e297fe20daf4b54148bf" => :mojave sha256 "5a317d40754e1387fffe605ed373d03d1acd43247e49cae4e6bc80e9e909c3b7" => :high_sierra + sha256 "71ba7bc38dfc3c9fe30bed018e36616bb3229ab409a0d416d6becb99e64f56f7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/woboq_codebrowser.rb b/Formula/woboq_codebrowser.rb index 05031edc598f5..d01750de5fc7c 100644 --- a/Formula/woboq_codebrowser.rb +++ b/Formula/woboq_codebrowser.rb @@ -11,6 +11,7 @@ class WoboqCodebrowser < Formula sha256 "f8aa32aaefa2b3ed4c1d6867d0b4b1945429a09043c5a6649801a3cf62d99a10" => :mojave sha256 "6aca9d134daeb173b56d1d3b0122c21b461c119add8feca1c52bef0ad91c267d" => :high_sierra sha256 "6dccc1dbb8c14362b3df29dc93bdfa010ad5de7e734d99a34918f28dc9f8035c" => :sierra + sha256 "2e86d508ed3a5662665a29fccd7c837935aeed0f5a47d2eee802a1737283c9a0" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/woff2.rb b/Formula/woff2.rb index 1c5e86cf34d73..f2562b70cb5df 100644 --- a/Formula/woff2.rb +++ b/Formula/woff2.rb @@ -12,6 +12,7 @@ class Woff2 < Formula sha256 "f0a9cba72030b62b02336c277f2688ad96bf45c1720e58205cfa597be9860296" => :high_sierra sha256 "965310f79a417663d33d4917880b4dd2a9654ca85f5a9a243465e3e0e86a394d" => :sierra sha256 "59d4f6c77ae933445a0fde4b1445208a094169fa5dac784889dd6c8d4947c997" => :el_capitan + sha256 "207f46d8082580e89a76cf0e660bed4fc3d382cf3d587ccccb109c9f12ceb94b" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/wolfmqtt.rb b/Formula/wolfmqtt.rb index cac67ce778e96..0c61097c71edb 100644 --- a/Formula/wolfmqtt.rb +++ b/Formula/wolfmqtt.rb @@ -9,6 +9,7 @@ class Wolfmqtt < Formula sha256 "69cad59befccc596b031061ae8d43f06395e92b9a870f79d3c326abd63aab801" => :catalina sha256 "d87c755ee5f7b7502f188abaf3f8ddcd88b394fe056f5912edfa9c98db3718e0" => :mojave sha256 "7cd884e7105e3522b767bafce562730e8279c511be71a0ef223f16c2120b03b4" => :high_sierra + sha256 "467d8b9a444da11ff5b2e3460de80c1759e57a2aed663782c4cb435e954fc355" => :x86_64_linux end head do diff --git a/Formula/wolfssl.rb b/Formula/wolfssl.rb index df6c9e96d88b4..3ff2dfa346bdd 100644 --- a/Formula/wolfssl.rb +++ b/Formula/wolfssl.rb @@ -11,6 +11,7 @@ class Wolfssl < Formula sha256 "0be0aa725d9cd9d9a127d574a3e63548ad7176d03613913e714175af1a91eae9" => :catalina sha256 "44add33b67e8f1d4e48f5130e9f0c73cbeda7277f8c43aa5fddbd8e9dccba657" => :mojave sha256 "e3220ea7176729c24f817900a45002a8502defeba7ef4a1001cff1b342b3c487" => :high_sierra + sha256 "a4f55cd5f44fecd9c09459942cb43f12816b7b2e8727214b0fb18ecbaad5add9" => :x86_64_linux end depends_on "autoconf" => :build @@ -75,7 +76,7 @@ def install # Extra flag is stated as a needed for the Mac platform. # https://www.wolfssl.com/docs/wolfssl-manual/ch2/ # Also, only applies if fastmath is enabled. - ENV.append_to_cflags "-mdynamic-no-pic" + ENV.append_to_cflags "-mdynamic-no-pic" if OS.mac? system "./autogen.sh" system "./configure", *args diff --git a/Formula/wordgrinder.rb b/Formula/wordgrinder.rb index a8c67815748a2..0d6316c2b2bd6 100644 --- a/Formula/wordgrinder.rb +++ b/Formula/wordgrinder.rb @@ -7,10 +7,11 @@ class Wordgrinder < Formula head "https://github.com/davidgiven/wordgrinder.git" bottle do - cellar :any + cellar :any_skip_relocation sha256 "79fa0f89e7e123f7746ab934514834eaaecd35fa228a64e243d620825e508f7d" => :catalina sha256 "daa17cb7ea4b7ad382352a18b359deaa7f1a9cd8b2c7c8949b2f6dca41f0674c" => :mojave sha256 "735f8f1c7d405d11e0fd464d937d3f943c192c939126ca610a388f145da1a7da" => :high_sierra + sha256 "2b195e83a932435477e27724538db25c4e87ae391c697059fb0ed3cf9e6ecdc1" => :x86_64_linux end depends_on "ninja" => :build diff --git a/Formula/wordnet.rb b/Formula/wordnet.rb index 05a590d205090..0b2a2307a721f 100644 --- a/Formula/wordnet.rb +++ b/Formula/wordnet.rb @@ -21,6 +21,7 @@ class Wordnet < Formula resource "dict" do url "https://wordnetcode.princeton.edu/wn3.1.dict.tar.gz" sha256 "3f7d8be8ef6ecc7167d39b10d66954ec734280b5bdcd57f7d9eafe429d11c22a" + version "3.1" end def install diff --git a/Formula/wordplay.rb b/Formula/wordplay.rb index 5f7327aa077df..a556b461899d7 100644 --- a/Formula/wordplay.rb +++ b/Formula/wordplay.rb @@ -11,6 +11,7 @@ class Wordplay < Formula sha256 "d98d89abff244c21cf2ad4eb651ed39afea5b3146bf0ec3277483b813c4e8d89" => :mojave sha256 "9056fb79657b3be7ba8a97f4a13b1777e72447b717bd9fd1b7830023bda964a6" => :high_sierra sha256 "5141a8f5456e5a685b65c5d9f3100029c6f42b3f0c80aa3d6a4736d3028a6a6b" => :sierra + sha256 "beb5fa4b5b3db4a09fb26af09af6dcf6c03a96874ac7f5d503c93ab0a8de5883" => :x86_64_linux end # Fixes compiler warnings on Darwin, via MacPorts. diff --git a/Formula/wpscan.rb b/Formula/wpscan.rb index f226f22c4a1a4..b5f4f7b20256d 100644 --- a/Formula/wpscan.rb +++ b/Formula/wpscan.rb @@ -10,6 +10,7 @@ class Wpscan < Formula sha256 "202f067c8019102a570f95ac29d60a5010498cedf047e3fb4cd7aab4636f0959" => :catalina sha256 "d5cff4f5d3649adab8cd5195266f2e0634d2c8993714f7e59f9d8d8d0bc53dc2" => :mojave sha256 "ce604ef3517c146a2922cb3d75ec18d5e740262e5c7b178565e25c07bb410f36" => :high_sierra + sha256 "dee7a3e1fc967c67dda5b9bba12c204a753aeddde23d41b121f459bcd2567d9c" => :x86_64_linux end depends_on "pkg-config" => :build @@ -17,7 +18,7 @@ class Wpscan < Formula uses_from_macos "curl" uses_from_macos "unzip" - uses_from_macos "xz" # for liblxma + uses_from_macos "xz" # for liblzma uses_from_macos "zlib" if MacOS.version < :catalina diff --git a/Formula/wrangler.rb b/Formula/wrangler.rb index 4a8c28d4b0179..f5c8a8f98c2a5 100644 --- a/Formula/wrangler.rb +++ b/Formula/wrangler.rb @@ -26,6 +26,7 @@ class Wrangler < Formula sha256 "8d67285352be09f209dba8e1fe678bb9e88a77c74e5178687f890cf5ba19c8ca" => :catalina sha256 "1f122b48da35f344074d239e3d23fcf3d66e309dd0425062547d080bd3285a12" => :mojave sha256 "b3aa1c943b1de15308be2cf7ac540daa95b4a843788a662fcdf34ed30e2ec29d" => :high_sierra + sha256 "25bd6e93987f520496341c14874c17548f7b7ef2e2692a5dbad85e86d34a2a23" => :x86_64_linux end depends_on "erlang@22" diff --git a/Formula/wren-cli.rb b/Formula/wren-cli.rb index ba988f9f171bd..2a970996b41ce 100644 --- a/Formula/wren-cli.rb +++ b/Formula/wren-cli.rb @@ -9,10 +9,11 @@ class WrenCli < Formula sha256 "c7f9b2cc6e9913517f802d8ef0142484fd86cb2b972ceb670f1b791b65144937" => :catalina sha256 "9bf6170802498342b99b6fb167a6ff9254601e911b5c7c74605145985909e6ff" => :mojave sha256 "074f4d9634a9e8e7fc33cd302778116121874851aa854830d41e3b73ba50500b" => :high_sierra + sha256 "ae62fdbf3751d4dc801df93482d01c4145655225c5015febd6bd0c547bf0d3e1" => :x86_64_linux end def install - system "make", "-C", "projects/make.mac" + system "make", "-C", "projects/make#{".mac" if OS.mac?}" bin.install "bin/wren_cli" pkgshare.install "example" end diff --git a/Formula/wren.rb b/Formula/wren.rb index bc997a956ec1b..e76526345739d 100644 --- a/Formula/wren.rb +++ b/Formula/wren.rb @@ -10,10 +10,11 @@ class Wren < Formula sha256 "21bb30d077f3de93293d6e6f3c41e8f923e6de7d8d04df2f48c7378f76b3d16f" => :catalina sha256 "d3837f28ed556d33753beb658f22b197f0afdb2aac3b30de26b2859397123d51" => :mojave sha256 "529a384d6d1665dd269ef7b6e8ea61f1edccddd5478ce82ec30839346af3d3b5" => :high_sierra + sha256 "2d58d90b330638b33cf9dff80befe9708eb537ce6b951173050700850151071e" => :x86_64_linux end def install - system "make", "-C", "projects/make.mac" + system "make", "-C", "projects/make#{".mac" if OS.mac?}" lib.install Dir["lib/*"] include.install Dir["src/include/*"] pkgshare.install "example" diff --git a/Formula/write-good.rb b/Formula/write-good.rb index 5d91256dc8867..3fc1e1caa07cb 100644 --- a/Formula/write-good.rb +++ b/Formula/write-good.rb @@ -11,6 +11,7 @@ class WriteGood < Formula sha256 "e0a5d6df3a160e8c24ef47754fe05f88e369fc7140c45af5f6b1228beb52de0d" => :catalina sha256 "35c6923bda9539fa5704c7f9255b6590029503dcdf7b4d29090dc62a38aa1452" => :mojave sha256 "7b0bb14228cf6054bfad6d22a9df86e67b893bf49682a3706606e3fab1f7f40a" => :high_sierra + sha256 "bf02d88c0dd1baff29a1fb3cd8dd3ae9172a031369cee05b33edd960a2387a24" => :x86_64_linux end depends_on "node" diff --git a/Formula/wrk.rb b/Formula/wrk.rb index 2a3b4b4fd0446..8e561e37deb8c 100644 --- a/Formula/wrk.rb +++ b/Formula/wrk.rb @@ -11,9 +11,11 @@ class Wrk < Formula sha256 "65f16f71cfb120d12f0f993044db92b767c728274aa046917bee7ad4deacfd3e" => :mojave sha256 "ccc1cc4303847b70f940b765a9229476e7018328fbf202c02a00d9a13c63919e" => :high_sierra sha256 "82fd1323ac999e23107dcd1cdae9635ff047afd15532f42f8cb4e82dad0db257" => :sierra + sha256 "7dd822b440f8d802c012c1d6a28859a8d8c7a7201ca24a9405706d1be4e72b06" => :x86_64_linux end depends_on "openssl@1.1" + depends_on "makedepend" => :build unless OS.mac? on_linux do depends_on "makedepend" => :build diff --git a/Formula/wsk.rb b/Formula/wsk.rb index 4e5033d432abb..07cb1287a3cf7 100644 --- a/Formula/wsk.rb +++ b/Formula/wsk.rb @@ -9,6 +9,7 @@ class Wsk < Formula sha256 "461c8bd630f1fb80859d16f1ef4ec57ba73990febdada45deb0411b66fca044e" => :catalina sha256 "3082ab49e515fa5b534ee3e8f0de9e90a23d7130d9fbf5f469ea5ef3f40c8bd9" => :mojave sha256 "9ea3a295b2eb7b4f622ec8d6065aa5a9cd50285d83df66453e41d2214de6135c" => :high_sierra + sha256 "25efcbd20fb8cdddebe9c788ea468cad0f8e9ba9c32480392fd731f85cc9141e" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/wskdeploy.rb b/Formula/wskdeploy.rb index 8c7c40fc2ff57..000b625a7cb68 100644 --- a/Formula/wskdeploy.rb +++ b/Formula/wskdeploy.rb @@ -9,6 +9,7 @@ class Wskdeploy < Formula sha256 "3628415e19ddfa9aa4c701f10bdecc2b60a595b8a88beff1fada7174b38517ed" => :catalina sha256 "fa27eb070527a3e4fff0ea62ed16e521b2c7f5482f4ca8c1bb934823e75c856b" => :mojave sha256 "9690c45ee52ba2c4bee9de7075136fd6743f05dcfca445c57f44df940b1fb3e7" => :high_sierra + sha256 "4294ee4df38330b2472c54f9439f9e6edee13a810a0f49ed130bc5ae0c73e324" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/wslay.rb b/Formula/wslay.rb index 87a4700566193..001348346e67b 100644 --- a/Formula/wslay.rb +++ b/Formula/wslay.rb @@ -9,6 +9,7 @@ class Wslay < Formula sha256 "b0c31393b4065ddad22d079252f4310ccafee1c26d5ea56a58c2bc3bfa728b46" => :catalina sha256 "4ea82d98c0fd0cfcc1e842dde6e0fbd15355d538876f24fa0c2ca6f05ed17926" => :mojave sha256 "6aade683b7db8a32c859e54134568bdb3983d57878783d86c89e5d28c5e8db77" => :high_sierra + sha256 "f1a5469f7dc5f02fb47e37268228dfd4d868a7380a6f8ae7ab596c389c854ddf" => :x86_64_linux end head do diff --git a/Formula/wtfutil.rb b/Formula/wtfutil.rb index 025ba1a7fff15..461e1cdd12229 100644 --- a/Formula/wtfutil.rb +++ b/Formula/wtfutil.rb @@ -10,6 +10,7 @@ class Wtfutil < Formula sha256 "0a3e0b78d2e9c8a8b26b0c9d3c735fa2663ce7f5f8ff64c26258f6bef8ba53d5" => :catalina sha256 "581b230dc16070ba799fe1a706441015633033fb3f3bdc83a8e6fa149ba0c1fd" => :mojave sha256 "3fa6f304088016d47cba5b2d96f1d1806483cdae23eb01ba7f9bee3dafe3da56" => :high_sierra + sha256 "211170fe6a4d6f34bce0731a37c248d9bf6e0c3ee642a1ea83bd726491b1d8a8" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/wumpus.rb b/Formula/wumpus.rb index 3d91d22abf967..d0dbfcb003de2 100644 --- a/Formula/wumpus.rb +++ b/Formula/wumpus.rb @@ -9,6 +9,7 @@ class Wumpus < Formula sha256 "49bc794562f3b9a0ad5799b5fcd2d63a5f866b9b6dc7a4b0d80988c388ee3726" => :catalina sha256 "e6881d8d217cebdd71e430c4ec8701d369d1ca03bb8724d30977b467d7422d83" => :mojave sha256 "006271b20835150dcf3006041f7053adf26a3ec58f9549029d14c844a53570c4" => :high_sierra + sha256 "25d9bcb0a8c5978f425a81be7abc3efa1a8058cb34b2d9628e53eae360a98dcb" => :x86_64_linux end def install diff --git a/Formula/wv.rb b/Formula/wv.rb index be1e106016e14..39c9ebeb9f8bb 100644 --- a/Formula/wv.rb +++ b/Formula/wv.rb @@ -10,6 +10,7 @@ class Wv < Formula sha256 "e3b62df7fad6fefbd233abc45ede4f9705b447df51433e0129a82d98dc321811" => :mojave sha256 "470ecfe6b84e931d4c4363b8274a04d42b2e2c3b6c5f50bc12b55a7fda6f5acb" => :high_sierra sha256 "7df867080d9b2edb57780c5f971a4a22d01c301aff70c1af7a6ce13385828908" => :sierra + sha256 "3cdd75690a26f3dc49b27296044a3c19afb7cacf812ef32f4eb23209b84afb06" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/wxmac.rb b/Formula/wxmac.rb index 5e6e26b74b5cf..499b3e20ffb5c 100644 --- a/Formula/wxmac.rb +++ b/Formula/wxmac.rb @@ -11,6 +11,7 @@ class Wxmac < Formula sha256 "110aa0b2134d8bff1647de0cd8500f160133794b347f789bba3e1894b991b788" => :catalina sha256 "5f703423fc3f1e36d647a2d8be2d271a92f5d60f49ceba8e3478391bbd4f5303" => :mojave sha256 "1de8aa03e1c50af387888ffa51cfa4e0c99d158f25edb0acbf312e10c629a31d" => :high_sierra + sha256 "13900a86c338c0fd7e97b61b5146d881a5738852474b461675e6c95b60bc5328" => :x86_64_linux end depends_on "jpeg" @@ -21,6 +22,12 @@ class Wxmac < Formula depends_on "pkg-config" => :build end + unless OS.mac? + depends_on "gtk+" + depends_on "linuxbrew/xorg/glu" + depends_on "linuxbrew/xorg/libsm" + end + def install args = [ "--prefix=#{prefix}", @@ -40,13 +47,10 @@ def install "--with-libpng", "--with-libtiff", "--with-opengl", - "--with-osx_cocoa", "--with-zlib", "--disable-precomp-headers", # This is the default option, but be explicit "--disable-monolithic", - # Set with-macosx-version-min to avoid configure defaulting to 10.5 - "--with-macosx-version-min=#{MacOS.version}", ] system "./configure", *args diff --git a/Formula/wxmaxima.rb b/Formula/wxmaxima.rb index 3ab4c8d1cb637..fd6b36f3249fc 100644 --- a/Formula/wxmaxima.rb +++ b/Formula/wxmaxima.rb @@ -19,8 +19,10 @@ class Wxmaxima < Formula def install system "cmake", ".", *std_cmake_args system "make", "install" - prefix.install "src/wxMaxima.app" - bin.write_exec_script "#{prefix}/wxMaxima.app/Contents/MacOS/wxmaxima" + if OS.mac? + prefix.install "src/wxMaxima.app" + bin.write_exec_script "#{prefix}/wxMaxima.app/Contents/MacOS/wxmaxima" + end bash_completion.install "data/wxmaxima" end @@ -38,6 +40,7 @@ def caveats end test do - assert_match "algebra", shell_output("#{bin}/wxmaxima --help 2>&1") + # Test is disbaled on Linux as circle has no X (Error: Unable to initialize GTK+, is DISPLAY set properly) + assert_match "algebra", shell_output("#{bin}/wxmaxima --help 2>&1", 255) if OS.mac? end end diff --git a/Formula/wxpython.rb b/Formula/wxpython.rb index 831be4c48a064..5227a5c3e31d7 100644 --- a/Formula/wxpython.rb +++ b/Formula/wxpython.rb @@ -21,6 +21,11 @@ class Wxpython < Formula depends_on "libtiff" depends_on "numpy" depends_on "python@3.8" + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "gtk+3" + depends_on "zlib" + end uses_from_macos "zlib" @@ -57,21 +62,27 @@ def install resource("Pillow").stage do inreplace "setup.py" do |s| - sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" - s.gsub! "openjpeg.h", - "probably_not_a_header_called_this_eh.h" - s.gsub! "ZLIB_ROOT = None", - "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + if OS.mac? + sdkprefix = MacOS.sdk_path_if_needed ? MacOS.sdk_path : "" + end + s.gsub! "openjpeg.h", "probably_not_a_header_called_this_eh.h" + if OS.mac? + s.gsub! "ZLIB_ROOT = None", + "ZLIB_ROOT = ('#{sdkprefix}/usr/lib', '#{sdkprefix}/usr/include')" + else + s.gsub! "ZLIB_ROOT = None", + "ZLIB_ROOT = ('#{Formula["zlib"].opt_prefix}/lib', '#{Formula["zlib"].opt_prefix}/include')" + end s.gsub! "JPEG_ROOT = None", - "JPEG_ROOT = ('#{Formula["jpeg"].opt_prefix}/lib', '#{Formula["jpeg"].opt_prefix}/include')" + "JPEG_ROOT = ('#{Formula["jpeg"].opt_prefix}/lib', '#{Formula["jpeg"].opt_prefix}/include')" + freetype = Formula["freetype"].opt_prefix s.gsub! "FREETYPE_ROOT = None", - "FREETYPE_ROOT = ('#{Formula["freetype"].opt_prefix}/lib', '#{Formula["freetype"].opt_prefix}/include')" + "FREETYPE_ROOT = ('#{freetype}/lib', '#{freetype}/include')" end # avoid triggering "helpful" distutils code that doesn't recognize Xcode 7 .tbd stubs - unless MacOS::CLT.installed? - ENV.append "CFLAGS", "-I#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers" - end + header_path = "-I#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers" + ENV.append "CFLAGS", header_path if OS.mac? && MacOS::CLT.installed? venv.pip_install Pathname.pwd end diff --git a/Formula/x264.rb b/Formula/x264.rb index 1ba66670c1b23..925ee11d15c0d 100644 --- a/Formula/x264.rb +++ b/Formula/x264.rb @@ -15,6 +15,7 @@ class X264 < Formula sha256 "3471d2725e761ac6dbf3882b95c933e51ab70ca457975652d737f689a4ec529f" => :catalina sha256 "8fbd7a7f33e32af373555483d12a19658d5b0e712e95d7b874e40ca386aa06f9" => :mojave sha256 "d06faa65365f712fcaee10dd672280388a0219159f8175b31a226043a9a45cc8" => :high_sierra + sha256 "55bfbe53b5df0f15e12cc1d820a3f7852f02265e5b34c446a690aabd8b0892e8" => :x86_64_linux end depends_on "nasm" => :build @@ -59,7 +60,7 @@ def install return 0; } EOS - system ENV.cc, "-L#{lib}", "-lx264", "test.c", "-o", "test" + system ENV.cc, "-L{lib}", "test.c", "-lx264", "-o", "test" system "./test" end end diff --git a/Formula/x265.rb b/Formula/x265.rb index 57c2f4edea026..a39c8a480aeaa 100644 --- a/Formula/x265.rb +++ b/Formula/x265.rb @@ -10,6 +10,7 @@ class X265 < Formula sha256 "51c759fb1ae6220caca443ef28171e94e387c5358ff5d8803716dc7d80d0b7d0" => :catalina sha256 "f17d8ecd707aac0fd61354432adf63bc7e4a2513c4cf5d38af7813e4c59e628c" => :mojave sha256 "68430356df947fbe78480d737180b3129c3a4b1e5fcec90762df19d14de30b1c" => :high_sierra + sha256 "4df0e3121494f3b635d608a83df04241c5b5723289b79a82770ca56073b71de3" => :x86_64_linux end depends_on "cmake" => :build @@ -49,8 +50,14 @@ def install system "cmake", buildpath/"source", *args system "make" mv "libx265.a", "libx265_main.a" - system "libtool", "-static", "-o", "libx265.a", "libx265_main.a", - "libx265_main10.a", "libx265_main12.a" + if OS.mac? + system "libtool", "-static", "-o", "libx265.a", "libx265_main.a", + "libx265_main10.a", "libx265_main12.a" + else + system "ar", "cr", "libx265.a", "libx265_main.a", "libx265_main10.a", + "libx265_main12.a" + system "ranlib", "libx265.a" + end system "make", "install" end end diff --git a/Formula/x86_64-elf-binutils.rb b/Formula/x86_64-elf-binutils.rb index e50a133452229..5c0115e102fb9 100644 --- a/Formula/x86_64-elf-binutils.rb +++ b/Formula/x86_64-elf-binutils.rb @@ -10,8 +10,11 @@ class X8664ElfBinutils < Formula sha256 "1d80291a30992f7d7cdbb8b057fa8dbf945425c89592b2b7ceeb02612269e3f0" => :catalina sha256 "c09647bc99180ed5ee504e7282ba8cb453c85ed9473458d3a4ebcdfe84fd43f8" => :mojave sha256 "68415da4e030aca55b4d077c134d23ca56820fd01b07c4eb9f67ed22decf1e41" => :high_sierra + sha256 "abf2f30364b4c4df6837a8f155fc3fc8e335654c4c70fba5b23587808a76f9b2" => :x86_64_linux end + uses_from_macos "texinfo" + def install system "./configure", "--target=x86_64-elf", "--prefix=#{prefix}", diff --git a/Formula/xa.rb b/Formula/xa.rb index 37d8595f78994..5d3891ed76add 100644 --- a/Formula/xa.rb +++ b/Formula/xa.rb @@ -9,6 +9,7 @@ class Xa < Formula sha256 "82ac5a005305bb5fd7ff181e2f9aae95ad5f865574ed4cb8f936948cce406a72" => :catalina sha256 "6dfd866eea2c29d98aabbe4b9a0821ad9b808b0d2b7754b3400f5bb4f4cb4184" => :mojave sha256 "40334865dd2af12409a5c52ed9a8d3a5bd6b781da28375509e2481bd885c87e4" => :high_sierra + sha256 "bd5e7a4b0dd1c470280b0a49b69ea803cbafc96230c391fc845d97484a9cc0a9" => :x86_64_linux end def install diff --git a/Formula/xalan-c.rb b/Formula/xalan-c.rb index 8b2d75dedd79a..b0f077bce7afc 100644 --- a/Formula/xalan-c.rb +++ b/Formula/xalan-c.rb @@ -13,6 +13,7 @@ class XalanC < Formula sha256 "24ddfd8ff41dbe54a5570db2a004247f92ef4bc1c897554ea83dfe7c138a172f" => :high_sierra sha256 "dfe6413a8d4cba234c105d0936a671a34742d2ac0103db863a644bf78538c28c" => :sierra sha256 "0b99ebef6e23b1c0d1e67d4ed8130130ad5c7b6af03f43ea9248c2d78e19a5cc" => :el_capitan + sha256 "263e1a1314c7e6490530dce0e10940052480f9bad379439811becaeb035ec88e" => :x86_64_linux end depends_on "xerces-c" diff --git a/Formula/xapian.rb b/Formula/xapian.rb index be4fa74026396..3a57ad5e85d4c 100644 --- a/Formula/xapian.rb +++ b/Formula/xapian.rb @@ -14,6 +14,10 @@ class Xapian < Formula depends_on "sphinx-doc" => :build depends_on "python@3.8" + unless OS.mac? + depends_on "util-linux" # for libuuid + depends_on "zlib" + end uses_from_macos "zlib" diff --git a/Formula/xbee-comm.rb b/Formula/xbee-comm.rb index 44abae18f3198..c366d87730247 100644 --- a/Formula/xbee-comm.rb +++ b/Formula/xbee-comm.rb @@ -17,6 +17,7 @@ class XbeeComm < Formula sha256 "64b15ac79da143e2b092db702fd22c92ef064093be1c4c81cb60fd5b08f44075" => :el_capitan sha256 "805e99d4e700a2e9993f26fbc48cae17c1bf16e6ff9ce63b5c7195358fcb052c" => :yosemite sha256 "06cb9c96c880a55763dbb58c1b1a60cba19ec89be9c6995955e235d10b6cb47d" => :mavericks + sha256 "5384e94b2ac56713f0a17c5a76d1e36d33f20c1730901e909b4fdf552ab9a49c" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/xcenv.rb b/Formula/xcenv.rb index a53e26944f4b1..38c0d99cedf11 100644 --- a/Formula/xcenv.rb +++ b/Formula/xcenv.rb @@ -7,6 +7,8 @@ class Xcenv < Formula bottle :unneeded + depends_on :macos + def install prefix.install ["bin", "libexec"] end diff --git a/Formula/xclip.rb b/Formula/xclip.rb index 9efa6d2036de3..07c99cd977254 100644 --- a/Formula/xclip.rb +++ b/Formula/xclip.rb @@ -3,6 +3,7 @@ class Xclip < Formula homepage "https://github.com/astrand/xclip" url "https://github.com/astrand/xclip/archive/0.13.tar.gz" sha256 "ca5b8804e3c910a66423a882d79bf3c9450b875ac8528791fb60ec9de667f758" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -11,11 +12,13 @@ class Xclip < Formula sha256 "0963015158b7d4ae2981503edc18427737a0586b7155da5cd2ddaa93fb3b92bd" => :high_sierra sha256 "bb26c2bb6d7ce8f15ab50144f38d11ddde113bb400326ccea990ca9a5d0a9c69" => :sierra sha256 "9e17790e9a94ae1e29317f013a65f2d639ae9063db48ed7fa0aed7449f221abb" => :el_capitan + sha256 "9de13067a4d4ab379e82ab78d97c559695551fd51ee99c23879e2503de6c4d7e" => :x86_64_linux end depends_on "autoconf" => :build depends_on "automake" => :build - depends_on :x11 + depends_on :x11 if OS.mac? + depends_on "linuxbrew/xorg/xorg" unless OS.mac? def install system "autoreconf", "-fiv" diff --git a/Formula/xcodegen.rb b/Formula/xcodegen.rb index 809940a5eff94..7719b144eed01 100644 --- a/Formula/xcodegen.rb +++ b/Formula/xcodegen.rb @@ -11,7 +11,8 @@ class Xcodegen < Formula sha256 "a8eea29cb064ef817a1aae173b102eb689a263fc4039987a4592e9f15c4b1d85" => :mojave end - depends_on :xcode => ["10.2", :build] + depends_on :xcode => ["10.2", :build] if OS.mac? + depends_on :macos def install system "make", "install", "PREFIX=#{prefix}" diff --git a/Formula/xcproj.rb b/Formula/xcproj.rb index e3fc9c8f60ae6..78dc0ba1a75cd 100644 --- a/Formula/xcproj.rb +++ b/Formula/xcproj.rb @@ -15,7 +15,7 @@ class Xcproj < Formula sha256 "8e20d277d1927c425544654cd8613765460f0b9bbbb8133b0ac04ebdff5d6f0e" => :yosemite end - depends_on :xcode + depends_on :xcode if OS.mac? def install xcodebuild "-project", "xcproj.xcodeproj", diff --git a/Formula/xctool.rb b/Formula/xctool.rb index 8aab0be836b8d..93d54781e9b8c 100644 --- a/Formula/xctool.rb +++ b/Formula/xctool.rb @@ -12,7 +12,8 @@ class Xctool < Formula sha256 "055172ba606bf94416513e418007f849a08ff24a3b3484fb67c1b4f854123bb9" => :high_sierra end - depends_on :xcode => "7.0" + depends_on :macos + depends_on :xcode => "7.0" if OS.mac? def install xcodebuild "-workspace", "xctool.xcworkspace", diff --git a/Formula/xdelta.rb b/Formula/xdelta.rb index f09e5c7e3fa97..b13a8e9639ead 100644 --- a/Formula/xdelta.rb +++ b/Formula/xdelta.rb @@ -13,6 +13,7 @@ class Xdelta < Formula sha256 "e07f928aadf6a9d8beb8a19fb72cb673cf0ae13c339ccd75c5df134cb3bc5c09" => :el_capitan sha256 "2581a9d0aabf6f6b34d35aae4d7ab07b6aaebdb70fd3b00ef14eff3bd96aa6c7" => :yosemite sha256 "a0801a8bd9796d03d8c031905e28a6e5f50b155da3102337070ec787ccb5cee9" => :mavericks + sha256 "019eb847eed8b1ead44830fadc8d85c9c2cf201a3b0fd54437e624224d90d73e" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/xdot.rb b/Formula/xdot.rb index 9efcb77d146f3..e93a816964c32 100644 --- a/Formula/xdot.rb +++ b/Formula/xdot.rb @@ -11,6 +11,7 @@ class Xdot < Formula sha256 "a92e47d64ecc06ba29af228325bb6ca78f063e410a26a5458e016660a600b3b4" => :catalina sha256 "a92e47d64ecc06ba29af228325bb6ca78f063e410a26a5458e016660a600b3b4" => :mojave sha256 "a92e47d64ecc06ba29af228325bb6ca78f063e410a26a5458e016660a600b3b4" => :high_sierra + sha256 "a4d10853faa401c679d870918116cb0f1e913a8813eb1539977cc100aff1324a" => :x86_64_linux end depends_on "adwaita-icon-theme" diff --git a/Formula/xdotool.rb b/Formula/xdotool.rb index 38f97e65c6fbe..52694b78b8663 100644 --- a/Formula/xdotool.rb +++ b/Formula/xdotool.rb @@ -3,18 +3,20 @@ class Xdotool < Formula homepage "https://www.semicomplete.com/projects/xdotool/" url "https://github.com/jordansissel/xdotool/archive/v3.20160805.1.tar.gz" sha256 "ddafca1239075c203769c17a5a184587731e56fbe0438c09d08f8af1704e117a" - revision 1 + revision OS.mac? ? 1 : 2 bottle do sha256 "8dbfb2b1c32176c7cba00aaa2365f3cd438619dc0286e668e5d87412c3717d53" => :catalina sha256 "860e5e7f2ca2ae88c86e8a979eba543f544960894bb4d8ec59d98cbba9805614" => :mojave sha256 "9de15325d8ed42b629a94e34ff710672e96c1570dc51a6544aff0d0445de5e9c" => :high_sierra + sha256 "844136b01ebd2c12060c9c5c7937c4dc72cea7630998e38fc8eb73bca603fbc6" => :x86_64_linux end depends_on "pkg-config" => :build depends_on "libxkbcommon" - depends_on :x11 + depends_on :x11 if OS.mac? + depends_on "linuxbrew/xorg/xorg" unless OS.mac? def install # Work around an issue with Xcode 8 on El Capitan, which diff --git a/Formula/xerces-c.rb b/Formula/xerces-c.rb index 4229e9b56156c..3b583b31e37cd 100644 --- a/Formula/xerces-c.rb +++ b/Formula/xerces-c.rb @@ -10,6 +10,12 @@ class XercesC < Formula sha256 "8bcfddab9276b6f09c9af5bd8be60d500cd5107795c25495b53ef5e0734ae617" => :catalina sha256 "502d34b51931ead6b1db27ca1a71eed465ecd4da5dbdeaa51c0ae77e77dc25ea" => :mojave sha256 "8b30ad6819fc3628b706a18193d45b96c13749e7d1e27f5392cf91e48fe7d63b" => :high_sierra + sha256 "a30bc66ae894454e16e3f0d7aa7b5c0a76bb4f50585dd26cf29d93b8918e503e" => :x86_64_linux + end + + pour_bottle? do + reason "The bottle needs to be installed into #{Homebrew::DEFAULT_PREFIX}." + satisfy { OS.mac? || HOMEBREW_PREFIX.to_s == Homebrew::DEFAULT_PREFIX } end depends_on "cmake" => :build diff --git a/Formula/xgboost.rb b/Formula/xgboost.rb index fc6717058c965..12743ae2042ab 100644 --- a/Formula/xgboost.rb +++ b/Formula/xgboost.rb @@ -10,6 +10,7 @@ class Xgboost < Formula sha256 "a80dfdb4e53157f2a5e3ff325303be7448952c80fa5db3292d1031024a36eded" => :catalina sha256 "7fbe70d2c3acff2901c3499ae7ce2582e44d4e944ffa1eab09ee79b7262413c3" => :mojave sha256 "6f40ceaac9d8aed4cbc8e52081f9d0c63ab24f5c63b38e564334a7c2c0717118" => :high_sierra + sha256 "748e9e0f856b1844e9005d0d507a7749cec96e0875653c1fce23671ae2d8a6e6" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/xmake.rb b/Formula/xmake.rb index 18a23a7815d9f..46455f37539a0 100644 --- a/Formula/xmake.rb +++ b/Formula/xmake.rb @@ -10,6 +10,7 @@ class Xmake < Formula sha256 "ecfef90dabbaa9a507b4bd17eba62a2f622f2e4e53324251db699e4c4cc3fb85" => :catalina sha256 "7009ae9ee758bc803ffa46267a1595f639fd350a819af79a237575d692bdb06d" => :mojave sha256 "7cd0cb7c5727d885904809c64859515f5d83a7e20a82232377a56333af37d9aa" => :high_sierra + sha256 "473197486bfa9bbe64f6ea382fe66c584b2110679c7c21c821914660cd722ef3" => :x86_64_linux end on_linux do @@ -22,6 +23,7 @@ def install end test do + ENV["XMAKE_ROOT"] = "y" unless OS.mac? system bin/"xmake", "create", "test" cd "test" do system bin/"xmake" diff --git a/Formula/xml-security-c.rb b/Formula/xml-security-c.rb index 0f92993101284..051eb7c175d45 100644 --- a/Formula/xml-security-c.rb +++ b/Formula/xml-security-c.rb @@ -12,6 +12,7 @@ class XmlSecurityC < Formula sha256 "eec2216263c3bb21b52418d18232034aacc69335d3e14624225627fe5364347c" => :mojave sha256 "5ee66d19898cd50085e90392313d3a1f45204bd111f32019251af89ee84f1ca5" => :high_sierra sha256 "bd1e4d4b5768f869d28850ad440e32d417f6db5d182c6049afc87575bb36ccc9" => :sierra + sha256 "3df702bab27cebced62824fd1c0f743102d7b863e77cf45990b1be824f36e389" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/xml-tooling-c.rb b/Formula/xml-tooling-c.rb index 8230c4deb459d..3a185c3fba209 100644 --- a/Formula/xml-tooling-c.rb +++ b/Formula/xml-tooling-c.rb @@ -5,10 +5,10 @@ class XmlToolingC < Formula sha256 "722723cc2731a25db23c6acc5bc67e25a1554224e7039edd4e9ea5816e525d0e" bottle do - cellar :any sha256 "0608d8938278794d1101b96e70d7f408b3e12f270eccc9cb1a8595e2880ab934" => :catalina sha256 "d04a629486e2478f98c1f729c474d18fee5fc4bb0b2f2bdab17c6e4b3131db9f" => :mojave sha256 "6ee9b56942dcf7b05e830c11eb4249c14d07ae367433e40838454f8e6cd84858" => :high_sierra + sha256 "4e9483a6f4d46031551aaca6957466de704a8c8f1e59f90eff0694d332dcf3ab" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/xml2.rb b/Formula/xml2.rb index 604720f10c9f9..4569bf6987d32 100644 --- a/Formula/xml2.rb +++ b/Formula/xml2.rb @@ -13,6 +13,7 @@ class Xml2 < Formula sha256 "d8d4bb9ceb9d97b648d3fd3cffb1e2fad2e4d82aa6aa3397c22f53fe5468ac56" => :sierra sha256 "85e939873edbb3dd1b072437992a0c404534a5084cccd6f9f76d99b09ddda695" => :el_capitan sha256 "3883d5997021b3a5bd57d8830906cb9b370da0f6e1927b6c7e9dcd6740e05c5c" => :yosemite + sha256 "614a8653250230e2f1f79816f7bbb6e4c901cc2ea80ec5a33562c36a3ea63c6f" => :x86_64_linux # glibc 2.19 end depends_on "pkg-config" => :build diff --git a/Formula/xmlcatmgr.rb b/Formula/xmlcatmgr.rb index 68e650e98cd34..316a58a909733 100644 --- a/Formula/xmlcatmgr.rb +++ b/Formula/xmlcatmgr.rb @@ -10,6 +10,7 @@ class Xmlcatmgr < Formula sha256 "ae788970290574145fa3ca20e389469f1a8582c8b604a50e3e506b7ffcb9faa4" => :catalina sha256 "eb8b0acfdaed325cce3e6b7befb53a675f9f7f6dc8aa5d058b4ebecea2d50e53" => :mojave sha256 "bbb201365fe9f89dc036d97e7bcb05d5b299e32f2ad427266f1d73934fd03cb4" => :high_sierra + sha256 "feb156fd85fe9afa5436382c842a451e3c69657c8642647150ec096a05ac5c2f" => :x86_64_linux end def install diff --git a/Formula/xmlrpc-c.rb b/Formula/xmlrpc-c.rb index 7fbc16484289a..1e470c6ddfdbb 100644 --- a/Formula/xmlrpc-c.rb +++ b/Formula/xmlrpc-c.rb @@ -12,8 +12,12 @@ class XmlrpcC < Formula sha256 "19784c94e65b73ea524331452a28458eaa29b78419955805226a50f1632ce6d1" => :sierra sha256 "503a064edf4638c671b6377d91045c7f0990203b9b8d6f873d84415c8c98b614" => :el_capitan sha256 "6fb643c4bc7e7fdef6c276f533eedafe77d325fd505218bdbd8244af5577db31" => :yosemite + sha256 "7323e4873c7a1ac0545d27522769469808d33d367773dcabcf4bb162d204a6ec" => :x86_64_linux end + uses_from_macos "curl" + uses_from_macos "libxml2" + def install ENV.deparallelize # --enable-libxml2-backend to lose some weight and not statically link in expat diff --git a/Formula/xmlstarlet.rb b/Formula/xmlstarlet.rb index d97899e0da244..e108914fde15a 100644 --- a/Formula/xmlstarlet.rb +++ b/Formula/xmlstarlet.rb @@ -13,6 +13,7 @@ class Xmlstarlet < Formula sha256 "2d9a9b5f875b91c78378e7f3df12595528d8e4b9ec9e321131b7f9f78f30acd8" => :el_capitan sha256 "525eafe6cab96cc6e04fef756e25316119b3c96cb61e5f7f51770cd062ad1bec" => :yosemite sha256 "7004b98b4dd9195a35f736ba3f6282369a2c63397a710056c5d1ae71d149fa3a" => :mavericks + sha256 "88b419a7af11d19f44e0450b8f50ae1c56a75d4b04124ad612e2ea15db557f3f" => :x86_64_linux # glibc 2.19 end uses_from_macos "libxslt" diff --git a/Formula/xmlto.rb b/Formula/xmlto.rb index 5d3a92ed0841f..c506d8e197a2e 100644 --- a/Formula/xmlto.rb +++ b/Formula/xmlto.rb @@ -3,6 +3,7 @@ class Xmlto < Formula homepage "https://pagure.io/xmlto/" url "https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2" sha256 "1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276" + revision 1 unless OS.mac? bottle do cellar :any_skip_relocation @@ -13,6 +14,7 @@ class Xmlto < Formula sha256 "e6c35d8216b36e13a890d839296f51989d58fbf6e35666ee161dcae6f1e5fcd3" => :sierra sha256 "7b12ea43ff42eb5acdf91a1b2390af62cb95abd80e0a651581653c3d2b470b60" => :el_capitan sha256 "b0042227a7b6f00c5e4f7eb0e9b0ce6959ff401035d0914a8be60d685929c4a4" => :yosemite + sha256 "bd3c64036e85fd291ee8ad2cd59fbc7a8ec5547a001f5bd4e10810bd5bfff5f4" => :x86_64_linux end depends_on "docbook" diff --git a/Formula/xmltoman.rb b/Formula/xmltoman.rb index 65121f88e07af..1e8fcda707d4a 100644 --- a/Formula/xmltoman.rb +++ b/Formula/xmltoman.rb @@ -13,6 +13,7 @@ class Xmltoman < Formula sha256 "010af030c01ebe6528bbdecfa1153fac5f6e082fa088e1803d0768bb268a509b" => :el_capitan sha256 "6345ec17095eeec7fde97b609c0c88f07fcdd1e911fa7fd3b8db7f3e5b081b9c" => :yosemite sha256 "9330b2e39919f745009122679a1e4f42ff818c55950fd7b462af86de644c0a45" => :mavericks + sha256 "662d5bd05b25019e95ae5aa1a3e660557c92f3416d5643b2d003a095691562c1" => :x86_64_linux # glibc 2.19 end def install diff --git a/Formula/xmount.rb b/Formula/xmount.rb index ca10adc487f8d..88d1659b6a402 100644 --- a/Formula/xmount.rb +++ b/Formula/xmount.rb @@ -10,6 +10,7 @@ class Xmount < Formula sha256 "55de429679b12e85dcfb854d4add045363a287c172b7b77765591d7d1d89324c" => :catalina sha256 "ae937d5fdba6c278bef72a4f87d62a6dafc2f78ad642ee6995bc228743ed37cd" => :mojave sha256 "a4436c7060d9b84abfa6450c7156cd994f42c130eebf1281e21319d6e5c00415" => :high_sierra + sha256 "48685578f4d3cca24e4d583b47977835607918011187a23c17dd6672aa5ef13d" => :x86_64_linux end depends_on "cmake" => :build @@ -17,7 +18,11 @@ class Xmount < Formula depends_on "afflib" depends_on "libewf" depends_on "openssl@1.1" - depends_on :osxfuse + if OS.mac? + depends_on :osxfuse + else + depends_on "libfuse" + end def install ENV.prepend_path "PKG_CONFIG_PATH", Formula["openssl@1.1"].opt_lib/"pkgconfig" diff --git a/Formula/xmp.rb b/Formula/xmp.rb index fcbcf861e6a22..74e917d6f0563 100644 --- a/Formula/xmp.rb +++ b/Formula/xmp.rb @@ -10,6 +10,7 @@ class Xmp < Formula sha256 "dc4399be2df77f0534bf1151201fd52b61694df7285bd58d9c1fe16522f199f6" => :catalina sha256 "197be59a2a0c3495aeed49eeeedea65b060534f4ff5ad234cdd35f6da19fb9e1" => :mojave sha256 "c76b4335844295d6daaaaca97f462828d39a9ce511c859d0ebf66165b12a6354" => :high_sierra + sha256 "0a471e113005d4df0e3fec160bacb405e3a9e085be0b63f6e996faf3b2d9bb28" => :x86_64_linux end head do diff --git a/Formula/xmrig.rb b/Formula/xmrig.rb index c04d94766825e..2ef7e17442278 100644 --- a/Formula/xmrig.rb +++ b/Formula/xmrig.rb @@ -6,9 +6,11 @@ class Xmrig < Formula head "https://github.com/xmrig/xmrig.git" bottle do + cellar :any sha256 "0855edef0e1b3a0f1cb59bc62f9cbfd75751d7283929ad667545643fd2726407" => :catalina sha256 "ad7b625ec09681ff6488efe43fbb4a8d6c94098ab0fd71554721d11d3c26c9d0" => :mojave sha256 "a325f57032ad09541daac1bc0f9541583d1eb6c850275b4a5fca0b215589e5b5" => :high_sierra + sha256 "cd5393e67e0696527bc6fd12af52faf6a27d5ff44e20b4f8ff1f3a51c546a7a8" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/xonsh.rb b/Formula/xonsh.rb index 8cf4621e46a03..ff46852fb6e5a 100644 --- a/Formula/xonsh.rb +++ b/Formula/xonsh.rb @@ -12,6 +12,7 @@ class Xonsh < Formula sha256 "4070263bdcb133592aa553a066e14508f9d80baad17dbb197ed1a66fa415642d" => :catalina sha256 "27f235259b2deddbc6dd0177e341e652a519b516cf4131124d55b320210acf88" => :mojave sha256 "e6160b47a159b7a1ed67dabb58a131ec8aea10d7f80a1a62404b72725ccd403d" => :high_sierra + sha256 "7b9b7b0ef3531f1f24e606332fe470e88945b8a34c0204a45bc264c3e9d9483c" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/xorriso.rb b/Formula/xorriso.rb index 9a7af72952485..29f068c0286a7 100644 --- a/Formula/xorriso.rb +++ b/Formula/xorriso.rb @@ -10,6 +10,7 @@ class Xorriso < Formula sha256 "ba9353c38b3109630b543faf56f9f8431ec225db32e5f446495528879fcdc361" => :catalina sha256 "e85cf1dfeb93797ef41680738cbde8fdf02aecb8040681742c2c89c82659c871" => :mojave sha256 "341b85b60e1762c6ffca661940ce5e1958b1f2aab89f49da0865466ad1badc5a" => :high_sierra + sha256 "fd29c9fe1118c161535a17ff363f729fde502a8a4bff2418378d705684362092" => :x86_64_linux end uses_from_macos "zlib" diff --git a/Formula/xplanet.rb b/Formula/xplanet.rb index 9e0c6feaf222c..c8a1bb3f01a01 100644 --- a/Formula/xplanet.rb +++ b/Formula/xplanet.rb @@ -9,6 +9,7 @@ class Xplanet < Formula sha256 "c8e659713aaa70e8fc00d48e15cf997648759afa7b6ff8e0979212348fd6cc8f" => :catalina sha256 "9912c643de81e812f69e639e1fe1ee3ee45900d85ce23409adb0a394305b970b" => :mojave sha256 "aec227666c4e6216b061e979c5aabd1343c9c6433e8f85868f0f12eff3c01b62" => :high_sierra + sha256 "e5f08a7dcab6cff1af995c15b64e7a425c4afbebee575688380378280000ac47" => :x86_64_linux end depends_on "pkg-config" => :build @@ -35,7 +36,7 @@ class Xplanet < Formula def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", - "--with-aqua", + ("--with-aqua" if OS.mac?), "--without-cspice", "--without-cygwin", "--with-gif", diff --git a/Formula/xqilla.rb b/Formula/xqilla.rb index fd60fa01d977f..135aded886fc7 100644 --- a/Formula/xqilla.rb +++ b/Formula/xqilla.rb @@ -12,6 +12,7 @@ class Xqilla < Formula sha256 "38579e6ab1b6f6801ca5404cc79fcd972f395b9dd2e981672889b3eac5441c86" => :high_sierra sha256 "0f1ef8f2aa1349b723062426a3e44fba2821bcf93316bacabf4c5e2948093bc4" => :sierra sha256 "4326ec876d3e05647320c4ab55824c37531af997cc723f303fac4c4b40153753" => :el_capitan + sha256 "18e7b349da94d52a40be41747e69fd4d8aa64fa668aee85e31b047257ae01a89" => :x86_64_linux end depends_on "xerces-c" @@ -44,10 +45,11 @@ def install return 0; } EOS - system ENV.cxx, "-I#{include}", "-L#{lib}", "-lxqilla", + system ENV.cxx, "-std=c++11", "-I#{include}", "-I#{Formula["xerces-c"].opt_include}", - "-L#{Formula["xerces-c"].opt_lib}", "-lxerces-c", - testpath/"test.cpp", "-o", testpath/"test" + testpath/"test.cpp", "-o", testpath/"test", + "-L#{lib}", "-lxqilla", + "-L#{Formula["xerces-c"].opt_lib}", "-lxerces-c" system testpath/"test" end end diff --git a/Formula/xrootd.rb b/Formula/xrootd.rb index a6c42d102592e..2bc4410da5b4b 100644 --- a/Formula/xrootd.rb +++ b/Formula/xrootd.rb @@ -10,6 +10,7 @@ class Xrootd < Formula sha256 "197ab8bf8564530157d3956408bc15a95ab3b7dc3616ee312292ce325cec655f" => :catalina sha256 "fda59892c853f5dbd525c3495d4bbd3776a93e762681e56afb82263f77908d63" => :mojave sha256 "d832213cdad3ef90e8c8bbf8f777b772ee00c0a10b2bb4005a2773d5383c808b" => :high_sierra + sha256 "2d55d1bd1eb6733691cae4b4ac9b5fd3aa5047c49ee617ac2f103c71c4485247" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/xsane.rb b/Formula/xsane.rb index 9fed769af17cf..5cdd3d83b7e84 100644 --- a/Formula/xsane.rb +++ b/Formula/xsane.rb @@ -11,6 +11,7 @@ class Xsane < Formula sha256 "93064b6ec70657f6815a0aba5d52c8b7e54e9ef6f223c608351b790887c62b92" => :mojave sha256 "4242d28d56f5ed634f7f8632d41e441e1cbeaf60a362628796a436ba2f8eac11" => :high_sierra sha256 "f247067d49d44f8c0662cd64c99524f13c4b3a18ef7e49a19dd377bb449c859d" => :sierra + sha256 "a2fc7f6f9ece41445c7806a0bbfa5eee7394c1ac7d88f8db30abfa264435b4ab" => :x86_64_linux end depends_on "pkg-config" => :build @@ -29,6 +30,9 @@ def install end test do + # (xsane:27015): Gtk-WARNING **: 12:58:53.105: cannot open display + return if !OS.mac? && ENV["CI"] + system "#{bin}/xsane", "--version" end end diff --git a/Formula/xsimd.rb b/Formula/xsimd.rb index 76be61a0985fe..a7dc9c8308d00 100644 --- a/Formula/xsimd.rb +++ b/Formula/xsimd.rb @@ -9,6 +9,7 @@ class Xsimd < Formula sha256 "a8c6a9f46585989372faf4b18029b2f69a1660e743ba8ee126a51686656dfc56" => :catalina sha256 "a8c6a9f46585989372faf4b18029b2f69a1660e743ba8ee126a51686656dfc56" => :mojave sha256 "a8c6a9f46585989372faf4b18029b2f69a1660e743ba8ee126a51686656dfc56" => :high_sierra + sha256 "ec3a6f89ed8b08222705302d8ee36142b3f35efb27fd11d1c7c03c6bf671dd91" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/xspin.rb b/Formula/xspin.rb index 4bcbc7493fe6e..eb7895750e243 100644 --- a/Formula/xspin.rb +++ b/Formula/xspin.rb @@ -14,6 +14,7 @@ class Xspin < Formula sha256 "896d3acc7e60648410ff86b1f8e744059bb71015900360fc18b3a75537e2c13e" => :el_capitan sha256 "2ff10f844a1c09cc99bf8e630bde4e191a450697ab6ea286c85bfb66670db405" => :yosemite sha256 "a1b19b1227fc19b6ea00cfea5a49955a82d180521e8df29d68842b465e5b4b89" => :mavericks + sha256 "430fb9e849344a4cdbf948f36d93aecbc86b74ee7cb437de26368831a3c1c2ad" => :x86_64_linux end depends_on "spin" diff --git a/Formula/xsv.rb b/Formula/xsv.rb index 3dbb630f6bbd6..3ef6080961de3 100644 --- a/Formula/xsv.rb +++ b/Formula/xsv.rb @@ -11,6 +11,7 @@ class Xsv < Formula sha256 "b077e2fd6f968d6a3fa5c22a145e134bcead5cbe50ff20c78495937cbee7ea1d" => :catalina sha256 "ade2c436c1acf011ef7807b01a2783f6c31c0cacf066e51db904adefd99d4a14" => :mojave sha256 "557ef267b773911347df0d1960040f2d28e20c3680637b8af5bd89edc77bcce2" => :high_sierra + sha256 "42799c5240e0094a4923c0ec6392f44a1100e15267aa489cab30e0720cd50895" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/xsw.rb b/Formula/xsw.rb index e5cd65fd91077..b70e4eddba66b 100644 --- a/Formula/xsw.rb +++ b/Formula/xsw.rb @@ -12,6 +12,7 @@ class Xsw < Formula sha256 "b7a6391cf0df4a4d514a33188dc67a8fac551a3f66e82da626c4d4877cfe5274" => :el_capitan sha256 "8652e603fa053db1bfedeebad3699f6c77158a7133b55b37cea9ac33981aec8f" => :yosemite sha256 "3bd5da94a5c179f2cb40fdb8f385d0baeaed2a88aceb0f7a3839a9c6c605549f" => :mavericks + sha256 "703711c7b386b60ac0dd81f3eae7a01be7ec7abd6351c041bc2a6e830486db3e" => :x86_64_linux end depends_on "sdl" diff --git a/Formula/xtail.rb b/Formula/xtail.rb index 5d8cb14b13086..15a9d58534ca5 100644 --- a/Formula/xtail.rb +++ b/Formula/xtail.rb @@ -13,6 +13,7 @@ class Xtail < Formula sha256 "a579041c4d693dd444464228dcd0175e79f31708b62ad3ccf55a8f545ce67ed7" => :el_capitan sha256 "60a2bcabfb83e8ab4df95b2417ccf5c49c5ca242853ff16e2a106f3e37f6005e" => :yosemite sha256 "939117402a33f5037aa7e49f5228e0d0b852e0e39e85d81357b8955864bd26eb" => :mavericks + sha256 "640e3bc461fc43b24c2cd3ad17753e877c3d1873c44c6a861ed0a415bb97c7ba" => :x86_64_linux end def install diff --git a/Formula/xtensor.rb b/Formula/xtensor.rb index 6d4aafb5e7859..aa56cd1b65b1e 100644 --- a/Formula/xtensor.rb +++ b/Formula/xtensor.rb @@ -9,6 +9,7 @@ class Xtensor < Formula sha256 "885a150c2923a6b90f592284e406b39b2b7fc736ea3ba83ac1d2486f48ef440e" => :catalina sha256 "885a150c2923a6b90f592284e406b39b2b7fc736ea3ba83ac1d2486f48ef440e" => :mojave sha256 "885a150c2923a6b90f592284e406b39b2b7fc736ea3ba83ac1d2486f48ef440e" => :high_sierra + sha256 "c82c6571e7a7da7015e0f36c5f480a616a85da8017a8697170f2481d0c744f63" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/xvid.rb b/Formula/xvid.rb index 409108b25583a..90f45f3ccb84c 100644 --- a/Formula/xvid.rb +++ b/Formula/xvid.rb @@ -9,6 +9,7 @@ class Xvid < Formula sha256 "ace5fea6272f3594b5c8fca6f1fe03c41c50a14af8599751571c5e44a49a5a53" => :catalina sha256 "4e119534a1351c85799944eb35f6f5675192e67e077fb3452f73f210a57eabe3" => :mojave sha256 "79ea46af3061561427ab0af36b09d61e057084c76f655ec21074fba375a36b01" => :high_sierra + sha256 "417f434031756b976767e0a59a02c507d675d7b5e3414f58eadf1209e28edc3b" => :x86_64_linux end def install diff --git a/Formula/xxhash.rb b/Formula/xxhash.rb index a52a7485b7222..0204cc0218a74 100644 --- a/Formula/xxhash.rb +++ b/Formula/xxhash.rb @@ -9,6 +9,7 @@ class Xxhash < Formula sha256 "4d4eddfac07b6120a21d489617ef7c365c116c94e29c51479d6ac4795b678063" => :catalina sha256 "be9807ccd03b690c5dde0ed30fe5bfdc52dfebff05f9997b4a603a0c5173b3c9" => :mojave sha256 "2a373f13868345da95bfa35078e0dc52942bf01bdb6b9d0a1cf84bb8ae001f77" => :high_sierra + sha256 "b903108780a3d092dbd1425d87e718dcd14e75dfab4780cb9ae5a87fb87e1d57" => :x86_64_linux end def install diff --git a/Formula/xz.rb b/Formula/xz.rb index fc7987572c238..84d9a7c702712 100644 --- a/Formula/xz.rb +++ b/Formula/xz.rb @@ -8,10 +8,10 @@ class Xz < Formula sha256 "f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10" bottle do - cellar :any sha256 "2dcc8e0121c934d1e34ffdb37fcd70f0f7b5c2f4755f2f7cbcf360e9e54cb43b" => :catalina sha256 "44483961b5d2b535b0ece1936c9d40b4bc7d9c7281646cca0fb476291ab9d4dc" => :mojave sha256 "1491b2b20c40c3cb0b990f520768d7e876e4ab4a7dc1da9994d0150da34ba5c6" => :high_sierra + sha256 "676b0e178b3e7644f86385cb2497ac5ec490e2222ba3d0147e28bd85aff365cf" => :x86_64_linux end def install diff --git a/Formula/yacas.rb b/Formula/yacas.rb index 1486f7a2ba213..4f69ed1767f81 100644 --- a/Formula/yacas.rb +++ b/Formula/yacas.rb @@ -12,7 +12,7 @@ class Yacas < Formula end depends_on "cmake" => :build - depends_on :xcode => :build + depends_on :xcode => :build if OS.mac? def install mkdir "build" do diff --git a/Formula/yaegi.rb b/Formula/yaegi.rb index 31979a99882c1..84c96b3f463da 100644 --- a/Formula/yaegi.rb +++ b/Formula/yaegi.rb @@ -10,6 +10,7 @@ class Yaegi < Formula sha256 "3658d0a57064a7337623c6aba74e06413c2f8b586b3cabafca39a7353fbfb297" => :catalina sha256 "3a12722a82af54893ca3e79ac713a53649cfa692e86293719e8e174574c1759a" => :mojave sha256 "ed60eaa1ae16be71d2052ad8a24a708a1bb9b7d9fae9b819745ed99ef1a4f112" => :high_sierra + sha256 "aea987582b2976e2fe670714e57fde7b97c66a4b22f872f189397fbcefce174c" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/yaf.rb b/Formula/yaf.rb index 698d8ab8c53d3..81edc164c5e0a 100644 --- a/Formula/yaf.rb +++ b/Formula/yaf.rb @@ -12,6 +12,7 @@ class Yaf < Formula sha256 "7395026369a9b4b30f6614ab98baa1d810de2af29511b635b3ba2ad5a3d82289" => :mojave sha256 "3e4ba45a90c4a47bcb4edc7dd9d9bf227d8b70af3989368bbf6cc4b006d2a9f7" => :high_sierra sha256 "f9f45a164b81d2b4d4ef3b45664faa81d8317039cee93b69a1f4dc2d55786068" => :sierra + sha256 "1efcc26b27a9bc4045b1faef7c8a5ae8200e936e3187913228e8c6b520b637b6" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/yajl.rb b/Formula/yajl.rb index c5c6341afb96e..306fcb3566c3b 100644 --- a/Formula/yajl.rb +++ b/Formula/yajl.rb @@ -14,6 +14,7 @@ class Yajl < Formula sha256 "5cfd83bfdbd7c92402f1cecc6b66788e6db0c195880a40263365d8130e47db2f" => :el_capitan sha256 "600fec6352ac23a66795cce22cb0a555df43eb464c87693299cb4fc2a1307833" => :yosemite sha256 "d44363e381f2f353387374167520ed166f3c0c756887dab6e015961bd9ba5ff3" => :mavericks + sha256 "f0c23a3d9a441a2d01237278c5c0a2b027397534ffc397403db8160b775ad695" => :x86_64_linux # glibc 2.19 end # Configure uses cmake internally diff --git a/Formula/yaml-cpp.rb b/Formula/yaml-cpp.rb index f0f68279d2c4e..e5aec11393d09 100644 --- a/Formula/yaml-cpp.rb +++ b/Formula/yaml-cpp.rb @@ -10,6 +10,7 @@ class YamlCpp < Formula sha256 "7cb356c020e5e1f2a32d5b2721516b9079cc4518556a0344fd498df6abe04731" => :catalina sha256 "ab76f2d444f7948c73f102588d079e4a3a0c758974f42cec1bffa31e80ca7bff" => :mojave sha256 "824351b703802346eeb47a3a0acdbf438327cc1cb77ef4a342493a938574c6d6" => :high_sierra + sha256 "1b156beecfaa03bcd03512a5074cacd6d7eaaf4767fa8232badcd7c2edab6c95" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/yamllint.rb b/Formula/yamllint.rb index c547cb905ffc0..74cb4aff0f2c9 100644 --- a/Formula/yamllint.rb +++ b/Formula/yamllint.rb @@ -5,12 +5,14 @@ class Yamllint < Formula homepage "https://github.com/adrienverge/yamllint" url "https://github.com/adrienverge/yamllint/archive/v1.23.0.tar.gz" sha256 "48238b771f3910d2fa16a35430a956ff26e7b649134dd57b0a7f8b9b5ce6844c" + revision 1 unless OS.mac? bottle do cellar :any sha256 "ec582cd37f6370383f7f3830eada064ee5549890e3004ec4efbe320ec8136799" => :catalina sha256 "a16d5e7e4086222c51793c0d032489174d6230599033484efacb20f50f43d5a3" => :mojave sha256 "aa68d7ef0ab8ad535ab0993ca1363b672c600e2bc339d56d4a6253dde87c0d74" => :high_sierra + sha256 "546969749bcac98e7245ff512596aed9dc91545195138b8b6784826963ad6392" => :x86_64_linux end depends_on "libyaml" diff --git a/Formula/yank.rb b/Formula/yank.rb index 8ad0d7ead7ff1..d612421630a2f 100644 --- a/Formula/yank.rb +++ b/Formula/yank.rb @@ -10,6 +10,7 @@ class Yank < Formula sha256 "60431f02c576c640597975986ce62f9d157c49f160d7d6e23f917dc321ca8bac" => :mojave sha256 "b87461e809f0bebd615d4da69c31509109de8f86d07d280dab07326293cc851f" => :high_sierra sha256 "70a5de45249c1656653733fea8d7a92c2496b9ba8e7540eef86b3f805d0e933a" => :sierra + sha256 "a603aadd7c40a0b0be7c66b99fff6c837acdef9aac38a4628618a98ca2efc5e5" => :x86_64_linux end def install diff --git a/Formula/yapf.rb b/Formula/yapf.rb index 5209a53346790..bf29d80b59ab4 100644 --- a/Formula/yapf.rb +++ b/Formula/yapf.rb @@ -11,6 +11,7 @@ class Yapf < Formula sha256 "d01c7c5f1bf9e9aa845dc219215902089bd4840058207b886699b6aaffa89e95" => :catalina sha256 "2382d1e94fa1ee30967decf41c62bf83d9d72ac7be41ae6d267fee68b52297c7" => :mojave sha256 "0827bfff5c9ea969e54f97302298d4fb2861d91b6baae4f8c4cf3f6e84f44cc2" => :high_sierra + sha256 "02dcd996e0acc110608617518893e27e1f70b6febf282c6fb281e203f8342cff" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/yash.rb b/Formula/yash.rb index 7b9ce99d0ac1d..caef2d46d5c2c 100644 --- a/Formula/yash.rb +++ b/Formula/yash.rb @@ -9,6 +9,7 @@ class Yash < Formula sha256 "7e92afc1391f9d80bcab553e29705fd0cb11c88ae10448a7d57d408284c8490f" => :catalina sha256 "1ce52a85f6ed173af4e6e296a1051b08536a31d7e7c8704d0324bb4d2c751fad" => :mojave sha256 "026106ab6ee3296619ad4cd762756d4676713feb7060172cabc39e92d8f222a0" => :high_sierra + sha256 "3299c1fe075f40a2b7bb51154f731557c726490ec7a9d08290a2562073a8a83b" => :x86_64_linux end depends_on "gettext" diff --git a/Formula/yasm.rb b/Formula/yasm.rb index 38636165ddcce..0684b375826df 100644 --- a/Formula/yasm.rb +++ b/Formula/yasm.rb @@ -12,6 +12,7 @@ class Yasm < Formula sha256 "a3b57d242cdd13967472fbb5badd774d677428b6f730438d18fd153920dd3620" => :mojave sha256 "aa12e2f4b22a402405553706681d5c6bde592a1958a7c1e2594a365c29834625" => :high_sierra sha256 "49aa187cc261f03269c7036f1c39d6ff58d6748a25b247a0c51f8f3ecbf032cd" => :sierra + sha256 "1dc1a3707c1748eaada591325a5b4dbe4a9aca39b0e9377e4c3fe5b5cb7900b1" => :x86_64_linux end head do @@ -55,7 +56,9 @@ def install .len: equ $ - msg EOS system "#{bin}/yasm", "-f", "macho64", "test.asm" - system "/usr/bin/ld", "-macosx_version_min", "10.7.0", "-lSystem", "-o", "test", "test.o" - system "./test" + if OS.mac? + system "/usr/bin/ld", "-macosx_version_min", "10.7.0", "-lSystem", "-o", "test", "test.o" + system "./test" + end end end diff --git a/Formula/yaz.rb b/Formula/yaz.rb index 6edb07208f0c4..2c272b7d96a89 100644 --- a/Formula/yaz.rb +++ b/Formula/yaz.rb @@ -9,6 +9,7 @@ class Yaz < Formula sha256 "3e99cfd562ae262f299752a7d92dbad3f9b67dd37726e90b1109684f0deac7d1" => :catalina sha256 "0fb86a32e27613df4ef17bc76556364a85d220c9d044f6f2c515ca0bb2e94c6a" => :mojave sha256 "a3dd5357b88bd5780a90dc1fb51c12943d3a8ba6ce69073fb262116c9b050b3e" => :high_sierra + sha256 "baaad44b69980968605be3a02561503b8af683318d56eccdec3e905c7213c36a" => :x86_64_linux end head do diff --git a/Formula/yazpp.rb b/Formula/yazpp.rb index 281bb8f0c9a7a..1a98543eaff38 100644 --- a/Formula/yazpp.rb +++ b/Formula/yazpp.rb @@ -12,6 +12,7 @@ class Yazpp < Formula sha256 "794e2e265413005b3c26a0fa38e1ab8957bd1ec13cf4abb63730070181d9beb4" => :sierra sha256 "292447a86953bb10361130542d2db9e0c0fc410e9be3b13b8c80891fbfaeec20" => :el_capitan sha256 "6f769c30797af9cb98bf02491706f96b7085eed2d5d05c377e51ca5e0bf8541a" => :yosemite + sha256 "e88036eee1f421fa010db0b524bb4595fd841cdd6958ab021486c09978d8d674" => :x86_64_linux end depends_on "yaz" diff --git a/Formula/yelp-tools.rb b/Formula/yelp-tools.rb index 368ed14017cde..e4473e93def83 100644 --- a/Formula/yelp-tools.rb +++ b/Formula/yelp-tools.rb @@ -10,6 +10,7 @@ class YelpTools < Formula sha256 "fd04fbc43832ca6a6e75ffcd928794c866153c7cf04d4f366e79d15a14a317b6" => :catalina sha256 "fd04fbc43832ca6a6e75ffcd928794c866153c7cf04d4f366e79d15a14a317b6" => :mojave sha256 "fd04fbc43832ca6a6e75ffcd928794c866153c7cf04d4f366e79d15a14a317b6" => :high_sierra + sha256 "3042cae5a46032afd71245c46aec7a00909484146cc0b2f9f8b51e4dbf05b523" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/yetris.rb b/Formula/yetris.rb index c36f97539dfd6..32357e45f4ff9 100644 --- a/Formula/yetris.rb +++ b/Formula/yetris.rb @@ -12,6 +12,7 @@ class Yetris < Formula sha256 "cf350d8daaf62f863b7466477aebea02145abf1f14e50ee56ad324c99dcee018" => :sierra sha256 "fd08bc62fc0c4687ed7e76fe604c345a647fb52a348c55cf446fcbf52c7af8dd" => :el_capitan sha256 "a14c5327ab931d7394b3f617422916eafbc76a936ac77e81a959b38aa223dd5e" => :yosemite + sha256 "e315cc19ed59f4fcc842ae5e599f9550423b9fd7948d8f82c953e654e4522152" => :x86_64_linux end uses_from_macos "ncurses" diff --git a/Formula/ykman.rb b/Formula/ykman.rb index e893bec5608f3..d7f7cab3ca6db 100644 --- a/Formula/ykman.rb +++ b/Formula/ykman.rb @@ -20,6 +20,11 @@ class Ykman < Formula depends_on "openssl@1.1" depends_on "python@3.8" depends_on "ykpers" + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "libffi" + depends_on "pcsc-lite" + end uses_from_macos "libffi" @@ -74,6 +79,13 @@ class Ykman < Formula end def install + unless OS.mac? + ENV.prepend "CPPFLAGS", "-I#{Formula["libffi"].lib}/libffi-#{Formula["libffi"].version}/include" + + resource("pyscard").stage do + ENV.append "CFLAGS", "-I#{Formula["pcsc-lite"].opt_include}/PCSC" + end + end virtualenv_install_with_resources end diff --git a/Formula/ykpers.rb b/Formula/ykpers.rb index 45cb1415bb698..730a65206923b 100644 --- a/Formula/ykpers.rb +++ b/Formula/ykpers.rb @@ -10,6 +10,7 @@ class Ykpers < Formula sha256 "5a77e8978ad9cf3ed1d596d5ec209cf94a4eb1f13ec7b7b228847c6d6241e662" => :mojave sha256 "5907731c71ecd35c52caebbda5b1cd2bca595a06d2a1571c3ffeadb745e33054" => :high_sierra sha256 "1f2863cf8132643dc9c3572b649792430d3fc932a5e6d49709a7076b10718d8c" => :sierra + sha256 "97bcace6f732a13023c70e86d39d63f9eb86a88b19c139edb5550b677bed40d1" => :x86_64_linux end depends_on "pkg-config" => :build @@ -21,12 +22,13 @@ class Ykpers < Formula end def install + backend = OS.mac? ? "osx" : "libusb-1.0" libyubikey_prefix = Formula["libyubikey"].opt_prefix system "./configure", "--disable-dependency-tracking", "--disable-silent-rules", "--prefix=#{prefix}", "--with-libyubikey-prefix=#{libyubikey_prefix}", - "--with-backend=osx" + "--with-backend=#{backend}" system "make", "check" system "make", "install" end diff --git a/Formula/yle-dl.rb b/Formula/yle-dl.rb index 69f41b2d1f981..1595e0e6ac8c2 100644 --- a/Formula/yle-dl.rb +++ b/Formula/yle-dl.rb @@ -10,6 +10,7 @@ class YleDl < Formula sha256 "513097c2d1d174c14eec82353155dca6efcded472ee4fce426c9c01f28821010" => :catalina sha256 "63de53da03bec566091483b0cb3b362fa41c1111cfb25c0cc55836e40e016dd4" => :mojave sha256 "7ba726d1b94eb47170aa85b1f173c68a2e52514127692467fbd47068085b32d7" => :high_sierra + sha256 "b53b68d5dad364dac1834dfb02a2c6656ff0c8b056f4694da240820a3115de28" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/you-get.rb b/Formula/you-get.rb index 96b70138b0996..a12acdcd9e8fc 100644 --- a/Formula/you-get.rb +++ b/Formula/you-get.rb @@ -5,6 +5,7 @@ class YouGet < Formula homepage "https://you-get.org/" url "https://github.com/soimort/you-get/archive/v0.4.1432.tar.gz" sha256 "c35ebe75a2904f0dfcf75222109ee02e59aa45ade1105bdc15879cc1a0ae9264" + revision 1 unless OS.mac? head "https://github.com/soimort/you-get.git", :branch => "develop" bottle do @@ -12,6 +13,7 @@ class YouGet < Formula sha256 "00978ff19ead4913f71581da459eedc79c51d51b3e3c2482db80cdba29e2bf3f" => :catalina sha256 "2baed6bb0c7bdba492eab79e19f267dae5a9c00d40ccdafcb230b2fa1b471cda" => :mojave sha256 "7e57020149ef1a994005275b9a09594d368f9ae59261fd4bb86a9386ba8e2ddd" => :high_sierra + sha256 "9aebc5129f603b3faa2b504357a5254b1e2c932c7ea4689493117e6ce62ac68b" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/yq.rb b/Formula/yq.rb index a55f55cf5687e..f701362fbd254 100644 --- a/Formula/yq.rb +++ b/Formula/yq.rb @@ -9,6 +9,7 @@ class Yq < Formula sha256 "1cd476d249fd7a11034e3e8581a099cc8dfff09cc1ff40c79b819a5562399137" => :catalina sha256 "7b33668ea6670cc65b4ef92d640c0066d9fc0c54f7bea4136cd326d8b59d37e8" => :mojave sha256 "d59fe8d26fa97d6fc26bfff73315d90d361e456bdecf1fdfc10084c3cadedd30" => :high_sierra + sha256 "4e36b33067b1b6f4da9f54e41dda5a3037e04614865e1c3e082ec508932f95ed" => :x86_64_linux end depends_on "go" => :build diff --git a/Formula/yydecode.rb b/Formula/yydecode.rb index 2ff6b26eb08bf..01bc78472a512 100644 --- a/Formula/yydecode.rb +++ b/Formula/yydecode.rb @@ -12,6 +12,7 @@ class Yydecode < Formula sha256 "e2e7285f1f2b18b4b99800602d15932dba435f6480c5776e5b57b734727f652f" => :high_sierra sha256 "91dc4fe34931d45fcebaead39ce505116322c7866e786cf86a7065f9e57b42ac" => :sierra sha256 "07aa31cabc4f2533df3b5670beed1ba99e3e7dcc3ffb3cf55fff56866e7bf11e" => :el_capitan + sha256 "29e030d103507190633e2070ff380510b53719d0dbc22038b3ce5d56ae993cae" => :x86_64_linux end def install diff --git a/Formula/z3.rb b/Formula/z3.rb index bbe2b1665ecb5..dddf0fe78a798 100644 --- a/Formula/z3.rb +++ b/Formula/z3.rb @@ -10,6 +10,7 @@ class Z3 < Formula sha256 "06f1a289d9f846c31fd171ebcad05442eb03473b6aaf4bf1cbb1ca7c6e77d612" => :catalina sha256 "3ac5deca9acb17a0a228766d6353048001747543ddcca607871cadaa6c736bbf" => :mojave sha256 "e8c20ad5ef814ae9e8700f0e8f79590a11d46e8077be7204a9517a5a0af663a9" => :high_sierra + sha256 "c2be64c54aaf3a65dd5569d20d47c3450ab6552e48bd6b183eee70a792969b22" => :x86_64_linux end # Has Python bindings but are supplementary to the main library @@ -37,8 +38,8 @@ def install end test do - system ENV.cc, "-I#{include}", "-L#{lib}", "-lz3", - pkgshare/"examples/c/test_capi.c", "-o", testpath/"test" + system ENV.cc, pkgshare/"examples/c/test_capi.c", + "-I#{include}", "-L#{lib}", "-lz3", "-o", testpath/"test" system "./test" end end diff --git a/Formula/z80asm.rb b/Formula/z80asm.rb index a261f6050c735..1ef06afdf674d 100644 --- a/Formula/z80asm.rb +++ b/Formula/z80asm.rb @@ -13,6 +13,7 @@ class Z80asm < Formula sha256 "46446e7c3644dc58e1c5cc80b904863298f818d15c4aaad721e36cabae75207c" => :el_capitan sha256 "f52e469f9e8ab4c30c6cce5cde41a52bfbdb06e8db88b8be80fb7c54cbb73a21" => :yosemite sha256 "ed0e94c25d70c23f537ffbf8440b909b5d652e6000ebacd89be024c7ceee0e3d" => :mavericks + sha256 "dd48c941b29262a037c540aeabe4cebbb5b7e0afa5a89a6a72863f79e8ee4fbf" => :x86_64_linux end def install diff --git a/Formula/z80dasm.rb b/Formula/z80dasm.rb index 8912b347390a1..90f77e3472405 100644 --- a/Formula/z80dasm.rb +++ b/Formula/z80dasm.rb @@ -11,6 +11,7 @@ class Z80dasm < Formula sha256 "aa3f2ab337305b4dcbb37e868fcc537e04cac5fd4a2af7c8548347965f26a226" => :high_sierra sha256 "527e7f1cd02531e634745086a7b74eafa57fa8e1f676c3ad60d552f0d6d9ef20" => :sierra sha256 "35be0cbdb1c9abc7277c740d7da130bb8b8f7bc50f744ae8a8ea3965a228b9ed" => :el_capitan + sha256 "ba13e1e8635045945d2529b4f66efec4913bae4f63b6fdcf8795a1a03c840a4f" => :x86_64_linux end def install diff --git a/Formula/zabbix-cli.rb b/Formula/zabbix-cli.rb index 1784357fb9138..4501f5b0bf504 100644 --- a/Formula/zabbix-cli.rb +++ b/Formula/zabbix-cli.rb @@ -5,6 +5,7 @@ class ZabbixCli < Formula homepage "https://github.com/unioslo/zabbix-cli/" url "https://github.com/unioslo/zabbix-cli/archive/2.2.1.tar.gz" sha256 "884ecd2a4a4c7f68a080bb7e0936dd208c813284ec3ed60b948ce90a1be7c828" + revision 1 unless OS.mac? head "https://github.com/unioslo/zabbix-cli.git" bottle do @@ -12,6 +13,7 @@ class ZabbixCli < Formula sha256 "3ce4d420b9ddaf208d8cdc5c1b22358ac39f1cd4e6473bb2765bbedb5eb82c9d" => :catalina sha256 "b663824f576794bc31d1d55ebcce1d2352cc1c3675d0c75f957d7f410e8ca766" => :mojave sha256 "6158e91d1699b5117714310bdf8850e185eb9b358c70d3a89a6d0fefd7856482" => :high_sierra + sha256 "fc08cac0e60272a8540cd294c8ca18696ed74272166122a63b88a9cdf2c80159" => :x86_64_linux end depends_on "python@3.8" diff --git a/Formula/zabbix.rb b/Formula/zabbix.rb index 01cc301b5b29d..11c18e31fb9a0 100644 --- a/Formula/zabbix.rb +++ b/Formula/zabbix.rb @@ -8,6 +8,7 @@ class Zabbix < Formula sha256 "2ac9eaa79b953244dda80543660b22150d7c6e9ce444386e5448f63cf76df412" => :catalina sha256 "0c52ff483bc2081662b76f0e0c5cfc10b933780a149bc14c29869ee3ea74f424" => :mojave sha256 "b336bc2a9533f0d54e2c6277cd3cd9de3577596049aa44bfbb4ba2791d3bfa9c" => :high_sierra + sha256 "a3b48091598af1aa6e7da9f6534cd43a38f1c52d5d7b09e7e8da457bfb59c8f7" => :x86_64_linux end depends_on "openssl@1.1" @@ -19,19 +20,22 @@ def brewed_or_shipped(db_config) end def install - sdk = MacOS::CLT.installed? ? "" : MacOS.sdk_path + if OS.mac? + sdk = MacOS::CLT.installed? ? "" : MacOS.sdk_path + end args = %W[ --disable-dependency-tracking --prefix=#{prefix} --sysconfdir=#{etc}/zabbix --enable-agent - --with-iconv=#{sdk}/usr --with-libpcre=#{Formula["pcre"].opt_prefix} --with-openssl=#{Formula["openssl@1.1"].opt_prefix} ] - if MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0" + args << "--with-iconv=#{sdk}/usr" if OS.mac? + + if OS.mac? && MacOS.version == :el_capitan && MacOS::Xcode.version >= "8.0" inreplace "configure", "clock_gettime(CLOCK_REALTIME, &tp);", "undefinedgibberish(CLOCK_REALTIME, &tp);" end diff --git a/Formula/zbackup.rb b/Formula/zbackup.rb index 9f8ea224c0ac2..675087f76c0bf 100644 --- a/Formula/zbackup.rb +++ b/Formula/zbackup.rb @@ -10,6 +10,7 @@ class Zbackup < Formula sha256 "faad049e7738a4eeefd904de33d4fb430a6e743d1da3aa5ff5dcf0f1a901256e" => :catalina sha256 "cfacb7cce0ef145c0cb0d4668a11bd745ee84bdff0e5fed181093401f785332f" => :mojave sha256 "04983e28ea73a359a248e685e9fb8395ea89af5cd71ebfde3d5fd45963e45639" => :high_sierra + sha256 "4a07f5fa7f147412b603e5fcf71fef11fcdfdda191b4cec2af2268d61e821edf" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/zbar.rb b/Formula/zbar.rb index 62bf800352a18..b02d623e7838a 100644 --- a/Formula/zbar.rb +++ b/Formula/zbar.rb @@ -18,6 +18,7 @@ class Zbar < Formula sha256 "c67f6e8064b2c29e707529c211d90499452391ab05739da4774d922f643dd1a3" => :catalina sha256 "17da6d6bbc5072ee46a84b3fed3259afcdc96eabb50988363aa1c13d6437ec4d" => :mojave sha256 "fdba8cdcefcf962f2da1d475bd6556d3bdc3b0f644e3684a0a46efb1dd778fe2" => :high_sierra + sha256 "e50ea29d04c958dd710bd9684bfc31b21214afc7078bf2d771e0ffc0ce760eaf" => :x86_64_linux end head do @@ -38,6 +39,14 @@ class Zbar < Formula depends_on "ufraw" depends_on "xz" + unless OS.mac? + # avoid function naming conflict + patch do + url "https://salsa.debian.org/debian/zbar/raw/debian/0.10+doc-11/debian/patches/0005-src-Replace-dprintf-macro-with-zbar_dprintf-to-avoid.patch" + sha256 "e9a1aab8150f244c7b092a03f16ad8997b26575149b7c86ea8b453199e8916d0" + end + end + def install if build.head? inreplace "configure.ac", "-Werror", "" diff --git a/Formula/zdelta.rb b/Formula/zdelta.rb index 73b42725bd6cb..48a3a280392ef 100644 --- a/Formula/zdelta.rb +++ b/Formula/zdelta.rb @@ -14,6 +14,7 @@ class Zdelta < Formula sha256 "3a186612374b9b2aca2e56f5dd68049c0b1ef952e4cb0b07263faf2ea62f136a" => :el_capitan sha256 "2ade2838217be1b9f6bc55be6bf05fa5046ae09a42d17b714b9f2a73f934c993" => :yosemite sha256 "86f93c2e260d321d3bf30b34c2313d2cec5bc6d23bfb5a86cf99ab6b5f64f157" => :mavericks + sha256 "bd48342dfec250f6b0705fde8cc8e338d7a293409b28d76f86a827569f937c31" => :x86_64_linux end def install diff --git a/Formula/zenity.rb b/Formula/zenity.rb index cfcd4cabcfd14..37614138d7891 100644 --- a/Formula/zenity.rb +++ b/Formula/zenity.rb @@ -10,6 +10,7 @@ class Zenity < Formula sha256 "cef54fcd5601eb5dd3b563d1a09a6cd83654a2fa46e4a83a3d3c6e6a356fe29a" => :mojave sha256 "36cf68d4838890e8d9122109464548a4630da0b06dcf6d4f0976ccf58b99dde2" => :high_sierra sha256 "8b06d6cfec84ff39a95aeb4b466c1eb62584ff019ed90331334d243501cc8398" => :sierra + sha256 "9de564fbd06063c0e002836e266b5c78cfbd0204084fc0501dd5053c58dfe0a6" => :x86_64_linux end depends_on "itstool" => :build @@ -23,6 +24,9 @@ def install end test do + # (zenity:30889): Gtk-WARNING **: 13:12:26.818: cannot open display + return if !OS.mac? && ENV["CI"] + system bin/"zenity", "--help" end end diff --git a/Formula/zeromq.rb b/Formula/zeromq.rb index e81b1ee3ddec3..1da1df29af17c 100644 --- a/Formula/zeromq.rb +++ b/Formula/zeromq.rb @@ -10,6 +10,7 @@ class Zeromq < Formula sha256 "f128049b3857d2b3be7fe355441b2dae455ccc5dae2d64e9d7e9d3abd5f014d5" => :mojave sha256 "11b7d1bf3457a32c1c94716bef3f899106125e772939acb1ad6b0ae308dff863" => :high_sierra sha256 "3de5d5f7d5d686855aadee66616516590fe8b73b5250d259144a1575a95802e8" => :sierra + sha256 "048a69bd9199073d82e4f34c673450ccc99f809f618a0bba03e83001eea9afe5" => :x86_64_linux end head do @@ -35,7 +36,6 @@ def install # Disable libunwind support due to pkg-config problem # https://github.com/Homebrew/homebrew-core/pull/35940#issuecomment-454177261 - system "./autogen.sh" if build.head? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make" diff --git a/Formula/zig.rb b/Formula/zig.rb index fa32fdf2a0721..e901959ada081 100644 --- a/Formula/zig.rb +++ b/Formula/zig.rb @@ -7,7 +7,6 @@ class Zig < Formula head "https://github.com/ziglang/zig.git" bottle do - cellar :any sha256 "56d061f373c70fe00ae0d38f1aace3d719123219d211ff50d613aa7d7d34c7f9" => :catalina sha256 "dd0354fc2c222ca360577701e554fe2acc6c6a6884906ec721c6602b98e9d2bf" => :mojave sha256 "10bca4e34e31a22c30ba447ecf999b32fd7b186e8083051458ee5694ffd493f8" => :high_sierra diff --git a/Formula/zile.rb b/Formula/zile.rb index ec51799ecddae..1f9ecdcdb7289 100644 --- a/Formula/zile.rb +++ b/Formula/zile.rb @@ -12,6 +12,7 @@ class Zile < Formula sha256 "854315aad2cba51fa2b556ebce95ffb0d402a491420e900de898a22c95c082e3" => :catalina sha256 "812e96a8ffe6c3baaece7400306b588bfd1eb1442f943a73f34b4066ab6b0f44" => :mojave sha256 "d0cefa1b959efdf8344907a229bff4ea03cf9856b2d028a509e0b8e0a046a7f2" => :high_sierra + sha256 "625f2ce56c9d8e843f09bebd2d60f9a4d12c008132a6d83a8f2760ba32e2e742" => :x86_64_linux end depends_on "help2man" => :build diff --git a/Formula/zim.rb b/Formula/zim.rb index 671b96a6eb7be..7a96b7d291ceb 100644 --- a/Formula/zim.rb +++ b/Formula/zim.rb @@ -10,6 +10,7 @@ class Zim < Formula sha256 "10b5ee2401d6771811831f96576b631ccdf62a147c9d1fd2538a5a44800653b5" => :catalina sha256 "10b5ee2401d6771811831f96576b631ccdf62a147c9d1fd2538a5a44800653b5" => :mojave sha256 "10b5ee2401d6771811831f96576b631ccdf62a147c9d1fd2538a5a44800653b5" => :high_sierra + sha256 "851445c2b3892cf692a58249191476dfda324c00b39b2326e629bb8a3dfff386" => :x86_64_linux end depends_on "pkg-config" => :build diff --git a/Formula/zimg.rb b/Formula/zimg.rb index 508b40889df01..200045f8dd9e9 100644 --- a/Formula/zimg.rb +++ b/Formula/zimg.rb @@ -10,6 +10,7 @@ class Zimg < Formula sha256 "65da1647208bb9d77aefcf9a2b4413adb1af57fc115f9689dcac02fbc6893fce" => :catalina sha256 "efd508b816f4d22b379645878b2aa415bd51883a404145250b6694a951c4b524" => :mojave sha256 "75a2ab770e1affcee1f185dd42699721bb9d03ca99cf66f417fff106521786a5" => :high_sierra + sha256 "eb74f694158ffd82ba0327e626320e3719fdd1a6ed109929625298e8e2732d5f" => :x86_64_linux end depends_on "autoconf" => :build diff --git a/Formula/zint.rb b/Formula/zint.rb index a1f1a16a5f03e..800809ec5a413 100644 --- a/Formula/zint.rb +++ b/Formula/zint.rb @@ -10,6 +10,7 @@ class Zint < Formula sha256 "73fd531d68666227d575947fa5c5d4e1c32c1dc8f904ae4fd8bdfd622ca447d9" => :catalina sha256 "1548af77a2e17959409fb6873f81fdbbe5ab7c8db3e99bb4c944849aa7656632" => :mojave sha256 "fc47d148dcd11a920bbecbedd35fac8b58ac1fe95297b9cdc234a8d8cb2a9746" => :high_sierra + sha256 "a6bfd0b96adf717008bd3cd23466d61ac20c435cf5424f7fc4c7b44217d77217" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/zip.rb b/Formula/zip.rb index ac6a05e0fe5e7..191982424315e 100644 --- a/Formula/zip.rb +++ b/Formula/zip.rb @@ -13,6 +13,7 @@ class Zip < Formula sha256 "d218e0b7d82c7864a1ead12186b5bc09b43c2aa3749651008ac8dbcf32ec0d7c" => :high_sierra sha256 "be282c3dfde4da608ab090910b3fe3cbec914d435122854f17acc0f718cc3a15" => :sierra sha256 "54ea09b9be1a8c8a20b94e7cadff551ed243f5762a0d8da79f1aaedc4c9492a9" => :el_capitan + sha256 "eee82c511bc78167c6bc043a8795f3b7b47e2ba77a595d6234648ae73102efb2" => :x86_64_linux end keg_only :provided_by_macos @@ -48,6 +49,9 @@ def install system "#{bin}/zip", "test.zip", "test1", "test2", "test3" assert_predicate testpath/"test.zip", :exist? + # zip -T needs unzip, disabled under Linux + return unless OS.mac? + assert_match "test of test.zip OK", shell_output("#{bin}/zip -T test.zip") # test bzip2 support that should be automatically linked in using the bzip2 library in macOS diff --git a/Formula/zita-convolver.rb b/Formula/zita-convolver.rb index 6fd654705345b..5a5b466adab9f 100644 --- a/Formula/zita-convolver.rb +++ b/Formula/zita-convolver.rb @@ -9,13 +9,14 @@ class ZitaConvolver < Formula sha256 "a616c118732c9f2c3775348e598a972abab7ae67b7cb0f283884cddaa55ce93d" => :catalina sha256 "e9bfda6d2d3119f93ea0d570b9b3516d44513c3eafc206543f8fb055707db8fd" => :mojave sha256 "b8b3326ead45ef0e126488d9c96a181f15888a11b707278c61c2ceeee312b37d" => :high_sierra + sha256 "e0b4689d517a824e633441a10057cb061bc608fa33eb5f1c3d02196b9b99d8d1" => :x86_64_linux end depends_on "fftw" def install cd "source" do - inreplace "Makefile", "-Wl,-soname,", "-Wl,-install_name," + inreplace "Makefile", "-Wl,-soname,", "-Wl,-install_name," if OS.mac? inreplace "Makefile", "ldconfig", "ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)" system "make", "install", "PREFIX=#{prefix}", "SUFFIX=" end diff --git a/Formula/zlib.rb b/Formula/zlib.rb index 0b357f1b636dd..137d39eb95b64 100644 --- a/Formula/zlib.rb +++ b/Formula/zlib.rb @@ -13,6 +13,7 @@ class Zlib < Formula sha256 "f822b4dbab4a15b889316b89248c7b4d15d6af9dc460bf209b9425b0accb7fa3" => :sierra sha256 "3f912f6f1ce6c586128ebde29756c883b89409e652ca7aa9a29a773c2d4d0915" => :el_capitan sha256 "5b969eb38b90a3e31869586df9d62e59d359212b16c6a270aee690dd67caa491" => :yosemite + sha256 "6f604280b9e056da163b81cef3076b2e39bbd2b8d3cc8c36d27c19c472c760a4" => :x86_64_linux # glibc 2.19 end keg_only :provided_by_macos diff --git a/Formula/zlog.rb b/Formula/zlog.rb index 95bb4de72cd94..9090401f3f3b0 100644 --- a/Formula/zlog.rb +++ b/Formula/zlog.rb @@ -9,6 +9,7 @@ class Zlog < Formula sha256 "31352f21933854c635450c9cc5c00f1dc1370a62a331a691879bea2eaba45582" => :catalina sha256 "170ffd446913b23c344d82160c19bfb1c8325c07dc31490a636e72345abe1c7b" => :mojave sha256 "332ed23525b10970bd5bc81052bae67755aee5f2651fdaafed5dd036da470239" => :high_sierra + sha256 "3c638b658f77c6ca08523e6aac391daddf8a8ad7a08b2e62fe4a442cd1412143" => :x86_64_linux end def install diff --git a/Formula/zmqpp.rb b/Formula/zmqpp.rb index 7d2fe6b651ce4..2eb2e60c83c29 100644 --- a/Formula/zmqpp.rb +++ b/Formula/zmqpp.rb @@ -11,6 +11,7 @@ class Zmqpp < Formula sha256 "02c8a7e0124d22e2c9fde2349179d9340e17203ad252ed9fd56fd6c9ea71a24c" => :high_sierra sha256 "a1843b77cb53950bcf0b29589071025a48d86f0ecb4420280f7fcff7420f1905" => :sierra sha256 "58f0301f03f30b314cb31dbbbc9a82163930b5b00a7285e3d279f49c0e1a25d1" => :el_capitan + sha256 "45ccf7507091583c8d4bcacf8553878f2cecb77a9464f0f4116acfcead26f77d" => :x86_64_linux end depends_on "doxygen" => :build @@ -34,7 +35,8 @@ def install return 0; } EOS - system ENV.cxx, "test.cpp", "-L#{lib}", "-lzmqpp", "-o", "test", "-std=c++11", "-stdlib=libc++", "-lc++" + system ENV.cxx, "test.cpp", "-L#{lib}", "-lzmqpp", "-o", "test", + "-std=c++11", *("-stdlib=libc++" if OS.mac?), *("-lc++" if OS.mac?) system "./test" end end diff --git a/Formula/znapzend.rb b/Formula/znapzend.rb index 76e207a5e8e7f..2d2130cb64c33 100644 --- a/Formula/znapzend.rb +++ b/Formula/znapzend.rb @@ -10,8 +10,11 @@ class Znapzend < Formula sha256 "37b73cba5b7ed887b1e72175d3c601c08e449ed3bbcaa87668641704477889d1" => :catalina sha256 "9a508c6a3fb15609b3552ce38369b16664f08515f635bd8a3dc92ed79d17d381" => :mojave sha256 "18e1269f3ab2964382c1cc7578fa8785ee7ba1412a1c247861d76accde2a6cc5" => :high_sierra + sha256 "c2734fa01624aa567ca13f716998250ab850f871ec486e569990ed81456a666b" => :x86_64_linux end + uses_from_macos "perl" + def install system "./configure", "--disable-silent-rules", "--prefix=#{prefix}" diff --git a/Formula/znc.rb b/Formula/znc.rb index 7569ee023d1ac..0451f2d35faef 100644 --- a/Formula/znc.rb +++ b/Formula/znc.rb @@ -8,6 +8,7 @@ class Znc < Formula sha256 "005cacad69c5a76df51fec1b909618bc3c6607e35c242ce3fb7a072691c27cc5" => :catalina sha256 "acf1a6758351f662fba78bff2d08664000290c4e1f92bf2cfa7e160827110c91" => :mojave sha256 "3f9ed65af25e3b5edeb3c07a78b24e96944a4d05acec6c13b1336d3ce06ae0c0" => :high_sierra + sha256 "71af6ce48c2c778b8146be67458ccaa8aac044dff801288c17133c88f5d28541" => :x86_64_linux end head do @@ -33,6 +34,12 @@ def install ENV.append "CXXFLAGS", "-std=c++11" ENV.append "CXXFLAGS", "-stdlib=libc++" if ENV.compiler == :clang + # https://github.com/Homebrew/linuxbrew-core/issues/19150 + unless OS.mac? + ENV.append "CXXFLAGS", "-I#{Formula["zlib"].opt_include}" + ENV.append "LIBS", "-L#{Formula["zlib"].opt_lib}" + end + system "./autogen.sh" if build.head? system "./configure", "--prefix=#{prefix}", "--enable-python" system "make", "install" diff --git a/Formula/zola.rb b/Formula/zola.rb index ed05985154c26..f568f2ebf4ca9 100644 --- a/Formula/zola.rb +++ b/Formula/zola.rb @@ -9,6 +9,7 @@ class Zola < Formula sha256 "099ec6c5af34a200dbfc30f9f9fc1d085bda28326edc06738c29db3272af3e71" => :catalina sha256 "7ec8be7e3bbafd3fb41dae7ecee7f613cfe0c4b9120cddc9b9720603e74c282a" => :mojave sha256 "6a5820422c3ac9776b45f6c7f210315c8ae87d294fdea3db093f3e89f11358f2" => :high_sierra + sha256 "234e8d7706172f9237068ab69581688c1a6cf4393c8df6f3adb03f9ee6acd6ef" => :x86_64_linux end depends_on "cmake" => :build @@ -19,6 +20,7 @@ class Zola < Formula end def install + ENV["OPENSSL_DIR"] = Formula["openssl@1.1"].opt_prefix unless OS.mac? system "cargo", "install", *std_cargo_args bash_completion.install "completions/zola.bash" diff --git a/Formula/zopfli.rb b/Formula/zopfli.rb index baa63753d12c2..867704afd48dc 100644 --- a/Formula/zopfli.rb +++ b/Formula/zopfli.rb @@ -10,6 +10,7 @@ class Zopfli < Formula sha256 "aa44f1667254347800d442b6347d6df658e3ee24386d2284cce8e88a27e87d6d" => :catalina sha256 "521a5185b6881c878be60af7df7c673f5845255f957b88d01307eb9220407a52" => :mojave sha256 "fb474057725b73aa00261b10d000474cb05c020b7d951d085dcf9ed5b0973030" => :high_sierra + sha256 "d9abd5cbd72acc595e4bf1668a3233020c9c451e2718a3333c14170428e60f99" => :x86_64_linux end def install diff --git a/Formula/zork.rb b/Formula/zork.rb index 42feea2ce9aca..c30e0e8e5553a 100644 --- a/Formula/zork.rb +++ b/Formula/zork.rb @@ -12,6 +12,7 @@ class Zork < Formula sha256 "d2fe9ee55de4906a3a99d30070d81f73637f3972a6e0c44eb7ab2461c024c684" => :sierra sha256 "8dc6fd49cf72dfa69f677eb1cfd7850f781271c35e4adbacdac00bf918ce6fec" => :el_capitan sha256 "cb1076cd985679e6d9d093f4887c95bc7f0eb046c2799ec5000611703f428d47" => :yosemite + sha256 "b4437e9cc54b1c8861dd43342e8726fc5a346d3ce1070aba8d72ec2eaf3deed3" => :x86_64_linux # glibc 2.19 end uses_from_macos "ncurses" diff --git a/Formula/zoxide.rb b/Formula/zoxide.rb index cd6c1ad7b2bf7..795ab35289829 100644 --- a/Formula/zoxide.rb +++ b/Formula/zoxide.rb @@ -9,6 +9,7 @@ class Zoxide < Formula sha256 "43b553c24f7ddf1eb33d85e11f4f1e3b8a015ebba506ecfb75c3a16b552f5e39" => :catalina sha256 "54ee00b69344542773764efa58bf4a970f1aab9ab3a2397172987b7ee904ff6b" => :mojave sha256 "645673cbcbbbc41f8255c0e70772821e702a324ac996c773b6df235a15a0e975" => :high_sierra + sha256 "65a3be688e4da2be0485eb43dcd343140dfc394598bf2b901e6077f0bffc65e7" => :x86_64_linux end depends_on "rust" => :build diff --git a/Formula/zpaq.rb b/Formula/zpaq.rb index b684e838cf812..da3c00007b051 100644 --- a/Formula/zpaq.rb +++ b/Formula/zpaq.rb @@ -14,6 +14,7 @@ class Zpaq < Formula sha256 "63f132c8cbff5b22daddc07289837ad710c4af7785fa36351a498cc99e77c6ec" => :sierra sha256 "beafa9e6d0ba28368a77d9ddcbaf3b04a3f02716f08eb4b2a345745c45fcf9d2" => :el_capitan sha256 "de09d5f93f86f77372ea01b40f23481bc3e6cd33b9b2ac67736c85167a760dbb" => :yosemite + sha256 "1906f46aa3da466758d340d37e4ac5cb34aecf5667ee8a874243027054e52ab6" => :x86_64_linux # glibc 2.19 end resource "test" do diff --git a/Formula/zrepl.rb b/Formula/zrepl.rb index 52fcb212e8984..c2b598d522259 100644 --- a/Formula/zrepl.rb +++ b/Formula/zrepl.rb @@ -10,6 +10,7 @@ class Zrepl < Formula sha256 "089ca444325890a214face9ea6de0cfc7de1a931ce126e4253f0c390c814fd67" => :catalina sha256 "0907d294ed2efe16891751914c03f869940b0c640e82ae11b882d50a60352dab" => :mojave sha256 "d480d224d1cfd259622de17f60d7f619f439e9cf37337a0a136fba827daa36d2" => :high_sierra + sha256 "8c7273b0fb858c58adb42612ebb115e027fcbf1cae9856c1169ca571cb4deb00" => :x86_64_linux end depends_on "dep" => :build @@ -25,8 +26,9 @@ def install gopath = buildpath/"gopath" (gopath/"src/github.com/zrepl/zrepl").install contents + os = OS.mac? ? "darwin" : "linux" ENV["GOPATH"] = gopath - ENV["GOOS"] = "darwin" + ENV["GOOS"] = os ENV["GOARCH"] = "amd64" ENV.prepend_create_path "PATH", gopath/"bin" @@ -37,7 +39,7 @@ def install system "go", "build", "-o", "'$GOPATH/bin/goimports'", "golang.org/x/tools/cmd/goimports" system "go", "build", "-o", "'$GOPATH/bin/golangci-lint'", "github.com/golangci/golangci-lint/cmd/golangci-lint" system "make", "ZREPL_VERSION=#{version}" - bin.install "artifacts/zrepl-darwin-amd64" => "zrepl" + bin.install "artifacts/zrepl-#{os}-amd64" => "zrepl" end end diff --git a/Formula/zsh-syntax-highlighting.rb b/Formula/zsh-syntax-highlighting.rb index 2cd08032d3140..43eea763bce22 100644 --- a/Formula/zsh-syntax-highlighting.rb +++ b/Formula/zsh-syntax-highlighting.rb @@ -11,6 +11,7 @@ class ZshSyntaxHighlighting < Formula sha256 "6b7d4cdc41b56c842a4b76f9901d922d1f39bd638e94249881078a873de8970b" => :catalina sha256 "6b7d4cdc41b56c842a4b76f9901d922d1f39bd638e94249881078a873de8970b" => :mojave sha256 "6b7d4cdc41b56c842a4b76f9901d922d1f39bd638e94249881078a873de8970b" => :high_sierra + sha256 "52323c91da50503c802baba48b0dd2c1e515322ce3269c11cc4cfe3b4af0205a" => :x86_64_linux end uses_from_macos "zsh" diff --git a/Formula/zsh.rb b/Formula/zsh.rb index 7ea7b9a85e754..daa36cdfd9c3e 100644 --- a/Formula/zsh.rb +++ b/Formula/zsh.rb @@ -9,6 +9,7 @@ class Zsh < Formula sha256 "209d04a4d62f6162f1b6cf824d2c50b00b52cb812c04c1967e5b376573b5aef0" => :catalina sha256 "c5c35657637c97132efbaa0fd8e2add568aaa62adfe66e7d19f961f8e9506da9" => :mojave sha256 "029b8c6922f01bfd832dd0f4f940f99328d2495714c37c1dc7ef326d6fb1459e" => :high_sierra + sha256 "76c6f1720e6253f9a9bb7549dfd52d9f95b402d640a859230da95b9a2c06322f" => :x86_64_linux end head do @@ -19,6 +20,8 @@ class Zsh < Formula depends_on "ncurses" depends_on "pcre" + uses_from_macos "texinfo" + resource "htmldoc" do url "https://downloads.sourceforge.net/project/zsh/zsh-doc/5.8/zsh-5.8-doc.tar.xz" mirror "https://www.zsh.org/pub/zsh-5.8-doc.tar.xz" diff --git a/Formula/zshdb.rb b/Formula/zshdb.rb index 1eb91cb9449e0..e79eaee4e4ec8 100644 --- a/Formula/zshdb.rb +++ b/Formula/zshdb.rb @@ -9,6 +9,7 @@ class Zshdb < Formula sha256 "2bdc583e95b4d4bd92624d48ce804561e3a337792dbba74f451a2507eb939704" => :catalina sha256 "2bdc583e95b4d4bd92624d48ce804561e3a337792dbba74f451a2507eb939704" => :mojave sha256 "2bdc583e95b4d4bd92624d48ce804561e3a337792dbba74f451a2507eb939704" => :high_sierra + sha256 "1b06a6809102e0aab55818cf467f41564ee3c98254defa1080343730a1be2f64" => :x86_64_linux end head do diff --git a/Formula/zssh.rb b/Formula/zssh.rb index 3aab0121ba37a..6d1f65703f619 100644 --- a/Formula/zssh.rb +++ b/Formula/zssh.rb @@ -13,9 +13,14 @@ class Zssh < Formula sha256 "04212f19c1d9a6b97fd56ffe937606f1779849fdf04b93e3f285889599845c8f" => :el_capitan sha256 "94280569f9e1c1deb9d8c3be4256cd501399fd51758f8e2ea6d77fd9f1b6ef2e" => :yosemite sha256 "94b16bb29616a839134527fd869ac40a8fb5fa88b0048d1a93a828e306c2a270" => :mavericks + sha256 "4a4148c0f7cd9a073155ccc89dd34914d8dc2d0901d3dbe0b889dba2ec9be725" => :x86_64_linux end depends_on "lrzsz" + unless OS.mac? + depends_on "pkg-config" => :build + depends_on "readline" + end on_linux do depends_on "pkg-config" => :build diff --git a/Formula/zstd.rb b/Formula/zstd.rb index 378e1809a0d03..8a5ebd7ebb826 100644 --- a/Formula/zstd.rb +++ b/Formula/zstd.rb @@ -9,6 +9,7 @@ class Zstd < Formula sha256 "2375c206a934090c4ba53362d038e4e191d8dd09eec734e8e72106089aa24e9d" => :catalina sha256 "86b04bfd318315486d772b29d30b361e734a74269ae48805eeb3eae1d562b984" => :mojave sha256 "61de5a45183f4d029c66024d645ad44b0a625d58f9f583b47af42346a7c90fe5" => :high_sierra + sha256 "3b6354ada22830f32dd0ed5a6c0cc6f1e1c8de50833db6004c58874533495df7" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/zsync.rb b/Formula/zsync.rb index 9ac86eb31c11c..54cf9a71143e8 100644 --- a/Formula/zsync.rb +++ b/Formula/zsync.rb @@ -13,6 +13,7 @@ class Zsync < Formula sha256 "9bbe0e102ca6a2b7ca57af6b2b29984f7da59ce97d15ce550bbbb206f1ad1815" => :el_capitan sha256 "b7436466e25e1fe44e2169059d613d9df279a69c31183f6cacce953fc6a47e8b" => :yosemite sha256 "c44baf1fc7c83e88bb255307121de1546a0b89d43048e6c0f951648a649bc5fd" => :mavericks + sha256 "983ed095e81a7ec30832439b9d20bcfc5499b90519eb16a1d68c58833143d0c4" => :x86_64_linux end def install diff --git a/Formula/zydis.rb b/Formula/zydis.rb index 2455199754905..a0478979636a0 100644 --- a/Formula/zydis.rb +++ b/Formula/zydis.rb @@ -12,6 +12,7 @@ class Zydis < Formula sha256 "ceffe3459006c374498e06809f8d75e9f512d5a43482d9b4d3973bbe4b2e3944" => :catalina sha256 "a51c744f89ed204c66e0699a960a3c58625a5f46f16f3710e68a4746bbc0fb7e" => :mojave sha256 "cefab7b097b79ae4c04616c235e572ffc5416296eba2a10bd7b07c6f18148313" => :high_sierra + sha256 "2ffa4cbf754f8020fbbcdbee5bc6ea0cd8431d78a3cc4ac0dd40571cfa8f614b" => :x86_64_linux end depends_on "cmake" => :build diff --git a/Formula/zyre.rb b/Formula/zyre.rb index 98d9de6f86fd0..33e0d4c692aba 100644 --- a/Formula/zyre.rb +++ b/Formula/zyre.rb @@ -12,6 +12,7 @@ class Zyre < Formula sha256 "f8f694368da98cd4781d43b1e4e18db94584ce1f8508b41d492d81194a15db3c" => :sierra sha256 "1402b11567fa689064366bf9f8fe9527dba8dfe9246e35b02130a344aa879a9b" => :el_capitan sha256 "1170a594d0eff7a57df26150d92daa37382ca6469d320e84957afb184560f691" => :yosemite + sha256 "be276eafd22a83b0ab53e0a95a2aaf8d56eba9635bec3e782789183b39f8e1e6" => :x86_64_linux end head do diff --git a/Formula/zzuf.rb b/Formula/zzuf.rb index 3cbc4e0bb16f6..a180d9e53bf6c 100644 --- a/Formula/zzuf.rb +++ b/Formula/zzuf.rb @@ -12,6 +12,7 @@ class Zzuf < Formula sha256 "5f0c55658fba6bbf225b6001b5be75c38f7a375322bd4b23944f3c7239dae0c7" => :el_capitan sha256 "7f260ec41af74aa8b99df4a89f202382c72067e34b4bb3ac0a0e3fb0be6f8ed0" => :yosemite sha256 "52460ee4dcac540298fa8f0e07225bc01d5592fd4ff558f1cfd129b329e87639" => :mavericks + sha256 "14f788951bf8b41b14c86f63df9901dba3b9794d8bb0dff1180f8e92fac52f76" => :x86_64_linux end head do diff --git a/Formula/zzz.rb b/Formula/zzz.rb index 0d7c0f5b18fcf..4cd246565688e 100644 --- a/Formula/zzz.rb +++ b/Formula/zzz.rb @@ -7,6 +7,8 @@ class Zzz < Formula bottle :unneeded + depends_on :macos + # No test is possible: this has no --help or --version, it just # sleeps the Mac instantly. def install diff --git a/README.md b/README.md index e0c045583a3e6..e602da9e89acf 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,6 @@ -# Homebrew Core - +# Linuxbrew Core Core formulae for the Homebrew package manager. -Core formulae for the Linuxbrew package manager (Homebrew on Linux or Windows 10 Subsystem for Linux) are in [Homebrew/linuxbrew-core](https://github.com/Homebrew/linuxbrew-core). - [![Join us on https://discourse.brew.sh](https://img.shields.io/badge/Discourse-forum-blue.svg)](https://discourse.brew.sh) ## How do I install these formulae?