[frysk] Don't build jdom, no longer needed Force the generation of some cni headers Pacify automake by givin

cagney cagney at fedoraproject.org
Fri Feb 15 03:28:00 UTC 2013 

commit 9fbb300caf94ed4226e9fed6f803a41b8b0d0c5a
Author: Andrew Cagney <cagney at fedoraproject.org>
Date:   Thu Feb 14 22:26:21 2013 -0500

    Don't build jdom, no longer needed
    Force the generation of some cni headers
    Pacify automake by giving config files names it likes

 frysk-0.4-missing-javah-cni-built.patch |   11 ++++
 frysk-0.4-no-jdom.patch                 |  101 +++++++++++++++++++++++++++++++
 frysk.spec                              |   23 +++++++-
 3 files changed, 134 insertions(+), 1 deletions(-)
---
diff --git a/frysk-0.4-missing-javah-cni-built.patch b/frysk-0.4-missing-javah-cni-built.patch
new file mode 100644
index 0000000..2b3950a
--- /dev/null
+++ b/frysk-0.4-missing-javah-cni-built.patch
@@ -0,0 +1,11 @@
+diff -up frysk-0.4/frysk-sys/Makefile.am.missing-javah-cni-built frysk-0.4/frysk-sys/Makefile.am
+--- frysk-0.4/frysk-sys/Makefile.am.missing-javah-cni-built	2013-02-14 21:33:35.397666535 -0500
++++ frysk-0.4/frysk-sys/Makefile.am	2013-02-14 21:59:36.968325166 -0500
+@@ -87,3 +87,7 @@ JNIXX_CLASSES += lib.unwind.UnwindRegist
+ JNIXX_CLASSES += lib.unwind.UnwindRegistersPPC64
+ JNIXX_CLASSES += lib.unwind.UnwindRegistersX86
+ JNIXX_CLASSES += lib.unwind.UnwindRegistersX8664
++# Some JAVAH files don't get generated as they are hidden includes
++lib/dwfl/cni/ElfSymbol.o: lib/dwfl/ElfSymbolVersion.h
++frysk/testbed/cni/ForkFactory.o: frysk/sys/UnhandledWaitBuilder.h
++lib/dwfl/cni/DwflModule.o: lib/dwfl/ElfSymbolVersion.h
diff --git a/frysk-0.4-no-jdom.patch b/frysk-0.4-no-jdom.patch
new file mode 100644
index 0000000..f97d01d
--- /dev/null
+++ b/frysk-0.4-no-jdom.patch
@@ -0,0 +1,101 @@
+diff -up frysk-0.4/frysk-core/frysk/debuginfo/DebugInfoFrame.java.no-jdom frysk-0.4/frysk-core/frysk/debuginfo/DebugInfoFrame.java
+--- frysk-0.4/frysk-core/frysk/debuginfo/DebugInfoFrame.java.no-jdom	2013-02-12 20:45:26.849514083 -0500
++++ frysk-0.4/frysk-core/frysk/debuginfo/DebugInfoFrame.java	2013-02-12 20:45:54.585387049 -0500
+@@ -47,7 +47,6 @@ import lib.dwfl.DwarfDie;
+ import lib.dwfl.Dwfl;
+ import lib.dwfl.DwflDie;
+ import frysk.dwfl.DwflCache;
+-import frysk.rt.LineXXX;
+ import frysk.scopes.Function;
+ import frysk.scopes.Scope;
+ import frysk.scopes.ScopeFactory;
+@@ -172,20 +171,6 @@ public class DebugInfoFrame extends Fram
+     }
+     private SourceLocation line;
+ 
+-    /**
+-     * XXX: This function should not be used DOM information (LineXXX)
+-     * should be moved out of DebugInfoFrame.
+-     * @return
+-     */
+-    public LineXXX getLineXXX(){
+-	if (this.getLine() == SourceLocation.UNKNOWN)
+-	    return null;
+-	if (this.lineXXX == null)
+-	    this.lineXXX = new LineXXX(this.getLine(), this.getTask().getProc());
+-	return lineXXX;
+-    }
+-    private LineXXX lineXXX;
+-    
+     public void toPrint(PrintWriter writer,
+ 			PrintDebugInfoStackOptions options) {
+         Function subprogram = this.getSubprogram();
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMCommon.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMCommon.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMCompilerSuffixes.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMCompilerSuffixes.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMFactory.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMFactory.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMFrysk.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMFrysk.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMFunction.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMFunction.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMImage.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMImage.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMInlineInstance.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMInlineInstance.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMLine.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMLine.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMSource.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMSource.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMTag.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMTag.java
+diff -up frysk-0.4/frysk-core/frysk/dom/DOMTagTypes.java.no-jdom frysk-0.4/frysk-core/frysk/dom/DOMTagTypes.java
+diff -up frysk-0.4/frysk-core/frysk/dom/StaticParser.java.no-jdom frysk-0.4/frysk-core/frysk/dom/StaticParser.java
+diff -up frysk-0.4/frysk-core/frysk/dom/TestDOM.java.no-jdom frysk-0.4/frysk-core/frysk/dom/TestDOM.java
+diff -up frysk-0.4/frysk-core/frysk/rt/LineXXX.java.no-jdom frysk-0.4/frysk-core/frysk/rt/LineXXX.java
+diff -up frysk-0.4/frysk-core/Makefile.am.no-jdom frysk-0.4/frysk-core/Makefile.am
+--- frysk-0.4/frysk-core/Makefile.am.no-jdom	2013-02-12 21:15:45.382563609 -0500
++++ frysk-0.4/frysk-core/Makefile.am	2013-02-12 21:15:59.743111685 -0500
+@@ -46,13 +46,11 @@ GEN_CLASSPATH += ../frysk-imports/jline.
+ GEN_CLASSPATH += ../frysk-imports/antlr.jar
+ GEN_CLASSPATH += ../frysk-imports/junit.jar
+ GEN_CLASSPATH += ../frysk-imports/getopt.jar
+-GEN_CLASSPATH += ../frysk-imports/jdom.jar
+ GEN_GCJ_LDADD_LIST += ../frysk-sys/libfrysk-sys.a
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jline.a
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-antlr.a
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
+-GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jdom.a
+ if USE_LIBUNWIND
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \
+                  ../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \
+diff -up frysk-0.4/frysk-imports/bootstrap.sh.no-jdom frysk-0.4/frysk-imports/bootstrap.sh
+--- frysk-0.4/frysk-imports/bootstrap.sh.no-jdom	2013-02-12 20:39:47.730169245 -0500
++++ frysk-0.4/frysk-imports/bootstrap.sh	2013-02-12 20:40:00.271780513 -0500
+@@ -43,7 +43,6 @@ set -e
+ FILE_LIST="\
+     junit/junit.jar \
+     ANTLR_JAR \
+-    JDOM_JAR \
+     jline/jline.jar \
+     getopt/getopt.jar \
+     "
+diff -up frysk-0.4/frysk-imports/configure.ac.no-jdom frysk-0.4/frysk-imports/configure.ac
+--- frysk-0.4/frysk-imports/configure.ac.no-jdom	2013-02-12 20:39:33.993600147 -0500
++++ frysk-0.4/frysk-imports/configure.ac	2013-02-12 20:40:14.883332957 -0500
+@@ -47,7 +47,6 @@ m4_include([common/frysk-common.ac])
+ AM_INIT_AUTOMAKE([subdir-objects foreign no-installinfo no-exeext no-dist])
+ 
+ AC_FIND_FILE([antlr.jar], [/usr/share/java /usr/share/frysk/java], ANTLR_JAR)
+-AC_FIND_FILE([jdom.jar], [/usr/share/java /usr/share/frysk/java], JDOM_JAR)
+ AC_FIND_FILE([libaudit.h], [/usr/include/], LIBAUDIT_H)
+ 
+ AC_CONFIG_FILES([
+diff -up frysk-0.4/frysk-sys/Makefile.am.no-jdom frysk-0.4/frysk-sys/Makefile.am
+--- frysk-0.4/frysk-sys/Makefile.am.no-jdom	2013-02-12 21:15:09.854684413 -0500
++++ frysk-0.4/frysk-sys/Makefile.am	2013-02-12 21:15:33.195948344 -0500
+@@ -47,12 +47,10 @@ GEN_CLASSPATH += ../frysk-imports/jline.
+ GEN_CLASSPATH += ../frysk-imports/antlr.jar
+ GEN_CLASSPATH += ../frysk-imports/junit.jar
+ GEN_CLASSPATH += ../frysk-imports/getopt.jar
+-GEN_CLASSPATH += ../frysk-imports/jdom.jar
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jline.a
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-antlr.a
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a
+-GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jdom.a
+ if USE_LIBUNWIND
+ GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \
+                  ../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \
diff --git a/frysk.spec b/frysk.spec
index f922b5c..db6447d 100644
--- a/frysk.spec
+++ b/frysk.spec
@@ -45,6 +45,8 @@ Patch18:	frysk-0.4-usererrno.patch
 Patch19:	frysk-0.4-configure-enable-gnome.patch
 Patch20:	frysk-0.4-bin-antlr.patch
 Patch21:	frysk-0.4-nopkglibdir.patch
+Patch22:	frysk-0.4-no-jdom.patch
+Patch23:	frysk-0.4-missing-javah-cni-built.patch
 
 Patch100:	frysk-0.4-aclocaljavac.patch
 Patch101:	frysk-0.4-cxx-scope.patch
@@ -67,7 +69,7 @@ Patch1103:	frysk-0.4-elfutils-ldadd-lzma.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  gcc-java >= 4.1.2 java-1.5.0-gcj
+BuildRequires:  gcc-java >= 4.1.2 java-1.5.0-gcj 
 BuildRequires:	junit >= 3.8.1
 BuildRequires:  jre >= 1.7.0
 BuildRequires:  antlr >= 2.7.4 
@@ -238,8 +240,22 @@ cd ../..
 %patch1103 -p1 -z .elfutils-ldadd-lzma
 %endif
 
+%if %{enable_gnome}
+# don't apply, leave jdom around
+%else
+%patch22 -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
+
 echo "%{version}-%{release}" > frysk-common/version.in
 
+# automake doesn't like old names
+mv frysk-imports/antlr/configure.{in,ac}
+mv frysk-imports/libunwind/configure.{in,ac}
+
 ./bootstrap.sh
 
 %build 
@@ -427,6 +443,11 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Feb 14 2013 Andrew Cagney <cagney at fedoraproject.org> - 0.4-39
+- Don't build jdom, no longer needed
+- Force the generation of some cni headers
+- Pacify automake by giving config files names it likes
+
 * Sat Jan 26 2013 Andrew Cagney <cagney at fedoraproject.org> - 0.4-38
 - Rebuild unchanged against new gcj so it picks up libgcj.so.14.

More information about the scm-commits mailing list