diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-05-07 16:54:43 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-08 10:10:57 +0100 |
| commit | 0f555363a3e12d45c3c1d7dcb26e32dc2dcf0ce2 (patch) | |
| tree | e4daf5a2979982b375b099abbe319513e1035ef3 /scp2 | |
| parent | f3ee7a8a463af1fde6ed0da91abb654b25a3ecd9 (diff) | |
fdo#49580: Fix bean after gbuild'ification
4478b739ddade09425d496cbddee1542fdfd5e9b "convert bean to gbuild and add to
tail_build" broke the following:
* The name of the officebean dynamic library must not be changed (by adding the
"lo" extension), as code in officebean.jar uses it in NativeLibraryLoader.
* With gbuild's per-default hidden visibility, JNIEXPORT functions must instead
use SAL_DLLPUBLIC_EXPORT. (Windows-only code in bean/native/win32/ should be
safe to continue using JNIEXPORT.)
Change-Id: I I3c312dd05c90421ba0c726496b7149a26d155604
(cherry picked from commit 708229dc96533b6f165b82ce4d9e07537d1ce8b1)
Conflicts:
Repository.mk
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index abcfec494864..d01b45bcc599 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -894,7 +894,16 @@ STD_LIB_FILE( gid_File_Lib_Offacc, offacc) #ifdef SOLAR_JAVA #ifndef MACOSX -STD_LIB_FILE(gid_File_Lib_Officebean, officebean) +File gid_File_Lib_Officebean + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + Name = STRING(CONCAT2(libofficebean,UNXSUFFIX)); + #else + Name = "officebean.dll"; + #endif +End #endif #endif |