mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

Correct pthread detection.

Browse Source 
Submitted by:	Craig Rodrigues <rodrigc@crodrigues.org> (maintainer)
Tested by:	kuriyama (on 4-stable and 5-current)
This commit is contained in:
Jun Kuriyama 2004-01-24 03:36:43 +00:00
parent e6b1822cd2
commit fc9cc5d066
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=98938
12 changed files with 188 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/apr/Makefile
View File

@ -14,7 +14,7 @@
PORTNAME= apr
PORTVERSION= 0.9.4
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
#MASTER_SITES= http://www.apache.org/dist/apr/
#DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
@ -35,10 +35,7 @@ USE_GMAKE= yes
USE_LIBTOOL_VER= 14
LIBTOOLFILES= # none
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}" \
CC="${CC}" CFLAGS="${CFLAGS}"
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
APR_CONF_ENV= CC="${CC}" CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} \

8
devel/apr/files/patch-apr_hints.m4
View File

@ -1,6 +1,6 @@
--- apr-0.9.4/build/apr_hints.m4.orig Mon Jun 2 11:52:28 2003
+++ apr-0.9.4/build/apr_hints.m4 Sun Nov 9 18:15:30 2003
@@ -130,14 +130,15 @@
--- apr-0.9.4/build/apr_hints.m4.orig Tue Dec 23 08:26:10 2003
+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 23 12:23:36 2004
@@ -129,14 +129,17 @@
APR_ADDTO(CPPFLAGS, [-DNETBSD])
;;
*-freebsd*)
@ -16,8 +16,10 @@
- APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
+ if test $os_version -lt "500016"; then
+ ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
+ ac_cv_pthreads_lib="none"
+ LIBS="$LIBS -pthread"
+ else
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="c_r"
+ fi
;;

40
devel/apr/files/patch-apr_threads.m4 Normal file
View File

@ -0,0 +1,40 @@
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 08:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Fri Jan 23 12:25:00 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
[apr_ptc_cflags=$CFLAGS
+ if test "x$ac_cv_pthreads_cflags" = "x"; then
for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do
CFLAGS=$apr_ptc_cflags
test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
@@ -118,6 +119,11 @@
break
])
done
+ else
+ if test "$ac_cv_pthreads_cflags" != "none"; then
+ apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
+ fi
+ fi
CFLAGS=$apr_ptc_cflags
])
@@ -136,6 +142,7 @@
AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
apr_ptc_libs=$LIBS
+ if test "x$ac_cv_pthreads_lib" = "x"; then
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,9 @@
break
])
done
+ else
+ test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ fi
LIBS=$apr_ptc_libs
])

7
devel/apr0/Makefile
View File

@ -14,7 +14,7 @@
PORTNAME= apr
PORTVERSION= 0.9.4
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
#MASTER_SITES= http://www.apache.org/dist/apr/
#DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
@ -35,10 +35,7 @@ USE_GMAKE= yes
USE_LIBTOOL_VER= 14
LIBTOOLFILES= # none
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}" \
CC="${CC}" CFLAGS="${CFLAGS}"
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
APR_CONF_ENV= CC="${CC}" CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} \

8
devel/apr0/files/patch-apr_hints.m4
View File

@ -1,6 +1,6 @@
--- apr-0.9.4/build/apr_hints.m4.orig Mon Jun 2 11:52:28 2003
+++ apr-0.9.4/build/apr_hints.m4 Sun Nov 9 18:15:30 2003
@@ -130,14 +130,15 @@
--- apr-0.9.4/build/apr_hints.m4.orig Tue Dec 23 08:26:10 2003
+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 23 12:23:36 2004
@@ -129,14 +129,17 @@
APR_ADDTO(CPPFLAGS, [-DNETBSD])
;;
*-freebsd*)
@ -16,8 +16,10 @@
- APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
+ if test $os_version -lt "500016"; then
+ ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
+ ac_cv_pthreads_lib="none"
+ LIBS="$LIBS -pthread"
+ else
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="c_r"
+ fi
;;

40
devel/apr0/files/patch-apr_threads.m4 Normal file
View File

@ -0,0 +1,40 @@
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 08:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Fri Jan 23 12:25:00 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
[apr_ptc_cflags=$CFLAGS
+ if test "x$ac_cv_pthreads_cflags" = "x"; then
for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do
CFLAGS=$apr_ptc_cflags
test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
@@ -118,6 +119,11 @@
break
])
done
+ else
+ if test "$ac_cv_pthreads_cflags" != "none"; then
+ apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
+ fi
+ fi
CFLAGS=$apr_ptc_cflags
])
@@ -136,6 +142,7 @@
AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
apr_ptc_libs=$LIBS
+ if test "x$ac_cv_pthreads_lib" = "x"; then
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,9 @@
break
])
done
+ else
+ test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ fi
LIBS=$apr_ptc_libs
])

