diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 00:17:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-23 00:37:11 +0200 |
| commit | cffad630256b5a7f9bb9c075d39b71b7c4f4c989 (patch) | |
| tree | 5f37c6f0c893ef0b3c92094d50a243af5c3f7137 /external/curl | |
| parent | d2f62c32e01e186f3cc0ffe7f9341be86d7f42b5 (diff) | |
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
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/curl-7.26.0_nspr.patch | 17 |
2 files changed, 0 insertions, 18 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index aa3e41302f88..2e75f38821ab 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 4eee75e2c62c..000000000000 --- 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 |