diff options
| author | tron <tron@pkgsrc.org> | 2002-06-25 06:54:43 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2002-06-25 06:54:43 +0000 |
| commit | 902f07db37beb9278eb0c40edf4a2a9d86c82532 (patch) | |
| tree | 5d4eccbde3289a3cf4ccf26e16cc4087ed30dd9c /devel/SDL | |
| parent | cd5039bff8d467ff31b371f8d4be15db066ce4a5 (diff) | |
| download | pkgsrc-902f07db37beb9278eb0c40edf4a2a9d86c82532.tar.gz | |
Back out last change on request by Thomas Klausner and Nick Hudson:
Setting "USE_PTHREADS" in a buildlink file will cause problems if the
package which includes it wants to use different POSIX threads libraries.
Diffstat (limited to 'devel/SDL')
| -rw-r--r-- | devel/SDL/Makefile | 6 | ||||
| -rw-r--r-- | devel/SDL/buildlink.mk | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index ee94ca39dff..2b13cbd94ba 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/06/24 20:25:25 tron Exp $ +# $NetBSD: Makefile,v 1.34 2002/06/25 06:54:43 tron Exp $ # DISTNAME= SDL-1.2.3 @@ -20,8 +20,6 @@ USE_GMAKE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -USE_PTHREAD= native pth - .include "../../mk/bsd.prefs.mk" .if ${OBJECT_FMT} == "ELF" @@ -58,9 +56,9 @@ post-configure: cd ${WRKSRC}/src/audio && ${CP} *.[ch] netbsd/ .include "../../audio/esound/buildlink.mk" +.include "../../devel/pth/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/aalib-x11/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" -.include "../../mk/pthread.buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk index 85b3d831f9a..4aad7335920 100644 --- a/devel/SDL/buildlink.mk +++ b/devel/SDL/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.14 2002/06/24 20:25:26 tron Exp $ +# $NetBSD: buildlink.mk,v 1.15 2002/06/25 06:54:43 tron Exp $ # # This Makefile fragment is included by packages that use SDL. # @@ -26,8 +26,6 @@ BUILDLINK_FILES.SDL= include/SDL/* BUILDLINK_FILES.SDL+= lib/libSDL.* BUILDLINK_FILES.SDL+= lib/libSDLmain.* -USE_PTHREAD= native pth - .include "../../mk/bsd.prefs.mk" REPLACE_BUILDLINK_SED+= \ @@ -37,9 +35,9 @@ REPLACE_BUILDLINK_SED+= \ .include "../../audio/nas/buildlink.mk" .endif .include "../../audio/esound/buildlink.mk" +.include "../../devel/pth/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/aalib-x11/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" BUILDLINK_TARGETS.SDL= SDL-buildlink BUILDLINK_TARGETS.SDL+= SDL-buildlink-config-wrapper |