[arch-commits] Commit in genxrdpattern/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Antonio Rojas]

    Date: Wednesday, June 24, 2020 @ 12:09:44
  Author: arojas
Revision: 390408

archrelease: copy trunk to extra-x86_64

Added:
  genxrdpattern/repos/extra-x86_64/PKGBUILD
    (from rev 390407, genxrdpattern/trunk/PKGBUILD)
Deleted:
  genxrdpattern/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   75 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-24 12:09:31 UTC (rev 390407)
+++ PKGBUILD	2020-06-24 12:09:44 UTC (rev 390408)
@@ -1,37 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=genxrdpattern
-pkgver=1.1
-pkgrel=1
-pkgdesc="Uses ObjCryst++ to generate a theoretical XRD pattern"
-arch=(x86_64)
-url="https://github.com/psavery/genXrdPattern"
-license=(GPL)
-depends=()
-makedepends=(cmake)
-source=($pkgname-$pkgver.tar.gz::"https://github.com/psavery/genXrdPattern/archive/$pkgver-linux.tar.gz"
-        https://github.com/psavery/genXrdPattern/releases/download/$pkgver-linux/objcryst.tgz)
-sha256sums=('9bc01dbf637d6520d8e2f5743bb1b46f8319432af5ce2d2a484a36615c1586d3'
-            '5523eae9937388260b3e491a1a11a443ab00a0961318ec92eee08f9366a0953f')
-
-prepare() {
-  mkdir -p build
-
-  sed -e 's|/user/psavery/src/objcryst/Fox/src|.|g' -i objcryst/Fox/src/Fox.dep
-}
-
-build() {
-  cd objcryst/Fox
-  make Fox-nogui shared=0 -j1
-
-  cd "$srcdir"/build
-  cmake ../genXrdPattern-$pkgver-linux \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DObjCryst_ROOT="$srcdir"/objcryst
-  make
-}
-
-package() {
-  cd build
-  install -Dm755 genXrdPattern -t "$pkgdir"/usr/bin
-}

Copied: genxrdpattern/repos/extra-x86_64/PKGBUILD (from rev 390407, genxrdpattern/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-24 12:09:44 UTC (rev 390408)
@@ -0,0 +1,38 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=genxrdpattern
+pkgver=1.1
+pkgrel=2
+pkgdesc="Uses ObjCryst++ to generate a theoretical XRD pattern"
+arch=(x86_64)
+url="https://github.com/psavery/genXrdPattern"
+license=(GPL)
+depends=(gcc-libs)
+makedepends=(cmake)
+source=($pkgname-$pkgver.tar.gz::"https://github.com/psavery/genXrdPattern/archive/$pkgver-linux.tar.gz"
+        https://github.com/psavery/genXrdPattern/releases/download/$pkgver-linux/objcryst.tgz)
+sha256sums=('9bc01dbf637d6520d8e2f5743bb1b46f8319432af5ce2d2a484a36615c1586d3'
+            '5523eae9937388260b3e491a1a11a443ab00a0961318ec92eee08f9366a0953f')
+
+prepare() {
+  sed -e 's|/user/psavery/src/objcryst/Fox/src|.|g' -i objcryst/Fox/src/Fox.dep
+  sed -e 's|-march=native||' -i objcryst/ObjCryst/*.mak # Don't use -march=native
+  sed -e 's|set(CMAKE_EXE_LINKER_FLAGS \"-static\")|set(CMAKE_EXE_LINKER_FLAGS "$ENV{LDFLAGS}")|' \
+    -i genXrdPattern-$pkgver-linux/CMakeLists.txt # Honor system LDFLAGS
+}
+
+build() {
+  cd objcryst/Fox
+  make Fox-nogui shared=0 -j1
+
+  cd "$srcdir"
+  cmake -B build -S genXrdPattern-$pkgver-linux \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DObjCryst_ROOT="$srcdir"/objcryst
+  cmake --build build
+}
+
+package() {
+  cd build
+  install -Dm755 genXrdPattern -t "$pkgdir"/usr/bin
+}