Subject: pkg/17259: devel/SDL should use mk/pthread.buildlink.mk instead depending on devel/pth directly
To: None <gnats-bugs@gnats.netbsd.org>
From: Lubomir Sedlacik <salo@Xtrmntr.org>
List: netbsd-bugs
Date: 06/15/2002 01:19:02
>Number:         17259
>Category:       pkg
>Synopsis:       devel/SDL should use mk/pthread.buildlink.mk instead depending on devel/pth directly
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jun 14 16:20:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Lubomir Sedlacik
>Release:        SunOS 5.9
>Organization:
>Environment:
>Description:

devel/SDL incorrectly introduces direct dependency on devel/pth in Makefile
and buildlink.mk.  it should include mk/pthread.buildlink.mk instead and
define USE_PTHREAD variable to choose between native pthreads (if available)
and alternative devel/pth.

>How-To-Repeat:
>Fix:


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/SDL/Makefile,v
retrieving revision 1.31
diff -u -u -r1.31 Makefile
--- Makefile	2002/02/14 00:39:45	1.31
+++ Makefile	2002/06/14 23:13:18
@@ -11,7 +11,6 @@
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
-BUILDLINK_DEPENDS.pth=	pth>=1.4.0
 
 USE_BUILDLINK_ONLY=	YES
 
@@ -21,6 +20,8 @@
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+USE_PTHREAD=		native pth
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OBJECT_FMT} == "ELF"
@@ -57,7 +58,7 @@
 	cd ${WRKSRC}/src/audio && ${CP} *.[ch] netbsd/
 
 .include "../../audio/esound/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/aalib-x11/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
Index: buildlink.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/SDL/buildlink.mk,v
retrieving revision 1.13
diff -u -u -r1.13 buildlink.mk
--- buildlink.mk	2002/01/31 13:53:41	1.13
+++ buildlink.mk	2002/06/14 23:13:18
@@ -31,11 +31,13 @@
 REPLACE_BUILDLINK_SED+=	\
 	-e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g"
 
+USE_PTHREAD=		native pth
+
 .if defined(SDL_USE_NAS)
 .include "../../audio/nas/buildlink.mk"
 .endif
 .include "../../audio/esound/buildlink.mk"
-.include "../../devel/pth/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/aalib-x11/buildlink.mk"
 
>Release-Note:
>Audit-Trail:
>Unformatted: