diff options
Diffstat (limited to '')
| -rw-r--r-- | project/setup.sh | 10 | ||||
| -rw-r--r-- | project/setup/cygwin-copy.sh | 11 |
2 files changed, 19 insertions, 2 deletions
diff --git a/project/setup.sh b/project/setup.sh index 205ec80..f33cbfa 100644 --- a/project/setup.sh +++ b/project/setup.sh @@ -26,6 +26,12 @@ have_fuse=0 [[ $NO_FUSE != 1 && -r /usr/include/fuse.h || -r /usr/local/include/fuse.h ]] \ && have_fuse=1 +have_md5=0 +[[ -r /usr/include/openssl/md5.h ]] && have_md5=1 + +have_sha=0 +[[ -r /usr/include/openssl/sha.h ]] && have_sha=1 + #--- if [[ $M32 = 1 ]] @@ -51,7 +57,7 @@ fi && defines="$defines -DHAVE_POSIX_FALLOCATE=1" gcc $xflags system.c -o system.tmp && ./system.tmp >Makefile.setup -rm -f system.tmp +#rm -f system.tmp SYSTEM=$(awk '$1=="SYSTEM" {print $3}' Makefile.setup) #echo "SYSTEM=|$SYSTEM|" >&2 @@ -171,6 +177,8 @@ cat <<- ---EOT--- >>Makefile.setup FORCE_M32 := $force_m32 HAVE_FUSE := $have_fuse + HAVE_MD5 := $have_md5 + HAVE_SHA := $have_sha STATIC := $STATIC XFLAGS += $xflags DEFINES1 := $defines -DDEBUG_ASSERT=1 diff --git a/project/setup/cygwin-copy.sh b/project/setup/cygwin-copy.sh index 3ce6c46..6e47c33 100644 --- a/project/setup/cygwin-copy.sh +++ b/project/setup/cygwin-copy.sh @@ -56,9 +56,18 @@ done #------------------------------------------------------------------------------ # copy needed cygwin dlls +CYGCHECK="$( which cygcheck 2>/dev/null )" + for tool in $CYGWIN_TOOLS do - ldd "$BIN_PATH/$tool.exe" | grep -F "=> $CYGWIN_DIR/" | awk '{print $1}' + if [[ $CYGCHECK ]] + then + "$CYGCHECK" "$BIN_PATH/$tool.exe" \ + | grep -E 'cygwin.*\\bin\\.*\.dll' \ + | sed 's/.*\\//' + else + ldd "$BIN_PATH/$tool.exe" | grep -F "=> $CYGWIN_DIR/" | awk '{print $1}' + fi done | sort | uniq | while read dll do cp --preserve=time "$CYGWIN_DIR/$dll" "$BIN_PATH" || exit 1 |