diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-13 17:08:03 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-14 11:27:38 +0000 |
| commit | cca8c8cf79e0d9bcfb8798de3948aa446317b08e (patch) | |
| tree | 00f58d7fc35e8ba68b36ad99ac3fe117a04d0360 /RepositoryExternal.mk | |
| parent | 6c5557c60f97778fd732c01f054553356ce7f258 (diff) | |
nss: upgrade to 3.15.3
- from nss_macosx.patch drop nmedit hunk (removed upstream)
- adapt include and lib paths to changed tarball directory layout
Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe
Reviewed-on: https://gerrit.libreoffice.org/6670
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4ec63ae02c6e..3dcca01391c5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2360,7 +2360,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \ + $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nspr4.lib \ $(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom.lib \ $(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom_core.lib \ ) @@ -2765,19 +2765,19 @@ define gb_LinkTarget__use_nss3 $(call gb_LinkTarget_use_package,$(1),nss) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss \ - -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ + -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss \ + -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include \ ) ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \ - $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nss3.lib \ - $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/smime3.lib \ + $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nspr4.lib \ + $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nss3.lib \ + $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/smime3.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib \ + -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \ -lnspr4 \ -lnss3 \ -lsmime3 \ @@ -2790,11 +2790,11 @@ define gb_LinkTarget__use_plc4 $(call gb_LinkTarget_use_package,$(1),nss) ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/plc4.lib \ + $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/plc4.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib -lplc4 \ + -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lplc4 \ ) endif @@ -2804,11 +2804,11 @@ define gb_LinkTarget__use_ssl3 $(call gb_LinkTarget_use_package,$(1),nss) ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/ssl3.lib \ + $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/ssl3.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib -lssl3 \ + -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lssl3 \ ) endif |