Compare commits

..

No commits in common. "rawhide" and "f32" have entirely different histories.

12 changed files with 66 additions and 2490 deletions

View file

@ -3,7 +3,7 @@
# Somewhat superseeded by fedpkg
BRANCH := $(shell fedpkg switch-branch | sed -n -e 's/ f/ /' -e 's/main/rawhide/' -e 's/^\* //p')
BRANCH := $(shell fedpkg switch-branch | sed -n -e 's/ f/ /' -e 's/master/rawhide/' -e 's/^\* //p')
SPEC_FILE = $(shell fedpkg gimmespec)
# VERREL is very slow
@ -29,8 +29,8 @@ ORDER = \
libglade-java \
frysk
#MOCKCFG = fedora-$(BRANCH)-i386
MOCKCFG = fedora-$(BRANCH)-x86_64
#MOCKCFG = jvanek-java11-fedora-rawhide-x86_64
MOCK_WORDS := $(subst -, , $(MOCKCFG))
MOCK_OS := $(word 1,$(MOCK_WORDS))
MOCK_RELEASE := $(word 2,$(MOCK_WORDS))
@ -107,7 +107,7 @@ world gnome:
.PHONY:: world
usable useful: init
$(MOCK) install vi less strace emacs git nss-devel libevent-devel unbound-devel bison libcurl-devel pam-devel libselinux-devel libseccomp-devel systemd-devel libcap-ng-devel ldns-devel
$(MOCK) install vi less strace emacs
.PHONY:: usable useful
clog prep:

View file

@ -1,13 +0,0 @@
diff --git a/frysk-sys/lib/dwfl/jni/Elf.cxx b/frysk-sys/lib/dwfl/jni/Elf.cxx
index c22fa58ee..92f19417b 100644
--- a/frysk-sys/lib/dwfl/jni/Elf.cxx
+++ b/frysk-sys/lib/dwfl/jni/Elf.cxx
@@ -174,7 +174,7 @@ lib::dwfl::Elf::elf_newehdr(jnixx::env env, jint wordSize) {
runtimeException(env, "Bad parameter to elf_newehdr (word size %d)",
wordSize);
}
- if (::gelf_newehdr(elf, elfClass) < 0)
+ if (::gelf_newehdr(elf, elfClass) == NULL)
throw_last_elf_error(env);
}

View file

