commit: 6f5ac8dee85a2732348fe84c790b3646741d0c24 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Dec 6 09:55:14 2018 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Dec 6 09:55:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5ac8de
net-libs/http-parser: Old Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-libs/http-parser/Manifest | 2 - .../files/0001-makefile-fix-DESTDIR-usage.patch | 64 ---------------------- .../files/0002-makefile-quote-variables.patch | 50 ----------------- ...x-SONAME-symlink-it-should-not-be-a-full-.patch | 35 ------------ ...04-makefile-add-CFLAGS-to-linking-command.patch | 31 ----------- ...0005-makefile-fix-install-rule-dependency.patch | 33 ----------- .../files/http-parser-2.6.2-darwin.patch | 16 ------ net-libs/http-parser/http-parser-2.6.2.ebuild | 45 --------------- net-libs/http-parser/http-parser-2.8.0.ebuild | 35 ------------ 9 files changed, 311 deletions(-) diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest index 1f9ae37e62f..8557aad9d1f 100644 --- a/net-libs/http-parser/Manifest +++ b/net-libs/http-parser/Manifest @@ -1,3 +1 @@ -DIST http-parser-2.6.2.tar.gz 48292 BLAKE2B 054ffa66960bad29a31e1a697a035447eb551fb85ed2af3786664f161d8d5a62aad8142ce859b7f1af85489b703b188d09980bf82b56cb190c21ecbe9c3a2f5c SHA512 e19e5377b3eb7f149c428196826fb878564fdfa3716ff6df5a3845c51586aee0582e252e09d1f8ebad1163b3e66632ff0c6e78f6acb2f0da20d7a06e734406c1 -DIST http-parser-2.8.0.tar.gz 50575 BLAKE2B 0ea1973b452b62915ad2a92be95e09281c1aa2f152ff4a67580e99ab113b44544f98b2e33fa1fadb259144975f15dc69c8b0ecc9de59e603dbd0e0a0785b7976 SHA512 57252a29b75f91452fd9bf2d3805bf1ddd95c32aee864cbe47dc676861512b9db95a7b3a4e1b999d5c046ab0d50809e7f184994c24ad48fe97cc2bcc27d9eb7b DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883 diff --git a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch deleted file mode 100644 index a819cf441d3..00000000000 --- a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 7fbc87986baa09c342abb21e34613e8bbdc3c9c7 Mon Sep 17 00:00:00 2001 -From: hasufell <hasuf...@hasufell.de> -Date: Mon, 2 Nov 2015 16:24:43 +0100 -Subject: [PATCH 1/4] makefile: fix DESTDIR usage - -DESTDIR is not supposed to be set inside other variables. It is -standard to have this variable in install/uninstall rules, so it -can be reliably set separately no matter what other variables are set -to. -This also avoids potential bugs with setting SONAME or seds on -installed files (like pkgconfig) which then might include the -temporary DESTDIR directory. - -DESTDIR is really just for installing into a temporary directory or -a chroot, mostly used by package managers. ---- - Makefile | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Makefile b/Makefile -index 33c8ba0..76153a0 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,7 +55,7 @@ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC - LDFLAGS_LIB = $(LDFLAGS) -shared - - INSTALL ?= install --PREFIX ?= $(DESTDIR)/usr/local -+PREFIX ?= /usr/local - LIBDIR = $(PREFIX)/lib - INCLUDEDIR = $(PREFIX)/include - -@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c - ctags $^ - - install: library -- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h -- $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h -+ $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -+ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) - - install-strip: library -- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h -- $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h -+ $(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -+ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) - - uninstall: -- rm $(INCLUDEDIR)/http_parser.h -- rm $(LIBDIR)/$(SONAME) -- rm $(LIBDIR)/libhttp_parser.so -+ rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h -+ rm $(DESTDIR)$(LIBDIR)/$(SONAME) -+ rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so - - clean: - rm -f *.o *.a tags test test_fast test_g \ --- -2.6.1 - diff --git a/net-libs/http-parser/files/0002-makefile-quote-variables.patch b/net-libs/http-parser/files/0002-makefile-quote-variables.patch deleted file mode 100644 index 096ac6b6bd6..00000000000 --- a/net-libs/http-parser/files/0002-makefile-quote-variables.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9bce473ba7417b45bfdb59d4151a8857dcfff4ad Mon Sep 17 00:00:00 2001 -From: hasufell <hasuf...@hasufell.de> -Date: Mon, 2 Nov 2015 16:27:06 +0100 -Subject: [PATCH 2/4] makefile: quote variables - -Make does not take care of this in make rules. If any of the variables -DESTDIR, INCLUDEDIR or LIBDIR contain whitespaces, then the related -install command will fail. - -This is even more important for the uninstall rule. ---- - Makefile | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index 76153a0..8c4a9d7 100644 ---- a/Makefile -+++ b/Makefile -@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c - ctags $^ - - install: library -- $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h -- $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) -+ $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" -+ $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" -+ ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" - - install-strip: library -- $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h -- $(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) -+ $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" -+ $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" -+ ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" - - uninstall: -- rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h -- rm $(DESTDIR)$(LIBDIR)/$(SONAME) -- rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so -+ rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" -+ rm "$(DESTDIR)$(LIBDIR)/$(SONAME)" -+ rm "$(DESTDIR)$(LIBDIR)/libhttp_parser.so" - - clean: - rm -f *.o *.a tags test test_fast test_g \ --- -2.6.1 - diff --git a/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch b/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch deleted file mode 100644 index cafe68d220c..00000000000 --- a/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f45b38c42e7e92a5d0215c44dcf306616536011e Mon Sep 17 00:00:00 2001 -From: hasufell <hasuf...@hasufell.de> -Date: Mon, 2 Nov 2015 16:32:11 +0100 -Subject: [PATCH 3/4] makefile: fix SONAME symlink, it should not be a full - path - -The symlink destination being a full path doesn't give any benefit and -may break a few use cases of copying these files to a different -destination, while preserving the symlink. ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 8c4a9d7..cbe93e8 100644 ---- a/Makefile -+++ b/Makefile -@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c - install: library - $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" - $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" -- ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" -+ ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" - - install-strip: library - $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" - $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" -- ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" -+ ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" - - uninstall: - rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" --- -2.6.1 - diff --git a/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch b/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch deleted file mode 100644 index e21cd715499..00000000000 --- a/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 62b1450cfe2e0df2d912279d38edf1b916020101 Mon Sep 17 00:00:00 2001 -From: hasufell <hasuf...@hasufell.de> -Date: Mon, 2 Nov 2015 16:39:31 +0100 -Subject: [PATCH 4/4] makefile: add CFLAGS to linking command - -Although we compile the objects explicitly there are some CFLAGS -that may also affect linking, which is not always obvious. - -This can also be a problem for toolchains that support multiple ABIs -and need to set CFLAGS=<abi selector>, which will cause linking -to either fail or produce an unusable executable/library. ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index cbe93e8..ae16f08 100644 ---- a/Makefile -+++ b/Makefile -@@ -102,7 +102,7 @@ libhttp_parser.o: http_parser.c http_parser.h Makefile - $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o - - library: libhttp_parser.o -- $(CC) $(LDFLAGS_LIB) -o $(SONAME) $< -+ $(CC) $(CFLAGS_LIB) $(LDFLAGS_LIB) -o $(SONAME) $< - - package: http_parser.o - $(AR) rcs libhttp_parser.a http_parser.o --- -2.6.1 - diff --git a/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch b/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch deleted file mode 100644 index da966373063..00000000000 --- a/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b67bfbe6a07529dd82e2ee83b6848d017e6e422f Mon Sep 17 00:00:00 2001 -From: hasufell <hasuf...@hasufell.de> -Date: Mon, 2 Nov 2015 16:51:28 +0100 -Subject: [PATCH 5/5] makefile: fix install rule dependency - -Otherwise the install rule will recompile the library, no matter -if it has already been compiled. ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index ae16f08..df0b59f 100644 ---- a/Makefile -+++ b/Makefile -@@ -122,12 +122,12 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c - tags: http_parser.c http_parser.h test.c - ctags $^ - --install: library -+install: $(SONAME) - $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" - $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" - ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" - --install-strip: library -+install-strip: $(SONAME) - $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" - $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" - ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" --- -2.6.1 - diff --git a/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch b/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch deleted file mode 100644 index b04b4a32bb0..00000000000 --- a/net-libs/http-parser/files/http-parser-2.6.2-darwin.patch +++ /dev/null @@ -1,16 +0,0 @@ -Makefile: set install_name on Darwin - -https://bugs.gentoo.org/show_bug.cgi?id=546098 -https://github.com/nodejs/http-parser/issues/356 - ---- http-parser-2.6.2/Makefile -+++ http-parser-2.6.2/Makefile -@@ -62,6 +62,8 @@ - ifneq (darwin,$(PLATFORM)) - # TODO(bnoordhuis) The native SunOS linker expects -h rather than -soname... - LDFLAGS_LIB += -Wl,-soname=$(SONAME) -+else -+LDFLAGS_LIB += -Wl,-install_name,$(LIBDIR)/$(SONAME) - endif - - test: test_g test_fast diff --git a/net-libs/http-parser/http-parser-2.6.2.ebuild b/net-libs/http-parser/http-parser-2.6.2.ebuild deleted file mode 100644 index 33986a95474..00000000000 --- a/net-libs/http-parser/http-parser-2.6.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs multilib multilib-minimal - -DESCRIPTION="Http request/response parser for C" -HOMEPAGE="https://github.com/nodejs/http-parser"; -SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x64-solaris" -IUSE="static-libs" - -# https://github.com/nodejs/http-parser/pull/272 -PATCHES=( - "${FILESDIR}"/0001-makefile-fix-DESTDIR-usage.patch - "${FILESDIR}"/0002-makefile-quote-variables.patch - "${FILESDIR}"/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch - "${FILESDIR}"/0004-makefile-add-CFLAGS-to-linking-command.patch - "${FILESDIR}"/0005-makefile-fix-install-rule-dependency.patch - "${FILESDIR}"/${PN}-2.6.2-darwin.patch -) - -src_prepare() { - tc-export CC AR - epatch "${PATCHES[@]}" - multilib_copy_sources -} - -multilib_src_compile() { - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library - use static-libs && emake CFLAGS_FAST="${CFLAGS}" package -} - -multilib_src_test() { - emake CFLAGS_DEBUG="${CFLAGS}" test -} - -multilib_src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install - use static-libs && dolib.a libhttp_parser.a -} diff --git a/net-libs/http-parser/http-parser-2.8.0.ebuild b/net-libs/http-parser/http-parser-2.8.0.ebuild deleted file mode 100644 index c4563e4bf41..00000000000 --- a/net-libs/http-parser/http-parser-2.8.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multilib-minimal - -DESCRIPTION="HTTP request/response parser for C" -HOMEPAGE="https://github.com/nodejs/http-parser"; -SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x64-solaris" -IUSE="static-libs" - -src_prepare() { - default - tc-export CC AR - multilib_copy_sources -} - -multilib_src_compile() { - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library - use static-libs && emake CFLAGS_FAST="${CFLAGS}" package -} - -multilib_src_test() { - emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test -} - -multilib_src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install - use static-libs && dolib.a libhttp_parser.a -}
