From 72322f24ae7bba6f8157fa65926d5b123e8403db Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Thu, 23 Apr 2015 13:43:17 +0000 Subject: [PATCH 1/7] lsof: respect IPv6 settings Signed-off-by: Alexander Ryzhov --- utils/lsof/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile index 75b2c5479..adf0d0478 100644 --- a/utils/lsof/Makefile +++ b/utils/lsof/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=lsof PKG_VERSION:=4.86 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)+dfsg.orig.tar.gz PKG_SOURCE_URL:=http://ftp2.de.debian.org/debian/pool/main/l/lsof @@ -32,9 +32,15 @@ define Package/lsof URL:=http://people.freebsd.org/~abe/ endef +ifeq ($(CONFIG_IPV6),y) + LINUX_CLIB_IPV6="-DHASIPv6" +else + LINUX_CLIB_IPV6= +endif + define Build/Configure cd $(PKG_BUILD_DIR); \ - LINUX_CLIB="-DGLIBCV=2" \ + LINUX_CLIB="-DGLIBCV=2 $(LINUX_CLIB_IPV6)" \ LSOF_CC="$(TARGET_CC)" \ LSOF_INCLUDE="-I$(STAGING_DIR)/usr/include" \ LSOF_VSTR="$(LINUX_VERSION)" \ From 84d27dccef99fbc384551d5c40d6b6a2894e0552 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Thu, 23 Apr 2015 13:47:57 +0000 Subject: [PATCH 2/7] libtorrent: respect IPv6 settings Signed-off-by: Alexander Ryzhov --- libs/libtorrent/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile index f6673acaa..2001235a9 100644 --- a/libs/libtorrent/Makefile +++ b/libs/libtorrent/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtorrent -PKG_VERSION:=0.13.4-git-0 +PKG_VERSION:=0.13.4-git-1 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git @@ -49,7 +49,8 @@ CONFIGURE_ARGS+= \ --disable-debug \ --enable-openssl \ --disable-instrumentation \ - --with-zlib=$(STAGING_DIR)/usr + --with-zlib=$(STAGING_DIR)/usr \ + $(call autoconf_bool,CONFIG_IPV6,ipv6) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include From 3dd3316f67538e22672e4e8e365dd306b0257840 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Thu, 23 Apr 2015 13:50:30 +0000 Subject: [PATCH 3/7] mtr: respect IPv6 settings Signed-off-by: Alexander Ryzhov --- net/mtr/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 7214991be..9498baf0e 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtr PKG_VERSION:=0.86 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr @@ -46,6 +46,7 @@ endef CONFIGURE_ARGS += \ --without-gtk \ --without-glib \ + $(call autoconf_bool,CONFIG_IPV6,ipv6) define Build/Configure (cd $(PKG_BUILD_DIR); touch \ From b0f2853135188c59378785996d446bc72597a4d1 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Thu, 23 Apr 2015 13:51:42 +0000 Subject: [PATCH 4/7] nfs-kernel-server: respect IPv6 settings Signed-off-by: Alexander Ryzhov --- net/nfs-kernel-server/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index fb67bb4ea..3371f97af 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfs-kernel-server PKG_VERSION:=1.3.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MD5SUM:=1e2f3c1ed468dee02d00c534c002ea10 PKG_SOURCE_URL:=@SF/nfs @@ -77,12 +77,12 @@ CONFIGURE_ARGS += \ --disable-gss \ --disable-nfsv4 \ --disable-nfsv41 \ - --disable-ipv6 \ --enable-static \ --enable-shared \ --disable-caps \ --disable-tirpc \ - --disable-nfsdcld + --disable-nfsdcld \ + $(call autoconf_bool,CONFIG_IPV6,ipv6) CONFIGURE_VARS += \ libblkid_cv_is_recent=yes \ From 7343322bd09d898b55cf69cddb7fa434c3da9e00 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Thu, 23 Apr 2015 13:52:50 +0000 Subject: [PATCH 5/7] rtorrent: respect IPv6 settings Signed-off-by: Alexander Ryzhov --- net/rtorrent/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index af644100d..bba6ddee0 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtorrent -PKG_VERSION:=0.9.4-git-0 +PKG_VERSION:=0.9.4-git-1 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git @@ -72,7 +72,8 @@ TARGET_LDFLAGS += -lz -lpthread -Wl,-rpath-link=$(STAGING_DIR)/usr/lib CONFIGURE_ARGS+= \ --enable-shared \ --disable-static \ - --disable-debug + --disable-debug \ + $(call autoconf_bool,CONFIG_IPV6,ipv6) ifeq ($(BUILD_VARIANT),rpc) CONFIGURE_ARGS += \ From ca8eecc665d0bc54e47ed73086046eaff18f1f5e Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Thu, 21 May 2015 06:15:08 +0000 Subject: [PATCH 6/7] apr: respect IPv6 settings Signed-off-by: Alexander Ryzhov --- libs/apr/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 924db85b4..d61d31f9e 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr PKG_VERSION:=1.5.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://mirrors.ibiblio.org/apache/apr/ @@ -38,7 +38,7 @@ TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CONFIGURE_ARGS += \ --with-devrandom=/dev/urandom \ --disable-dso \ - --enable-ipv6 + $(call autoconf_bool,CONFIG_IPV6,ipv6) # XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure CONFIGURE_VARS += \ From 10e7191a6f03f75e9a08b5eb493927e60078156b Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Thu, 21 May 2015 06:17:05 +0000 Subject: [PATCH 7/7] ruby: respect IPv6 settings Signed-off-by: Alexander Ryzhov --- lang/ruby/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index eb90e3563..54aaadc29 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby PKG_VERSION:=2.2.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LIBVER:=2.2 @@ -815,7 +815,7 @@ CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ --disable-rpath \ - --enable-ipv6 \ + $(call autoconf_bool,CONFIG_IPV6,ipv6) \ --disable-install-doc \ --disable-install-capi \ --with-ruby-version=minor \