1 |
commit: 2090c80453f96c2beb68d2e9fd2840f9eae9964e |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jan 4 19:35:47 2018 +0000 |
4 |
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 5 11:38:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2090c804 |
7 |
|
8 |
net-libs/pacparser: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/6749 |
11 |
|
12 |
.../pacparser/files/pacparser-1.3.1-makefile.patch | 66 ---------------------- |
13 |
1 file changed, 66 deletions(-) |
14 |
|
15 |
diff --git a/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch b/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch |
16 |
deleted file mode 100644 |
17 |
index a1434075d18..00000000000 |
18 |
--- a/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch |
19 |
+++ /dev/null |
20 |
@@ -1,66 +0,0 @@ |
21 |
-diff -Nur pacparser-1.3.1.orig/src/Makefile pacparser-1.3.1/src/Makefile |
22 |
---- pacparser-1.3.1.orig/src/Makefile 2013-11-26 04:21:24.000000000 +0000 |
23 |
-+++ pacparser-1.3.1/src/Makefile 2013-11-26 04:27:11.000000000 +0000 |
24 |
-@@ -55,7 +55,7 @@ |
25 |
- endif |
26 |
- endif |
27 |
- |
28 |
--CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION) |
29 |
-+CFLAGS := $(CFLAGS) -g -DXP_UNIX -Wall -DVERSION=$(VERSION) |
30 |
- |
31 |
- ifndef PYTHON |
32 |
- PYTHON = python |
33 |
-@@ -67,13 +67,14 @@ |
34 |
- |
35 |
- LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX) |
36 |
- PREFIX := $(DESTDIR)$(PREFIX) |
37 |
--LIB_PREFIX = $(PREFIX)/lib |
38 |
--INC_PREFIX = $(PREFIX)/include |
39 |
--BIN_PREFIX = $(PREFIX)/bin |
40 |
--MAN_PREFIX = $(PREFIX)/share/man |
41 |
-+LIB_PREFIX := $(PREFIX)/lib |
42 |
-+INC_PREFIX := $(PREFIX)/include |
43 |
-+BIN_PREFIX := $(PREFIX)/bin |
44 |
-+MAN_PREFIX := $(PREFIX)/share/man |
45 |
-+DOC_PREFIX := $(PREFIX)/share/doc/pacparser |
46 |
- |
47 |
- .PHONY: clean pymod install-pymod |
48 |
--all: testpactester |
49 |
-+all: pactester |
50 |
- |
51 |
- spidermonkey/js/src: spidermonkey/js-?.?.?.tar.gz |
52 |
- tar xzvf spidermonkey/js-?.?.?.tar.gz -C spidermonkey |
53 |
-@@ -97,7 +98,7 @@ |
54 |
- ln -sf $(LIBRARY) $(LIBRARY_LINK) |
55 |
- |
56 |
- pactester: pactester.c pacparser.h $(LIBRARY_LINK) |
57 |
-- $(CC) pactester.c -o pactester -lpacparser -L. -I. |
58 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) pactester.c -o pactester -lpacparser -L. -I. |
59 |
- |
60 |
- testpactester: pactester |
61 |
- echo "Running tests for pactester." |
62 |
-@@ -118,16 +119,20 @@ |
63 |
- # install pacparser manpages |
64 |
- install -d $(MAN_PREFIX)/man3/ |
65 |
- (test -d ../docs && install -m 644 ../docs/man/man3/*.3 $(MAN_PREFIX)/man3/) || true |
66 |
-+ |
67 |
-+install-docs: |
68 |
- # install html docs |
69 |
-- install -d $(PREFIX)/share/doc/pacparser/html/ |
70 |
-- (test -d ../docs/html && install -m 644 ../docs/html/* $(PREFIX)/share/doc/pacparser/html/) || true |
71 |
-+ install -d $(DOC_PREFIX)/html/ |
72 |
-+ (test -d ../docs/html && install -m 644 ../docs/html/* $(DOC_PREFIX)/html/) || true |
73 |
- # install examples |
74 |
-- install -d $(PREFIX)/share/doc/pacparser/examples/ |
75 |
-- (test -d ../examples && install -m 644 ../examples/* $(PREFIX)/share/doc//pacparser/examples/) || true |
76 |
-+ install -d $(DOC_PREFIX)/examples/ |
77 |
-+ (test -d ../examples && install -m 644 ../examples/* $(DOC_PREFIX)/examples/) || true |
78 |
- |
79 |
- # Targets to build python module |
80 |
- pymod: pacparser.o pacparser.h libjs.a |
81 |
- cd pymod && ARCHFLAGS="" $(PYTHON) setup.py build |
82 |
-+ |
83 |
-+test-pymod: pymod |
84 |
- $(PYTHON) ../tests/runtests.py |
85 |
- |
86 |
- install-pymod: pymod |