You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 01:10:17 UTC
svn commit: r1409593 - in /incubator/ooo/branches/gbuild/main: Repository.mk
RepositoryExternal.mk RepositoryFixes.mk oox/Library_oox.mk
Author: arist
Date: Thu Nov 15 00:10:16 2012
New Revision: 1409593
URL: http://svn.apache.org/viewvc?rev=1409593&view=rev
Log:
gnumake4_139_8df80965ae98.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1303125237 0
# Node ID 8df80965ae98cea37134057d47437019bddd10a7
# Parent 140bf9b8db248b869c5464f4e8168e0bf9cc306b
gnumake4: #i117610#: move openssl to RepositoryExternal.mk
Modified:
incubator/ooo/branches/gbuild/main/Repository.mk
incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
incubator/ooo/branches/gbuild/main/oox/Library_oox.mk
Modified: incubator/ooo/branches/gbuild/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Repository.mk?rev=1409593&r1=1409592&r2=1409593&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Repository.mk (original)
+++ incubator/ooo/branches/gbuild/main/Repository.mk Thu Nov 15 00:10:16 2012
@@ -172,23 +172,4 @@ $(eval $(call gb_Helper_register_static_
vclmain \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- crypto \
- ssl \
-))
-else
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- crypto \
- ssl \
-))
-endif
-
-ifeq ($(SYSTEM_OPENSSL),YES)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
- crypto \
- ssl \
-))
-endif
-
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/RepositoryExternal.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryExternal.mk?rev=1409593&r1=1409592&r2=1409593&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryExternal.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryExternal.mk Thu Nov 15 00:10:16 2012
@@ -312,4 +312,52 @@ endef
endif # SYSTEM_ICU
+
+ifeq ($(SYSTEM_OPENSSL),YES)
+
+define gb_LinkTarget__use_openssl
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(OPENSSL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
+endef
+
+else # !SYSTEM_OPENSSL
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ crypto \
+ ssl \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ crypto \
+ ssl \
+))
+endif
+
+define gb_LinkTarget__use_openssl
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ crypto \
+ ssl \
+)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ crypto \
+ ssl \
+)
+ifeq ($(OS),SOLARIS)
+$(call gb_LinkTarget_add_libs,$(1),\
+ -lnsl \
+ -lsocket \
+)
+endif
+endif
+endef
+
+endif # SYSTEM_OPENSSL
+
+
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/RepositoryFixes.mk?rev=1409593&r1=1409592&r2=1409593&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/RepositoryFixes.mk (original)
+++ incubator/ooo/branches/gbuild/main/RepositoryFixes.mk Thu Nov 15 00:10:16 2012
@@ -253,11 +253,4 @@ ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
-ifeq ($(SYSTEM_OPENSSL),YES)
-gb_StaticLibrary_TARGETS := $(filter-out crypto,$(gb_StaticLibrary_TARGETS))
-gb_StaticLibrary_TARGETS := $(filter-out ssl,$(gb_StaticLibrary_TARGETS))
-gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
-endif
-
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/oox/Library_oox.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/oox/Library_oox.mk?rev=1409593&r1=1409592&r2=1409593&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/oox/Library_oox.mk (original)
+++ incubator/ooo/branches/gbuild/main/oox/Library_oox.mk Thu Nov 15 00:10:16 2012
@@ -61,33 +61,7 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_OPENSSL),YES)
-$(eval $(call gb_Library_add_linked_libs,oox,\
- crypto \
- ssl \
-))
-else
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,oox,\
- crypto \
- ssl \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,oox,\
- crypto \
- ssl \
-))
-endif
-endif
-
-# this is for openssl
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_add_linked_libs,oox,\
- nsl \
- socket \
-))
-endif
-#probably not necessary: dl \
+$(call gb_Library_use_external,oox,openssl)
# object files ----------------------------------------------------------------