1 |
commit: 0b9c249b5b7270ee043bac1a3368d44e83205762 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Wed Apr 6 06:40:32 2022 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 6 23:37:16 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9c249b |
7 |
|
8 |
dev-db/mysql-super-smack: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/24927 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../mysql-super-smack-1.3-automake-1.13.patch | 256 --------------------- |
16 |
1 file changed, 256 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch |
19 |
deleted file mode 100644 |
20 |
index 6cf69580b887..000000000000 |
21 |
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch |
22 |
+++ /dev/null |
23 |
@@ -1,256 +0,0 @@ |
24 |
-diff -aurwN a/configure.ac b/configure.ac |
25 |
---- a/configure.ac 2014-06-20 14:43:52.744753334 -0400 |
26 |
-+++ b/configure.ac 2014-06-20 14:59:51.263609319 -0400 |
27 |
-@@ -16,9 +16,9 @@ |
28 |
- |
29 |
- # Process this file with autoconf to produce a configure script. |
30 |
- |
31 |
--AC_INIT() |
32 |
-+AC_INIT([super-smack], [1.1]) |
33 |
- AM_CONFIG_HEADER(config.h) |
34 |
--AM_INIT_AUTOMAKE(super-smack, 1.1) |
35 |
-+AM_INIT_AUTOMAKE |
36 |
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION") |
37 |
- |
38 |
- # Checks for programs. |
39 |
-@@ -31,6 +31,14 @@ |
40 |
- AM_PROG_LEX |
41 |
- AC_PROG_YACC |
42 |
- |
43 |
-+AH_TEMPLATE([HAVE_CRYPT], [Define if we have a crypt()]) |
44 |
-+AH_TEMPLATE([HAVE_MYSQL], [MySQL Support]) |
45 |
-+AH_TEMPLATE([HAVE_ORACLE], [PostgreSQL Support]) |
46 |
-+AH_TEMPLATE([HAVE_PGSQL], [Oracle Support]) |
47 |
-+AH_TEMPLATE([SMACK_DATADIR], [Sample .smack data files]) |
48 |
-+ |
49 |
-+AC_CONFIG_MACRO_DIRS([m4]) |
50 |
-+ |
51 |
- # get super-smack datadir |
52 |
- AC_ARG_WITH(datadir, |
53 |
- [ --with-datadir=DIR Specify default smack datadir], |
54 |
-diff -aurwN a/m4/crypt.m4 b/m4/crypt.m4 |
55 |
---- a/m4/crypt.m4 1969-12-31 19:00:00.000000000 -0500 |
56 |
-+++ b/m4/crypt.m4 2014-06-20 15:06:42.289976907 -0400 |
57 |
-@@ -0,0 +1,5 @@ |
58 |
-+AC_DEFUN([AC_FUNC_CRYPT], [ |
59 |
-+ AC_CHECK_LIB(crypt, crypt) |
60 |
-+ AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT)) |
61 |
-+]) |
62 |
-+ |
63 |
-diff -aruwN a/m4/lex.m4 b/m4/lex.m4 |
64 |
---- a/m4/lex.m4 1969-12-31 19:00:00.000000000 -0500 |
65 |
-+++ b/m4/lex.m4 2014-06-20 16:51:23.548854098 -0400 |
66 |
-@@ -0,0 +1,6 @@ |
67 |
-+AC_DEFUN([AM_PROG_LEX], |
68 |
-+[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1) |
69 |
-+AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") |
70 |
-+AC_PROG_LEX |
71 |
-+AC_DECL_YYTEXT]) |
72 |
-+ |
73 |
-diff -aurwN a/m4/libz.m4 b/m4/libz.m4 |
74 |
---- a/m4/libz.m4 1969-12-31 19:00:00.000000000 -0500 |
75 |
-+++ b/m4/libz.m4 2014-06-20 15:06:24.260569878 -0400 |
76 |
-@@ -0,0 +1,4 @@ |
77 |
-+AC_DEFUN([AC_LIB_Z], [ |
78 |
-+ AC_CHECK_LIB(z, compress) |
79 |
-+]) |
80 |
-+ |
81 |
-diff -aurwN a/m4/mysql.m4 b/m4/mysql.m4 |
82 |
---- a/m4/mysql.m4 1969-12-31 19:00:00.000000000 -0500 |
83 |
-+++ b/m4/mysql.m4 2014-06-20 15:10:48.291892456 -0400 |
84 |
-@@ -0,0 +1,76 @@ |
85 |
-+#serial 1 |
86 |
-+AC_DEFUN([AC_LIB_MYSQL], [ |
87 |
-+ AC_ARG_WITH(mysql-lib, |
88 |
-+ [ --with-mysql-lib=DIR Look for MySQL client library in DIR], |
89 |
-+ mysql_lib=$withval, mysql_lib="") |
90 |
-+ |
91 |
-+ if test "x$want_mysql" = "xyes" |
92 |
-+ then |
93 |
-+ AC_MSG_CHECKING([for libmysqlclient]) |
94 |
-+ AC_MSG_RESULT() |
95 |
-+ |
96 |
-+ mysql_ok=no |
97 |
-+ |
98 |
-+ SAVE_LIBS=$LIBS |
99 |
-+ |
100 |
-+ mysql_lib="$mysql_lib /usr/lib /usr/lib/mysql \ |
101 |
-+ /usr/local/lib /usr/local/lib/mysql \ |
102 |
-+ /usr/local/mysql/lib" |
103 |
-+ |
104 |
-+ for dir in $mysql_lib; do |
105 |
-+ if test "x$mysql_found" != "xyes" |
106 |
-+ then |
107 |
-+ if test -f "$dir/libmysqlclient.so" ; |
108 |
-+ then |
109 |
-+ LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB" |
110 |
-+ MYSQL_LIB="-L$dir -lmysqlclient $LIBZ_LIB" |
111 |
-+ AC_SUBST(MYSQL_LIB) |
112 |
-+ AC_CHECK_LIB(mysqlclient, mysql_real_connect, |
113 |
-+ mysql_ok=yes, mysql_ok=no) |
114 |
-+ fi |
115 |
-+ fi |
116 |
-+ done |
117 |
-+ |
118 |
-+ if test "x$mysql_ok" != "xyes" |
119 |
-+ then |
120 |
-+ AC_MSG_ERROR([Could not find libmysqlclient in '$mysql_lib']) |
121 |
-+ fi |
122 |
-+ fi |
123 |
-+]) |
124 |
-+ |
125 |
-+AC_DEFUN([AC_HEADER_MYSQL], [ |
126 |
-+ AC_ARG_WITH(mysql-include, |
127 |
-+ [ --with-mysql-include=DIR |
128 |
-+ Look for MySQL include files in DIR], |
129 |
-+ mysql_include=$withval, mysql_include="") |
130 |
-+ |
131 |
-+ if test "x$want_mysql" = "xyes" |
132 |
-+ then |
133 |
-+ AC_MSG_CHECKING([for mysql.h]) |
134 |
-+ AC_MSG_RESULT() |
135 |
-+ |
136 |
-+ mysql_found=no |
137 |
-+ |
138 |
-+ mysql_include="$mysql_include /usr/include /usr/include/mysql \ |
139 |
-+ /usr/local/include /usr/local/include/mysql \ |
140 |
-+ /usr/local/mysql/include" |
141 |
-+ |
142 |
-+ for dir in $mysql_include; do |
143 |
-+ if test "x$mysql_found" != "xyes" |
144 |
-+ then |
145 |
-+ if test -f "$dir/mysql.h" |
146 |
-+ then |
147 |
-+ MYSQL_INCLUDE="-I$dir" |
148 |
-+ AC_SUBST(MYSQL_INCLUDE) |
149 |
-+ mysql_found=yes |
150 |
-+ fi |
151 |
-+ fi |
152 |
-+ done |
153 |
-+ |
154 |
-+ if test "x$mysql_found" != "xyes" |
155 |
-+ then |
156 |
-+ AC_MSG_ERROR([Could not find mysql.h in '$mysql_include']) |
157 |
-+ fi |
158 |
-+ fi |
159 |
-+]) |
160 |
-+ |
161 |
-diff -aurwN a/m4/oracle.m4 b/m4/oracle.m4 |
162 |
---- a/m4/oracle.m4 1969-12-31 19:00:00.000000000 -0500 |
163 |
-+++ b/m4/oracle.m4 2014-06-20 15:05:05.543169365 -0400 |
164 |
-@@ -0,0 +1,10 @@ |
165 |
-+AC_DEFUN([AC_LIB_ORACLE], [ |
166 |
-+ ORACLE_LIB="" |
167 |
-+ AC_SUBST(ORACLE_LIB) |
168 |
-+]) |
169 |
-+ |
170 |
-+AC_DEFUN([AC_HEADER_ORACLE], [ |
171 |
-+ ORACLE_INCLUDE="" |
172 |
-+ AC_SUBST(ORACLE_INCLUDE) |
173 |
-+]) |
174 |
-+ |
175 |
-diff -aurwN a/m4/postgresql.m4 b/m4/postgresql.m4 |
176 |
---- a/m4/postgresql.m4 1969-12-31 19:00:00.000000000 -0500 |
177 |
-+++ b/m4/postgresql.m4 2014-06-20 15:06:09.311064874 -0400 |
178 |
-@@ -0,0 +1,75 @@ |
179 |
-+AC_DEFUN([AC_LIB_PGSQL], [ |
180 |
-+ AC_ARG_WITH(pgsql-lib, |
181 |
-+ [ --with-pgsql-lib=DIR Look for PostgreSQL client library in DIR], |
182 |
-+ pgsql_lib=$withval, pgsql_lib="") |
183 |
-+ |
184 |
-+ if test "x$want_pgsql" = "xyes" |
185 |
-+ then |
186 |
-+ AC_MSG_CHECKING([for libpq]) |
187 |
-+ AC_MSG_RESULT() |
188 |
-+ |
189 |
-+ pgsql_ok=no |
190 |
-+ |
191 |
-+ SAVE_LIBS=$LIBS |
192 |
-+ |
193 |
-+ pgsql_lib="$pgsql_lib /usr/lib /usr/lib/pgsql \ |
194 |
-+ /usr/local/lib /usr/local/lib/pgsql \ |
195 |
-+ /usr/local/pgsql/lib" |
196 |
-+ |
197 |
-+ for dir in $pgsql_lib; do |
198 |
-+ if test "x$pgsql_found" != "xyes" |
199 |
-+ then |
200 |
-+ if test -f "$dir/libpq.so" |
201 |
-+ then |
202 |
-+ LIBS="-L$dir $SAVE_LIBS" |
203 |
-+ PGSQL_LIB="-L$dir -lpq" |
204 |
-+ AC_SUBST(PGSQL_LIB) |
205 |
-+ AC_CHECK_LIB(pq, PQconnectdb, |
206 |
-+ pgsql_ok=yes, pgsql_ok=no) |
207 |
-+ fi |
208 |
-+ fi |
209 |
-+ done |
210 |
-+ |
211 |
-+ if test "x$pgsql_ok" != "xyes" |
212 |
-+ then |
213 |
-+ AC_MSG_ERROR([Could not find libpq in '$pgsql_lib']) |
214 |
-+ fi |
215 |
-+ fi |
216 |
-+]) |
217 |
-+ |
218 |
-+AC_DEFUN([AC_HEADER_PGSQL], [ |
219 |
-+ AC_ARG_WITH(pgsql-include, |
220 |
-+ [ --with-pgsql-include=DIR |
221 |
-+ Look for PostgreSQL include files in DIR], |
222 |
-+ pgsql_include=$withval, pgsql_include="") |
223 |
-+ |
224 |
-+ if test "x$want_pgsql" = "xyes" |
225 |
-+ then |
226 |
-+ AC_MSG_CHECKING([for libpq-fe.h]) |
227 |
-+ AC_MSG_RESULT() |
228 |
-+ |
229 |
-+ pgsql_found=no |
230 |
-+ |
231 |
-+ pgsql_include="$pgsql_include /usr/include /usr/include/pgsql \ |
232 |
-+ /usr/local/include /usr/local/include/pgsql \ |
233 |
-+ /usr/local/pgsql/include" |
234 |
-+ |
235 |
-+ for dir in $pgsql_include; do |
236 |
-+ if test "x$pgsql_found" != "xyes" |
237 |
-+ then |
238 |
-+ if test -f "$dir/libpq-fe.h" |
239 |
-+ then |
240 |
-+ PGSQL_INCLUDE="-I$dir" |
241 |
-+ AC_SUBST(PGSQL_INCLUDE) |
242 |
-+ pgsql_found=yes |
243 |
-+ fi |
244 |
-+ fi |
245 |
-+ done |
246 |
-+ |
247 |
-+ if test "x$pgsql_found" != "xyes" |
248 |
-+ then |
249 |
-+ AC_MSG_ERROR([Could not find libpq-fe.h in '$pgsql_include']) |
250 |
-+ fi |
251 |
-+ fi |
252 |
-+]) |
253 |
-+ |
254 |
-diff -aurwN a/src/Makefile.am b/src/Makefile.am |
255 |
---- a/src/Makefile.am 2014-06-20 14:37:35.266956252 -0400 |
256 |
-+++ b/src/Makefile.am 2014-06-20 15:12:40.278227315 -0400 |
257 |
-@@ -16,7 +16,8 @@ |
258 |
- |
259 |
- # Process this file with automake to create Makefile.in |
260 |
- |
261 |
--INCLUDES = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@ |
262 |
-+AM_CPPFLAGS = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@ |
263 |
-+BUILT_SOURCES = super-smack-yacc.hh |
264 |
- |
265 |
- noinst_PROGRAMS=test-dictionary test-client test_tcp_client |
266 |
- bin_PROGRAMS=super-smack super-smack-gen-data |
267 |
-diff -aurN a/src/super-smack-lex.ll b/src/super-smack-lex.ll |
268 |
---- a/src/super-smack-lex.ll 2003-05-14 21:08:34.000000000 -0400 |
269 |
-+++ b/src/super-smack-lex.ll 2014-06-24 08:56:05.970614176 -0400 |
270 |
-@@ -6,7 +6,7 @@ |
271 |
- #include <ctype.h> |
272 |
- #include "query.h" |
273 |
- #include "parse.h" |
274 |
-- #include "super-smack-yacc.h" |
275 |
-+ #include "super-smack-yacc.hh" |
276 |
- |
277 |
- static string q_str = ""; |
278 |
- %} |
279 |
- |