Remove -pthread patching.
from Brad
This commit is contained in:
ajacoutot
parent
bc41963523
commit
e197aaebf5
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.42 2012/08/25 10:15:47 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.43 2012/08/27 06:19:48 ajacoutot Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= AFP file and print services for IP networks
|
||||
|
||||
DISTNAME= netatalk-2.2.3
|
||||
REVISION= 1
|
||||
REVISION= 2
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
@ -1,17 +1,6 @@
|
||||
$OpenBSD: patch-configure,v 1.3 2012/06/15 10:34:46 ajacoutot Exp $
|
||||
--- configure.orig Sun May 27 23:01:21 2012
|
||||
+++ configure Sun May 27 23:04:06 2012
|
||||
@@ -14154,8 +14154,8 @@ for ac_lib in '' pthread; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
- ac_res=-l$ac_lib
|
||||
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
||||
+ ac_res=-$ac_lib
|
||||
+ LIBS="-$ac_lib $ac_func_search_save_LIBS"
|
||||
fi
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_search_pthread_sigmask=$ac_res
|
||||
$OpenBSD: patch-configure,v 1.4 2012/08/27 06:19:48 ajacoutot Exp $
|
||||
--- configure.orig Thu Apr 26 10:27:12 2012
|
||||
+++ configure Thu Aug 16 18:00:15 2012
|
||||
@@ -15761,7 +15761,7 @@ fi
|
||||
for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h
|
||||
do :
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.131 2012/06/30 09:32:28 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.132 2012/08/27 06:19:48 ajacoutot Exp $
|
||||
|
||||
COMMENT= WWW and FTP proxy cache and accelerator
|
||||
|
||||
DISTNAME= squid-2.7.STABLE9
|
||||
REVISION= 19
|
||||
REVISION= 20
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${HOMEPAGE}/Versions/v2/2.7/
|
||||
DIST_SUBDIR= squid
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_in,v 1.31 2010/11/29 23:06:39 dcoppa Exp $
|
||||
--- configure.in.orig Wed Mar 17 01:10:12 2010
|
||||
+++ configure.in Mon Nov 29 21:43:13 2010
|
||||
$OpenBSD: patch-configure_in,v 1.32 2012/08/27 06:19:48 ajacoutot Exp $
|
||||
--- configure.in.orig Tue Mar 16 20:10:12 2010
|
||||
+++ configure.in Fri Aug 17 00:44:48 2012
|
||||
@@ -17,11 +17,6 @@ AM_MAINTAINER_MODE
|
||||
PRESET_CFLAGS="$CFLAGS"
|
||||
PRESET_LDFLAGS="$LDFLAGS"
|
||||
@ -13,29 +13,7 @@ $OpenBSD: patch-configure_in,v 1.31 2010/11/29 23:06:39 dcoppa Exp $
|
||||
dnl Check for GNU cc
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
@@ -2216,11 +2211,9 @@ dnl We use pthreads when doing ASYNC I/O
|
||||
if test "$with_pthreads" = "yes"; then
|
||||
CFLAGS="$CFLAGS -D_REENTRANT"
|
||||
case "$host" in
|
||||
- i386-unknown-freebsd*)
|
||||
+ i386-unknown-freebsd*|*-unknown-openbsd*)
|
||||
if test "$GCC" = "yes" ; then
|
||||
- if test -z "$PRESET_LDFLAGS"; then
|
||||
- LDFLAGS="$LDFLAGS -pthread"
|
||||
- fi
|
||||
+ LDFLAGS="$LDFLAGS -pthread"
|
||||
fi
|
||||
;;
|
||||
*-solaris2.*)
|
||||
@@ -2231,7 +2224,6 @@ if test "$with_pthreads" = "yes"; then
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
- AC_CHECK_LIB(pthread, pthread_create)
|
||||
fi
|
||||
|
||||
dnl Check for librt
|
||||
@@ -2350,18 +2342,6 @@ dnl during compile.
|
||||
@@ -2350,18 +2345,6 @@ dnl during compile.
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -54,7 +32,7 @@ $OpenBSD: patch-configure_in,v 1.31 2010/11/29 23:06:39 dcoppa Exp $
|
||||
# Recommended by Balint Nagy Endre <bne@CareNet.hu>
|
||||
case "$host" in
|
||||
*-univel-sysv4.2MP)
|
||||
@@ -2906,12 +2886,14 @@ AC_ARG_WITH(maxfd,
|
||||
@@ -2906,12 +2889,14 @@ AC_ARG_WITH(maxfd,
|
||||
;;
|
||||
esac
|
||||
])
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.208 2012/08/25 15:05:51 ratchov Exp $
|
||||
# $OpenBSD: Makefile,v 1.209 2012/08/27 06:19:48 ajacoutot Exp $
|
||||
|
||||
# May not be hard to add more.
|
||||
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
|
||||
@ -13,7 +13,7 @@ SUBST_VARS += PREFIX CONFDIR
|
||||
# Distfiles must be hand-rolled, see README
|
||||
N = mplayer
|
||||
DISTNAME = mplayer-${V}
|
||||
REVISION = 20
|
||||
REVISION = 21
|
||||
|
||||
CATEGORIES = x11 multimedia
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure,v 1.63 2012/06/28 18:53:02 jasper Exp $
|
||||
$OpenBSD: patch-configure,v 1.64 2012/08/27 06:19:48 ajacoutot Exp $
|
||||
--- configure.orig Tue Mar 8 19:33:03 2011
|
||||
+++ configure Thu Jun 28 02:45:17 2012
|
||||
+++ configure Thu Aug 16 17:53:14 2012
|
||||
@@ -35,29 +35,33 @@
|
||||
#
|
||||
#############################################################################
|
||||
@ -154,15 +154,6 @@ $OpenBSD: patch-configure,v 1.63 2012/06/28 18:53:02 jasper Exp $
|
||||
fi
|
||||
echores "$_memalign"
|
||||
|
||||
@@ -3585,7 +3597,7 @@ int main(void) { pthread_t tid; return pthread_create(
|
||||
EOF
|
||||
_pthreads=no
|
||||
if ! hpux ; then
|
||||
- for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
|
||||
+ for _ld_tmp in "-lpthreadGC2" "" "-pthread" "-lpthread" ; do
|
||||
# for crosscompilation, we cannot execute the program, be happy if we can link statically
|
||||
cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
|
||||
done
|
||||
@@ -4661,6 +4673,8 @@ if test "$_aa" = yes ; then
|
||||
def_aa='#define CONFIG_AA 1'
|
||||
if cygwin ; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user