cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with what bentley@ pushed upstream.

Browse Source
This commit is contained in:
dcoppa 2012-05-15 08:36:28 +00:00
parent f2f13a2a9f
commit ae2b2f4867
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/cmake/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.54 2012/05/14 19:24:33 bentley Exp $
# $OpenBSD: Makefile,v 1.55 2012/05/15 08:36:28 dcoppa Exp $
VMEM_WARNING = Yes
BROKEN-arm = build fails since move to gcc4
@ -7,7 +7,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.8
REVISION = 1
REVISION = 2
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dcoppa@openbsd.org>

18
devel/cmake/patches/patch-Modules_FindwxWidgets_cmake
View File

@ -1,6 +1,16 @@
$OpenBSD: patch-Modules_FindwxWidgets_cmake,v 1.1 2012/05/14 19:24:33 bentley Exp $
--- Modules/FindwxWidgets.cmake.orig Mon May 14 04:27:31 2012
+++ Modules/FindwxWidgets.cmake Mon May 14 04:27:07 2012
$OpenBSD: patch-Modules_FindwxWidgets_cmake,v 1.2 2012/05/15 08:36:28 dcoppa Exp $
From 16ee19731e13abcd7d36d18822f61b7679322631 Mon Sep 17 00:00:00 2001
From: Anthony J. Bentley <anthonyjbentley@gmail.com>
Date: Mon, 14 May 2012 15:42:00 -0400
Subject: [PATCH] FindwxWidgets: Do not use -isystem on OpenBSD (#13219)
Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM on OpenBSD in addition to Apple to
prevent UsewxWidgets.cmake from using the include_directories SYSTEM
option.
--- Modules/FindwxWidgets.cmake.orig Wed Apr 18 20:10:54 2012
+++ Modules/FindwxWidgets.cmake Tue May 15 10:27:15 2012
@@ -167,9 +167,9 @@ SET(wxWidgets_CXX_FLAGS "")
# http://www.cmake.org/pipermail/cmake/2008-April/021115.html
# http://www.cmake.org/pipermail/cmake/2008-April/021146.html
@ -9,7 +19,7 @@ $OpenBSD: patch-Modules_FindwxWidgets_cmake,v 1.1 2012/05/14 19:24:33 bentley Ex
+IF(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
-ENDIF(APPLE)
+ENDIF(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
+ENDIF()
# DEPRECATED: This is a patch to support the DEPRECATED use of
# wxWidgets_USE_LIBS.