Index: Makefile
===================================================================
--- Makefile (.../3.4.4-x86_32) (revision 423)
+++ Makefile (.../3.4.6-x86_32) (revision 424)
@@ -12,13 +12,13 @@
SOURCE_REQUIRES = sources/packages/l/libffi
-REQUIRES = libs/libffi/3.4.4
+REQUIRES = libs/libffi/3.4.6
REQUIRES += libs/glibc/2.40-x86_32
# ======= __END_OF_REQUIRES__ =======
-version = 3.4.4
+version = 3.4.6
tar_xz_archive = $(SRC_PACKAGE_PATH)/packages/l/libffi/libffi-$(version).tar.xz
SRC_ARCHIVE = $(tar_xz_archive)
SRC_DIR = $(TARGET_BUILD_DIR)/libffi-$(version)
@@ -39,7 +39,7 @@
# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
#
LIBFFI32_PKG_NAME = libffi-x32
-LIBFFI32_PKG_VERSION = 3.4.4
+LIBFFI32_PKG_VERSION = 3.4.6
LIBFFI32_PKG_ARCH = $(PKGARCH)
LIBFFI32_PKG_DISTRO_NAME = $(DISTRO_NAME)
LIBFFI32_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
@@ -82,6 +82,7 @@
extra_configure_switches += --disable-dependency-tracking
extra_configure_switches += --sysconfdir=/etc
extra_configure_switches += --localstatedir=/var
+
ifeq ($(__ENABLE_STATIC__),yes)
extra_configure_switches += --enable-static=yes
else
@@ -90,6 +91,11 @@
extra_configure_switches += --enable-shared=yes
+CFLAGS += -Wno-deprecated-declarations
+
+LDFLAGS += -Wl,-rpath,/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
+
+
####### Dependencies
$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
@@ -113,20 +119,20 @@
@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
@rm -rf $(LIBFFI32_PKG)/usr/include
@rm -rf $(LIBFFI32_PKG)/usr/share
- # ======= remove toolchain path from target libtool *.la files =======
+ # ======= Remove toolchain path from target libtool *.la files =======
@( cd $(LIBFFI32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
- sed -i "s,$(TARGET_DEST_DIR),,g" libffi.la \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libffi.la ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(LIBFFI32_PKG))
- # ======= tune libtool *.la search path to the target destination for development =======
+ # ======= Tune libtool *.la search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
- sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libffi.la ; \
- sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libffi.la \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libffi.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libffi.la ; \
)
- # ======= tune pkg-config *.pc search path to the target destination for development =======
+ # ======= Tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
- sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libffi.pc \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libffi.pc ; \
)
# ======= Strip binaries =======
@( cd $(LIBFFI32_PKG) ; \