This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH 1/9] Reimport gnulib from scratch.


On 06/28/2013 02:52 AM, Pedro Alves wrote:
I tried moving aside gnulib/import/, and re-running the our
gnulib/update-gnulib.sh script, and surprisingly, I get a different
result compared to what's in the tree.  This is with pristine FSF
autoconf and FSF automake, at the versions required by
update-gnulib.sh.  However, if I just run the update-gnulib.sh scripts
against the_existing_  tree, then nothing changes...  I suspect
gnulib-tool's merge logic might be preserving some things by design.
I think we should put this in regardless, as a "get rid of cruft that
might have accumulated over gnulib updates".  onceonly.m4 seems to fit
in that category.

Pedro,
I tried to run update-gnulib.sh to import module unistd, and the result looks right to me. Don't know why we need to reimport gnulib here. Here are my steps,

1. cd to <my gnulib repository> and check out commit.
8d5bd1402003bd0153984b138735adf537d960b0, which is required by
update-gnulib.sh

2. Modify update-gnulib.sh to add unistd into IMPORTED_GNULIB_MODULES,

3. Run 'bash update-gnulib.sh <my gnulib repository>'.

Here is the diff of aclocal.m4, for the reference sake.

$ git diff aclocal.m4
diff --git a/gdb/gnulib/aclocal.m4 b/gdb/gnulib/aclocal.m4
index fb99505..d983131 100644
--- a/gdb/gnulib/aclocal.m4
+++ b/gdb/gnulib/aclocal.m4
@@ -1048,11 +1048,15 @@ m4_include([import/m4/memchr.m4])
 m4_include([import/m4/memmem.m4])
 m4_include([import/m4/mmap-anon.m4])
 m4_include([import/m4/multiarch.m4])
+m4_include([import/m4/off_t.m4])
 m4_include([import/m4/onceonly.m4])
+m4_include([import/m4/ssize_t.m4])
 m4_include([import/m4/stdbool.m4])
 m4_include([import/m4/stddef_h.m4])
 m4_include([import/m4/stdint.m4])
 m4_include([import/m4/string_h.m4])
+m4_include([import/m4/sys_types_h.m4])
+m4_include([import/m4/unistd_h.m4])
 m4_include([import/m4/warn-on-use.m4])
 m4_include([import/m4/wchar_h.m4])
 m4_include([import/m4/wchar_t.m4])

--
Yao (éå)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]