| author | David Tardon <dtardon@redhat.com> | 2012-08-13 04:57:51 (GMT) |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-13 05:03:16 (GMT) |
| commit | 2b9dbc8ad1640a62f71d75aede0250dc34d96224 (patch) (side-by-side diff) | |
| tree | dc2e1d6eaf97ed250fad7c3a9509eea488dc3690 | |
| parent | b4079b0065767a0717a7f279511c0527fc8b994f (diff) | |
| download | core-2b9dbc8ad1640a62f71d75aede0250dc34d96224.zip core-2b9dbc8ad1640a62f71d75aede0250dc34d96224.tar.gz | |
move selection of nss libs into RepositoryExternal
This should also unbreak Windows tinderboxes, because the internal nss
libs are now registered.
Change-Id: I801d7ebebf36eb1460fa4d626a893b5016115a79
| -rw-r--r-- | RepositoryExternal.mk | 26 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 36 |
2 files changed, 29 insertions, 33 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 342f5fb..478bf25 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1884,7 +1884,11 @@ endef ifeq ($(SYSTEM_NSS),YES) -define gb_LinkTarget__use_plc4 +define gb_LinkTarget__use_nss3 +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_MOZILLA \ +) + $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(NSS_CFLAGS) \ @@ -1896,6 +1900,11 @@ $(call gb_LinkTarget_add_libs,$(1),\ endef +define gb_LinkTarget__use_plc4 +$(call gb_LinkTarget__use_nss3,$(1)) + +endef + else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ @@ -1905,6 +1914,21 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ plc4 \ )) +define gb_LinkTarget__use_nss3 +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/mozilla/nspr \ + -I$(OUTDIR)/inc/mozilla/nss \ +) + +$(call gb_LinkTarget_use_libraries,$(1),\ + nspr4 \ + nss3 \ + smime3 \ +) + +endef + define gb_LinkTarget__use_plc4 $(call gb_LinkTarget_use_libraries,$(1),\ plc4 \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ebd1f56..e6abe34 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -67,6 +67,10 @@ $(eval $(call gb_Library_add_defs,vcl,\ $(eval $(call gb_Library_use_sdk_api,vcl)) +$(eval $(call gb_Library_use_externals,vcl,\ + nss3 \ +)) + $(eval $(call gb_Library_use_libraries,vcl,\ svl \ tl \ @@ -83,38 +87,6 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_NSS),YES) - -$(eval $(call gb_Library_set_include,vcl,\ - $$(INCLUDE) \ - $(NSS_CFLAGS) \ -)) - -$(eval $(call gb_Library_add_defs,vcl,\ - -DSYSTEM_MOZILLA \ -)) - -$(eval $(call gb_Library_add_libs,vcl,\ - $(NSS_LIBS) \ -)) - -else - -$(eval $(call gb_Library_set_include,vcl,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla/nspr \ - -I$(OUTDIR)/inc/mozilla/nss \ -)) - -$(eval $(call gb_Library_use_libraries,vcl,\ - nspr4 \ - nss3 \ - smime3 \ -)) - -endif # ifeq ($(SYSTEM_NSS),YES) - - ifneq ($(OS),IOS) $(eval $(call gb_Library_use_libraries,vcl,\ jvmaccess \ |