Просмотр исходного кода

git: update to 2.34.0, needs curl dependency because SSL is otherwise not activated

Waldemar Brodkorb 4 лет назад
Родитель
Сommit
c3609e7837
2 измененных файлов с 6 добавлено и 6 удалено
  1. 3 3
      package/curl/Makefile
  2. 3 3
      package/git/Makefile

+ 3 - 3
package/curl/Makefile

@@ -47,18 +47,18 @@ $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS
 HOST_CONFIGURE_ARGS+=	--without-ssl
 
 ifeq (${ADK_PACKAGE_CURL_WITH_LIBRESSL},y)
-CONFIGURE_ARGS+=	--with-ssl="${STAGING_TARGET_DIR}/usr" \
+CONFIGURE_ARGS+=	--with-openssl="${STAGING_TARGET_DIR}/usr" \
 			--without-gnutls \
 			--without-axtls
 endif
 ifeq (${ADK_PACKAGE_CURL_WITH_GNUTLS},y)
 CONFIGURE_ARGS+=	--with-gnutls="${STAGING_TARGET_DIR}/usr" \
-			--without-ssl \
+			--without-openssl \
 			--without-axtls
 endif
 ifeq (${ADK_PACKAGE_CURL_WITH_WOLFSSL},y)
 CONFIGURE_ARGS+=	--with-cyassl="${STAGING_TARGET_DIR}/usr" \
-			--without-ssl \
+			--without-openssl \
 			--without-gnutls \
 			--without-axtls
 endif

+ 3 - 3
package/git/Makefile

@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		2.31.1
+PKG_VERSION:=		2.34.0
 PKG_RELEASE:=		1
-PKG_HASH:=		9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+PKG_HASH:=		fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		dev/scm
 PKG_BUILDDEP:=		curl expat libressl
-PKG_DEPENDS:=		libcurl libexpat libressl
+PKG_DEPENDS:=		curl libexpat libressl
 PKG_NEEDS:=		threads
 PKG_URL:=		http://git-scm.com/
 PKG_SITES:=		https://www.kernel.org/pub/software/scm/git/