remove -lpthread vs. -pthread patches/chunks
This commit is contained in:
jasper
parent
f8d9ead7d8
commit
7b5bd51a46
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.13 2012/04/28 10:52:08 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.14 2012/09/23 19:33:02 jasper Exp $
|
||||
|
||||
COMMENT-main = system metrics collection engine
|
||||
COMMENT-mysql = collectd mysql plugin
|
||||
@ -15,11 +15,11 @@ PKGNAME-rrdtool = collectd-rrdtool-$V
|
||||
PKGNAME-snmp = collectd-snmp-$V
|
||||
CATEGORIES = sysutils
|
||||
|
||||
REVISION-main= 2
|
||||
REVISION-mysql = 0
|
||||
REVISION-pgsql = 0
|
||||
REVISION-rrtool = 0
|
||||
REVISION-snmp = 0
|
||||
REVISION-main= 3
|
||||
REVISION-mysql = 1
|
||||
REVISION-pgsql = 1
|
||||
REVISION-rrtool = 1
|
||||
REVISION-snmp = 1
|
||||
|
||||
HOMEPAGE = http://www.collectd.org/
|
||||
SHARED_LIBS += collectdclient 0.0
|
||||
@ -37,19 +37,19 @@ MODULES = devel/gettext
|
||||
|
||||
MULTI_PACKAGES = -main -mysql -pgsql -rrdtool -snmp
|
||||
|
||||
WANTLIB-mysql = crypto m ssl z mysqlclient
|
||||
WANTLIB-mysql = crypto m ssl z mysqlclient pthread
|
||||
LIB_DEPENDS-mysql = databases/mysql
|
||||
RUN_DEPENDS-mysql = collectd-$V:${BASE_PKGPATH},-main
|
||||
|
||||
WANTLIB-pgsql = pq
|
||||
WANTLIB-pgsql = pq com_err crypto pthread ssl
|
||||
LIB_DEPENDS-pgsql = databases/postgresql
|
||||
RUN_DEPENDS-pgsql = collectd-$V:${BASE_PKGPATH},-main
|
||||
|
||||
WANTLIB-rrdtool = art_lgpl_2 freetype m png z rrd_th
|
||||
WANTLIB-rrdtool = art_lgpl_2 freetype m png z rrd_th pthread
|
||||
LIB_DEPENDS-rrdtool = net/rrdtool
|
||||
RUN_DEPENDS-rrdtool = collectd-$V:${BASE_PKGPATH},-main
|
||||
|
||||
WANTLIB-snmp = crypto netsnmp
|
||||
WANTLIB-snmp = crypto netsnmp m pthread
|
||||
LIB_DEPENDS-snmp = net/net-snmp
|
||||
RUN_DEPENDS-snmp = collectd-$V:${BASE_PKGPATH},-main
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.3 2012/04/05 09:20:12 jasper Exp $
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.4 2012/09/23 19:33:02 jasper Exp $
|
||||
Install config file in examples/
|
||||
--- src/Makefile.in.orig Sat Nov 27 11:10:51 2010
|
||||
+++ src/Makefile.in Thu Apr 5 11:12:50 2012
|
||||
+++ src/Makefile.in Sun Sep 23 21:17:24 2012
|
||||
@@ -37,7 +37,7 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
@BUILD_WITH_OWN_LIBIPTC_TRUE@am__append_1 = owniptc
|
||||
@ -11,15 +11,6 @@ Install config file in examples/
|
||||
sbin_PROGRAMS = collectd$(EXEEXT) collectdmon$(EXEEXT)
|
||||
bin_PROGRAMS = collectd-nagios$(EXEEXT)
|
||||
|
||||
@@ -46,7 +46,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
|
||||
@BUILD_WITH_LIBPOSIX4_TRUE@am__append_5 = -lposix4
|
||||
@BUILD_WITH_LIBSOCKET_TRUE@am__append_6 = -lsocket
|
||||
@BUILD_WITH_LIBRESOLV_TRUE@am__append_7 = -lresolv
|
||||
-@BUILD_WITH_LIBPTHREAD_TRUE@am__append_8 = -lpthread
|
||||
+@BUILD_WITH_LIBPTHREAD_TRUE@am__append_8 = -pthread
|
||||
@BUILD_WITH_LIBKSTAT_TRUE@am__append_9 = -lkstat
|
||||
@BUILD_WITH_LIBDEVINFO_TRUE@am__append_10 = -ldevinfo
|
||||
@BUILD_AIX_TRUE@am__append_11 = -Wl,-bexpall,-brtllib
|
||||
@@ -57,7 +57,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
|
||||
@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
|
||||
@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
|
||||
@ -29,15 +20,6 @@ Install config file in examples/
|
||||
@BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
|
||||
@BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
|
||||
@BUILD_AIX_TRUE@am__append_19 = -lm
|
||||
@@ -335,7 +335,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
|
||||
@BUILD_PLUGIN_SNMP_TRUE@am__append_289 = snmp.la
|
||||
@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_290 = $(BUILD_WITH_LIBSNMP_CFLAGS)
|
||||
@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_291 = $(BUILD_WITH_LIBSNMP_LIBS)
|
||||
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_292 = -lpthread
|
||||
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_292 = -pthread
|
||||
@BUILD_PLUGIN_SNMP_TRUE@am__append_293 = "-dlopen" snmp.la
|
||||
@BUILD_PLUGIN_SNMP_TRUE@am__append_294 = snmp.la
|
||||
@BUILD_PLUGIN_SWAP_TRUE@am__append_295 = swap.la
|
||||
@@ -1836,11 +1836,11 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
@ -52,63 +34,15 @@ Install config file in examples/
|
||||
$(am__append_3) -DPLUGINDIR='"${pkglibdir}"' \
|
||||
-DPKGDATADIR='"${pkgdatadir}"'
|
||||
collectd_SOURCES = collectd.c collectd.h \
|
||||
@@ -2052,10 +2052,10 @@ CLEANFILES = $(am__append_250)
|
||||
@BUILD_PLUGIN_DISK_TRUE@ $(am__append_86) $(am__append_87)
|
||||
@BUILD_PLUGIN_DNS_TRUE@dns_la_SOURCES = dns.c utils_dns.c utils_dns.h
|
||||
@BUILD_PLUGIN_DNS_TRUE@dns_la_LDFLAGS = -module -avoid-version
|
||||
-@BUILD_PLUGIN_DNS_TRUE@dns_la_LIBADD = -lpcap -lpthread
|
||||
+@BUILD_PLUGIN_DNS_TRUE@dns_la_LIBADD = -lpcap -pthread
|
||||
@BUILD_PLUGIN_EMAIL_TRUE@email_la_SOURCES = email.c
|
||||
@BUILD_PLUGIN_EMAIL_TRUE@email_la_LDFLAGS = -module -avoid-version
|
||||
-@BUILD_PLUGIN_EMAIL_TRUE@email_la_LIBADD = -lpthread
|
||||
+@BUILD_PLUGIN_EMAIL_TRUE@email_la_LIBADD = -pthread
|
||||
@BUILD_PLUGIN_ENTROPY_TRUE@entropy_la_SOURCES = entropy.c
|
||||
@BUILD_PLUGIN_ENTROPY_TRUE@entropy_la_LDFLAGS = -module -avoid-version
|
||||
@BUILD_PLUGIN_EXEC_TRUE@exec_la_SOURCES = exec.c \
|
||||
@@ -2063,7 +2063,7 @@ CLEANFILES = $(am__append_250)
|
||||
@BUILD_PLUGIN_EXEC_TRUE@ utils_cmd_putval.c utils_cmd_putval.h
|
||||
|
||||
@BUILD_PLUGIN_EXEC_TRUE@exec_la_LDFLAGS = -module -avoid-version
|
||||
-@BUILD_PLUGIN_EXEC_TRUE@exec_la_LIBADD = -lpthread
|
||||
+@BUILD_PLUGIN_EXEC_TRUE@exec_la_LIBADD = -pthread
|
||||
@BUILD_PLUGIN_FILECOUNT_TRUE@filecount_la_SOURCES = filecount.c
|
||||
@BUILD_PLUGIN_FILECOUNT_TRUE@filecount_la_LDFLAGS = -module -avoid-version
|
||||
@BUILD_PLUGIN_GMOND_TRUE@gmond_la_SOURCES = gmond.c
|
||||
@@ -2170,7 +2170,7 @@ CLEANFILES = $(am__append_250)
|
||||
@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_203)
|
||||
@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = -module -avoid-version \
|
||||
@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_204)
|
||||
-@BUILD_PLUGIN_NETWORK_TRUE@network_la_LIBADD = -lpthread \
|
||||
+@BUILD_PLUGIN_NETWORK_TRUE@network_la_LIBADD = -pthread \
|
||||
@BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_202) $(am__append_205)
|
||||
@BUILD_PLUGIN_NFS_TRUE@nfs_la_SOURCES = nfs.c
|
||||
@BUILD_PLUGIN_NFS_TRUE@nfs_la_LDFLAGS = -module -avoid-version
|
||||
@@ -2187,14 +2187,14 @@ CLEANFILES = $(am__append_250)
|
||||
@@ -2187,7 +2187,7 @@ CLEANFILES = $(am__append_250)
|
||||
@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_LIBADD = $(LIBNOTIFY_LIBS)
|
||||
@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_SOURCES = notify_email.c
|
||||
@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LDFLAGS = -module -avoid-version
|
||||
-@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread -ldl
|
||||
+@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -pthread
|
||||
+@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
|
||||
@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_SOURCES = ntpd.c
|
||||
@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LDFLAGS = -module -avoid-version
|
||||
@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_226)
|
||||
@BUILD_PLUGIN_NUT_TRUE@nut_la_SOURCES = nut.c
|
||||
@BUILD_PLUGIN_NUT_TRUE@nut_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBUPSCLIENT_CFLAGS)
|
||||
@BUILD_PLUGIN_NUT_TRUE@nut_la_LDFLAGS = -module -avoid-version
|
||||
-@BUILD_PLUGIN_NUT_TRUE@nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS)
|
||||
+@BUILD_PLUGIN_NUT_TRUE@nut_la_LIBADD = -pthread $(BUILD_WITH_LIBUPSCLIENT_LIBS)
|
||||
@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_SOURCES = olsrd.c
|
||||
@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LDFLAGS = -module -avoid-version
|
||||
@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_233)
|
||||
@@ -2323,7 +2323,7 @@ CLEANFILES = $(am__append_250)
|
||||
@BUILD_PLUGIN_UNIXSOCK_TRUE@ utils_cmd_putnotif.h utils_cmd_putnotif.c
|
||||
|
||||
@BUILD_PLUGIN_UNIXSOCK_TRUE@unixsock_la_LDFLAGS = -module -avoid-version
|
||||
-@BUILD_PLUGIN_UNIXSOCK_TRUE@unixsock_la_LIBADD = -lpthread
|
||||
+@BUILD_PLUGIN_UNIXSOCK_TRUE@unixsock_la_LIBADD = -pthread
|
||||
@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_SOURCES = uptime.c
|
||||
@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_CFLAGS = $(AM_CFLAGS)
|
||||
@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LDFLAGS = -module -avoid-version
|
||||
@@ -4039,13 +4039,8 @@ pinba.pb-c.c pinba.pb-c.h: pinba.proto
|
||||
protoc-c --c_out $(builddir) pinba.proto
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $OpenBSD: Makefile,v 1.34 2012/09/01 14:36:58 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.35 2012/09/23 19:33:02 jasper Exp $
|
||||
|
||||
# XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)
|
||||
# XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)
|
||||
CFLAGS += "-DG_CONST_RETURN=const"
|
||||
|
||||
COMMENT-main= file and directory monitoring system
|
||||
@ -12,8 +12,8 @@ GNOME_VERSION= 0.1.10
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
PKGNAME-python= py-gamin-${GNOME_VERSION}
|
||||
|
||||
REVISION-main= 19
|
||||
REVISION-python=7
|
||||
REVISION-main= 20
|
||||
REVISION-python=8
|
||||
|
||||
SHARED_LIBS += gamin-1 0.0 # .1.10
|
||||
SHARED_LIBS += fam 1.0 # .0.0
|
||||
@ -52,7 +52,7 @@ LIB_DEPENDS-python = ${BUILD_PKGPATH},-main
|
||||
|
||||
.if ${BUILD_PACKAGES:M-python}
|
||||
MODULES += lang/python
|
||||
WANTLIB-python += gamin-1
|
||||
WANTLIB-python += gamin-1 pthread
|
||||
RUN_DEPENDS-python += ${MODPY_RUN_DEPENDS}
|
||||
.else
|
||||
CONFIGURE_ARGS += --without-python
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2009/12/04 08:07:20 ajacoutot Exp $
|
||||
--- configure.orig Fri Jun 19 15:49:19 2009
|
||||
+++ configure Fri Jun 19 15:49:41 2009
|
||||
@@ -22944,13 +22944,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
|
||||
|
||||
fi
|
||||
if test $ac_cv_header_pthread_h = yes; then
|
||||
- { echo "$as_me:$LINENO: checking for pthread_mutexattr_settype in -lpthread" >&5
|
||||
-echo $ECHO_N "checking for pthread_mutexattr_settype in -lpthread... $ECHO_C" >&6; }
|
||||
+ { echo "$as_me:$LINENO: checking for pthread_mutexattr_settype in -pthread" >&5
|
||||
+echo $ECHO_N "checking for pthread_mutexattr_settype in -pthread... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_pthread_pthread_mutexattr_settype+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -23007,7 +23007,7 @@ fi
|
||||
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutexattr_settype" >&6; }
|
||||
if test $ac_cv_lib_pthread_pthread_mutexattr_settype = yes; then
|
||||
|
||||
- THREAD_LIBS="-lpthread"
|
||||
+ THREAD_LIBS="-pthread"
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_LIBPTHREAD
|
||||
@ -1,8 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.21 2012/05/29 15:45:56 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.22 2012/09/23 19:33:02 jasper Exp $
|
||||
|
||||
COMMENT= monitoring and managing daemons utility
|
||||
|
||||
DISTNAME= monit-5.4
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= sysutils
|
||||
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.9 2012/05/29 15:45:56 jasper Exp $
|
||||
--- configure.orig Fri May 25 10:25:39 2012
|
||||
+++ configure Fri May 25 10:26:10 2012
|
||||
@@ -11046,13 +11046,13 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
|
||||
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
|
||||
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -11087,7 +11087,7 @@ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes;
|
||||
#define HAVE_LIBPTHREAD 1
|
||||
_ACEOF
|
||||
|
||||
- LIBS="-lpthread $LIBS"
|
||||
+ LIBS="-pthread $LIBS"
|
||||
|
||||
else
|
||||
as_fn_error "POSIX thread library is required" "$LINENO" 5
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2012/01/25 11:03:14 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2012/09/23 19:33:02 jasper Exp $
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
@ -15,9 +15,9 @@ PKGNAME-mysql = rsyslog-mysql-$V
|
||||
PKGNAME-pgsql = rsyslog-pgsql-$V
|
||||
CATEGORIES = sysutils
|
||||
|
||||
REVISION-main = 4
|
||||
REVISION-mysql = 1
|
||||
REVISION-pgsql = 1
|
||||
REVISION-main = 5
|
||||
REVISION-mysql = 2
|
||||
REVISION-pgsql = 2
|
||||
|
||||
HOMEPAGE = http://www.rsyslog.com/
|
||||
|
||||
@ -29,7 +29,7 @@ PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
MODULES = devel/gettext
|
||||
|
||||
WANTLIB-main += c gmp hogweed nettle gnutls pthread
|
||||
WANTLIB-main += c gmp hogweed nettle gnutls pthread p11-kit
|
||||
WANTLIB-main += relp tasn1 z ${MODGETTEXT_WANTLIB}
|
||||
WANTLIB-mysql += crypto m mysqlclient ssl z
|
||||
WANTLIB-pgsql += crypto com_err pq ssl
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
|
||||
--- configure.ac.orig Fri Jul 23 22:03:50 2010
|
||||
+++ configure.ac Fri Jul 23 22:04:32 2010
|
||||
@@ -247,6 +247,7 @@ if test "x$enable_pthreads" != "xno"; then
|
||||
PTHREADS_LIBS="-lpthread"
|
||||
case "${os_type}" in
|
||||
solaris) PTHREADS_CFLAGS="-pthreads" ;;
|
||||
+ openbsd) PTHREADS_CFLAGS="-pthread" PTHREADS_LIBS="-pthread" ;;
|
||||
*) PTHREADS_CFLAGS="-pthread" ;;
|
||||
esac
|
||||
AC_SUBST(PTHREADS_LIBS)
|
||||
Loading…
Reference in New Issue
Block a user