Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Follow libffi update

  • Loading branch information...
commit cd39aea968581ab1d805b8b1195b8f154af9925a 1 parent 984419f
igfoo authored October 06, 2011
14  libffi/ghc.mk
@@ -105,8 +105,6 @@ $(libffi_STAMP_CONFIGURE):
105 105
 	cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP_CMD) -d | { cd libffi && $(TAR_CMD) -xf - ; }
106 106
 	mv libffi/libffi-* libffi/build
107 107
 	chmod +x libffi/ln
108  
-	# don't report nonselinux systems as selinux
109  
-	cd libffi/build && "$(PATCH_CMD)" -p0 < ../libffi.selinux-detection-3.0.8.patch
110 108
 
111 109
 # Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
112 110
 # warnings off or the compilation of libffi might fail due to warnings
@@ -125,29 +123,31 @@ $(libffi_STAMP_CONFIGURE):
125 123
 	          --enable-shared=$(libffi_EnableShared) \
126 124
 	          --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
127 125
 
  126
+	cp libffi/build/*/libtool libffi/build
  127
+
128 128
 	# libffi.so needs to be built with the correct soname.
129 129
 	# NOTE: this builds libffi_convience.so with the incorrect
130 130
 	# soname, but we don't need that anyway!
131 131
 	cd libffi && \
132  
-	  "$(CP)" build/libtool build/libtool.orig; \
  132
+	  "$(CP)" build/libtool build/libtool.orig && \
133 133
 	  sed -e s/soname_spec=.*/soname_spec="$(libffi_HS_DYN_LIB_NAME)"/ build/libtool.orig > build/libtool
134 134
 
135 135
 	# We don't want libtool's cygwin hacks
136 136
 	cd libffi && \
137  
-	  "$(CP)" build/libtool build/libtool.orig; \
  137
+	  "$(CP)" build/libtool build/libtool.orig && \
138 138
 	  sed -e s/dlname=\'\$$tdlname\'/dlname=\'\$$dlname\'/ build/libtool.orig > build/libtool
139 139
 
140 140
 	touch $@
141 141
 
142 142
 libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) libffi/dist-install/build/ffitarget.h | $$(dir $$@)/.
143  
-	"$(CP)" libffi/build/include/ffi.h $@
  143
+	"$(CP)" libffi/build/*/include/ffi.h $@
144 144
 
145 145
 libffi/dist-install/build/ffitarget.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/.
146  
-	"$(CP)" libffi/build/include/ffitarget.h $@
  146
+	"$(CP)" libffi/build/*/include/ffitarget.h $@
147 147
 
148 148
 $(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE) | libffi/dist-install/build/.
149 149
 	$(MAKE) -C libffi/build MAKEFLAGS=
150  
-	cd libffi/build && ./libtool --mode=install cp libffi.la $(TOP)/libffi/dist-install/build
  150
+	cd libffi/build && ./libtool --mode=install cp */libffi.la $(TOP)/libffi/dist-install/build
151 151
 
152 152
 	# We actually want both static and dllized libraries, because we build
153 153
 	#   the runtime system both ways. libffi_convenience.a is the static version.
15  libffi/libffi.selinux-detection-3.0.8.patch
... ...
@@ -1,15 +0,0 @@
1  
-src/closures.c (selinux_enabled_check): Fix strncmp usage bug.
2  
-
3  
-http://github.com/atgreen/libffi/commit/eaf444eabc4c78703c0f98ac0197b1619c1b1bef
4  
-
5  
---- src/closures.c
6  
-+++ src/closures.c
7  
-@@ -146,7 +146,7 @@
8  
-       p = strchr (p + 1, ' ');
9  
-       if (p == NULL)
10  
-         break;
11  
--      if (strncmp (p + 1, "selinuxfs ", 10) != 0)
12  
-+      if (strncmp (p + 1, "selinuxfs ", 10) == 0)
13  
-         {
14  
-           free (buf);
15  
-           fclose (f);

0 notes on commit cd39aea

Please sign in to comment.
Something went wrong with that request. Please try again.