From 1e23c2cb5ef378238e27165d83ab68636eeb8340 Mon Sep 17 00:00:00 2001 From: mm Date: Wed, 29 Jun 2011 13:15:26 +0000 Subject: Remove conditions with USE_GCC (not needed anymore) --- graphics/opencv/Makefile | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 979098916b98..51186f568f59 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -202,23 +202,6 @@ CMAKE_ARGS+= -DBUILD_TESTS:BOOL=Off \ .include -# This whole block looks a bit hackish, but it works... -.if ${ARCH} == "amd64" && ${OSVERSION} < 700042 -USE_GCC= 4.2+ -.else -CMAKE_OUTSOURCE= yes -.if ${ARCH} == "i386" && ${OSVERSION} >= 700042 && ${OSVERSION} < 800107 -USE_GCC= 4.4+ -.endif -.endif - -# Any other way to override CFLAGS and CXXFLAGS? -.ifdef(USE_GCC) -CMAKE_SOURCE_PATH= -DCMAKE_C_FLAGS:STRING="${CFLAGS:C/-Wl[^ ]*//g}" \ - -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS:C/-Wl[^ ]*//g}" \ - ${WRKSRC} -.endif - post-patch: @${MKDIR} ${CONFIGURE_WRKSRC} @${REINPLACE_CMD} -e 's:set(OPENCV_SOVERSION.*:set(OPENCV_SOVERSION "$${OPENCV_VERSION_MAJOR}"):' \ -- cgit