pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

brlcad: Stop disabling pkgsrc flags



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Oct 22 12:30:48 2016 +0200
Changeset:	8a09a0cd7d4923364b805068b8f2afba4cb44478

Modified Files:
	brlcad/distinfo
Added Files:
	brlcad/patches/patch-misc_CMake_CompilerFlags.cmake

Log Message:
brlcad: Stop disabling pkgsrc flags

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8a09a0cd7d4923364b805068b8f2afba4cb44478

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 brlcad/distinfo                                    |  1 +
 .../patches/patch-misc_CMake_CompilerFlags.cmake   | 51 ++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diffs:
diff --git a/brlcad/distinfo b/brlcad/distinfo
index 090f7a1..122eafe 100644
--- a/brlcad/distinfo
+++ b/brlcad/distinfo
@@ -5,6 +5,7 @@ RMD160 (brlcad-7.26.0.tar.bz2) = bf391f887463ece786c5e1e4f3382c168bfc99b3
 SHA512 (brlcad-7.26.0.tar.bz2) = e4819da6e94ff7e5f777cb3c59a911f8818a10ddef42f02f3c3b95be9057a7a83427fdbc29bc3f610f16100b65bb14919438598bd5d59af16fcdbe9f6351006a
 Size (brlcad-7.26.0.tar.bz2) = 113073230 bytes
 SHA1 (patch-CMakeLists.txt) = 230ac7ce5c1b98c08651e4d74d92658836a8dfbc
+SHA1 (patch-misc_CMake_CompilerFlags.cmake) = 172dc28290fee3d6ae6023becfd6908376204685
 SHA1 (patch-misc_CMake_ThirdParty.cmake) = 03cb989aa4de0a07e146bc80facd649946a9688b
 SHA1 (patch-src_librt_primitives_bot_gct__decimation_meshdecimation.c) = c76104ad99c8714379ad7e01b806a2f30cda4f05
 SHA1 (patch-src_other_openscenegraph_CMakeLists.txt) = 1508f2fc2da4cc2c303ad11b49ab40fca379eaec
diff --git a/brlcad/patches/patch-misc_CMake_CompilerFlags.cmake b/brlcad/patches/patch-misc_CMake_CompilerFlags.cmake
new file mode 100644
index 0000000..b2ebced
--- /dev/null
+++ b/brlcad/patches/patch-misc_CMake_CompilerFlags.cmake
@@ -0,0 +1,51 @@
+$NetBSD$
+
+--- misc/CMake/CompilerFlags.cmake.orig	2016-08-09 06:52:30.000000000 +0000
++++ misc/CMake/CompilerFlags.cmake
+@@ -101,26 +101,26 @@ endmacro(RESTORE_CACHED_BUILD_FLAGS)
+ # rely on CMake to specify Windows compilation flags - until
+ # that changes, we can't afford to strip flags out on MSVC
+ macro(CLEAR_BUILD_FLAGS)
+-  set(BUILD_FLAGS_TO_CLEAR
+-    CMAKE_C_FLAGS
+-    CMAKE_CXX_FLAGS
+-    CMAKE_SHARED_LINKER_FLAGS
+-    CMAKE_EXE_LINKER_FLAGS
+-    )
+-  if (NOT MSVC)
+-    foreach(bflag ${BUILD_FLAGS_TO_CLEAR})
+-      set(${bflag} "")
+-      unset(${bflag} CACHE)
+-      foreach(BTYPE ${CMAKE_BUILD_TYPES})
+-	set(${bflag}_${BTYPE} "")
+-	unset(${bflag}_${BTYPE} CACHE)
+-      endforeach(BTYPE ${CMAKE_BUILD_TYPES})
+-    endforeach(bflag ${BUILD_FLAGS_TO_CLEAR})
+-
+-    set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
+-    set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS}")
+-    set(CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS}")
+-  endif (NOT MSVC)
++#  set(BUILD_FLAGS_TO_CLEAR
++#    CMAKE_C_FLAGS
++#    CMAKE_CXX_FLAGS
++#    CMAKE_SHARED_LINKER_FLAGS
++#    CMAKE_EXE_LINKER_FLAGS
++#    )
++#  if (NOT MSVC)
++#    foreach(bflag ${BUILD_FLAGS_TO_CLEAR})
++#      set(${bflag} "")
++#      unset(${bflag} CACHE)
++#      foreach(BTYPE ${CMAKE_BUILD_TYPES})
++#	set(${bflag}_${BTYPE} "")
++#	unset(${bflag}_${BTYPE} CACHE)
++#      endforeach(BTYPE ${CMAKE_BUILD_TYPES})
++#    endforeach(bflag ${BUILD_FLAGS_TO_CLEAR})
++#
++#    set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
++#    set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS}")
++#    set(CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS}")
++#  endif (NOT MSVC)
+ endmacro(CLEAR_BUILD_FLAGS)
+ 
+ # To reduce verbosity in this file, determine up front which


Home | Main Index | Thread Index | Old Index