Thu May 26 14:31:12 2016 UTC ()
Add support for CFLAGS

This fixes the build with PKGSRC_MKPIE.


(khorben)
diff -r1.46 -r1.47 pkgsrc/lang/ocaml/Makefile.common
cvs diff -r1.46 -r1.47 pkgsrc/lang/ocaml/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile.common 2016/05/05 08:12:01 1.46
+++ pkgsrc/lang/ocaml/Makefile.common 2016/05/26 14:31:12 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.46 2016/05/05 08:12:01 jaapb Exp $ 1# $NetBSD: Makefile.common,v 1.47 2016/05/26 14:31:12 khorben Exp $
2 2
3# used by x11/labltk/Makefile 3# used by x11/labltk/Makefile
4# used by x11/ocaml-graphics/Makefile 4# used by x11/ocaml-graphics/Makefile
5DISTNAME= ocaml-4.03.0 5DISTNAME= ocaml-4.03.0
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.03/ 7MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.03/
8#EXTRACT_SUFX= .tar.bz2 8#EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= jaapb@NetBSD.org 10MAINTAINER= jaapb@NetBSD.org
11HOMEPAGE= http://caml.inria.fr/ocaml/ 11HOMEPAGE= http://caml.inria.fr/ocaml/
12COMMENT= The latest implementation of the Caml dialect of ML 12COMMENT= The latest implementation of the Caml dialect of ML
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -23,31 +23,31 @@ CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLA @@ -23,31 +23,31 @@ CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLA
23CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR} 23CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
24CPPFLAGS+= -DDB_DBM_HSEARCH 24CPPFLAGS+= -DDB_DBM_HSEARCH
25 25
26DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo 26DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
27PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches 27PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31.if ${OPSYS} == "Linux" 31.if ${OPSYS} == "Linux"
32INSTALL_UNSTRIPPED= yes 32INSTALL_UNSTRIPPED= yes
33.endif 33.endif
34 34
35.if ${OPSYS} == "Darwin" 35.if ${OPSYS} == "Darwin"
36CONFIGURE_ARGS+= -cc "${CC} -arch ${MACHINE_ARCH}" 36CONFIGURE_ARGS+= -cc "${CC} -arch ${MACHINE_ARCH} ${CFLAGS}"
37CONFIGURE_ARGS+= -aspp "${CC} -arch ${MACHINE_ARCH} -c" 37CONFIGURE_ARGS+= -aspp "${CC} -arch ${MACHINE_ARCH} -c"
38CONFIGURE_ARGS+= -as "as -arch ${MACHINE_ARCH}" 38CONFIGURE_ARGS+= -as "as -arch ${MACHINE_ARCH}"
39.else 39.else
40CONFIGURE_ARGS+= -cc ${CC} 40CONFIGURE_ARGS+= -cc "${CC} ${CFLAGS}"
41.endif 41.endif
42 42
43.include "../../mk/bdb.buildlink3.mk" 43.include "../../mk/bdb.buildlink3.mk"
44 44
45BDB_LINK= ${BDB_LIBS} 45BDB_LINK= ${BDB_LIBS}
46.if empty(BDBBASE:M/usr) 46.if empty(BDBBASE:M/usr)
47BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib 47BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
48.endif 48.endif
49 49
50post-extract: cp-gnu-config 50post-extract: cp-gnu-config
51 51
52.PHONY: cp-gnu-config 52.PHONY: cp-gnu-config
53cp-gnu-config: 53cp-gnu-config: