Compare commits
27 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b1e8523956 | ||
|
|
93625bcf76 | ||
|
|
2b81f52b88 | ||
|
|
de0a6f43a1 | ||
|
|
3655ee9878 | ||
|
|
df3591df6c | ||
|
|
39913091cc | ||
|
|
d136642936 | ||
|
|
5a10057321 | ||
|
|
23596acd39 | ||
|
|
0413799665 | ||
|
|
6bbb573a83 | ||
|
|
d65f29b78c | ||
|
|
8b204e83ac | ||
|
|
e180ded93b | ||
|
|
038b1f7e9f | ||
|
|
06cf29c0c0 | ||
|
|
5802181851 | ||
|
|
3bccf2d023 | ||
|
|
12df6ac17c | ||
|
|
80547c1bbc | ||
|
|
03a7fed2b6 | ||
|
|
03baa9b3c3 | ||
|
|
b36bdb2abb | ||
|
|
6a7112fcc5 | ||
|
|
11887f519d | ||
|
|
47bbd0f953 |
9 changed files with 2077 additions and 68 deletions
4
Makefile
4
Makefile
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
# Somewhat superseeded by fedpkg
|
||||
|
||||
BRANCH := $(shell fedpkg switch-branch | sed -n -e 's/ f/ /' -e 's/master/rawhide/' -e 's/^\* //p')
|
||||
BRANCH := $(shell fedpkg switch-branch | sed -n -e 's/ f/ /' -e 's/main/rawhide/' -e 's/^\* //p')
|
||||
SPEC_FILE = $(shell fedpkg gimmespec)
|
||||
|
||||
# VERREL is very slow
|
||||
|
|
@ -107,7 +107,7 @@ world gnome:
|
|||
.PHONY:: world
|
||||
|
||||
usable useful: init
|
||||
$(MOCK) install vi less strace emacs
|
||||
$(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
|
||||
.PHONY:: usable useful
|
||||
|
||||
clog prep:
|
||||
|
|
|
|||
13
frysk-0.4-49-elf-newehdr-null.patch
Normal file
13
frysk-0.4-49-elf-newehdr-null.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
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);
|
||||
}
|
||||
|
||||
119
frysk-0.4-50-autoconf-2-70-fixes.patch
Normal file
119
frysk-0.4-50-autoconf-2-70-fixes.patch
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
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],
|
||||
13
frysk-0.4-51-debugedit-path.patch
Normal file
13
frysk-0.4-51-debugedit-path.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
--- 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;
|
||||
|
||||
13
frysk-0.4-52-libunwind-tests.patch
Normal file
13
frysk-0.4-52-libunwind-tests.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
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
|
||||
1622
frysk-0.4-53-no-new-integer.patch
Normal file
1622
frysk-0.4-53-no-new-integer.patch
Normal file
File diff suppressed because it is too large
Load diff
135
frysk-0.4-54-c-warnings.patch
Normal file
135
frysk-0.4-54-c-warnings.patch
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
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);
|
||||
}
|
||||
|
|
@ -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/jline], JLINE_JAR)
|
||||
+AC_FIND_FILE([jline.jar], [/usr/share/java/jline2], JLINE_JAR)
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
224
frysk.spec
224
frysk.spec
|
|
@ -1,16 +1,22 @@
|
|||
Summary: Execution analysis and debugging tool-suite
|
||||
Name: frysk
|
||||
Version: 0.4
|
||||
Release: 74%{?dist}
|
||||
Release: 99%{?dist}
|
||||
|
||||
# Fedora 17+ is still waiting for vte et.al. bindings.
|
||||
%define enable_gnome %{fedora}0 < 170
|
||||
%define enable_devel %{fedora}0 < 170
|
||||
|
||||
# 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
|
||||
# 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
|
||||
|
||||
URL: http://sourceware.org/frysk
|
||||
Source: ftp://sourceware.org/pub/frysk/%{name}-%{version}.tar.bz2
|
||||
|
|
@ -67,6 +73,12 @@ 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
|
||||
|
|
@ -78,7 +90,7 @@ Patch1003: frysk-0.4-nogtkwerror.patch
|
|||
Patch666: frysk-0.4-sodwfl.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: java-25-devel
|
||||
BuildRequires: junit >= 3.8.1
|
||||
BuildRequires: antlr-tool >= 2.7.4
|
||||
BuildRequires: xmlto
|
||||
|
|
@ -89,12 +101,13 @@ BuildRequires: autoconf automake libtool
|
|||
# Some scripts run during the build use python
|
||||
BuildRequires: python3
|
||||
BuildRequires: elfutils-devel >= 0.151
|
||||
BuildRequires: jline
|
||||
BuildRequires: jline2
|
||||
BuildRequires: debugedit
|
||||
|
||||
# it seems java requires explict runtime requires!?!?
|
||||
Requires: junit
|
||||
Requires: antlr-tool
|
||||
Requires: jline
|
||||
Requires: jline2
|
||||
|
||||
%if %{enable_gnome}
|
||||
BuildRequires: jdom >= 1.0
|
||||
|
|
@ -109,6 +122,7 @@ 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
|
||||
|
|
@ -116,7 +130,8 @@ BuildRequires: gnome-python2-gconf
|
|||
# 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.
|
||||
ExclusiveArch: %{ix86} x86_64 ppc64
|
||||
# Bug #2104040: native frysk depends on to be removed i686 java-openjdk packages
|
||||
ExclusiveArch: 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
|
||||
|
|
@ -184,91 +199,97 @@ This package contains the GNOME front end for Frysk.
|
|||
%setup -q -n %{name}-%{version}
|
||||
pwd
|
||||
|
||||
%patch0 -p1 -z .head
|
||||
%patch -P0 -p1 -z .head
|
||||
|
||||
%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
|
||||
%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
|
||||
mv frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java
|
||||
%patch7 -p1 -z .mvtesttomain -F 1
|
||||
%patch -P7 -p1 -z .mvtesttomain -F 1
|
||||
mv frysk-core/frysk/util/ProcStopUtil.java frysk-core/frysk/util/TaskStopUtil.java
|
||||
%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
|
||||
%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
|
||||
|
||||
%if %{fedora}0 >= 130
|
||||
%patch100 -p1 -z .aclocaljavac
|
||||
%patch -P100 -p1 -z .aclocaljavac
|
||||
%endif
|
||||
|
||||
%if %{enable_gnome}
|
||||
# don't apply - leaves default as build gnome
|
||||
%else
|
||||
%patch101 -p1 -z .configure-enable-gnome
|
||||
%patch -P101 -p1 -z .configure-enable-gnome
|
||||
%endif
|
||||
|
||||
%if %{enable_devel}
|
||||
# don't apply - leaves devel package installed
|
||||
%else
|
||||
%patch21 -p1 -z .nopkglibdir
|
||||
%patch -P21 -p1 -z .nopkglibdir
|
||||
%endif
|
||||
|
||||
%patch1003 -p1 -z .nogtkwerror
|
||||
%patch -P1003 -p1 -z .nogtkwerror
|
||||
|
||||
%patch666 -p1 -z .sodwfl
|
||||
%patch -P666 -p1 -z .sodwfl
|
||||
rm -rf frysk-imports/elfutils
|
||||
|
||||
%if %{enable_gnome}
|
||||
# don't apply, leave jdom around
|
||||
%else
|
||||
%patch22 -p1 -z .no-jdom
|
||||
%patch -P22 -p1 -z .no-jdom
|
||||
rm -rf frysk-core/frysk/dom
|
||||
rm -rf frysk-core/frysk/rt/LineXXX.java
|
||||
%endif
|
||||
|
||||
%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
|
||||
%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
|
||||
rm -rf frysk-imports/antlr
|
||||
%patch30 -p1 -z .use-installed-junit
|
||||
%patch -P30 -p1 -z .use-installed-junit
|
||||
rm -rf frysk-imports/junit
|
||||
%patch31 -p1 -z .jni-issameobject
|
||||
%patch32 -p1 -z .switch-ecj-to-javac
|
||||
%patch33 -p1 -z .use-installed-jline
|
||||
%patch -P31 -p1 -z .jni-issameobject
|
||||
%patch -P32 -p1 -z .switch-ecj-to-javac
|
||||
%patch -P33 -p1 -z .use-installed-jline
|
||||
rm -rf frysk-imports/jline
|
||||
# automake doesn't like old names
|
||||
mv frysk-imports/libunwind/configure.{in,ac}
|
||||
%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
|
||||
%patch46 -p1 -z .javac
|
||||
%patch47 -p1 -z .jnixx-union-as-reserved-word
|
||||
%patch48 -p1 -z .jnixx-dont-emit-nested-classes
|
||||
%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
|
||||
|
||||
echo "%{version}-%{release}" > frysk-common/version.in
|
||||
|
||||
|
|
@ -294,9 +315,6 @@ 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"
|
||||
|
|
@ -451,6 +469,82 @@ 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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue