diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 00:14:01 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-23 00:37:11 +0200 |
| commit | d2f62c32e01e186f3cc0ffe7f9341be86d7f42b5 (patch) | |
| tree | 387c8c37ac738a78d0ab437e207bc34188f8c488 | |
| parent | 52004a886bedd97944c5c723afcae9b44292349d (diff) | |
nss: use libraries from WORKDIR
Change-Id: I120fdbd32d3c20df7f2c6f67e0df6de216606396
| -rw-r--r-- | RepositoryExternal.mk | 41 | ||||
| -rw-r--r-- | nss/ExternalPackage_nss.mk | 27 | ||||
| -rw-r--r-- | nss/nss-config.in | 2 |
3 files changed, 33 insertions, 37 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d43be9f38f4c..764f98845126 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2254,8 +2254,10 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/mozilla \ ) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \ +) $(call gb_LinkTarget_use_libraries,$(1),\ - nspr4 \ xpcom \ xpcom_core \ ) @@ -2639,27 +2641,48 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - nspr4 \ - nss3 \ - smime3 \ +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 \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib \ + -lnspr4 \ + -lnss3 \ + -lsmime3 \ ) +endif endef define gb_LinkTarget__use_plc4 $(call gb_LinkTarget_use_package,$(1),nss) -$(call gb_LinkTarget_use_libraries,$(1),\ - plc4 \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/plc4.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib -lplc4 \ +) +endif endef define gb_LinkTarget__use_ssl3 $(call gb_LinkTarget_use_package,$(1),nss) -$(call gb_LinkTarget_use_libraries,$(1),\ - ssl3 \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/ssl3.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib -lssl3 \ +) +endif endef diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk index f07301ae6717..69a3a45ba4a5 100644 --- a/nss/ExternalPackage_nss.mk +++ b/nss/ExternalPackage_nss.mk @@ -31,33 +31,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\ mozilla/dist/out/lib/libssl3.dylib \ )) else ifeq ($(OS),WNT) -ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_files,nss,lib,\ - mozilla/dist/out/lib/nspr4.lib \ - mozilla/dist/out/lib/nss3.lib \ - mozilla/dist/out/lib/nssdbm3.lib \ - mozilla/dist/out/lib/nssutil3.lib \ - mozilla/dist/out/lib/plc4.lib \ - mozilla/dist/out/lib/plds4.lib \ - mozilla/dist/out/lib/smime3.lib \ - mozilla/dist/out/lib/softokn3.lib \ - mozilla/dist/out/lib/sqlite3.lib \ - mozilla/dist/out/lib/ssl3.lib \ -)) -else -$(eval $(call gb_ExternalPackage_add_files,nss,lib,\ - mozilla/nsprpub/out/pr/src/libnspr4.dll.a \ - mozilla/dist/out/lib/libnss3.dll.a \ - mozilla/dist/out/lib/libnssdbm3.dll.a \ - mozilla/dist/out/lib/libnssutil3.dll.a \ - mozilla/nsprpub/out/lib/libc/src/libplc4.dll.a \ - mozilla/nsprpub/out/lib/ds/libplds4.dll.a \ - mozilla/dist/out/lib/libsmime3.dll.a \ - mozilla/dist/out/lib/libsoftokn3.dll.a \ - mozilla/dist/out/lib/libsqlite3.dll.a \ - mozilla/dist/out/lib/libssl3.dll.a \ -)) -endif $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,bin,\ mozilla/dist/out/lib/freebl3.dll \ mozilla/dist/out/lib/nspr4.dll \ diff --git a/nss/nss-config.in b/nss/nss-config.in index 141d4833c5fb..2b8d045ef30d 100644 --- a/nss/nss-config.in +++ b/nss/nss-config.in @@ -102,7 +102,7 @@ if test -z "$includedir"; then includedir=@includedir@ fi if test -z "$libdir"; then - libdir=${exec_prefix}/lib + libdir=${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/lib fi if test "$echo_prefix" = "yes"; then |