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

- don't override ${CC} with gcc.

Browse Source
This commit is contained in:
jasper 2011-04-07 09:57:18 +00:00
parent f7a2c6a5a1
commit 5ae2a3dd13
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/gobject-introspection/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2011/04/07 09:38:12 jasper Exp $ # $OpenBSD: Makefile,v 1.28 2011/04/07 09:57:18 jasper Exp $
# Look at cairo-related regression failure. # Look at cairo-related regression failure.
# and cairo/cairo.h: No such file or directory during build. # and cairo/cairo.h: No such file or directory during build.
@ -9,7 +9,7 @@ COMMENT= GObject Introspection
GNOME_VERSION= 0.10.7 GNOME_VERSION= 0.10.7
GNOME_PROJECT= gobject-introspection GNOME_PROJECT= gobject-introspection
REVISION= 0 REVISION= 1
CATEGORIES= devel CATEGORIES= devel
SHARED_LIBS += girepository-1.0 1.0 # 1.0 SHARED_LIBS += girepository-1.0 1.0 # 1.0
@ -53,11 +53,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS+= -pthread CFLAGS+= -pthread
SUBST_VARS+= MODPY_SITEPKG LIBTOOL SUBST_VARS+= MODPY_SITEPKG LIBTOOL CC
pre-configure: pre-configure:
${SUBST_CMD} ${WRKSRC}/Makefile.in \ ${SUBST_CMD} ${WRKSRC}/Makefile.in \
${WRKSRC}/Makefile.introspection \ ${WRKSRC}/Makefile.introspection \
${WRKSRC}/giscanner/dumper.py \
${WRKSRC}/giscanner/scannermain.py \ ${WRKSRC}/giscanner/scannermain.py \
${WRKSRC}/giscanner/utils.py \ ${WRKSRC}/giscanner/utils.py \
${WRKSRC}/tests/scanner/Makefile.in \ ${WRKSRC}/tests/scanner/Makefile.in \

12
devel/gobject-introspection/patches/patch-giscanner_dumper_py Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-giscanner_dumper_py,v 1.3 2011/04/07 09:57:18 jasper Exp $
--- giscanner/dumper.py.orig Thu Apr 7 11:48:35 2011
+++ giscanner/dumper.py Thu Apr 7 11:51:54 2011
@@ -80,7 +80,7 @@ class DumpCompiler(object):
self._options = options
self._get_type_functions = get_type_functions
- self._compiler_cmd = os.environ.get('CC', 'gcc')
+ self._compiler_cmd = os.environ.get('CC', '${CC}')
self._linker_cmd = os.environ.get('CC', self._compiler_cmd)
self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')