ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-28 11:40:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

repo: fix ent build on mingw

Browse Source
This commit is contained in:
Jōshin 2022-03-25 13:20:25 -06:00
parent 30c329115d
commit 133ef8c779
No known key found for this signature in database
GPG Key ID: A8BE5A9A521639D0
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -111,5 +111,5 @@ jobs:
CACHIX_CACHE: ares CACHIX_CACHE: ares
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
- run: make build/urbit build/urbit-worker - run: mingw32-make build/urbit build/urbit-worker
- run: build/urbit -l -d -B ../../bin/solid.pill -F bus && curl -f --data '{"source":{"dojo":"+hood/exit"},"sink":{"app":"hood"}}' http://localhost:12321 - run: build/urbit -l -d -B ../../bin/solid.pill -F bus && curl -f --data '{"source":{"dojo":"+hood/exit"},"sink":{"app":"hood"}}' http://localhost:12321

4
pkg/ent/configure vendored
View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
: "${MAKE:=make}"
log () { log () {
echo "$@" >&2; echo "$@" >&2;
} }
@ -14,7 +16,7 @@ do
log "Trying IMPL=$IMPL" log "Trying IMPL=$IMPL"
if IMPL=$impl make >/dev/null 2>/dev/null if IMPL=$impl ${MAKE} >/dev/null 2>/dev/null
then sed -i 's|$(error IMPL must be set)|IMPL='"$impl"'|' Makefile then sed -i 's|$(error IMPL must be set)|IMPL='"$impl"'|' Makefile
log "IMPL=$IMPL works" log "IMPL=$IMPL works"
exit 0 exit 0

4
pkg/urbit/compat/poor-mans-nix-shell.sh
View File

@ -9,6 +9,8 @@ markfil=.$1~
depdirs= depdirs=
nixpath=${NIX_STORE-../build} nixpath=${NIX_STORE-../build}
: "${MAKE:=make}"
# LDFLAGS doesn't like absolute paths # LDFLAGS doesn't like absolute paths
if [ "${nixpath:0:1}" == "/" ] if [ "${nixpath:0:1}" == "/" ]
then then
@ -84,7 +86,7 @@ buildnixdep () {
[ -e $patch ] && patch -d $dir -p 1 <$patch [ -e $patch ] && patch -d $dir -p 1 <$patch
pushd $dir pushd $dir
eval "$cmdprep" eval "$cmdprep"
eval make "$cmdmake" eval ${MAKE} "$cmdmake"
touch $markfil touch $markfil
popd popd
fi fi

2
pkg/urbit/configure vendored
View File

@ -109,6 +109,8 @@ case $(tr A-Z a-z <<< $os) in
mpkgs=(cmake curl gcc jq make) mpkgs=(cmake curl gcc jq make)
pacman -S --needed autoconf automake-wrapper libtool patch ${mpkgs[@]/#/mingw-w64-x86_64-} pacman -S --needed autoconf automake-wrapper libtool patch ${mpkgs[@]/#/mingw-w64-x86_64-}
export MAKE=mingw32-make
. compat/poor-mans-nix-shell.sh mingw . compat/poor-mans-nix-shell.sh mingw
compat/create-include-files.sh 'stat -c %s' /etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt compat/create-include-files.sh 'stat -c %s' /etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt