Kaydet (Commit) cffad630 authored tarafından Michael Stahl's avatar Michael Stahl

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
üst d2f62c32
......@@ -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 -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
......@@ -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 \
......
......@@ -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)
......
#!/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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment