diff options
author | Maho Nakata <maho@FreeBSD.org> | 2003-08-15 22:39:12 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2003-08-15 22:39:12 +0000 |
commit | 221d366d7501f5ca7debf73daa90c19e8344dd6e (patch) | |
tree | eebddff5d0eca82c211c3e997330ffae3dd03dc8 /editors/openoffice.org-2.0-devel | |
parent | If you do not need mozilla connectivity, this patch might help you. (diff) |
add --with-gxx-include-path especially for STLport,
and pass PTHREAD_CFLAGS, PTHREAD_LIBS for every compilation.
See http://www.openoffice.org/issues/show_bug.cgi?id=18062 for detail.
Obtained from Volker Quetschke
Notes
Notes:
svn path=/head/; revision=87012
Diffstat (limited to 'editors/openoffice.org-2.0-devel')
-rw-r--r-- | editors/openoffice.org-2.0-devel/files/patch-config_office | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office b/editors/openoffice.org-2.0-devel/files/patch-config_office new file mode 100644 index 000000000000..29182dcbd96b --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-config_office @@ -0,0 +1,103 @@ +--- ../config_office/configure.in 5 Aug 2003 16:21:41 -0000 1.55.2.9 ++++ ../config_office/configure.in 9 Aug 2003 05:20:19 -0000 +@@ -77,6 +77,11 @@ + + Usage: --with-jdk-home=<absolute path to JDK 1.3 home> + ],,) ++AC_ARG_WITH(gxx_include_path, ++[ --with-gxx-include-path if you want to override the autodetected g++ include path. ++ ++ Usage: --with-gxx-include-path=<absolute path to g++ include dir> ++],,) + AC_ARG_ENABLE(java, + [ --disable-java Build without Java support. Use if there is no supported JDK + for your platform. The build will have no support for Java +@@ -191,8 +196,8 @@ + Usage: --with-asm-home=<path to ml.exe directory> + ],,) + AC_ARG_WITH(os-version, +-[ --with-os-version For FreeBSD users, use this option option to build +- OpenOffice.org with the correct OSVERSION. ++[ --with-os-version For FreeBSD users, use this option option to override ++ the detected OSVERSION. + + Usage: --with-os-version=<OSVERSION> + ],,) +@@ -301,6 +306,19 @@ + "FreeBSD") + test_x=yes + test_gtk=yes ++ AC_MSG_CHECKING([the FreeBSD operating system release]) ++ if test -n "$with_os_version"; then ++ OSVERSION="$with_os_version" ++ else ++ 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_LIBS="-pthread" ++ else ++ PTHREAD_LIBS="-lc_r" ++ fi + ;; + "OSF1") + test_x=dontknow +@@ -326,6 +345,7 @@ + + AC_MSG_RESULT([checked ($_os)]) + ++AC_SUBST(OSVERSION) + AC_SUBST(PTHREAD_CFLAGS) + AC_SUBST(PTHREAD_LIBS) + +@@ -812,30 +832,20 @@ + dnl =================================================================== + dnl Set the gcc/gxx include directories + dnl =================================================================== +-if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then +-if test "$GXX" = "yes"; then +- if test -n "$enable_gcc3"; then +- _gccincname1="g++-v3" +- else +- _gccincname1="g++-3" +- fi +- _gcc_include_path=".." +- _gxx_include_path="$_gcc_include_path/$_gccincname1" +-fi +-else +-if test "$GXX" = "yes"; then +- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` +- if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then +- _gxx_include_path="/usr/include" ++# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path ++# often contains an i386 which is expanded as a macro. Solved in stlport. ++if test "$GXX" = "yes" -a -z "$with_gxx_include_path"; then ++ with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` ++ if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then ++ with_gxx_include_path="/usr/include" + fi + dnl This is the original code... +-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include +-fi ++dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include + fi +-if test -z "$_gxx_include_path"; then +- _gxx_include_path="NO_GXX_INCLUDE" ++if test -z "$with_gxx_include_path"; then ++ with_gxx_include_path="NO_GXX_INCLUDE" + fi +-GXX_INCLUDE_PATH="$_gxx_include_path" ++GXX_INCLUDE_PATH="$with_gxx_include_path" + AC_SUBST(GXX_INCLUDE_PATH) + + dnl =================================================================== +@@ -1677,8 +1687,6 @@ + AC_SUBST(GCC_HOME) + + AC_SUBST(WITH_MINGWIN) +-OSVERSION="$with_os_version" +-AC_SUBST(OSVERSION) + + AC_OUTPUT([set_soenv]) + |