| 1234567891011121314151617181920212223242526272829303132333435363738 |
- $OpenBSD: patch-libjava_Makefile_in,v 1.1.1.1 2014/06/26 16:30:17 pascal Exp $
- work around gcj-dbtool hanging during build
- --- libjava/Makefile.in.orig Sun Feb 9 23:32:51 2014
- +++ libjava/Makefile.in Fri Feb 14 20:24:55 2014
- @@ -1055,12 +1055,13 @@ AM_CPPFLAGS = -I$(top_srcdir) \
- $(GCINCS) $(THREADINCS) $(INCLTDL) \
- $(LIBGCC_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 =
- @@ -1079,7 +1080,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_LD_EXPORT_ALL)
-
- libgcj_la_LIBADD = \
- @@ -1121,7 +1122,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)
-
|
