gmp: Update to 6.2.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/gmp/gmp.nm b/gmp/gmp.nm
index 144a8fadd1c59a1f6e42e4583bdee01f6e0c6547..4b72d27a06a95f584ee8e5a67e42e5ce3129b3ce 100644 (file)
--- a/gmp/gmp.nm
+++ b/gmp/gmp.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = gmp
-version    = 6.2.0
+version    = 6.2.1
 release    = 1
 
 groups     = System/Libraries
-url        = http://gmplib.org/
+url        = https://gmplib.org/
 license    = LGPLv3+
 summary    = A GNU arbitrary precision library.
 
@@ -31,110 +31,19 @@ build
                m4
        end
 
-       # Build different versions of gmp to enhance the speed
-       # of the OS.
-       build_versions = base
-
        export ABI = standard
 
        if "%{DISTRO_ARCH}" == "x86_64"
                ABI = 64
        end
 
-       if "%{DISTRO_ARCH}" == "i686"
-               # Build sse2 enabled version of gmp.
-               build_versions += sse2
-
-               ABI = 32
-       end
-
        configure_options += \
                --enable-cxx \
                --enable-mpbsd \
                --disable-static
 
-       if "%{DISTRO_ARCH}" == "armv7hl"
-               # GMP cannot be built with THUMB support.
-               CFLAGS   := %(echo "%{CFLAGS}"   | sed -e "s/-mthumb//g")
-               CXXFLAGS := %(echo "%{CXXFLAGS}" | sed -e "s/-mthumb//g")
-       end
-
-       prepare_cmds
-               for version in %{build_versions}; do
-                       mkdir -p build-${version}
-
-                       cd build-${version}
-                       ln -svf ../configure .
-                       cd ..
-               done
-       end
-
-       build_one
-               ./configure \
-                       %{configure_options}
-
-               # Kill RPATHs.
-               sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-                       -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-                       -e 's|-lstdc++ -lm|-lstdc++|' \
-                       -i libtool
-
-               export LD_LIBRARY_PATH=$(pwd)/.libs
-               make %{PARALLELISMFLAGS} \
-                       CFLAGS="${CFLAGS}" \
-                       CXXFLAGS="${CXXFLAGS}"
-       end
-
-       build
-               for version in %{build_versions}; do
-                       cd build-${version}
-
-                       CFLAGS="%{CFLAGS}"
-                       CXXFLAGS="%{CXXFLAGS}"
-                       if [ "${version}" = "sse2" ]; then
-                               # Enable sse2.
-                               CFLAGS="%{CFLAGS} -march=pentium4"
-                               CXXFLAGS="%{CXXFLAGS} -march=pentium4"
-                       fi
-
-                       %{build_one}
-
-                       cd ..
-               done
-       end
-
        test
-               for version in %{build_versions}; do
-                       cd build-${version}
-
-                       export LD_LIBRARY_PATH=$(pwd)/.libs
-                       make check
-
-                       cd ..
-               done
-       end
-
-       install
-               for version in %{build_versions}; do
-                       cd build-${version}
-
-                       if [ "${version}" = "sse2" ]; then
-                               # Manually install sse2 libs.
-                               mkdir -pv %{BUILDROOT}/usr/lib/sse2
-
-                               install -m 755 .libs/libgmp.so.*.* %{BUILDROOT}/usr/lib/sse2
-                               cp -a .libs/libgmp.so.[^.]* %{BUILDROOT}/usr/lib/sse2
-                               chmod 755 %{BUILDROOT}/usr/lib/sse2/libgmp.so.[^.]*
-
-                               install -m 755 .libs/libgmpxx.so.*.* %{BUILDROOT}/usr/lib/sse2
-                               cp -a .libs/libgmpxx.so.? %{BUILDROOT}/usr/lib/sse2
-                               chmod 755 %{BUILDROOT}/usr/lib/sse2/libgmpxx.so.?
-                       else
-                               make install DESTDIR="%{BUILDROOT}"
-                       fi
-
-                       cd ..
-               done
+               LD_LIBRARY_PATH=%{DIR_APP}/.libs make check
        end
 end