Date: Wednesday, June 24, 2020 @ 12:09:31 Author: arojas Revision: 390407
Don't use -march=native, it breaks reproducibility. Honor system LDFLAGS Modified: genxrdpattern/trunk/PKGBUILD ----------+ PKGBUILD | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-24 11:16:57 UTC (rev 390406) +++ PKGBUILD 2020-06-24 12:09:31 UTC (rev 390407) @@ -2,12 +2,12 @@ pkgname=genxrdpattern pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Uses ObjCryst++ to generate a theoretical XRD pattern" arch=(x86_64) url="https://github.com/psavery/genXrdPattern"; license=(GPL) -depends=() +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) @@ -15,9 +15,10 @@ '5523eae9937388260b3e491a1a11a443ab00a0961318ec92eee08f9366a0953f') prepare() { - mkdir -p build - 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() { @@ -24,11 +25,11 @@ cd objcryst/Fox make Fox-nogui shared=0 -j1 - cd "$srcdir"/build - cmake ../genXrdPattern-$pkgver-linux \ + cd "$srcdir" + cmake -B build -S genXrdPattern-$pkgver-linux \ -DCMAKE_INSTALL_PREFIX=/usr \ -DObjCryst_ROOT="$srcdir"/objcryst - make + cmake --build build } package() {
