rpms/frysk/FC-5 frysk-elf-cxx.patch, NONE, 1.1 frysk-non-intermediate.patch, NONE, 1.1 frysk-sscanf.patch, NONE, 1.1 frysk-static-link.patch, NONE, 1.1 frysk-unistd.patch, NONE, 1.1 frysk_syscall.patch, NONE, 1.1 frysk.spec, 1.37, 1.38 sources, 1.11, 1.12 frysk-Makefile-rules-noxmltest.patch, 1.1, NONE frysk-makefileam.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jun 17 23:46:44 UTC 2006
- Previous message (by thread): rpms/libglade-java/FC-5 .cvsignore, 1.12, 1.13 libglade-java.spec, 1.31, 1.32 sources, 1.13, 1.14
- Next message (by thread): rpms/kernel/devel linux-2.6.17.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.455, 1.456 kernel-2.6.spec, 1.2291, 1.2292 sources, 1.399, 1.400 upstream, 1.364, 1.365 linux-2.6.16.tar.bz2.sign, 1.1, NONE patch-2.6.17-rc6-git7.bz2.sign, 1.1, NONE patch-2.6.17-rc6.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: skasal
Update of /cvs/dist/rpms/frysk/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3878
Modified Files:
frysk.spec sources
Added Files:
frysk-elf-cxx.patch frysk-non-intermediate.patch
frysk-sscanf.patch frysk-static-link.patch frysk-unistd.patch
frysk_syscall.patch
Removed Files:
frysk-Makefile-rules-noxmltest.patch frysk-makefileam.patch
Log Message:
New version.
frysk-elf-cxx.patch:
Elf.cxx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE frysk-elf-cxx.patch ---
Index: frysk-imports/lib/elf/cni/Elf.cxx
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/elf/cni/Elf.cxx,v
retrieving revision 1.8
diff -u -r1.8 Elf.cxx
--- frysk-imports/lib/elf/cni/Elf.cxx 5 Jun 2006 14:58:10 -0000 1.8
+++ frysk-imports/lib/elf/cni/Elf.cxx 15 Jun 2006 21:23:43 -0000
@@ -125,7 +125,7 @@
jstring
lib::elf::Elf::elf_getident (jlong ptr){
- char* ident = ::elf_getident((::Elf*) pointer, (size_t*) &ptr);
+ char* ident = ::elf_getident((::Elf*) pointer, (size_t*) (long) &ptr);
return JvNewString((const jchar*) ident, strlen(ident));
}
@@ -202,12 +202,12 @@
jint
lib::elf::Elf::elf_getshnum (jlong dst){
- return ::elf_getshnum((::Elf*) this->pointer, (size_t*) &dst);
+ return ::elf_getshnum((::Elf*) this->pointer, (size_t*) (long) &dst);
}
jint
lib::elf::Elf::elf_getshstrndx (jlong dst){
- return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) &dst);
+ return ::elf_getshstrndx((::Elf*) this->pointer, (size_t*) (long) &dst);
}
jint
@@ -248,7 +248,7 @@
jlong
lib::elf::Elf::elf_getarsym (jlong ptr){
- return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) &ptr);
+ return (jlong) ::elf_getarsym((::Elf*) this->pointer, (size_t*) (long) &ptr);
}
jint
@@ -258,7 +258,7 @@
jstring
lib::elf::Elf::elf_rawfile (jlong ptr){
- char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) &ptr);
+ char* file = ::elf_rawfile((::Elf*) pointer, (size_t*) (long) &ptr);
return JvNewString((const jchar*) file, strlen(file));
}
frysk-non-intermediate.patch:
Makefile.am | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE frysk-non-intermediate.patch ---
Index: frysk-imports/elfutils/backends/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/backends/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- frysk-imports/elfutils/backends/Makefile.am 8 May 2006 20:49:15 -0000 1.1.1.1
+++ frysk-imports/elfutils/backends/Makefile.am 16 Jun 2006 01:54:20 -0000
@@ -35,7 +35,6 @@
INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
-I$(top_srcdir)/lib -I..
-PACKAGE_VERSION = @PACKAGE_VERSION@
modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390
@@ -46,6 +45,8 @@
noinst_LIBRARIES = $(libebl_pic)
noinst_DATA = $(libebl_pic:_pic.a=.so)
+# Workaround a bug in GNU make:
+non-intermidate: $(libebl_pic:_pic.a=.map)
if MUDFLAP
libelf = ../libelf/libelf.a
frysk-sscanf.patch:
line2addr.c | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
--- NEW FILE frysk-sscanf.patch ---
Index: ./frysk-imports/elfutils/tests/line2addr.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/tests/line2addr.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 line2addr.c
--- ./frysk-imports/elfutils/tests/line2addr.c 8 May 2006 20:48:53 -0000 1.1.1.1
+++ ./frysk-imports/elfutils/tests/line2addr.c 15 Jun 2006 18:19:57 -0000
@@ -131,19 +131,18 @@
for (; cnt < argc; ++cnt)
{
struct args a = { .arg = argv[cnt] };
+ char *c = strchr (a.arg, ':');
- switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
- {
- default:
- case 0:
- printf ("ignored %s\n", argv[cnt]);
- continue;
- case 1:
- a.line = 0;
- break;
- case 2:
- break;
- }
+ if (a.arg == NULL) {
+ printf ("ignored %s\n", a.arg);
+ continue;
+ } else if (c == NULL) {
+ a.file = strdup (a.arg);
+ a.line = 0;
+ } else {
+ a.file = strndup (a.arg, c - a.arg);
+ a.line = strtol (c + 1, NULL, 10);
+ }
(void) dwfl_getdwarf (dwfl, &handle_module, &a, 0);
frysk-static-link.patch:
frysk-core/Makefile.am | 5 +++--
frysk-gui/ChangeLog | 5 +++++
frysk-gui/Makefile.am | 5 +++--
frysk-imports/Makefile.am | 5 +++--
frysk-sys/Makefile.am | 5 +++--
5 files changed, 17 insertions(+), 8 deletions(-)
--- NEW FILE frysk-static-link.patch ---
Index: ./frysk-core/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-core/Makefile.am,v
retrieving revision 1.51
diff -u -r1.51 Makefile.am
--- ./frysk-core/Makefile.am 13 Jun 2006 13:44:37 -0000 1.51
+++ ./frysk-core/Makefile.am 16 Jun 2006 03:28:37 -0000
@@ -78,9 +78,10 @@
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jdom.a
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-cdtparser.a
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
GEN_GCJ_LDADD += -lopcodes
# XXX: This needs to be make less-architecture independant.
Index: ./frysk-gui/ChangeLog
===================================================================
RCS file: /cvs/frysk/frysk-gui/ChangeLog,v
retrieving revision 1.66
diff -u -r1.66 ChangeLog
--- ./frysk-gui/ChangeLog 14 Jun 2006 22:57:01 -0000 1.66
+++ ./frysk-gui/ChangeLog 16 Jun 2006 03:28:37 -0000
@@ -1,3 +1,8 @@
+2006-06-15 Andrew Cagney <cagney at redhat.com>
+
+ * Makefile.am (GEN_GCJ_LDADD): Specify static elfutil libraries,
+ re-order and add libebl/libebl.a.
+
2006-06-15 Stepan Kasal <kasal at ucw.cz>
* Makefile.am (noinst_PROGRAMS): remove .../frysk_suite.sh; shell
Index: ./frysk-gui/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-gui/Makefile.am,v
retrieving revision 1.53
diff -u -r1.53 Makefile.am
--- ./frysk-gui/Makefile.am 14 Jun 2006 22:57:01 -0000 1.53
+++ ./frysk-gui/Makefile.am 16 Jun 2006 03:28:37 -0000
@@ -69,9 +69,10 @@
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jline.a
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
GEN_GCJ_LDADD += ../frysk-gtk/libfrysk-ftk.a
GEN_GCJ_LDADD += -L../frysk-gtk/EggTrayIcon
GEN_GCJ_LDADD += -L../frysk-gtk/tlwidgets
Index: ./frysk-imports/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-imports/Makefile.am,v
retrieving revision 1.53
diff -u -r1.53 Makefile.am
--- ./frysk-imports/Makefile.am 15 Jun 2006 18:50:50 -0000 1.53
+++ ./frysk-imports/Makefile.am 16 Jun 2006 03:28:37 -0000
@@ -62,9 +62,10 @@
GEN_CLASSPATH += junit.jar
GEN_GCJ_LDADD += libfrysk-jargs.a
GEN_GCJ_LDADD += libfrysk-junit.a
-GEN_GCJ_LDADD += -Lelfutils/libelf -lelf
-GEN_GCJ_LDADD += -Lelfutils/libdw -ldw
GEN_GCJ_LDADD += ./elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ./elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ./elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ./elfutils/libelf/libelf.a
GEN_GCJ_LDADD += -lopcodes
all-local: lib/elf/tests/test-core lib/elf/tests/helloworld.o
Index: ./frysk-sys/Makefile.am
===================================================================
RCS file: /cvs/frysk/frysk-sys/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- ./frysk-sys/Makefile.am 13 Jun 2006 13:44:37 -0000 1.20
+++ ./frysk-sys/Makefile.am 16 Jun 2006 03:28:39 -0000
@@ -51,7 +51,8 @@
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-imports.a
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a
GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jargs.a
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libelf -lelf
-GEN_GCJ_LDADD += -L../frysk-imports/elfutils/libdw -ldw
GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a
+GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a
GEN_GCJ_LDADD += -lopcodes
frysk-unistd.patch:
frysk-core/prog/kill/suspend.c | 1 +
frysk-sys/frysk/sys/cni/Signal.cxx | 1 +
2 files changed, 2 insertions(+)
--- NEW FILE frysk-unistd.patch ---
Index: frysk-sys/frysk/sys/cni/Signal.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Signal.cxx,v
retrieving revision 1.4
diff -u -r1.4 Signal.cxx
--- frysk-sys/frysk/sys/cni/Signal.cxx 10 Mar 2006 00:18:53 -0000 1.4
+++ frysk-sys/frysk/sys/cni/Signal.cxx 15 Jun 2006 22:48:04 -0000
@@ -40,6 +40,7 @@
#include <sys/types.h>
#include <signal.h>
#include <linux/unistd.h>
+#include <unistd.h>
#include <errno.h>
#include <gcj/cni.h>
Index: frysk-core/prog/kill/suspend.c
===================================================================
RCS file: /cvs/frysk/frysk-core/prog/kill/suspend.c,v
retrieving revision 1.6
diff -u -r1.6 suspend.c
--- frysk-core/prog/kill/suspend.c 26 Jan 2006 21:09:45 -0000 1.6
+++ frysk-core/prog/kill/suspend.c 15 Jun 2006 23:16:57 -0000
@@ -45,6 +45,7 @@
#include <linux/unistd.h>
#include <limits.h>
#include <pthread.h>
+#include <unistd.h>
pthread_mutex_t start;
pthread_mutex_t stop;
frysk_syscall.patch:
frysk-core/frysk/pkglibexecdir/funit-syscallint.c | 7 ++++
frysk-core/frysk/pkglibexecdir/util.h | 15 ++++++++++
frysk-core/prog/kill/detach.c | 15 ++++++++++
frysk-imports/tests/frysk2595/ptrace_after_exec.c | 7 ++++
frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c | 7 ++++
frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c | 7 ++++
frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c | 7 ++++
frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c | 7 ++++
frysk-imports/tests/process/multi_child_exec.c | 8 +++++
frysk-imports/tests/process/multi_child_parent_exec.c | 8 +++++
frysk-imports/tests/process/multi_parent_exec.c | 8 +++++
frysk-imports/tests/process/single_exec.c | 8 +++++
frysk-sys/frysk/sys/cni/Poll.cxx | 8 +++++
frysk-sys/frysk/sys/cni/Tid.cxx | 8 +++++
14 files changed, 120 insertions(+)
--- NEW FILE frysk_syscall.patch ---
Index: frysk-core/frysk/pkglibexecdir/funit-syscallint.c
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/pkglibexecdir/funit-syscallint.c,v
retrieving revision 1.4
diff -u -r1.4 funit-syscallint.c
--- frysk-core/frysk/pkglibexecdir/funit-syscallint.c 10 Feb 2006 19:31:11 -0000 1.4
+++ frysk-core/frysk/pkglibexecdir/funit-syscallint.c 15 Jun 2006 16:23:37 -0000
@@ -47,6 +47,13 @@
int childPid;
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
+
_syscall2(int, tkill, pid_t, tid, int, sig);
void handler (int sig) {
Index: frysk-core/frysk/pkglibexecdir/util.h
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/pkglibexecdir/util.h,v
retrieving revision 1.2
diff -u -r1.2 util.h
--- frysk-core/frysk/pkglibexecdir/util.h 15 Apr 2006 04:10:29 -0000 1.2
+++ frysk-core/frysk/pkglibexecdir/util.h 15 Jun 2006 16:23:37 -0000
@@ -41,8 +41,23 @@
#include <stdarg.h>
#include <sys/types.h>
#include <linux/unistd.h>
+#include <unistd.h>
#include <stdlib.h>
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+ return syscall(__NR_##name);\
+}
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
+
_syscall0(pid_t, gettid);
_syscall2(int, tkill, pid_t, tid, int, sig);
Index: frysk-core/prog/kill/detach.c
===================================================================
RCS file: /cvs/frysk/frysk-core/prog/kill/detach.c,v
retrieving revision 1.6
diff -u -r1.6 detach.c
--- frysk-core/prog/kill/detach.c 26 Jan 2006 18:53:28 -0000 1.6
+++ frysk-core/prog/kill/detach.c 15 Jun 2006 16:23:37 -0000
@@ -46,10 +46,25 @@
#include <errno.h>
#include <sys/select.h>
#include <linux/unistd.h>
+#include <unistd.h>
#include <limits.h>
#include <pthread.h>
#include <string.h>
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+ return syscall(__NR_##name);\
+}
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
+
// Simple sleep for roughly SECONDS and then exit.
Index: frysk-imports/tests/frysk2595/ptrace_after_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_exec.c,v
retrieving revision 1.2
diff -u -r1.2 ptrace_after_exec.c
--- frysk-imports/tests/frysk2595/ptrace_after_exec.c 22 Apr 2006 21:11:26 -0000 1.2
+++ frysk-imports/tests/frysk2595/ptrace_after_exec.c 15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
#define __REENTRANT
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
+
_syscall2(int, tkill, int, tid, int, sig);
pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c,v
retrieving revision 1.2
diff -u -r1.2 ptrace_after_exec_of_thread.c
--- frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c 22 Apr 2006 21:11:26 -0000 1.2
+++ frysk-imports/tests/frysk2595/ptrace_after_exec_of_thread.c 15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
#define __REENTRANT
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
+
_syscall2(int, tkill, int, tid, int, sig);
pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c,v
retrieving revision 1.4
diff -u -r1.4 ptrace_after_forked_thread_exits.c
--- frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c 25 Apr 2006 20:19:11 -0000 1.4
+++ frysk-imports/tests/frysk2595/ptrace_after_forked_thread_exits.c 15 Jun 2006 16:23:46 -0000
@@ -52,6 +52,13 @@
#define __REENTRANT
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
+
_syscall2(int, tkill, int, tid, int, sig);
pid_t c_pid;
Index: frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c,v
retrieving revision 1.3
diff -u -r1.3 ptrace_before_forked_thread_exits.c
--- frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c 25 Apr 2006 20:19:11 -0000 1.3
+++ frysk-imports/tests/frysk2595/ptrace_before_forked_thread_exits.c 15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
#define __REENTRANT
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
+
_syscall2(int, tkill, int, tid, int, sig);
pthread_barrier_t child_ready_for_ptrace;
Index: frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c,v
retrieving revision 1.3
diff -u -r1.3 ptrace_peek_wrong_thread.c
--- frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c 25 Apr 2006 20:19:11 -0000 1.3
+++ frysk-imports/tests/frysk2595/ptrace_peek_wrong_thread.c 15 Jun 2006 16:23:46 -0000
@@ -51,6 +51,13 @@
#define __REENTRANT
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
+
_syscall2(int, tkill, int, tid, int, sig);
pid_t c_pid;
Index: frysk-imports/tests/process/multi_child_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_child_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_child_exec.c
--- frysk-imports/tests/process/multi_child_exec.c 8 Mar 2006 04:24:02 -0000 1.3
+++ frysk-imports/tests/process/multi_child_exec.c 15 Jun 2006 16:23:47 -0000
@@ -9,6 +9,14 @@
#include <linux/unistd.h>
#include <pthread.h>
#include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+ return syscall(__NR_##name);\
+}
+
_syscall0(pid_t,gettid)
#define NUM_THREADS 2
Index: frysk-imports/tests/process/multi_child_parent_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_child_parent_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_child_parent_exec.c
--- frysk-imports/tests/process/multi_child_parent_exec.c 8 Mar 2006 04:24:02 -0000 1.3
+++ frysk-imports/tests/process/multi_child_parent_exec.c 15 Jun 2006 16:23:47 -0000
@@ -10,6 +10,14 @@
#include <pthread.h>
#include <string.h>
#include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+ return syscall(__NR_##name);\
+}
+
_syscall0(pid_t,gettid);
#define NUM_THREADS 2
Index: frysk-imports/tests/process/multi_parent_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/multi_parent_exec.c,v
retrieving revision 1.3
diff -u -r1.3 multi_parent_exec.c
--- frysk-imports/tests/process/multi_parent_exec.c 8 Mar 2006 04:24:02 -0000 1.3
+++ frysk-imports/tests/process/multi_parent_exec.c 15 Jun 2006 16:23:47 -0000
@@ -9,6 +9,14 @@
#include <linux/unistd.h>
#include <pthread.h>
#include <sys/time.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+ return syscall(__NR_##name);\
+}
+
_syscall0(pid_t,gettid)
#define NUM_THREADS 2
Index: frysk-imports/tests/process/single_exec.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/tests/process/single_exec.c,v
retrieving revision 1.2
diff -u -r1.2 single_exec.c
--- frysk-imports/tests/process/single_exec.c 8 Feb 2006 22:02:58 -0000 1.2
+++ frysk-imports/tests/process/single_exec.c 15 Jun 2006 16:23:47 -0000
@@ -7,6 +7,14 @@
#include <sys/wait.h>
#include <unistd.h>
#include <linux/unistd.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+ return syscall(__NR_##name);\
+}
+
_syscall0(pid_t,gettid)
int
Index: frysk-sys/frysk/sys/cni/Poll.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Poll.cxx,v
retrieving revision 1.9
diff -u -r1.9 Poll.cxx
--- frysk-sys/frysk/sys/cni/Poll.cxx 9 Apr 2006 17:40:08 -0000 1.9
+++ frysk-sys/frysk/sys/cni/Poll.cxx 15 Jun 2006 16:23:47 -0000
@@ -46,6 +46,14 @@
#include <stdio.h>
#include <sys/types.h>
#include <linux/unistd.h>
+#include <unistd.h>
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{\
+ return syscall(__NR_##name, arg1, arg2);\
+}
_syscall2(int, tkill, pid_t, tid, int, sig);
Index: frysk-sys/frysk/sys/cni/Tid.cxx
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/sys/cni/Tid.cxx,v
retrieving revision 1.1
diff -u -r1.1 Tid.cxx
--- frysk-sys/frysk/sys/cni/Tid.cxx 8 Oct 2005 15:37:53 -0000 1.1
+++ frysk-sys/frysk/sys/cni/Tid.cxx 15 Jun 2006 16:23:47 -0000
@@ -39,6 +39,14 @@
#include <sys/types.h>
#include <linux/unistd.h>
+#include <unistd.h>
+
+#undef _syscall0
+#define _syscall0(type,name) \
+type name(void) \
+{\
+ return syscall(__NR_##name);\
+}
_syscall0(pid_t,gettid)
Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-5/frysk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- frysk.spec 18 May 2006 12:01:20 -0000 1.37
+++ frysk.spec 17 Jun 2006 23:46:42 -0000 1.38
@@ -1,31 +1,42 @@
Summary: Frysk execution analysis tool
Name: frysk
-Version: 0.0.1.2006.02.19.rh2
-Release: 0.FC5.3
+Version: 0.0.1.2006.06.15.rh4
+Release: 0.FC5
License: GPL
Group: Development/System
URL: http://sourceware.org/frysk
Source: %{name}-%{version}.tar.bz2
-Patch1: frysk-Makefile-rules-noxmltest.patch
+
+Patch0: frysk_syscall.patch
+Patch1: frysk-sscanf.patch
+Patch2: frysk-elf-cxx.patch
+Patch3: frysk-unistd.patch
+Patch4: frysk-non-intermediate.patch
+Patch5: frysk-static-link.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: libgtk-java >= 2.8.3.0.20060301.rh1
-Requires: libglade-java >= 2.12.2.0.20060301.rh1
-Requires: libvte-java >= 0.11.11.0.20060301.rh1
+Requires: libgtk-java >= 2.8.4
+Requires: libglade-java >= 2.12.3
+Requires: libvte-java >= 0.12.0
+BuildRequires: gcc-java >= 4.1.1
BuildRequires: junit >= 3.8.1
BuildRequires: antlr >= 2.7.4
-BuildRequires: transfig >= 3.2.0
BuildRequires: jdom >= 1.0
-BuildRequires: libgtk-java-devel >= 2.8.3.0.20060301.rh1
-BuildRequires: libglade-java-devel >= 2.12.2.0.20060301.rh1
-BuildRequires: cairo-java-devel >= 1.0.2.0.20060301.rh1
+BuildRequires: libgtk-java-devel >= 2.8.4
+BuildRequires: libglade-java-devel >= 2.12.3
+BuildRequires: cairo-java-devel >= 1.0.3
BuildRequires: cairo-devel >= 1.0.0
BuildRequires: gtk2-devel >= 2.8.0
-BuildRequires: libvte-java-devel >= 0.11.11.0.20060301.rh1
-BuildRequires: vte-devel >= 0.11.11
+BuildRequires: libglade2-devel >= 2.5.1
+BuildRequires: libgconf-java-devel
+BuildRequires: libvte-java-devel >= 0.12.0
+BuildRequires: vte-devel >= 0.12.1
BuildRequires: xmlto
BuildRequires: gmime
+BuildRequires: transfig >= 3.2.0
+BuildRequires: ghostscript
+BuildRequires: autoconf automake
# We can only build on i386 for now
ExclusiveArch: %{ix86} x86_64
@@ -39,10 +50,13 @@
process in the system.
%prep
-
%setup -q -n %{name}-%{version}
-%patch1 -p0 -b .noxmltest
-./autogen.sh
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
%build
@@ -58,7 +72,17 @@
export JAVA=${JAVA:-/usr/bin/gij}
export JV_SCAN=${JV_SCAN:-/usr/bin/jv-scan}
-%configure
+gcc --version
+
+./bootstrap.sh
+
+# FIXME: Warninggs should be fixed, not suppressed:
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
+%configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
+
+# Build system can end up with corrupt xmllint files:
+touch frysk-gui/glade.catalog
+touch frysk-gui/glade.checked
make %{?_smp_mflags}
@@ -67,6 +91,52 @@
rm -rf %{buildroot}
make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags}
+# FIXME: remove the unwanted files:
+unwanted='usr/bin/addr2line
+ usr/bin/elfcmp
+ usr/bin/elflint
+ usr/bin/findtextrel
+ usr/bin/ld
+ usr/bin/nm
+ usr/bin/objdump
+ usr/bin/ranlib
+ usr/bin/readelf
+ usr/bin/size
+ usr/bin/strings
+ usr/bin/strip
+ usr/include/dwarf.h
+ usr/include/elfutils/elf-knowledge.h
+ usr/include/elfutils/libasm.h
+ usr/include/elfutils/libdw.h
+ usr/include/elfutils/libdwfl.h
+ usr/include/elfutils/libebl.h
+ usr/include/gelf.h
+ usr/include/libelf.h
+ usr/include/nlist.h
+ usr/lib{,64}/elfutils/libebl_alpha-0.120.so
+ usr/lib{,64}/elfutils/libebl_alpha.so
+ usr/lib{,64}/elfutils/libebl_arm-0.120.so
+ usr/lib{,64}/elfutils/libebl_arm.so
+ usr/lib{,64}/elfutils/libebl_i386-0.120.so
+ usr/lib{,64}/elfutils/libebl_i386.so
+ usr/lib{,64}/elfutils/libebl_ia64-0.120.so
+ usr/lib{,64}/elfutils/libebl_ia64.so
+ usr/lib{,64}/elfutils/libebl_ppc-0.120.so
+ usr/lib{,64}/elfutils/libebl_ppc.so
+ usr/lib{,64}/elfutils/libebl_ppc64-0.120.so
+ usr/lib{,64}/elfutils/libebl_ppc64.so
+ usr/lib{,64}/elfutils/libebl_s390-0.120.so
+ usr/lib{,64}/elfutils/libebl_s390.so
+ usr/lib{,64}/elfutils/libebl_sh-0.120.so
+ usr/lib{,64}/elfutils/libebl_sh.so
+ usr/lib{,64}/elfutils/libebl_sparc-0.120.so
+ usr/lib{,64}/elfutils/libebl_sparc.so
+ usr/lib{,64}/elfutils/libebl_x86_64-0.120.so
+ usr/lib{,64}/elfutils/libebl_x86_64.so
+ usr/lib{,64}/lib{asm,dw,ebl,elf}*
+'
+(cd $RPM_BUILD_ROOT && eval rm $unwanted)
+
# For moment, keep off menu (but if someone wants to enable it they
# can).
echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
@@ -94,6 +164,36 @@
%{_libexecdir}/frysk/*
%changelog
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-3
+- Add the non-intermediate hack.
+- Remove more unwanted files.
+- Add patch to link statically with libelf; remove elfutils libraries.
+
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-2
+- Suppress warnings caused by _FORTIFY_SOURCE=2
+- Remove unwanted files.
+
+* Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-1
+- Add BuildRequires: libgconf-java-devel
+- Update frysk-unistd.patch
+
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-0
+- Refresh the tarball.
+- Patch to fix Elf.cxx on 64bit.
+- Anoter patch required by new linux/unistd.h.
+- Add BuildRequires: ghostscript
+
+* Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
+- Patch for new linux/unistd.h.
+- Patch to avoid scanf("%a[..]").
+
+* Thu Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
+- New upstream version.
+- Add BuildRequires: libglade2-devel >= 2.5.1
+- Refresh other BuildRequires.
+- Replace the noxmltest.patch patch by two touch commands.
+- Add BuildRequires: autoconf automake, BuildRequires: gcc-java >= 4.1.1
+
* Thu May 18 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.02.19.rh2-0.FC5.3
- Add gmime to BuildRequires.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 1 Mar 2006 21:14:47 -0000 1.11
+++ sources 17 Jun 2006 23:46:42 -0000 1.12
@@ -1 +1 @@
-01dba74491b570ebbbfa7cc41ba9fe06 frysk-0.0.1.2006.02.19.rh2.tar.bz2
+177ecac75e299933d845f3519ad2bee3 frysk-0.0.1.2006.06.15.rh4.tar.bz2
--- frysk-Makefile-rules-noxmltest.patch DELETED ---
--- frysk-makefileam.patch DELETED ---
- Previous message (by thread): rpms/libglade-java/FC-5 .cvsignore, 1.12, 1.13 libglade-java.spec, 1.31, 1.32 sources, 1.13, 1.14
- Next message (by thread): rpms/kernel/devel linux-2.6.17.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.455, 1.456 kernel-2.6.spec, 1.2291, 1.2292 sources, 1.399, 1.400 upstream, 1.364, 1.365 linux-2.6.16.tar.bz2.sign, 1.1, NONE patch-2.6.17-rc6-git7.bz2.sign, 1.1, NONE patch-2.6.17-rc6.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list