Mercurial > hg > octave-nkf
changeset 15409:c898dbe14e1d
build: Update imported module list from gnulib.
* bootstrap.conf: Update imported module list from gnulib.
* libgnu/Makefile.am: Auto-updated by gnulib-tool.
* liboctave/link-deps.mk: Add FLOORF_LIBM to list of GNULIB_DEPS.
* lo-mappers.h (xfloor): Change float version to forward to
xfloor in lo-mappers.cc instead of being an inline function.
* lo-mappers.c (xfloor): New function with float signature
which calls gnulib::floorf.
(xround) : Fix typo and call gnulib::roundf for float version of function.
* file-ops.cc: Include "canonicalize.h" for access to
gnulib::canonicalize_file_name.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 18 Sep 2012 10:15:05 -0700 |
parents | c0dd3ce6d1e2 |
children | 2024c70329df |
files | build-aux/bootstrap.conf libgnu/Makefile.am liboctave/link-deps.mk liboctave/numeric/lo-mappers.cc liboctave/numeric/lo-mappers.h liboctave/system/file-ops.cc |
diffstat | 6 files changed, 173 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/bootstrap.conf +++ b/build-aux/bootstrap.conf @@ -19,17 +19,22 @@ # gnulib modules used by this package. gnulib_modules=" base64 - c-strcase + canonicalize + chdir + close + closedir copysign copysignf - closedir crypto/md5 + dup2 fclose fcntl + fflush filemode + floor + floorf fnmatch fopen - fflush fseek ftell getcwd @@ -40,23 +45,25 @@ isatty link lstat + malloc mkdir mkfifo mkostemp - mkstemp mktime nanosleep nproc + open opendir pathmax progname readdir readlink + realloc rename - rewinddir rmdir round roundf + select sigaction signal sigprocmask @@ -64,6 +71,7 @@ stat stdint stdio + strerror strftime strptime symlink
--- a/libgnu/Makefile.am +++ b/libgnu/Makefile.am @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=libgnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl base64 c-strcase closedir copysign copysignf crypto/md5 fclose fcntl fflush filemode fnmatch fopen fseek ftell getcwd gethostname getopt-gnu gettimeofday glob isatty link lstat mkdir mkfifo mkostemp mkstemp mktime nanosleep nproc opendir pathmax progname readdir readlink rename rewinddir rmdir round roundf sigaction signal sigprocmask sleep stat stdint stdio strftime strptime symlink sys_stat sys_time sys_times time times tmpfile trunc truncf unistd unlink vasprintf +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=libgnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl base64 canonicalize chdir close closedir copysign copysignf crypto/md5 dup2 fclose fcntl fflush filemode floor floorf fnmatch fopen fseek ftell getcwd gethostname getopt-gnu gettimeofday glob isatty link lstat malloc mkdir mkfifo mkostemp mktime nanosleep nproc open opendir pathmax progname readdir readlink realloc rename rmdir round roundf select sigaction signal sigprocmask sleep stat stdint stdio strerror strftime strptime symlink sys_stat sys_time sys_times time times tmpfile trunc truncf unistd unlink vasprintf AUTOMAKE_OPTIONS = 1.5 gnits @@ -51,6 +51,7 @@ libgnu_la_LDFLAGS += -no-undefined libgnu_la_LDFLAGS += $(COPYSIGNF_LIBM) libgnu_la_LDFLAGS += $(COPYSIGN_LIBM) +libgnu_la_LDFLAGS += $(FLOORF_LIBM) libgnu_la_LDFLAGS += $(FLOOR_LIBM) libgnu_la_LDFLAGS += $(GETHOSTNAME_LIB) libgnu_la_LDFLAGS += $(LIBSOCKET) @@ -96,6 +97,14 @@ ## end gnulib module alloca-opt +## begin gnulib module areadlink-with-size + +libgnu_la_SOURCES += areadlink-with-size.c + +EXTRA_DIST += areadlink.h + +## end gnulib module areadlink-with-size + ## begin gnulib module at-internal @@ -111,17 +120,25 @@ ## end gnulib module base64 +## begin gnulib module bitrotate + +libgnu_la_SOURCES += bitrotate.h + +## end gnulib module bitrotate + ## begin gnulib module c-ctype libgnu_la_SOURCES += c-ctype.h c-ctype.c ## end gnulib module c-ctype -## begin gnulib module c-strcase - -libgnu_la_SOURCES += c-strcase.h c-strcasecmp.c c-strncasecmp.c - -## end gnulib module c-strcase +## begin gnulib module canonicalize + +libgnu_la_SOURCES += canonicalize.c + +EXTRA_DIST += canonicalize.h + +## end gnulib module canonicalize ## begin gnulib module canonicalize-lgpl @@ -294,6 +311,16 @@ ## end gnulib module dirfd +## begin gnulib module dirname + +libgnu_la_SOURCES += dirname.c basename.c + +EXTRA_DIST += stripslash.c + +EXTRA_libgnu_la_SOURCES += stripslash.c + +## end gnulib module dirname + ## begin gnulib module dirname-lgpl libgnu_la_SOURCES += dirname-lgpl.c basename-lgpl.c stripslash.c @@ -466,6 +493,14 @@ ## end gnulib module fflush +## begin gnulib module file-set + +libgnu_la_SOURCES += file-set.c + +EXTRA_DIST += file-set.h + +## end gnulib module file-set + ## begin gnulib module filemode libgnu_la_SOURCES += filemode.c @@ -529,6 +564,15 @@ ## end gnulib module floor +## begin gnulib module floorf + + +EXTRA_DIST += floor.c floorf.c + +EXTRA_libgnu_la_SOURCES += floor.c floorf.c + +## end gnulib module floorf + ## begin gnulib module fnmatch BUILT_SOURCES += $(FNMATCH_H) @@ -751,6 +795,28 @@ ## end gnulib module glob +## begin gnulib module hash + +libgnu_la_SOURCES += hash.c + +EXTRA_DIST += hash.h + +## end gnulib module hash + +## begin gnulib module hash-pjw + +libgnu_la_SOURCES += hash-pjw.h hash-pjw.c + +## end gnulib module hash-pjw + +## begin gnulib module hash-triple + +libgnu_la_SOURCES += hash-triple.c + +EXTRA_DIST += hash-triple.h + +## end gnulib module hash-triple + ## begin gnulib module intprops @@ -895,6 +961,15 @@ ## end gnulib module lstat +## begin gnulib module malloc-gnu + + +EXTRA_DIST += malloc.c + +EXTRA_libgnu_la_SOURCES += malloc.c + +## end gnulib module malloc-gnu + ## begin gnulib module malloc-posix @@ -1276,15 +1351,6 @@ ## end gnulib module mkostemp -## begin gnulib module mkstemp - - -EXTRA_DIST += mkstemp.c - -EXTRA_libgnu_la_SOURCES += mkstemp.c - -## end gnulib module mkstemp - ## begin gnulib module mktime @@ -1409,6 +1475,15 @@ ## end gnulib module readlink +## begin gnulib module realloc-gnu + + +EXTRA_DIST += realloc.c + +EXTRA_libgnu_la_SOURCES += realloc.c + +## end gnulib module realloc-gnu + ## begin gnulib module realloc-posix @@ -1463,6 +1538,14 @@ ## end gnulib module roundf +## begin gnulib module same + +libgnu_la_SOURCES += same.c + +EXTRA_DIST += same.h + +## end gnulib module same + ## begin gnulib module same-inode @@ -2230,6 +2313,24 @@ ## end gnulib module strings +## begin gnulib module strndup + + +EXTRA_DIST += strndup.c + +EXTRA_libgnu_la_SOURCES += strndup.c + +## end gnulib module strndup + +## begin gnulib module strnlen + + +EXTRA_DIST += strnlen.c + +EXTRA_libgnu_la_SOURCES += strnlen.c + +## end gnulib module strnlen + ## begin gnulib module strnlen1 libgnu_la_SOURCES += strnlen1.h strnlen1.c @@ -2970,12 +3071,47 @@ ## end gnulib module wctype-h +## begin gnulib module xalloc + +libgnu_la_SOURCES += xmalloc.c + +EXTRA_DIST += xalloc.h + +## end gnulib module xalloc + +## begin gnulib module xalloc-die + +libgnu_la_SOURCES += xalloc-die.c + +## end gnulib module xalloc-die + +## begin gnulib module xalloc-oversized + + +EXTRA_DIST += xalloc-oversized.h + +## end gnulib module xalloc-oversized + +## begin gnulib module xgetcwd + +libgnu_la_SOURCES += xgetcwd.c + +EXTRA_DIST += xgetcwd.h + +## end gnulib module xgetcwd + ## begin gnulib module xsize libgnu_la_SOURCES += xsize.h ## end gnulib module xsize +## begin gnulib module xstrndup + +libgnu_la_SOURCES += xstrndup.h xstrndup.c + +## end gnulib module xstrndup + mostlyclean-local: mostlyclean-generic @for dir in '' $(MOSTLYCLEANDIRS); do \
--- a/liboctave/link-deps.mk +++ b/liboctave/link-deps.mk @@ -1,6 +1,7 @@ GNULIB_LINK_DEPS = \ $(COPYSIGNF_LIBM)\ $(COPYSIGN_LIBM)\ + $(FLOORF_LIBM)\ $(FLOOR_LIBM)\ $(GETHOSTNAME_LIB)\ $(LIBSOCKET)\
--- a/liboctave/numeric/lo-mappers.cc +++ b/liboctave/numeric/lo-mappers.cc @@ -279,10 +279,15 @@ return gnulib::copysignf (x, y); } +float xfloor (float x) +{ + return gnulib::floorf (x); +} + float xround (float x) { - return gnulib::round (x); + return gnulib::roundf (x); } float
--- a/liboctave/numeric/lo-mappers.h +++ b/liboctave/numeric/lo-mappers.h @@ -119,7 +119,7 @@ extern OCTAVE_API float xtrunc (float x); extern OCTAVE_API float xcopysign (float x, float y); inline float xceil (float x) { return ceilf (x); } -inline float xfloor (float x) { return floorf (x); } +extern OCTAVE_API float xfloor (float x); inline float arg (float x) { return atan2f (0.0f, x); } inline float conj (float x) { return x; } inline float fix (float x) { return xtrunc (x); }