[arch-commits] Commit in llvm13/trunk (PKGBUILD)

2022-07-03 Thread Evangelos Foutras via arch-commits
Date: Monday, July 4, 2022 @ 05:55:52
  Author: foutrelis
Revision: 449852

upgpkg: llvm13 13.0.1-3: move LLVMgold.so to *-libs

It is passed to ld as a plugin when building with -flto.

Modified:
  llvm13/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-07-03 20:13:45 UTC (rev 449851)
+++ PKGBUILD2022-07-04 05:55:52 UTC (rev 449852)
@@ -3,7 +3,7 @@
 
 pkgname=('llvm13' 'llvm13-libs')
 pkgver=13.0.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="https://llvm.org/;
 license=('custom:Apache 2.0 with LLVM Exception')
@@ -82,8 +82,9 @@
 
   DESTDIR="$pkgdir" ninja install
 
-  # The runtime library goes into llvm13-libs
+  # The runtime libraries go into llvm13-libs
   mv -f "$pkgdir"/usr/lib/llvm13/lib/libLLVM-{13,$pkgver}.so "$srcdir/"
+  mv -f "$pkgdir"/usr/lib/llvm13/lib/LLVMgold.so "$srcdir/"
 
   install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
@@ -96,6 +97,7 @@
   cp -P "$srcdir"/libLLVM-{13,$pkgver}.so "$pkgdir/usr/lib/"
   ln -s ../../libLLVM-13.so "$pkgdir/usr/lib/llvm13/lib/libLLVM-13.so"
   ln -s ../../libLLVM-13.so "$pkgdir/usr/lib/llvm13/lib/libLLVM-$pkgver.so"
+  cp -P "$srcdir"/LLVMgold.so "$pkgdir/usr/lib/llvm13/lib/"
 
   install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
 "$pkgdir/usr/share/licenses/$pkgname/LICENSE"



[arch-commits] Commit in llvm13/trunk (PKGBUILD)

2022-06-22 Thread Evangelos Foutras via arch-commits
Date: Wednesday, June 22, 2022 @ 21:49:44
  Author: foutrelis
Revision: 449339

upgpkg: llvm13 13.0.1-2: remove ld.so.conf.d config

Also move libLLVM-13*.so to /usr/lib/.

Modified:
  llvm13/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-06-22 20:54:49 UTC (rev 449338)
+++ PKGBUILD2022-06-22 21:49:44 UTC (rev 449339)
@@ -3,7 +3,7 @@
 
 pkgname=('llvm13' 'llvm13-libs')
 pkgver=13.0.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://llvm.org/;
 license=('custom:Apache 2.0 with LLVM Exception')
@@ -83,9 +83,8 @@
 
   DESTDIR="$pkgdir" ninja install
 
-  # The runtime libraries go into llvm13-libs
-  mv -f "$pkgdir"/usr/lib/llvm13/lib/lib{LLVM,LTO,Remarks}*.so* "$srcdir"
-  mv -f "$pkgdir"/usr/lib/llvm13/lib/LLVMgold.so "$srcdir"
+  # The runtime library goes into llvm13-libs
+  mv -f "$pkgdir"/usr/lib/llvm13/lib/libLLVM-{13,$pkgver}.so "$srcdir/"
 
   install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
@@ -95,14 +94,10 @@
   depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2')
 
   install -d "$pkgdir/usr/lib/llvm13/lib"
-  cp -P \
-"$srcdir"/lib{LLVM,LTO,Remarks}*.so* \
-"$srcdir"/LLVMgold.so \
-"$pkgdir/usr/lib/llvm13/lib/"
+  cp -P "$srcdir"/libLLVM-{13,$pkgver}.so "$pkgdir/usr/lib/"
+  ln -s ../../libLLVM-13.so "$pkgdir/usr/lib/llvm13/lib/libLLVM-13.so"
+  ln -s ../../libLLVM-13.so "$pkgdir/usr/lib/llvm13/lib/libLLVM-$pkgver.so"
 
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo /usr/lib/llvm13/lib >"$pkgdir/etc/ld.so.conf.d/llvm13.conf"
-
   install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
 "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }