X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgmp;h=4d55e4f76253c29e675e6a8cfdf17a42ae6890ab;hb=2723ef8721862b9d9565346bae8115773123e53e;hp=5ac0eb8c9df7480c925b657a28d050c6bfa4fa5a;hpb=046894ab7fbe281c24e460ac48841e8d5e9f5328;p=ipfire-2.x.git diff --git a/lfs/gmp b/lfs/gmp index 5ac0eb8c9d..4d55e4f762 100644 --- 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,16 +32,14 @@ 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 = \ --prefix=/usr \ - --enable-cxx \ - --enable-mpbsd \ - --disable-nls + --enable-cxx ############################################################################### # Top-level Rules @@ -51,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a9868ef2556ad6a2909babcd1428f3c7 +$(DL_FILE)_MD5 = f58fa8001d60c4c77595fbbb62b63c1d install : $(TARGET) @@ -89,7 +87,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 +100,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)