diff options
author | Armijn Hemel <armijn@gpl-violations.org> | 2005-12-13 15:49:13 +0000 |
---|---|---|
committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-12-13 15:49:13 +0000 |
commit | ed1d78bc525e6d423e3748f75305163e5d72343d (patch) | |
tree | fb8b8e9a71b91e9f3763be27d075db3c91f3af12 /pkgs/os-specific/linux/procps | |
parent | 4733044ddb12262472884f8a732d3bd71d24eb00 (diff) |
we need a far bigger patch, so procps won't delete our /dev/null (bizarre!!!)
svn path=/nixpkgs/trunk/; revision=4365
Diffstat (limited to 'pkgs/os-specific/linux/procps')
-rw-r--r-- | pkgs/os-specific/linux/procps/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/procps/procps-build.patch | 49 | ||||
-rw-r--r-- | pkgs/os-specific/linux/procps/procps-no-kill.patch | 12 |
3 files changed, 50 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix index 8fdc141916b87..5bd8e6de460f6 100644 --- a/pkgs/os-specific/linux/procps/default.nix +++ b/pkgs/os-specific/linux/procps/default.nix @@ -7,6 +7,6 @@ stdenv.mkDerivation { url = http://procps.sourceforge.net/procps-3.2.6.tar.gz; md5 = "7ce39ea27d7b3da0e8ad74dd41d06783"; }; - patches = [./makefile.patch ./procps-no-kill.patch]; + patches = [./makefile.patch ./procps-build.patch]; buildInputs = [ncurses]; } diff --git a/pkgs/os-specific/linux/procps/procps-build.patch b/pkgs/os-specific/linux/procps/procps-build.patch new file mode 100644 index 0000000000000..fa08464c20628 --- /dev/null +++ b/pkgs/os-specific/linux/procps/procps-build.patch @@ -0,0 +1,49 @@ +diff -ruN procps-3.2.6/Makefile procps-3.2.6.new/Makefile +--- procps-3.2.6/Makefile 2005-10-30 07:27:04.000000000 +0100 ++++ procps-3.2.6.new/Makefile 2005-12-13 16:47:00.000000000 +0100 +@@ -43,7 +43,7 @@ + usr/lib := $(DESTDIR)/usr/$(lib64)/ + usr/include := $(DESTDIR)/usr/include/ + +-#SKIP := $(bin)kill $(man1)kill.1 ++SKIP := $(bin)kill $(man1)kill.1 + + BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \ + $(usr/bin)top $(usr/bin)vmstat $(usr/bin)watch $(usr/bin)skill \ +@@ -127,26 +127,26 @@ + # produce separate executables for ppc and ppc64, s390 and s390x, + # i386 and x86-64, mips and mips64, sparc and sparc64, and so on. + # Failure to do so will cause data corruption. +-m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,)) +-ALL_CFLAGS += $(m64) ++#m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,)) ++#ALL_CFLAGS += $(m64) + +-ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,) +-ALL_CFLAGS += $(call check_gcc,-Wpadded,) +-ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,) ++#ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,) ++#ALL_CFLAGS += $(call check_gcc,-Wpadded,) ++#ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,) + + # Adding -fno-gcse might be good for those files which + # use computed goto. + #ALL_CFLAGS += $(call check_gcc,-fno-gcse,) + + # if not debugging, enable things that could confuse gdb +-ifeq (,$(findstring -g,$(filter -g%,$(CFLAGS)))) +-ALL_CFLAGS += $(call check_gcc,-fweb,) +-ALL_CFLAGS += $(call check_gcc,-frename-registers,) +-ALL_CFLAGS += $(call check_gcc,-fomit-frame-pointer,) ++#ifeq (,$(findstring -g,$(filter -g%,$(CFLAGS)))) ++#ALL_CFLAGS += $(call check_gcc,-fweb,) ++#ALL_CFLAGS += $(call check_gcc,-frename-registers,) ++#ALL_CFLAGS += $(call check_gcc,-fomit-frame-pointer,) + endif + + # in case -O3 is enabled, avoid bloat +-ALL_CFLAGS += $(call check_gcc,-fno-inline-functions,) ++#ALL_CFLAGS += $(call check_gcc,-fno-inline-functions,) + + endif + endif diff --git a/pkgs/os-specific/linux/procps/procps-no-kill.patch b/pkgs/os-specific/linux/procps/procps-no-kill.patch deleted file mode 100644 index cf8be3906791f..0000000000000 --- a/pkgs/os-specific/linux/procps/procps-no-kill.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN procps-3.2.6/Makefile procps-3.2.6.new/Makefile ---- procps-3.2.6/Makefile 2005-10-30 07:27:04.000000000 +0100 -+++ procps-3.2.6.new/Makefile 2005-12-13 16:11:40.000000000 +0100 -@@ -43,7 +43,7 @@ - usr/lib := $(DESTDIR)/usr/$(lib64)/ - usr/include := $(DESTDIR)/usr/include/ - --#SKIP := $(bin)kill $(man1)kill.1 -+SKIP := $(bin)kill $(man1)kill.1 $(usr/bin)uptime $(man1)uptime.1 - - BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \ - $(usr/bin)top $(usr/bin)vmstat $(usr/bin)watch $(usr/bin)skill \ |