diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-09-23 05:56:12 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-09-23 05:56:12 +0000 |
| commit | 04a9e7f2510aa2988b855ad6abc081801a2a96e7 (patch) | |
| tree | 4de933d693d202a02bc71988bef38520de7dd1e1 /fedora/glibc.spec.in | |
| parent | fd8e1ac720ab9bd18500a745bdd93064d33bab61 (diff) | |
Remove glibc-execstack-disable.patch patch, use glibc-nptl-check.patch
even on current fedora (GCC 3.4.*).
Diffstat (limited to 'fedora/glibc.spec.in')
| -rw-r--r-- | fedora/glibc.spec.in | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 30ee1c409c..047dc56d01 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -18,8 +18,7 @@ Source1: %{name}-fedora-%{glibcdate}.tar.bz2 Patch0: %{name}-fedora.patch Patch1: %{name}-nptl-check.patch Patch2: %{name}-ppc-assume.patch -Patch3: %{name}-execstack-disable.patch -Patch4: %{name}-ia64-lib64.patch +Patch3: %{name}-ia64-lib64.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja @@ -249,7 +248,7 @@ package or when debugging this package. %setup -q -n %{glibcsrcdir} -a1 %patch0 -p1 case "`gcc --version | head -1`" in -gcc*\ 3.3*) +gcc*\ 3.[34]*) %ifarch %{nptlarches} %patch1 -p1 %endif @@ -257,12 +256,11 @@ gcc*\ 3.3*) gcc*\ 3.2.3*) case "`uname -r`" in *.ent*|*.EL*) %patch2 -p1 -%patch3 -p1 ;; esac ;; esac %ifarch ia64 %if "%{_lib}" == "lib64" -%patch4 -p1 +%patch3 -p1 %endif %endif |