diff options
Diffstat (limited to 'math/octave-current/patches/patch-ad')
-rw-r--r-- | math/octave-current/patches/patch-ad | 79 |
1 files changed, 19 insertions, 60 deletions
diff --git a/math/octave-current/patches/patch-ad b/math/octave-current/patches/patch-ad index c14c4feb506..aedef1f279f 100644 --- a/math/octave-current/patches/patch-ad +++ b/math/octave-current/patches/patch-ad @@ -1,68 +1,27 @@ -$NetBSD: patch-ad,v 1.2 2001/04/22 20:23:02 jtb Exp $ +$NetBSD: patch-ad,v 1.3 2003/12/04 11:15:37 adam Exp $ ---- libcruft/Makefile.in.orig Sun Apr 22 20:22:10 2001 -+++ libcruft/Makefile.in Sun Apr 22 20:41:53 2001 -@@ -61,39 +61,14 @@ - CRUFT_OBJ1 := $(patsubst %.f, %.o, $(CRUFT_OBJ2)) - CRUFT_OBJ := $(CRUFT_OBJ1) $(MISC_OBJ) - --ifeq ($(SHARED_LIBS), true) -- ifdef FPICFLAG -- CRUFT_OBJ_DIR := $(dir $(CRUFT_OBJ)) -- CRUFT_OBJ_PICDIR := $(addsuffix pic/, $(CRUFT_OBJ_DIR)) -- CRUFT_OBJ_NOTDIR := $(notdir $(CRUFT_OBJ)) -- CRUFT_PICOBJ := $(join $(CRUFT_OBJ_PICDIR), $(CRUFT_OBJ_NOTDIR)) -- else -- CRUFT_PICOBJ := $(CRUFT_OBJ) -- endif --endif -- --ifeq ($(SHARED_LIBS), true) -- ifeq ($(STATIC_LIBS), true) -- LIBRARIES = libcruft.$(LIBEXT) libcruft.$(SHLEXT) -- else -- LIBRARIES = libcruft.$(SHLEXT) -- endif --else -- ifeq ($(STATIC_LIBS), true) -- LIBRARIES = libcruft.$(LIBEXT) -- else -- LIBRARIES = -- endif --endif -+LIBRARIES = libcruft.$(LIBEXT) - - libraries: $(SUBDIRS) - $(MAKE) $(LIBRARIES) - .PHONY: libraries +--- libcruft/Makefile.in.orig 2003-10-30 17:48:09.000000000 +0100 ++++ libcruft/Makefile.in +@@ -100,8 +100,8 @@ libraries: $(SUBDIRS) libcruft.$(LIBEXT): $(CRUFT_OBJ) -- rm -f $@ + rm -f $@ - $(AR) $(ARFLAGS) $@ $^ - $(RANLIB) $@ -+ ${LIBTOOL} --mode=link ${CC} -o libcruft.${LIBEXT} ${CRUFT_OBJ:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%} ++ ${LIBTOOL} --mode=link ${CC} -o libcruft.$(LIBEXT) $(CRUFT_OBJ:.o=.lo) \ ++ -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%} - libcruft.$(SHLEXT): libcruft.$(SHLEXT_VER) + libcruft.$(SHLEXT_VER): libcruft.$(SHLEXT) rm -f $@ -@@ -113,20 +88,7 @@ - - install:: - $(top_srcdir)/mkinstalldirs $(octlibdir) -- if $(STATIC_LIBS); then \ -- rm -f $(octlibdir)/libcruft.$(LIBEXT) ; \ +@@ -126,9 +126,8 @@ install:: + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) + if $(STATIC_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ - $(INSTALL_DATA) libcruft.$(LIBEXT) \ -- $(octlibdir)/libcruft.$(LIBEXT) ; \ -- $(RANLIB) $(octlibdir)/libcruft.$(LIBEXT) ; \ -- fi -- if $(SHARED_LIBS); then \ -- rm -f $(octlibdir)/libcruft.$(SHLEXT_VER); \ -- $(INSTALL_PROGRAM) \ -- libcruft.$(SHLEXT_VER) $(octlibdir)/libcruft.$(SHLEXT_VER); \ -- cd $(octlibdir); \ -- rm -f libcruft.$(SHLEXT); \ -- $(LN_S) libcruft.$(SHLEXT_VER) libcruft.$(SHLEXT); \ -- fi -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libcruft.${LIBEXT} ${PREFIX}/lib - $(mk-libdir-link) - - install-strip:: +- $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ +- $(RANLIB) $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \ ++ ${LIBTOOL} --mode=install $(INSTALL_DATA) libcruft.$(LIBEXT) \ ++ ${PREFIX}/lib; \ + fi + if $(SHARED_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/libcruft.$(SHLLIB_VER); \ |