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

use -pthread instead of -lpthread for pthreads linkage

Browse Source 
fix some WANTLIB/LIB_DEPENDS in akode and amarok while here

bulk build tested by steven@, "go ahead" espie@ a while ago
This commit is contained in:
jakemsr 2007-12-11 07:55:05 +00:00
parent d7d07e0294
commit 41cd1c99bd
10 changed files with 90 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/akode/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2007/10/01 17:39:50 jakemsr Exp $
# $OpenBSD: Makefile,v 1.8 2007/12/11 07:55:05 jakemsr Exp $
COMMENT= Decoding Library for KDE Multimedia
DISTNAME= akode-2.0.2
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
SHARED_LIBS += akode 2.1 # .2.0
CATEGORIES= audio multimedia x11/kde
@ -22,12 +22,13 @@ PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= FLAC.>=8::audio/flac \
mad::audio/libmad \
speex::audio/speex \
vorbis,vorbisfile::audio/libvorbis \
vorbis,vorbisfile,vorbisenc::audio/libvorbis \
ltdl::devel/libtool,-ltdl \
avcodec.>=10,avformat.>=10::graphics/ffmpeg \
avcodec.>=10,avformat.>=10,avutil.>=3::graphics/ffmpeg \
samplerate.>=1::audio/libsamplerate
WANTLIB= c stdc++ pthread m ossaudio ogg
WANTLIB= X11 Xau Xdmcp Xext a52 c faac faad m mp3lame \
ogg ossaudio pthread stdc++ theora x264 z
USE_X11= Yes
USE_GMAKE= Yes
@ -36,6 +37,7 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.60
CONFIGURE= /bin/sh ${WRKDIST}/admin/cvs.sh configure
CONFIGURE_ENV= PTHREAD_LIBS=-pthread
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \
--with-extra-libs=${LOCALBASE}/lib

15
audio/akode/patches/patch-acinclude_m4 Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2007/12/11 07:55:05 jakemsr Exp $
--- acinclude.m4.orig Fri Apr 6 06:23:11 2007
+++ acinclude.m4 Sun Oct 21 05:27:14 2007
@@ -4394,7 +4394,10 @@ AC_DEFUN([KDE_CHECK_LIBPTHREAD],
dnl Un-special-case for FreeBSD.
if test "x$LIBPTHREAD" = "xPTHREAD" ; then
- LIBPTHREAD=""
+ case $host_os in
+ openbsd*) LIBPTHREAD="-pthread" ;;
+ *) LIBPTHREAD="" ;;
+ esac
fi
AC_SUBST(LIBPTHREAD)

12
audio/akode/patches/patch-akode_akode-config_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-akode_akode-config_in,v 1.1 2007/12/11 07:55:05 jakemsr Exp $
--- akode/akode-config.in.orig Sun Oct 21 18:21:09 2007
+++ akode/akode-config.in Sun Oct 21 18:21:42 2007
@@ -29,7 +29,7 @@ while test $# -gt 0
do
case $1 in
--libs)
- flags="$flags -L$libdir -lakode"
+ flags="$flags -L$libdir -lakode @LIBPTHREAD@"
;;
--cflags)
flags="$flags -I$includedir"

6
audio/amarok/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2007/08/25 08:53:28 espie Exp $
# $OpenBSD: Makefile,v 1.23 2007/12/11 07:55:05 jakemsr Exp $
CATEGORIES= audio x11 x11/kde
COMMENT= music player for kde
@ -7,7 +7,7 @@ HOMEPAGE= http://amarok.kde.org/
V= 1.4.7
MASTER_SITES= ${MASTER_SITE_KDE:=stable/amarok/$V/src/}
DISTNAME= amarok-$V
PKGNAME= ${DISTNAME}
PKGNAME= ${DISTNAME}p0
EXTRACT_SUFX= .tar.bz2
FLAVORS= debug
@ -21,7 +21,7 @@ LIB_DEPENDS+= lib/qt3/qt-mt.>=3.33::x11/qt3 \
njb::audio/libnjb
WANTLIB= stdc++ Xext Xrender z X11 Xau Xdmcp util m SM c \
pthread ICE idn freetype \
pthread ICE idn expat fontconfig freetype \
iconv pcre pcreposix \
jpeg png art_lgpl_2 intl usb \
gdk_pixbuf-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \

