Apache OpenOffice (AOO) Bugzilla – Issue 17657
11rc3: stlport patch for OS X buildability
Last modified: 2004-02-15 07:31:37 UTC
Allow delivery and symlinking of STLport libs, plus some compile option changes for OS X.
Created attachment 8162 [details] cd stlport, patch -p0 < /path/to/patchfile
Created attachment 8163 [details] place in stlport, replacing any previous copy
I have cross-checked the STLport-4.5.patch file and it builds fine in RH 9 / gcc 3.2.2.
Hi, Approved since cross-checked by Dan under Linux if rc3 is still open for commits. Kevin
Committed to cws_srx645_ooo11rc3
something about this patch is bad for sparc linux? ============= Building project stlport ============= /usr/local/oo_src/stlport ------------- sed -e 's#GXX_INCLUDE_PATH#/usr/local/include/c++/3.3#g' < STLport-4.5.patch > ./unxlngs.pro/misc/STLport-4.5.patch cd ./unxlngs.pro/misc/build && cat ../../.././unxlngs.pro/misc/STLport-4.5.patch | patch -b -p2 && touch so_patched_so_stlport patching file STLport-4.5/src/dll_main.cpp patching file STLport-4.5/src/gcc-3.0-macosx.mak Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file STLport-4.5/src/gcc-3.0-macosx.mak.rej patching file STLport-4.5/src/gcc-3.0.mak Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file STLport-4.5/src/gcc-3.0.mak.rej patching file STLport-4.5/src/gcc-freebsd.mak Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 3 out of 3 hunks ignored -- saving rejects to file STLport-4.5/src/gcc-freebsd.mak.rej patching file STLport-4.5/stlport/config/stl_gcc.h Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 3 out of 3 hunks ignored -- saving rejects to file STLport-4.5/stlport/config/stl_gcc.h.rej patching file STLport-4.5/stlport/cwchar Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file STLport-4.5/stlport/cwchar.rej patching file STLport-4.5/stlport/stdexcept Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file STLport-4.5/stlport/stdexcept.rej patching file STLport-4.5/stlport/stl/_threads.h patching file STLport-4.5/src/gcc-3.0-freebsd.mak Reversed (or previously applied) patch detected! Assume -R? [n] n Apply anyway? [n] n Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file STLport-4.5/src/gcc-3.0-freebsd.mak.rej dmake: Error code 1, while making './unxlngs.pro/misc/build/so_patched_so_stlport' ---* TG_SLO.MK *--- ERROR: Error 65280 occurred while making /usr/local/oo_src/stlport
Hi, Someone just committed a fix for this problem I think (its a makefile dependency issue). CVS update your ooo11rc3 checkout to get revision 1.22.2.1. Dan
added __APPLE__ to avoid change on existing Linux platform. committed to master as 1.11.6.2
verfied in 1.1.0.
close issue