octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: SONAME clarification


From: Marco Atzeri
Subject: Re: SONAME clarification
Date: Wed, 12 Nov 2008 23:24:54 +0100 (CET)

--- "John W. Eaton"  ha scritto:

> On 12-Nov-2008, Marco Atzeri wrote:
> 
> | Hi All,
> | could someone clarify me the scope of 
> | 
> |  { false, "SONAME_FLAGS", OCTAVE_CONF_SONAME_FLAGS
> },
> | 
> | in src/toplev.cc ?
> 
> That is just recording the SONAME_FLAGS in the
> struct that
> octave_config_info returns.
> 

fine so I should have no consequence to change it.

> | I was trying to get rid of SONAME_FLAGS,
> | to solve the cygwin issue of different
> | prefix between DLL and the import library
> | 
> | cygoctave.dll liboctave.dll.a   
> | 
> | see for reference
> | http://cygwin.com/cygwin-ug-net/dll.html
> | 
> | My idea was to define 
> | LIBPRE=cyg
> | 
> | and to replace SONAME_FLAGS with
> | 
> | SOCRUFT_FLAGS='-Wl,--out-implib=libcruft.dll.a'
> | SOOCTAVE_FLAGS='-Wl,--out-implib=liboctave.dll.a'
> |
> SOINTERP_FLAGS='-Wl,--out-implib=liboctinterp.dll.a'
> | 
> | for cygwin and leave 
> 
> It is currently set to
> 
>   SONAME_FLAGS='-Wl,address@hidden'
> 
> in configure.in for Cygwin, so I don't see how this
> will change
> anything.  In the places where SONAME_FLAGS is used,
> isn't $@ already
> set to libcruft.dll, liboctave.dll, and
> liboctinterp.dll?
> 
> Oh, I see, you are changing LIBPRE to "cyg".  If you
> do that and you
> also strip it off for the --out-implib option, then
> how about using
> something like
> 
>   SONAME_FLAGS='-Wl,--out-implib=$(patsubst
> $(LIBPRE)%, %, $@).a'

I need to check, in any case there are other points 
where I need to differentiate between
LIBPRE=cyg and an additional SOPRE=lib.
See attached patch, in cygwin it works, and
I should have left correct for all the other systems.

> 
> ?  Would that do what you want?
> 
> Or maybe we need to revisit this whole LIBPRE thing
> so that it is
> used on all systems (i.e., LIBPRE would be set to
> "lib" on Unixy
> systems).
> 
> Comments?
> 
> jwe
> 

Regards
Marco



      Unisciti alla community di Io fotografo e video, il nuovo corso di 
fotografia di Gazzetta dello sport:
http://www.flickr.com/groups/iofotografoevideo
--- origsrc/octave-3.0.3/Makeconf.in    2008-09-24 09:13:46.000000000 +0200
+++ src/octave-3.0.3/Makeconf.in        2008-11-12 18:03:47.955025800 +0100
@@ -97,6 +97,7 @@
 
 LIBEXT = a
 LIBPRE = @LIBPRE@
+SOPRE = @SOPRE@
 
 # Fortran to C translator and associated flags.
 
@@ -198,7 +199,9 @@
 DL_LD = @DL_LD@
 DL_LDFLAGS = @DL_LDFLAGS@
 
-SONAME_FLAGS = @SONAME_FLAGS@
+SOCRUFT_FLAGS = @SOCRUFT_FLAGS@
+SOOCTAVE_FLAGS = @SOOCTAVE_FLAGS@
+SOINTERP_FLAGS = @SOINTERP_FLAGS@
 
 RDYNAMIC_FLAG = @RDYNAMIC_FLAG@
 
@@ -510,7 +513,9 @@
   -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \
   -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \
   -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \
-  -e "s|%OCTAVE_CONF_SONAME_FLAGS%|\"${SONAME_FLAGS}\"|" \
+  -e "s|%OCTAVE_CONF_SOCRUFT_FLAGS%|\"${SOCRUFT_FLAGS}\"|" \
+  -e "s|%OCTAVE_CONF_SOOCTAVE_FLAGS%|\"${SOOCTAVE_FLAGS}\"|" \
+  -e "s|%OCTAVE_CONF_SOINTERP_FLAGS%|\"${SOINTERP_FLAGS}\"|" \
   -e "s|%OCTAVE_CONF_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_UGLY_DEFS%|\"${UGLY_DEFS}\"|" \
   -e "s|%OCTAVE_CONF_USE_64_BIT_IDX_T%|\"${USE_64_BIT_IDX_T}\"|" \
