Change the relative path to the bitsery patch file

Meson has been changing its behavior around, and this is now also the
behavior I'm getting when doing a clean build for the yabridge-git AUR
package.
This commit is contained in:
Robbert van der Helm
2020-05-05 15:16:58 +02:00
parent afc7f0dffc
commit 8049385e29
3 changed files with 3 additions and 28 deletions
+2 -7
View File
@@ -63,13 +63,8 @@ jobs:
install install
- name: Build the binaries - name: Build the binaries
run: | run: |
# Ubuntu resolves the relative paths used in the meson wrap files meson setup --buildtype=release --cross-file cross-wine.conf -Duse-bitbridge=true build
# relatively to the current working directory, so we have to setup the ninja -C build
# project directly from the build directory
mkdir build
cd build
meson setup --buildtype=release --cross-file ../cross-wine.conf -Duse-bitbridge=true
ninja
- name: Create an archive for the binaries - name: Create an archive for the binaries
run: | run: |
set -e set -e
-20
View File
@@ -178,26 +178,6 @@ meson setup --buildtype=release --cross-file cross-wine.conf build
ninja -C build ninja -C build
``` ```
If you're getting an error similar to this:
```shell
meson.build:45:0: ERROR: could not get file:../subprojects/bitsery-patch.tar.xz is the internet available?
```
Then you could try to start the build from the build directory. This seems to be
caused by Meson resolving relative paths differently on different distributions.
```shell
# Remove any already downloaded and Meson subprojects, since this will otherwise
# cause a conflict
git clean -Xf subprojects/
mkdir -p build
cd build
meson setup --buildtype=release --cross-file ../cross-wine.conf
ninja
```
### 32-bit bitbridge ### 32-bit bitbridge
It is also possible to compile a host application for yabridge that's compatible It is also possible to compile a host application for yabridge that's compatible
+1 -1
View File
@@ -5,6 +5,6 @@ source_url = https://github.com/fraillt/bitsery/archive/d24dfe14f5a756c0f8ad3d56
source_filename = bitsery-d24dfe14f5a756c0f8ad3d56ae6949ecc2c99b2e.zip source_filename = bitsery-d24dfe14f5a756c0f8ad3d56ae6949ecc2c99b2e.zip
source_hash = 1a3219e0818db6fa95677deb29087ddccf99087c0777c9313719122062186ae7 source_hash = 1a3219e0818db6fa95677deb29087ddccf99087c0777c9313719122062186ae7
patch_url = file:../subprojects/bitsery-patch.tar.xz patch_url = file:./subprojects/bitsery-patch.tar.xz
patch_filename = bitsery-patch.tar.xz patch_filename = bitsery-patch.tar.xz
patch_hash = bdbd46d6be1c3ecf7b8b48f43ab0bd7837458e49ddeef81fee3ac0bdc89767ea patch_hash = bdbd46d6be1c3ecf7b8b48f43ab0bd7837458e49ddeef81fee3ac0bdc89767ea