summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-07-03 23:20:22 +0200
committerbartus2020-07-04 02:42:24 +0200
commitc36583a276075a7082a32713f558105e8375c752 (patch)
tree3a82c86733540dfa7270640bc6653dee51122326
parent2cddb882736232eb66f086af4d9276a3007c4f76 (diff)
downloadaur-c36583a276075a7082a32713f558105e8375c752.tar.gz
Fix ChronoEngine_fsi legacy fea library linker flag.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
-rw-r--r--fsi.patch17
3 files changed, 23 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 70f3a87afce..13091efae2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -41,11 +41,13 @@ pkgbase = chronoengine
source = git+https://github.com/google/googletest.git
source = chronoengine.sh
source = glm.patch
+ source = fsi.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 0fe883cfcc1db869d08235482a3801fa458db15360e0eefac9084c7f2993af4a
sha256sums = 4e8ed0097fb14bbe437c2a57e9ef1852fdbfe8675e5345b0af42287d24fbfefe
+ sha256sums = 30b72d0004f784950ef8496a10cc491de8d98a855c6db97ac8fe2e73d01c1579
pkgname = chronoengine
diff --git a/PKGBUILD b/PKGBUILD
index 3c37fa7e2d9..33f202f9c59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,12 +35,14 @@ source=("${pkgname}::git+https://github.com/projectchrono/chrono.git${_fragment}
"git+https://github.com/google/googletest.git"
"chronoengine.sh"
"glm.patch"
+ "fsi.patch"
)
sha256sums=('SKIP'
'SKIP'
'SKIP'
'0fe883cfcc1db869d08235482a3801fa458db15360e0eefac9084c7f2993af4a'
- '4e8ed0097fb14bbe437c2a57e9ef1852fdbfe8675e5345b0af42287d24fbfefe')
+ '4e8ed0097fb14bbe437c2a57e9ef1852fdbfe8675e5345b0af42287d24fbfefe'
+ '30b72d0004f784950ef8496a10cc491de8d98a855c6db97ac8fe2e73d01c1579')
CMAKE_FLAGS=( -DENABLE_MODULE_POSTPROCESS=ON
-DENABLE_HDF5=ON
@@ -73,6 +75,7 @@ prepare() {
sed -i 's/lib64/lib/' "${files[@]}"
sed -i 's|share/chrono/bin|bin/chronoengine|' CMakeLists.txt
git apply -v "${srcdir}"/glm.patch
+ git apply -v "${srcdir}"/fsi.patch
}
build() {
diff --git a/fsi.patch b/fsi.patch
new file mode 100644
index 00000000000..7870f7152f3
--- /dev/null
+++ b/fsi.patch
@@ -0,0 +1,17 @@
+diff --git a/src/chrono_fsi/CMakeLists.txt b/src/chrono_fsi/CMakeLists.txt
+index c31c1671f..376920c66 100644
+--- a/src/chrono_fsi/CMakeLists.txt
++++ b/src/chrono_fsi/CMakeLists.txt
+@@ -167,12 +167,6 @@ if(ENABLE_MODULE_PARALLEL)
+ list(APPEND LIBRARIES ChronoEngine_parallel)
+ endif()
+
+-if(ENABLE_MODULE_FEA)
+- set(CXX_FLAGS ${CH_FEA_CXX_FLAGS})
+- include_directories(${CH_FEA_INCLUDES})
+- list(APPEND LIBRARIES ChronoEngine_fea)
+-endif()
+-
+ if(ENABLE_MODULE_VEHICLE)
+ include_directories(${CH_VEHICLE_INCLUDES})
+ list(APPEND LIBRARIES ChronoEngine_vehicle)