4
audio/amarok/patches/patch-configure_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_in,v 1.3 2007/03/18 11:11:26 espie Exp $
$OpenBSD: patch-configure_in,v 1.4 2007/12/11 07:55:05 jakemsr Exp $
--- configure.in.orig Thu Feb 1 19:14:18 2007
+++ configure.in Sat Mar 17 23:29:04 2007
@@ -844,7 +844,7 @@ AC_MSG_RESULT($amarok_glibcsched_works)
@ -6,7 +6,7 @@ $OpenBSD: patch-configure_in,v 1.3 2007/03/18 11:11:26 espie Exp $
KDE_CHECK_HEADER(konqsidebarplugin.h, have_konqsidebar=yes, have_konqsidebar=no)
-KDE_CHECK_LIB(konqsidebarplugin, _init, have_konqsidebar=$have_konqsidebar, have_konqsidebar=no)
+KDE_CHECK_LIB(konqsidebarplugin, _init, have_konqsidebar=$have_konqsidebar, have_konqsidebar=no, -lstdc++)
+KDE_CHECK_LIB(konqsidebarplugin, _init, have_konqsidebar=$have_konqsidebar, have_konqsidebar=no, [-lstdc++ $LIBPTHREAD])
AM_CONDITIONAL(with_konqsidebar, [test x$have_konqsidebar = xyes])

12
x11/kde/bindings3/patches/patch-qtruby_rubylib_designer_rbuic_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-qtruby_rubylib_designer_rbuic_Makefile_in,v 1.1 2007/12/11 07:55:05 jakemsr Exp $
--- qtruby/rubylib/designer/rbuic/Makefile.in.orig Tue Oct 30 14:14:05 2007
+++ qtruby/rubylib/designer/rbuic/Makefile.in Tue Oct 30 14:17:52 2007
@@ -399,7 +399,7 @@ INCLUDES = $(all_includes)
librbuic_la_SOURCES = widgetdatabase.cpp uic.cpp subclassing.cpp parser.cpp object.cpp form.cpp embed.cpp domtool.cpp
librbuic_la_LIBADD = $(LIB_QT) $(LIBZ)
rbuic_SOURCES = main.cpp
-rbuic_LDADD = librbuic.la $(all_libraries)
+rbuic_LDADD = librbuic.la $(all_libraries) $(LIBPTHREAD)
rbuic_LDFLAGS =
EXTRA_DIST = domtool.cpp domtool.h embed.cpp form.cpp globaldefs.h main.cpp object.cpp parser.cpp parser.h subclassing.cpp uic.cpp uic.h widgetdatabase.cpp widgetdatabase.h widgetinterface.h
#>- all: all-am

3
x11/kde/kde.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: kde.port.mk,v 1.27 2007/10/24 21:52:16 espie Exp $
# $OpenBSD: kde.port.mk,v 1.28 2007/12/11 07:55:05 jakemsr Exp $
SHARED_ONLY?= Yes
@ -32,6 +32,7 @@ MODKDE_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin
MODKDE_CONFIGURE_ENV= UIC_PATH="${MODQT_UIC}" UIC="${MODQT_UIC}"
MODKDE_CONFIGURE_ENV+= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
MODKDE_CONFIGURE_ENV+= PTHREAD_LIBS=-pthread
MODKDE_MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
MODKDE_MAKE_FLAGS+= LIBRESOLV=

