diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-12-13 15:53:14 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-12-13 15:53:14 +0000 |
| commit | 7fc766307468a31aff6686fc41c13b58f5cc77f1 (patch) | |
| tree | 286f943bd6632e9c5a62c9d4ec35fa23b849ff47 /pkgs/os-specific/linux/procps | |
| parent | ed1d78bc525e6d423e3748f75305163e5d72343d (diff) | |
| download | nixpkgs-7fc766307468a31aff6686fc41c13b58f5cc77f1.tar nixpkgs-7fc766307468a31aff6686fc41c13b58f5cc77f1.tar.gz nixpkgs-7fc766307468a31aff6686fc41c13b58f5cc77f1.tar.bz2 nixpkgs-7fc766307468a31aff6686fc41c13b58f5cc77f1.tar.lz nixpkgs-7fc766307468a31aff6686fc41c13b58f5cc77f1.tar.xz nixpkgs-7fc766307468a31aff6686fc41c13b58f5cc77f1.tar.zst nixpkgs-7fc766307468a31aff6686fc41c13b58f5cc77f1.zip | |
right...so *first* test before submitting :S
svn path=/nixpkgs/trunk/; revision=4366
Diffstat (limited to 'pkgs/os-specific/linux/procps')
| -rw-r--r-- | pkgs/os-specific/linux/procps/procps-build.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/procps/procps-build.patch b/pkgs/os-specific/linux/procps/procps-build.patch index fa08464c206..67141715bb6 100644 --- a/pkgs/os-specific/linux/procps/procps-build.patch +++ b/pkgs/os-specific/linux/procps/procps-build.patch @@ -1,12 +1,12 @@ 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 ++++ procps-3.2.6.new/Makefile 2005-12-13 16:52:02.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 ++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 \ @@ -35,11 +35,12 @@ diff -ruN procps-3.2.6/Makefile procps-3.2.6.new/Makefile -ALL_CFLAGS += $(call check_gcc,-fweb,) -ALL_CFLAGS += $(call check_gcc,-frename-registers,) -ALL_CFLAGS += $(call check_gcc,-fomit-frame-pointer,) +-endif +#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 ++#endif # in case -O3 is enabled, avoid bloat -ALL_CFLAGS += $(call check_gcc,-fno-inline-functions,) |