Skip to content

Commit

Permalink
mingw fixes for bcrypt, suppress depends related warnings (#1847)
Browse files Browse the repository at this point in the history
* Suppress depends related superfluous warnings

* Fix passthrough string quote

* Fix windres, bcrypt failures
  • Loading branch information
prasannavl authored Apr 3, 2023
1 parent 7f64256 commit 80f249c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ case $host in
AC_CHECK_LIB([shlwapi], [main],, AC_MSG_ERROR(libshlwapi missing))
AC_CHECK_LIB([iphlpapi], [main],, AC_MSG_ERROR(libiphlpapi missing))
AC_CHECK_LIB([crypt32], [main],, AC_MSG_ERROR(libcrypt32 missing))
AC_CHECK_LIB([bcrypt], [main],, AC_MSG_ERROR(libbcrypt missing))

# -static is interpreted by libtool, where it has a different meaning.
# In libtool-speak, it's -all-static.
Expand Down
2 changes: 1 addition & 1 deletion depends/config.site.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if test -z "@allow_host_packages@"; then
export PKGCONFIG_LIBDIR=
fi

CPPFLAGS="-I$depends_prefix/include/ $CPPFLAGS"
CPPFLAGS="-isystem $depends_prefix/include/ $CPPFLAGS"
LDFLAGS="-L$depends_prefix/lib $LDFLAGS"

if test -n "@CC@" -a -z "${CC}"; then
Expand Down
7 changes: 5 additions & 2 deletions make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ setup_vars() {
DOCKERFILE=${DOCKERFILE:-""}
DOCKERFILES_DIR=${DOCKERFILES_DIR:-"./contrib/dockerfiles"}
RELEASE_DIR=${RELEASE_DIR:-"./build"}
CLANG_DEFAULT_VERSION=${CLANG_DEFAULT_VERSION:-"16"}

local default_target="x86_64-pc-linux-gnu"
if [[ "${OSTYPE}" == "darwin"* ]]; then
Expand All @@ -32,7 +33,8 @@ setup_vars() {
local default_compiler_flags=""
if [[ "${TARGET}" == "x86_64-pc-linux-gnu" || \
"${TARGET}" == "x86_64-apple-darwin11" ]]; then
default_compiler_flags="CC=clang-16 CXX=clang++-16"
local clang_ver="${CLANG_DEFAULT_VERSION}"
default_compiler_flags="CC=clang-${clang_ver} CXX=clang++-${clang_ver}"
fi

if [[ "${OSTYPE}" == "darwin"* ]]; then
Expand Down Expand Up @@ -409,7 +411,8 @@ pkg_install_deps_mingw_x86_64() {
}

pkg_install_llvm() {
wget -O - "https://apt.llvm.org/llvm.sh" | bash -s 16
# shellcheck disable=SC2086
wget -O - "https://apt.llvm.org/llvm.sh" | bash -s ${CLANG_DEFAULT_VERSION}
}

pkg_ensure_mac_sdk() {
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ clean-local:
.rc.o:
@test -f $(WINDRES)
## FIXME: How to get the appropriate modulename_CPPFLAGS in here?
$(AM_V_GEN) $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -DWINDRES_PREPROC -i $< -o $@
$(AM_V_GEN) $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(subst -isystem ,-I,$(CPPFLAGS)) -DWINDRES_PREPROC -i $< -o $@

check-symbols: $(bin_PROGRAMS)
if GLIBC_BACK_COMPAT
Expand Down

0 comments on commit 80f249c

Please sign in to comment.