packages: glibc/glibc.spec - added ports source - enabled arm build - arm-a...
tommat
tommat at pld-linux.org
Sun Jun 27 10:58:18 CEST 2010
Author: tommat Date: Sun Jun 27 08:58:18 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added ports source
- enabled arm build
- arm-alignment-fix.patch from Fedora
---- Files affected:
packages/glibc:
glibc.spec (1.873 -> 1.874)
---- Diffs:
================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.873 packages/glibc/glibc.spec:1.874
--- packages/glibc/glibc.spec:1.873 Fri May 28 07:00:52 2010
+++ packages/glibc/glibc.spec Sun Jun 27 10:58:12 2010
@@ -41,6 +41,9 @@
# Source0: ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.bz2
# Source0-md5: 37526f1337474dffcf9cda5292957c24
+# Source1: ftp://sources.redhat.com/pub/glibc/releases/%{name}-ports-%{version}.tar.bz2
+Source1: %{name}-ports-%{version}.tar.bz2
+# Source1-md5: edbf6b9a5b9aa2c441d78343fe282c64
Source2: nscd.init
Source3: nscd.sysconfig
Source4: nscd.logrotate
@@ -73,6 +76,7 @@
Patch26: %{name}-posix-sh.patch
Patch27: %{name}-i686.patch
Patch28: %{name}-dl.patch
+Patch29: %{name}-arm-alignment-fix.patch
URL: http://www.gnu.org/software/libc/
%{?with_selinux:BuildRequires: audit-libs-devel}
BuildRequires: autoconf
@@ -92,7 +96,7 @@
BuildRequires: nss-devel >= 1:3.12.3
BuildRequires: perl-base
BuildRequires: rpm-build >= 4.3-0.20030610.28
-BuildRequires: rpmbuild(macros) >= 1.413
+BuildRequires: rpmbuild(macros) >= 1.567
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo
Requires(post): ldconfig = %{epoch}:%{version}-%{release}
@@ -118,7 +122,7 @@
Conflicts: poldek < 0.18.8-5
Conflicts: rc-scripts < 0.3.1-13
Conflicts: rpm < 4.1
-ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64
+ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# avoid -s here (ld.so must not be stripped to allow any program debugging)
@@ -139,6 +143,9 @@
%{expand:%%define __cc %{__cc} -m32}
%endif
+# Architectures supported in glibc-ports
+%define ports_arch %{arm}
+
# Xen-friendly glibc
%define specflags_ia32 -mno-tls-direct-seg-refs
%define specflags_x86_64 -mno-tls-direct-seg-refs -fasynchronous-unwind-tables
@@ -889,7 +896,8 @@
Zabawka.
%prep
-%setup -q
+%setup -q -a1
+mv %{name}-ports-%{version} ports
#%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -914,6 +922,7 @@
%patch26 -p1
%patch27 -p1
%patch28 -p1
+%patch29 -p1
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -938,6 +947,12 @@
%ifarch sparc64
CC="%{__cc} -m64 -mcpu=ultrasparc -mvis -fcall-used-g6"
%endif
+
+AddOns=nptl,libidn
+%ifarch %{ports_arch}
+AddOns=$AddOns,ports
+%endif
+
AWK="gawk" \
../%configure \
--enable-kernel="%{min_kernel}" \
@@ -945,7 +960,7 @@
--with-headers=%{_includedir} \
--with%{!?with_selinux:out}-selinux \
--with-tls \
- --enable-add-ons=nptl,libidn \
+ --enable-add-ons=$AddOns \
%if "%{pld_release}" != "ti"
--enable-nss-crypt \
%endif
@@ -1241,7 +1256,7 @@
%ifarch ppc64 s390x
%attr(755,root,root) /%{_lib}/ld64.so.1
%endif
-%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} ppc64 s390x
+%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} ppc64 s390x %{arm}
%attr(755,root,root) /%{_lib}/ld.so.1
%endif
%attr(755,root,root) /%{_lib}/libBrokenLocale-%{version}.so
@@ -1672,6 +1687,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.874 2010/06/27 08:58:12 tommat
+- added ports source
+- enabled arm build
+- arm-alignment-fix.patch from Fedora
+
Revision 1.873 2010/05/28 05:00:52 arekm
- release 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc.spec?r1=1.873&r2=1.874&f=u
More information about the pld-cvs-commit
mailing list