audit: Move libs and all others to /usr.

[people/arne_f/ipfire-3.x.git] / glibc / glibc.nm

diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 88ceb394d49877cc3ec2f031b14f190902025fda..e5a6aa0ff8034753a30b2efaff4d72685cc65fc2 100644 (file)
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -4,8 +4,9 @@
 ###############################################################################
 
 name       = glibc
-version    = 2.14
-release    = 5
+version    = 2.15
+release    = 3
+thisapp    = %{name}-2.15-a316c1f
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
@@ -24,10 +25,10 @@ description
 end
 
 # The version of the ports addon.
-ports_version = %{version}
+ports_version = 2.15-8a70b2d
 
 source_dl  = http://ftp.gnu.org/gnu/glibc/
-sources    = %{thisapp}.tar.xz glibc-ports-%{ports_version}.tar.xz
+sources    = %{thisapp}.tar.gz glibc-ports-%{ports_version}.tar.gz
 
 build
        # Optimize glibc for kernel
@@ -41,15 +42,18 @@ build
                kernel-headers>=%{OPTIMIZED_KERNEL}
                libcap-devel
                libselinux-devel
+               nss-devel
                texinfo
        end
 
        # Build glibc with custom cflags
-       GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG -DPIC
+       GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG -fPIC -DPIC
 
        if "%{DISTRO_ARCH}" == "i686"
                GLIBC_FLAGS += -march=i686 -mtune=generic
-       elif "%{DISTRO_ARCH}" == "x86_64"
+       end
+
+       if "%{DISTRO_ARCH}" == "x86_64"
                GLIBC_FLAGS += -mtune=generic
        end
 
@@ -68,11 +72,6 @@ build
                # Apply the patches.
                %{MACRO_PATCHES}
 
-               if [ "%{DISTRO_ARCH}" = "armv5tel" ]; then
-                       sed -i configure \
-                               -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
                # unknown whether this is a bash bug or a Glibc problem. Disable
                # installation of this locale in order to avoid the problem.
@@ -149,20 +148,15 @@ build
 
        configure_options = \
                --build=%{DISTRO_BUILDTARGET} \
-               --host=%{DISTRO_BUILDTARGET} \
                --prefix=/usr \
-               --libexecdir=/usr/lib/glibc \
+               --libexecdir=%{libdir}/glibc \
                --disable-profile \
                --enable-add-ons \
                --enable-kernel=%{OPTIMIZED_KERNEL} \
                --with-selinux \
                --disable-werror \
                --enable-bind-now \
-               --enable-__thread \
-               --enable-tls \
-               --enable-experimental-malloc \
-               --with-gd \
-               --with-nss-crypt
+               --enable-nss-crypt
 
        if "%{DISTRO_ARCH}" == "armv5tel"
                # Disable hardware FP for ARM.
@@ -232,18 +226,18 @@ build
                rm -vf %{BUILDROOT}/etc/ld.so.cache
 
                # Include /usr/lib/gconv/gconv-modules.cache
-               > %{BUILDROOT}/usr/lib/gconv/gconv-modules.cache
-               chmod 644 %{BUILDROOT}/usr/lib/gconv/gconv-modules.cache
+               > %{BUILDROOT}%{libdir}/gconv/gconv-modules.cache
+               chmod 644 %{BUILDROOT}%{libdir}/gconv/gconv-modules.cache
 
-               strip -g %{BUILDROOT}/usr/lib/*.o
+               strip -g %{BUILDROOT}%{libdir}/*.o
 
                # Move some libs to correct place
-               mv -v %{BUILDROOT}/lib/lib{memusage,pcprofile}.so %{BUILDROOT}/usr/lib/
+               mv -v %{BUILDROOT}/%{lib}/lib{memusage,pcprofile}.so %{BUILDROOT}%{libdir}
        end
 
        keep_libraries
-               /usr/lib/libc_nonshared.a
-               /usr/lib/libpthread_nonshared.a
+               %{libdir}/libc_nonshared.a
+               %{libdir}/libpthread_nonshared.a
        end
 end
 
@@ -261,6 +255,7 @@ packages
                        /usr/bin
                        /usr/sbin
                        /usr/share
+                       /usr/lib/locale
                        !/usr/share/zoneinfo
                end
        end
@@ -282,7 +277,7 @@ packages
 
                requires = glibc-headers=%{thisver}
 
-               files = /usr/lib/*.a /usr/lib/*.o
+               files = %{libdir}/*.a %{libdir}/*.o
        end
 
        package glibc-headers
@@ -335,8 +330,8 @@ packages
                        /usr/bin/mtrace
                        /usr/bin/pcprofiledump
                        /usr/bin/xtrace
-                       /usr/lib/libmemusage.so
-                       /usr/lib/libpcprofile.so
+                       %{libdir}/libmemusage.so
+                       %{libdir}/libpcprofile.so
                end
        end