projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f66260
)
Fix libffi bindist
author
Clemens Fruhwirth
<clemens@endorphin.org>
Sat, 8 Nov 2008 09:47:25 +0000
(09:47 +0000)
committer
Clemens Fruhwirth
<clemens@endorphin.org>
Sat, 8 Nov 2008 09:47:25 +0000
(09:47 +0000)
libffi/Makefile
patch
|
blob
|
history
diff --git
a/libffi/Makefile
b/libffi/Makefile
index
f8651ac
..
8a1f110
100644
(file)
--- a/
libffi/Makefile
+++ b/
libffi/Makefile
@@
-56,7
+56,7
@@
PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
LIBFFI_TARBALL := $(firstword $(wildcard libffi*.tar.gz))
LIBFFI_DIR := $(subst .tar.gz,,$(LIBFFI_TARBALL))
LIBFFI_TARBALL := $(firstword $(wildcard libffi*.tar.gz))
LIBFFI_DIR := $(subst .tar.gz,,$(LIBFFI_TARBALL))
-BINDIST_STAMPS = stamp.ffi
+BINDIST_STAMPS = stamp.ffi.build stamp.ffi.configure
ifeq "$(BuildSharedLibs)" "YES"
STAMP_BUILD = stamp.ffi.build-shared
ifeq "$(BuildSharedLibs)" "YES"
STAMP_BUILD = stamp.ffi.build-shared
@@
-81,7
+81,7
@@
DYNAMIC_PROG = $(HS_DYN_LIB_NAME).a
DYNAMIC_LIBS = $(HS_DYN_LIB_NAME)
else
DYNAMIC_PROG =
DYNAMIC_LIBS = $(HS_DYN_LIB_NAME)
else
DYNAMIC_PROG =
-DYNAMIC_LIBS = libffi.so libffi.so.5 libffi.so.5.0.5
+DYNAMIC_LIBS = libffi.so libffi.so.5 libffi.so.5.0.7
endif
ifeq "$(BuildSharedLibs)" "YES"
endif
ifeq "$(BuildSharedLibs)" "YES"
@@
-141,12
+141,11
@@
ffi.h: $(STAMP_CONFIGURE)
$(STAMP_BUILD): $(STAMP_CONFIGURE)
$(MAKE) -C build MAKEFLAGS=
(cd build; ./libtool --mode=install cp libffi.la $(FPTOOLS_TOP_ABS)/libffi)
$(STAMP_BUILD): $(STAMP_CONFIGURE)
$(MAKE) -C build MAKEFLAGS=
(cd build; ./libtool --mode=install cp libffi.la $(FPTOOLS_TOP_ABS)/libffi)
+ $(CP) $(STATIC_LIB) libHSffi.a
+ $(CP) $(STATIC_LIB) libHSffi_p.a
touch $@
touch $@
-$(STATIC_LIB) $(DYNAMIC_LIBS): $(STAMP_BUILD)
-
-libHSffi.a libHSffi_p.a: $(STATIC_LIB)
- $(CP) $(STATIC_LIB) $@
+libHSffi.a libHSffi_p.a: $(STAMP_BUILD)
all :: libHSffi.a libHSffi_p.a
all :: libHSffi.a libHSffi_p.a
@@
-191,6
+190,7
@@
clean distclean maintainer-clean ::
include $(TOP)/mk/target.mk
include $(TOP)/mk/target.mk
+BINDIST_EXTRAS += package.conf.in
BINDIST_EXTRAS += $(BINDIST_STAMPS)
BINDIST_EXTRAS += $(INSTALL_PROGS)
BINDIST_EXTRAS += $(INSTALL_LIBS)
BINDIST_EXTRAS += $(BINDIST_STAMPS)
BINDIST_EXTRAS += $(INSTALL_PROGS)
BINDIST_EXTRAS += $(INSTALL_LIBS)