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

remove devel/flex dep, these are ok with base flex

Browse Source
This commit is contained in:
sthen 2015-11-20 12:01:07 +00:00
parent d12f9be4de
commit 91fd752133
4 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
geo/qgis/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2015/11/16 10:22:59 landry Exp $
# $OpenBSD: Makefile,v 1.44 2015/11/20 12:01:07 sthen Exp $
COMMENT = desktop geographical information system
@ -32,7 +32,6 @@ MODULES = devel/cmake \
BUILD_DEPENDS = x11/py-qt4>=4.8.4 \
security/qca-ossl \
devel/flex \
editors/py-qscintilla \
devel/bison>=2.4 \
geo/gdal,-python

14
geo/qgis/patches/patch-cmake_Flex_cmake
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-cmake_Flex_cmake,v 1.1 2014/11/10 16:05:17 landry Exp $
Use gflex from ports, our flex doesnt handle %option reentrant
used since https://github.com/qgis/QGIS/commit/2427546d8850c7f0b2ca191b238a77c49f648510
--- cmake/Flex.cmake.orig Fri Nov 7 10:51:41 2014
+++ cmake/Flex.cmake Fri Nov 7 10:52:43 2014
@@ -15,7 +15,7 @@ MACRO(FIND_FLEX)
PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
)
ELSE(MSVC)
- FIND_PROGRAM(FLEX_EXECUTABLE flex)
+ FIND_PROGRAM(FLEX_EXECUTABLE gflex)
ENDIF (MSVC)
IF (NOT FLEX_EXECUTABLE)
MESSAGE(FATAL_ERROR "flex not found - aborting")

6
multimedia/gstreamer-0.10/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2015/11/15 12:14:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.41 2015/11/20 12:01:07 sthen Exp $
COMMENT= framework for streaming media
@ -18,12 +18,10 @@ WANTLIB += pcre pthread xml2 z
MASTER_SITES= ${MASTER_SITE_GST:=gstreamer/}
BUILD_DEPENDS= devel/flex
LIB_DEPENDS= textproc/libxml \
devel/glib2
CONFIGURE_ENV += FLEX_PATH=${LOCALBASE}/bin/gflex \
ac_cv_path_PYTHON=""
CONFIGURE_ENV += ac_cv_path_PYTHON=""
# do not pick-up gmp nor gdl: for now, it is only used by
# tests/check/gst (which is not built) but better safe than sorry

4
multimedia/gstreamer1/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2015/11/15 12:15:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2015/11/20 12:01:07 sthen Exp $
COMMENT= framework for streaming media
@ -18,12 +18,10 @@ WANTLIB += pthread z
MASTER_SITES= ${MASTER_SITE_GST:=gstreamer/}
BUILD_DEPENDS= devel/bison \
devel/flex \
devel/gobject-introspection
LIB_DEPENDS= devel/glib2
CONFIGURE_ENV += FLEX_PATH=${LOCALBASE}/bin/gflex
# do not pick-up gmp nor gdl: for now, it is only used by
# tests/check/gst (which is not built) but better safe than sorry
CONFIGURE_ENV += ac_cv_lib_gmp___gmpz_init_set_d=no \