$OpenBSD: patch-libjava_Makefile_in,v 1.3 2011/12/08 17:40:55 pascal Exp $
work around gcj-dbtool hanging during build
--- libjava/Makefile.in.orig	Wed Oct 26 11:30:24 2011
+++ libjava/Makefile.in	Thu Dec  8 10:05:53 2011
@@ -1041,12 +1041,13 @@ AM_CPPFLAGS = -I$(top_srcdir) \
 	$(GCINCS) $(THREADINCS) $(INCLTDL) \
 	$(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
 
+include $(top_srcdir)/../libversions
 BOOTCLASSPATH = $(srcdir)/classpath/lib
 libgij_la_SOURCES = gij.cc
 libgij_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_10)
 libgij_la_LIBADD = -L$(here)/.libs libgcj.la
 libgij_la_LDFLAGS = -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+        $(LIBgij_LTVERSION) $(LIBGCJ_LD_SYMBOLIC)
 
 libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS)
 @INTERPRETER_FALSE@libgcj_interpret_source_files = 
@@ -1065,7 +1066,7 @@ xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 # certain linuxthread functions get linked:
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
 	$(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
-	-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+	$(LIBgcj_LTVERSION) \
 	$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
 
 libgcj_la_LIBADD = \
@@ -1107,7 +1108,7 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-d
  -fsource-filename=$(here)/classpath/tools/all-classes.lst
 
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
- -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+ $(LIBgcj-tools_LTVERSION) \
  $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
  $(LIBJAVA_LDFLAGS_LIBMATH)
 
