Fri Jun 22 11:36:10 2012 UTC ()
When linking with a non-builtin BDB an rpath to it libdir is needed.

Bump PKGREVISION.


(sbd)
diff -r1.77 -r1.78 pkgsrc/lang/ocaml/Makefile
diff -r1.32 -r1.33 pkgsrc/lang/ocaml/Makefile.common
cvs diff -r1.77 -r1.78 pkgsrc/lang/ocaml/Makefile (switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2012/03/12 12:28:04 1.77
+++ pkgsrc/lang/ocaml/Makefile 2012/06/22 11:36:10 1.78
@@ -1,87 +1,89 @@ @@ -1,87 +1,89 @@
1# $NetBSD: Makefile,v 1.77 2012/03/12 12:28:04 fhajny Exp $ 1# $NetBSD: Makefile,v 1.78 2012/06/22 11:36:10 sbd Exp $
 2
 3PKGREVISION= 1
2 4
3PKG_DESTDIR_SUPPORT= user-destdir 5PKG_DESTDIR_SUPPORT= user-destdir
4 6
5.include "Makefile.common" 7.include "Makefile.common"
6 8
7CONFIGURE_ARGS+= -no-tk 9CONFIGURE_ARGS+= -no-tk
8CONFIGURE_ARGS+= -cc ${CC} 10CONFIGURE_ARGS+= -cc ${CC}
9CONFIGURE_ENV+= disable_x11=yes 11CONFIGURE_ENV+= disable_x11=yes
10 12
11BUILD_TARGET= world 13BUILD_TARGET= world
12MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
13UNLIMIT_RESOURCES= stacksize 15UNLIMIT_RESOURCES= stacksize
14 16
15### 17###
16### PLIST components 18### PLIST components
17### 19###
18 20
19# Stub libraries for functions missing from base system. 21# Stub libraries for functions missing from base system.
20.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \ 22.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
21 !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \ 23 !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \
22 !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*-x86_64) || \ 24 !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*-x86_64) || \
23 ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \ 25 ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
24 ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \ 26 ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \
25 ${OPSYS} == "Linux" 27 ${OPSYS} == "Linux"
26PLIST_SRC+= ${PKGDIR}/PLIST.stub 28PLIST_SRC+= ${PKGDIR}/PLIST.stub
27.endif 29.endif
28 30
29# Optional components built only on certain platforms. 31# Optional components built only on certain platforms.
30.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 32.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
31 (${MACHINE_ARCH} == "arm") || \ 33 (${MACHINE_ARCH} == "arm") || \
32 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") 34 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
33BUILD_TARGET+= opt opt.opt 35BUILD_TARGET+= opt opt.opt
34PLIST_SRC+= ${PKGDIR}/PLIST.opt 36PLIST_SRC+= ${PKGDIR}/PLIST.opt
35. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \ 37. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
36 empty(MACHINE_PLATFORM:MSunOS-*-i386) && \ 38 empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
37 empty(MACHINE_PLATFORM:MSunOS-*-x86_64) && \ 39 empty(MACHINE_PLATFORM:MSunOS-*-x86_64) && \
38 empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \ 40 empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \
39 empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \ 41 empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \
40 empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) && \ 42 empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) && \
41 empty(MACHINE_PLATFORM:MNetBSD-*-arm) && \ 43 empty(MACHINE_PLATFORM:MNetBSD-*-arm) && \
42 empty(MACHINE_PLATFORM:MNetBSD-*-sparc) 44 empty(MACHINE_PLATFORM:MNetBSD-*-sparc)
43PLIST_SRC+= ${PKGDIR}/PLIST.prof 45PLIST_SRC+= ${PKGDIR}/PLIST.prof
44. endif 46. endif
45.endif 47.endif
46 48
47# XXX This conditional is not complete. It should match the 49# XXX This conditional is not complete. It should match the
48# conditional in ocaml-x.y.z/configure. 50# conditional in ocaml-x.y.z/configure.
49.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") 51.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64")
50. if !empty(MACHINE_PLATFORM:MLinux-*-*) || \ 52. if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
51 !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \ 53 !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
52 !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \ 54 !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
53 !empty(MACHINE_PLATFORM:MNetBSD-*-*) 55 !empty(MACHINE_PLATFORM:MNetBSD-*-*)
54PLIST_SRC+= ${PKGDIR}/PLIST.natdynlink 56PLIST_SRC+= ${PKGDIR}/PLIST.natdynlink
55. endif 57. endif
56.endif 58.endif
57 59
58# Common ocaml files. 60# Common ocaml files.
59PLIST_SRC+= ${PKGDIR}/PLIST 61PLIST_SRC+= ${PKGDIR}/PLIST
60 62
61# This is needed because ${WRKSRC}/build/partial-install.sh uses 63# This is needed because ${WRKSRC}/build/partial-install.sh uses
62# $PWD as part of its script. However, with /bin/sh on SunOS 64# $PWD as part of its script. However, with /bin/sh on SunOS
63# (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is 65# (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
64# set before the cd takes place and is then passed down. So the end 66# set before the cd takes place and is then passed down. So the end
65# result is when ./build/partial-install.sh is called, PWD is set 67# result is when ./build/partial-install.sh is called, PWD is set
66# to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}. /bin/ksh, which 68# to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}. /bin/ksh, which
67# is what ${SH} is on SunOS, doesn't exhibit this behaviour. 69# is what ${SH} is on SunOS, doesn't exhibit this behaviour.
68.if ${OPSYS} == "SunOS" 70.if ${OPSYS} == "SunOS"
69INSTALL_MAKE_FLAGS+= SHELL=${SH:Q} 71INSTALL_MAKE_FLAGS+= SHELL=${SH:Q}
70.endif 72.endif
71 73
72.if ${OPSYS} == "NetBSD" 74.if ${OPSYS} == "NetBSD"
73EXTRA_RT_LIBS= -lcurses 75EXTRA_RT_LIBS= -lcurses
74.else 76.else
75EXTRA_RT_LIBS= 77EXTRA_RT_LIBS=
76.endif 78.endif
77 79
78SUBST_CLASSES+= extra-rt-libs 80SUBST_CLASSES+= extra-rt-libs
79SUBST_FILES.extra-rt-libs= bytecomp/bytelink.ml 81SUBST_FILES.extra-rt-libs= bytecomp/bytelink.ml
80SUBST_SED.extra-rt-libs+= -e 's,@EXTRA_RT_LIBS@,${EXTRA_RT_LIBS},g' 82SUBST_SED.extra-rt-libs+= -e 's,@EXTRA_RT_LIBS@,${EXTRA_RT_LIBS},g'
81SUBST_STAGE.extra-rt-libs= pre-configure 83SUBST_STAGE.extra-rt-libs= pre-configure
82 84
83do-test: 85do-test:
84 cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all 86 cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
85 87
86.include "../../mk/termcap.buildlink3.mk" 88.include "../../mk/termcap.buildlink3.mk"
87.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"
cvs diff -r1.32 -r1.33 pkgsrc/lang/ocaml/Makefile.common (switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile.common 2012/03/04 09:06:46 1.32
+++ pkgsrc/lang/ocaml/Makefile.common 2012/06/22 11:36:10 1.33
@@ -1,50 +1,55 @@ @@ -1,50 +1,55 @@
1# $NetBSD: Makefile.common,v 1.32 2012/03/04 09:06:46 asau Exp $ 1# $NetBSD: Makefile.common,v 1.33 2012/06/22 11:36:10 sbd 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-3.12.1 5DISTNAME= ocaml-3.12.1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.12/ 7MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.12/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= adam@NetBSD.org 10MAINTAINER= adam@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
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
17CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS:Q} 17CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
18CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q} 18CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
19CONFIGURE_ARGS+= -prefix ${PREFIX} 19CONFIGURE_ARGS+= -prefix ${PREFIX}
20CONFIGURE_ARGS+= -libs ${LDFLAGS:Q} 20CONFIGURE_ARGS+= -libs ${LDFLAGS:Q}
21CONFIGURE_ARGS+= -with-pthread 21CONFIGURE_ARGS+= -with-pthread
22CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q} 22CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
23CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR} 23CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR}
24CPPFLAGS+= -DDB_DBM_HSEARCH 24CPPFLAGS+= -DDB_DBM_HSEARCH
25 25
26INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ 26INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \
27 MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} 27 MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
28DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo 28DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
29PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches 29PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
30 30
31.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
32 32
33.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" 33.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
34INSTALL_UNSTRIPPED= yes 34INSTALL_UNSTRIPPED= yes
35.endif 35.endif
36 36
37.include "../../mk/bdb.buildlink3.mk" 37.include "../../mk/bdb.buildlink3.mk"
38 38
 39BDB_LINK= ${BDB_LIBS}
 40.if empty(BDBBASE:M/usr)
 41BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
 42.endif
 43
39post-extract: cp-power-bsd cp-gnu-config 44post-extract: cp-power-bsd cp-gnu-config
40 45
41.PHONY: cp-power-bsd 46.PHONY: cp-power-bsd
42cp-power-bsd: 47cp-power-bsd:
43 ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S 48 ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
44 49
45.PHONY: cp-gnu-config 50.PHONY: cp-gnu-config
46cp-gnu-config: 51cp-gnu-config:
47 ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/ 52 ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
48 ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/ 53 ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
49 54
50.include "../../mk/pthread.buildlink3.mk" 55.include "../../mk/pthread.buildlink3.mk"