diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | settings.cmake | 5 |
3 files changed, 5 insertions, 23 deletions
@@ -35,14 +35,6 @@ pkgbase = root source = root.xml source = rootd source = settings.cmake - md5sums = 4308449892210c8d36e36924261fea26 - md5sums = f36f7bff97ed7232d8534c2ef166b2bf - md5sums = 5a4a67f59d553cf86d5b09fdfb204352 - md5sums = 464eae7414433aa684cf9017204267cb - md5sums = 0e883ad44f99da9bc7c23bc102800b62 - md5sums = e2cf69b204192b5889ceb5b4dedc66f7 - md5sums = f973e17f573f0f313395d34d2e82eeb6 - md5sums = 168175a1685c408ffd02020520b1074e sha256sums = 0a7d702a130a260c72cb6ea754359eaee49a8c4531b31f23de0bfcafe3ce466b sha256sums = 437ed0fb2c46d5ca8e37cc689f87dfe12429f6a243d4e5cf2d395a177de7e90f sha256sums = e03fff4accf7cee4e7329b305f1e0df7bf804dbced08d52566af789bc77ea0b0 @@ -50,7 +42,7 @@ pkgbase = root sha256sums = 71ed39f7e5a605a6a02e3d0ba79c997b8e7f02551898c27112eb78f07d9d8244 sha256sums = b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32 sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a - sha256sums = 077c7651f51c56ba02c0aa61bb4aa99fdc11c30e5e565072b652eb028f387814 + sha256sums = 4199f01443e78b6fb98f09488434b4cba827995a2cfb18d654c03920fc3984c3 pkgname = root @@ -42,14 +42,6 @@ source=("https://root.cern.ch/download/root_v${pkgver}.source.tar.gz" 'root.xml' 'rootd' 'settings.cmake') -md5sums=('4308449892210c8d36e36924261fea26' - 'f36f7bff97ed7232d8534c2ef166b2bf' - '5a4a67f59d553cf86d5b09fdfb204352' - '464eae7414433aa684cf9017204267cb' - '0e883ad44f99da9bc7c23bc102800b62' - 'e2cf69b204192b5889ceb5b4dedc66f7' - 'f973e17f573f0f313395d34d2e82eeb6' - '168175a1685c408ffd02020520b1074e') sha256sums=('0a7d702a130a260c72cb6ea754359eaee49a8c4531b31f23de0bfcafe3ce466b' '437ed0fb2c46d5ca8e37cc689f87dfe12429f6a243d4e5cf2d395a177de7e90f' 'e03fff4accf7cee4e7329b305f1e0df7bf804dbced08d52566af789bc77ea0b0' @@ -57,7 +49,7 @@ sha256sums=('0a7d702a130a260c72cb6ea754359eaee49a8c4531b31f23de0bfcafe3ce466b' '71ed39f7e5a605a6a02e3d0ba79c997b8e7f02551898c27112eb78f07d9d8244' 'b103d46705883590d9e07aafb890ec1150f63dc2ca5f40d67e6ebef49a6d0a32' '3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a' - '077c7651f51c56ba02c0aa61bb4aa99fdc11c30e5e565072b652eb028f387814') + '4199f01443e78b6fb98f09488434b4cba827995a2cfb18d654c03920fc3984c3') prepare(){ ## https://sft.its.cern.ch/jira/browse/ROOT-6924 cd ${pkgname}-${pkgver} @@ -76,6 +68,9 @@ build() { [ -d ${srcdir}/build ] || mkdir ${srcdir}/build cd ${srcdir}/build + CFLAGS="${CFLAGS} -pthread" \ + CXXFLAGS="${CXXFLAGS} -pthread -D_GLIBCXX_USE_CXX11_ABI=0" \ + LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \ cmake -C ${srcdir}/settings.cmake ${srcdir}/${pkgname}-${pkgver} make ${MAKEFLAGS} diff --git a/settings.cmake b/settings.cmake index 9b268aaa3726..69f0e6b99a54 100644 --- a/settings.cmake +++ b/settings.cmake @@ -1,9 +1,4 @@ set (CMAKE_BUILD_TYPE Release CACHE STRING "" FORCE) -set (CMAKE_C_FLAGS "-pthread -pipe -fstack-protector-strong -O2 -march=native -mtune=native" CACHE STRING "" FORCE) -set (CMAKE_CXX_FLAGS "-D_GLIBCXX_USE_CXX11_ABI=0 -pthread -pipe -fstack-protector-strong -O2 -march=native -mtune=native" CACHE STRING "" FORCE) -set (CMAKE_EXE_LINKER_FLAGS "-pthread -Wl,-O1,--sort-common,--as-needed,-z,relro -Wl,--no-undefined" CACHE STRING "" FORCE) -set (CMAKE_MODULE_LINKER_FLAGS "-pthread -Wl,-O1,--sort-common,--as-needed,-z,relro -Wl,--no-undefined" CACHE STRING "" FORCE) -set (CMAKE_SHARED_LINKER_FLAGS "-pthread -Wl,-O1,--sort-common,--as-needed,-z,relro -Wl,--no-undefined" CACHE STRING "" FORCE) set (BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) # this option is currently incompatible set (CMAKE_INSTALL_PREFIX /usr CACHE PATH "" FORCE) set (CMAKE_INSTALL_SYSCONFDIR /etc CACHE PATH "" FORCE) |