~mdw / termux-packages / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
packages/catacomb2: Support assembler code on Android.
[termux-packages] / packages / catacomb2 / termux-logging-weirdness.patch
CommitLineData
3839123a
MW		 1diff -ru catacomb-2.4.1/Makefile.in catacomb-2.4.1.hack/Makefile.in
2--- catacomb-2.4.1/Makefile.in 2017-06-22 11:23:40.000000000 +0100
3+++ catacomb-2.4.1.hack/Makefile.in 2018-05-20 00:32:54.855517583 +0100
4@@ -414,6 +414,7 @@
5 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
6 LIPO = @LIPO@
7 LN_S = @LN_S@
8+LOGLIBS = @LOGLIBS@
9 LTLIBOBJS = @LTLIBOBJS@
10 MAKEINFO = @MAKEINFO@
11 MANIFEST_TOOL = @MANIFEST_TOOL@
12@@ -502,6 +503,7 @@
13 psdir = @psdir@
14 pyexecdir = @pyexecdir@
15 pythondir = @pythondir@
16+runstatedir = @runstatedir@
17 sbindir = @sbindir@
18 sharedstatedir = @sharedstatedir@
19 srcdir = @srcdir@
20Only in catacomb-2.4.1.hack/: autom4te.cache
21diff -ru catacomb-2.4.1/base/Makefile.in catacomb-2.4.1.hack/base/Makefile.in
22--- catacomb-2.4.1/base/Makefile.in 2017-06-22 11:23:39.000000000 +0100
23+++ catacomb-2.4.1.hack/base/Makefile.in 2018-05-20 00:32:53.999505492 +0100
24@@ -349,6 +349,7 @@
25 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
26 LIPO = @LIPO@
27 LN_S = @LN_S@
28+LOGLIBS = @LOGLIBS@
29 LTLIBOBJS = @LTLIBOBJS@
30 MAKEINFO = @MAKEINFO@
31 MANIFEST_TOOL = @MANIFEST_TOOL@
32@@ -437,6 +438,7 @@
33 psdir = @psdir@
34 pyexecdir = @pyexecdir@
35 pythondir = @pythondir@
36+runstatedir = @runstatedir@
37 sbindir = @sbindir@
38 sharedstatedir = @sharedstatedir@
39 srcdir = @srcdir@
40diff -ru catacomb-2.4.1/configure catacomb-2.4.1.hack/configure
41--- catacomb-2.4.1/configure 2017-06-22 11:23:38.000000000 +0100
42+++ catacomb-2.4.1.hack/configure 2018-05-20 00:32:53.407497130 +0100
43@@ -663,6 +663,7 @@
44 limits
45 type_bits
46 have_stdint_h
47+LOGLIBS
48 MATHLIBS
49 CROSS_COMPILING_FALSE
50 CROSS_COMPILING_TRUE
51@@ -798,6 +799,7 @@
52 docdir
53 oldincludedir
54 includedir
55+runstatedir
56 localstatedir
57 sharedstatedir
58 sysconfdir
59@@ -888,6 +890,7 @@
60 sysconfdir='${prefix}/etc'
61 sharedstatedir='${prefix}/com'
62 localstatedir='${prefix}/var'
63+runstatedir='${localstatedir}/run'
64 includedir='${prefix}/include'
65 oldincludedir='/usr/include'
66 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
67@@ -1140,6 +1143,15 @@
68 | -silent | --silent | --silen | --sile | --sil)
69 silent=yes ;;
70
71+ -runstatedir | --runstatedir | --runstatedi | --runstated \
72+ | --runstate | --runstat | --runsta | --runst | --runs \
73+ | --run | --ru | --r)
74+ ac_prev=runstatedir ;;
75+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
76+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
77+ | --run=* | --ru=* | --r=*)
78+ runstatedir=$ac_optarg ;;
79+
80 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
81 ac_prev=sbindir ;;
82 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
83@@ -1277,7 +1289,7 @@
84 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
85 datadir sysconfdir sharedstatedir localstatedir includedir \
86 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
87- libdir localedir mandir
88+ libdir localedir mandir runstatedir
89 do
90 eval ac_val=\$$ac_var
91 # Remove trailing slashes.
92@@ -1430,6 +1442,7 @@
93 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
94 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
95 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
96+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
97 --libdir=DIR object code libraries [EPREFIX/lib]
98 --includedir=DIR C header files [PREFIX/include]
99 --oldincludedir=DIR C header files for non-gcc [/usr/include]
100@@ -12294,6 +12307,48 @@
101
102 LIBS=$mdw_ORIG_LIBS
103
104+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking library needed for syslog" >&5
105+$as_echo_n "checking library needed for syslog... " >&6; }
106+if ${mdw_cv_syslog_lib+:} false; then :
107+ $as_echo_n "(cached) " >&6
108+else
109+ mdw_ORIG_LIBS=$LIBS LIBS=
110+ for i in 0 1; do
111+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
112+/* end confdefs.h. */
113+#include <syslog.h>
114+int
115+main ()
116+{
117+openlog("test", LOG_PID, LOG_DAEMON);
118+ syslog(LOG_ERR, "this is a test");
119+ ;
120+ return 0;
121+}
122+_ACEOF
123+if ac_fn_c_try_link "$LINENO"; then :
124+ ok=t
125+else
126+ ok=nil
127+fi
128+rm -f core conftest.err conftest.$ac_objext \
129+ conftest$ac_exeext conftest.$ac_ext
130+ case $i,$ok in
131+ *,t) mdw_cv_syslog_lib=${LIBS:-none}; break ;;
132+ 0,nil) LIBS="-llog" ;;
133+ 1,nil) as_fn_error $? "\"failed to link test program\"" "$LINENO" 5 ;;
134+ esac
135+ done
136+ LIBS=$mdw_ORIG_LIBS
137+fi
138+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mdw_cv_syslog_lib" >&5
139+$as_echo "$mdw_cv_syslog_lib" >&6; }
140+case $mdw_cv_syslog_lib in
141+ none) LOGLIBS= ;;
142+ *) LOGLIBS=$mdw_cv_syslog_lib ;;
143+esac
144+
145+
146 for ac_header in stdint.h
147 do :
148 ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
149diff -ru catacomb-2.4.1/configure.ac catacomb-2.4.1.hack/configure.ac
150--- catacomb-2.4.1/configure.ac 2017-06-22 11:23:31.000000000 +0100
151+++ catacomb-2.4.1.hack/configure.ac 2018-05-20 00:32:52.387482722 +0100
152@@ -237,6 +237,29 @@
153 AC_SUBST([MATHLIBS], [$LIBS])
154 LIBS=$mdw_ORIG_LIBS
155
156+dnl Logging is weird under Termux. Unfortunately, it involves macros, so we
157+dnl have to do this the hard way.
158+AC_CACHE_CHECK(
159+ [library needed for syslog], [mdw_cv_syslog_lib],
160+ [mdw_ORIG_LIBS=$LIBS LIBS=
161+ for i in 0 1; do
162+ AC_TRY_LINK([#include <syslog.h>],
163+ [openlog("test", LOG_PID, LOG_DAEMON);
164+ syslog(LOG_ERR, "this is a test");],
165+ [ok=t], [ok=nil])
166+ case $i,$ok in
167+ *,t) mdw_cv_syslog_lib=${LIBS:-none}; break ;;
168+ 0,nil) LIBS="-llog" ;;
169+ 1,nil) AC_MSG_ERROR("failed to link test program") ;;
170+ esac
171+ done
172+ LIBS=$mdw_ORIG_LIBS])
173+case $mdw_cv_syslog_lib in
174+ none) LOGLIBS= ;;
175+ *) LOGLIBS=$mdw_cv_syslog_lib ;;
176+esac
177+AC_SUBST([LOGLIBS])
178+
179 dnl Find out whether very long integer types are available.
180 AC_CHECK_HEADERS([stdint.h])
181 AC_SUBST([have_stdint_h])
182diff -ru catacomb-2.4.1/key/Makefile.in catacomb-2.4.1.hack/key/Makefile.in
183--- catacomb-2.4.1/key/Makefile.in 2017-06-22 11:23:39.000000000 +0100
184+++ catacomb-2.4.1.hack/key/Makefile.in 2018-05-20 00:32:54.075506565 +0100
185@@ -351,6 +351,7 @@
186 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
187 LIPO = @LIPO@
188 LN_S = @LN_S@
189+LOGLIBS = @LOGLIBS@
190 LTLIBOBJS = @LTLIBOBJS@
191 MAKEINFO = @MAKEINFO@
192 MANIFEST_TOOL = @MANIFEST_TOOL@
193@@ -439,6 +440,7 @@
194 psdir = @psdir@
195 pyexecdir = @pyexecdir@
196 pythondir = @pythondir@
197+runstatedir = @runstatedir@
198 sbindir = @sbindir@
199 sharedstatedir = @sharedstatedir@
200 srcdir = @srcdir@
201diff -ru catacomb-2.4.1/math/Makefile.in catacomb-2.4.1.hack/math/Makefile.in
202--- catacomb-2.4.1/math/Makefile.in 2017-06-22 11:23:39.000000000 +0100
203+++ catacomb-2.4.1.hack/math/Makefile.in 2018-05-20 00:32:54.219508599 +0100
204@@ -461,6 +461,7 @@
205 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
206 LIPO = @LIPO@
207 LN_S = @LN_S@
208+LOGLIBS = @LOGLIBS@
209 LTLIBOBJS = @LTLIBOBJS@
210 MAKEINFO = @MAKEINFO@
211 MANIFEST_TOOL = @MANIFEST_TOOL@
212@@ -549,6 +550,7 @@
213 psdir = @psdir@
214 pyexecdir = @pyexecdir@
215 pythondir = @pythondir@
216+runstatedir = @runstatedir@
217 sbindir = @sbindir@
218 sharedstatedir = @sharedstatedir@
219 srcdir = @srcdir@
220diff -ru catacomb-2.4.1/misc/Makefile.in catacomb-2.4.1.hack/misc/Makefile.in
221--- catacomb-2.4.1/misc/Makefile.in 2017-06-22 11:23:39.000000000 +0100
222+++ catacomb-2.4.1.hack/misc/Makefile.in 2018-05-20 00:32:54.291509616 +0100
223@@ -354,6 +354,7 @@
224 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
225 LIPO = @LIPO@
226 LN_S = @LN_S@
227+LOGLIBS = @LOGLIBS@
228 LTLIBOBJS = @LTLIBOBJS@
229 MAKEINFO = @MAKEINFO@
230 MANIFEST_TOOL = @MANIFEST_TOOL@
231@@ -442,6 +443,7 @@
232 psdir = @psdir@
233 pyexecdir = @pyexecdir@
234 pythondir = @pythondir@
235+runstatedir = @runstatedir@
236 sbindir = @sbindir@
237 sharedstatedir = @sharedstatedir@
238 srcdir = @srcdir@
239diff -ru catacomb-2.4.1/progs/Makefile.am catacomb-2.4.1.hack/progs/Makefile.am
240--- catacomb-2.4.1/progs/Makefile.am 2017-06-22 11:23:31.000000000 +0100
241+++ catacomb-2.4.1.hack/progs/Makefile.am 2018-05-20 00:32:52.387482722 +0100
242@@ -101,7 +101,7 @@
243 ## Remember passphrases for limited periods of time.
244 bin_PROGRAMS += pixie
245 pixie_SOURCES = pixie.c
246-pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS)
247+pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS) $(LOGLIBS)
248 dist_man_MANS += pixie.1
249 EXTRA_DIST += xpixie
250
251diff -ru catacomb-2.4.1/progs/Makefile.in catacomb-2.4.1.hack/progs/Makefile.in
252--- catacomb-2.4.1/progs/Makefile.in 2017-06-22 11:23:40.000000000 +0100
253+++ catacomb-2.4.1.hack/progs/Makefile.in 2018-05-20 00:32:54.399511142 +0100
254@@ -190,7 +190,8 @@
255 perftest_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
256 am_pixie_OBJECTS = pixie.$(OBJEXT)
257 pixie_OBJECTS = $(am_pixie_OBJECTS)
258-pixie_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
259+pixie_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
260+ $(am__DEPENDENCIES_1)
261 rspit_SOURCES = rspit.c
262 rspit_OBJECTS = rspit.$(OBJEXT)
263 rspit_LDADD = $(LDADD)
264@@ -418,6 +419,7 @@
265 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
266 LIPO = @LIPO@
267 LN_S = @LN_S@
268+LOGLIBS = @LOGLIBS@
269 LTLIBOBJS = @LTLIBOBJS@
270 MAKEINFO = @MAKEINFO@
271 MANIFEST_TOOL = @MANIFEST_TOOL@
272@@ -506,6 +508,7 @@
273 psdir = @psdir@
274 pyexecdir = @pyexecdir@
275 pythondir = @pythondir@
276+runstatedir = @runstatedir@
277 sbindir = @sbindir@
278 sharedstatedir = @sharedstatedir@
279 srcdir = @srcdir@
280@@ -589,7 +592,7 @@
281 mkphrase_LDADD = $(LDADD) $(MATHLIBS)
282 perftest_LDADD = $(LDADD) $(MATHLIBS)
283 pixie_SOURCES = pixie.c
284-pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS)
285+pixie_LDADD = $(UTILS_LIBS) $(PIXIE_LIBS) $(LOGLIBS)
286 all: $(BUILT_SOURCES)
287 $(MAKE) $(AM_MAKEFLAGS) all-am
288
289diff -ru catacomb-2.4.1/pub/Makefile.in catacomb-2.4.1.hack/pub/Makefile.in
290--- catacomb-2.4.1/pub/Makefile.in 2017-06-22 11:23:40.000000000 +0100
291+++ catacomb-2.4.1.hack/pub/Makefile.in 2018-05-20 00:32:54.479512272 +0100
292@@ -353,6 +353,7 @@
293 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
294 LIPO = @LIPO@
295 LN_S = @LN_S@
296+LOGLIBS = @LOGLIBS@
297 LTLIBOBJS = @LTLIBOBJS@
298 MAKEINFO = @MAKEINFO@
299 MANIFEST_TOOL = @MANIFEST_TOOL@
300@@ -441,6 +442,7 @@
301 psdir = @psdir@
302 pyexecdir = @pyexecdir@
303 pythondir = @pythondir@
304+runstatedir = @runstatedir@
305 sbindir = @sbindir@
306 sharedstatedir = @sharedstatedir@
307 srcdir = @srcdir@
308diff -ru catacomb-2.4.1/rand/Makefile.in catacomb-2.4.1.hack/rand/Makefile.in
309--- catacomb-2.4.1/rand/Makefile.in 2017-06-22 11:23:40.000000000 +0100
310+++ catacomb-2.4.1.hack/rand/Makefile.in 2018-05-20 00:32:54.555513345 +0100
311@@ -349,6 +349,7 @@
312 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
313 LIPO = @LIPO@
314 LN_S = @LN_S@
315+LOGLIBS = @LOGLIBS@
316 LTLIBOBJS = @LTLIBOBJS@
317 MAKEINFO = @MAKEINFO@
318 MANIFEST_TOOL = @MANIFEST_TOOL@
319@@ -437,6 +438,7 @@
320 psdir = @psdir@
321 pyexecdir = @pyexecdir@
322 pythondir = @pythondir@
323+runstatedir = @runstatedir@
324 sbindir = @sbindir@
325 sharedstatedir = @sharedstatedir@
326 srcdir = @srcdir@
327diff -ru catacomb-2.4.1/symm/Makefile.in catacomb-2.4.1.hack/symm/Makefile.in
328--- catacomb-2.4.1/symm/Makefile.in 2017-06-22 11:23:50.000000000 +0100
329+++ catacomb-2.4.1.hack/symm/Makefile.in 2018-05-20 00:32:54.771516396 +0100
330@@ -590,6 +590,7 @@
331 LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@
332 LIPO = @LIPO@
333 LN_S = @LN_S@
334+LOGLIBS = @LOGLIBS@
335 LTLIBOBJS = @LTLIBOBJS@
336 MAKEINFO = @MAKEINFO@
337 MANIFEST_TOOL = @MANIFEST_TOOL@
338@@ -678,6 +679,7 @@
339 psdir = @psdir@
340 pyexecdir = @pyexecdir@
341 pythondir = @pythondir@
342+runstatedir = @runstatedir@
343 sbindir = @sbindir@
344 sharedstatedir = @sharedstatedir@
345 srcdir = @srcdir@
Unnamed repository; edit this file 'description' to name the repository.