kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Honor `--disable-threads' in configure scripts [1]

Browse source 
Support latest 5-CURRENT (-lpthread instad of -lc_r) [2]

Submitted by:	lev [1]
		Craig Rodrigues <rodrigc@crodrigues.org> (maintainer) [2]
Reviewed by:	Craig Rodrigues <rodrigc@crodrigues.org> (maintainer)
Approved by:	Craig Rodrigues <rodrigc@crodrigues.org> (maintainer)
This commit is contained in:
Lev A. Serebryakov 2004-01-31 10:04:40 +00:00
parent 3bb2f85aee
commit b2931451eb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=99594
12 changed files with 68 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/apr/Makefile
View file

@ -14,7 +14,7 @@
PORTNAME= apr
PORTVERSION= 0.9.4
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel
#MASTER_SITES= http://www.apache.org/dist/apr/
#DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz

14
devel/apr/files/patch-apr_hints.m4
View file

@ -1,6 +1,6 @@
--- 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-0.9.4/build/apr_hints.m4.orig Mon Dec 22 18:26:10 2003
+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 30 22:53:49 2004
@@ -129,14 +129,19 @@
APR_ADDTO(CPPFLAGS, [-DNETBSD])
;;
*-freebsd*)
@ -16,11 +16,13 @@
- 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_lib="-pthread"
+ elif test $os_version -lt "502102"; then
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="c_r"
+ else
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="pthread"
+ fi
;;
*-next-nextstep*)

12
devel/apr/files/patch-apr_threads.m4
View file

@ -1,5 +1,5 @@
--- 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
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 02:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Wed Jan 28 17:52:33 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
@ -28,12 +28,16 @@
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,9 @@
@@ -143,6 +150,13 @@
break
])
done
+ else
+ test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ case x$ac_cv_pthreads_lib in
+ x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
+ xnone|x) : ;;
+ *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ esac
+ fi
LIBS=$apr_ptc_libs
])

2
devel/apr0/Makefile
View file

@ -14,7 +14,7 @@
PORTNAME= apr
PORTVERSION= 0.9.4
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel
#MASTER_SITES= http://www.apache.org/dist/apr/
#DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz

14
devel/apr0/files/patch-apr_hints.m4
View file

@ -1,6 +1,6 @@
--- 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-0.9.4/build/apr_hints.m4.orig Mon Dec 22 18:26:10 2003
+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 30 22:53:49 2004
@@ -129,14 +129,19 @@
APR_ADDTO(CPPFLAGS, [-DNETBSD])
;;
*-freebsd*)
@ -16,11 +16,13 @@
- 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_lib="-pthread"
+ elif test $os_version -lt "502102"; then
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="c_r"
+ else
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="pthread"
+ fi
;;
*-next-nextstep*)

12
devel/apr0/files/patch-apr_threads.m4
View file

@ -1,5 +1,5 @@
--- 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
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 02:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Wed Jan 28 17:52:33 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
@ -28,12 +28,16 @@
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,9 @@
@@ -143,6 +150,13 @@
break
])
done
+ else
+ test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ case x$ac_cv_pthreads_lib in
+ x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
+ xnone|x) : ;;
+ *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ esac
+ fi
LIBS=$apr_ptc_libs
])

2
devel/apr1/Makefile
View file

@ -14,7 +14,7 @@
PORTNAME= apr
PORTVERSION= 0.9.4
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel
#MASTER_SITES= http://www.apache.org/dist/apr/
#DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz

14
devel/apr1/files/patch-apr_hints.m4
View file

@ -1,6 +1,6 @@
--- 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-0.9.4/build/apr_hints.m4.orig Mon Dec 22 18:26:10 2003
+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 30 22:53:49 2004
@@ -129,14 +129,19 @@
APR_ADDTO(CPPFLAGS, [-DNETBSD])
;;
*-freebsd*)
@ -16,11 +16,13 @@
- 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_lib="-pthread"
+ elif test $os_version -lt "502102"; then
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="c_r"
+ else
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="pthread"
+ fi
;;
*-next-nextstep*)

12
devel/apr1/files/patch-apr_threads.m4
View file

@ -1,5 +1,5 @@
--- 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
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 02:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Wed Jan 28 17:52:33 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
@ -28,12 +28,16 @@
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,9 @@
@@ -143,6 +150,13 @@
break
])
done
+ else
+ test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ case x$ac_cv_pthreads_lib in
+ x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
+ xnone|x) : ;;
+ *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ esac
+ fi
LIBS=$apr_ptc_libs
])

2
devel/apr2/Makefile
View file

@ -14,7 +14,7 @@
PORTNAME= apr
PORTVERSION= 0.9.4
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel
#MASTER_SITES= http://www.apache.org/dist/apr/
#DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz

14
devel/apr2/files/patch-apr_hints.m4
View file

@ -1,6 +1,6 @@
--- 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-0.9.4/build/apr_hints.m4.orig Mon Dec 22 18:26:10 2003
+++ apr-0.9.4/build/apr_hints.m4 Fri Jan 30 22:53:49 2004
@@ -129,14 +129,19 @@
APR_ADDTO(CPPFLAGS, [-DNETBSD])
;;
*-freebsd*)
@ -16,11 +16,13 @@
- 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_lib="-pthread"
+ elif test $os_version -lt "502102"; then
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="c_r"
+ else
+ ac_cv_pthreads_cflags="none"
+ ac_cv_pthreads_lib="pthread"
+ fi
;;
*-next-nextstep*)

12
devel/apr2/files/patch-apr_threads.m4
View file

@ -1,5 +1,5 @@
--- 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
--- apr-0.9.4/build/apr_threads.m4.orig Sun Nov 16 02:42:33 2003
+++ apr-0.9.4/build/apr_threads.m4 Wed Jan 28 17:52:33 2004
@@ -110,6 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
@ -28,12 +28,16 @@
for lib in -lpthread -lpthreads -lc_r; do
LIBS="$apr_ptc_libs $lib"
APR_PTHREADS_TRY_RUN([
@@ -143,6 +150,9 @@
@@ -143,6 +150,13 @@
break
])
done
+ else
+ test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ case x$ac_cv_pthreads_lib in
+ x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
+ xnone|x) : ;;
+ *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
+ esac
+ fi
LIBS=$apr_ptc_libs
])