diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-10-06 00:17:50 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-10-06 01:57:32 +0100 |
| commit | cd39aea968581ab1d805b8b1195b8f154af9925a (patch) | |
| tree | 3f9800660e6b60d2857143ba2ab37ff0fa98bc56 /libffi | |
| parent | 984419fb7e662c009ae83514200c8430ad59dd27 (diff) | |
| download | haskell-cd39aea968581ab1d805b8b1195b8f154af9925a.tar.gz | |
Follow libffi update
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 14 | ||||
| -rw-r--r-- | libffi/libffi.selinux-detection-3.0.8.patch | 15 |
2 files changed, 7 insertions, 22 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index f7caeda782..9dcf2c54a3 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -105,8 +105,6 @@ $(libffi_STAMP_CONFIGURE): cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; } mv libffi/libffi-* libffi/build chmod +x libffi/ln - # don't report nonselinux systems as selinux - cd libffi/build && "$(PATCH_CMD)" -p0 < ../libffi.selinux-detection-3.0.8.patch # Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn # warnings off or the compilation of libffi might fail due to warnings @@ -125,29 +123,31 @@ $(libffi_STAMP_CONFIGURE): --enable-shared=$(libffi_EnableShared) \ --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM) + cp libffi/build/*/libtool libffi/build + # libffi.so needs to be built with the correct soname. # NOTE: this builds libffi_convience.so with the incorrect # soname, but we don't need that anyway! cd libffi && \ - "$(CP)" build/libtool build/libtool.orig; \ + "$(CP)" build/libtool build/libtool.orig && \ sed -e s/soname_spec=.*/soname_spec="$(libffi_HS_DYN_LIB_NAME)"/ build/libtool.orig > build/libtool # We don't want libtool's cygwin hacks cd libffi && \ - "$(CP)" build/libtool build/libtool.orig; \ + "$(CP)" build/libtool build/libtool.orig && \ sed -e s/dlname=\'\$$tdlname\'/dlname=\'\$$dlname\'/ build/libtool.orig > build/libtool touch $@ libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) libffi/dist-install/build/ffitarget.h | $$(dir $$@)/. - "$(CP)" libffi/build/include/ffi.h $@ + "$(CP)" libffi/build/*/include/ffi.h $@ libffi/dist-install/build/ffitarget.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/. - "$(CP)" libffi/build/include/ffitarget.h $@ + "$(CP)" libffi/build/*/include/ffitarget.h $@ $(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE) | libffi/dist-install/build/. $(MAKE) -C libffi/build MAKEFLAGS= - cd libffi/build && ./libtool --mode=install cp libffi.la $(TOP)/libffi/dist-install/build + cd libffi/build && ./libtool --mode=install cp */libffi.la $(TOP)/libffi/dist-install/build # We actually want both static and dllized libraries, because we build # the runtime system both ways. libffi_convenience.a is the static version. diff --git a/libffi/libffi.selinux-detection-3.0.8.patch b/libffi/libffi.selinux-detection-3.0.8.patch deleted file mode 100644 index a919f28817..0000000000 --- a/libffi/libffi.selinux-detection-3.0.8.patch +++ /dev/null @@ -1,15 +0,0 @@ -src/closures.c (selinux_enabled_check): Fix strncmp usage bug. - -http://github.com/atgreen/libffi/commit/eaf444eabc4c78703c0f98ac0197b1619c1b1bef - ---- src/closures.c -+++ src/closures.c -@@ -146,7 +146,7 @@ - p = strchr (p + 1, ' '); - if (p == NULL) - break; -- if (strncmp (p + 1, "selinuxfs ", 10) != 0) -+ if (strncmp (p + 1, "selinuxfs ", 10) == 0) - { - free (buf); - fclose (f); |