diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-11-04 20:45:11 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-11-04 20:45:11 +0800 |
| commit | f9f6d128a96d148924b3e9196f775e0e578773fd (patch) | |
| tree | 146d35d01d6da73355437f6eab698cc8383201c2 | |
| parent | 8608e17a656d2522f56ca134fadc14ec10d3245f (diff) | |
| download | marcuscom-ports-f9f6d128a96d148924b3e9196f775e0e578773fd.tar marcuscom-ports-f9f6d128a96d148924b3e9196f775e0e578773fd.tar.gz marcuscom-ports-f9f6d128a96d148924b3e9196f775e0e578773fd.tar.bz2 marcuscom-ports-f9f6d128a96d148924b3e9196f775e0e578773fd.tar.lz marcuscom-ports-f9f6d128a96d148924b3e9196f775e0e578773fd.tar.xz marcuscom-ports-f9f6d128a96d148924b3e9196f775e0e578773fd.tar.zst marcuscom-ports-f9f6d128a96d148924b3e9196f775e0e578773fd.zip | |
Use upstream patch to see if CC is set. This removes the temp hardcode I
put in place at build time.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16554 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/gobject-introspection/Makefile | 6 | ||||
| -rw-r--r-- | devel/gobject-introspection/files/patch-giscanner_sourcescanner.py | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index aa28d6c7f..9666fd6c2 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -3,7 +3,7 @@ # Whom: Alexander Logvinov <avl@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gobject-introspection/Makefile,v 1.43 2011/10/04 11:57:21 kwm Exp $ +# $MCom: ports/devel/gobject-introspection/Makefile,v 1.44 2011/10/23 09:03:39 kwm Exp $ # PORTNAME= gobject-introspection @@ -38,8 +38,4 @@ MAKE_ENV= HOME=${WRKDIR} MAN1= g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1 -post-patch: - @${REINPLACE_CMD} -e 's|%%CC%%|${CC:Q}|g' \ - ${WRKSRC}/giscanner/sourcescanner.py - .include <bsd.port.mk> diff --git a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py index 8c80102b5..e11b722a8 100644 --- a/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py +++ b/devel/gobject-introspection/files/patch-giscanner_sourcescanner.py @@ -1,11 +1,12 @@ --- giscanner/sourcescanner.py.orig 2011-09-03 20:42:14.000000000 +0200 -+++ giscanner/sourcescanner.py 2011-10-04 13:48:48.000000000 +0200 -@@ -274,7 +274,7 @@ ++++ giscanner/sourcescanner.py 2011-11-04 13:36:04.000000000 +0100 +@@ -274,7 +274,8 @@ class SourceScanner(object): defines = ['__GI_SCANNER__'] undefs = [] - cpp_args = [os.environ.get('CC', 'cc'), '-E', '-C', '-I.', '-'] -+ cpp_args = ['%%CC%%', '-E', '-C', '-I.', '-'] ++ cpp_args = os.environ.get('CC', 'cc').split() ++ cpp_args += ['-E', '-C', '-I.', '-'] cpp_args += self._cpp_options proc = subprocess.Popen(cpp_args, |