Fixed build issues II [docker_verify]

sumeetchhetri · sumeetchhetri · commit 4455d1f5c514 · 2025-01-19T18:00:38.000+05:30
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -72,4 +72,4 @@ jobs:
         sudo ninja install
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/docker/dockcross-build-deps.sh b/docker/dockcross-build-deps.sh
@@ -53,7 +53,7 @@ build_curl() {
 	#curl -sLo- https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz | tar xz -C ${BUILD_DIR}
 	git clone https://github.com/curl/curl && mv curl ${BUILD_DIR}/curl-${CURL_VERSION}
 	pushd ${BUILD_DIR}/curl-${CURL_VERSION}
-		cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_NGHTTP2=OFF -DUSE_LDAP=OFF -DUSE_LIBIDN2=OFF -DUSE_LIBPSL=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=${STAGE_DIR} .
+		cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_NGHTTP2=OFF -DCURL_DISABLE_LDAP=OFF -DCURL_DISABLE_LDAPS=OFF -DUSE_LIBIDN2=OFF -DUSE_LIBPSL=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=${STAGE_DIR} .
 		make install
 	popd
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ build_curl() {`
`53`	`53`	`#curl -sLo- https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz \| tar xz -C ${BUILD_DIR}`
`54`	`54`	`git clone https://github.com/curl/curl && mv curl ${BUILD_DIR}/curl-${CURL_VERSION}`
`55`	`55`	`pushd ${BUILD_DIR}/curl-${CURL_VERSION}`
`56`		`- cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_NGHTTP2=OFF -DUSE_LDAP=OFF -DUSE_LIBIDN2=OFF -DUSE_LIBPSL=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=${STAGE_DIR} .`
	`56`	`+ cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DUSE_NGHTTP2=OFF -DCURL_DISABLE_LDAP=OFF -DCURL_DISABLE_LDAPS=OFF -DUSE_LIBIDN2=OFF -DUSE_LIBPSL=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_CURL_EXE=OFF -DCURL_USE_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=${STAGE_DIR} .`
`57`	`57`	`make install`
`58`	`58`	`popd`
`59`	`59`	`}`