diff options
Diffstat (limited to 'math/octave/patches/patch-ag')
| -rw-r--r-- | math/octave/patches/patch-ag | 53 |
1 files changed, 30 insertions, 23 deletions
diff --git a/math/octave/patches/patch-ag b/math/octave/patches/patch-ag index 0a57be04e16..776881067d0 100644 --- a/math/octave/patches/patch-ag +++ b/math/octave/patches/patch-ag @@ -1,29 +1,36 @@ -$NetBSD: patch-ag,v 1.3 2005/04/01 10:15:47 adam Exp $ +$NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $ ---- src/Makefile.in.orig 2004-11-12 05:34:58.000000000 +0000 +--- src/Makefile.in.orig 2007-12-05 18:08:28.000000000 +0100 +++ src/Makefile.in -@@ -267,8 +267,9 @@ libraries: $(LIBRARIES) +@@ -204,7 +204,7 @@ BUILT_EXTRAS := graphics.h mxarray.h - liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA) + EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc + +-EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o ++EXTRA_OBJECTS := oct-errno.o builtins.o ops.o + + INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS) + +@@ -318,8 +318,9 @@ libraries: $(LIBRARIES) + + $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA) rm -f $@ - $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^ - $(RANLIB) $@ + ${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \ + $(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \ -+ -version-info ${version:2.1.%=2:%} ++ -version-info ${version:3.0.%=3:%} - liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT) + $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT) rm -f $@ -@@ -276,7 +277,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp +@@ -327,12 +328,13 @@ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBP - liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA) + $(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA) rm -f $@ - $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS) + ${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS) - stamp-oct-links: $(OCT_FILES) - if [ -n "$(OCT_FILES)" ]; then \ -@@ -288,6 +289,7 @@ stamp-prereq: defaults.h oct-conf.h oct- + stamp-prereq: defaults.h graphics.h oct-conf.h oct-gperf.h parse.cc lex.cc __gnuplot_raw__.cc $(OPT_HANDLERS) touch stamp-prereq octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ) @@ -31,31 +38,31 @@ $NetBSD: patch-ag,v 1.3 2005/04/01 10:15:47 adam Exp $ $(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \ $(ALL_LDFLAGS) -o $@ \ main.o $(DLD_STATIC_OBJ) \ -@@ -368,6 +370,7 @@ install-strip: +@@ -421,6 +423,7 @@ install-strip: install-bin: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) + ${LIBTOOL} --mode=install \ $(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) - $(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT) + cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT) .PHONY: install-bin -@@ -377,6 +380,7 @@ install-oct: - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir); \ +@@ -431,6 +434,7 @@ install-oct: + if [ -n "$(OCT_FILES)" ]; then \ xfiles="$(OCT_FILES)"; \ for f in $$xfiles; do \ + ${LIBTOOL} --mode=install \ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \ done; \ - $(srcdir)/mk-oct-links $(DESTDIR)$(octfiledir) $(DLD_DEF_FILES); \ -@@ -387,9 +391,8 @@ install-lib: + fi +@@ -440,9 +444,8 @@ install-lib: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) if $(STATIC_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ -- $(INSTALL_DATA) liboctinterp.$(LIBEXT) \ -- $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ -- $(RANLIB) $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \ + rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \ +- $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \ +- $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \ +- $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \ + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \ -+ ${PREFIX}/lib; \ ++ ${PREFIX}/lib; \ fi if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \ |