diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-07-11 11:46:13 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-07-11 11:49:16 +0200 |
| commit | bbe19f13011a4a10157a351ee4514f014c1519ee (patch) | |
| tree | 259781e1d6eaf0b7f27672e6ca3f063327bd6b89 /curl | |
| parent | bd5262540a97e0115a070a7b34479b0661e94248 (diff) | |
curl: fixed internal nss configure to get nspr includes
The nspr includes aren't added when using nss-config while they are
added by pkg-config. This caused internal build to fail when nss devel
packages aren't installed on the system. Patched the configure to get it
working.
Change-Id: I86d7d56c0d6df2dbf69ba7ac2a6f930ecb4ae8fb
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/curl-7.26.0_nspr.patch | 17 | ||||
| -rw-r--r-- | curl/makefile.mk | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/curl/curl-7.26.0_nspr.patch b/curl/curl-7.26.0_nspr.patch new file mode 100644 index 000000000000..4eee75e2c62c --- /dev/null +++ b/curl/curl-7.26.0_nspr.patch @@ -0,0 +1,17 @@ +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/curl/makefile.mk b/curl/makefile.mk index aab5be3db04e..56775d125379 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -45,6 +45,7 @@ TARFILE_NAME=curl-7.26.0 TARFILE_MD5=3fa4d5236f2a36ca5c3af6715e837691 PATCH_FILES=\ curl-7.26.0.patch \ + curl-7.26.0_nspr.patch \ curl-aix.patch .IF "$(GUI)"=="WNT" |