Apache OpenOffice (AOO) Bugzilla – Issue 18062
FreeBSD-4.8: Enhance configure
Last modified: 2010-11-10 15:59:10 UTC
The following patch adds a new option to configure: --with-gxx-include-path Used to override the autodetected g++ include path. This is a fallback if the autodetection doesn't provide the correct path, *OR* there are macros in the path that get expanded to strange values. This was also necessary because for FreeBSD the include dir was set to ../g++-3 but ../c++ would have been correct for FreeBSD gcc33. The autodetection gives: "/usr/local/lib/gcc-lib/i386-portbld-freebsd4.8/3.3.1/include/c++" on this machine. *ATTENTION* This normally fails because "i386" is a macro and expands to 1 in stlport. I will also file an issue with a small fix for stlport to cure this problem. It also enhances the --with-os-version switch for FreeBSD, if you are on FreeBSD and don't use this switch OSVERSION is autmatically detected and set. For FreeBSD the following variables are now set (they got actually unset before): PTHREAD_CFLAGS="-D_THREAD_SAFE" And depending on the OSVERSION PTHREAD_LIBS="-pthread" or PTHREAD_LIBS="-lc_r" To get a correct build environment for gcc 3.3.1 I call configure in the following way: $ CC=gcc33 CXX=g++33 ./configure --with-jdk-home=/usr/local/jdk1.4.1
Created attachment 8359 [details] Patch for config_office/configure.in
Target 1.1.1
Hi, Volker thanks for your excellent work! As far as I remember, I suggested to Martin to use /sbin/sysctl -n kern.osreldate, however, the version of userland and (see /usr/include/osreldate.h) the kernel sometimes differ. so he reject to use it... use this with caution, but I think nowadays it is not a serious problem. As you know, for 4.6-RELEASE or so there a bug or something in rtld that prevents OOo to build. but it was an old issue.
Patch approved. Please apply.
Can someone apply it together with regenerated configure?
Committed to cws_srx645_ooo111fix1.
verifying for close.
Closing.
Created attachment 73048