From 0f505d219b18486117161b94ba624b66f435c62b Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 4 Jul 2022 14:53:20 -0400 Subject: [PATCH] jjb: babeltrace: cleanup yaml job definition Replace duplications with yaml anchors, replace deprecated Warnings plugin with Warnings-NG, cleanup unused portions of build scripts. Change-Id: I35227bbe624726975a0f9008ec225aa67151a18a Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 514 ++++++++++++++++-------------------- scripts/babeltrace/build.sh | 84 +----- 2 files changed, 239 insertions(+), 359 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 5583b06..c7b0c66 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -15,15 +15,15 @@ project-type: freestyle wrappers: - - ansicolor - - timeout: + - ansicolor: &babeltrace_wrapper_ansicolor_defaults + colormap: xterm + - timeout: &babeltrace_wrapper_timeout_defaults timeout: 20 fail: true type: no-activity + write-description: "

This build failed due to timeout.

" - timestamps - - workspace-cleanup: - clean-if: - - failure: false + - workspace-cleanup scm: - git: @@ -50,61 +50,52 @@ ## Anchors -- babeltrace_build_axes_defaults: &babeltrace_build_axes_defaults - name: 'babeltrace_build_axes_defaults' +- babeltrace_matrix_axes_defaults: &babeltrace_matrix_axes_defaults + name: 'babeltrace_matrix_axes_defaults' project-type: matrix node: 'master' # Applies only to matrix flyweight task + execution-strategy: + combination-filter: '{filter}' + touchstone: + expr: '{touchstone}' + result: unstable axes: - - axis: + - axis: &babeltrace_build_axis_arch type: slave name: arch - values: '{obj:arch}' - - axis: + values: '{obj:archs}' + - axis: &babeltrace_build_axis_conf type: user-defined name: conf - values: '{obj:conf}' - - axis: + values: '{obj:confs}' + - axis: &babeltrace_build_axis_build type: user-defined name: build - values: '{obj:build}' + values: '{obj:builds}' + +- babeltrace_matrix_axes_cc: &babeltrace_matrix_axes_cc + name: 'babeltrace_matrix_axes_cc' + + <<: *babeltrace_matrix_axes_defaults -- babeltrace_build_axes_cc: &babeltrace_build_axes_cc - name: 'babeltrace_build_axes_cc' - project-type: matrix - node: 'master' # Applies only to matrix flyweight task axes: - - axis: - type: slave - name: arch - values: '{obj:arch}' - - axis: - type: user-defined - name: conf - values: '{obj:conf}' - - axis: - type: user-defined - name: build - values: '{obj:build}' - - axis: + - axis: *babeltrace_build_axis_arch + - axis: *babeltrace_build_axis_conf + - axis: *babeltrace_build_axis_build + - axis: &babeltrace_build_axis_cc type: user-defined name: cc - values: '{obj:cc}' + values: '{obj:ccs}' -- babeltrace_build_builders_defaults: &babeltrace_build_builders_defaults - name: 'babeltrace_build_builders_defaults' - builders: - - shell: - !include-raw-escape: - - scripts/common/print.sh - - scripts/babeltrace/build.sh - -- babeltrace_build_builders_win: &babeltrace_build_builders_win - name: 'babeltrace_build_builders_win' +- babeltrace_builders_defaults: &babeltrace_builders_defaults + name: 'babeltrace_builders_defaults' builders: + !j2-yaml: | + {% if buildtype is defined and buildtype == 'winbuild' %} - conditional-step: condition-kind: strings-match on-evaluation-failure: run - condition-string1: '${{arch}}' + condition-string1: {{ '${{arch}}' }} condition-string2: 'cygwin64' steps: - shell: @@ -116,7 +107,7 @@ - conditional-step: condition-kind: strings-match on-evaluation-failure: run - condition-string1: '${{arch}}' + condition-string1: {{ '${{arch}}' }} condition-string2: 'msys2-mingw32' steps: - inject: @@ -130,7 +121,7 @@ - conditional-step: condition-kind: strings-match on-evaluation-failure: run - condition-string1: '${{arch}}' + condition-string1: {{ '${{arch}}' }} condition-string2: 'msys2-mingw64' steps: - inject: @@ -141,10 +132,16 @@ - scripts/common/cygpath-prefix - scripts/common/print.sh - scripts/babeltrace/build.sh + {% else %} + - shell: + !include-raw-escape: + - scripts/common/print.sh + - scripts/babeltrace/build.sh + {% endif %} # Use - in version number since yaml anchor do not support dot -- babeltrace_build_builders_glib-2-28-6: &babeltrace_build_builders_glib-2-28-6 - name: 'babeltrace_build_builders_glib-2-28-6' +- babeltrace_builders_glib-2-28-6: &babeltrace_builders_glib-2-28-6 + name: 'babeltrace_builders_glib-2-28-6' builders: - inject: properties-content: | @@ -166,27 +163,69 @@ - scripts/common/print.sh - scripts/babeltrace/build.sh -- babeltrace_build_publishers_defaults: &babeltrace_build_publishers_defaults - name: 'babeltrace_build_publishers_defaults' +- babeltrace_publishers_defaults: &babeltrace_publishers_defaults + name: 'babeltrace_publishers_defaults' publishers: - - tap: + - tap: &babeltrace_publisher_tap_defaults results: 'tap/**/*.log' fail-if-no-results: true failed-tests-mark-build-as-failure: true todo-is-failure: false - - warnings: - console-log-parsers: - - 'GNU Make + GNU C Compiler (gcc)' - total-thresholds: - unstable: - total-all: 0 - total-high: 0 - total-normal: 0 - total-low: 0 - - archive: + - raw: &babeltrace_publisher_warnings-ng_defaults + xml: | + + + + + + + + + false + + + + + + + + false + + + + + + false + true + false + 0 + 0 + + LOW + + + true + true + false + true + false + + + 1 + TOTAL + WARNING + + + AGGREGATION_TOOLS + + + - archive: &babeltrace_publisher_archive_defaults artifacts: 'build/**,tap/**' allow-empty: false - - email-ext: + - workspace-cleanup: &babeltrace_publisher_workspace-cleanup_defaults + clean-if: + - failure: false + - email-ext: &babeltrace_publisher_email-ext_defaults recipients: '{obj:email_to}' reply-to: ci-notification@lists.lttng.org always: false @@ -212,58 +251,29 @@ - babeltrace_build_publishers_gerrit: &babeltrace_build_publishers_gerrit name: 'babeltrace_build_publishers_gerrit' publishers: - - tap: - results: 'tap/**/*.log' - fail-if-no-results: true - failed-tests-mark-build-as-failure: true - todo-is-failure: false - - warnings: - console-log-parsers: - - 'GNU Make + GNU C Compiler (gcc)' - total-thresholds: - failed: - total-all: 0 - total-high: 0 - total-normal: 0 - total-low: 0 - - archive: - artifacts: 'build/**,tap/**' - allow-empty: false + - tap: *babeltrace_publisher_tap_defaults + - raw: *babeltrace_publisher_warnings-ng_defaults + - archive: *babeltrace_publisher_archive_defaults + - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults -## Templates - -- job-template: - name: babeltrace_{version}_{buildtype} - defaults: babeltrace - - <<: *babeltrace_build_axes_defaults - <<: *babeltrace_build_builders_defaults - <<: *babeltrace_build_publishers_defaults +## Job Templates - job-template: name: '{job_prefix}babeltrace_{version}_{buildtype}' defaults: babeltrace - <<: *babeltrace_build_axes_defaults - <<: *babeltrace_build_builders_defaults - <<: *babeltrace_build_publishers_defaults + <<: *babeltrace_matrix_axes_defaults + <<: *babeltrace_builders_defaults + <<: *babeltrace_publishers_defaults - job-template: name: babeltrace_{version}_{cctype} defaults: babeltrace - <<: *babeltrace_build_axes_cc - <<: *babeltrace_build_builders_defaults - <<: *babeltrace_build_publishers_defaults - -- job-template: - name: babeltrace_{version}_winbuild - defaults: babeltrace - - <<: *babeltrace_build_axes_defaults - <<: *babeltrace_build_builders_win - <<: *babeltrace_build_publishers_defaults + <<: *babeltrace_matrix_axes_cc + <<: *babeltrace_builders_defaults + <<: *babeltrace_publishers_defaults - job-template: name: dev_gerrit_babeltrace_{buildtype} @@ -292,28 +302,6 @@ - branch-compare-type: 'ANT' branch-pattern: '**' - project-type: matrix - node: 'master' # Applies only to matrix flyweight task - execution-strategy: - combination-filter: | - {filter} - axes: - - axis: - type: slave - name: arch - values: '{obj:arch}' - - axis: - type: user-defined - name: conf - values: '{obj:conf}' - - axis: - type: user-defined - name: build - values: '{obj:build}' - - <<: *babeltrace_build_builders_defaults - <<: *babeltrace_build_publishers_gerrit - properties: - inject: properties-content: | @@ -325,46 +313,8 @@ categories: - 'gerrit-{buildtype}' -- job-template: - name: dev_gerrit_babeltrace_winbuild - defaults: babeltrace - concurrent: true - - scm: - - git: - url: https://review.lttng.org/babeltrace - refspec: 'refs/changes/*:refs/changes/*' - branches: - - '$GERRIT_REFSPEC' - basedir: src/babeltrace - skip-tag: true - - triggers: - - gerrit: - trigger-on: - - comment-added-event: - approval-category: 'CI-Build' - approval-value: 1 - projects: - - project-compare-type: 'PLAIN' - project-pattern: 'babeltrace' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**' - - properties: - - inject: - properties-content: | - PROJECT_NAME=babeltrace - - build-discarder: - days-to-keep: 1 - - throttle: - option: 'category' - categories: - - 'gerrit-winbuild' - - <<: *babeltrace_build_axes_defaults - <<: *babeltrace_build_builders_win + <<: *babeltrace_matrix_axes_defaults + <<: *babeltrace_builders_defaults <<: *babeltrace_build_publishers_gerrit - job-template: @@ -391,23 +341,9 @@ !include-raw-escape: scripts/babeltrace/release.sh publishers: - - tap: - results: 'tap/**/*.log' - fail-if-no-results: true - failed-tests-mark-build-as-failure: true - todo-is-failure: false - - warnings: - console-log-parsers: - - 'GNU Make + GNU C Compiler (gcc)' - total-thresholds: - unstable: - total-all: 0 - total-high: 0 - total-normal: 0 - total-low: 0 - - workspace-cleanup: - clean-if: - - failure: false + - tap: *babeltrace_publisher_tap_defaults + - raw: *babeltrace_publisher_warnings-ng_defaults + - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults - archive: artifacts: 'out/**,tap/**' allow-empty: false @@ -466,6 +402,7 @@ cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/babeltrace 2> cppcheck-result.xml publishers: + - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults - archive: artifacts: 'cppcheck-result.xml' allow-empty: false @@ -486,6 +423,7 @@ !include-raw-escape: scripts/common/scan-build.sh publishers: + - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults - html-publisher: name: 'HTML Report' dir: 'scan-build-archive/' @@ -501,21 +439,22 @@ cron: "@daily" wrappers: - - workspace-cleanup + - ansicolor: *babeltrace_wrapper_ansicolor_defaults + - timeout: *babeltrace_wrapper_timeout_defaults - timestamps - - ansicolor: - colormap: xterm + - workspace-cleanup - credentials-binding: - username-password-separated: credential-id: babeltrace_coverity_token username: COVERITY_SCAN_PROJECT_NAME password: COVERITY_SCAN_TOKEN + builders: - shell: !include-raw-escape: scripts/common/coverity.sh publishers: - - workspace-cleanup + - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults - archive: artifacts: 'analysis-results.tgz,cov-int/**' allow-empty: false @@ -534,46 +473,19 @@ !include-raw-escape: scripts/babeltrace/pylint.sh publishers: + - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults - archive: artifacts: 'black.out,flake8.out' - - email-ext: - recipients: '{obj:email_to}' - reply-to: ci-notification@lists.lttng.org - always: false - unstable: false - first-failure: true - first-unstable: true - not-built: false - aborted: false - regression: false - failure: false - second-failure: false - improvement: false - still-failing: false - success: false - fixed: false - fixed-unhealthy: true - still-unstable: false - pre-build: false - matrix-trigger: only-parent - send-to: - - recipients - -- job-template: - name: babeltrace_{version}_glib-2.28.6 - defaults: babeltrace - node: 'amd64' - - <<: *babeltrace_build_builders_glib-2-28-6 - <<: *babeltrace_build_publishers_defaults + allow-empty: false + - email-ext: *babeltrace_publisher_email-ext_defaults - job-template: name: '{job_prefix}babeltrace_{version}_glib-2.28.6' defaults: babeltrace node: 'amd64' - <<: *babeltrace_build_builders_glib-2-28-6 - <<: *babeltrace_build_publishers_defaults + <<: *babeltrace_builders_glib-2-28-6 + <<: *babeltrace_publishers_defaults ## Views @@ -594,46 +506,63 @@ - stable-2.0 - master jobs: - - 'babeltrace_{version}_{buildtype}': + - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: build - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist, oot-dist] - conf: !!python/tuple [std, static, prod, min] - - 'babeltrace_{version}_{buildtype}': + archs: !!python/tuple [amd64] + builds: !!python/tuple [std, oot, dist, oot-dist] + confs: !!python/tuple [std, static, prod, min] + filter: '' + touchstone: '(build == "std") && (conf == "std")' + - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: portbuild - arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] - build: !!python/tuple [std] - conf: !!python/tuple [std, prod] - - 'babeltrace_{version}_{buildtype}': + archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + builds: !!python/tuple [std] + confs: !!python/tuple [std, prod] + filter: '' + touchstone: '(build == "std") && (conf == "std") && (arch == "i386")' + - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: slesbuild - arch: !!python/tuple [sles12sp5] - build: !!python/tuple [std] - conf: !!python/tuple [std, prod] - - 'babeltrace_{version}_{buildtype}': + archs: !!python/tuple [sles12sp5] + builds: !!python/tuple [std] + confs: !!python/tuple [std, prod] + filter: '' + touchstone: '' + - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: elbuild - arch: !!python/tuple [el8] - build: !!python/tuple [std] - conf: !!python/tuple [std, prod] - - 'babeltrace_{version}_{buildtype}': + archs: !!python/tuple [el8] + builds: !!python/tuple [std] + confs: !!python/tuple [std, prod] + filter: '' + touchstone: '' + - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: macosbuild - arch: !!python/tuple [macos-amd64, macos-arm64] - build: !!python/tuple [std] - conf: !!python/tuple [std, prod] - - 'babeltrace_{version}_{buildtype}': + archs: !!python/tuple [macos-amd64, macos-arm64] + builds: !!python/tuple [std] + confs: !!python/tuple [std, prod] + filter: '' + touchstone: '' + - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: freebsdbuild - arch: !!python/tuple [freebsd] - build: !!python/tuple [std] - conf: !!python/tuple [std, prod] + archs: !!python/tuple [freebsd] + builds: !!python/tuple [std] + confs: !!python/tuple [std, prod] + filter: '' + touchstone: '' + - '{job_prefix}babeltrace_{version}_{buildtype}': + buildtype: winbuild + archs: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64] + builds: !!python/tuple [std] + confs: !!python/tuple [std] + filter: '' + touchstone: '' - 'babeltrace_{version}_{cctype}': cctype: clangbuild - arch: !!python/tuple [amd64] - build: !!python/tuple [std] - conf: !!python/tuple [std, static, prod] - cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] - - 'babeltrace_{version}_winbuild': - arch: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64] - build: !!python/tuple [std] - conf: !!python/tuple [std] + archs: !!python/tuple [amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [std, static, prod] + ccs: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] + filter: '' + touchstone: '' - 'babeltrace_{version}_release': version: v2.0 - 'babeltrace_{version}_cppcheck' @@ -641,7 +570,7 @@ - 'babeltrace_{version}_pylint' - 'babeltrace_{version}_coverity': version: master - - 'babeltrace_{version}_glib-2.28.6': + - '{job_prefix}babeltrace_{version}_glib-2.28.6': version: master - project: @@ -652,20 +581,25 @@ jobs: - 'dev_gerrit_babeltrace_{buildtype}': buildtype: build - arch: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386] - build: !!python/tuple [std, oot, dist, oot-dist] - conf: !!python/tuple [std, static, prod, min] + archs: !!python/tuple [amd64, armhf, arm64, powerpc, ppc64el, i386] + builds: !!python/tuple [std, oot, dist, oot-dist] + confs: !!python/tuple [std, static, prod, min] filter: '(build=="std" && conf=="std") || (arch=="amd64")' + touchstone: '' - 'dev_gerrit_babeltrace_{buildtype}': buildtype: macosbuild - arch: !!python/tuple [macos-amd64, macos-arm64] - build: !!python/tuple [std] - conf: !!python/tuple [std, prod] + archs: !!python/tuple [macos-amd64, macos-arm64] + builds: !!python/tuple [std] + confs: !!python/tuple [std, prod] filter: '' - - 'dev_gerrit_babeltrace_winbuild': - arch: !!python/tuple [cygwin64, msys2-mingw64] - build: !!python/tuple [std] - conf: !!python/tuple [std] + touchstone: '' + - 'dev_gerrit_babeltrace_{buildtype}': + buildtype: winbuild + archs: !!python/tuple [cygwin64, msys2-mingw64] + builds: !!python/tuple [std] + confs: !!python/tuple [std] + filter: '' + touchstone: '' - 'dev_gerrit_babeltrace_pylint' @@ -680,24 +614,32 @@ jobs: - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: build - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist, oot-dist] - conf: !!python/tuple [std, static, python-bindings] + archs: !!python/tuple [amd64] + builds: !!python/tuple [std, oot, dist, oot-dist] + confs: !!python/tuple [std, static, python-bindings] + filter: '' + touchstone: '(build == "std") && (conf == "std")' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: portbuild - arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] - build: !!python/tuple [std] - conf: !!python/tuple [std, python-bindings] + archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + builds: !!python/tuple [std] + confs: !!python/tuple [std, python-bindings] + filter: '' + touchstone: '(build == "std") && (conf == "std") && (arch == "i386")' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: slesbuild - arch: !!python/tuple [sles12sp5] - build: !!python/tuple [std] - conf: !!python/tuple [std] + archs: !!python/tuple [sles12sp5] + builds: !!python/tuple [std] + confs: !!python/tuple [std] + filter: '' + touchstone: '' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: elbuild - arch: !!python/tuple [el8] - build: !!python/tuple [std] - conf: !!python/tuple [std] + archs: !!python/tuple [el8] + builds: !!python/tuple [std] + confs: !!python/tuple [std] + filter: '' + touchstone: '' - project: @@ -711,14 +653,18 @@ jobs: - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: build - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist, oot-dist] - conf: !!python/tuple [std, static, python-bindings] + archs: !!python/tuple [amd64] + builds: !!python/tuple [std, oot, dist, oot-dist] + confs: !!python/tuple [std, static, python-bindings] + filter: '' + touchstone: '' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: macosbuild - arch: !!python/tuple [macos-amd64, macos-arm64] - build: !!python/tuple [std] - conf: !!python/tuple [std] + archs: !!python/tuple [macos-amd64, macos-arm64] + builds: !!python/tuple [std] + confs: !!python/tuple [std] + filter: '' + touchstone: '' - project: @@ -736,14 +682,18 @@ - master-staging - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: build - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist, oot-dist] - conf: !!python/tuple [std, static, prod, min] + archs: !!python/tuple [amd64] + builds: !!python/tuple [std, oot, dist, oot-dist] + confs: !!python/tuple [std, static, prod, min] + filter: '' + touchstone: '' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: macosbuild - arch: !!python/tuple [macos-amd64, macos-arm64] - build: !!python/tuple [std] - conf: !!python/tuple [std, prod] + archs: !!python/tuple [macos-amd64, macos-arm64] + builds: !!python/tuple [std] + confs: !!python/tuple [std, prod] + filter: '' + touchstone: '' - project: name: babeltrace-views diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 37a593a..e71f4cc 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -108,49 +108,17 @@ gcc) export CC=gcc export CXX=g++ ;; -gcc-4.8) - export CC=gcc-4.8 - export CXX=g++-4.8 - ;; -gcc-5) - export CC=gcc-5 - export CXX=g++-5 - ;; -gcc-6) - export CC=gcc-6 - export CXX=g++-6 - ;; -gcc-7) - export CC=gcc-7 - export CXX=g++-7 - ;; -gcc-8) - export CC=gcc-8 - export CXX=g++-8 +gcc-*) + export CC=gcc-${cc#gcc-} + export CXX=g++-${cc#gcc-} ;; clang) export CC=clang export CXX=clang++ ;; -clang-3.9) - export CC=clang-3.9 - export CXX=clang++-3.9 - ;; -clang-4.0) - export CC=clang-4.0 - export CXX=clang++-4.0 - ;; -clang-5.0) - export CC=clang-5.0 - export CXX=clang++-5.0 - ;; -clang-6.0) - export CC=clang-6.0 - export CXX=clang++-6.0 - ;; -clang-7) - export CC=clang-7 - export CXX=clang++-7 +clang-*) + export CC=clang-${cc#clang-} + export CXX=clang++-${cc#clang-} ;; *) if [ "x$cc" != "x" ]; then @@ -166,30 +134,6 @@ fi # Set platform variables case "$arch" in -sol10-i386) - export MAKE=gmake - export TAR=gtar - export NPROC=gnproc - export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH" - export CPPFLAGS="-I/opt/csw/include" - export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib" - export PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig" - export PYTHON="python3" - export PYTHON_CONFIG="python3-config" - ;; - -sol11-i386) - export MAKE=gmake - export TAR=gtar - export NPROC=nproc - export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin" - export LD_ALTEXEC=/usr/bin/gld - export LD=/usr/bin/gld - export PYTHON="python3" - export PYTHON_CONFIG="python3-config" - export PKG_CONFIG_PATH="/usr/lib/pkgconfig" - ;; - macos*) export MAKE=make export TAR=tar @@ -201,16 +145,7 @@ macos*) export PYTHON_CONFIG="python3.9-config" ;; -cygwin) - export MAKE=make - export TAR=tar - export NPROC=nproc - export PYTHON="python3" - export PYTHON_CONFIG="python3-config" - rebase_dll=1 - ;; - -freebsd) +freebsd*) export MAKE=gmake export TAR=tar export NPROC="getconf _NPROCESSORS_ONLN" @@ -386,11 +321,6 @@ esac # BUILD! $MAKE -j "$($NPROC)" V=1 -# Force rebase DLL address mapping -if [ "${rebase_dll:-}" == "1" ]; then - find . -name "*.dll" -print0 | xargs -0 rebase -O -v -fi - # Install in the workspace $MAKE install DESTDIR="$WORKSPACE" -- 2.34.1