| 1 |
commit: 406d69036668018cd3086eff091b37c36019ffc9 |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 19 13:35:52 2020 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 19 13:42:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406d6903 |
| 7 |
|
| 8 |
net-proxy/privoxy: fix build without native symlinks and custom STRIP |
| 9 |
|
| 10 |
Original GNUMakefile uses $(STRIP) to pass optional -s argument to |
| 11 |
install and $(STRIP_PROG) for strip binary. This caused problems |
| 12 |
with custom STRIP set by portage. Fixed now by using $(STRIP) and |
| 13 |
$(STRIP_ARGS). |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/732572 |
| 16 |
Package-Manager: Portage-3.0.3, Repoman-3.0.0 |
| 17 |
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> |
| 18 |
|
| 19 |
net-proxy/privoxy/files/privoxy-3.0.28-strip.patch | 47 ++++++++++++++++++++++ |
| 20 |
net-proxy/privoxy/privoxy-3.0.28-r1.ebuild | 1 + |
| 21 |
2 files changed, 48 insertions(+) |
| 22 |
|
| 23 |
diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch b/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..2ca24330b46 |
| 26 |
--- /dev/null |
| 27 |
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch |
| 28 |
@@ -0,0 +1,47 @@ |
| 29 |
+Privory uses STRIP Makefile variable for passing strip argument, |
| 30 |
+this clashes with STRIP set in the environment. So rename STRIP -> |
| 31 |
+STRIP_ARGS and then use real STRIP instead of STRIP_PROG with |
| 32 |
+fallback on predefined "strip" if STRIP is not set. |
| 33 |
+ |
| 34 |
+--- privoxy-3.0.28-stable/GNUmakefile.in.orig 2020-08-19 15:24:46.930551734 +0300 |
| 35 |
++++ privoxy-3.0.28-stable/GNUmakefile.in 2020-08-19 16:12:18.214837417 +0300 |
| 36 |
+@@ -117,7 +117,7 @@ |
| 37 |
+ CP = cp -f |
| 38 |
+ RMDIR = rmdir |
| 39 |
+ MKDIR = ./mkinstalldirs |
| 40 |
+-STRIP_PROG = strip |
| 41 |
++STRIP ?= strip |
| 42 |
+ SED = sed |
| 43 |
+ GREP = grep |
| 44 |
+ CAT = cat |
| 45 |
+@@ -391,7 +391,7 @@ |
| 46 |
+ @$(ECHO) "You have run autoconf && autoheader && ./configure right?" |
| 47 |
+ @$(ECHO) "" |
| 48 |
+ $(MAKE) $(PROGRAM) |
| 49 |
+- $(STRIP_PROG) $(PROGRAM) |
| 50 |
++ $(STRIP) $(PROGRAM) |
| 51 |
+ $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS) |
| 52 |
+ # add program |
| 53 |
+ (cd .. && $(TAR) --exclude "PACKAGERS" -cvhf $(GEN_DIST_TAR_NAME) privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM)) |
| 54 |
+@@ -822,7 +822,7 @@ |
| 55 |
+ fi) |
| 56 |
+ |
| 57 |
+ install-strip: |
| 58 |
+- $(MAKE) install STRIP=-s |
| 59 |
++ $(MAKE) install STRIP_ARG=-s |
| 60 |
+ |
| 61 |
+ # FIXME: Test USER and GROUP on Slack to make sure this works as |
| 62 |
+ # intended. |
| 63 |
+@@ -848,10 +848,10 @@ |
| 64 |
+ $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \ |
| 65 |
+ $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST) |
| 66 |
+ @# Install the executable binary, strip if invoked as install-strip |
| 67 |
+- @test -n "$(STRIP)" &&\ |
| 68 |
++ @test -n "$(STRIP_ARG)" &&\ |
| 69 |
+ $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\ |
| 70 |
+ $(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST) |
| 71 |
+- $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST) |
| 72 |
++ $(INSTALL) $(INSTALL_P) $(STRIP_ARG) $(PROGRAM) $(DESTDIR)$(SBIN_DEST) |
| 73 |
+ |
| 74 |
+ @# Install the DOCS and man page. install-sh only does one file at a time. |
| 75 |
+ @# FIXME: only handles jpegs. |
| 76 |
|
| 77 |
diff --git a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild |
| 78 |
index 4bf768abcc4..7df385fb2d2 100644 |
| 79 |
--- a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild |
| 80 |
+++ b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild |
| 81 |
@@ -48,6 +48,7 @@ PATCHES=( |
| 82 |
"${FILESDIR}"/${PN}-3.0.19-gentoo.patch |
| 83 |
"${FILESDIR}"/${P}-chdir.patch |
| 84 |
"${FILESDIR}"/${P}-null-termination.patch |
| 85 |
+ "${FILESDIR}"/${P}-strip.patch |
| 86 |
) |
| 87 |
|
| 88 |
pkg_pretend() { |
Archives