Signed-off-by: Robert Schwebel <[email protected]> --- patches/atop-1.24/0001-Fix-crosscompilation.patch | 40 +++++++++++++++++++++ patches/atop-1.24/fix-cross-compile.patch | 38 ------------------- patches/atop-1.24/series | 1 - 3 files changed, 40 insertions(+), 39 deletions(-) create mode 100644 patches/atop-1.24/0001-Fix-crosscompilation.patch delete mode 100644 patches/atop-1.24/fix-cross-compile.patch delete mode 100644 patches/atop-1.24/series
diff --git a/patches/atop-1.24/0001-Fix-crosscompilation.patch b/patches/atop-1.24/0001-Fix-crosscompilation.patch new file mode 100644 index 0000000..952916f --- /dev/null +++ b/patches/atop-1.24/0001-Fix-crosscompilation.patch @@ -0,0 +1,40 @@ +From 63f4c95124e237b0dac0ca4d3cf65d0ae7079daf Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde <[email protected]> +Date: Sat, 29 Oct 2011 18:53:38 +0200 +Subject: [PATCH] Fix crosscompilation + +This patch fixes cross compilation, of another handcrafted +Makefile. + +Signed-off-by: Marc Kleine-Budde <[email protected]> +--- + Makefile | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 669cbcd..f4c4868 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,8 +15,8 @@ CRNPATH = /etc/cron.d + ROTPATH = /etc/logrotate.d + + # CFLAGS = -g -I. -Wall # -DHTTPSTATS +-CFLAGS = -O -I. -Wall # -DHTTPSTATS +-LDFLAGS = -lncurses -lm -lz ++CFLAGS += -O2 -I. -Wall # -DHTTPSTATS ++LDFLAGS += -lncurses -lm -lz + OBJMOD0 = version.o + OBJMOD1 = various.o deviate.o procdbase.o + OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o +@@ -27,7 +27,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD2) $(OBJMOD3) $(OBJMOD4) + all: atop + + atop: atop.o $(ALLMODS) Makefile +- cc atop.o $(ALLMODS) -o atop $(LDFLAGS) ++ $(CC) atop.o $(ALLMODS) -o atop $(LDFLAGS) + + clean: + rm -f *.o +-- +1.7.7 + diff --git a/patches/atop-1.24/fix-cross-compile.patch b/patches/atop-1.24/fix-cross-compile.patch deleted file mode 100644 index e325c7a..0000000 --- a/patches/atop-1.24/fix-cross-compile.patch +++ /dev/null @@ -1,38 +0,0 @@ -Subject: Fix crosscompilation -From: Marc Kleine-Budde <[email protected]> - -This patch fixes cross compilation, of another handcrafted -Makefile. - -Signed-off-by: Marc Kleine-Budde <[email protected]> - ---- -#20081125: wsa: Mailed to upstream. -#20081127: wsa: Accepted upstream. Wait for next release. -#20100317: mkl: Mailed to upstream again. - - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -15,8 +15,8 @@ CRNPATH = /etc/cron.d - ROTPATH = /etc/logrotate.d - - # CFLAGS = -g -I. -Wall # -DHTTPSTATS --CFLAGS = -O -I. -Wall # -DHTTPSTATS --LDFLAGS = -lncurses -lm -lz -+CFLAGS += -O2 -I. -Wall # -DHTTPSTATS -+LDFLAGS += -lncurses -lm -lz - OBJMOD0 = version.o - OBJMOD1 = various.o deviate.o procdbase.o - OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o -@@ -27,7 +27,7 @@ ALLMODS = $(OBJMOD0) $(OBJMOD1) $(OBJMOD - all: atop - - atop: atop.o $(ALLMODS) Makefile -- cc atop.o $(ALLMODS) -o atop $(LDFLAGS) -+ $(CC) atop.o $(ALLMODS) -o atop $(LDFLAGS) - - clean: - rm -f *.o diff --git a/patches/atop-1.24/series b/patches/atop-1.24/series deleted file mode 100644 index 0190994..0000000 --- a/patches/atop-1.24/series +++ /dev/null @@ -1 +0,0 @@ -fix-cross-compile.patch -- 1.7.7 -- ptxdist mailing list [email protected]
