Sun Jul 2 10:22:37 2017 UTC ()
SunOS needs POSIX_PTHREAD_SEMANTICS


(wiedi)
diff -r1.47 -r1.48 pkgsrc/lang/swi-prolog-packages/Makefile
cvs diff -r1.47 -r1.48 pkgsrc/lang/swi-prolog-packages/Makefile (switch to unified diff)

--- pkgsrc/lang/swi-prolog-packages/Makefile 2016/07/01 17:55:23 1.47
+++ pkgsrc/lang/swi-prolog-packages/Makefile 2017/07/02 10:22:37 1.48
@@ -1,97 +1,99 @@ @@ -1,97 +1,99 @@
1# $NetBSD: Makefile,v 1.47 2016/07/01 17:55:23 jperkin Exp $ 1# $NetBSD: Makefile,v 1.48 2017/07/02 10:22:37 wiedi Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../lang/swi-prolog-lite/Makefile.common" 4.include "../../lang/swi-prolog-lite/Makefile.common"
5 5
6PKGNAME= swi-prolog-packages-${SWIPLVERS} 6PKGNAME= swi-prolog-packages-${SWIPLVERS}
7#PKGREVISION= 4 7#PKGREVISION= 4
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Packages for SWI Prolog 10COMMENT= Packages for SWI Prolog
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13USE_TOOLS+= gmake pkg-config 13USE_TOOLS+= gmake pkg-config
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
18.if ${X11_TYPE} == "modular" 18.if ${X11_TYPE} == "modular"
19BUILD_DEPENDS+= modular-xorg-server-[0-9]*:../../x11/modular-xorg-server 19BUILD_DEPENDS+= modular-xorg-server-[0-9]*:../../x11/modular-xorg-server
20.endif 20.endif
21 21
22CONFIGURE_ENV+= PL=swi-prolog 22CONFIGURE_ENV+= PL=swi-prolog
23CONFIGURE_ENV+= PLARCH=${MACHINE_GNU_PLATFORM} # make PLIST consistent 23CONFIGURE_ENV+= PLARCH=${MACHINE_GNU_PLATFORM} # make PLIST consistent
24CONFIGURE_ARGS+= --without-jpl 24CONFIGURE_ARGS+= --without-jpl
25 25
26CONFIGURE_DIRS+= . packages 26CONFIGURE_DIRS+= . packages
27BUILD_DIRS+= packages 27BUILD_DIRS+= packages
28INSTALL_DIRS+= packages 28INSTALL_DIRS+= packages
29 29
30INSTALLATION_DIRS= bin lib/swi-prolog-${PKGVERSION_NOREV}/include ${PKGMANDIR}/man1 30INSTALLATION_DIRS= bin lib/swi-prolog-${PKGVERSION_NOREV}/include ${PKGMANDIR}/man1
31 31
 32CPPFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
 33
