On Sun, 15 Jan 2017 14:32:00 -0600 Eric Sandeen <sandeen@xxxxxxxxxxx> wrote: > On 9/10/16 2:37 AM, Ralph Sennhauser wrote: > > --- > > > > Based on the earlier discussion this seems to be the preferred way > > of handling things. > > > > Should I split it into 3 patches? > > Do you want something different to happen when cross-compiling? > > Hi Ralph - > > I just merged a patch to for-next to address cross-compiling; > it was on the list prior to this one. > > Can you confirm that it resolves your issues? Hi Eric, I compile tested 4.9.0 with 0a71e38396304b4d1215ba0b51cd6ce8e33eb40d on top. Cross-compiling is fixed for me with this leaving only the d_namlen issue with musl for which you already reviewed a patch from me. If that gets addressed I can use vanilla xfsprogs. Thanks Ralph > > Thanks, > -Eric > > > Cheers > > Ralph > > > > --- > > configure.ac | 3 +++ > > include/builddefs.in | 1 + > > libxfs/Makefile | 10 ++++++++-- > > 3 files changed, 12 insertions(+), 2 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > index 79053e5..89334d6 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -10,11 +10,14 @@ AC_PROG_LIBTOOL > > > > AC_PROG_CC > > if test $cross_compiling = no; then > > + CROSS_COMPILING=no > > BUILD_CC="$CC" > > AC_SUBST(BUILD_CC) > > else > > + CROSS_COMPILING=yes > > AC_CHECK_PROGS(BUILD_CC, gcc cc) > > fi > > +AC_SUBST(CROSS_COMPILING) > > > > AC_ARG_ENABLE(shared, > > [ --enable-shared=[yes/no] Enable use of shared libraries > > [default=yes]],, diff --git a/include/builddefs.in > > b/include/builddefs.in index 7153d7a..0c4ce36 100644 > > --- a/include/builddefs.in > > +++ b/include/builddefs.in > > @@ -26,6 +26,7 @@ MALLOCLIB = @malloc_lib@ > > LOADERFLAGS = @LDFLAGS@ > > LTLDFLAGS = @LDFLAGS@ > > CFLAGS = @CFLAGS@ > > +CROSS_COMPILING = @CROSS_COMPILING@ > > > > LIBRT = @librt@ > > LIBUUID = @libuuid@ > > diff --git a/libxfs/Makefile b/libxfs/Makefile > > index 62608bd..ad492e5 100644 > > --- a/libxfs/Makefile > > +++ b/libxfs/Makefile > > @@ -114,11 +114,15 @@ DEBUG = -DNDEBUG > > > > LDIRT = gen_crc32table crc32table.h crc32selftest > > > > +ifeq ($(CROSS_COMPILING),no) > > +BUILD_CFLAGS:=$(CFLAGS) > > +endif > > + > > default: crc32selftest ltdepend $(LTLIBRARY) > > > > crc32table.h: gen_crc32table.c > > @echo " [CC] gen_crc32table" > > - $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $< > > + $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $< > > @echo " [GENERATE] $@" > > $(Q) ./gen_crc32table > crc32table.h > > > > @@ -128,9 +132,11 @@ crc32table.h: gen_crc32table.c > > # busted CRC calculation at build time and hence avoid putting bad > > CRCs down on # disk. > > crc32selftest: gen_crc32table.c crc32table.h crc32.c > > +ifeq ($(CROSS_COMPILING),no) > > @echo " [TEST] CRC32" > > - $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o > > $@ > > + $(Q) $(CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ > > $(Q) ./$@ > > +endif > > > > # set up include/xfs header directory > > include $(BUILDRULES) > > -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
