]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
glibc: Fix patching the ports addon.
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 1 Dec 2011 11:02:53 +0000 (12:02 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 1 Dec 2011 11:02:53 +0000 (12:02 +0100)
glibc/glibc.nm

index 626bc5b40593f046d961b36cce3a37a86e70f307..6d5d5bcca497bcb19438ad24d3a5340a041322b4 100644 (file)
@@ -7,7 +7,7 @@
 
 name       = glibc
 version    = 2.14
-release    = 4
+release    = 5
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
@@ -60,12 +60,19 @@ build
 
        export QUALITY_AGENT_RPATH_ALLOW_ORIGIN=yes
 
-       prepare_cmds
+       prepare
+               # Extract source tarballs.
+               %{MACRO_EXTRACT_TARBALL}
+
+               # Create link for ports addon.
                ln -svf ../glibc-ports-%{ports_version} ports
 
+               # Apply the patches.
+               %{MACRO_PATCHES}
+
                if [ "%{DISTRO_ARCH}" = "armv5tel" ]; then
                        sed -i configure \
-                               "s/libc_cv_gcc_static_libgcc=-static-libgcc/libc_cv_gcc_static_libgcc=/"
+                               -e "s/libc_cv_gcc_static_libgcc=-static-libgcc/libc_cv_gcc_static_libgcc=/"
                fi
 
                # In the vi_VN.TCVN locale, bash enters an infinite loop at startup. It is