@ -1,119 +0,0 @@
diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac
index c9a2be863..7e0bbb0d0 100644
--- a/frysk-common/frysk-common.ac
+++ b/frysk-common/frysk-common.ac
@@ -89,13 +89,13 @@ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/$lib/frysk/pkgconfig
# Check for XMLLINT
AC_CHECK_PROGS([XMLLINT], [xmllint], [no])
-test $XMLLINT = no && AC_ERROR([no xmllint program found])
+test $XMLLINT = no && AC_MSG_ERROR([no xmllint program found])
AC_CHECK_PROGS([XMLCATALOG], [xmlcatalog], [no])
-test $XMLCATALOG = no && AC_ERROR([no xmlcatalog program found])
+test $XMLCATALOG = no && AC_MSG_ERROR([no xmlcatalog program found])
# Check for uudecode
AC_CHECK_PROGS([UUDECODE], [uudecode], [no])
-test $UUDECODE = no && AC_ERROR([no uudecode program found, please install sharutils package])
+test $UUDECODE = no && AC_MSG_ERROR([no uudecode program found, please install sharutils package])
FRYSK_USE_LIBUNWIND
diff --git a/frysk-core/configure.ac b/frysk-core/configure.ac
index 69fc220b3..d0fe07c3a 100644
--- a/frysk-core/configure.ac
+++ b/frysk-core/configure.ac
@@ -37,7 +37,7 @@
# version and license this file solely under the GPL without
# exception.
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
sinclude(common/version.ac)
AC_INIT(frysk, [FRYSK_VERSION])
diff --git a/frysk-gtk/configure.ac b/frysk-gtk/configure.ac
index aaa123f82..55c592ebf 100644
--- a/frysk-gtk/configure.ac
+++ b/frysk-gtk/configure.ac
@@ -36,7 +36,7 @@
# version and license this file solely under the GPL without
# exception.
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
sinclude(common/version.ac)
AC_INIT(frysk, [FRYSK_VERSION])
diff --git a/frysk-gui/configure.ac b/frysk-gui/configure.ac
index 9a274c68b..ec5950d2a 100644
--- a/frysk-gui/configure.ac
+++ b/frysk-gui/configure.ac
@@ -36,7 +36,7 @@
# version and license this file solely under the GPL without
# exception.
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
sinclude(common/version.ac)
AC_INIT(frysk, [FRYSK_VERSION])
diff --git a/frysk-imports/configure.ac b/frysk-imports/configure.ac
index b9a6c32c3..e65f4c433 100644
--- a/frysk-imports/configure.ac
+++ b/frysk-imports/configure.ac
@@ -37,7 +37,7 @@
# version and license this file solely under the GPL without
# exception.
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
sinclude(common/version.ac)
AC_INIT(frysk, [FRYSK_VERSION])
diff --git a/frysk-imports/libunwind/configure.ac b/frysk-imports/libunwind/configure.ac
index 7fa2e4bcf..37c9072a0 100644
--- a/frysk-imports/libunwind/configure.ac
+++ b/frysk-imports/libunwind/configure.ac
@@ -57,7 +57,6 @@ esac
CHECK_ATOMIC_OPS
dnl Checks for header files.
-AC_HEADER_STDC
AC_CHECK_HEADERS(asm/ptrace_offsets.h endian.h sys/endian.h execinfo.h \
ia64intrin.h sys/uc_access.h unistd.h signal.h sys/types.h \
sys/procfs.h sys/ptrace.h byteswap.h elf.h sys/elf.h link.h sys/link.h)
diff --git a/frysk-sys/configure.ac b/frysk-sys/configure.ac
index 6a1e0cad8..4f838439d 100644
--- a/frysk-sys/configure.ac
+++ b/frysk-sys/configure.ac
@@ -36,7 +36,7 @@
# version and license this file solely under the GPL without
# exception.
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
sinclude(common/version.ac)
AC_INIT(frysk, [FRYSK_VERSION])
diff --git a/frysk-top/configure.ac b/frysk-top/configure.ac
index f57136a56..ee68665d3 100644
--- a/frysk-top/configure.ac
+++ b/frysk-top/configure.ac
@@ -36,14 +36,14 @@
# version and license this file solely under the GPL without
# exception.
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
sinclude(common/version.ac)
AC_INIT(frysk,defn([FRYSK_VERSION]))
m4_include([common/frysk-common.ac])
AC_ARG_ENABLE(gnome,
-AC_HELP_STRING(
+AS_HELP_STRING(
[--enable-gnome],
[enable gnome user interface (default no)]),
[enable_gnome=$enableval],

View file

@ -1,13 +0,0 @@
--- frysk-0.4/frysk-core/Makefile.am.orig 2021-08-05 14:51:10.741080868 -0400
+++ frysk-0.4/frysk-core/Makefile.am 2021-08-05 14:51:29.595873910 -0400
@@ -225,8 +225,8 @@
(cd $@/usr/src/debug; \
$(COMPILE) funit-bubblesort.c -fpic -shared -o ../../lib/libbubble.so -g; \
$(COMPILE) funit-quicksort.c -L ../../lib -lbubble -g -o ../../bin/funit-quicksort -DNO_MAIN)
- /usr/lib/rpm/debugedit -b $(abspath $@) -d / $@/usr/bin/funit-quicksort
- /usr/lib/rpm/debugedit -b $(abspath $@) -d / $@/usr/lib/libbubble.so
+ debugedit -b $(abspath $@) -d / $@/usr/bin/funit-quicksort
+ debugedit -b $(abspath $@) -d / $@/usr/lib/libbubble.so
eu-strip --remove-comment -f $@/usr/lib/debug/usr/bin/funit-quicksort.debug $@/usr/bin/funit-quicksort; \
eu-strip --remove-comment -f $@/usr/lib/debug/usr/lib/funit-bubblesort.debug $@/usr/lib/libbubble.so;

View file

@ -1,13 +0,0 @@
diff --git a/frysk-imports/libunwind/Makefile.am b/frysk-imports/libunwind/Makefile.am
index 6a3ed9e78..d0a23a569 100644
--- frysk-0.4/frysk-imports/libunwind/Makefile.am.orig
+++ frysk-0.4/frysk-imports/libunwind/Makefile.am
@@ -42,7 +42,7 @@ endif
nodist_include_HEADERS = include/libunwind-common.h
-SUBDIRS = src tests
+SUBDIRS = src
if CONFIG_DOCS
SUBDIRS += doc

File diff suppressed because it is too large Load diff

View file

@ -1,135 +0,0 @@
diff --git a/frysk-core/frysk/pkglibdir/funit-2threads.c b/frysk-core/frysk/pkglibdir/funit-2threads.c
index 970c90c37..e4b969046 100644
--- a/frysk-core/frysk/pkglibdir/funit-2threads.c
+++ b/frysk-core/frysk/pkglibdir/funit-2threads.c
@@ -46,7 +46,7 @@
pthread_t thread;
-void* thread_func ()
+void* thread_func (void*)
{
int count1 = 0;
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-goto.c b/frysk-core/frysk/pkglibdir/funit-rt-goto.c
index 928096bd7..f79197509 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-goto.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-goto.c
@@ -52,7 +52,7 @@ volatile int sig;
volatile int j = 0;
void
-*signal_parent ()
+*signal_parent (void*)
{
while (lock);
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c b/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
index 3ad4368aa..c65358d27 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
@@ -54,7 +54,7 @@ volatile int sig;
static sigjmp_buf *env;
void
-*signal_parent ()
+*signal_parent (void*)
{
while (lock);
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c b/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
index 4270edf07..1f9c26151 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
@@ -53,7 +53,7 @@ volatile int sig;
volatile int j = 0;
void
-*signal_parent ()
+*signal_parent (void*)
{
while (lock);
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
index 0effca488..2b0392013 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
@@ -56,7 +56,7 @@ volatile int kill_bool = 1;
volatile int sig_rec = 0;
void
-*signal_parent ()
+*signal_parent (void*)
{
while (lock);
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-threader.c b/frysk-core/frysk/pkglibdir/funit-rt-threader.c
index 73d0aa427..fe34a5041 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-threader.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-threader.c
@@ -56,7 +56,7 @@ volatile pid_t pid;
volatile int sig;
void
-*signal_parent ()
+*signal_parent (void*)
{
while (lock_one || lock_two);
kill (pid, sig);
@@ -124,7 +124,7 @@ foo_two ()
/* tester_thread_one: a = 1 */
void
-*foo ()
+*foo (void*)
{
bar ();
return NULL;
diff --git a/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c b/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
index b69736ce9..c634dc659 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
+++ b/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
@@ -184,7 +184,7 @@ bar ()
/* tester_thread_two: a = 0 */
void
-*foo_two ()
+*foo_two (void*)
{
bar_two ();
return NULL;
@@ -192,7 +192,7 @@ void
/* tester_thread_one: a = 1 */
void
-*foo ()
+*foo (void*)
{
bar ();
return NULL;
diff --git a/frysk-core/frysk/pkglibdir/funit-threads-looper.c b/frysk-core/frysk/pkglibdir/funit-threads-looper.c
index bc2931a5d..557be4089 100644
--- a/frysk-core/frysk/pkglibdir/funit-threads-looper.c
+++ b/frysk-core/frysk/pkglibdir/funit-threads-looper.c
@@ -64,7 +64,7 @@ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
static char * myname;
void
-*do_it ()
+*do_it (void*)
{
int t = 34543;
while (t > 0)
diff --git a/frysk-core/prog/kill/detach.c b/frysk-core/prog/kill/detach.c
index 78f759194..e536f9e9c 100644
--- a/frysk-core/prog/kill/detach.c
+++ b/frysk-core/prog/kill/detach.c
@@ -53,7 +53,7 @@
// Simple sleep for roughly SECONDS and then exit.
static void
-sigalrm ()
+sigalrm (int)
{
exit (0);
}

View file

@ -1,31 +0,0 @@
diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac
index 8d7f83780..c9a2be863 100644
--- a/frysk-common/frysk-common.ac
+++ b/frysk-common/frysk-common.ac
@@ -151,10 +151,10 @@ AC_DEFUN([AC_LANG_COMPILER(Java)], [])
AU_DEFUN([AC_LANG_JAVAC], [AC_LANG(Java)])
AC_LANG(Java)
-JAVAC='javac -source 1.4'
-AS_IF([test x"$enable_werror" = xyes],
- [WERROR_JAVACFLAGS='-Werror -Xlint:all -Xlint:-options -Xlint:-cast'],
- [WERROR_JAVACFLAGS=])
+JAVAC='javac'
+# AS_IF([test x"$enable_werror" = xyes],
+# [WERROR_JAVACFLAGS='-Werror -Xlint:all -Xlint:-options -Xlint:-cast'],
+# [WERROR_JAVACFLAGS=])
AC_SUBST([JAVAC])
AC_SUBST([JAVACFLAGS])
AC_SUBST([WERROR_JAVACFLAGS])
diff --git a/frysk-common/javadocs.sh b/frysk-common/javadocs.sh
index fa9b33fd4..01f4f3e1d 100644
--- a/frysk-common/javadocs.sh
+++ b/frysk-common/javadocs.sh
@@ -93,7 +93,6 @@ for scope in public private ; do
-link ${jg}/libgconf-java-2.12.5/api/ \
-link ${jg}/libvte-java-0.12.2/api/ \
-overview ${overview} \
- -source 1.4 \
-d javadoc/$scope \
-use \
-linksource \

View file

@ -7,7 +7,7 @@ index 49bab9acb..69fc220b3 100644
AC_FIND_FILE([antlr.jar], [/usr/share/java], ANTLR_JAR)
AC_FIND_FILE([junit.jar], [/usr/share/java], JUNIT_JAR)
-AC_FIND_FILE([jline-1.0.jar], [/usr/lib/java/jline1], JLINE_JAR)
+AC_FIND_FILE([jline.jar], [/usr/share/java/jline2], JLINE_JAR)
+AC_FIND_FILE([jline.jar], [/usr/share/java/jline], JLINE_JAR)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

View file

@ -1,353 +0,0 @@
diff --git a/frysk-sys/frysk/junit/Runner.java b/frysk-sys/frysk/junit/Runner.java
index 23e960430..33091729f 100755
--- a/frysk-sys/frysk/junit/Runner.java
+++ b/frysk-sys/frysk/junit/Runner.java
@@ -126,7 +126,7 @@ public class Runner extends TestRunner {
testMethod = null;
}
fine.log(this, "testClass", testClass, "testMethod", testMethod);
-
+
for (Iterator c = testClasses.iterator(); c.hasNext (); ) {
Class testKlass = (Class) c.next ();
if (testMethod == null) {
@@ -141,7 +141,7 @@ public class Runner extends TestRunner {
try {
// Probe the class to see if the method
// exists.
- testKlass.getMethod(testMethod, null);
+ testKlass.getMethod(testMethod, (Class[])null);
TestCase test = (TestCase)testKlass.newInstance();
test.setName(testMethod);
testSuite.addTest(test);
diff --git a/frysk-sys/jnixx/ClassVisitor.java b/frysk-sys/jnixx/ClassVisitor.java
index b2cafaa19..e5c7af90d 100644
--- a/frysk-sys/jnixx/ClassVisitor.java
+++ b/frysk-sys/jnixx/ClassVisitor.java
@@ -76,6 +76,9 @@ abstract class ClassVisitor {
Class[] classes = klass.getDeclaredClasses();
for (int i = 0; i < classes.length; i++) {
Class inner = classes[i];
+ if (inner.isSynthetic()) {
+ continue;
+ }
acceptClass(inner);
}
}
diff --git a/frysk-sys/jnixx/ClassWalker.java b/frysk-sys/jnixx/ClassWalker.java
index 45ed0dd87..6fb78d392 100644
--- a/frysk-sys/jnixx/ClassWalker.java
+++ b/frysk-sys/jnixx/ClassWalker.java
@@ -45,39 +45,43 @@ import java.util.Set;
import java.util.HashSet;
abstract class ClassWalker {
+
private final Set visited = new HashSet();
- void walk(Class[] klasses) {
+ private final Set<Class> required;
+
+ ClassWalker(Set<Class> required) {
+ this.required = required;
+ }
+
+ void walk() {
+ Class[] classes = new Class[required.size()];
+ required.toArray(classes);
+ walk(classes, 0);
+ }
+
+ void walk(Class[] klasses, int level) {
for (int i = 0; i < klasses.length; i++) {
- walk(klasses[i]);
+ Class klass = klasses[i];
+ walk(klass, level+1);
+ }
+ }
+ void indent(int level) {
+ for (int i = 0; i < level; i++) {
+ System.err.print(" ");
}
}
- private final ClassVisitor visitor = new ClassVisitor() {
- void acceptInterface(Class klass) {
- walk(klass);
- }
- void acceptConstructor(Constructor constructor) {
- walk(constructor.getParameterTypes());
- }
- void acceptField(Field field) {
- walk(field.getType());
- }
- void acceptMethod(Method method) {
- walk(method.getReturnType());
- walk(method.getParameterTypes());
- }
- void acceptClass(Class klass) {
- walk(klass);
- }
- };
- void walk(Class klass) {
+ void walk(Class klass, int level) {
if (klass == null)
return;
- walk(klass.getSuperclass());
+ /* walk down from parent's parent first */
+ walk(klass.getSuperclass(), level+1);
if (visited.contains(klass))
return;
+ indent(level);
+ System.err.println(klass);
visited.add(klass);
if (klass.isArray()) {
- walk(klass.getComponentType());
+ walk(klass.getComponentType(), level+1);
acceptArray(klass);
} else if (klass.isPrimitive()) {
acceptPrimitive(klass);
@@ -86,6 +90,29 @@ abstract class ClassWalker {
} else {
acceptClass(klass);
}
+ ClassVisitor visitor = new ClassVisitor() {
+ void acceptInterface(Class klassInterface) {
+ walk(klassInterface, level+1);
+ }
+ void acceptConstructor(Constructor constructor) {
+ walk(constructor.getParameterTypes(), level+1);
+ }
+ void acceptField(Field field) {
+ walk(field.getType(), level+1);
+ }
+ void acceptMethod(Method method) {
+ walk(method.getReturnType(), level+1);
+ walk(method.getParameterTypes(), level+1);
+ }
+ void acceptClass(Class nestedKlass) {
+ if (required.contains(klass)) {
+ walk(nestedKlass, level+1);
+ } else {
+ indent(level);
+ System.err.println("dropping " + nestedKlass);
+ }
+ }
+ };
visitor.visit(klass);
}
/**
diff --git a/frysk-sys/jnixx/Main.java b/frysk-sys/jnixx/Main.java
index d68bd1a67..4942f620d 100644
--- a/frysk-sys/jnixx/Main.java
+++ b/frysk-sys/jnixx/Main.java
@@ -48,6 +48,7 @@ import java.util.jar.JarFile;
import java.util.jar.JarEntry;
import java.util.Collections;
import java.util.List;
+import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;
import java.io.IOException;
@@ -56,13 +57,13 @@ class Main {
/**
* Collection of classes that need native bindings.
*/
- private static final HashSet nativeClasses = new HashSet();
+ private static final HashSet<Class> nativeClasses = new HashSet();
/**
* Collection of classes that should be visible (non-visible
* classes don't get their bindings generated).
*/
- private static final HashSet visibleClasses = new HashSet();
+ private static final HashSet<Class> visibleClasses = new HashSet();
/**
* Does this method require native bindings? Methods that are not
@@ -87,10 +88,10 @@ class Main {
return Modifier.isPrivate(member.getModifiers());
}
- private static HashSet getJarClasses(String jarFile)
+ private static HashSet<Class> getJarClasses(String jarFile)
throws IOException, ClassNotFoundException {
// Generate a list of classes in the jar file.
- HashSet jarClasses = new HashSet();
+ HashSet<Class> jarClasses = new HashSet();
List entries = Collections.list(new JarFile(jarFile).entries());
for (Iterator i = entries.iterator(); i.hasNext(); ) {
JarEntry entry = (JarEntry) i.next();
@@ -107,8 +108,8 @@ class Main {
return jarClasses;
}
- private static HashSet getNativeClasses(HashSet classes) {
- final HashSet natives = new HashSet();
+ private static HashSet<Class> getNativeClasses(HashSet<Class> classes) {
+ final HashSet<Class> natives = new HashSet();
// Iterate over just these identifying which are native.
ClassVisitor findNatives = new ClassVisitor() {
void acceptInterface(Class klass) {
@@ -133,7 +134,7 @@ class Main {
}
private static void printHxxFile(Printer p, String headerFile,
- Class[] classes) {
+ Set<Class> classes) {
p.println("#include \"jnixx/jnixx.hxx\"");
p.println();
p.println("namespace jnixx {");
@@ -142,17 +143,17 @@ class Main {
p.println();
p.println("\f");
System.err.println("Generating namespaces");
- new PrintNamespaces(p).walk(classes);
+ new PrintNamespaces(p, classes).walk();
System.err.println("Generating declarations");
- new PrintDeclarations(p).walk(classes);
+ new PrintDeclarations(p, classes).walk();
p.println();
p.println("\f");
System.err.println("Generating definitions");
- new PrintHxxDefinitions(p).walk(classes);
+ new PrintHxxDefinitions(p, classes).walk();
}
private static void printCxxFile(Printer p, String headerFile,
- Class[] classes) {
+ Set<Class> classes) {
p.print("#include \"");
p.print(headerFile);
p.println("\"");
@@ -168,7 +169,7 @@ class Main {
p.println();
p.println("\f");
System.err.println("Generating definitions");
- new PrintCxxDefinitions(p).walk(classes);
+ new PrintCxxDefinitions(p, classes).walk();
}
public static void main(String[] args)
@@ -181,33 +182,35 @@ class Main {
boolean generateHeader = args[0].equals("hxx");
String headerFile = args[1];
String jarFile = args[2];
- HashSet explicitClasses = new HashSet();
+ HashSet<Class> explicitClasses = new HashSet();
for (int i = 3; i < args.length; i++) {
Class klass = Class.forName(args[i], false,
Main.class.getClassLoader());
explicitClasses.add(klass);
}
- HashSet jarClasses = getJarClasses(jarFile);
+ HashSet<Class> jarClasses = getJarClasses(jarFile);
visibleClasses.addAll(jarClasses);
visibleClasses.addAll(explicitClasses);
nativeClasses.addAll(getNativeClasses(jarClasses));
- HashSet requiredClasses = new HashSet();
+ HashSet<Class> requiredClasses = new HashSet<Class>();
requiredClasses.addAll(nativeClasses);
requiredClasses.addAll(explicitClasses);
- System.err.print("Required " + requiredClasses.size() + " - ");
- System.err.println(requiredClasses);
-
- Class[] classes = new Class[requiredClasses.size()];
- requiredClasses.toArray(classes);
+ System.err.println("Required classes " + requiredClasses.size() + ":");
+ for (Class klass : requiredClasses) {
+ System.err.println(" " + klass);
+ }
Printer p = new Printer(new PrintWriter(System.out));
- if (generateHeader)
- printHxxFile(p, headerFile, classes);
- else
- printCxxFile(p, headerFile, classes);
+ if (generateHeader) {
+ System.err.println(".hxx classes:");
+ printHxxFile(p, headerFile, requiredClasses);
+ } else {
+ System.err.println(".cxx classes:");
+ printCxxFile(p, headerFile, requiredClasses);
+ }
p.flush();
}
}
diff --git a/frysk-sys/jnixx/PrintCxxDefinitions.java b/frysk-sys/jnixx/PrintCxxDefinitions.java
index 032f10081..2f3072aa1 100644
--- a/frysk-sys/jnixx/PrintCxxDefinitions.java
+++ b/frysk-sys/jnixx/PrintCxxDefinitions.java
@@ -42,11 +42,13 @@ import java.lang.reflect.Method;
import java.lang.reflect.Field;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
+import java.util.Set;
class PrintCxxDefinitions extends ClassWalker {
private final Printer p;
- PrintCxxDefinitions(Printer p) {
+ PrintCxxDefinitions(Printer p, Set<Class> required) {
+ super(required);
this.p = p;
}
diff --git a/frysk-sys/jnixx/PrintDeclarations.java b/frysk-sys/jnixx/PrintDeclarations.java
index db0117d09..559fd5283 100644
--- a/frysk-sys/jnixx/PrintDeclarations.java
+++ b/frysk-sys/jnixx/PrintDeclarations.java
@@ -42,11 +42,13 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
+import java.util.Set;
class PrintDeclarations extends ClassWalker {
private final Printer p;
- PrintDeclarations(Printer p) {
+ PrintDeclarations(Printer p, Set<Class> required) {
+ super(required);
this.p = p;
}
diff --git a/frysk-sys/jnixx/PrintHxxDefinitions.java b/frysk-sys/jnixx/PrintHxxDefinitions.java
index 3ac6445b7..342e37f58 100644
--- a/frysk-sys/jnixx/PrintHxxDefinitions.java
+++ b/frysk-sys/jnixx/PrintHxxDefinitions.java
@@ -43,11 +43,13 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
+import java.util.Set;
class PrintHxxDefinitions extends ClassWalker {
private final Printer p;
- PrintHxxDefinitions(Printer p) {
+ PrintHxxDefinitions(Printer p, Set<Class> required) {
+ super(required);
this.p = p;
}
diff --git a/frysk-sys/jnixx/PrintNamespaces.java b/frysk-sys/jnixx/PrintNamespaces.java
index e566c5fbd..7b44868bf 100644
--- a/frysk-sys/jnixx/PrintNamespaces.java
+++ b/frysk-sys/jnixx/PrintNamespaces.java
@@ -38,10 +38,13 @@
package jnixx;
+import java.util.Set;
+
class PrintNamespaces extends ClassWalker {
private final Printer p;
- PrintNamespaces(Printer p) {
+ PrintNamespaces(Printer p, Set<Class> required) {
+ super(required);
this.p = p;
}

View file

@ -1,12 +0,0 @@
diff --git a/frysk-sys/jnixx/Printer.java b/frysk-sys/jnixx/Printer.java
index 4469027d0..933bd6b05 100644
--- a/frysk-sys/jnixx/Printer.java
+++ b/frysk-sys/jnixx/Printer.java
@@ -320,6 +320,7 @@ class Printer {
|| name.equals("register")
|| name.equals("signed")
|| name.equals("unsigned")
+ || name.equals("union")
) {
return name + "$";
} else {

View file

@ -1,22 +1,16 @@
Summary: Execution analysis and debugging tool-suite
Name: frysk
Version: 0.4
Release: 99%{?dist}
Release: 70%{?dist}
# Fedora 17+ is still waiting for vte et.al. bindings.
%define enable_gnome %{fedora}0 < 170
%define enable_devel %{fedora}0 < 170
# https://docs.fedoraproject.org/en-US/legal/allowed-licenses/
# https://docs.fedoraproject.org/en-US/legal/license-review-process/
# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/new
# origin: Legacy Abbreviation -> SPDX
#
# getopt GPLv2+ with exception -> GPL-2.0-or-later WITH Classpath-exception-2.0
# frysk: GPLv2 with 398-exception -> GPL-2.0 WITH ???redhat??? exception
# libunwind: MIT Modern Style with sublicense -> MIT
License: GPL-2.0-only WITH 389-exception AND GPL-2.0-or-later WITH Classpath-exception-2.0 AND MIT
# getopt licence is GPLv2+ with exception
# frysk licence is GPLv2 with exception
# libunwind is MIT Modern Style with sublicense
License: GPLv2 with exceptions and MIT
URL: http://sourceware.org/frysk
Source: ftp://sourceware.org/pub/frysk/%{name}-%{version}.tar.bz2
@ -70,15 +64,6 @@ Patch42: frysk-0.4-jline1-to-jline.patch
Patch43: frysk-0.4-disable-arch32-tests.patch
Patch44: frysk-0.4-steptester-indentation.patch
Patch45: frysk-0.4-gcc-fcommon.patch
Patch46: frysk-0.4-javac.patch
Patch47: frysk-0.4-jnixx-union-as-reserved-word.patch
Patch48: frysk-0.4-jnixx-dont-emit-nested-classes.patch
Patch49: frysk-0.4-49-elf-newehdr-null.patch
Patch50: frysk-0.4-50-autoconf-2-70-fixes.patch
Patch51: frysk-0.4-51-debugedit-path.patch
Patch52: frysk-0.4-52-libunwind-tests.patch
Patch53: frysk-0.4-53-no-new-integer.patch
Patch54: frysk-0.4-54-c-warnings.patch
Patch100: frysk-0.4-aclocaljavac.patch
Patch101: frysk-0.4-cxx-scope.patch
@ -90,7 +75,7 @@ Patch1003: frysk-0.4-nogtkwerror.patch
Patch666: frysk-0.4-sodwfl.patch
BuildRequires: gcc-c++
BuildRequires: java-25-devel
BuildRequires: java-devel
BuildRequires: junit >= 3.8.1
BuildRequires: antlr-tool >= 2.7.4
BuildRequires: xmlto
@ -101,13 +86,12 @@ BuildRequires: autoconf automake libtool
# Some scripts run during the build use python
BuildRequires: python3
BuildRequires: elfutils-devel >= 0.151
BuildRequires: jline2
BuildRequires: debugedit
BuildRequires: jline
# it seems java requires explict runtime requires!?!?
Requires: junit
Requires: antlr-tool
Requires: jline2
Requires: jline
%if %{enable_gnome}
BuildRequires: jdom >= 1.0
@ -122,7 +106,6 @@ BuildRequires: libglade2-devel >= 2.5.1
BuildRequires: vte-devel >= 0.12.1
BuildRequires: gnome-python2-gconf
%endif
BuildRequires: make
# Bug #305611: PPC Build problems with libunwind
@ -130,8 +113,7 @@ BuildRequires: make
# Bug #467970: SPARC/SPARC64 not supported by frysk and libunwind.
# Bug #467971: ARM not supported by frysk.
# Bug #506961: S390(X) not supported by frysk and libunwind.
# Bug #2104040: native frysk depends on to be removed i686 java-openjdk packages
ExclusiveArch: x86_64 ppc64
ExclusiveArch: %{ix86} x86_64 ppc64
# We do not want to build a ``cross-debugging version'' i686->i386;
# libunwind build would get confused by this. Override the cmd-line
@ -199,97 +181,88 @@ This package contains the GNOME front end for Frysk.
%setup -q -n %{name}-%{version}
pwd
%patch -P0 -p1 -z .head
%patch0 -p1 -z .head
%patch -P1 -p1 -z .bash-dollar-star
%patch -P2 -p1 -z .strayelsif
%patch -P3 -p1 -z .fdebugrpm
%patch -P4 -p1 -z .mktlwidgetdir
%patch -P5 -p1 -z .gcc-warnings
%patch -P6 -p1 -z .funitexitman
%patch1 -p1 -z .bash-dollar-star
%patch2 -p1 -z .strayelsif
%patch3 -p1 -z .fdebugrpm
%patch4 -p1 -z .mktlwidgetdir
%patch5 -p1 -z .gcc-warnings
%patch6 -p1 -z .funitexitman
mv frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
%patch -P7 -p1 -z .mvtesttomain -F 1
%patch7 -p1 -z .mvtesttomain -F 1
mv frysk-core/frysk/util/ProcStopUtil.java frysk-core/frysk/util/TaskStopUtil.java
%patch -P8 -p1 -z .taskstoputil -F 3
%patch -P9 -p1 -z .publictestbedsymtab
%patch -P10 -p1 -z .noelfmem
%patch -P11 -p1 -z .gccjint
%patch -P12 -p1 -z .taskstoperr
%patch -P13 -p1 -z .lostfork
%patch -P14 -p1 -z .nooptimize
%patch -P15 -p1 -z .skipdecl
%patch -P16 -p1 -z .flushstat
%patch -P17 -p1 -z .ftrace
%patch -P18 -p1 -z .usererrno
%patch -P19 -p1 -z .configure-enable-gnome
%patch -P20 -p1 -z .bin-antlr
%patch8 -p1 -z .taskstoputil -F 3
%patch9 -p1 -z .publictestbedsymtab
%patch10 -p1 -z .noelfmem
%patch11 -p1 -z .gccjint
%patch12 -p1 -z .taskstoperr
%patch13 -p1 -z .lostfork
%patch14 -p1 -z .nooptimize
%patch15 -p1 -z .skipdecl
%patch16 -p1 -z .flushstat
%patch17 -p1 -z .ftrace
%patch18 -p1 -z .usererrno
%patch19 -p1 -z .configure-enable-gnome
%patch20 -p1 -z .bin-antlr
%if %{fedora}0 >= 130
%patch -P100 -p1 -z .aclocaljavac
%patch100 -p1 -z .aclocaljavac
%endif
%if %{enable_gnome}
# don't apply - leaves default as build gnome
%else
%patch -P101 -p1 -z .configure-enable-gnome
%patch101 -p1 -z .configure-enable-gnome
%endif
%if %{enable_devel}
# don't apply - leaves devel package installed
%else
%patch -P21 -p1 -z .nopkglibdir
%patch21 -p1 -z .nopkglibdir
%endif
%patch -P1003 -p1 -z .nogtkwerror
%patch1003 -p1 -z .nogtkwerror
%patch -P666 -p1 -z .sodwfl
%patch666 -p1 -z .sodwfl
rm -rf frysk-imports/elfutils
%if %{enable_gnome}
# don't apply, leave jdom around
%else
%patch -P22 -p1 -z .no-jdom
%patch22 -p1 -z .no-jdom
rm -rf frysk-core/frysk/dom
rm -rf frysk-core/frysk/rt/LineXXX.java
%endif
%patch -P23 -p1 -z .missing-javah-cni-built
%patch -P24 -p1 -z .jni
%patch -P25 -p1 -z .awk-gensub
%patch -P26 -p1 -z .pic-asm
%patch -P27 -p1 -z .per-thread-java-id
%patch -P28 -p1 -z .unwind-global-id
%patch -P29 -p1 -z .use-installed-antlr
%patch23 -p1 -z .missing-javah-cni-built
%patch24 -p1 -z .jni
%patch25 -p1 -z .awk-gensub
%patch26 -p1 -z .pic-asm
%patch27 -p1 -z .per-thread-java-id
%patch28 -p1 -z .unwind-global-id
%patch29 -p1 -z .use-installed-antlr
rm -rf frysk-imports/antlr
%patch -P30 -p1 -z .use-installed-junit
%patch30 -p1 -z .use-installed-junit
rm -rf frysk-imports/junit
%patch -P31 -p1 -z .jni-issameobject
%patch -P32 -p1 -z .switch-ecj-to-javac
%patch -P33 -p1 -z .use-installed-jline
%patch31 -p1 -z .jni-issameobject
%patch32 -p1 -z .switch-ecj-to-javac
%patch33 -p1 -z .use-installed-jline
rm -rf frysk-imports/jline
# automake doesn't like old names
mv frysk-imports/libunwind/configure.{in,ac}
%patch -P34 -p1 -z .libunwind-fstack
%patch -P35 -p1 -z .clone-cursor
%patch -P36 -p1 -z .fedpkg-lint-licence
%patch -P37 -p1 -z .fedpkg-lint-solib
%patch -P38 -p1 -z .gelf-newphdr
%patch -P39 -p1 -z .jnixx-signed-unsigned
%patch -P40 -p1 -z .check-p-not-status
%patch -P41 -p1 -z .python3
%patch -P42 -p1 -z .jline1-to-jline
%patch -P43 -p1 -z .disable-arch32-tests
%patch -P44 -p1 -z .steptester-indentation
%patch -P45 -p1 -z .gcc-fcommon
%patch -P46 -p1 -z .javac
%patch -P47 -p1 -z .jnixx-union-as-reserved-word
%patch -P48 -p1 -z .jnixx-dont-emit-nested-classes
%patch -P49 -p1 -z .49-elf-newehdr-null
%patch -P50 -p1 -z .50-autoconf-2-70-fixes
%patch -P51 -p1 -z .51-debugedit-path
%patch -P52 -p1 -z .52-libunwind-tests.patch
%patch -P53 -p1 -z .53-no-new-integer.patch
%patch -P54 -p1 -z .54-c-warnings.patch
%patch34 -p1 -z .libunwind-fstack
%patch35 -p1 -z .clone-cursor
%patch36 -p1 -z .fedpkg-lint-licence
%patch37 -p1 -z .fedpkg-lint-solib
%patch38 -p1 -z .gelf-newphdr
%patch39 -p1 -z .jnixx-signed-unsigned
%patch40 -p1 -z .check-p-not-status
%patch41 -p1 -z .python3
%patch42 -p1 -z .jline1-to-jline
%patch43 -p1 -z .disable-arch32-tests
%patch44 -p1 -z .steptester-indentation
%patch45 -p1 -z .gcc-fcommon
echo "%{version}-%{release}" > frysk-common/version.in
@ -315,6 +288,9 @@ echo '#!/bin/sh -x' >> configure
echo 'exec ../$(basename $0) "$@"' >> configure
chmod a+x configure
# FIXME: Warnings should be fixed, not suppressed:
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
%configure \
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS"
@ -469,95 +445,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug
%endif
%changelog
* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 0.4-99
- Rebuilt for java-25-openjdk as preffered jdk
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-98
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Feb 28 2025 Andrew Cagney <cagney@fedoraproject.org> - 0.4-97
- Fix deprecated New Integer() warnings
- Fix unprototyped function
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-96
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-95
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0.4-94
- Rebuilt for java-21-openjdk as system jdk
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-93
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-92
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-91
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon May 15 2023 Andrew Cagney <cagney@fedoraproject.org> - 0.4-90
- drop hack mangling _FORTIFY_SOURCE; fix 2161322
* Mon Apr 3 2023 Andrew Cagney <cagney@fedoraproject.org> - 0.4-89
- update frysk licence
* Thu Mar 9 2023 Andrew Cagney <cagney@fedoraproject.org> - 0.4-88
- update getopt and libunwind sub licences
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-87
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Sep 29 2022 Andrew Cagney <cagney@fedoraproject.org> - 0.4-86
- don't build libunwind tests; frysk-0.4-52-libunwind-tests.patch
* Thu Jul 21 2022 Andrew Cagney <cagney@fedoraproject.org> - 0.4-85
- ding dong the 32-bit Java is dead; #2104040
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-84
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0.4-83
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-82
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Aug 4 2021 Andrew Cagney <cagney@fedoraproject.org> - 0.4-81
- require debugedit; fix hardwired path
* Wed Aug 4 2021 Andrew Cagney <cagney@fedoraproject.org> - 0.4-80
- Allow autoconf 2.69
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-79
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Apr 12 2021 Andrew Cagney <cagney@fedoraproject.org> - 0.4-78
- autoconf 2.70
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-77
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 0.4-76
- Depend on jline2, not jline
* Fri Dec 11 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-75
- fix check of elf_newehdr()'s return value
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-74
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jul 16 2020 Andrew Cagney <cagney@fedoraproject.org> - 0.4-73
- 'union' onto 'union$' - frysk-0.4-jnixx-union-as-reserved-word.patch
- omit nested local classes - frysk-0.4-jnixx-dont-emit-nested-classes.patch
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0.4-72
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Tue Jun 9 2020 Andrew Cagney <cagney@fedoraproject.org> - 0.4-71
- drop -source 1.4 -- frysk-0.4-javac.patch
* Tue Jan 28 2020 Andrew Cagney <cagney@fedoraproject.org> - 0.4-70
- pacify gcc -fcommon