diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-01-23 07:55:38 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-01-23 07:55:38 +0000 |
| commit | 7021b880e98abfd0f0805d7e412f62e895201cca (patch) | |
| tree | 19b278c6d51f276eeb34b5c8a62bf459e83c78b7 /patches | |
| parent | 0fdc0d6cbb0e9c4383ea72fbac66aa945dbef194 (diff) | |
| download | midipix_build-7021b880e98abfd0f0805d7e412f62e895201cca.tar.bz2 midipix_build-7021b880e98abfd0f0805d7e412f62e895201cca.tar.xz | |
patches/whois-5.{2.18,5.7}.local.patch: updated; skip {,install-}pos target due to broken build system.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/whois-5.2.18.local.patch | 21 | ||||
| -rw-r--r-- | patches/whois-5.5.7.local.patch | 59 |
2 files changed, 59 insertions, 21 deletions
diff --git a/patches/whois-5.2.18.local.patch b/patches/whois-5.2.18.local.patch deleted file mode 100644 index 7a6b8996..00000000 --- a/patches/whois-5.2.18.local.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- whois-5.2.18/Makefile.orig 2017-08-22 18:48:50.000000000 +0200 -+++ whois-5.2.18/Makefile 2017-09-15 10:02:37.915199229 +0200 -@@ -32,12 +32,12 @@ - DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\" - endif - --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) -+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) - endif - - ifdef HAVE_ICONV diff --git a/patches/whois-5.5.7.local.patch b/patches/whois-5.5.7.local.patch new file mode 100644 index 00000000..432f7fac --- /dev/null +++ b/patches/whois-5.5.7.local.patch @@ -0,0 +1,59 @@ +--- whois-5.5.7/Makefile.orig 2020-10-03 16:43:15.000000000 +0100 ++++ whois-5.5.7/Makefile 2021-01-23 07:55:24.889153830 +0000 +@@ -42,12 +42,12 @@ + $(error Please fix your build system to stop defining HAVE_LIBIDN!) + endif + +-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) ++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) + endif + + ifdef HAVE_ICONV +@@ -72,7 +72,7 @@ + CPPFLAGS += $(DEFS) $(INCLUDES) + + ############################################################################## +-all: Makefile.depend whois mkpasswd pos ++all: Makefile.depend whois mkpasswd + + ############################################################################## + %.o: %.c +@@ -121,7 +121,7 @@ + nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois + + ############################################################################## +-install: install-whois install-mkpasswd install-pos ++install: install-whois install-mkpasswd + + install-whois: whois + $(INSTALL) -d $(BASEDIR)$(prefix)/bin/ +@@ -137,9 +137,6 @@ + $(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/ + $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/ + +-install-pos: +- cd po && $(MAKE) install +- + distclean: clean + rm -f po/whois.pot + +@@ -148,9 +145,6 @@ + new_gtlds.h tld_serv.h servers_charset.h *.o whois mkpasswd + rm -f po/*.mo + +-pos: +- cd po && $(MAKE) +- + depend: Makefile.depend + Makefile.depend: + $(CC) $(CPPFLAGS) $(CFLAGS) -MM -MG *.c > $@ |