You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2012/03/12 04:20:14 UTC
svn commit: r1299552 - in /incubator/ooo/trunk:
ext_libraries/apr-util/prj/d.lst ext_libraries/apr/prj/d.lst
ext_libraries/serf/prj/d.lst main/scp2/source/ooo/file_library_ooo.scp
Author: maho
Date: Mon Mar 12 03:20:14 2012
New Revision: 1299552
URL: http://svn.apache.org/viewvc?rev=1299552&view=rev
Log:
Fix shared lib's version number for FreeBSD.
Modified:
incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst
incubator/ooo/trunk/ext_libraries/apr/prj/d.lst
incubator/ooo/trunk/ext_libraries/serf/prj/d.lst
incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
Modified: incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst?rev=1299552&r1=1299551&r2=1299552&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/prj/d.lst Mon Mar 12 03:20:14 2012
@@ -8,7 +8,9 @@ mkdir: %_DEST%\inc%_EXT%\apr-util
# Linux
..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
linklib: libaprutil-1.so.*.*
+linklib: libaprutil-1.so.*
# Mac
..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%
Modified: incubator/ooo/trunk/ext_libraries/apr/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/prj/d.lst?rev=1299552&r1=1299551&r2=1299552&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/prj/d.lst (original)
+++ incubator/ooo/trunk/ext_libraries/apr/prj/d.lst Mon Mar 12 03:20:14 2012
@@ -16,7 +16,9 @@ mkdir: %_DEST%\lib%_EXT%\apr
# Linux
..\%__SRC%\lib\libapr-1.so.*.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libapr-1.so.* %_DEST%\lib%_EXT%
linklib: libapr-1.so.*.*
+linklib: libapr-1.so.*
# Mac
..\%__SRC%\lib\libapr-1.*dylib %_DEST%\lib%_EXT%
Modified: incubator/ooo/trunk/ext_libraries/serf/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/prj/d.lst?rev=1299552&r1=1299551&r2=1299552&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/prj/d.lst (original)
+++ incubator/ooo/trunk/ext_libraries/serf/prj/d.lst Mon Mar 12 03:20:14 2012
@@ -7,5 +7,6 @@ mkdir: %_DEST%\inc%_EXT%\serf
# Linux, BSD, et al
..\%__SRC%\lib\libserf-1.so.*.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libserf-1.so.* %_DEST%\lib%_EXT%
linklib: libserf-1.so.*.*
-
+linklib: libserf-1.so.*
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1299552&r1=1299551&r2=1299552&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon Mar 12 03:20:14 2012
@@ -2008,6 +2008,8 @@ File gid_File_Lib_Apr
// part of the suffix. An error?
#ifdef MACOSX
Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
+ #elif FREEBSD
+ Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.4));
#else
Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
#endif
@@ -2023,6 +2025,8 @@ File gid_File_Lib_AprUtil
// part of the suffix. An error?
#ifdef MACOSX
Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
+ #elif FREEBSD
+ Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.4));
#else
Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
#endif
@@ -2038,6 +2042,8 @@ File gid_File_Lib_Serf
// part of the suffix. An error?
#ifdef MACOSX
Name = STRING(CONCAT6(libserf-1,.0.,SERF_MINOR,.,SERF_MICRO,UNXSUFFIX));
+ #elif FREEBSD
+ Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
#else
Name = STRING(CONCAT6(libserf-1,UNXSUFFIX,.0.,SERF_MINOR,.,SERF_MICRO));
#endif