The following commit has been merged in the master branch: commit 5207be08140bc5da55f90803cb3489878755cbd2 Author: Patrick Winnertz <win...@debian.org> Date: Wed May 12 10:46:28 2010 +0200
link statically Signed-off-by: Patrick Winnertz <win...@debian.org> diff --git a/debian/patches/e2fsprogs-lfsck.patch b/debian/patches/e2fsprogs-lfsck.patch index 96e2031..b541db5 100644 --- a/debian/patches/e2fsprogs-lfsck.patch +++ b/debian/patches/e2fsprogs-lfsck.patch @@ -27704,7 +27704,7 @@ Index: e2fsprogs-1.41.10/e2fsck/Makefile.in +...@lfsck_cmt@lfsck: $(LFSCK_OBJS) +...@lfsck_cmt@ @echo " LD $@" -...@lfsck_cmt@ $(LD) -pthread $(ALL_LDFLAGS) $(LUSTRE_INC) $(LFSCK_OBJS) -o lfsck $(LUSTRE_LIB) -llustreapi $(DEPLIBS) +...@lfsck_cmt@ $(LD) -pthread $(ALL_LDFLAGS) $(LUSTRE_INC) $(LFSCK_OBJS) -o lfsck $(LUSTRE_LIB) -llustreapi $(STATIC_DEPLIBS) -ldb -lpthread -static + extend: extend.o $(E) " LD $@" diff --git a/debian/patches/series b/debian/patches/series index c1ab1a7..643518a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -30,4 +30,4 @@ e2fsprogs-lfsck-absolute-path.patch e2fsprogs-add-io_channel_readahead.patch e2fsprogs-e2scan.patch e2fsprogs-fid_in_dirent.patch -#static-linking.patch +static-linking.patch diff --git a/debian/patches/static-linking.patch b/debian/patches/static-linking.patch index b7e2994..0189bb0 100644 --- a/debian/patches/static-linking.patch +++ b/debian/patches/static-linking.patch @@ -1,13 +1,26 @@ +diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in +index 10e5277..2842c09 100644 +--- a/lib/uuid/Makefile.in ++++ b/lib/uuid/Makefile.in +@@ -87,7 +87,7 @@ tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID) + uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID) + $(E) " LD $@" + $(Q) $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ +- $(LIBUUID) ++ $(STATIC_LIBUUID) + + uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in + $(E) " SUBST $@" diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in -index 360013e..2f65d99 100644 +index 8296e72..f8e4745 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in -@@ -118,7 +118,7 @@ e2fsck: $(OBJS) $(DEPLIBS) +@@ -115,7 +115,7 @@ prof_err.c prof_err.h: prof_err.et - e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) - @echo " LD $@" -- @$(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) -+ @$(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) -lpthread -static + e2fsck: $(OBJS) $(DEPLIBS) + $(E) " LD $@" +- $(Q) $(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS) ++ $(Q) $(LD) $(LDFLGAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) -ldb -lpthread -static - e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS) - @echo " LD $@" + e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) + $(E) " LD $@" -- Repository for maintaining lidskfsprogs _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit