59 lines
2.9 KiB
Diff
59 lines
2.9 KiB
Diff
diff -up frysk-0.4/frysk-core/Makefile.am.elfutilsin frysk-0.4/frysk-core/Makefile.am
|
||
--- frysk-0.4/frysk-core/Makefile.am.elfutilsin 2010-03-23 21:33:19.000000000 -0400
|
||
+++ frysk-0.4/frysk-core/Makefile.am 2010-03-23 21:33:20.000000000 -0400
|
||
@@ -68,6 +68,8 @@ GEN_GCJ_LDADD_LIST += -lstdc++
|
||
# Stub bfd_getb32 and bfd_getl32 for PPC64. Unconditionally
|
||
# link -lbfd_get just for simplification.
|
||
GEN_GCJ_LDADD_LIST += -laudit
|
||
+GEN_GCJ_LDADD_LIST += -lbz2
|
||
+GEN_GCJ_LDADD_LIST += -lz
|
||
|
||
# For TestExec.java
|
||
pkglib_PROGRAMS += frysk/pkglibdir/funit-exec-alias
|
||
diff -up frysk-0.4/frysk-gtk/Makefile.am.elfutilsin frysk-0.4/frysk-gtk/Makefile.am
|
||
--- frysk-0.4/frysk-gtk/Makefile.am.elfutilsin 2010-03-23 21:44:42.000000000 -0400
|
||
+++ frysk-0.4/frysk-gtk/Makefile.am 2010-03-23 21:45:02.000000000 -0400
|
||
@@ -64,6 +64,8 @@ GEN_GCJ_LDADD_LIST += \
|
||
GEN_GCJ_LDADD_LIST += -lstdc++
|
||
# For auditing
|
||
GEN_GCJ_LDADD_LIST += -laudit
|
||
+GEN_GCJ_LDADD_LIST += -lbz2
|
||
+GEN_GCJ_LDADD_LIST += -lz
|
||
|
||
# Hack, need to compile this entire sub-tree with JNI.
|
||
AM_GCJFLAGS += -fjni
|
||
diff -up frysk-0.4/frysk-gui/Makefile.am.elfutilsin frysk-0.4/frysk-gui/Makefile.am
|
||
--- frysk-0.4/frysk-gui/Makefile.am.elfutilsin 2008-06-09 14:03:07.000000000 -0400
|
||
+++ frysk-0.4/frysk-gui/Makefile.am 2010-03-23 21:33:20.000000000 -0400
|
||
@@ -77,6 +77,8 @@ GEN_GCJ_LDADD_LIST += -L../frysk-gtk/Egg
|
||
GEN_GCJ_LDADD_LIST += -L../frysk-gtk/tlwidgets
|
||
GEN_GCJ_LDADD_LIST += $(FRYSK_GUI_LIBS)
|
||
GEN_GCJ_LDADD_LIST += -laudit
|
||
+GEN_GCJ_LDADD_LIST += -lbz2
|
||
+GEN_GCJ_LDADD_LIST += -lz
|
||
|
||
# Skip the JUnit tests (exit with status 77) when there is no display; bug #3012.
|
||
#TESTS_ENVIRONMENT = ( test $$tst != TestRunner || test -n "$$DISPLAY" || exit 77 ) &&
|
||
diff -up frysk-0.4/frysk-imports/tests/Makefile.am.elfutilsin frysk-0.4/frysk-imports/tests/Makefile.am
|
||
--- frysk-0.4/frysk-imports/tests/Makefile.am.elfutilsin 2008-06-09 14:03:07.000000000 -0400
|
||
+++ frysk-0.4/frysk-imports/tests/Makefile.am 2010-03-23 21:33:20.000000000 -0400
|
||
@@ -491,5 +491,6 @@ frysk4796_dwfltest_CFLAGS = -I$(top_srcd
|
||
frysk4796_dwfltest_LDADD = -ldl $(top_builddir)/elfutils/libasm/libasm.a \
|
||
$(top_builddir)/elfutils/libdw/libdw.a \
|
||
$(top_builddir)/elfutils/libebl/libebl.a \
|
||
-$(top_builddir)/elfutils/libelf/libelf.a
|
||
+$(top_builddir)/elfutils/libelf/libelf.a \
|
||
+-lz -lbz2
|
||
systests_PASS_PROGRAM += frysk4796/dwfltest
|
||
diff -up frysk-0.4/frysk-sys/Makefile.am.elfutilsin frysk-0.4/frysk-sys/Makefile.am
|
||
--- frysk-0.4/frysk-sys/Makefile.am.elfutilsin 2008-06-09 14:03:07.000000000 -0400
|
||
+++ frysk-0.4/frysk-sys/Makefile.am 2010-03-23 21:33:20.000000000 -0400
|
||
@@ -65,6 +65,8 @@ GEN_GCJ_LDADD_LIST += ../frysk-imports/l
|
||
../frysk-imports/libunwind-ppc64/src/.libs/libunwind-ppc64.a
|
||
endif
|
||
GEN_GCJ_LDADD_LIST += -lstdc++ -laudit
|
||
+GEN_GCJ_LDADD_LIST += -lbz2
|
||
+GEN_GCJ_LDADD_LIST += -lz
|
||
|
||
# Force a few dependencies
|
||
lib/unwind/cni/Unwind%.cxx: lib/unwind/Unwind%.java lib/unwind/cni/UnwindH.hxx
|