libprelude/libprelude-4.1.0-fix_pthrea...

121 lines
5.8 KiB
Diff

--- ./prelude-admin/Makefile.am 2016-09-15 08:49:10.785000884 +0200
+++ ./prelude-admin/Makefile.am 2017-04-25 23:55:55.141482528 +0200
@@ -7,7 +7,7 @@
$(top_builddir)/src/variable.lo \
$(top_builddir)/src/libprelude.la \
@PRELUDE_ADMIN_LIBS@ \
- ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB)
+ ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBMULTITHREAD) $(SERVENT_LIB)
prelude_admin_SOURCES = \
--- ./src/Makefile.am 2016-09-15 08:49:10.786000884 +0200
+++ ./src/Makefile.am 2017-04-25 23:56:31.085664831 +0200
@@ -9,7 +9,7 @@
libpreludeincludedir = $(includedir)/
libprelude_la_LIBADD = @LIBPRELUDE_LIBS@ $(LIBLTDL) $(top_builddir)/libmissing/libmissing.la libprelude-error/libprelude-error.la
-libprelude_la_LDFLAGS = $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB) -no-undefined -version-info @LIBPRELUDE_SONAME@ -export-symbols-regex "^(idmef|_?prelude)_"
+libprelude_la_LDFLAGS = $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBMULTITHREAD) $(SERVENT_LIB) -no-undefined -version-info @LIBPRELUDE_SONAME@ -export-symbols-regex "^(idmef|_?prelude)_" -Wl,-u,pthread_atfork
lib_LTLIBRARIES = libprelude.la
BUILT_SOURCES = $(LTDLDEPS)
--- ./src/libprelude-error/Makefile.am 2016-09-15 08:49:10.805000884 +0200
+++ ./src/libprelude-error/Makefile.am 2017-04-25 23:57:02.636949645 +0200
@@ -14,7 +14,7 @@
nodist_include_HEADERS = prelude-error.h
noinst_LTLIBRARIES = libprelude-error.la
-libprelude_error_la_LIBADD = @LTLIBTHREAD@
+libprelude_error_la_LIBADD = $(LTLIBMULTITHREAD)
libprelude_error_la_LDFLAGS = -no-undefined
libprelude_error_la_SOURCES = prelude-error.h prelude-error.c strsource.c strerror.c
--- ./src/libprelude-error/Makefile.in 2016-09-15 08:51:19.590000884 +0200
+++ ./src/libprelude-error/Makefile.in 2017-04-26 08:06:29.762178749 +0200
@@ -912,7 +912,7 @@
LIBS = @LIBS@
LIBSOCKET = @LIBSOCKET@
LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@
-LIBTHREAD = @LIBTHREAD@
+LIBMULTITHREAD = @LIBMULTITHREAD@
LIBTOOL = @LIBTOOL@
LIB_POLL = @LIB_POLL@
LIB_SELECT = @LIB_SELECT@
@@ -933,7 +933,7 @@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@
@@ -1323,7 +1323,7 @@
nodist_include_HEADERS = prelude-error.h
noinst_LTLIBRARIES = libprelude-error.la
-libprelude_error_la_LIBADD = @LTLIBTHREAD@
+libprelude_error_la_LIBADD = $(LTLIBMULTITHREAD)
libprelude_error_la_LDFLAGS = -no-undefined
libprelude_error_la_SOURCES = prelude-error.h prelude-error.c strsource.c strerror.c
all: $(BUILT_SOURCES)
--- ./src/Makefile.in 2016-09-15 08:51:19.299000884 +0200
+++ ./src/Makefile.in 2017-04-26 08:05:59.685853138 +0200
@@ -978,7 +978,7 @@
LIBS = @LIBS@
LIBSOCKET = @LIBSOCKET@
LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@
-LIBTHREAD = @LIBTHREAD@
+LIBMULTITHREAD = @LIBMULTITHREAD@
LIBTOOL = @LIBTOOL@
LIB_POLL = @LIB_POLL@
LIB_SELECT = @LIB_SELECT@
@@ -999,7 +999,7 @@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@
@@ -1386,7 +1386,7 @@
DISTCLEANFILES = $(pkgconfig_DATA) idmef-criteria-string.yac.h idmef-criteria-string.lex.c idmef-criteria-string.yac.c
libpreludeincludedir = $(includedir)/
libprelude_la_LIBADD = @LIBPRELUDE_LIBS@ $(LIBLTDL) $(top_builddir)/libmissing/libmissing.la libprelude-error/libprelude-error.la
-libprelude_la_LDFLAGS = $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB) -no-undefined -version-info @LIBPRELUDE_SONAME@ -export-symbols-regex "^(idmef|_?prelude)_"
+libprelude_la_LDFLAGS = $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBMULTITHREAD) $(SERVENT_LIB) -no-undefined -version-info @LIBPRELUDE_SONAME@ -export-symbols-regex "^(idmef|_?prelude)_" -Wl,-u,pthread_atfork
lib_LTLIBRARIES = libprelude.la
BUILT_SOURCES = $(LTDLDEPS)
AM_YFLAGS = -d
--- ./prelude-admin/Makefile.in 2016-09-15 08:51:19.173000884 +0200
+++ ./prelude-admin/Makefile.in 2017-04-26 08:05:48.262109285 +0200
@@ -922,7 +922,7 @@
LIBS = @LIBS@
LIBSOCKET = @LIBSOCKET@
LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@
-LIBTHREAD = @LIBTHREAD@
+LIBMULTITHREAD = @LIBMULTITHREAD@
LIBTOOL = @LIBTOOL@
LIB_POLL = @LIB_POLL@
LIB_SELECT = @LIB_SELECT@
@@ -943,7 +943,7 @@
LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LTLIBOBJS = @LTLIBOBJS@
LTLIBPTH = @LTLIBPTH@
-LTLIBTHREAD = @LTLIBTHREAD@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@
@@ -1327,7 +1327,7 @@
$(top_builddir)/src/variable.lo \
$(top_builddir)/src/libprelude.la \
@PRELUDE_ADMIN_LIBS@ \
- ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBTHREAD) $(SERVENT_LIB)
+ ../libmissing/libmissing.la $(GETADDRINFO_LIB) $(GETHOSTNAME_LIB) $(HOSTENT_LIB) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSOCKET) $(LIB_POLL) $(LIB_SELECT) $(LTLIBINTL) $(LTLIBMULTITHREAD) $(SERVENT_LIB)
prelude_admin_SOURCES = \
prelude-admin.c \