Attachment 900445 Details for Bug 1102862 – Use system zlib instead of bundled one

[patch] Use system zlib instead of bundled one

Use-system-zlib-instead-of-bundled-one.patch (text/plain), 1.82 KB, created by Ville Skyttä on 2014-05-29 17:31:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-05-29 17:31:38 UTC

Size: 1.82 KB

patch

obsolete

>From 1d2ed5d95d0ca1e0cf36f3d534f6264ea39ed1cf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Thu, 29 May 2014 20:31:09 +0300
>Subject: [PATCH] Use system zlib instead of bundled one
>
>---
> msp430-gcc.spec | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/msp430-gcc.spec b/msp430-gcc.spec
>index acd3a3d..07fa96a 100644
>--- a/msp430-gcc.spec
>+++ b/msp430-gcc.spec
>@@ -2,7 +2,7 @@
> 
> Name:		%{target}-gcc
> Version:	4.6.4
>-Release:	1%{?dist}
>+Release:	2%{?dist}
> Summary:	Cross Compiling GNU GCC targeted at %{target}
> Group:		Development/Languages
> License:	GPLv2+
>@@ -19,7 +19,7 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> # We need the uniarch variant of binutils
> # which was shipped as 2.21.1a-1 in Fedora
> BuildRequires:	%{target}-binutils >= 2.21.1a-1
>-BuildRequires:	gmp-devel, mpfr-devel, libmpc-devel
>+BuildRequires:	gmp-devel, mpfr-devel, libmpc-devel, zlib-devel
> Requires:	%{target}-binutils >= 2.21.1a-1
> Provides: 	bundled(libiberty)
> 
>@@ -32,6 +32,7 @@ platform.
> %setup -q -c -n msp430-gcc
> pushd gcc-%{version}
> %patch0 -p1
>+rm -r zlib
> popd
> 
> # Extract %%__os_install_post into os_install_post~
>@@ -61,7 +62,7 @@ cd gcc-%{version}-build
> CC="%{__cc} ${RPM_OPT_FLAGS}" ../gcc-%{version}/configure --prefix=%{_prefix} --mandir=%{_mandir} \
> 	--infodir=%{_infodir} --target=%{target} --disable-nls \
> 	--libdir=%{_libdir} --enable-version-specific-runtime-libs \
>-	--enable-languages=c
>+	--enable-languages=c --with-system-zlib
> # Building GCC-3.2.3 is not smp-safe
> make
> 
>@@ -98,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Thu May 29 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 4.6.4-2
>+- Use system zlib instead of bundled one
>+
> * Fri Dec 27 2013 Rob Spanton <rspanton@zepler.net> 4.6.4-1
> - Update to 4.6.4 to fix build
> 
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1102862: 900445