56 lines
2.5 KiB
Plaintext
56 lines
2.5 KiB
Plaintext
$OpenBSD: patch-libjava_Makefile_in,v 1.1.1.1 2011/11/14 13:00:57 pascal Exp $
|
|
work around gcj-dbtool hanging during build
|
|
--- libjava/Makefile.in.orig Wed Oct 26 11:30:24 2011
|
|
+++ libjava/Makefile.in Sun Nov 13 11:48:33 2011
|
|
@@ -502,7 +502,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-
|
|
install-pdf-recursive install-ps-recursive install-recursive \
|
|
installcheck-recursive installdirs-recursive pdf-recursive \
|
|
ps-recursive uninstall-recursive
|
|
-DATA = $(dbexec_DATA) $(jar_DATA) $(toolexecmainlib_DATA)
|
|
+DATA = $(jar_DATA) $(toolexecmainlib_DATA)
|
|
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
|
distclean-recursive maintainer-clean-recursive
|
|
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
|
@@ -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)
|
|
|
|
@@ -10459,7 +10460,7 @@ install-dvi: install-dvi-recursive
|
|
install-dvi-am:
|
|
|
|
install-exec-am: install-binPROGRAMS install-binSCRIPTS \
|
|
- install-dbexecDATA install-dbexecLTLIBRARIES \
|
|
+ install-dbexecLTLIBRARIES \
|
|
install-libexecsubPROGRAMS install-multi \
|
|
install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA
|
|
@$(NORMAL_INSTALL)
|