From owner-svn-ports-head@freebsd.org Wed Mar 10 14:37:09 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2992556A8F0; Wed, 10 Mar 2021 14:37:09 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DwZR90lK9z3NrV; Wed, 10 Mar 2021 14:37:09 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C8CC11209; Wed, 10 Mar 2021 14:37:09 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12AEb88n012854; Wed, 10 Mar 2021 14:37:08 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12AEb8jf012852; Wed, 10 Mar 2021 14:37:08 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202103101437.12AEb8jf012852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 10 Mar 2021 14:37:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568007 - in head/math/ogdf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/math/ogdf: . files X-SVN-Commit-Revision: 568007 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Mar 2021 14:37:09 -0000 Author: pkubaj Date: Wed Mar 10 14:37:08 2021 New Revision: 568007 URL: https://svnweb.freebsd.org/changeset/ports/568007 Log: math/ogdf: fix build on non-x86 Don't use cpuid on non-x86. Modified: head/math/ogdf/Makefile head/math/ogdf/files/patch-src_ogdf_basic_System.cpp Modified: head/math/ogdf/Makefile ============================================================================== --- head/math/ogdf/Makefile Wed Mar 10 14:29:15 2021 (r568006) +++ head/math/ogdf/Makefile Wed Mar 10 14:37:08 2021 (r568007) @@ -15,9 +15,6 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE_GPL_v2.txt LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE_GPL_v3.txt -ONLY_FOR_ARCHS= amd64 i386 -ONLY_FOR_ARCHS_REASON= fails to compile: reports "include/cpuid.h:11:2: this header is for x86 only" - CONFLICTS_INSTALL= CoinMP-[0-9]* USES= cmake compiler:c++11-lang zip Modified: head/math/ogdf/files/patch-src_ogdf_basic_System.cpp ============================================================================== --- head/math/ogdf/files/patch-src_ogdf_basic_System.cpp Wed Mar 10 14:29:15 2021 (r568006) +++ head/math/ogdf/files/patch-src_ogdf_basic_System.cpp Wed Mar 10 14:37:08 2021 (r568007) @@ -1,6 +1,6 @@ ---- src/ogdf/basic/System.cpp.orig 2015-05-29 15:36:49 UTC +--- src/ogdf/basic/System.cpp.orig 2020-02-09 22:05:19 UTC +++ src/ogdf/basic/System.cpp -@@ -52,6 +52,13 @@ +@@ -56,6 +56,13 @@ #include #include #include @@ -14,7 +14,25 @@ #elif defined(OGDF_SYSTEM_UNIX) #include #endif -@@ -308,6 +315,40 @@ size_t System::memoryUsedByProcess() +@@ -67,7 +74,7 @@ + # include + # include + #endif +-#ifdef __GNUC__ ++#if defined(__GNUC__) && (defined(__amd64__) || defined(__i386__)) + # include + #endif + +@@ -81,7 +88,7 @@ static inline void cpuid(int CPUInfo[4], int infoType) + uint32_t c = 0; + uint32_t d = 0; + +-# ifdef __GNUC__ ++#if defined(__GNUC__) && (defined(__amd64__) || defined(__i386__)) + __get_cpuid(infoType, &a, &b, &c, &d); + # endif + +@@ -289,6 +296,40 @@ size_t System::memoryUsedByProcess() return 0; } @@ -55,9 +73,9 @@ #else // LINUX, NOT MAC OS long long System::physicalMemory() -@@ -389,6 +430,19 @@ size_t System::memoryInFreelistOfMalloc( +@@ -370,6 +411,19 @@ size_t System::memoryInFreelistOfMalloc() { - return mstats().chunks_free; + return mstats().bytes_free; } + +#elif defined(OGDF_SYSTEM_FREEBSD)