17
x11/kde/libs3/patches/patch-configure_in
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-configure_in,v 1.29 2007/10/24 21:52:18 espie Exp $
--- configure.in.orig Mon Oct 8 16:41:26 2007
+++ configure.in Mon Oct 22 23:35:14 2007
@@ -2011,7 +2011,7 @@ dnl ==================================================
$OpenBSD: patch-configure_in,v 1.30 2007/12/11 07:55:05 jakemsr Exp $
--- configure.in.orig Thu May 17 00:09:47 2007
+++ configure.in Sun Oct 21 13:56:57 2007
@@ -1145,7 +1145,7 @@ if test "$ac_use_cups" = "yes"; then
else
AC_MSG_RESULT(cups-config not found, using default libraries: $kde_cups_libs. You should consider upgrading CUPS)
fi
- KDE_CHECK_LIB(cups,cupsServer,[ac_cups_libs=1],[ac_cups_libs=0],[$LIBDL $LIBSOCKET])
+ KDE_CHECK_LIB(cups,cupsServer,[ac_cups_libs=1],[ac_cups_libs=0],[$kde_cups_libs $LIBDL $LIBSOCKET])
if test "$ac_cups_libs" = "0"; then
AC_MSG_WARN(CUPS library not found. CUPS support disabled)
ac_use_cups="no"
@@ -2009,7 +2009,7 @@ dnl ==================================================
AC_LANG_SAVE
AC_LANG_C
dnl Check for aspell library

14
x11/kde/multimedia3/patches/patch-configure_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_in,v 1.29 2007/10/31 11:09:02 jakemsr Exp $
$OpenBSD: patch-configure_in,v 1.30 2007/12/11 07:55:05 jakemsr Exp $
--- configure.in.orig Mon Oct 8 16:26:39 2007
+++ configure.in Wed Oct 24 12:03:20 2007
@@ -164,22 +164,22 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS],
@ -44,12 +44,16 @@ $OpenBSD: patch-configure_in,v 1.29 2007/10/31 11:09:02 jakemsr Exp $
then
DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"
else
- KDE_CHECK_LIB(akode_mpeg_decoder, mpeg_decoder, have_akode_mpeg=yes, have_akode_mpeg=no, -lakode)
- KDE_CHECK_LIB(akode_mpc_decoder, mpc_decoder, have_akode_mpc=yes, have_akode_mpc=no, -lakode)
- KDE_CHECK_LIB(akode_xiph_decoder, xiph_decoder, have_akode_xiph=yes, have_akode_xiph=no, -lakode)
- KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, have_akode_ffmpeg=yes, have_akode_ffmpeg=no, -lakode)
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
KDE_CHECK_LIB(akode_mpeg_decoder, mpeg_decoder, have_akode_mpeg=yes, have_akode_mpeg=no, -lakode)
KDE_CHECK_LIB(akode_mpc_decoder, mpc_decoder, have_akode_mpc=yes, have_akode_mpc=no, -lakode)
KDE_CHECK_LIB(akode_xiph_decoder, xiph_decoder, have_akode_xiph=yes, have_akode_xiph=no, -lakode)
KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, have_akode_ffmpeg=yes, have_akode_ffmpeg=no, -lakode)
+ KDE_CHECK_LIB(akode_mpeg_decoder, mpeg_decoder, have_akode_mpeg=yes, have_akode_mpeg=no, $akode_libs)
+ KDE_CHECK_LIB(akode_mpc_decoder, mpc_decoder, have_akode_mpc=yes, have_akode_mpc=no, $akode_libs)
+ KDE_CHECK_LIB(akode_xiph_decoder, xiph_decoder, have_akode_xiph=yes, have_akode_xiph=no, $akode_libs)
+ KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, have_akode_ffmpeg=yes, have_akode_ffmpeg=no, $akode_libs)
+ AC_LANG_RESTORE
fi

15
x11/kde/patches-3.5.7/patch-acinclude_m4 Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2007/12/11 07:55:05 jakemsr Exp $
--- acinclude.m4.orig Fri Apr 6 06:23:11 2007
+++ acinclude.m4 Sun Oct 21 05:27:14 2007
@@ -4394,7 +4394,10 @@ AC_DEFUN([KDE_CHECK_LIBPTHREAD],
dnl Un-special-case for FreeBSD.
if test "x$LIBPTHREAD" = "xPTHREAD" ; then
- LIBPTHREAD=""
+ case $host_os in
+ openbsd*) LIBPTHREAD="-pthread" ;;
+ *) LIBPTHREAD="" ;;
+ esac
fi
AC_SUBST(LIBPTHREAD)