summaryrefslogtreecommitdiff
path: root/fedora/glibc.spec.in
diff options
context:
space:
mode:
Diffstat (limited to 'fedora/glibc.spec.in')
-rw-r--r--fedora/glibc.spec.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index fdba96fb9c..f0950d992a 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -30,7 +30,8 @@ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System Environment/Libraries
URL: http://www.gnu.org/software/glibc/
Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2
-Source1: %{glibcsrcdir}-fedora.tar.bz2
+Source1: %{?glibc_release_url}%{glibcportsdir}.tar.bz2
+Source2: %{glibcsrcdir}-fedora.tar.bz2
Patch0: %{name}-fedora.patch
Patch1: %{name}-ia64-lib64.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -236,7 +237,8 @@ package or when debugging this package.
%endif
%prep
-%setup -q -n %{glibcsrcdir} -b1
+rm -rf %{glibcportsdir}
+%setup -q -n %{glibcsrcdir} -b1 -b2
%patch0 -E -p1
%ifarch ia64
%if "%{_lib}" == "lib64"
@@ -338,8 +340,8 @@ mkdir $builddir ; cd $builddir
build_CFLAGS="$BuildFlags -g -O3 $*"
../configure CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" \
--prefix=%{_prefix} \
- --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \
- --with-headers=%{_prefix}/include --enable-bind-now \
+ --enable-add-ons=../%{glibcportsdir},nptl$AddOns \
+ --with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
--host %{nptl_target_cpu}-redhat-linux \
%ifarch %{multiarcharches}