Commit a67cfc79 authored by Moritz Angermann's avatar Moritz Angermann

Revert "libffi via submodule"

This reverts commit 8d4bce42.
parent c0872bf9
......@@ -111,12 +111,13 @@
path = utils/hsc2hs
url = ../hsc2hs.git
ignore = none
[submodule "libffi-tarballs"]
path = libffi-tarballs
url = ../libffi-tarballs.git
ignore = none
[submodule "gmp-tarballs"]
path = libraries/integer-gmp/gmp/gmp-tarballs
url = ../gmp-tarballs.git
[submodule ".arc-linters/arcanist-external-json-linter"]
path = .arc-linters/arcanist-external-json-linter
url = ../arcanist-external-json-linter.git
[submodule "libffi/build"]
path = libffi/build
url = https://github.com/libffi/libffi.git
Subproject commit ec37a68838566cb830c33cb30bfade003a306cff
Subproject commit b841ae70a05a5e11de1fca1b4551189db0895cf2
......@@ -50,8 +50,9 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
$(call removeFiles,$(libffi_STAMP_STATIC_SHARED_CONFIGURE))
$(call removeFiles,$(libffi_STAMP_STATIC_SHARED_BUILD))
$(call removeFiles,$(libffi_STAMP_STATIC_SHARED_INSTALL))
git clean -x -f -d libffi/build
cd libffi/build && ./autogen.sh
$(call removeTrees,$(LIBFFI_DIR) libffi/build)
cat libffi-tarballs/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; }
mv libffi/libffi-* libffi/build
# update config.guess/config.sub
$(CP) "$(TOP)/config.guess" libffi/build/config.guess
......@@ -122,10 +123,10 @@ $(libffi_STATIC_LIB): $(libffi_STAMP_INSTALL)
@test -f $@ || { echo "$< exists, but $@ does not."; echo "Suggest removing $<."; exit 1; }
$(libffi_HEADERS): $(libffi_STAMP_INSTALL) | $$(dir $$@)/.
cp -f libffi/build/inst/include/$(notdir $@) $@
cp -f libffi/build/inst/lib/libffi-*/include/$(notdir $@) $@
$(eval $(call clean-target,libffi,, \
$(wildcard libffi/stamp.ffi.*) libffi/dist-install))
libffi/build $(wildcard libffi/stamp.ffi.*) libffi/dist-install))
endif
......@@ -38,7 +38,7 @@
# localpath tag remotepath upstreamurl
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ghc-tarballs windows ghc-tarballs.git -
libffi/build - - https://github.com/libffi/libffi.git
libffi-tarballs - - -
utils/hsc2hs - - -
utils/haddock - - ssh://git@github.com/haskell/haddock.git
libraries/array - - -
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment