[avr-libc/f19] use more atmel's patches to support more MCUs (#972384)
Michal Hlavinka
mhlavink at fedoraproject.org
Tue Jun 25 21:46:46 UTC 2013
commit 961c8919203d6d3ed45feb4fbc0dd88a5b103879
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Tue Jun 25 23:46:35 2013 +0200
use more atmel's patches to support more MCUs (#972384)
.gitignore | 2 ++
avr-libc.spec | 26 ++++++++++++++++++++------
sources | 2 ++
3 files changed, 24 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47c18ef..99aca86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ avr-libc-user-manual-1.7.0.tar.bz2
/avr-libc-manpages-1.8.0.tar.bz2
/avr-libc-user-manual-1.8.0.pdf.bz2
/avr-libc-user-manual-1.8.0.tar.bz2
+/avr-headers-6.1.3.1475.zip
+/avr-patches.tar.gz
diff --git a/avr-libc.spec b/avr-libc.spec
index 237cdca..87b5eb2 100644
--- a/avr-libc.spec
+++ b/avr-libc.spec
@@ -7,7 +7,7 @@
Name: avr-libc
Version: 1.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: C library for use with GCC on Atmel AVR microcontrollers
Group: Development/Tools
License: BSD
@@ -17,6 +17,8 @@ Source1: http://download.savannah.gnu.org/releases/avr-libc/avr-libc-manp
Source2: http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.tar.bz2
Source3: http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%{version}.pdf.bz2
Patch0: avr-libc-1.6.4-documentation.patch
+Source4: http://distribute.atmel.no/tools/opensource/Atmel-AVR-Toolchain-3.4.2/avr/avr-patches.tar.gz
+Source5: http://distribute.atmel.no/tools/opensource/Atmel-AVR-Toolchain-3.4.2/avr/avr-headers-6.1.3.1475.zip
BuildRequires: avr-gcc, autoconf, automake, libtool
BuildArch: noarch
@@ -44,8 +46,19 @@ access these).
%prep
-%setup -q -a 1
+%setup -q -a 1 -a 4 -a 5
%patch0 -p0
+I=0
+for f in avr-patches/avr-libc/*.patch
+do
+ echo $f
+ patch -p0 <$f
+done
+for i in ./avr-headers//io[0-9a-zA-Z]*.h
+do
+ cp $i include/avr/ -v
+done
+
# Add html docs
mkdir html
@@ -68,7 +81,8 @@ sed -i 's|@DOC_INST_DIR@/man|%{_prefix}/avr/share/man|' scripts/avr-man.in
%build
-autoreconf -fiv # required for aarch64 support, not needed since autotools 2.69+
+./bootstrap
+#autoreconf -fiv # required for aarch64 support, not needed since autotools 2.69+
# The ps doc ways in at 7Mb versus 2.5 for the pdf and has little added value
./configure --prefix=%{_prefix} --host=avr --build=`./config.guess` #--enable-doc
# don't use %{?_smp_mflags}, it breaks the build
@@ -121,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
%doc pdf/*
%changelog
+* Tue Jun 25 2013 Michal Hlavinka <mhlavink at redhat.com> - 1.8.0-5
+- use more atmel's patches to support more MCUs (#972384)
+
* Wed Mar 27 2013 Michal Hlavinka <mhlavink at redhat.com> - 1.8.0-4
- fix aarch64 support (#925065)
@@ -162,9 +179,6 @@ rm -rf $RPM_BUILD_ROOT
* Wed Nov 25 2009 Thibault North <tnorth AT fedoraproject DOT org> 1.6.5-1
- Updated to 1.6.7
-* Fri Nov 20 2009 Thibault North <tnorth AT fedoraproject DOT org> 1.6.5-1
-- New upstream release
-
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index ec986a9..1693e41 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,5 @@
35af895d775015731b77d027a9e07cca avr-libc-manpages-1.8.0.tar.bz2
dbdc7b66262f930c82f8ebf94e15f225 avr-libc-user-manual-1.8.0.pdf.bz2
d8a02a987cc0ea447348e0b6a08ab679 avr-libc-user-manual-1.8.0.tar.bz2
+07eecfb18f90a859593758b34186863c avr-headers-6.1.3.1475.zip
+cebd8222af9bec2941a930db1a5da917 avr-patches.tar.gz
More information about the scm-commits
mailing list