Merge branch 'master' into kernel-4.9

[people/pmueller/ipfire-2.x.git] / lfs / gmp

diff --git a/lfs/gmp b/lfs/gmp
index 5ac0eb8c9df7480c925b657a28d050c6bfa4fa5a..8dc9b73509cd69cc28dd775ef5f2b93ea591d146 100644 (file)
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.1.0
+VER        = 6.1.2
 
 THISAPP    = gmp-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE)" "i586"
+ifeq "$(BUILD_ARCH)" "i586"
        CONFIGURE_ARGS = ABI=32
-       BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET))
+       BUILDTARGET_PENTIUM4 = $(patsubst $(BUILD_ARCH)-%,pentium4-%,$(BUILDTARGET))
 endif
 
 CONFIGURE_OPTIONS = \
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a9868ef2556ad6a2909babcd1428f3c7
+$(DL_FILE)_MD5 = f58fa8001d60c4c77595fbbb62b63c1d
 
 install : $(TARGET)
 
@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
-ifeq "$(MACHINE)" "i586"
+ifeq "$(BUILD_ARCH)" "i586"
        # Build SSE/SSE2 optimised version for x86
        cd $(DIR_APP) && make clean
        cd $(DIR_APP) && \
@@ -102,7 +102,7 @@ ifeq "$(MACHINE)" "i586"
        cd $(DIR_APP) && make $(MAKETUNING)
 
        -mkdir -pv /usr/lib/sse2
-       cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.3.0 /usr/lib/sse2
+       cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.3.2 /usr/lib/sse2
 endif
 
        @rm -rf $(DIR_APP)