From 3de61c47150118fc9e60bec42100ed1c0fe8e61d Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 14 Feb 2020 16:28:21 +0800 Subject: [PATCH] srelay: reduce ipk size and enable thread --- package/lean/srelay/Makefile | 10 ++++------ package/lean/srelay/patches/001-compile.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 package/lean/srelay/patches/001-compile.patch diff --git a/package/lean/srelay/Makefile b/package/lean/srelay/Makefile index f008a8dfc..f09389cb4 100644 --- a/package/lean/srelay/Makefile +++ b/package/lean/srelay/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=srelay PKG_VERSION:=0.4.8p3 -PKG_RELEASE:=1 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/socks-relay @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk define Package/srelay SECTION:=net CATEGORY:=Network - DEPENDS:=+libwrap + DEPENDS:=+libpthread SUBMENU:=Web Servers/Proxies TITLE:=A socks 4/5 proxy server URL:=http://www.c-wind.com/srelay/ @@ -31,8 +31,8 @@ define Package/srelay/conffiles endef CONFIGURE_ARGS += \ - --disable-thread \ - --with-libwrap="$(STAGING_DIR)/usr" \ + --enable-thread \ + --with-libwrap=no \ CONFIGURE_VARS += \ CPPFLAGS="-DLINUX $$$$CPPFLAGS" \ @@ -40,8 +40,6 @@ CONFIGURE_VARS += \ define Package/srelay/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) files/$(PKG_NAME).conf $(1)/etc/ endef $(eval $(call BuildPackage,srelay)) diff --git a/package/lean/srelay/patches/001-compile.patch b/package/lean/srelay/patches/001-compile.patch new file mode 100644 index 000000000..0cc2bc343 --- /dev/null +++ b/package/lean/srelay/patches/001-compile.patch @@ -0,0 +1,19 @@ +--- a/configure ++++ b/configure +@@ -3999,11 +3999,11 @@ + LDFLAGS="$LDFLAGS -lpthread" + fi + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else ++# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++#as_fn_error $? "cannot run test program while cross compiling ++#See \`config.log' for more details" "$LINENO" 5; } ++#else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +