[arch-commits] Commit in musl/trunk (2 files)

[Eli Schwartz]

    Date: Tuesday, April 16, 2019 @ 00:53:34
  Author: eschwartz
Revision: 451743

upgpkg: musl 1.1.22-1

upstream release

Modified:
  musl/trunk/PKGBUILD
Deleted:
  musl/trunk/fix-musl-gcc-wrapper-with-default-pie-gcc.patch

-------------------------------------------------+
 PKGBUILD                                        |   20 ++---------
 fix-musl-gcc-wrapper-with-default-pie-gcc.patch |   37 ----------------------
 2 files changed, 5 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-16 00:05:15 UTC (rev 451742)
+++ PKGBUILD	2019-04-16 00:53:34 UTC (rev 451743)
@@ -2,7 +2,7 @@
 # Contributor: TJ Vanderpoel <tj at rubyists>
 
 pkgname=musl
-pkgver=1.1.21
+pkgver=1.1.22
 pkgrel=1
 pkgdesc='Lightweight implementation of C standard library'
 arch=('x86_64')
@@ -10,21 +10,15 @@
 license=('MIT')
 options=('staticlibs' '!buildflags')
 validpgpkeys=('836489290BB6B70F99FFDA0556BCDB593020450F')
-source=(https://www.musl-libc.org/releases/musl-$pkgver.tar.gz{,.asc}
-        fix-musl-gcc-wrapper-with-default-pie-gcc.patch)
-sha256sums=('c742b66f6f49c9e5f52f64d8b79fecb5a0f6e0203fca176c70ca20f6be285f44'
-            'SKIP'
-            'bd5d147ecebb694f0fd3bbe8d282006d978c8c3c0848f3243b0d754b6c08dc60')
+source=(https://www.musl-libc.org/releases/musl-$pkgver.tar.gz{,.asc})
+sha256sums=('8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3'
+            'SKIP')
 
-prepare() {
-  cd $pkgname-$pkgver
-#  patch -Np1 -i ../fix-musl-gcc-wrapper-with-default-pie-gcc.patch
-}
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr/lib/musl \
     --exec-prefix=/usr \
+    --syslibdir=/usr/lib \
     --enable-wrapper=all
   make
 }
@@ -33,10 +27,6 @@
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
-  install -dm755 "$pkgdir"/usr/lib/
-  mv "$pkgdir"/lib/ld-musl*.so* "$pkgdir"/usr/lib/
-  rmdir "$pkgdir"/lib
-
   install -Dm0644 README "$pkgdir"/usr/share/doc/musl/README
   install -Dm0644 COPYRIGHT "$pkgdir"/usr/share/licenses/musl/COPYRIGHT
 }

Deleted: fix-musl-gcc-wrapper-with-default-pie-gcc.patch
===================================================================
--- fix-musl-gcc-wrapper-with-default-pie-gcc.patch	2019-04-16 00:05:15 UTC (rev 451742)
+++ fix-musl-gcc-wrapper-with-default-pie-gcc.patch	2019-04-16 00:53:34 UTC (rev 451743)
@@ -1,37 +0,0 @@
-From 7dad9c212587267818de919dd9c5886f18f99779 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias at aerifal.cx>
-Date: Thu, 2 Aug 2018 19:15:48 -0400
-Subject: fix musl-gcc wrapper to be compatible with default-pie gcc toolchains
-
-the specfile for the wrapper was written assuming output is pie only
-if -pie appears on the command line. recent (and older patched)
-versions of gcc can be configured to produce pie output by default,
-adn when used with such a toolchain, the wrapper linked the wrong
-startfiles (crt*) containing pic-incompatible code.
-
-rather than trying to figure out gcc's default, simply always use the
-pic-compatible start files.
----
- tools/musl-gcc.specs.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/musl-gcc.specs.sh b/tools/musl-gcc.specs.sh
-index 294e24f7..30492574 100644
---- a/tools/musl-gcc.specs.sh
-+++ b/tools/musl-gcc.specs.sh
-@@ -17,10 +17,10 @@ cat <<EOF
- libgcc.a%s %:if-exists(libgcc_eh.a%s)
- 
- *startfile:
--%{!shared: $libdir/%{pie:S}crt1.o} $libdir/crti.o %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}
-+%{!shared: $libdir/Scrt1.o} $libdir/crti.o crtbeginS.o%s
- 
- *endfile:
--%{shared|pie:crtendS.o%s;:crtend.o%s} $libdir/crtn.o
-+crtendS.o%s $libdir/crtn.o
- 
- *link:
- -dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} %{rdynamic:-export-dynamic}
--- 
-cgit v1.2.1
-