- let g-c-a use the clang module to get the correct includes path

- add a reminder commennt in llvm/Makefile

discussed with and ok sthen@
This commit is contained in:
jasper 2012-05-26 09:14:34 +00:00
parent 004e63f74b
commit 1e878a85e0
3 changed files with 10 additions and 5 deletions

View File

@ -1,4 +1,7 @@
# $OpenBSD: Makefile,v 1.42 2012/05/25 09:05:49 sthen Exp $
# $OpenBSD: Makefile,v 1.43 2012/05/26 09:14:34 jasper Exp $
# XXX: Remember to bump MODCLANG_VERSION in lang/clang/clang.port.mk when
# updating this port.
SHARED_LIBS += libclang 0.0 # 3.0

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/05/01 07:38:47 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2012/05/26 09:14:34 jasper Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= code assistance for Gedit
GNOME_PROJECT= gedit-code-assistance
GNOME_VERSION= 0.1.3
REVISION= 0
CATEGORIES= editors devel
@ -16,6 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= devel/gettext \
lang/clang \
x11/gnome
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
@ -29,7 +31,7 @@ WANTLIB += xcb-shm xml2 z
LIB_DEPENDS= devel/libgee06 \
devel/libpeas \
devel/llvm \
devel/llvm>=${MODCLANG_VERSION} \
x11/gtksourceview3
BUILD_DEPENDS= lang/vala \

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_backends_c_gcp-c-compile-args_c,v 1.1.1.1 2012/05/01 07:38:47 jasper Exp $
$OpenBSD: patch-src_backends_c_gcp-c-compile-args_c,v 1.2 2012/05/26 09:14:34 jasper Exp $
--- src/backends/c/gcp-c-compile-args.c.orig Mon Apr 30 21:28:24 2012
+++ src/backends/c/gcp-c-compile-args.c Mon Apr 30 21:31:07 2012
@@ -1848,7 +1848,7 @@ static void gcp_c_compile_args_find_for_makefile (GcpC
@ -6,7 +6,7 @@ $OpenBSD: patch-src_backends_c_gcp-c-compile-args_c,v 1.1.1.1 2012/05/01 07:38:4
_tmp27_ = args;
_tmp27__length1 = args_length1;
- _tmp28_ = g_strdup ("/usr/lib/clang/2.9/include");
+ _tmp28_ = g_strdup ("${LOCALBASE}/lib/clang/3.0/include");
+ _tmp28_ = g_strdup ("${LOCALBASE}/lib/clang/${MODCLANG_VERSION}/include");
_vala_array_add4 (&args, &args_length1, &_args_size_, _tmp28_);
}
}