--- origsrc/octave-3.0.3/configure.in   2008-09-24 09:13:46.000000000 +0200
+++ src/octave-3.0.3/configure.in       2008-11-12 18:17:22.470664200 +0100
@@ -950,12 +950,15 @@
 SHLBIN_VER='$(SHLBIN).$(version)'
 SHLLINKEXT=
 LIBPRE=lib
+SOPRE=lib
 SH_LD='$(CXX)'
 SH_LDFLAGS=-shared
 DL_LD='$(SH_LD)'
 DL_LDFLAGS='$(SH_LDFLAGS)'
 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)'
-SONAME_FLAGS=
+SOCRUFT_FLAGS=
+SOOCTAVE_FLAGS=
+SOINTERP_FLAGS=
 RLD_FLAG=
 NO_OCT_FILE_STRIP=false
 TEMPLATE_AR='$(AR)'
@@ -999,10 +1002,12 @@
     SHLEXT_VER='$(version).$(SHLEXT)'
     SHLLIB_VER='$(version).$(SHLLIB)'
     NO_OCT_FILE_STRIP=true
-    SONAME_FLAGS='-install_name $(octlibdir)/$@'
+    SOCRUFT_FLAGS='-install_name $(octlibdir)/$@'
+    SOOCTAVE_FLAGS='-install_name $(octlibdir)/$@'
+    SOINTERP_FLAGS='-install_name $(octlibdir)/$@'
     library_path_var=DYLD_LIBRARY_PATH 
   ;;
-  *-*-cygwin* | *-*-mingw*)
+  *-*-mingw*)
     DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import 
-Wl,--enable-runtime-pseudo-reloc"
     CXXPICFLAG=
     CPICFLAG=
@@ -1012,9 +1017,29 @@
     SHLBIN=dll
     SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import 
-Wl,--enable-auto-image-base"
     SHLLINKEXT=.dll
-    SONAME_FLAGS='-Wl,address@hidden'
+    SOCRUFT_FLAGS='-Wl,address@hidden'
+    SOOCTAVE_FLAGS='-Wl,address@hidden'
+    SOINTERP_FLAGS='-Wl,address@hidden'
     library_path_var=PATH
   ;;
+  *-*-cygwin*)
+    DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import 
-Wl,--enable-runtime-pseudo-reloc"
+    CXXPICFLAG=
+    CPICFLAG=
+    FPICFLAG=
+    LIBPRE=cyg
+    SOPRE=lib
+    SHLEXT=dll
+    SHLLIB=dll.a
+    SHLBIN=dll
+    SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import 
-Wl,--enable-auto-image-base"
+    SHLLINKEXT=.dll
+    SOCRUFT_FLAGS='-Wl,--out-implib=libcruft.dll.a'
+    SOOCTAVE_FLAGS='-Wl,--out-implib=liboctave.dll.a'
+    SOINTERP_FLAGS='-Wl,--out-implib=liboctinterp.dll.a'
+    library_path_var=PATH
+  ;;
+
   *-*-msdosmsvc)
     DL_LDFLAGS="-shared"
     CPICFLAG=
@@ -1024,6 +1049,7 @@
     SHLLIB=lib
     SHLBIN=dll
     LIBPRE=
+    SOPRE=
     SH_LDFLAGS="-shared"
       if test -n "`echo $CFLAGS | grep -e '-g'`" -o -n "`echo $CXXFLAGS | grep 
