mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Merge commit '7c433cbbce'

Browse source 
Conflicts:
	meta/Makefile.am
This commit is contained in:
Andy Wingo 2015-01-22 13:32:59 +01:00
commit 7c6ce75e2c
2 changed files with 49 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/ref/api-io.texi
View file

@ -443,8 +443,12 @@ open.
@deffn {Scheme Procedure} seek fd_port offset whence @deffn {Scheme Procedure} seek fd_port offset whence
@deffnx {C Function} scm_seek (fd_port, offset, whence) @deffnx {C Function} scm_seek (fd_port, offset, whence)
Sets the current position of @var{fd_port} to the integer Sets the current position of @var{fd_port} to the integer
@var{offset}, which is interpreted according to the value of @var{offset}. For a file port, @var{offset} is expressed
@var{whence}. as a number of bytes; for other types of ports, such as string
ports, @var{offset} is an abstract representation of the
position within the port's data, not necessarily expressed
as a number of bytes. @var{offset} is interpreted according to
the value of @var{whence}.
One of the following variables should be supplied for One of the following variables should be supplied for
@var{whence}: @var{whence}:
@ -460,7 +464,7 @@ Seek from the end of the file.
If @var{fd_port} is a file descriptor, the underlying system If @var{fd_port} is a file descriptor, the underlying system
call is @code{lseek}. @var{port} may be a string port. call is @code{lseek}. @var{port} may be a string port.
The value returned is the new position in the file. This means The value returned is the new position in @var{fd_port}. This means
that the current position of a port can be obtained using: that the current position of a port can be obtained using:
@lisp @lisp
(seek port 0 SEEK_CUR) (seek port 0 SEEK_CUR)

24
meta/Makefile.am
View file

@ -54,6 +54,12 @@ substitute = \
installed_guile="@bindir@/$$guile" ; \ installed_guile="@bindir@/$$guile" ; \
$(SED) -e "s,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g" \ $(SED) -e "s,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g" \
-e "s,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g" \ -e "s,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g" \
-e "s,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g" \
-e "s,[@]GUILE_VERSION[@],$(GUILE_VERSION),g" \
-e "s,[@]GUILE_CFLAGS[@],$(GUILE_CFLAGS),g" \
-e "s,[@]GUILE_LIBS[@],$(GUILE_LIBS),g" \
-e "s,[@]LIBGUILE_INTERFACE[@],$(LIBGUILE_INTERFACE),g" \
$(dependency_substitutions) \
-e "s,[@]PKG_CONFIG[@],$(PKG_CONFIG),g" \ -e "s,[@]PKG_CONFIG[@],$(PKG_CONFIG),g" \
-e "s,[@]pkgconfigdir[@],$(pkgconfigdir),g" \ -e "s,[@]pkgconfigdir[@],$(pkgconfigdir),g" \
-e "s,[@]prefix[@],$(prefix),g" \ -e "s,[@]prefix[@],$(prefix),g" \
@ -68,6 +74,24 @@ substitute = \
-e "s,[@]guild[@],$$guild,g" \ -e "s,[@]guild[@],$$guild,g" \
-e "s,[@]installed_guile[@],$$installed_guile,g" -e "s,[@]installed_guile[@],$$installed_guile,g"
# Substitutions for dependencies that appear in 'guile-2.0.pc'.
dependency_substitutions = \
-e "s,[@]BDW_GC_CFLAGS[@],$(BDW_GC_CFLAGS),g" \
-e "s,[@]BDW_GC_LIBS[@],$(BDW_GC_LIBS),g" \
-e "s,[@]LIB_CLOCK_GETTIME[@],$(LIB_CLOCK_GETTIME),g" \
-e "s,[@]LIBGMP[@],$(LIBGMP),g" \
-e "s,[@]LIBLTDL[@],$(LIBLTDL),g" \
-e "s,[@]LIBFFI_LIBS[@],$(LIBFFI_LIBS),g" \
-e "s,[@]LIBUNISTRING[@],$(LIBUNISTRING),g" \
-e "s,[@]LIBICONV[@],$(LIBICONV),g" \
-e "s,[@]LIBINTL[@],$(LIBINTL),g" \
-e "s,[@]LIBSOCKET[@],$(LIBSOCKET),g" \
-e "s,[@]SERVENT_LIB[@],$(SERVENT_LIB),g" \
-e "s,[@]HOSTENT_LIB[@],$(HOSTENT_LIB),g" \
-e "s,[@]GETADDRINFO_LIB[@],$(GETADDRINFO_LIB),g" \
-e "s,[@]INET_NTOP_LIB[@],$(INET_NTOP_LIB),g" \
-e "s,[@]INET_PTON_LIB[@],$(INET_PTON_LIB),g"
guile-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in guile-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in
$(substitute) < "$<" > "$@.out" $(substitute) < "$<" > "$@.out"
mv "$@.out" "$@" mv "$@.out" "$@"