Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/webmcp/files/
Date: Sat, 28 Dec 2019 20:25:24
Message-Id: 1577564659.b4b74f7ed1e2dc0d6a0c5813a75bd06615195178.tupone@gentoo
1 commit: b4b74f7ed1e2dc0d6a0c5813a75bd06615195178
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 28 20:20:37 2019 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 28 20:24:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b74f7e
7
8 www-apps/webmcp: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/14154
11 Package-Manager: Portage-2.3.79, Repoman-2.3.16
12 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
13
14 www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch | 141 ------------------------
15 1 file changed, 141 deletions(-)
16
17 diff --git a/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
18 deleted file mode 100644
19 index 2cd506583e6..00000000000
20 --- a/www-apps/webmcp/files/webmcp-1.2.5-gentoo.patch
21 +++ /dev/null
22 @@ -1,141 +0,0 @@
23 ---- Makefile.old 2013-03-12 21:49:03.976676966 +0100
24 -+++ Makefile 2013-03-12 21:50:02.888103540 +0100
25 -@@ -1,11 +1,11 @@
26 - include Makefile.options
27 -
28 - all::
29 -- make documentation
30 -- make accelerator
31 -- make libraries
32 -- make symlinks
33 -- make precompile
34 -+ $(MAKE) documentation
35 -+ $(MAKE) accelerator
36 -+ $(MAKE) libraries
37 -+ $(MAKE) symlinks
38 -+ $(MAKE) precompile
39 -
40 - documentation::
41 - rm -f doc/autodoc.tmp
42 -@@ -14,12 +14,12 @@
43 - rm -f doc/autodoc.tmp
44 -
45 - accelerator::
46 -- cd framework/accelerator; make
47 -+ $(MAKE) -C framework/accelerator
48 -
49 - libraries::
50 -- cd libraries/extos; make
51 -- cd libraries/mondelefant; make
52 -- cd libraries/multirand; make
53 -+ $(MAKE) -C libraries/extos
54 -+ $(MAKE) -C libraries/mondelefant
55 -+ $(MAKE) -C libraries/multirand
56 -
57 - symlinks::
58 - ln -s -f ../../libraries/atom/atom.lua framework/lib/
59 ---- Makefile.options.old 2013-03-12 21:54:27.245530485 +0100
60 -+++ Makefile.options 2013-03-12 21:55:45.756768247 +0100
61 -@@ -10,13 +8,13 @@
62 - # C compiler flags
63 - # TODO: check alternatives to -D_GNU_SOURCE -fPIC
64 - # using libtool?
65 --CFLAGS = -O2 -D_GNU_SOURCE -fPIC -Wall -I /usr/include -I /usr/local/include
66 -+CPPFLAGS = -D_GNU_SOURCE
67 -
68 - # additional C compiler flags for parts which depend on PostgreSQL
69 - CFLAGS_PGSQL = -I /usr/include/postgresql -I /usr/include/postgresql/server -I /usr/local/include/postgresql -I /usr/local/include/postgresql/server
70 -
71 - # linker flags
72 --LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
73 -+LDFLAGS += -shared
74 -
75 - # additional linker flags for parts which depend on PostgreSQL
76 - LDFLAGS_PGSQL =
77 ---- libraries/extos/Makefile.old 2013-03-13 21:49:19.710360750 +0100
78 -+++ libraries/extos/Makefile 2013-03-13 21:49:47.778096460 +0100
79 -@@ -1,7 +1,7 @@
80 - include ../../Makefile.options
81 -
82 - extos.so: extos.o
83 -- $(LD) $(LDFLAGS) -lrt -lcrypt -o extos.$(SLIB_EXT) extos.o
84 -+ $(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
85 -
86 - extos.o: extos.c
87 - $(CC) -c $(CFLAGS) -o extos.o extos.c
88 ---- libraries/mondelefant/Makefile.old 2013-03-13 21:52:54.884250479 +0100
89 -+++ libraries/mondelefant/Makefile 2013-03-13 21:53:27.511932686 +0100
90 -@@ -1,7 +1,7 @@
91 - include ../../Makefile.options
92 -
93 - mondelefant_native.so: mondelefant_native.o
94 -- $(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq
95 -+ $(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
96 -
97 - mondelefant_native.o: mondelefant_native.c
98 - $(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
99 ---- libraries/multirand/Makefile.old 2013-03-13 21:54:29.399328173 +0100
100 -+++ libraries/multirand/Makefile 2013-03-13 21:54:58.019048434 +0100
101 -@@ -1,7 +1,7 @@
102 - include ../../Makefile.options
103 -
104 - multirand.so: multirand.o
105 -- $(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o
106 -+ $(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
107 -
108 - multirand.o: multirand.c
109 - $(CC) -c $(CFLAGS) -o multirand.o multirand.c
110 ---- libraries/extos/extos.c.old 2013-04-05 23:19:52.028115226 +0200
111 -+++ libraries/extos/extos.c 2013-04-05 23:20:14.819896253 +0200
112 -@@ -12,6 +12,7 @@
113 - #include <fcntl.h>
114 - #include <poll.h>
115 - #include <stdlib.h>
116 -+#include <crypt.h>
117 -
118 - #define EXTOS_MAX_ERRLEN 80
119 - #define EXTOS_EXEC_MAX_ARGS 64
120 ---- framework/accelerator/Makefile.old 2014-06-21 20:15:21.019918183 +0200
121 -+++ framework/accelerator/Makefile 2014-06-21 20:15:44.700471794 +0200
122 -@@ -4,7 +4,7 @@
123 - $(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
124 -
125 - webmcp_accelerator.o: webmcp_accelerator.c
126 -- $(CC) -c $(CFLAGS) -o webmcp_accelerator.o webmcp_accelerator.c
127 -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o webmcp_accelerator.o webmcp_accelerator.c
128 -
129 - clean::
130 - rm -f webmcp_accelerator.so webmcp_accelerator.o
131 ---- libraries/extos/Makefile.old 2014-06-21 20:18:25.594611956 +0200
132 -+++ libraries/extos/Makefile 2014-06-21 20:18:50.457183029 +0200
133 -@@ -4,7 +4,7 @@
134 - $(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
135 -
136 - extos.o: extos.c
137 -- $(CC) -c $(CFLAGS) -o extos.o extos.c
138 -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o extos.o extos.c
139 -
140 - clean::
141 - rm -f extos.so extos.o
142 ---- libraries/mondelefant/Makefile.old 2014-06-21 20:19:58.218962359 +0200
143 -+++ libraries/mondelefant/Makefile 2014-06-21 20:20:24.527476578 +0200
144 -@@ -4,7 +4,7 @@
145 - $(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
146 -
147 - mondelefant_native.o: mondelefant_native.c
148 -- $(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
149 -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
150 -
151 - test:: mondelefant_native.so mondelefant.lua
152 - lua -l mondelefant
153 ---- libraries/multirand/Makefile.old 2014-06-21 20:21:36.950197127 +0200
154 -+++ libraries/multirand/Makefile 2014-06-21 20:22:04.967703944 +0200
155 -@@ -4,7 +4,7 @@
156 - $(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
157 -
158 - multirand.o: multirand.c
159 -- $(CC) -c $(CFLAGS) -o multirand.o multirand.c
160 -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC -o multirand.o multirand.c
161 -
162 - clean::
163 - rm -f multirand.so multirand.o