Fix hard-coded -lpthread.

This commit is contained in:
joerg 2006-08-22 14:29:07 +00:00
parent 2002ad978d
commit 48480d18c7
4 changed files with 40 additions and 2 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2006/07/26 18:26:49 rillig Exp $
# $NetBSD: Makefile,v 1.3 2006/08/22 14:29:07 joerg Exp $
#
DISTNAME= lmms-0.2.0
@ -31,4 +31,5 @@ BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.11
.include "../../devel/SDL/buildlink3.mk"
.include "../../x11/Xfixes/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
$NetBSD: distinfo,v 1.2 2006/08/22 14:29:07 joerg Exp $
SHA1 (lmms-0.2.0.tar.bz2) = 410647c860d140769ed1c56bb8a794cb2594658b
RMD160 (lmms-0.2.0.tar.bz2) = c3e44e018303ed40d048542a8f66fbb785ea11f2
@ -7,3 +7,5 @@ SHA1 (patch-aa) = ea99645ba74ea80c669e1757fca949541d2b5441
SHA1 (patch-ab) = 8a598eed529d609272419283e382ad2223dfe4d6
SHA1 (patch-ac) = f9be78b4c606e80c8b0bad78fafbd8ee07f2e65e
SHA1 (patch-ad) = b62e49823415530354a01c43fc588338212aaf68
SHA1 (patch-ae) = de50ed87888b74a0d3ed0158dda3291af54595c9
SHA1 (patch-af) = acb2752b501d3d286028ab85eae474759d921924

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ae,v 1.1 2006/08/22 14:29:07 joerg Exp $
--- plugins/vestige/Makefile.in.orig 2006-08-22 16:13:41.000000000 +0000
+++ plugins/vestige/Makefile.in
@@ -241,7 +241,7 @@ EXTRA_DIST = $(EMBEDDED_RESOURCES)
pkglib_LTLIBRARIES = libvestige.la
libvestige_la_SOURCES = vestige.cpp vestige.h lvsl_client.cpp lvsl_client.h
lvsl_server_SOURCES = lvsl_server.c communication.h
-lvsl_server_LDFLAGS = -mwindows -L/usr/X11R6/lib -lX11 -lpthread -o $(pkglib_PROGRAMS)
+lvsl_server_LDFLAGS = -mwindows -L/usr/X11R6/lib -lX11 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -o $(pkglib_PROGRAMS)
lvsl_server_LINK = wineg++
nobase_pkglib_DATA = $(pkglib_PROGRAMS).exe.so
CLEANFILES = $(MOC_FILES) ./embedded_resources.h $(nobase_pkglib_DATA)

View file

@ -0,0 +1,22 @@
$NetBSD: patch-af,v 1.1 2006/08/22 14:29:07 joerg Exp $
--- configure.orig 2006-08-22 16:22:55.000000000 +0000
+++ configure
@@ -21822,7 +21822,7 @@ fi
if test x"$QT_IS_MT" = "xyes" ; then
QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
- QT_LIBS="$QT_LIBS -lpthread"
+ QT_LIBS="$QT_LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
fi
if test x"$QT_TRANSLATIONS" != x ; then
@@ -24717,7 +24717,7 @@ done
OLD_LIBS="$LIBS"
-LIBS="$LIBS -lpthread"
+LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
# check for SDL-lib