Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Apr 2016 15:13:53 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412748 - head/math/pdal/files
Message-ID:  <201604081513.u38FDrkB059312@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Fri Apr  8 15:13:53 2016
New Revision: 412748
URL: https://svnweb.freebsd.org/changeset/ports/412748

Log:
  math/pdal: Fix macro check and restore DragonFly support
  
  Add __DragonFly__ definition check in two places to restore the build
  on DF.  While here, change __FreeBSD__ value check to existance check
  which was the intent I believe (although result is the same).
  
  Approved by:	Restore DF functionality blanket

Modified:
  head/math/pdal/files/patch-src_PluginManager.cpp
  head/math/pdal/files/patch-vendor_gtest-1.7.0_include_gtest_internal_gtest-port.h

Modified: head/math/pdal/files/patch-src_PluginManager.cpp
==============================================================================
--- head/math/pdal/files/patch-src_PluginManager.cpp	Fri Apr  8 13:33:49 2016	(r412747)
+++ head/math/pdal/files/patch-src_PluginManager.cpp	Fri Apr  8 15:13:53 2016	(r412748)
@@ -5,7 +5,7 @@
  #if defined(__APPLE__) && defined(__MACH__)
      const std::string dynamicLibraryExtension(".dylib");
 -#elif defined __linux__
-+#elif defined __linux__ || __FreeBSD__
++#elif defined __linux__ || defined __FreeBSD__ || defined __DragonFly__
      const std::string dynamicLibraryExtension(".so");
  #elif defined _WIN32
      const std::string dynamicLibraryExtension(".dll");

Modified: head/math/pdal/files/patch-vendor_gtest-1.7.0_include_gtest_internal_gtest-port.h
==============================================================================
--- head/math/pdal/files/patch-vendor_gtest-1.7.0_include_gtest_internal_gtest-port.h	Fri Apr  8 13:33:49 2016	(r412747)
+++ head/math/pdal/files/patch-vendor_gtest-1.7.0_include_gtest_internal_gtest-port.h	Fri Apr  8 15:13:53 2016	(r412748)
@@ -12,7 +12,7 @@
  # define GTEST_OS_OPENBSD 1
  #elif defined __QNX__
  # define GTEST_OS_QNX 1
-+#elif defined __FreeBSD__
++#elif defined __FreeBSD__ || defined __DragonFly__
 +# define GTEST_OS_FREEBSD 1
  #endif  // __CYGWIN__
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604081513.u38FDrkB059312>