build: fix compilation with meson 1.3.0

rizinorg · Nov 21, 2023 · d40f131 · d40f131
1 parent 94d7ccc
commit d40f131
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -69,7 +69,7 @@ install:
   - ps: $env:DIST_FOLDER = "rizin-$env:builder-$env:RZ_VERSION"
   - ps: $env:ARTIFACT_ZIP = "$env:DIST_FOLDER.zip"
   # Download required packages
-  - cmd: if defined BUILD_DIR ( %PYTHON%\python.exe -m pip install meson==1.2.3 ninja PyYAML)
+  - cmd: if defined BUILD_DIR ( %PYTHON%\python.exe -m pip install meson ninja PyYAML)
 
 # Build scripts
 build_script:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -186,7 +186,7 @@ jobs:
         run: sudo apt-get --assume-yes install python3-wheel python3-setuptools libcapstone4 libcapstone-dev
       - name: Install meson and ninja
         if: matrix.build_system == 'meson' && matrix.enabled
-        run: pip3 install --user meson==1.2.3 ninja PyYAML
+        run: pip3 install --user meson ninja PyYAML
       - name: Checkout rzpipe
         if: matrix.enabled
         uses: actions/checkout@v3
@@ -447,7 +447,7 @@ jobs:
       - name: Install python and other dependencies
         run: sudo apt-get install --yes python3-wheel python3-setuptools python3-pip
       - name: Install meson and ninja
-        run: sudo pip3 install meson==1.2.3 ninja PyYAML
+        run: sudo pip3 install meson ninja PyYAML
       - name: Install test dependencies
         run: |
           sudo pip3 install 'git+https://github.com/rizinorg/rz-pipe#egg=rzpipe&subdirectory=python'
@@ -499,7 +499,7 @@ jobs:
     timeout-minutes: 45
     steps:
       - name: Install meson and ninja
-        run: sudo pip3 install meson==1.2.3 ninja
+        run: sudo pip3 install meson ninja
       - name: Checkout rizin
         run: |
           git clone https://github.com/${{ github.repository }}
@@ -584,7 +584,7 @@ jobs:
       - name: Install python and other dependencies
         run: sudo apt-get --assume-yes install python3-wheel python3-setuptools python3-pip
       - name: Install meson and ninja
-        run: pip3 install --user meson==1.2.3 ninja PyYAML
+        run: pip3 install --user meson ninja PyYAML
       - uses: actions/checkout@v3
       - name: Extract rizin version
         run: echo "version=$(python sys/version.py)" >> $GITHUB_OUTPUT
@@ -611,7 +611,7 @@ jobs:
       - name: Install python and other dependencies
         run: sudo apt-get --assume-yes install python3-wheel python3-setuptools python3-pip
       - name: Install meson and ninja
-        run: sudo pip3 install meson==1.2.3 ninja PyYAML
+        run: sudo pip3 install meson ninja PyYAML
       - uses: actions/download-artifact@v3
         with:
           name: rizin-src.tar.xz
@@ -650,7 +650,7 @@ jobs:
       - name: Install pkg-config with Homebrew
         run: brew install pkg-config
       - name: Install meson and ninja
-        run: pip3 install meson==1.2.3 ninja PyYAML
+        run: pip3 install meson ninja PyYAML
       - name: Install ImageMagick
         run: brew install imagemagick
       - name: Create OSX package
@@ -720,7 +720,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
-        run: sudo apt-get --assume-yes install pax wget unzip python3-wheel python3-setuptools python3-pip && pip3 install --user meson==1.2.3 ninja
+        run: sudo apt-get --assume-yes install pax wget unzip python3-wheel python3-setuptools python3-pip && pip3 install --user meson ninja
       - name: Compile with meson
         run: |
           export PATH=${HOME}/.local/bin:${PATH}
@@ -747,7 +747,7 @@ jobs:
       - name: Install dependencies
         run: sudo apt-get --assume-yes install pax wget unzip python3-wheel python3-setuptools python3-pip
       - name: Install meson and ninja
-        run: sudo pip3 install meson==1.2.3 ninja PyYAML
+        run: sudo pip3 install meson ninja PyYAML
       - name: Compile & Install Rizin
         run: |
           export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}
@@ -773,7 +773,7 @@ jobs:
       - name: Install dependencies
         run: sudo apt-get --assume-yes install pax wget unzip python3-wheel python3-setuptools python3-pip
       - name: Install meson and ninja
