whois: fix noidn patch
If no idn2 but idn is present, it picks it up. Just remove the whole thing. Refreshed patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
9ec3f18b8c
commit
cfedca7360
|
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=whois
|
||||
PKG_VERSION:=5.5.7
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
+++ b/Makefile
|
||||
@@ -56,8 +56,6 @@ DEFS += -DHAVE_ICONV
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(shell $(PKG_CONFIG) --exists 'libxcrypt >= 4.1' || echo NO),)
|
||||
-DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt)
|
||||
-mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt)
|
||||
|
|
|
@ -1,11 +1,17 @@
|
|||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -43,8 +43,6 @@ $(error Please fix your build system to stop defining HAVE_LIBIDN!)
|
||||
@@ -42,14 +42,6 @@ ifdef HAVE_LIBIDN
|
||||
$(error Please fix your build system to stop defining HAVE_LIBIDN!)
|
||||
endif
|
||||
|
||||
ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
|
||||
|
||||
-ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
|
||||
-whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
|
||||
-DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
|
||||
else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
|
||||
whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
|
||||
DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
|
||||
-else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
|
||||
-whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
|
||||
-DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
|
||||
-endif
|
||||
-
|
||||
ifdef HAVE_ICONV
|
||||
whois_OBJECTS += simple_recode.o
|
||||
DEFS += -DHAVE_ICONV
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -72,7 +72,7 @@ endif
|
||||
@@ -62,7 +62,7 @@ endif
|
||||
CPPFLAGS += $(DEFS) $(INCLUDES)
|
||||
|
||||
##############################################################################
|
||||
|
|
Loading…
Reference in New Issue