diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/busybox/config/networking/Config.in | 2 | ||||
-rw-r--r-- | package/gdb/Makefile | 2 | ||||
-rw-r--r-- | package/gdbserver/Makefile | 2 | ||||
-rw-r--r-- | package/git/Makefile | 4 | ||||
-rw-r--r-- | package/libressl/Makefile | 4 | ||||
-rw-r--r-- | package/python3/Makefile | 17 | ||||
-rw-r--r-- | package/uclibc-ng-test/Makefile | 3 |
7 files changed, 21 insertions, 13 deletions
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 341092334..5e0ea5819 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -872,7 +872,7 @@ config BUSYBOX_SSL_CLIENT This tool pipes data to/from a socket, TLS-encrypting it. config BUSYBOX_TC bool "tc (8.3 kb)" - default y + default n help Show / manipulate traffic control settings diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 4a78eab3f..d9e4b91f5 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -14,7 +14,7 @@ PKG_DEPENDS:= libncurses libreadline zlib libexpat libthread-db libgmp mpfr PKG_BUILDDEP:= ncurses readline expat zlib gmp mpfr PKG_NEEDS:= c++ -PKG_ARCH_DEPENDS:= !cris !avr32 !microblaze +PKG_ARCH_DEPENDS:= !cris !avr32 !microblaze !nds32 include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 7238eb306..5eb676517 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -15,7 +15,7 @@ PKG_DEPENDS:= libthread-db libgmp PKG_BUILDDEP:= gmp PKG_LIBC_DEPENDS:= !musl -PKG_ARCH_DEPENDS:= !microblaze +PKG_ARCH_DEPENDS:= !microblaze !nds32 ifeq ($(ADK_TOOLCHAIN_GDB_6_7_1),y) DISTFILES:= gdb-6.7.1-avr32-2.1.5.tar.bz2 diff --git a/package/git/Makefile b/package/git/Makefile index 2756d68fb..22d678e6f 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 2.44.0 +PKG_VERSION:= 2.45.1 PKG_RELEASE:= 1 -PKG_HASH:= e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 +PKG_HASH:= e64d340a8e627ae22cfb8bcc651cca0b497cf1e9fdf523735544ff4a732f12bf PKG_DESCR:= fast version control system PKG_SECTION:= dev/scm PKG_BUILDDEP:= zlib curl expat diff --git a/package/libressl/Makefile b/package/libressl/Makefile index ca08f24df..f5df34fc5 100644 --- a/package/libressl/Makefile +++ b/package/libressl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libressl -PKG_VERSION:= 3.9.1 +PKG_VERSION:= 3.9.2 PKG_RELEASE:= 1 -PKG_HASH:= 6da0b954695f7ee62b03f64200a8a4f02af93717b60cce04ab6c8df262c07a51 +PKG_HASH:= 7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= http://www.libressl.org diff --git a/package/python3/Makefile b/package/python3/Makefile index 060ca4003..3d8761af2 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -17,7 +17,7 @@ PKG_URL:= http://www.python.org/ PKG_SITES:= http://legacy.python.org/ftp/python/${PKG_VERSION}/ PKG_FLAVOURS_PYTHON3:= MOD_ZLIB MOD_BZ2 MOD_SQLITE MOD_GDBM -PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_SSL MOD_READLINE +PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_LIBRESSL MOD_OPENSSL MOD_READLINE PKGFD_MOD_ZLIB:= zlib support PKGFB_MOD_ZLIB:= zlib @@ -37,9 +37,12 @@ PKGFS_MOD_NCURSES:= libncurses PKGFD_MOD_READLINE:= readline support PKGFB_MOD_READLINE:= readline PKGFS_MOD_READLINE:= libreadline -PKGFD_MOD_SSL:= ssl support -PKGFB_MOD_SSL:= libressl -PKGFS_MOD_SSL:= libressl +PKGFD_MOD_LIBRESSL:= libressl support +PKGFB_MOD_LIBRESSL:= libressl +PKGFS_MOD_LIBRESSL:= libressl +PKGFD_MOD_OPENSSL:= openssl support +PKGFB_MOD_OPENSSL:= openssl +PKGFS_MOD_OPENSSL:= libopenssl DISTFILES:= Python-${PKG_VERSION}.tar.xz WRKDIST= ${WRKDIR}/Python-${PKG_VERSION} @@ -67,7 +70,8 @@ $(eval $(call PKG_template,PYTHON3_MOD_BZ2,python3-mod-bz2,$(PKG_VERSION)-${PKG_ $(eval $(call PKG_template,PYTHON3_MOD_SQLITE,python3-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SQLITE},${PKGFD_MOD_SQLITE},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_GDBM,python3-mod-gdbm,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_GDBM},${PKGFD_MOD_GDBM},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_NCURSES,python3-mod-ncurses,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_NCURSES},${PKGFD_MOD_NCURSES},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON3_MOD_SSL,python3-mod-ssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SSL},${PKGFD_MOD_SSL},${PKG_SECTION})) +$(eval $(call PKG_template,PYTHON3_MOD_LIBRESSL,python3-mod-libressl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_LIBRESSL},${PKGFD_MOD_LIBRESSL},${PKG_SECTION})) +$(eval $(call PKG_template,PYTHON3_MOD_OPENSSL,python3-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_OPENSSL},${PKGFD_MOD_OPENSSL},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_READLINE,python3-mod-readline,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_READLINE},${PKGFD_MOD_READLINE},${PKG_SECTION})) $(eval $(call PKG_mod_template,PYTHON3_MOD_ZLIB,zlib)) @@ -75,7 +79,8 @@ $(eval $(call PKG_mod_template,PYTHON3_MOD_BZ2,_bz2)) $(eval $(call PKG_mod_template,PYTHON3_MOD_SQLITE,_sqlite)) $(eval $(call PKG_mod_template,PYTHON3_MOD_GDBM,_gdbm)) $(eval $(call PKG_mod_template,PYTHON3_MOD_NCURSES,_curses)) -$(eval $(call PKG_mod_template,PYTHON3_MOD_SSL,_ssl)) +$(eval $(call PKG_mod_template,PYTHON3_MOD_LIBRESSL,_ssl)) +$(eval $(call PKG_mod_template,PYTHON3_MOD_OPENSSL,_ssl)) $(eval $(call PKG_mod_template,PYTHON3_MOD_READLINE,readline)) MAKE_ENV+= HOSTPGEN=$(STAGING_HOST_DIR)/usr/bin/pgen3 diff --git a/package/uclibc-ng-test/Makefile b/package/uclibc-ng-test/Makefile index d05e57c91..ebc1f1b62 100644 --- a/package/uclibc-ng-test/Makefile +++ b/package/uclibc-ng-test/Makefile @@ -47,6 +47,9 @@ endif ifeq ($(ADK_TARGET_ARCH_KVX),y) XAKE_FLAGS+= NO_TLS=1 endif +ifeq ($(ADK_TARGET_ARCH_NDS32),y) +XAKE_FLAGS+= NO_TLS=1 +endif uclibc-ng-test-install: ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/etc |