Removing another glibc patch already upstream.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25111
This commit is contained in:
parent
8895565d45
commit
a8a01a54ab
@ -71,9 +71,6 @@ stdenv.mkDerivation ({
|
||||
/* Have rpcgen(1) look for cpp(1) in $PATH. */
|
||||
./rpcgen-path.patch
|
||||
|
||||
/* Fix for the check of -fgnu89-inline compiler flag */
|
||||
./gnu89-inline.patch
|
||||
|
||||
/* Allow nixos and nix handle the locale-archive. */
|
||||
./nix-locale-archive.patch
|
||||
|
||||
|
@ -1,26 +0,0 @@
|
||||
diff --git a/configure b/configure
|
||||
index ce76653..fba6de2 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6891,7 +6891,7 @@ fi
|
||||
$as_echo "$libc_cv_gnu89_inline" >&6; }
|
||||
if test $libc_cv_gnu89_inline = yes; then
|
||||
libc_cv_gnu89_inline=-fgnu89-inline
|
||||
-else
|
||||
+elif test $libc_cv_gnu89_inline = no; then
|
||||
libc_cv_gnu89_inline=
|
||||
fi
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 182c683..b867371 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1777,7 +1777,7 @@ fi
|
||||
rm -f conftest*])
|
||||
if test $libc_cv_gnu89_inline = yes; then
|
||||
libc_cv_gnu89_inline=-fgnu89-inline
|
||||
-else
|
||||
+elif test $libc_cv_gnu89_inline = no; then
|
||||
libc_cv_gnu89_inline=
|
||||
fi
|
||||
AC_SUBST(libc_cv_gnu89_inline)
|
Loading…
Reference in New Issue
Block a user