znc: Clean up Makefile and fix compilation on PPC

Some of these hacks were needed when uClibc++ was used. Now that it is not
we can remove them.

Remove libpthread dependency. Not only is it unneeded, package-defaults
already specifies it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[jonas.gorski: cherry-pick from master]
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
(cherry picked from commit 9cb7cc71e7da9d06194b813d6263c0b8427eb1c3)
This commit is contained in:
Rosen Penev 2019-04-22 11:24:53 -07:00 committed by Jonas Gorski
parent a8316a5c6c
commit 9b3414fd11

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=znc
PKG_VERSION:=1.6.6
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://znc.in/releases \
@ -36,7 +36,7 @@ endef
define Package/znc
$(Package/znc/default)
DEPENDS:=+libopenssl +libpthread +libstdcpp +ZNC_ICU:icu +zlib
DEPENDS:=+libopenssl +libstdcpp +ZNC_ICU:icu +zlib
MENU:=1
endef
@ -278,12 +278,6 @@ PKG_CONFIG_DEPENDS += $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES))
include $(INCLUDE_DIR)/package.mk
CONFIGURE_VARS += \
CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
LIBS="-lstdc++ -lm -lssl -lcrypto $(LIBGCC_S) -lc"
CONFIGURE_ARGS += \
$(if $(CONFIG_ZNC_ICU), --enable-charset, --disable-charset) \
--disable-cyrus \
@ -298,11 +292,6 @@ CONFIGURE_ARGS += \
--enable-tdns \
--enable-zlib
define Build/Configure
$(call Build/Configure/Default,)
$(call libtool_disable_rpath)
endef
define Build/Compile
$(call Build/Compile/Default,znc)
+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/modules \