]> git.pld-linux.org Git - packages/glibc.git/blob - glibc-nss_include_dirs.patch
- rel 6; update fixes from upstream
[packages/glibc.git] / glibc-nss_include_dirs.patch
1 --- glibc-2.26/configure.ac~    2017-12-04 08:35:08.000000000 +0100
2 +++ glibc-2.26/configure.ac     2017-12-04 08:40:44.267900240 +0100
3 @@ -326,14 +326,7 @@ AC_ARG_ENABLE([nss-crypt],
4               [nss_crypt=$enableval],
5               [nss_crypt=no])
6  if test x$nss_crypt = xyes; then
7 -  nss_includes=-I$(nss-config --includedir 2>/dev/null)
8 -  if test $? -ne 0; then
9 -    AC_MSG_ERROR([cannot find include directory with nss-config])
10 -  fi
11 -  nspr_includes=-I$(nspr-config --includedir 2>/dev/null)
12 -  if test $? -ne 0; then
13 -    AC_MSG_ERROR([cannot find include directory with nspr-config])
14 -  fi
15 +  nss_includes='-I/usr/include/nss -I/usr/include/nspr'
16    old_CFLAGS="$CFLAGS"
17    CFLAGS="$CFLAGS $nss_includes $nspr_includes"
18    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([typedef int PRBool;
19 --- glibc-2.26/crypt/Makefile~  2017-12-04 08:35:09.000000000 +0100
20 +++ glibc-2.26/crypt/Makefile   2017-12-04 08:41:17.325468766 +0100
21 @@ -38,7 +38,7 @@ endif
22  
23  ifeq ($(nss-crypt),yes)
24  nss-cpp-flags := -DUSE_NSS \
25 -  -I$(shell nss-config --includedir) -I$(shell nspr-config --includedir)
26 +  -I/usr/include/nss -I/usr/include/nspr
27  CPPFLAGS-sha256-crypt.c += $(nss-cpp-flags)
28  CPPFLAGS-sha512-crypt.c += $(nss-cpp-flags)
29  CPPFLAGS-md5-crypt.c += $(nss-cpp-flags)
30
This page took 0.035059 seconds and 3 git commands to generate.