7
devel/apr1/Makefile
View File

@ -14,7 +14,7 @@
PORTNAME= apr
PORTVERSION= 0.9.4
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
#MASTER_SITES= http://www.apache.org/dist/apr/
#DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
@ -35,10 +35,7 @@ USE_GMAKE= yes
USE_LIBTOOL_VER= 14
LIBTOOLFILES= # none
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}" \
CC="${CC}" CFLAGS="${CFLAGS}"
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
APR_CONF_ENV= CC="${CC}" CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} \

8
devel/apr1/files/patch-apr_hints.m4
View File

@ -1,6 +1,6 @@
--- apr-0.9.4/build/apr_hints.m4.orig Mon Jun 2 11:52:28 2003
+++ apr-0.9.4/build/apr_hints.m4 Sun Nov 9 18:15:30 2003
@@ -130,14 +130,15 @@
--- apr-0.9.4/build/apr_hints.m4.orig Tue Dec 23 08:26:10 2003
+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 23 12:23:36 2004
@@ -129,14 +129,17 @@
APR_ADDTO(CPPFLAGS, [-DNETBSD])
;;
*-freebsd*)
@ -16,8 +16,10 @@
- APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
+ if test $os_version -lt "500016"; then
+ ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
+ ac_cv_pthreads_lib="none"
+ LIBS="$LIBS -pthread"
+ else
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="c_r"
+ fi
;;

40
devel/apr1/files/patch-apr_threads.m4 Normal file
View File

@ -0,0 +1,40 @@
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 08:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Fri Jan 23 12:25:00 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
[apr_ptc_cflags=$CFLAGS
+ if test "x$ac_cv_pthreads_cflags" = "x"; then
for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do
CFLAGS=$apr_ptc_cflags
test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
@@ -118,6 +119,11 @@
break
])
done
+ else
+ if test "$ac_cv_pthreads_cflags" != "none"; then
+ apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
+ fi
+ fi
CFLAGS=$apr_ptc_cflags
])
@@ -136,6 +142,7 @@
AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
apr_ptc_libs=$LIBS
+ if test "x$ac_cv_pthreads_lib" = "x"; then
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,9 @@
break
])
done
+ else
+ test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ fi
LIBS=$apr_ptc_libs
])

7
devel/apr2/Makefile
View File

@ -14,7 +14,7 @@
PORTNAME= apr
PORTVERSION= 0.9.4
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
#MASTER_SITES= http://www.apache.org/dist/apr/
#DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
@ -35,10 +35,7 @@ USE_GMAKE= yes
USE_LIBTOOL_VER= 14
LIBTOOLFILES= # none
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LIBS="${PTHREAD_LIBS}" \
CC="${CC}" CFLAGS="${CFLAGS}"
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
APR_CONF_ENV= CC="${CC}" CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} \

8
devel/apr2/files/patch-apr_hints.m4
View File

@ -1,6 +1,6 @@
--- apr-0.9.4/build/apr_hints.m4.orig Mon Jun 2 11:52:28 2003
+++ apr-0.9.4/build/apr_hints.m4 Sun Nov 9 18:15:30 2003
@@ -130,14 +130,15 @@
--- apr-0.9.4/build/apr_hints.m4.orig Tue Dec 23 08:26:10 2003
+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 23 12:23:36 2004
@@ -129,14 +129,17 @@
APR_ADDTO(CPPFLAGS, [-DNETBSD])
;;
*-freebsd*)
@ -16,8 +16,10 @@
- APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
+ if test $os_version -lt "500016"; then
+ ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
+ ac_cv_pthreads_lib="none"
+ LIBS="$LIBS -pthread"
+ else
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="c_r"
+ fi
;;

40
devel/apr2/files/patch-apr_threads.m4 Normal file
View File

@ -0,0 +1,40 @@
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 08:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Fri Jan 23 12:25:00 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
[apr_ptc_cflags=$CFLAGS
+ if test "x$ac_cv_pthreads_cflags" = "x"; then
for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do
CFLAGS=$apr_ptc_cflags
test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
@@ -118,6 +119,11 @@
break
])
done
+ else
+ if test "$ac_cv_pthreads_cflags" != "none"; then
+ apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
+ fi
+ fi
CFLAGS=$apr_ptc_cflags
])
@@ -136,6 +142,7 @@
AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
apr_ptc_libs=$LIBS
+ if test "x$ac_cv_pthreads_lib" = "x"; then
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,9 @@
break
])
done
+ else
+ test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ fi
LIBS=$apr_ptc_libs
])