mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Removing a patch for glibc that I thought was needed for i686-linux.
Building with gcc 4.4 as minimum was needed, and not this patch. http://sourceware.org/bugzilla/show_bug.cgi?id=12123 I uploaded new i686-linux bootstrap-tools with gcc 4.5.1, but I'll not update the i686 reference to those bootstrap-tools until they are reachable by http. The bootstrap-tools we used until now had gcc 4.3, said not to be able to build glibc 2.12.1. Meanwhile other platforms can go on building this glibc already without the patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=24522
This commit is contained in:
parent
f823e5c4ef
commit
acd1e6ee3a
@ -75,9 +75,6 @@ stdenv.mkDerivation ({
|
||||
/* Allow nixos and nix handle the locale-archive. */
|
||||
./nix-locale-archive.patch
|
||||
|
||||
/* Patch already sent upstream against a segafult on libpthread load */
|
||||
./libpthread_init.patch
|
||||
|
||||
/* Fix for a vulnerability, taken from upstream */
|
||||
./audit_suid.patch
|
||||
];
|
||||
|
@ -1,15 +0,0 @@
|
||||
http://sourceware.org/bugzilla/show_bug.cgi?id=12123
|
||||
|
||||
diff --git a/nptl/sysdeps/i386/Makefile b/nptl/sysdeps/i386/Makefile
|
||||
index 2f0d88f..3d9d223 100644
|
||||
--- a/nptl/sysdeps/i386/Makefile
|
||||
+++ b/nptl/sysdeps/i386/Makefile
|
||||
@@ -21,6 +21,8 @@ gen-as-const-headers += tcb-offsets.sym
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),nptl)
|
||||
+CFLAGS-nptl-init.c += -mpreferred-stack-boundary=4
|
||||
+CFLAGS-pt-initfini.c += -mpreferred-stack-boundary=4
|
||||
CFLAGS-pthread_create.c += -mpreferred-stack-boundary=4
|
||||
CFLAGS-tst-align.c += -mpreferred-stack-boundary=4
|
||||
CFLAGS-tst-align2.c += -mpreferred-stack-boundary=4
|
Loading…
Reference in New Issue
Block a user