plptools/plpfuse-x86_64.patch

   1 Fix build of plpfuse on x86_64
   2
   3 /usr/include/fuse/fuse_common.h:32:2: error: #error Please add -D_FILE_OFFSET_BITS=64 to your compile flags!
   4
   5 See plptools bug ID 3081337
   6
   7 When looking at this workaround patch, maybe i686 is also affected from this bug?
   8
   9 diff --git a/plpfuse/Makefile.in.orig b/plpfuse/Makefile.in
  10 index 172ce02..ff2629a 100644
  11 --- a/plpfuse/Makefile.in.orig
  12 +++ b/plpfuse/Makefile.in
  13 @@ -74,22 +74,22 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
  14  am__depfiles_maybe = depfiles
  15  am__mv = mv -f
  16  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  17 -       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  18 +       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(FUSE_CFLAGS)
  19  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  20         --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  21 -       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  22 +       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(FUSE_CFLAGS)
  23  CCLD = $(CC)
  24  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  25 -       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  26 +       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(FUSE_CFLAGS) $(AM_LDFLAGS) \
  27         $(LDFLAGS) -o $@
  28  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  29 -       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  30 +       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(FUSE_CFLAGS)
  31  LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  32         --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  33 -       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  34 +       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(FUSE_CFLAGS)
  35  CXXLD = $(CXX)
  36  CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  37 -       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
  38 +       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(FUSE_CFLAGS) $(AM_LDFLAGS) \
  39         $(LDFLAGS) -o $@
  40  SOURCES = $(plpfuse_SOURCES)
  41  DIST_SOURCES = $(plpfuse_SOURCES)
  42 @@ -354,7 +354,7 @@ clean-sbinPROGRAMS:
  43         rm -f $$list
  44  plpfuse$(EXEEXT): $(plpfuse_OBJECTS) $(plpfuse_DEPENDENCIES)
  45         @rm -f plpfuse$(EXEEXT)
  46 -       $(CXXLINK) $(plpfuse_OBJECTS) $(plpfuse_LDADD) $(LIBS)
  47 +       $(CXXLINK) $(plpfuse_OBJECTS) $(plpfuse_LDADD) $(LIBS) $(FUSE_LIBS)
  48
  49  mostlyclean-compile:
  50         -rm -f *.$(OBJEXT)