sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use PTHREAD_CFLAGS/PTHREAD_LIBS.

Browse source
This commit is contained in:
Maxim Sobolev 2001-03-30 14:18:31 +00:00
parent 5ccb6f19c2
commit 4dbcaae5c8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=40590
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devel/sdl/Makefile
View file

@ -23,7 +23,9 @@ USE_XLIB= yes
USE_ESOUND= yes USE_ESOUND= yes
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
USE_LIBTOOL= 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 CONFIGURE_ARGS= --enable-video-svga
CFLAGS+= ${PTHREAD_CFLAGS} CFLAGS+= ${PTHREAD_CFLAGS}

9
devel/sdl/files/patch-ac
View file

@ -1,5 +1,8 @@
$FreeBSD$
--- configure.orig Sat Mar 4 04:58:00 2000 --- 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 @@ @@ -604,9 +604,9 @@
# libtool versioning # libtool versioning
@ -26,7 +29,7 @@
case "$target" in case "$target" in
*-*-freebsd*) *-*-freebsd*)
- pthread_lib="-lc_r" - pthread_lib="-lc_r"
+ pthread_lib="-pthread" + pthread_lib="${PTHREAD_LIBS}"
;; ;;
*-*-openbsd*) *-*-openbsd*)
pthread_lib="-lc_r" pthread_lib="-lc_r"
@ -35,7 +38,7 @@
if test x$use_pthreads = xyes; then if test x$use_pthreads = xyes; then
CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS" CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS"
- SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT" - 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" SDL_LIBS="$SDL_LIBS $pthread_lib"
fi fi
fi fi

4
devel/sdl10/Makefile
View file

@ -23,7 +23,9 @@ USE_XLIB= yes
USE_ESOUND= yes USE_ESOUND= yes
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
USE_LIBTOOL= 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 CONFIGURE_ARGS= --enable-video-svga
CFLAGS+= ${PTHREAD_CFLAGS} CFLAGS+= ${PTHREAD_CFLAGS}

9
devel/sdl10/files/patch-ac
View file

@ -1,5 +1,8 @@
$FreeBSD$
--- configure.orig Sat Mar 4 04:58:00 2000 --- 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 @@ @@ -604,9 +604,9 @@
# libtool versioning # libtool versioning
@ -26,7 +29,7 @@
case "$target" in case "$target" in
*-*-freebsd*) *-*-freebsd*)
- pthread_lib="-lc_r" - pthread_lib="-lc_r"
+ pthread_lib="-pthread" + pthread_lib="${PTHREAD_LIBS}"
;; ;;
*-*-openbsd*) *-*-openbsd*)
pthread_lib="-lc_r" pthread_lib="-lc_r"
@ -35,7 +38,7 @@
if test x$use_pthreads = xyes; then if test x$use_pthreads = xyes; then
CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS" CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS"
- SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT" - 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" SDL_LIBS="$SDL_LIBS $pthread_lib"
fi fi
fi fi