diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2004-12-18 03:08:52 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2004-12-18 03:08:52 +0000 |
| commit | 852393cbec66a08a72853d529a437104a15087a1 (patch) | |
| tree | 0383e42e2831706f1aa9e8baa60330a63ad4b4c5 /editors | |
| parent | Fix PTHREAD_CFLAGS, PTHREAD_LIBS, hardcoded (diff) | |
Fix PTHREAD_CFLAGS and PTHREAD_LIBS
hardcoded inside config_office/configure.in
Notes
Notes:
svn path=/head/; revision=124353
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-1.1-devel/files/patch-config_office+configure.in | 48 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in | 48 |
2 files changed, 96 insertions, 0 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in new file mode 100644 index 000000000000..e7ffb67330a6 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in @@ -0,0 +1,48 @@ +Index: config_office/configure.in +=================================================================== +RCS file: /cvs/tools/config_office/configure.in,v +retrieving revision 1.55.6.10 +diff -u -r1.55.6.10 configure.in +--- config_office/configure.in 27 Aug 2004 10:03:41 -0000 1.55.6.10 ++++ config_office/configure.in 18 Dec 2004 03:13:51 -0000 +@@ -357,13 +357,14 @@ + OSVERSION=`/sbin/sysctl -n kern.osreldate` + fi + AC_MSG_RESULT([found OSVERSION=$OSVERSION]) +- PTHREAD_CFLAGS="-D_THREAD_SAFE" + if test "$OSVERSION" -lt "500016"; then ++ PTHREAD_CFLAGS="-D_THREAD_SAFE" + PTHREAD_LIBS="-pthread" + elif test "$OSVERSION" -lt "502102"; then ++ PTHREAD_CFLAGS="-D_THREAD_SAFE" + PTHREAD_LIBS="-lc_r" + else +- PTHREAD_LIBS="-lpthread" ++ PTHREAD_LIBS="-pthread" + fi + ;; + "OSF1") +Index: config_office/configure.in +=================================================================== +RCS file: /cvs/tools/config_office/configure.in,v +retrieving revision 1.55.6.10 +diff -u -r1.55.6.10 configure.in +--- config_office/configure.in 27 Aug 2004 10:03:41 -0000 1.55.6.10 ++++ config_office/configure.in 18 Dec 2004 03:13:51 -0000 +@@ -357,13 +357,14 @@ + OSVERSION=`/sbin/sysctl -n kern.osreldate` + fi + AC_MSG_RESULT([found OSVERSION=$OSVERSION]) +- PTHREAD_CFLAGS="-D_THREAD_SAFE" + if test "$OSVERSION" -lt "500016"; then ++ PTHREAD_CFLAGS="-D_THREAD_SAFE" + PTHREAD_LIBS="-pthread" + elif test "$OSVERSION" -lt "502102"; then ++ PTHREAD_CFLAGS="-D_THREAD_SAFE" + PTHREAD_LIBS="-lc_r" + else +- PTHREAD_LIBS="-lpthread" ++ PTHREAD_LIBS="-pthread" + fi + ;; + "OSF1") diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in new file mode 100644 index 000000000000..e7ffb67330a6 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in @@ -0,0 +1,48 @@ +Index: config_office/configure.in +=================================================================== +RCS file: /cvs/tools/config_office/configure.in,v +retrieving revision 1.55.6.10 +diff -u -r1.55.6.10 configure.in +--- config_office/configure.in 27 Aug 2004 10:03:41 -0000 1.55.6.10 ++++ config_office/configure.in 18 Dec 2004 03:13:51 -0000 +@@ -357,13 +357,14 @@ + OSVERSION=`/sbin/sysctl -n kern.osreldate` + fi + AC_MSG_RESULT([found OSVERSION=$OSVERSION]) +- PTHREAD_CFLAGS="-D_THREAD_SAFE" + if test "$OSVERSION" -lt "500016"; then ++ PTHREAD_CFLAGS="-D_THREAD_SAFE" + PTHREAD_LIBS="-pthread" + elif test "$OSVERSION" -lt "502102"; then ++ PTHREAD_CFLAGS="-D_THREAD_SAFE" + PTHREAD_LIBS="-lc_r" + else +- PTHREAD_LIBS="-lpthread" ++ PTHREAD_LIBS="-pthread" + fi + ;; + "OSF1") +Index: config_office/configure.in +=================================================================== +RCS file: /cvs/tools/config_office/configure.in,v +retrieving revision 1.55.6.10 +diff -u -r1.55.6.10 configure.in +--- config_office/configure.in 27 Aug 2004 10:03:41 -0000 1.55.6.10 ++++ config_office/configure.in 18 Dec 2004 03:13:51 -0000 +@@ -357,13 +357,14 @@ + OSVERSION=`/sbin/sysctl -n kern.osreldate` + fi + AC_MSG_RESULT([found OSVERSION=$OSVERSION]) +- PTHREAD_CFLAGS="-D_THREAD_SAFE" + if test "$OSVERSION" -lt "500016"; then ++ PTHREAD_CFLAGS="-D_THREAD_SAFE" + PTHREAD_LIBS="-pthread" + elif test "$OSVERSION" -lt "502102"; then ++ PTHREAD_CFLAGS="-D_THREAD_SAFE" + PTHREAD_LIBS="-lc_r" + else +- PTHREAD_LIBS="-lpthread" ++ PTHREAD_LIBS="-pthread" + fi + ;; + "OSF1") |