aboutsummaryrefslogtreecommitdiff
path: root/devel/sdl10
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-03-30 14:18:31 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-03-30 14:18:31 +0000
commit4dbcaae5c84c00cb10c3393ac7a82b80a84840a5 (patch)
tree509b173ed243771e2531c98be6f801f0650fb9b5 /devel/sdl10
parent5ccb6f19c2da84940988196a2b292ab725e15f2f (diff)
Notes
Diffstat (limited to 'devel/sdl10')
-rw-r--r--devel/sdl10/Makefile4
-rw-r--r--devel/sdl10/files/patch-ac9
2 files changed, 9 insertions, 4 deletions
diff --git a/devel/sdl10/Makefile b/devel/sdl10/Makefile
index a86a566db247..308ed4c1bafd 100644
--- a/devel/sdl10/Makefile
+++ b/devel/sdl10/Makefile
@@ -23,7 +23,9 @@ USE_XLIB= yes
USE_ESOUND= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm"
+CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --enable-video-svga
CFLAGS+= ${PTHREAD_CFLAGS}
diff --git a/devel/sdl10/files/patch-ac b/devel/sdl10/files/patch-ac
index 27e4f11aaa02..3806f37749de 100644
--- a/devel/sdl10/files/patch-ac
+++ b/devel/sdl10/files/patch-ac
@@ -1,5 +1,8 @@
+
+$FreeBSD$
+
--- configure.orig Sat Mar 4 04:58:00 2000
-+++ configure Thu Aug 31 18:43:39 2000
++++ configure Fri Mar 30 17:04:33 2001
@@ -604,9 +604,9 @@
# libtool versioning
@@ -26,7 +29,7 @@
case "$target" in
*-*-freebsd*)
- pthread_lib="-lc_r"
-+ pthread_lib="-pthread"
++ pthread_lib="${PTHREAD_LIBS}"
;;
*-*-openbsd*)
pthread_lib="-lc_r"
@@ -35,7 +38,7 @@
if test x$use_pthreads = xyes; then
CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS"
- SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT"
-+ SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT -D_THREAD_SAFE"
++ SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT ${PTHREAD_CFLAGS}"
SDL_LIBS="$SDL_LIBS $pthread_lib"
fi
fi