Mercurial > hg > octave-lyh > gnulib-hg
changeset 6550:3bb57675fc1b
Avoid error due to empty archive on MacOS X.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 11 Jan 2006 13:03:25 +0000 |
parents | 2f04f595e14e |
children | d37637700b4e |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 47 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-08 Bruno Haible <bruno@clisp.org> + + Avoid "ar: no archive members specified" error on MacOS X. + * gnulib-tool (func_modules_add_dummy): New function. + (func_import, func_create_testdir): Invoke it. + 2006-01-08 Bruno Haible <bruno@clisp.org> Ensure automatic ordering between gl_LOCK and gl_ARGP.
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-01-11 13:01:13 $' +cvsdatestamp='$Date: 2006-01-11 13:03:25 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -634,6 +634,40 @@ done } +# func_modules_add_dummy +# Input: +# - modules list of modules, including dependencies +# Output: +# - modules list of modules, including 'dummy' if needed +func_modules_add_dummy () +{ + have_lib_SOURCES= + sed_remove_backslash_newline=':a +/\\$/{ +s/\\$// +N +s/\n// +ba +}' + for module in $modules; do + func_verify_nontests_module + if test -n "$module"; then + # Extract the value of "lib_SOURCES += ...". + for file in `func_get_automake_snippet "$module" | sed -e "$sed_remove_backslash_newline" | sed -n -e 's,^lib_SOURCES[ ]*+=\([^#]*\).*$,\1,p'`; do + # Ignore .h files since they are not compiled. + case "$file" in + *.h) ;; + *) have_lib_SOURCES=yes ;; + esac + done + fi + done + # Add the dummy module, to make sure the library will be non-empty. + if test -z "$have_lib_SOURCES"; then + modules="$modules dummy" + fi +} + # func_modules_to_filelist # Input: # - modules list of modules, including dependencies @@ -945,6 +979,9 @@ echo "Module list with included dependencies:" echo "$modules" | sed -e 's/^/ /' + # Add the dummy module if needed. + func_modules_add_dummy + # If --lgpl, check the license of modules are compatible. if test -n "$lgpl"; then for module in $modules; do @@ -1400,6 +1437,9 @@ echo "Module list with included dependencies:" echo "$modules" | sed -e 's/^/ /' + # Add the dummy module if needed. + func_modules_add_dummy + # Determine final file list. func_modules_to_filelist echo "File list:"