Re: Partial patch

[Gary V. Vaughan]

Hey Bruce,

On 17 Nov 2010, at 04:49, Bruce Korb wrote:
> Hi Gary, I'd as soon push this part now and debug
> the other issues later....

For the topic/libposix right?  All looks fine to me!

> From 8dcc0ce40119e06404ee29c84a52dc8c7f6457fb Mon Sep 17 00:00:00 2001
> From: Bruce Korb <address@hidden>
> Date: Tue, 16 Nov 2010 13:40:18 -0800
> Subject: [PATCH 2/2] update change log
> 
> ---
> ChangeLog |    8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index 772bb14..47d9c85 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,11 @@
> +2010-11-16  Bruce Korb  <address@hidden>
> +
> +     * libposix/bootstrap: generate libposix module file on the fly.
> +     * modules/libposix: remove
> +     * modules/*: Use pkginclude_HEADERS instead of plain "include".
> +     * libposix/lib/Makefile.am: adjust here, too
> +     * gnulib-tool: adjust here, too
> +
> 2010-11-06  Gary V. Vaughan  <address@hidden>
> 
>       libposix: vastly simplified bootstrap sanity check
> -- 
> 1.7.1
> From 79f700b068bebd3057de3c8cc644edf590560e23 Mon Sep 17 00:00:00 2001
> From: Bruce Korb <address@hidden>
> Date: Tue, 16 Nov 2010 13:34:36 -0800
> Subject: [PATCH 1/2] spell the pkginclude directory correctly.
> 
> ---
> gnulib-tool              |   10 +-
> libposix/.gitignore      |    3 +
> libposix/bootstrap       |   65 +++++++---
> libposix/lib/Makefile.am |    4 +-
> modules/alloca-opt       |    2 +-
> modules/arg-nonnull      |    2 +-
> modules/argz             |    2 +-
> modules/arpa_inet        |    2 +-
> modules/byteswap         |    2 +-
> modules/c++defs          |    2 +-
> modules/ctype            |    2 +-
> modules/dirent           |    2 +-
> modules/errno            |    2 +-
> modules/fcntl-h          |    2 +-
> modules/float            |    2 +-
> modules/fnmatch          |    2 +-
> modules/getopt-posix     |    2 +-
> modules/glob             |    2 +-
> modules/iconv-h          |    2 +-
> modules/iconv_open       |    2 +-
> modules/inttypes         |    2 +-
> modules/langinfo         |    2 +-
> modules/libposix         |  318 ----------------------------------------------
> modules/link-warning     |    2 +-
> modules/locale           |    2 +-
> modules/math             |    2 +-
> modules/netdb            |    2 +-
> modules/netinet_in       |    2 +-
> modules/poll-h           |    2 +-
> modules/pthread          |    2 +-
> modules/pty              |    2 +-
> modules/sched            |    2 +-
> modules/search           |    2 +-
> modules/selinux-h        |    2 +-
> modules/signal           |    2 +-
> modules/spawn            |    2 +-
> modules/stdarg           |    2 +-
> modules/stdbool          |    2 +-
> modules/stddef           |    2 +-
> modules/stdint           |    2 +-
> modules/stdio            |    2 +-
> modules/stdlib           |    2 +-
> modules/string           |    2 +-
> modules/strings          |    2 +-
> modules/sys_file         |    2 +-
> modules/sys_ioctl        |    2 +-
> modules/sys_select       |    2 +-
> modules/sys_socket       |    2 +-
> modules/sys_stat         |    2 +-
> modules/sys_time         |    2 +-
> modules/sys_times        |    2 +-
> modules/sys_utsname      |    2 +-
> modules/sys_wait         |    2 +-
> modules/sysexits         |    2 +-
> modules/termios          |    2 +-
> modules/time             |    2 +-
> modules/unistd           |    2 +-
> modules/unitypes         |    2 +-
> modules/unused-parameter |    2 +-
> modules/warn-on-use      |    2 +-
> modules/wchar            |    2 +-
> modules/wctype           |    2 +-
> 62 files changed, 114 insertions(+), 400 deletions(-)
> delete mode 100644 modules/libposix
> 
> diff --git a/gnulib-tool b/gnulib-tool
> index ab0b378..b7d7614 100755
> --- a/gnulib-tool
> +++ b/gnulib-tool
> @@ -2872,8 +2872,8 @@ func_emit_lib_Makefile_am ()
>   echo
>   if test -z "$makefile_name"; then
>     echo "SUBDIRS ="
> -    echo "nodist_include_HEADERS ="
> -    echo "nobase_nodist_include_HEADERS ="
> +    echo "nodist_pkginclude_HEADERS ="
> +    echo "nobase_nodist_pkginclude_HEADERS ="
>     echo "noinst_HEADERS ="
>     echo "noinst_LIBRARIES ="
>     echo "noinst_LTLIBRARIES ="
> @@ -2932,7 +2932,7 @@ func_emit_lib_Makefile_am ()
>   else
>     # Don't install header files when generated library is not installed.
>     sed_transform_HEADERS_primaries="\
> -        /^\(nobase_\)\{0,1\}nodist_include_HEADERS *=.*$/d
> +        /^\(nobase_\)\{0,1\}nodist_pkginclude_HEADERS *=.*$/d
>         /^EXTRA_HEADERS *=.*$/d
>     "
>     # By default, the generated library should not be installed.
> @@ -3181,8 +3181,8 @@ func_emit_tests_Makefile_am ()
>   if ! $for_test; then
>     echo "check_PROGRAMS ="
>   fi
> -  echo "nodist_include_HEADERS ="
> -  echo "nobase_nodist_include_HEADERS ="
> +  echo "nodist_pkginclude_HEADERS ="
> +  echo "nobase_nodist_pkginclude_HEADERS ="
>   echo "noinst_HEADERS ="
>   echo "noinst_LIBRARIES ="
>   if $use_libtests; then
> diff --git a/libposix/.gitignore b/libposix/.gitignore
> index b078d37..873ceeb 100644
> --- a/libposix/.gitignore
> +++ b/libposix/.gitignore
> @@ -46,3 +46,6 @@ stamp-h1
> /tests/test-*
> unused-parameter.h
> warn-on-use.h
> +/tests
> +/tmp
> +
> diff --git a/libposix/bootstrap b/libposix/bootstrap
> index 987bd31..10c37a9 100755
> --- a/libposix/bootstrap
> +++ b/libposix/bootstrap
> @@ -2,29 +2,58 @@
> 
> PATH=..:$PATH
> 
> -# Bootstrap for autotools.
> -gnulib-tool --import --lib=libposix --makefile-name=gnulib.mk \
> -  --macro-prefix=LIBPOSIX --libtool --no-changelog --symlink \
> -  --with-tests --with-c++-tests --with-longrunning-tests \
> -  git-version-gen libposix
> +mkdir tmp
> +mkdir tmp/modules
> 
> +    {   echo alloca
> +        posix-modules
> +    } | sort -u > tmp/posix-list
> 
> -# No need to maintain a Makefile.am just to include gnulib.mk.
> -mv tests/gnulib.mk tests/Makefile.am
> +    posix_list=$(grep -v '^$' tmp/posix-list)
> +
> +    cat > tmp/modules/libposix <<- _EOF_
> +     Description:
> +     Wrap up all the posix modules into an installable libposix.la.
> +
> +     Files:
> +
> +     Depends-on:
> +     ${posix_list}
> +
> +     configure.ac:
> +
> +     Makefile.am:
> +     lib_LTLIBRARIES = libposix.la
> 
> +     Include:
> 
> -# Sanity check the module list for synchronisation issues.
> -{
> -    sed_noblanks='/^$/d'
> -    posix-modules |sed -e "$sed_noblanks" -e 's|$| posix-modules|'
> -    gnulib-tool --extract-dependencies libposix \
> -        |sed -e "$sed_noblanks" -e 's|$| libposix|'
> -} | awk '_[$1] {delete _[$1]; next}
> -               {_[$1]=$2}
> -         END   {for (k in _)
> -                  printf ("bootstrap: warning: `%s'\'' only appears in 
> %s\n", k, _[k])}' \
> -  | sort
> +     License:
> +     LGPL
> 
> +     Maintainer:
> +     Bruce Korb
> +     Gary V. Vaughan
> +     _EOF_
> +
> +
> +opts='--local-dir=tmp
> +     --import
> +     --lib=libposix
> +     --makefile-name=gnulib.mk
> +     --macro-prefix=LIBPOSIX
> +     --libtool
> +     --no-changelog
> +     --symlink
> +     --with-tests
> +     --with-c++-tests
> +     --with-longrunning-tests'
> +
> +# Bootstrap for autotools.
> +gnulib-tool ${opts} git-version-gen libposix
> +
> +
> +# No need to maintain a Makefile.am just to include gnulib.mk.
> +mv tests/gnulib.mk tests/Makefile.am
> 
> # Run autotools.
> autoreconf --force --install --verbose --symlink
> diff --git a/libposix/lib/Makefile.am b/libposix/lib/Makefile.am
> index 9be48fc..0a31f4e 100644
> --- a/libposix/lib/Makefile.am
> +++ b/libposix/lib/Makefile.am
> @@ -3,8 +3,8 @@ SUFFIXES =
> 
> EXTRA_DIST =
> EXTRA_HEADERS =
> -nodist_include_HEADERS =
> -nobase_nodist_include_HEADERS =
> +nodist_pkginclude_HEADERS =
> +nobase_nodist_pkginclude_HEADERS =
> 
> CLEANFILES =
> MOSTLYCLEANDIRS =
> diff --git a/modules/alloca-opt b/modules/alloca-opt
> index 9424453..4ae08b0 100644
> --- a/modules/alloca-opt
> +++ b/modules/alloca-opt
> @@ -13,7 +13,7 @@ configure.ac:
> gl_FUNC_ALLOCA
> 
> Makefile.am:
> -nodist_include_HEADERS += $(ALLOCA_H)
> +nodist_pkginclude_HEADERS += $(ALLOCA_H)
> EXTRA_HEADERS += alloca.h
> 
> BUILT_SOURCES += $(ALLOCA_H)
> 
> [[[....many more elided.....]]]
> 
> diff --git a/modules/libposix b/modules/libposix
> deleted file mode 100644
> index f43874d..0000000
> --- a/modules/libposix
> +++ /dev/null
> @@ -1,318 +0,0 @@
> [[[.....elided.....]]]

Cheers,
-- 
Gary V. Vaughan (address@hidden)

PGP.sig
Description: This is a digitally signed message part