From cde78ce750923bbc6243950d255141161ca11ccf Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 14:30:21 -0800 Subject: [PATCH 1/7] Refresh top --- .topdeps | 2 +- .topmsg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.topdeps b/.topdeps index d6085981c9..df1b5f3872 100644 --- a/.topdeps +++ b/.topdeps @@ -1 +1 @@ -linux-zfs-branch +linux-configure-branch diff --git a/.topmsg b/.topmsg index f9e0d5cbed..f3ece37ae7 100644 --- a/.topmsg +++ b/.topmsg @@ -1,6 +1,6 @@ From: Brian Behlendorf -Subject: [PATCH] linux configure branch +Subject: [PATCH] top -This branch contains the configure products from autogen.sh + Signed-off-by: Brian Behlendorf From 2e072229033a947cdd49017e2279159ed1be76d0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 14:31:23 -0800 Subject: [PATCH 2/7] Refresh top --- .topmsg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.topmsg b/.topmsg index f3ece37ae7..f43491a9cd 100644 --- a/.topmsg +++ b/.topmsg @@ -1,6 +1,8 @@ From: Brian Behlendorf Subject: [PATCH] top - +Top most branch, simply used as an well known reference. + +DO NOT COMMIT ANY CHANGES TO THIS BRANCH Signed-off-by: Brian Behlendorf From 6d781c344d2577d8da009b12887eb45d5e7adf3b Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 17 Dec 2008 14:22:01 -0800 Subject: [PATCH 3/7] Refresh autogen products --- lib/libspl/Makefile.in | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index 63679c1ffa..b1bc9f77f3 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -64,8 +64,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libspl_la_LIBADD = -am_libspl_la_OBJECTS = list.lo mkdirp.lo strlcat.lo strlcpy.lo \ - strnlen.lo u8_textprep.lo +am_libspl_la_OBJECTS = getmntany.lo list.lo mkdirp.lo strlcat.lo \ + strlcpy.lo strnlen.lo u8_textprep.lo zone.lo libspl_la_OBJECTS = $(am_libspl_la_OBJECTS) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -223,12 +223,14 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" lib_LTLIBRARIES = libspl.la libspl_la_SOURCES = \ + ${top_srcdir}/lib/libspl/getmntany.c \ ${top_srcdir}/lib/libspl/list.c \ ${top_srcdir}/lib/libspl/mkdirp.c \ ${top_srcdir}/lib/libspl/strlcat.c \ ${top_srcdir}/lib/libspl/strlcpy.c \ ${top_srcdir}/lib/libspl/strnlen.c \ ${top_srcdir}/lib/libspl/u8_textprep.c \ + ${top_srcdir}/lib/libspl/zone.c \ ${top_srcdir}/lib/libspl/include/sys/list.h \ ${top_srcdir}/lib/libspl/include/sys/list_impl.h @@ -301,12 +303,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getmntany.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdirp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u8_textprep.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zone.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -329,6 +333,13 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +getmntany.lo: ${top_srcdir}/lib/libspl/getmntany.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getmntany.lo -MD -MP -MF "$(DEPDIR)/getmntany.Tpo" -c -o getmntany.lo `test -f '${top_srcdir}/lib/libspl/getmntany.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/getmntany.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/getmntany.Tpo" "$(DEPDIR)/getmntany.Plo"; else rm -f "$(DEPDIR)/getmntany.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${top_srcdir}/lib/libspl/getmntany.c' object='getmntany.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getmntany.lo `test -f '${top_srcdir}/lib/libspl/getmntany.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/getmntany.c + list.lo: ${top_srcdir}/lib/libspl/list.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT list.lo -MD -MP -MF "$(DEPDIR)/list.Tpo" -c -o list.lo `test -f '${top_srcdir}/lib/libspl/list.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/list.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/list.Tpo" "$(DEPDIR)/list.Plo"; else rm -f "$(DEPDIR)/list.Tpo"; exit 1; fi @@ -371,6 +382,13 @@ u8_textprep.lo: ${top_srcdir}/lib/libspl/u8_textprep.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8_textprep.lo `test -f '${top_srcdir}/lib/libspl/u8_textprep.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/u8_textprep.c +zone.lo: ${top_srcdir}/lib/libspl/zone.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zone.lo -MD -MP -MF "$(DEPDIR)/zone.Tpo" -c -o zone.lo `test -f '${top_srcdir}/lib/libspl/zone.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/zone.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/zone.Tpo" "$(DEPDIR)/zone.Plo"; else rm -f "$(DEPDIR)/zone.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${top_srcdir}/lib/libspl/zone.c' object='zone.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zone.lo `test -f '${top_srcdir}/lib/libspl/zone.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/zone.c + mostlyclean-libtool: -rm -f *.lo From f48eae623ae6f6ac5183cb8b97aa6749eaf4ccbd Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 17 Dec 2008 14:54:33 -0800 Subject: [PATCH 4/7] Whoops --- lib/libspl/Makefile.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index d24a2437c1..3fb7a388ec 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -223,10 +223,7 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Wshadow -Werror -Wno-switch \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" lib_LTLIBRARIES = libspl.la libspl_la_SOURCES = \ -<<<<<<< HEAD:lib/libspl/Makefile.in -======= ${top_srcdir}/lib/libspl/getexecname.c \ ->>>>>>> refs/top-bases/top:lib/libspl/Makefile.in ${top_srcdir}/lib/libspl/getmntany.c \ ${top_srcdir}/lib/libspl/list.c \ ${top_srcdir}/lib/libspl/mkdirp.c \ @@ -307,10 +304,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -<<<<<<< HEAD:lib/libspl/Makefile.in -======= @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getexecname.Plo@am__quote@ ->>>>>>> refs/top-bases/top:lib/libspl/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getmntany.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdirp.Plo@am__quote@ @@ -341,8 +335,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -<<<<<<< HEAD:lib/libspl/Makefile.in -======= getexecname.lo: ${top_srcdir}/lib/libspl/getexecname.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getexecname.lo -MD -MP -MF "$(DEPDIR)/getexecname.Tpo" -c -o getexecname.lo `test -f '${top_srcdir}/lib/libspl/getexecname.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/getexecname.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/getexecname.Tpo" "$(DEPDIR)/getexecname.Plo"; else rm -f "$(DEPDIR)/getexecname.Tpo"; exit 1; fi @@ -350,7 +342,6 @@ getexecname.lo: ${top_srcdir}/lib/libspl/getexecname.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getexecname.lo `test -f '${top_srcdir}/lib/libspl/getexecname.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/getexecname.c ->>>>>>> refs/top-bases/top:lib/libspl/Makefile.in getmntany.lo: ${top_srcdir}/lib/libspl/getmntany.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getmntany.lo -MD -MP -MF "$(DEPDIR)/getmntany.Tpo" -c -o getmntany.lo `test -f '${top_srcdir}/lib/libspl/getmntany.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/getmntany.c; \ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/getmntany.Tpo" "$(DEPDIR)/getmntany.Plo"; else rm -f "$(DEPDIR)/getmntany.Tpo"; exit 1; fi From ad40585741267cc617256057b85aaaa84689cdbe Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 5 Jan 2009 13:10:32 -0800 Subject: [PATCH 5/7] Add libunicode configure foo --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index e8dbea0ad0..05324f8039 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AC_CONFIG_FILES([ lib/libspl/Makefile lib/libavl/Makefile lib/libnvpair/Makefile + lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile @@ -82,6 +83,9 @@ AC_CONFIG_FILES([ module/nvpair/Makefile module/nvpair/include/Makefile module/nvpair/include/sys/Makefile + module/unicode/Makefile + module/unicode/include/Makefile + module/unicode/include/sys/Makefile module/zcommon/Makefile module/zcommon/include/Makefile module/zcommon/include/sys/Makefile From 3c547e2c927533dd777aafdd57973ee311af7616 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 5 Jan 2009 13:12:01 -0800 Subject: [PATCH 6/7] Add libunicode configure foo --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index 05324f8039..e8dbea0ad0 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,6 @@ AC_CONFIG_FILES([ lib/libspl/Makefile lib/libavl/Makefile lib/libnvpair/Makefile - lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile @@ -83,9 +82,6 @@ AC_CONFIG_FILES([ module/nvpair/Makefile module/nvpair/include/Makefile module/nvpair/include/sys/Makefile - module/unicode/Makefile - module/unicode/include/Makefile - module/unicode/include/sys/Makefile module/zcommon/Makefile module/zcommon/include/Makefile module/zcommon/include/sys/Makefile From 54e709b8e571b5f726e43501fd41b90661c77bd0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 5 Jan 2009 13:42:29 -0800 Subject: [PATCH 7/7] Refresh libtool --- libtool | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libtool b/libtool index 0580e52ce6..94ccc74163 100755 --- a/libtool +++ b/libtool @@ -44,7 +44,7 @@ available_tags=" CXX F77" # ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host ilci: +# Libtool was configured on host wopri: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -331,7 +331,7 @@ link_all_deplibs=unknown sys_lib_search_path_spec=`echo "/lib64 /usr/lib64 /usr/local/lib64" | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/nvidia/lib /usr/nvidia/lib64 /usr/lib64/R/lib /usr/lib64/atlas /usr/lib64/ldapotp /usr/lib64/mvapich/0.9.9-1760.19chaos/gnu/shmem/lib/shared /usr/lib64/mysql /usr/lib64/qt-3.3/lib " +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/nvidia/lib /usr/nvidia/lib64 /usr/lib64/R/lib /usr/lib64/atlas /usr/lib64/ldapotp /usr/lib64/mvapich/0.9.9-1760.19chaos/gnu/gen2/lib/shared /usr/lib64/mysql /usr/lib64/octave-3.0.1 /usr/lib64/qt-3.3/lib " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7266,7 +7266,7 @@ disable_libs=static # End: # ### BEGIN LIBTOOL TAG CONFIG: CXX -# Libtool was configured on host ilci: +# Libtool was configured on host wopri: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -7550,7 +7550,7 @@ link_all_deplibs=unknown sys_lib_search_path_spec=`echo "/lib64 /usr/lib64 /usr/local/lib64" | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/nvidia/lib /usr/nvidia/lib64 /usr/lib64/R/lib /usr/lib64/atlas /usr/lib64/ldapotp /usr/lib64/mvapich/0.9.9-1760.19chaos/gnu/shmem/lib/shared /usr/lib64/mysql /usr/lib64/qt-3.3/lib " +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/nvidia/lib /usr/nvidia/lib64 /usr/lib64/R/lib /usr/lib64/atlas /usr/lib64/ldapotp /usr/lib64/mvapich/0.9.9-1760.19chaos/gnu/gen2/lib/shared /usr/lib64/mysql /usr/lib64/octave-3.0.1 /usr/lib64/qt-3.3/lib " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" @@ -7574,7 +7574,7 @@ include_expsyms="" # ### BEGIN LIBTOOL TAG CONFIG: F77 -# Libtool was configured on host ilci: +# Libtool was configured on host wopri: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -7861,7 +7861,7 @@ link_all_deplibs=unknown sys_lib_search_path_spec=`echo "/lib64 /usr/lib64 /usr/local/lib64" | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/nvidia/lib /usr/nvidia/lib64 /usr/lib64/R/lib /usr/lib64/atlas /usr/lib64/ldapotp /usr/lib64/mvapich/0.9.9-1760.19chaos/gnu/shmem/lib/shared /usr/lib64/mysql /usr/lib64/qt-3.3/lib " +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/nvidia/lib /usr/nvidia/lib64 /usr/lib64/R/lib /usr/lib64/atlas /usr/lib64/ldapotp /usr/lib64/mvapich/0.9.9-1760.19chaos/gnu/gen2/lib/shared /usr/lib64/mysql /usr/lib64/octave-3.0.1 /usr/lib64/qt-3.3/lib " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path=""