openjade-1.3.2-libosp-la.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/jade/Makefile.sub /tmp/buffer-content-5978gFR
  2. --- a/jade/Makefile.sub 2009-11-19 17:21:46.000000000 -0500
  3. +++ b/jade/Makefile.sub 2009-11-19 17:23:24.000000000 -0500
  4. @@ -4,7 +4,8 @@
  5. INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
  6. # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
  7. # ../lib/libosp.a
  8. -XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a
  9. +XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a -losp
  10. +EXT_LIBS=-L$(splibdir) -losp $(LIBS)
  11. GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \
  12. HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \
  13. TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx
  14. diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/Makefile.prog.in /tmp/buffer-content-5978T7K
  15. --- a/Makefile.prog.in 2002-01-22 06:57:53.000000000 -0500
  16. +++ b/Makefile.prog.in 2009-11-19 17:23:05.000000000 -0500
  17. @@ -10,16 +10,15 @@
  18. top_builddir=@TOP@
  19. LINKFLAGS = @LINKFLAGS@
  20. -ALL_LIBS = $(XLIBS) $(LIBS)
  21. Makefile.lt:
  22. - echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
  23. + echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
  24. PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
  25. all: $(PROG)
  26. $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
  27. - $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
  28. + $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(EXT_LIBS)
  29. install: $(PROG)
  30. -test -d $(DESTDIR)$(bindir) || \