diff options
Diffstat (limited to 'math/octave/patches/patch-ac')
| -rw-r--r-- | math/octave/patches/patch-ac | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/math/octave/patches/patch-ac b/math/octave/patches/patch-ac index 759e32b58c5..e85602e5214 100644 --- a/math/octave/patches/patch-ac +++ b/math/octave/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.5 2005/07/01 11:49:02 adam Exp $ +$NetBSD: patch-ac,v 1.6 2008/01/11 01:23:44 adam Exp $ ---- Makeconf.in.orig 2005-05-18 12:19:58.000000000 +0000 +--- Makeconf.in.orig 2007-12-04 21:51:25.000000000 +0100 +++ Makeconf.in -@@ -73,7 +73,7 @@ SHLBIN = @SHLBIN@ +@@ -95,7 +95,7 @@ SHLBIN = @SHLBIN@ SHLBIN_VER = @SHLBIN_VER@ SHLLINKEXT= -LIBEXT = a +LIBEXT = la + LIBPRE = @LIBPRE@ # Fortran to C translator and associated flags. - -@@ -157,7 +157,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ +@@ -195,7 +195,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ SH_LD = @SH_LD@ SH_LDFLAGS = @SH_LDFLAGS@ @@ -20,9 +20,13 @@ $NetBSD: patch-ac,v 1.5 2005/07/01 11:49:02 adam Exp $ DL_LDFLAGS = @DL_LDFLAGS@ SONAME_FLAGS = @SONAME_FLAGS@ -@@ -335,10 +335,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ +@@ -365,13 +365,13 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ # How to make .o files: + %.o : %.f +- $(FC) -c $(ALL_FFLAGS) -o $@ $< ++ ${LIBTOOL} --mode=compile $(FC) -c $(ALL_FFLAGS) -o $@ $< + %.o : %.c - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@ + ${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -o $@ @@ -31,5 +35,5 @@ $NetBSD: patch-ac,v 1.5 2005/07/01 11:49:02 adam Exp $ - $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@ + ${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(ALL_CXXFLAGS) $< -o $@ - pic/%.o : %.c - $(CC) -c $(CPPFLAGS) $(CPICFLAG) $(ALL_CFLAGS) $< -o $@ + pic/%.o : %.f + $(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@ |