upgpkg: sh-elf-newlib 3.0.0.20180226-1

3 files changed, 14 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 892ddc132e00..715e3eb9db67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sh-elf-newlib
-	pkgdesc = A C standard library implementation intended for use on embedded systems (sh-elf target)
-	pkgver = 3.0.0
+	pkgdesc = A C standard library implementation intended for use on embedded systems (SuperH)
+	pkgver = 3.0.0.20180226
 	pkgrel = 1
 	url = http://www.sourceware.org/newlib/
 	arch = any
@@ -8,12 +8,8 @@ pkgbase = sh-elf-newlib
 	makedepends = sh-elf-gcc
 	options = !emptydirs
 	options = !strip
-	source = ftp://sourceware.org/pub/newlib/newlib-3.0.0.tar.gz
-	source = fix_build1.patch::https://www.sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;a=patch;h=b8272e3b8df8337744423e4dd23e727cf963d528
-	source = fix_build2.patch::https://www.sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;a=patch;h=b7e0f286a2ecab3b687ec9b3f95f5a88b9f85310
-	sha256sums = c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332
-	sha256sums = 2be98412600b8d62b4f1456e95ae4bc3b7a6810981d3fde49fad1f42df0c49da
-	sha256sums = 641978987fcfc9fc5c529192f34771db44d3257f95bc682da16e8351356177cf
+	source = ftp://sourceware.org/pub/newlib/newlib-3.0.0.20180226.tar.gz
+	sha256sums = d0b40c874c3047eccbf06fe916d3fc746bd94e8a4cd14c54381b2f72f68c5665
 
 pkgname = sh-elf-newlib
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index a8467144bd9d..b7886268249e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,21 @@
 
 _target=sh-elf
 pkgname=$_target-newlib
-pkgver=3.0.0
+pkgver=3.0.0.20180226
 pkgrel=1
 _upstream_ver=$pkgver
-pkgdesc="A C standard library implementation intended for use on embedded systems ($_target target)"
+pkgdesc="A C standard library implementation intended for use on embedded systems (SuperH)"
 arch=(any)
 url='http://www.sourceware.org/newlib/'
 license=(BSD)
 makedepends=($_target-gcc)
 options=(!emptydirs !strip)
-source=(ftp://sourceware.org/pub/newlib/newlib-$_upstream_ver.tar.gz
-        fix_build1.patch::'https://www.sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;a=patch;h=b8272e3b8df8337744423e4dd23e727cf963d528'
-        fix_build2.patch::'https://www.sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;a=patch;h=b7e0f286a2ecab3b687ec9b3f95f5a88b9f85310')
-sha256sums=('c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332'
-            '2be98412600b8d62b4f1456e95ae4bc3b7a6810981d3fde49fad1f42df0c49da'
-            '641978987fcfc9fc5c529192f34771db44d3257f95bc682da16e8351356177cf')
-
-prepare() {
-  cd newlib-$_upstream_ver
-  patch -p1 < ../fix_build1.patch
-  patch -p1 < ../fix_build2.patch
-}
+source=(ftp://sourceware.org/pub/newlib/newlib-$_upstream_ver.tar.gz)
+sha256sums=('d0b40c874c3047eccbf06fe916d3fc746bd94e8a4cd14c54381b2f72f68c5665')
 
 build() {
-  rm -rf build-{newlib,nano}
-  mkdir build-{newlib,nano}
+  rm -rf build-newlib
+  mkdir build-newlib
 
   export CFLAGS_FOR_TARGET='-g -O2 -ffunction-sections -fdata-sections'
   cd "$srcdir"/build-newlib
@@ -39,30 +29,9 @@ build() {
     --enable-newlib-register-fini
   make
 
-  export CFLAGS_FOR_TARGET='-g -Os -ffunction-sections -fdata-sections'
-  cd "$srcdir"/build-nano
-  ../newlib-$_upstream_ver/configure \
-    --target=$_target \
-    --prefix=/usr \
-    --disable-newlib-supplied-syscalls \
-    --disable-nls \
-    --enable-newlib-reent-small           \
-    --disable-newlib-fvwrite-in-streamio  \
-    --disable-newlib-fseek-optimization   \
-    --disable-newlib-wide-orient          \
-    --enable-newlib-nano-malloc           \
-    --disable-newlib-unbuf-stream-opt     \
-    --enable-lite-exit                    \
-    --enable-newlib-global-atexit         \
-    --enable-newlib-nano-formatted-io
-  make
 }
 
 package() {
-  cd "$srcdir"/build-nano
-  make DESTDIR="$pkgdir" install -j1
-  find "$pkgdir" -regex ".*/lib\(c\|g\|rdimon\)\.a" -exec rename .a _nano.a '{}' \;
-
   cd "$srcdir"/build-newlib
   make DESTDIR="$pkgdir" install -j1