-e '-g'`"; then
       DL_LDFLAGS="$DL_LDFLAGS -g"
@@ -1039,11 +1065,15 @@
   ;;
   *-*-linux* | *-*-gnu*)
     MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
-    SONAME_FLAGS='-Wl,-soname -Wl,$@'
+    SOCRUFT_FLAGS='-Wl,-soname -Wl,$@'
+    SOOCTAVE_FLAGS='-Wl,-soname -Wl,$@'
+    SOINTERP_FLAGS='-Wl,-soname -Wl,$@'
     RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
   ;;
   i[[3456]]86-*-sco3.2v5*)
-    SONAME_FLAGS='-Wl,-h -Wl,$@'
+    SOCRUFT_FLAGS='-Wl,-h -Wl,$@'
+    SOOCTAVE_FLAGS='-Wl,-h -Wl,$@'
+    SOINTERP_FLAGS='-Wl,-h -Wl,$@'
     RLD_FLAG=
     SH_LDFLAGS=-G
   ;;
@@ -1126,12 +1156,15 @@
 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER])
 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT])
 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE])
+AC_MSG_NOTICE([defining SOPRE to be $SOPRE])
 AC_MSG_NOTICE([defining SH_LD to be $SH_LD])
 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
 AC_MSG_NOTICE([defining DL_LD to be $DL_LD])
 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS])
 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS])
-AC_MSG_NOTICE([defining SONAME_FLAGS to be $SONAME_FLAGS])
+AC_MSG_NOTICE([defining SOCRUFT_FLAGS to be $SOCRUFT_FLAGS])
+AC_MSG_NOTICE([defining SOOCTAVE_FLAGS to be $SOOCTAVE_FLAGS])
+AC_MSG_NOTICE([defining SOINTERP_FLAGS to be $SOINTERP_FLAGS])
 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP])
 AC_MSG_NOTICE([defining RLD_FLAG to be $RLD_FLAG])
 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR])
@@ -1151,12 +1184,15 @@
 AC_SUBST(SHLBIN_VER)
 AC_SUBST(SHLLINKEXT)
 AC_SUBST(LIBPRE)
+AC_SUBST(SOPRE)
 AC_SUBST(SH_LD)
 AC_SUBST(SH_LDFLAGS)
 AC_SUBST(DL_LD)
 AC_SUBST(DL_LDFLAGS)
 AC_SUBST(MKOCTFILE_DL_LDFLAGS)
-AC_SUBST(SONAME_FLAGS)
+AC_SUBST(SOCRUFT_FLAGS)
+AC_SUBST(SOOCTAVE_FLAGS)
+AC_SUBST(SOINTERP_FLAGS)
 AC_SUBST(NO_OCT_FILE_STRIP)
 AC_SUBST(RLD_FLAG)
 AC_SUBST(TEMPLATE_AR)
--- origsrc/octave-3.0.3/libcruft/Makefile.in   2008-09-24 09:13:46.000000000 
+0200
+++ src/octave-3.0.3/libcruft/Makefile.in       2008-11-12 16:57:27.159846000 
+0100
@@ -130,7 +130,7 @@
 
 $(LIBPRE)cruft.$(SHLEXT): $(CRUFT_PICOBJ)
        rm -f $@
-       $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(LINK_DEPS)
+       $(SH_LD) $(SH_LDFLAGS) $(SOCRUFT_FLAGS) -o $@ $^ $(LINK_DEPS)
 
 $(CRUFT_OBJ):
 
@@ -146,18 +146,18 @@
 install::
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
        if $(STATIC_LIBS); then \
-         rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
-         $(INSTALL_DATA) $(LIBPRE)cruft.$(LIBEXT) \
-           $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
-         $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
+         rm -f $(DESTDIR)$(octlibdir)/$(SOPRE)cruft.$(LIBEXT) ; \
+         $(INSTALL_DATA) $(SOPRE)cruft.$(LIBEXT) \
+           $(DESTDIR)$(octlibdir)/$(SOPRE)cruft.$(LIBEXT) ; \
+         $(RANLIB) $(DESTDIR)$(octlibdir)/$(SOPRE)cruft.$(LIBEXT) ; \
        fi
        if $(SHARED_LIBS); then \
-         rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
+         rm -f $(DESTDIR)$(octlibdir)/$(SOPRE)cruft.$(SHLLIB_VER); \
          $(INSTALL) \
-           $(LIBPRE)cruft.$(SHLLIB) 
$(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
-         rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB); \
+           $(SOPRE)cruft.$(SHLLIB) 
$(DESTDIR)$(octlibdir)/$(SOPRE)cruft.$(SHLLIB_VER); \
+         rm -f $(DESTDIR)$(octlibdir)/$(SOPRE)cruft.$(SHLLIB); \
          (cd $(DESTDIR)$(octlibdir); \
-         $(LN_S) $(LIBPRE)cruft.$(SHLLIB_VER) 
$(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB)); \
+         $(LN_S) $(SOPRE)cruft.$(SHLLIB_VER) 
$(DESTDIR)$(octlibdir)/$(SOPRE)cruft.$(SHLLIB)); \
          if  test x$(SHLBIN) != x ; then \
            rm -f $(DESTDIR)$(bindir)/$(LIBPRE)cruft.$(SHLBIN); \
            $(INSTALL_PROGRAM) \
--- origsrc/octave-3.0.3/liboctave/Makefile.in  2008-09-24 09:13:47.000000000 
+0200
+++ src/octave-3.0.3/liboctave/Makefile.in      2008-11-12 17:04:23.214709100 
+0100
@@ -265,7 +265,7 @@
 
 $(LIBPRE)octave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
        rm -f $@
-       $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ \
+       $(SH_LD) $(SH_LDFLAGS) $(SOOCTAVE_FLAGS) -o $@ \
        $(LIBOCTAVE_PICOBJ) $(LINK_DEPS)
 
 $(LIBOCTAVE_PICOBJ): stmp-pic
@@ -283,17 +283,17 @@
 install-lib:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
        if $(STATIC_LIBS); then \
-         rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
-         $(INSTALL_DATA) $(LIBPRE)octave.$(LIBEXT) \
-           $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
-         $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
+         rm -f $(DESTDIR)$(octlibdir)/$(SOPRE)octave.$(LIBEXT); \
+         $(INSTALL_DATA) $(SOPRE)octave.$(LIBEXT) \
+           $(DESTDIR)$(octlibdir)/$(SOPRE)octave.$(LIBEXT); \
+         $(RANLIB) $(DESTDIR)$(octlibdir)/$(SOPRE)octave.$(LIBEXT); \
        fi
        if $(SHARED_LIBS); then \
-         rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
+         rm -f $(DESTDIR)$(octlibdir)/$(SOPRE)octave.$(SHLLIB_VER); \
          $(INSTALL) \
-           $(LIBPRE)octave.$(SHLLIB) 
$(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
-         rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB); \
-         (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(LIBPRE)octave.$(SHLLIB_VER) 
$(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB)); \
+           $(SOPRE)octave.$(SHLLIB) 
$(DESTDIR)$(octlibdir)/$(SOPRE)octave.$(SHLLIB_VER); \
+         rm -f $(DESTDIR)$(octlibdir)/$(SOPRE)octave.$(SHLLIB); \
+         (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(SOPRE)octave.$(SHLLIB_VER) 
$(DESTDIR)$(octlibdir)/$(SOPRE)ctave.$(SHLLIB)); \
          if  test x$(SHLBIN) != x ; then \
            rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octave.$(SHLBIN); \
            $(INSTALL_PROGRAM) \
--- origsrc/octave-3.0.3/scripts/Makefile.in    2008-09-24 09:13:48.000000000 
+0200
+++ src/octave-3.0.3/scripts/Makefile.in        2008-11-12 16:01:48.423868500 
+0100
@@ -72,8 +72,8 @@
 .PHONY: clean mostlyclean distclean maintainer-clean
 
 install install-strip::
-       ls -LR $(DESTDIR)$(datadir)/octave > $(DESTDIR)$(datadir)/octave/ls-R
-       ls -LR $(DESTDIR)$(libexecdir)/octave > 
$(DESTDIR)$(libexecdir)/octave/ls-R
+       (cd $(DESTDIR) ; ls -LR .$(datadir)/octave > .$(datadir)/octave/ls-R )
+       (cd $(DESTDIR) ; ls -LR .$(libexecdir)/octave > 
.$(libexecdir)/octave/ls-R )
 
 uninstall::
        rm -f $(DESTDIR)$(datadir)/octave/ls-R 
$(DESTDIR)$(libexecdir)/octave/ls-R
--- origsrc/octave-3.0.3/src/Makefile.in        2008-09-24 09:13:49.000000000 
+0200
+++ src/octave-3.0.3/src/Makefile.in    2008-11-12 17:07:32.312089700 +0100
@@ -327,7 +327,7 @@
 
 $(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
        rm -f $@
-       $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
+       $(SH_LD) $(SH_LDFLAGS) $(SOINTERP_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
 
 stamp-prereq: defaults.h graphics.h oct-conf.h oct-gperf.h parse.cc lex.cc 
__gnuplot_raw__.cc $(OPT_HANDLERS)
        touch stamp-prereq
@@ -439,17 +439,17 @@
 install-lib:
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
        if $(STATIC_LIBS); then \
-         rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
-         $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \
-           $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
-         $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+         rm -f $(DESTDIR)$(octlibdir)/$(SOPRE)octinterp.$(LIBEXT); \
+         $(INSTALL_DATA) $(SOPRE)octinterp.$(LIBEXT) \
+           $(DESTDIR)$(octlibdir)/$(SOPRE)octinterp.$(LIBEXT); \
+         $(RANLIB) $(DESTDIR)$(octlibdir)/$(SOPRE)octinterp.$(LIBEXT); \
        fi
        if $(SHARED_LIBS); then \
          rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \
-         $(INSTALL) $(LIBPRE)octinterp.$(SHLLIB) \
-           $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB_VER); \
-         rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB); \
-         (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(LIBPRE)octinterp.$(SHLLIB_VER) 
$(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLLIB)); \
+         $(INSTALL) $(SOPRE)octinterp.$(SHLLIB) \
+           $(DESTDIR)$(octlibdir)/$(SOPRE)octinterp.$(SHLLIB_VER); \
+         rm -f $(DESTDIR)$(octlibdir)/$(SOPRE)octinterp.$(SHLLIB); \
+         (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(SOPRE)octinterp.$(SHLLIB_VER) 
$(DESTDIR)$(octlibdir)/$(SOPRE)octinterp.$(SHLLIB)); \
          if  test x$(SHLBIN) != x ; then \
            rm -f $(DESTDIR)$(bindir)/$(LIBPRE)octinterp.$(SHLBIN); \
            $(INSTALL_PROGRAM) \
--- origsrc/octave-3.0.3/src/oct-conf.h.in      2008-09-24 09:13:49.000000000 
+0200
+++ src/octave-3.0.3/src/oct-conf.h.in  2008-11-12 22:18:10.015625000 +0100
@@ -277,8 +277,16 @@
 #define OCTAVE_CONF_SH_LDFLAGS %OCTAVE_CONF_SH_LDFLAGS%
 #endif
 
-#ifndef OCTAVE_CONF_SONAME_FLAGS
-#define OCTAVE_CONF_SONAME_FLAGS %OCTAVE_CONF_SONAME_FLAGS%
+#ifndef OCTAVE_CONF_SOCRUFT_FLAGS
+#define OCTAVE_CONF_SOCRUFT_FLAGS %OCTAVE_CONF_SOCRUFT_FLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_SOOCTAVE_FLAGS
+#define OCTAVE_CONF_SOOCTAVE_FLAGS %OCTAVE_CONF_SOOCTAVE_FLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_SOINTERP_FLAGS
+#define OCTAVE_CONF_SOINTERP_FLAGS %OCTAVE_CONF_SOINTERP_FLAGS%
 #endif
 
 #ifndef OCTAVE_CONF_STATIC_LIBS
--- origsrc/octave-3.0.3/src/toplev.cc  2008-09-24 09:13:49.000000000 +0200
+++ src/octave-3.0.3/src/toplev.cc      2008-11-12 22:22:50.953125000 +0100
@@ -844,7 +844,9 @@
       { false, "SHLEXT_VER", OCTAVE_CONF_SHLEXT_VER },
       { false, "SH_LD", OCTAVE_CONF_SH_LD },
       { false, "SH_LDFLAGS", OCTAVE_CONF_SH_LDFLAGS },
-      { false, "SONAME_FLAGS", OCTAVE_CONF_SONAME_FLAGS },
+      { false, "SOCRUFT_FLAGS", OCTAVE_CONF_SOCRUFT_FLAGS },
+      { false, "SOOCTAVE_FLAGS", OCTAVE_CONF_SOOCTAVE_FLAGS },
+      { false, "SOINTERP_FLAGS", OCTAVE_CONF_SOINTERP_FLAGS },
       { false, "STATIC_LIBS", OCTAVE_CONF_STATIC_LIBS },
       { false, "UGLY_DEFS", OCTAVE_CONF_UGLY_DEFS },
       { false, "USE_64_BIT_IDX_T", OCTAVE_CONF_USE_64_BIT_IDX_T },

reply via email to

[Prev in Thread] Current Thread [Next in Thread]