From 80e28e941c6d87f3c6fd2e8a4b5448fdad66d251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 18 Mar 2021 07:21:19 +0700 Subject: [PATCH] libogdf: distfiles moved, cleanup New release v2020.02 is available. --- .../patches/no-march-native-werror.patch | 25 +++++++++++++++++++ srcpkgs/libogdf/template | 19 ++++++-------- 2 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/libogdf/patches/no-march-native-werror.patch diff --git a/srcpkgs/libogdf/patches/no-march-native-werror.patch b/srcpkgs/libogdf/patches/no-march-native-werror.patch new file mode 100644 index 00000000000..bee7c0a475f --- /dev/null +++ b/srcpkgs/libogdf/patches/no-march-native-werror.patch @@ -0,0 +1,25 @@ +Index: b/cmake/compiler-specifics.cmake +=================================================================== +--- a/cmake/compiler-specifics.cmake ++++ b/cmake/compiler-specifics.cmake +@@ -12,12 +12,6 @@ if(MSVC) + set(COIN_LIBRARY_TYPE STATIC) + endif() + +-# use native arch (ie, activate things like SSE) +-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") +- # cannot use add_definitions() here because it does not work with check-sse3.cmake +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") +-endif() +- + # set default warning flags for OGDF and tests + set(available_default_warning_flags "") + set(available_default_warning_flags_debug "") +@@ -38,7 +32,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Cl + set(available_default_warning_flags_release "-Wno-error=unused-but-set-variable -Wno-error=strict-overflow") + endif() + set(available_default_warning_flags_release "${available_default_warning_flags_release} -Wno-error=unused-variable") +- set(warnings_as_errors_flag "-Werror") + elseif(MSVC) + set(available_default_warning_flags "/W3 /wd4018 /wd4068 /wd4101 /wd4244 /wd4250 /wd4267 /wd4373 /wd4800 /wd4996") + # this has to be explained because MSVC is so cryptic: diff --git a/srcpkgs/libogdf/template b/srcpkgs/libogdf/template index d9bcdd886a0..5ca0549acc5 100644 --- a/srcpkgs/libogdf/template +++ b/srcpkgs/libogdf/template @@ -5,26 +5,21 @@ revision=1 archs="i686* x86_64*" wrksrc=OGDF-snapshot build_style=cmake -configure_args="-DBUILD_SHARED_LIBS=ON -DOGDF_EXTRA_CXX_FLAGS=-Wno-error" +configure_args="-DBUILD_SHARED_LIBS=ON" hostmakedepends="unzip python" makedepends="libClp-devel" short_desc="Open Graph Drawing Framework" maintainer="nexolight " license="GPL-2.0-or-later" -homepage="http://www.ogdf.net" -distfiles="http://amber-v7.cs.tu-dortmund.de/lib/exe/fetch.php/tech:ogdf-snapshot-${version//./-}.zip" +homepage="https://ogdf.uos.de/" +distfiles="https://ogdf.uos.de/wp-content/uploads/2019/04/ogdf-snapshot-${version//./-}.zip" checksum=347c3fa8dcdbb094f9c43008cbc2934bc5a64a532af4d3fe360a5fa54488440f nocross="can't find cpuid.h headers" +patch_args=-Np1 -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="Non optional usage of broken mallinfo" ;; -esac - -pre_configure() { - # Fix upstream messing with CXXFLAGS - sed -e 's|-march=native||g' \ - -i cmake/compiler-specifics.cmake -} +if [ "$XBPS_TARGET_LIBC" = musl ]; then + broken="Non optional usage of broken mallinfo" +fi libogdf-devel_package() { short_desc+=" - development files"