diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2017-05-11 21:12:34 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2017-05-11 21:12:34 +0800 |
| commit | a67cfc790256884be9ce784b1439556308db3c53 (patch) | |
| tree | a635077752bfbb3027bb7b26d9115920ffe74729 | |
| parent | c0872bf99ff891e440f118bf9eea20b980c2cfca (diff) | |
| download | haskell-a67cfc790256884be9ce784b1439556308db3c53.tar.gz | |
Revert "libffi via submodule"
This reverts commit 8d4bce42de7929b0dec7e7d68e66bcfc4d266322.
| -rw-r--r-- | .gitmodules | 7 | ||||
| m--------- | libffi-tarballs | 0 | ||||
| m--------- | libffi/build | 0 | ||||
| -rw-r--r-- | libffi/ghc.mk | 9 | ||||
| -rw-r--r-- | packages | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index a1af41c7ac..55d360ae10 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/libffi-tarballs b/libffi-tarballs new file mode 160000 +Subproject ec37a68838566cb830c33cb30bfade003a306cf diff --git a/libffi/build b/libffi/build deleted file mode 160000 -Subproject b841ae70a05a5e11de1fca1b4551189db0895cf diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 08f5e4d40a..7c5bc9e1b3 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -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 - - - |