js/src/ctypes/libffi-patches/00-base.patch

   1 Modifications to upstream libffi needed for the Mozilla build:
   2 * Clear INFO_DEPS so that builds don't fail when makeinfo isn't present.
   3   - This can be removed if https://github.com/atgreen/libffi/issues/111 is fixed.
   4 * Various workarounds for pymake bugs.
   5   - Once pymake support is fully deprecated, hunks 2-4 be safely removed.
   6
   7 diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
   8 --- a/js/src/ctypes/libffi/Makefile.in
   9 +++ b/js/src/ctypes/libffi/Makefile.in
  10 @@ -358,17 +358,17 @@ am__v_TEXI2PDF_1 =
  11  AM_V_texinfo = $(am__v_texinfo_@AM_V@)
  12  am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
  13  am__v_texinfo_0 = -q
  14  am__v_texinfo_1 =
  15  AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
  16  am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
  17  am__v_texidevnull_0 = > /dev/null
  18  am__v_texidevnull_1 =
  19 -INFO_DEPS = $(srcdir)/doc/libffi.info
  20 +INFO_DEPS =
  21  am__TEXINFO_TEX_DIR = $(srcdir)
  22  DVIS = doc/libffi.dvi
  23  PDFS = doc/libffi.pdf
  24  PSS = doc/libffi.ps
  25  HTMLS = doc/libffi.html
  26  TEXINFOS = doc/libffi.texi
  27  TEXI2DVI = texi2dvi
  28  TEXI2PDF = $(TEXI2DVI) --pdf --batch
  29 @@ -758,18 +758,20 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
  30
  31  $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
  32         $(am__cd) $(srcdir) && $(AUTOCONF)
  33  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  34         $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  35  $(am__aclocal_m4_deps):
  36
  37  fficonfig.h: stamp-h1
  38 -       @test -f $@ || rm -f stamp-h1
  39 -       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
  40 +       @if test ! -f $@; then \
  41 +         rm -f stamp-h1; \
  42 +         $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
  43 +       else :; fi
  44
  45  stamp-h1: $(srcdir)/fficonfig.h.in $(top_builddir)/config.status
  46         @rm -f stamp-h1
  47         cd $(top_builddir) && $(SHELL) ./config.status fficonfig.h
  48  $(srcdir)/fficonfig.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
  49         ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
  50         rm -f stamp-h1
  51         touch $@
  52 @@ -1292,57 +1294,57 @@ distclean-compile:
  53  @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/freebsd.Plo@am__quote@
  54  @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/sysv.Plo@am__quote@
  55  @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/unix64.Plo@am__quote@
  56  @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/win32.Plo@am__quote@
  57  @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/win64.Plo@am__quote@
  58  @AMDEP_TRUE@@am__include@ @am__quote@src/xtensa/$(DEPDIR)/ffi.Plo@am__quote@
  59  @AMDEP_TRUE@@am__include@ @am__quote@src/xtensa/$(DEPDIR)/sysv.Plo@am__quote@
  60
  61 -.S.o:
  62 +%.o: %.S
  63  @am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
  64  @am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
  65  @am__fastdepCCAS_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
  66  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@    $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  67  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@    DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  68  @am__fastdepCCAS_FALSE@        $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $<
  69
  70 -.S.obj:
  71 +%.obj: %.S
  72  @am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
  73  @am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
  74  @am__fastdepCCAS_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
  75  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@    $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  76  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@    DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  77  @am__fastdepCCAS_FALSE@        $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  78
  79 -.S.lo:
  80 +%.lo: %.S
  81  @am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
  82  @am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
  83  @am__fastdepCCAS_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
  84  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@    $(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  85  @AMDEP_TRUE@@am__fastdepCCAS_FALSE@    DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  86  @am__fastdepCCAS_FALSE@        $(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $<
  87
  88 -.c.o:
  89 +%.o: %.c
  90  @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
  91  @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
  92  @am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
  93  @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  94  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  95  @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
  96
  97 -.c.obj:
  98 +%.obj: %.c
  99  @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 100  @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 101  @am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
 102  @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 103  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 104  @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 105
 106 -.c.lo:
 107 +%.lo: %.c
 108  @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 109  @am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 110  @am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
 111  @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 112  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 113  @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 114
 115  mostlyclean-libtool:
 116 @@ -1443,17 +1445,17 @@ doc/libffi.html: doc/libffi.texi $(srcdi
 117         -@rm -f vti.tmp
 118         @cp $(srcdir)/doc/version.texi $@
 119
 120  mostlyclean-vti:
 121         -rm -f vti.tmp
 122
 123  maintainer-clean-vti:
 124  @MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi
 125 -.dvi.ps:
 126 +%.ps: %.dvi
 127         $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 128         $(DVIPS) $(AM_V_texinfo) -o $@ $<
 129
 130  uninstall-dvi-am:
 131         @$(NORMAL_UNINSTALL)
 132         @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
 133         for p in $$list; do \
 134           $(am__strip_dir) \