cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove -pthread patching.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2012-08-26 07:16:54 +00:00
parent 551d2539ac
commit 2ec950a657
5 changed files with 14 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/pidgin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.109 2012/07/18 13:31:49 jasper Exp $
# $OpenBSD: Makefile,v 1.110 2012/08/26 07:16:54 ajacoutot Exp $
SHARED_ONLY= Yes
@ -9,8 +9,11 @@ COMMENT-libpurple= multi-protocol instant messaging library
VERSION= 2.10.6
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
REVISION-main= 0
PKGNAME-finch= finch-${VERSION}
REVISION-finch= 0
PKGNAME-libpurple= libpurple-${VERSION}
REVISION-libpurple= 0
.for i in -finch -libpurple
FULLPKGNAME$i= ${PKGNAME$i}${FLAVOR_EXT:S/-gtkspell//}
FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}

30
net/pidgin/patches/patch-configure_ac
View File

@ -1,15 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.30 2012/05/08 06:49:41 jasper Exp $
$OpenBSD: patch-configure_ac,v 1.31 2012/08/26 07:16:54 ajacoutot Exp $
--- configure.ac.orig Mon May 7 05:37:20 2012
+++ configure.ac Mon May 7 22:27:24 2012
@@ -981,7 +981,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
- SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL"
+ SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -pthread $LIBDL"
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1334,7 +1334,6 @@ if test "x$GCC" = "xyes"; then
fi
@ -18,25 +9,6 @@ $OpenBSD: patch-configure_ac,v 1.30 2012/05/08 06:49:41 jasper Exp $
fi
if test "x$SUNCC" = "xyes"; then
@@ -1501,7 +1500,17 @@ if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON
changequote([, ])dnl
if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then
AC_MSG_RESULT()
- AC_CHECK_LIB(pthread, pthread_create, )
+ AC_CHECK_HEADER(pthread.h, have_pthread_h=yes)
+ if test "X$have_pthread_h" = "Xyes" ; then
+ LDFLAGS_save="${LDFLAGS}";
+ LDFLAGS="${LDFLAGS} -pthread"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>
+ pthread_t thr;]],
+ [pthread_create(&thr, NULL, NULL, NULL);])],,
+ [LDFLAGS="${LDFLAGS_save}"])
+ fi
AC_CHECK_LIB(util, openpty, )
AC_CHECK_LIB(db, dbopen, )
PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION"
@@ -1703,6 +1712,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!

9
net/pidgin/patches/patch-libpurple_purple_pc_in
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-libpurple_purple_pc_in,v 1.2 2010/06/10 20:13:33 steven Exp $
--- libpurple/purple.pc.in.orig Sat May 29 21:24:00 2010
+++ libpurple/purple.pc.in Fri Jun 4 21:42:39 2010
@@ -13,4 +13,4 @@ Description: libpurple is a GLib-based instant messeng
Version: @VERSION@
Requires: glib-2.0
Cflags: -I${includedir}/libpurple
-Libs: -L${libdir} -lpurple
+Libs: -L${libdir} -lpurple -pthread

5
x11/vlc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.156 2012/08/07 07:35:09 sthen Exp $
# $OpenBSD: Makefile,v 1.157 2012/08/26 07:16:54 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,8 +8,9 @@ COMMENT-jack= JACK audio output module for VLC
V= 2.0.3
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
REVISION-main= 0
REVISION-main= 1
PKGNAME-jack= vlc-jack-${V}
REVISION-jack= 0
CATEGORIES= x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz

33
x11/vlc/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.23 2012/07/06 12:51:11 sthen Exp $
--- configure.ac.orig Mon Jun 25 10:46:34 2012
+++ configure.ac Sat Jun 30 22:40:47 2012
$OpenBSD: patch-configure_ac,v 1.24 2012/08/26 07:16:54 ajacoutot Exp $
--- configure.ac.orig Tue Jul 3 18:55:34 2012
+++ configure.ac Thu Aug 16 14:24:29 2012
@@ -122,10 +122,6 @@ case "${host_os}" in
;;
openbsd*)
@ -12,28 +12,7 @@ $OpenBSD: patch-configure_ac,v 1.23 2012/07/06 12:51:11 sthen Exp $
;;
netbsd*)
SYS=netbsd
@@ -688,6 +684,20 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
if test "${THREAD_LIB}" = "error"; then
+ AC_MSG_CHECKING(for pthread_create in -pthread)
+ save_LDFLAGS="${LDFLAGS}"
+ LDFLAGS="${LDFLAGS} -pthread"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>
+ pthread_t thr;]],
+ [pthread_create(&thr, NULL, NULL, NULL);])],
+ [THREAD_LIB="-pthread"
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)])
+ LDFLAGS="${save_LDFLAGS}"
+fi
+ if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
fi
if test "${THREAD_LIB}" = "error"; then
@@ -964,33 +974,6 @@ dnl Check for various optimization flags
@@ -964,33 +960,6 @@ dnl Check for various optimization flags
AS_IF([test "${enable_optimizations}" != "no"], [
C_O=""
@ -67,7 +46,7 @@ $OpenBSD: patch-configure_ac,v 1.23 2012/07/06 12:51:11 sthen Exp $
VLC_RESTORE_FLAGS
CFLAGS="${CFLAGS} ${C_O}"
CXXFLAGS="${CXXFLAGS} ${C_O}"
@@ -1736,7 +1719,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"
@@ -1736,7 +1705,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"
AC_LANG_PUSH(C++)
CPPFLAGS_save="${CPPFLAGS}"
AS_IF([test -z "${CONTRIB_DIR}"], [
@ -76,7 +55,7 @@ $OpenBSD: patch-configure_ac,v 1.23 2012/07/06 12:51:11 sthen Exp $
], [
CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
])
@@ -3509,6 +3492,24 @@ AS_IF([test "$enable_oss" != "no"], [
@@ -3509,6 +3478,24 @@ AS_IF([test "$enable_oss" != "no"], [
])
AC_SUBST(OSS_LIBS)
AM_CONDITIONAL([HAVE_OSS], [test "${have_oss}" = "yes"])