diff options
| author | sobomax <sobomax@FreeBSD.org> | 2001-03-30 22:18:31 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2001-03-30 22:18:31 +0800 |
| commit | 361205f18429fab5e1108fcdeb4f373a9529953a (patch) | |
| tree | e835f83c154a5c711ed7fbcbb66e8ee0731bc7e6 | |
| parent | fd45a1775c87363c9b13634d30290f9b4a0d3538 (diff) | |
| download | freebsd-ports-gnome-361205f18429fab5e1108fcdeb4f373a9529953a.tar.gz freebsd-ports-gnome-361205f18429fab5e1108fcdeb4f373a9529953a.tar.zst freebsd-ports-gnome-361205f18429fab5e1108fcdeb4f373a9529953a.zip | |
Use PTHREAD_CFLAGS/PTHREAD_LIBS.
| -rw-r--r-- | devel/sdl/Makefile | 4 | ||||
| -rw-r--r-- | devel/sdl/files/patch-ac | 9 | ||||
| -rw-r--r-- | devel/sdl10/Makefile | 4 | ||||
| -rw-r--r-- | devel/sdl10/files/patch-ac | 9 |
4 files changed, 18 insertions, 8 deletions
diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile index a86a566db247..308ed4c1bafd 100644 --- a/devel/sdl/Makefile +++ b/devel/sdl/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/sdl/files/patch-ac b/devel/sdl/files/patch-ac index 27e4f11aaa02..3806f37749de 100644 --- a/devel/sdl/files/patch-ac +++ b/devel/sdl/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 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 |