[Libreoffice-commits] core.git: 4 commits - external/curl nss/ExternalPackage_nss.mk nss/ExternalProject_nss.mk nss/nss-config.in RepositoryExternal.mk
Michael Stahl
mstahl at redhat.com
Tue Oct 22 15:46:23 PDT 2013
RepositoryExternal.mk | 41 +++++++--
external/curl/UnpackedTarball_curl.mk | 1
external/curl/curl-7.26.0_nspr.patch | 17 ---
nss/ExternalPackage_nss.mk | 39 ---------
nss/ExternalProject_nss.mk | 7 -
nss/nss-config.in | 147 ----------------------------------
6 files changed, 33 insertions(+), 219 deletions(-)
New commits:
commit 7f614ac933524d798724895827b255b0d36dcc6b
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 23 00:19:36 2013 +0200
nss: handle libsqlite3.so like other libs
Change-Id: Ic000787d9a3155d95bd2f5db531192791650392f
diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index 3ce82b2..e4323ea 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -53,9 +53,7 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
mozilla/dist/out/lib/libsmime3.so \
mozilla/dist/out/lib/libsoftokn3.so \
mozilla/dist/out/lib/libssl3.so \
-))
-$(eval $(call gb_ExternalPackage_add_files,nss,lib/sqlite,\
- mozilla/dist/out/lib/libsqlite3.so \
+ mozilla/dist/out/lib/libsqlite3.so \
))
endif
commit cffad630256b5a7f9bb9c075d39b71b7c4f4c989
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 23 00:17:25 2013 +0200
nss: remove nss-config and nspr-config
Apparently curl is the only external that is looking for these,
but it turns out that we already pass --with-nss=dir to its configure
which overrides the nss-config/nspr-config calls.
Change-Id: I967e74a74690a64b5bccfd98d1509bba1dd12259
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index aa3e413..2e75f38 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -19,7 +19,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
))
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-7.26.0.patch \
- external/curl/curl-7.26.0_nspr.patch \
external/curl/curl-aix.patch \
external/curl/curl-7.26.0_win.patch \
external/curl/curl-7.26.0_mingw.patch \
diff --git a/external/curl/curl-7.26.0_nspr.patch b/external/curl/curl-7.26.0_nspr.patch
deleted file mode 100644
index 4eee75e..0000000
--- a/external/curl/curl-7.26.0_nspr.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur curl-7.26.0/configure misc/build/curl-7.26.0/configure
---- curl-7.26.0/configure 2012-07-11 10:06:15.249214153 +0200
-+++ misc/build/curl-7.26.0/configure 2012-07-11 10:09:48.967225739 +0200
-@@ -22779,6 +22779,13 @@
- addcflags=""
- version="unknown"
- fi
-+
-+ # NSPR includes and libs are needed with nss
-+ check=`nspr-config --version 2>/dev/null`
-+ if test -n "$check"; then
-+ addlib="$addlib `nspr-config --libs`"
-+ addcflags="$addcflags `nspr-config --cflags`"
-+ fi
- fi
- else
- # Without pkg-config, we'll kludge in some defaults
diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index 69a3a45b..3ce82b2 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -11,11 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,nss,nss))
$(eval $(call gb_ExternalPackage_use_external_project,nss,nss))
-$(eval $(call gb_ExternalPackage_add_files,nss,bin,\
- config/nspr-config \
- config/nss-config \
-))
-
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
mozilla/dist/out/lib/libfreebl3.dylib \
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index 843a153..89f4e74 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -20,13 +20,6 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \
- && sed -e 's%@prefix@%$(OUTDIR)%' \
- -e 's%@includedir@%$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss%' \
- -e 's%@MOD_MAJOR_VERSION@%$(NSS_MAJOR)%' \
- -e 's%@MOD_MINOR_VERSION@%$(NSS_MINOR)%' \
- -e 's%@MOD_PATCH_VERSION@%$(NSS_PATCH)%' \
- $(SRCDIR)/nss/nss-config.in > $(EXTERNAL_WORKDIR)/config/nss-config \
- && chmod a+x $(EXTERNAL_WORKDIR)/config/nss-config \
,,nss_configure.log)
ifeq ($(OS),WNT)
diff --git a/nss/nss-config.in b/nss/nss-config.in
deleted file mode 100644
index 2b8d045..0000000
--- a/nss/nss-config.in
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
- cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--includedir[=DIR]]
- [--libdir[=DIR]]
- [--version]
- [--libs]
- [--cflags]
-Dynamic Libraries:
- nss
- ssl
- smime
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --includedir=*)
- includedir=$optarg
- ;;
- --includedir)
- echo_includedir=yes
- ;;
- --libdir=*)
- libdir=$optarg
- ;;
- --libdir)
- echo_libdir=yes
- ;;
- --version)
- echo ${major_version}.${minor_version}.${patch_version}
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- ssl)
- lib_ssl=yes
- ;;
- smime)
- lib_smime=yes
- ;;
- nss)
- lib_nss=yes
- ;;
- nssutil)
- lib_nssutil=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
- exec_prefix=${prefix}
-fi
-if test -z "$includedir"; then
- includedir=@includedir@
-fi
-if test -z "$libdir"; then
- libdir=${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/lib
-fi
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
- echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
- echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
- echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
- libdirs="-L$libdir"
- if test `uname` != Darwin; then
- libdirs="-Wl,-rpath-link,$libdir $libdirs"
- fi
- if test -n "$lib_ssl"; then
- libdirs="$libdirs -lssl${major_version}"
- fi
- if test -n "$lib_smime"; then
- libdirs="$libdirs -lsmime${major_version}"
- fi
- if test -n "$lib_nss"; then
- libdirs="$libdirs -lnss${major_version}"
- fi
- if test -n "$lib_nssutil"; then
- libdirs="$libdirs -lnssutil${major_version}"
- fi
- echo $libdirs
-fi
-
commit d2f62c32e01e186f3cc0ffe7f9341be86d7f42b5
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 23 00:14:01 2013 +0200
nss: use libraries from WORKDIR
Change-Id: I120fdbd32d3c20df7f2c6f67e0df6de216606396
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d43be9f..764f988 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 f07301a..69a3a45b 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 141d483..2b8d045 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
commit 52004a886bedd97944c5c723afcae9b44292349d
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 22 23:49:04 2013 +0200
nss: what is libnsssysinit.so good for?
Change-Id: I6b047d8e6c6e747cc5fd8b3cde14486138c56d84
diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index 18211f2..f07301a 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -73,9 +73,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,bin,\
mozilla/dist/out/lib/ssl3.dll \
))
else # OS!=WNT/MACOSX
-$(eval $(call gb_ExternalPackage_add_files,nss,lib,\
- mozilla/dist/out/lib/libnsssysinit.so \
-))
$(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
mozilla/dist/out/lib/libfreebl3.so \
mozilla/dist/out/lib/libnspr4.so \
More information about the Libreoffice-commits
mailing list