[package] ruby: fix path to libiconv
[openwrt/svn-archive/archive.git] / devel / oprofile / patches / 101-remove_24_support.patch
1 diff -urN oprofile-0.9.4/daemon/Makefile.am oprofile-0.9.4.new/daemon/Makefile.am
2 --- oprofile-0.9.4/daemon/Makefile.am 2008-04-28 23:23:24.000000000 +0200
3 +++ oprofile-0.9.4.new/daemon/Makefile.am 2009-07-26 15:23:23.000000000 +0200
4 @@ -1,4 +1,4 @@
5 -SUBDIRS = liblegacy .
6 +SUBDIRS = .
7
8 oprofiled_SOURCES = \
9 init.c \
10 @@ -42,7 +42,6 @@
11 bin_PROGRAMS = oprofiled
12
13 oprofiled_LDADD = \
14 - liblegacy/liblegacy.a \
15 ../libabi/libabi.a \
16 ../libdb/libodb.a \
17 ../libop/libop.a \
18 diff -urN oprofile-0.9.4/daemon/Makefile.in oprofile-0.9.4.new/daemon/Makefile.in
19 --- oprofile-0.9.4/daemon/Makefile.in 2008-07-18 01:14:44.000000000 +0200
20 +++ oprofile-0.9.4.new/daemon/Makefile.in 2009-07-26 15:23:14.000000000 +0200
21 @@ -68,7 +68,7 @@
22 opd_events.$(OBJEXT) opd_mangling.$(OBJEXT) \
23 opd_perfmon.$(OBJEXT) opd_anon.$(OBJEXT) opd_spu.$(OBJEXT)
24 oprofiled_OBJECTS = $(am_oprofiled_OBJECTS)
25 -oprofiled_DEPENDENCIES = liblegacy/liblegacy.a ../libabi/libabi.a \
26 +oprofiled_DEPENDENCIES = ../libabi/libabi.a \
27 ../libdb/libodb.a ../libop/libop.a ../libutil/libutil.a
28 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
29 depcomp = $(SHELL) $(top_srcdir)/depcomp
30 @@ -240,7 +240,7 @@
31 sysconfdir = @sysconfdir@
32 target_alias = @target_alias@
33 topdir = @topdir@
34 -SUBDIRS = liblegacy .
35 +SUBDIRS = .
36 oprofiled_SOURCES = \
37 init.c \
38 oprofiled.c \
39 @@ -279,7 +279,6 @@
40 # -fno-omit-frame-pointer needed for daemon build: see ChangeLog-2004 02-23
41 AM_CFLAGS = @OP_CFLAGS@ -fno-omit-frame-pointer
42 oprofiled_LDADD = \
43 - liblegacy/liblegacy.a \
44 ../libabi/libabi.a \
45 ../libdb/libodb.a \
46 ../libop/libop.a \
47 diff -urN oprofile-0.9.4/daemon/oprofiled.c oprofile-0.9.4.new/daemon/oprofiled.c
48 --- oprofile-0.9.4/daemon/oprofiled.c 2008-04-28 23:23:23.000000000 +0200
49 +++ oprofile-0.9.4.new/daemon/oprofiled.c 2009-07-26 15:25:25.000000000 +0200
50 @@ -73,7 +73,6 @@
51 static char * events;
52 static int showvers;
53 static struct oprofiled_ops * opd_ops;
54 -extern struct oprofiled_ops opd_24_ops;
55 extern struct oprofiled_ops opd_26_ops;
56
57 #define OPD_IMAGE_FILTER_HASH_SIZE 32
58 @@ -465,9 +464,6 @@
59 static struct oprofiled_ops * get_ops(void)
60 {
61 switch (op_get_interface()) {
62 - case OP_INTERFACE_24:
63 - printf("Using 2.4 OProfile kernel interface.\n");
64 - return &opd_24_ops;
65 case OP_INTERFACE_26:
66 printf("Using 2.6+ OProfile kernel interface.\n");
67 return &opd_26_ops;