32TEST_TARGET= check 34TEST_TARGET= check
33 35
34pre-configure: 36pre-configure:
35 ${LN} -sf ${LOCALBASE}/bin/plld ${WRKSRC}/src 37 ${LN} -sf ${LOCALBASE}/bin/plld ${WRKSRC}/src
36 ${LN} -sf ${LOCALBASE}/bin/swi-prolog ${WRKSRC}/src 38 ${LN} -sf ${LOCALBASE}/bin/swi-prolog ${WRKSRC}/src
37 39
38post-configure: 40post-configure:
39 ${LN} -sf ${LOCALBASE}/bin/plld ${WRKSRC}/src 41 ${LN} -sf ${LOCALBASE}/bin/plld ${WRKSRC}/src
40 ${LN} -sf ${LOCALBASE}/bin/swi-prolog ${WRKSRC}/src 42 ${LN} -sf ${LOCALBASE}/bin/swi-prolog ${WRKSRC}/src
41 cd ${WRKSRC}/packages; \ 43 cd ${WRKSRC}/packages; \
42 ${SETENV} \ 44 ${SETENV} \
43 CPP=${CPP:Q} \ 45 CPP=${CPP:Q} \
44 ${GMAKE} configure 46 ${GMAKE} configure
45 mkdir ${WRKSRC}/include 47 mkdir ${WRKSRC}/include
46 ${LN} -sf ${WRKSRC}/src/SWI-Prolog.h ${WRKSRC}/include 48 ${LN} -sf ${WRKSRC}/src/SWI-Prolog.h ${WRKSRC}/include
47 ${LN} -sf ${WRKSRC}/src/os/SWI-Stream.h ${WRKSRC}/include 49 ${LN} -sf ${WRKSRC}/src/os/SWI-Stream.h ${WRKSRC}/include
48 50
49pre-install: checkforx 51pre-install: checkforx
50 52
51# Based on misc/openoffice: 53# Based on misc/openoffice:
52DISPLAY?= #empty, if unset 54DISPLAY?= #empty, if unset
53checkforx: 55checkforx:
54.if ${DISPLAY} == "" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && ${ECHO} YES || ${ECHO} NO!} == "NO" 56.if ${DISPLAY} == "" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && ${ECHO} YES || ${ECHO} NO!} == "NO"
55. if exists(${X11BASE}/bin/Xvfb) 57. if exists(${X11BASE}/bin/Xvfb)
56 -${X11BASE}/bin/Xvfb :2 & \ 58 -${X11BASE}/bin/Xvfb :2 & \
57 ${ECHO} $$! >${WRKDIR}/.Xvfb.pid 59 ${ECHO} $$! >${WRKDIR}/.Xvfb.pid
58 ${ECHO} checkforx: Xvfb-PID: `${CAT} ${WRKDIR}/.Xvfb.pid` 60 ${ECHO} checkforx: Xvfb-PID: `${CAT} ${WRKDIR}/.Xvfb.pid`
59 sleep 5 61 sleep 5
60DISPLAY= :2 62DISPLAY= :2
61. else 63. else
62 @${ECHO} "Error: Environment variable DISPLAY must be set" 64 @${ECHO} "Error: Environment variable DISPLAY must be set"
63 @${ECHO} " and point to a connectible X server." 65 @${ECHO} " and point to a connectible X server."
64 @${FALSE} 66 @${FALSE}
65. endif #Xvfb 67. endif #Xvfb
66.endif #DISPLAY 68.endif #DISPLAY
67 69
68MAKE_ENV+= DISPLAY=${DISPLAY:Q} 70MAKE_ENV+= DISPLAY=${DISPLAY:Q}
69 71
70post-install: teardownx 72post-install: teardownx
71 ${RM} -f ${LOCALBASE}/lib/swi-prolog-${SWIPLVERS}/xpce-${XPCE_VERSION}/prolog/lib/.pwd 73 ${RM} -f ${LOCALBASE}/lib/swi-prolog-${SWIPLVERS}/xpce-${XPCE_VERSION}/prolog/lib/.pwd
72 ${INSTALL_DATA} ${WRKSRC}/packages/xpce/man/xpce-client.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xpce-client.1 74 ${INSTALL_DATA} ${WRKSRC}/packages/xpce/man/xpce-client.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xpce-client.1
73 ${INSTALL_DATA} ${WRKSRC}/packages/xpce/man/xpce.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xpce.1 75 ${INSTALL_DATA} ${WRKSRC}/packages/xpce/man/xpce.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xpce.1
74teardownx: 76teardownx:
75 ${ECHO} teardownx: Xvfb-PID: `${CAT} ${WRKDIR}/.Xvfb.pid` 77 ${ECHO} teardownx: Xvfb-PID: `${CAT} ${WRKDIR}/.Xvfb.pid`
76 sleep 5 78 sleep 5
77 -kill `${CAT} ${WRKDIR}/.Xvfb.pid` 79 -kill `${CAT} ${WRKDIR}/.Xvfb.pid`
78 ${RM} -f ${WRKDIR}/.Xvfb.pid 80 ${RM} -f ${WRKDIR}/.Xvfb.pid
79 81
80# I need this on FreeBSD, perhaps this depends on GCC behaviour: 82# I need this on FreeBSD, perhaps this depends on GCC behaviour:
81CHECK_WRKREF_SKIP= lib/swi-prolog-${SWIPLVERS}/xpce-${XPCE_VERSION}/lib/${MACHINE_GNU_PLATFORM}/pl2xpce.so 83CHECK_WRKREF_SKIP= lib/swi-prolog-${SWIPLVERS}/xpce-${XPCE_VERSION}/lib/${MACHINE_GNU_PLATFORM}/pl2xpce.so
82 84
83 85
84.include "../../archivers/libarchive/buildlink3.mk" 86.include "../../archivers/libarchive/buildlink3.mk"
85.include "../../lang/swi-prolog-lite/buildlink3.mk" 87.include "../../lang/swi-prolog-lite/buildlink3.mk"
86.include "../../mk/jpeg.buildlink3.mk" 88.include "../../mk/jpeg.buildlink3.mk"
87.include "../../devel/gmp/buildlink3.mk" 89.include "../../devel/gmp/buildlink3.mk"
88.include "../../devel/ncurses/buildlink3.mk" 90.include "../../devel/ncurses/buildlink3.mk"
89# uses rl_event_hook() interface 91# uses rl_event_hook() interface
90.include "../../devel/readline/buildlink3.mk" 92.include "../../devel/readline/buildlink3.mk"
91.include "../../security/openssl/buildlink3.mk" 93.include "../../security/openssl/buildlink3.mk"
92.include "../../x11/libXft/buildlink3.mk" 94.include "../../x11/libXft/buildlink3.mk"
93.include "../../x11/libXinerama/buildlink3.mk" 95.include "../../x11/libXinerama/buildlink3.mk"
94.include "../../x11/libXpm/buildlink3.mk" 96.include "../../x11/libXpm/buildlink3.mk"
95.include "../../x11/libXt/buildlink3.mk" 97.include "../../x11/libXt/buildlink3.mk"
96.include "../../mk/pthread.buildlink3.mk" 98.include "../../mk/pthread.buildlink3.mk"
97.include "../../mk/bsd.pkg.mk" 99.include "../../mk/bsd.pkg.mk"