-        run: sudo pip3 install meson==1.2.3 ninja PyYAML
+        run: sudo pip3 install meson ninja PyYAML
       - name: Compile & Install Rizin
         run: |
           export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}
@@ -803,7 +803,7 @@ jobs:
           mkdir rizin && pwd && ls -l
           tar -C rizin --strip-components=1 -xvf rizin-src.tar.xz
       - name: Install dependencies
-        run: sudo apt-get --assume-yes install wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson==1.2.3 ninja
+        run: sudo apt-get --assume-yes install wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson ninja
       - name: Install rizin
         run: |
           export PATH=$PATH:/usr/local/bin
@@ -832,7 +832,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt update
-          sudo apt-get --assume-yes install cmake swig pkg-config clang libclang-dev llvm wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson==1.2.3 ninja
+          sudo apt-get --assume-yes install cmake swig pkg-config clang libclang-dev llvm wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson ninja
       - name: Install rizin
         run: |
           export PATH=$PATH:/usr/local/bin
@@ -1004,7 +1004,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
-        run: sudo apt-get --assume-yes install python3-wheel python3-setuptools python3-pip && pip3 install --user meson==1.2.3
+        run: sudo apt-get --assume-yes install python3-wheel python3-setuptools python3-pip && pip3 install --user meson
       - name: Download subprojects
         run: |
           export PATH=${HOME}/.local/bin:${PATH}

diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Install meson and ninja
       run: |
-        sudo pip3 install meson==1.2.3 ninja PyYAML
+        sudo pip3 install meson ninja PyYAML
         export PATH=${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/.local/bin:${PATH}
 
     - name: Initialize CodeQL - cpp

diff --git a/.travis.yml b/.travis.yml
@@ -48,6 +48,6 @@ cache:
 script:
   - export PR_NAME=$(echo $TRAVIS_PULL_REQUEST_SLUG | cut -d'/' -f1)
   - |
-    pip3 install -U --user meson==1.2.3 ninja
+    pip3 install -U --user meson ninja
     pip3 install --user 'git+https://github.com/rizinorg/rz-pipe#egg=rzpipe&subdirectory=python'
     $SHELL travis-script
diff --git a/Dockerfile b/Dockerfile
@@ -66,7 +66,7 @@ RUN apt-get install -y --no-install-recommends \
 	${with_arm32_as:+binutils-arm-linux-gnueabi} \
 	${with_ppc_as:+binutils-powerpc64le-linux-gnu}
 
-RUN pip3 install meson==1.2.3
+RUN pip3 install meson
 
 # Build rizin in a volume to minimize space used by build
 COPY . /tmp/rizin/

diff --git a/subprojects/packagefiles/libzip-1.9.2/cmake-config.h.in b/subprojects/packagefiles/libzip-1.9.2/cmake-config.h.in
@@ -4,6 +4,7 @@
 #include "zipconf.h"
 #endif
 /* BEGIN DEFINES */
+// clang-format off
 #cmakedefine HAVE___PROGNAME
 #cmakedefine HAVE__CLOSE
 #cmakedefine HAVE__DUP
@@ -46,8 +47,8 @@
 #cmakedefine HAVE_STRINGS_H
 #cmakedefine HAVE_UNISTD_H
 #cmakedefine HAVE_WINDOWS_CRYPTO
-#cmakedefine SIZEOF_OFF_T
-#cmakedefine SIZEOF_SIZE_T
+#cmakedefine SIZEOF_OFF_T @SIZEOF_OFF_T@
+#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
 #cmakedefine HAVE_DIRENT_H
 #cmakedefine HAVE_FTS_H
 #cmakedefine HAVE_NDIR_H
@@ -58,5 +59,5 @@
 /* END DEFINES */
 #define PACKAGE "@CMAKE_PROJECT_NAME@"
 #define VERSION "@CMAKE_PROJECT_VERSION@"
-
-#endif /* HAD_CONFIG_H */
+// clang-format on
+# endif /* HAD_CONFIG_H */
diff --git a/subprojects/packagefiles/libzip-1.9.2/cmake-zipconf.h.in b/subprojects/packagefiles/libzip-1.9.2/cmake-zipconf.h.in
@@ -15,7 +15,7 @@
 
 #cmakedefine HAVE_LIMITS_H
 
-#if HAVE_LIMITS_H
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif