WinXP x64 compat fix.
This commit is contained in:
parent
82fe8ffc5c
commit
637bce0b3a
20
build.sh
20
build.sh
@ -60,7 +60,7 @@ pkg_zlib="$(find "${LIBS_DIR}" -maxdepth 1 -name 'zlib-*.tar.gz' | sort -rn | he
|
||||
rm -rf "${ZLIB_DIR}" && mkdir "${ZLIB_DIR}"
|
||||
tar -xvf "${pkg_zlib}" --strip-components=1 -C "${ZLIB_DIR}"
|
||||
pushd "${ZLIB_DIR}"
|
||||
make -f win32/Makefile.gcc libz.a LOC="-march=${MY_MARCH} -mtune=${MY_MTUNE}"
|
||||
make -f win32/Makefile.gcc libz.a LOC="-march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501"
|
||||
cp -vf libz.a "${LIBS_DIR}/lib"
|
||||
cp -vf zlib.h zconf.h "${LIBS_DIR}/include"
|
||||
popd
|
||||
@ -74,7 +74,7 @@ pkg_zstd="$(find "${LIBS_DIR}" -maxdepth 1 -name 'zstd-*.tar.gz' | sort -rn | he
|
||||
rm -rf "${ZSTD_DIR}" && mkdir "${ZSTD_DIR}"
|
||||
tar -xvf "${pkg_zstd}" --strip-components=1 -C "${ZSTD_DIR}"
|
||||
pushd "${ZSTD_DIR}"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" make lib
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501 -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" make lib
|
||||
cp -vf lib/libzstd.a "${LIBS_DIR}/lib"
|
||||
cp -vf lib/zstd.h lib/zstd_errors.h "${LIBS_DIR}/include"
|
||||
popd
|
||||
@ -88,7 +88,7 @@ pkg_brot="$(find "${LIBS_DIR}" -maxdepth 1 -name 'brotli-*.tar.gz' | sort -rn |
|
||||
rm -rf "${BROT_DIR}" && mkdir "${BROT_DIR}"
|
||||
tar -xvf "${pkg_brot}" --strip-components=1 -C "${BROT_DIR}"
|
||||
pushd "${BROT_DIR}"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" make lib
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501 -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" make lib
|
||||
mkdir -p "${LIBS_DIR}/include/brotli"
|
||||
cp -vf libbrotli.a "${LIBS_DIR}/lib/libbrotlienc.a"
|
||||
cp -vf libbrotli.a "${LIBS_DIR}/lib/libbrotlidec.a"
|
||||
@ -106,7 +106,7 @@ tar -xvf "${pkg_ossl}" --strip-components=1 -C "${OSSL_DIR}"
|
||||
[[ "${MY_CPU}" == "x64" ]] && readonly ossl_flag="no-sse2" || readonly ossl_flag="386"
|
||||
[[ "${MY_CPU}" == "x64" ]] && readonly ossl_mngw="mingw64" || readonly ossl_mngw="mingw"
|
||||
pushd "${OSSL_DIR}"
|
||||
./Configure no-hw no-shared no-engine no-capieng no-dso zlib ${ossl_flag} -static -march=${MY_MARCH} -mtune=${MY_MTUNE} -I"${LIBS_DIR}/include" -L"${LIBS_DIR}/lib" -latomic ${ossl_mngw}
|
||||
./Configure no-hw no-shared no-engine no-capieng no-dso zlib ${ossl_flag} -static -march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501 -I"${LIBS_DIR}/include" -L"${LIBS_DIR}/lib" -latomic ${ossl_mngw}
|
||||
make build_libs
|
||||
mkdir -p "${LIBS_DIR}/include/crypto" "${LIBS_DIR}/include/openssl"
|
||||
cp -vf libcrypto.a libssl.a "${LIBS_DIR}/lib"
|
||||
@ -124,7 +124,7 @@ rm -rf "${SSH2_DIR}" && mkdir "${SSH2_DIR}"
|
||||
tar -xvf "${pkg_ssh2}" --strip-components=1 -C "${SSH2_DIR}"
|
||||
pushd "${SSH2_DIR}"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/ssh2_session.diff"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" LIBS="-latomic" ./configure --disable-examples-build --disable-shared --with-libz
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501 -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" LIBS="-latomic" ./configure --disable-examples-build --disable-shared --with-libz
|
||||
make
|
||||
cp -v src/.libs/libssh2.a "${LIBS_DIR}/lib"
|
||||
cp -v include/libssh2.h include/libssh2_publickey.h include/libssh2_sftp.h "${LIBS_DIR}/include"
|
||||
@ -139,7 +139,7 @@ pkg_ngh2="$(find "${LIBS_DIR}" -maxdepth 1 -name 'nghttp2-*.tar.gz' | sort -rn |
|
||||
rm -rf "${NGH2_DIR}" && mkdir "${NGH2_DIR}"
|
||||
tar -xvf "${pkg_ngh2}" --strip-components=1 -C "${NGH2_DIR}"
|
||||
pushd "${NGH2_DIR}"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" OPENSSL_CFLAGS="-I${LIBS_DIR}/include" OPENSSL_LIBS="-L${LIBS_DIR}/lib -lssl -lcrypto" ZLIB_CFLAGS="-I${LIBS_DIR}/include" ZLIB_LIBS="-L${LIBS_DIR}/lib -lz" ./configure --enable-lib-only --disable-threads --disable-shared
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501 -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" OPENSSL_CFLAGS="-I${LIBS_DIR}/include" OPENSSL_LIBS="-L${LIBS_DIR}/lib -lssl -lcrypto" ZLIB_CFLAGS="-I${LIBS_DIR}/include" ZLIB_LIBS="-L${LIBS_DIR}/lib -lz" ./configure --enable-lib-only --disable-threads --disable-shared
|
||||
make
|
||||
mkdir -p "${LIBS_DIR}/include/nghttp2" "${LIBS_DIR}/pkgconfig"
|
||||
cp -v lib/.libs/libnghttp2.a "${LIBS_DIR}/lib"
|
||||
@ -156,7 +156,7 @@ pkg_icnv="$(find "${LIBS_DIR}" -maxdepth 1 -name 'libiconv-*.tar.gz' | sort -rn
|
||||
rm -rf "${ICNV_DIR}" && mkdir "${ICNV_DIR}"
|
||||
tar -xvf "${pkg_icnv}" --strip-components=1 -C "${ICNV_DIR}"
|
||||
pushd "${ICNV_DIR}"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" ./configure --disable-rpath --disable-shared
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501 -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" ./configure --disable-rpath --disable-shared
|
||||
make
|
||||
cp -v lib/.libs/libiconv.a "${LIBS_DIR}/lib"
|
||||
cp -v include/iconv.h "${LIBS_DIR}/include"
|
||||
@ -171,7 +171,7 @@ pkg_idn2="$(find "${LIBS_DIR}" -maxdepth 1 -name 'libidn2-*.tar.gz' | sort -rn |
|
||||
rm -rf "${IDN2_DIR}" && mkdir "${IDN2_DIR}"
|
||||
tar -xvf "${pkg_idn2}" --strip-components=1 -C "${IDN2_DIR}"
|
||||
pushd "${IDN2_DIR}"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" ./configure --disable-shared --disable-doc --without-libiconv-prefix --without-libunistring-prefix --disable-valgrind-tests
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501 -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" ./configure --disable-shared --disable-doc --without-libiconv-prefix --without-libunistring-prefix --disable-valgrind-tests
|
||||
make
|
||||
cp -v lib/.libs/libidn2.a "${LIBS_DIR}/lib"
|
||||
cp -v lib/idn2.h "${LIBS_DIR}/include"
|
||||
@ -187,7 +187,7 @@ rm -rf "${SASL_DIR}" && mkdir "${SASL_DIR}"
|
||||
tar -xvf "${pkg_sasl}" --strip-components=1 -C "${SASL_DIR}"
|
||||
pushd "${SASL_DIR}"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/gsasl_error.diff"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" ./configure --disable-shared --disable-valgrind-tests --disable-obsolete -without-libintl-prefix
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -D_WIN32_WINNT=0x0501 -I${LIBS_DIR}/include" LDFLAGS="-L${LIBS_DIR}/lib" ./configure --disable-shared --disable-valgrind-tests --disable-obsolete -without-libintl-prefix
|
||||
make
|
||||
cp -v src/.libs/libgsasl.a "${LIBS_DIR}/lib"
|
||||
cp -v src/gsasl.h src/gsasl-*.h "${LIBS_DIR}/include"
|
||||
@ -206,7 +206,7 @@ patch -p1 -b < "${BASE_DIR}/patch/curl_threads.diff"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/curl_tool_doswin.diff"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/curl_tool_parsecfg.diff"
|
||||
patch -p1 -b < "${BASE_DIR}/patch/curl_url.diff"
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" CPPFLAGS="-DNGHTTP2_STATICLIB -DUNICODE -D_UNICODE" LDFLAGS="-static -no-pthread -L${LIBS_DIR}/lib" LIBS="-latomic -liconv -lcrypt32" PKG_CONFIG_PATH="${LIBS_DIR}/pkgconfig" ./configure --enable-static --disable-shared --disable-pthreads --disable-libcurl-option --disable-openssl-auto-load-config --with-zlib="${LIBS_DIR}" --with-zstd="${LIBS_DIR}" --with-brotli="${LIBS_DIR}" --with-openssl="${LIBS_DIR}" --with-libssh2="${LIBS_DIR}" --with-nghttp2="${LIBS_DIR}" --with-libidn2="${LIBS_DIR}" --with-gsasl="${LIBS_DIR}" --without-ca-bundle
|
||||
CFLAGS="-march=${MY_MARCH} -mtune=${MY_MTUNE} -I${LIBS_DIR}/include" CPPFLAGS="-D_WIN32_WINNT=0x0501 -DNGHTTP2_STATICLIB -DUNICODE -D_UNICODE" LDFLAGS="-static -no-pthread -L${LIBS_DIR}/lib" LIBS="-latomic -liconv -lcrypt32" PKG_CONFIG_PATH="${LIBS_DIR}/pkgconfig" ./configure --enable-static --disable-shared --disable-pthreads --disable-libcurl-option --disable-openssl-auto-load-config --with-zlib="${LIBS_DIR}" --with-zstd="${LIBS_DIR}" --with-brotli="${LIBS_DIR}" --with-openssl="${LIBS_DIR}" --with-libssh2="${LIBS_DIR}" --with-nghttp2="${LIBS_DIR}" --with-libidn2="${LIBS_DIR}" --with-gsasl="${LIBS_DIR}" --without-ca-bundle
|
||||
make curl_LDFLAGS="-all-static -municode -mconsole"
|
||||
strip -s src/curl.exe
|
||||
popd
|
||||
|
Loading…
Reference in New Issue
Block a user