[PATCH] do not set soversion for private ure libraries
Matúš Kukan (via_Code_Review)
gerrit at gerrit.libreoffice.org
Thu Apr 11 15:06:20 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3351
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/3351/1
do not set soversion for private ure libraries
Change-Id: I2b2099d8fc00062f67c42e73c4b8a17a689db89d
---
M jvmaccess/Library_jvmaccess.mk
D jvmaccess/util/gcc3.map
M jvmfwk/Library_jvmfwk.mk
D jvmfwk/source/framework.map
M registry/Library_reg.mk
D registry/util/reg.map
M store/Library_store.mk
D store/util/store.map
8 files changed, 0 insertions(+), 334 deletions(-)
diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk
index 75128f3..60d22a2 100644
--- a/jvmaccess/Library_jvmaccess.mk
+++ b/jvmaccess/Library_jvmaccess.mk
@@ -27,8 +27,6 @@
$(eval $(call gb_Library_Library,jvmaccess))
-$(eval $(call gb_Library_set_soversion_script,jvmaccess,3,$(SRCDIR)/jvmaccess/util/gcc3.map))
-
$(eval $(call gb_Library_use_package,jvmaccess,\
jvmaccess_inc \
))
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
deleted file mode 100644
index 70d26fb..0000000
--- a/jvmaccess/util/gcc3.map
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3.1 {
- global:
- _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
-
- # jvmaccess/virtualmachine.hxx:
- _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
- _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
- _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
- _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
- # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
- # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
- _ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
- _ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
- _ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
- _ZN9jvmaccess14VirtualMachine11AttachGuardD2Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
- _ZN9jvmaccess14VirtualMachineC1EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-
- local:
- *;
-};
-
-UDK_3.2 {
- global:
- # initially forgotten jvmaccess/virtualmachine.hxx:
- _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
- _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
- _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
- _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
- _ZN9jvmaccess14VirtualMachineC2EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-
- # We prefix the next two symbols with a wildcard sign because they will only be generated by gcj. The Mac OS X linker doesn't support
- # "Treat not existing symbols as warning" under certain circumstances and thus ends with an error when trying to find these symbols
- # (see man ld on Mac OS X). For further details see also #i69351#. By using the wildcard the symbols will be filtered out before.
- # We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
- _*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
- _*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-} UDK_3.1;
-
-UDK_3.3 {
- global:
- # jvmaccess/unovirtualmachine.hxx:
- _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
- _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
- _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
- _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
- _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD0Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
- _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
- _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
- _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
- # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
- # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
- _ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
- _ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
- _ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
- _ZNK9jvmaccess17UnoVirtualMachine14getClassLoaderEv; # jvmaccess::UnoVirtualMachine::getClassLoader() const
-} UDK_3.2;
-
-UDK_3.4 { # OOo 2.3
- global:
- # jvmaccess/classpath.hxx:
- _ZN9jvmaccess9ClassPath11doLoadClassERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringESE_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &)
- _ZN9jvmaccess9ClassPath17doTranslateToUrlsERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringE; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &)
-} UDK_3.3;
-
-UDK_3.5 { # LibO 3.6
- global:
- # jvmaccess/unovirtualmachine.hxx:
- _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
- _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
- _ZTVN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # vtable for jvmaccess::UnoVirtualMachine::CreationException
- # jvmaccess/virtualmachine.hxx:
- _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
- _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
- _ZTVN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # vtable for jvmaccess::VirtualMachine::AttachGuard::CreationException
-} UDK_3.4;
-
-# Unique libstdc++ symbols:
-GLIBCXX_3.4 {
- global:
- _ZGVNSt7num_put*; _ZNSt7num_put*;
- _ZNSs4_Rep20_S_empty_rep_storageE;
-};
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index aceaed2..3ee7cb8 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -27,8 +27,6 @@
$(eval $(call gb_Library_Library,jvmfwk))
-$(eval $(call gb_Library_set_soversion_script,jvmfwk,3,$(SRCDIR)/jvmfwk/source/framework.map))
-
$(eval $(call gb_Library_use_package,jvmfwk,\
jvmfwk_inc \
))
diff --git a/jvmfwk/source/framework.map b/jvmfwk/source/framework.map
deleted file mode 100644
index ff26edf..0000000
--- a/jvmfwk/source/framework.map
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
- global:
- _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
-
- # jvmfwk/framework.h:
- jfw_freeJavaInfo;
- jfw_areEqualJavaInfo;
- jfw_findAllJREs;
- jfw_findAndSelectJRE;
- jfw_startVM;
- jfw_isVMRunning;
- jfw_getJavaInfoByPath;
- jfw_setSelectedJRE;
- jfw_getSelectedJRE;
- jfw_setEnabled;
- jfw_getEnabled;
- jfw_setVMParameters;
- jfw_getVMParameters;
- jfw_setUserClassPath;
- jfw_getUserClassPath;
- jfw_setJRELocations;
- jfw_getJRELocations;
- jfw_addJRELocation;
- jfw_lock;
- jfw_unlock;
- local:
- *;
-};
-
-UDK_3.1 { # OOo 3.1.0
- global:
- jfw_existJRE;
-} UDK_3_0_0;
-
-# Unique libstdc++ symbols:
-GLIBCXX_3.4 {
- global:
- _ZGVNSt7num_put*; _ZNSt7num_put*;
- _ZNSs4_Rep20_S_empty_rep_storageE;
-};
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 375f162..78753c5 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -26,8 +26,6 @@
$(eval $(call gb_Library_Library,reg))
-$(eval $(call gb_Library_set_soversion_script,reg,3,$(SRCDIR)/registry/util/reg.map))
-
$(eval $(call gb_Library_use_packages,reg,\
registry_inc \
))
diff --git a/registry/util/reg.map b/registry/util/reg.map
deleted file mode 100644
index ad4c39c..0000000
--- a/registry/util/reg.map
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-UDK_3_0_0 {
- global:
- _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
-
- initRegistry_Api;
- initRegistryTypeWriter_Api;
- initRegistryTypeReader_Api;
- reg_createKey;
- reg_openKey;
- reg_openSubKeys;
- reg_closeSubKeys;
- reg_deleteKey;
- reg_closeKey;
- reg_getKeyName;
- reg_setValue;
- reg_setLongListValue;
- reg_setStringListValue;
- reg_setUnicodeListValue;
- reg_getValueInfo;
- reg_getValue;
- reg_getLongListValue;
- reg_getStringListValue;
- reg_getUnicodeListValue;
- reg_freeValueList;
- reg_getKeyType;
- reg_getResolvedKeyName;
- reg_loadKey;
- reg_saveKey;
- reg_mergeKey;
- reg_createRegistry;
- reg_openRootKey;
- reg_getName;
- reg_isReadOnly;
- reg_openRegistry;
- reg_closeRegistry;
- reg_destroyRegistry;
- reg_dumpRegistry;
- local:
- *;
-};
-
-UDK_3.1 {
- global:
- typereg_reader_create;
- typereg_reader_acquire;
- typereg_reader_release;
- typereg_reader_getVersion;
- typereg_reader_getDocumentation;
- typereg_reader_getFileName;
- typereg_reader_getTypeClass;
- typereg_reader_isPublished;
- typereg_reader_getTypeName;
- typereg_reader_getSuperTypeCount;
- typereg_reader_getSuperTypeName;
- typereg_reader_getFieldCount;
- typereg_reader_getFieldDocumentation;
- typereg_reader_getFieldFileName;
- typereg_reader_getFieldFlags;
- typereg_reader_getFieldName;
- typereg_reader_getFieldTypeName;
- typereg_reader_getFieldValue;
- typereg_reader_getMethodCount;
- typereg_reader_getMethodDocumentation;
- typereg_reader_getMethodFlags;
- typereg_reader_getMethodName;
- typereg_reader_getMethodReturnTypeName;
- typereg_reader_getMethodParameterCount;
- typereg_reader_getMethodParameterFlags;
- typereg_reader_getMethodParameterName;
- typereg_reader_getMethodParameterTypeName;
- typereg_reader_getMethodExceptionCount;
- typereg_reader_getMethodExceptionTypeName;
- typereg_reader_getReferenceCount;
- typereg_reader_getReferenceDocumentation;
- typereg_reader_getReferenceFlags;
- typereg_reader_getReferenceSort;
- typereg_reader_getReferenceTypeName;
- typereg_writer_create;
- typereg_writer_destroy;
- typereg_writer_setSuperTypeName;
- typereg_writer_setFieldData;
- typereg_writer_setMethodData;
- typereg_writer_setMethodParameterData;
- typereg_writer_setMethodExceptionTypeName;
- typereg_writer_setReferenceData;
- typereg_writer_getBlob;
-} UDK_3_0_0;
-
-# Unique libstdc++ symbols:
-GLIBCXX_3.4 {
- global:
- _ZGVNSt7num_put*; _ZNSt7num_put*;
- _ZNSs4_Rep20_S_empty_rep_storageE;
-};
diff --git a/store/Library_store.mk b/store/Library_store.mk
index 11c822e..983f811 100644
--- a/store/Library_store.mk
+++ b/store/Library_store.mk
@@ -26,8 +26,6 @@
$(eval $(call gb_Library_Library,store))
-$(eval $(call gb_Library_set_soversion_script,store,3,$(SRCDIR)/store/util/store.map))
-
$(eval $(call gb_Library_use_external,store,boost_headers))
$(eval $(call gb_Library_use_packages,store,\
diff --git a/store/util/store.map b/store/util/store.map
deleted file mode 100644
index d2c4e03..0000000
--- a/store/util/store.map
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-UDK_3_0_0 {
- global:
- _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
-
- store_acquireHandle;
- store_attrib;
- store_closeDirectory;
- store_closeFile;
- store_closeStream;
- store_createMemoryFile;
- store_findFirst;
- store_findNext;
- store_flushFile;
- store_flushStream;
- store_getFileRefererCount;
- store_getFileSize;
- store_getStreamSize;
- store_link;
- store_openDirectory;
- store_openFile;
- store_openStream;
- store_readStream;
- store_rebuildFile;
- store_releaseHandle;
- store_remove;
- store_rename;
- store_setStreamSize;
- store_symlink;
- store_writeStream;
- local:
- *;
-};
-
-# Unique libstdc++ symbols:
-GLIBCXX_3.4 {
- global:
- _ZGVNSt7num_put*; _ZNSt7num_put*;
- _ZNSs4_Rep20_S_empty_rep_storageE;
-};
--
To view, visit https://gerrit.libreoffice.org/3351
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b2099d8fc00062f67c42e73c4b8a17a689db89d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.kukan at gmail.com>
More information about the LibreOffice
mailing list