move a few development packages to trunk and add myself as a maintainer
[openwrt/staging/wigyori.git] / package / devel / oprofile / patches / 101-remove_24_support.patch
1 --- a/daemon/Makefile.am
2 +++ b/daemon/Makefile.am
3 @@ -1,4 +1,4 @@
4 -SUBDIRS = liblegacy .
5 +SUBDIRS = .
6
7 oprofiled_SOURCES = \
8 init.c \
9 @@ -49,7 +49,6 @@ AM_CFLAGS = @OP_CFLAGS@ -fno-omit-frame-
10 bin_PROGRAMS = oprofiled
11
12 oprofiled_LDADD = \
13 - liblegacy/liblegacy.a \
14 ../libabi/libabi.a \
15 ../libdb/libodb.a \
16 ../libop/libop.a \
17 --- a/daemon/Makefile.in
18 +++ b/daemon/Makefile.in
19 @@ -70,7 +70,7 @@ am_oprofiled_OBJECTS = init.$(OBJEXT) op
20 opd_extended.$(OBJEXT) opd_ibs.$(OBJEXT) \
21 opd_ibs_trans.$(OBJEXT)
22 oprofiled_OBJECTS = $(am_oprofiled_OBJECTS)
23 -oprofiled_DEPENDENCIES = liblegacy/liblegacy.a ../libabi/libabi.a \
24 +oprofiled_DEPENDENCIES = ../libabi/libabi.a \
25 ../libdb/libodb.a ../libop/libop.a ../libutil/libutil.a
26 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
27 depcomp = $(SHELL) $(top_srcdir)/depcomp
28 @@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@
29 top_builddir = @top_builddir@
30 top_srcdir = @top_srcdir@
31 topdir = @topdir@
32 -SUBDIRS = liblegacy .
33 +SUBDIRS = .
34 oprofiled_SOURCES = \
35 init.c \
36 oprofiled.c \
37 @@ -331,7 +331,6 @@ AM_CPPFLAGS = \
38 # -fno-omit-frame-pointer needed for daemon build: see ChangeLog-2004 02-23
39 AM_CFLAGS = @OP_CFLAGS@ -fno-omit-frame-pointer
40 oprofiled_LDADD = \
41 - liblegacy/liblegacy.a \
42 ../libabi/libabi.a \
43 ../libdb/libodb.a \
44 ../libop/libop.a \
45 --- a/daemon/oprofiled.c
46 +++ b/daemon/oprofiled.c
47 @@ -77,7 +77,6 @@ static char * events;
48 static char * ext_feature;
49 static int showvers;
50 static struct oprofiled_ops * opd_ops;
51 -extern struct oprofiled_ops opd_24_ops;
52 extern struct oprofiled_ops opd_26_ops;
53
54 #define OPD_IMAGE_FILTER_HASH_SIZE 32
55 @@ -477,9 +476,6 @@ static void opd_options(int argc, char c
56 static struct oprofiled_ops * get_ops(void)
57 {
58 switch (op_get_interface()) {
59 - case OP_INTERFACE_24:
60 - printf("Using 2.4 OProfile kernel interface.\n");
61 - return &opd_24_ops;
62 case OP_INTERFACE_26:
63 printf("Using 2.6+ OProfile kernel interface.\n");
64 return &opd_26_ops;