urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-22 10:21:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jb/urcrypt' into jb/next-gen-term

Browse Source 
* jb/urcrypt:
  build: fixes mingw static builds, tweaks urbit configure --enable-static
  build: updates pmnsh to *prepend* to PKG_CONFIG_PATH
This commit is contained in:
Joe Bryan 2021-08-31 11:09:27 -04:00
commit 137dea5b41
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ jobs:
lfs: true lfs: true
# echo suppresses pacman prompt # echo suppresses pacman prompt
- run: echo|./configure --enable-static - run: echo|./configure
env: env:
CACHIX_CACHE: ares CACHIX_CACHE: ares
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}

2
pkg/urbit/compat/mingw/compat.mk
View File

@ -1,5 +1,5 @@
# increase default thread stack size and link Windows implibs # increase default thread stack size and link Windows implibs
LDFLAGS := $(LDFLAGS) -Wl,--stack,67108864 -lbcrypt -lntdll -lws2_32 LDFLAGS := $(LDFLAGS) -static -Wl,--stack,67108864 -lbcrypt -lntdll -lws2_32
# libcurl # libcurl
CFLAGS := $(CFLAGS) -DCURL_STATICLIB CFLAGS := $(CFLAGS) -DCURL_STATICLIB
LDFLAGS := $(LDFLAGS) -lzstd -lcrypt32 LDFLAGS := $(LDFLAGS) -lzstd -lcrypt32

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

@ -149,4 +149,4 @@ pdirs+=($dir) # XX support json override a la cdirs/pdirs
CFLAGS="${CFLAGS-} ${cdirs[@]}" CFLAGS="${CFLAGS-} ${cdirs[@]}"
LDFLAGS="${LDFLAGS-} ${ldirs[@]}" LDFLAGS="${LDFLAGS-} ${ldirs[@]}"
PKG_CONFIG_PATH="${PKG_CONFIG_PATH-}:$(IFS=:;echo "${pdirs[*]}")" PKG_CONFIG_PATH="$(IFS=:;echo "${pdirs[*]}"):${PKG_CONFIG_PATH-}"

18
pkg/urbit/configure vendored
View File

@ -68,12 +68,6 @@ do
shift shift
done done
if [ -n "${opt_static-}" ]
then
CFLAGS="${CFLAGS-} -static"
fi
[ -n "${MEMORY_DEBUG-}" ] && defmacro U3_MEMORY_DEBUG 1 [ -n "${MEMORY_DEBUG-}" ] && defmacro U3_MEMORY_DEBUG 1
[ -n "${MEMORY_LOG-}" ] && defmacro U3_MEMORY_LOG 1 [ -n "${MEMORY_LOG-}" ] && defmacro U3_MEMORY_LOG 1
[ -n "${CPU_DEBUG-}" ] && defmacro U3_CPU_DEBUG 1 [ -n "${CPU_DEBUG-}" ] && defmacro U3_CPU_DEBUG 1
@ -112,11 +106,9 @@ esac
# TODO Determine if the target cpu is little or big endian. # TODO Determine if the target cpu is little or big endian.
case $(tr A-Z a-z <<< $os) in case $(tr A-Z a-z <<< $os) in
*mingw*) *mingw*)
if [ -z "${opt_static-}" ] # mingw builds are static-only
then #
echo mingw builds are static-only opt_static=1
exit 1
fi
# ensure required mingw packages are installed # ensure required mingw packages are installed
mpkgs=(cmake curl gcc jq make) mpkgs=(cmake curl gcc jq make)
@ -179,6 +171,10 @@ PKG_CONFIG="${PKG_CONFIG-pkg-config}"
if [ -n "${opt_static-}" ] if [ -n "${opt_static-}" ]
then then
CFLAGS="${CFLAGS-} -static"
# XX can't set -static here due libuv's -ldl on MacOS
#
# LDFLAGS="${LDFLAGS-} -static"
PKG_CONFIG="$PKG_CONFIG --static" PKG_CONFIG="$PKG_CONFIG --static"
fi fi