Commit 98fb942a authored by Razvan Maries's avatar Razvan Maries
Browse files

Backed out changeset 70e72871917e (bug 1576659) for Linux x64 debug build bustages. CLOSED TREE

parent 40a8a07d

build/build-infer/build-infer.py

+2 −17
Original line number Diff line number Diff line
@@ -107,26 +107,11 @@ if __name__ == '__main__': 
        run_in(source_dir, ['git']+command)

    for p in config.get('patches', []):

        run_in(source_dir, ['git', 'apply', os.path.join(dir_path, p)])

    # configure opam

    run_in(source_dir, ['opam', 'init', '--no-setup', '--disable-sandboxing'])

    # build infer

    run_in(source_dir, ['./build-infer.sh', 'java'],

           extra_env={'NO_CMAKE_STRIP': '1'})



    package_name = 'infer'

    infer_package = os.path.join(os.getcwd(), package_name)

    # We need to create a package with all of the depended libraries injected in it

    run_in(source_dir, ['make', 'install-with-libs', 'BUILD_MODE=opt',

                        'PATCHELF=patchelf', 'DESTDIR={}'.format(infer_package),

                        'libdir_relative_to_bindir=../lib'])





    infer_package_with_pref = os.path.join(infer_package, 'usr')

    if not args.skip_tar:

        os.rename(os.path.join(infer_package_with_pref, 'local'),

                  os.path.join(infer_package_with_pref, 'infer'))

        build_tar_package('tar', '%s.tar.xz' % (package_name),

                          infer_package_with_pref,

                          [os.path.join('infer', 'bin'),

                           os.path.join('infer', 'lib'),

                           os.path.join('infer', 'share')])
 
                          source_dir, [os.path.join('infer', 'bin'),

                                       os.path.join('infer', 'lib')])

build/build-infer/infer-linux64.json

+1 −1
Original line number Diff line number Diff line 
{

    "infer_repo": "https://github.com/facebook/infer",

    "infer_revision": "99464c01da5809e7159ed1a75ef10f60d34506a4",

    "infer_revision": "14aa1edbf532675f48ba0a35a2e55d07b79b1f3c",

    "patches": []

}

taskcluster/ci/docker-image/kind.yml

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ jobs: 
            - deb10-python-zstandard

    static-analysis-build:

        symbol: I(static-analysis-build)

        parent: debian9-base

        parent: android-build

    mingw32-build:

        symbol: I(mingw)

        parent: debian9-base

taskcluster/docker/static-analysis-build/Dockerfile

+2 −8
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ RUN apt-get update && \ 
      cmake \

      flex \

      curl \

      opam \

      libsqlite3-dev \

      file \

      gawk \
@@ -28,7 +29,6 @@ RUN apt-get update && \ 
      gnupg \

      jq \

      libc6-dev \

      libmpfr-dev \

      nasm \

      openjdk-8-jdk-headless \

      pkg-config \
@@ -55,16 +55,10 @@ RUN apt-get update && \ 
      libfontconfig1-dev \

      libfreetype6-dev \

      libgconf2-dev \

      libgmp-dev \

      libgtk-3-dev \

      libgtk2.0-dev \

      libpango1.0-dev \

      libpulse-dev \

      libx11-xcb-dev \

      libxt-dev \

      lib32z1 \

      patchelf



# Install opam 2

RUN curl -sL https://github.com/ocaml/opam/releases/download/2.0.3/opam-2.0.3-x86_64-linux > /usr/bin/opam && \

    chmod +x /usr/bin/opam
 
      lib32z1