- Fix build on 7.x

Reported by:	pointyhat via erwin
This commit is contained in:
Dmitry Marakasov 2009-04-10 17:41:53 +00:00
parent 24bfb7cb2f
commit 09cb048e6e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=232022
2 changed files with 19 additions and 3 deletions

View file

@ -30,13 +30,18 @@ WRKSRC= ${WRKDIR}/ACE_wrappers
BUILD_WRKSRC= ${WRKSRC}/objdir
INSTALL_WRKSRC= ${BUILD_WRKSRC}
NOT_FOR_ARCHS= sparc64
MAKE_JOBS_SAFE= yes
MAN1= ace-gperf.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700015 || (${OSVERSION} < 700000 && ${OSVERSION} >= 601103)
EXTRA_PATCHES= ${FILESDIR}/extra-ace-OS_NS_netdb.inl
.if (${OSVERSION} >= 601103 && ${OSVERSION} < 700000) || ${OSVERSION} >= 700015
EXTRA_PATCHES+= ${FILESDIR}/extra-ace-OS_NS_netdb.inl
.endif
.if ${OSVERSION} >= 700110 && ${OSVERSION} < 800000
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ace-OS_NS_Thread.h
.endif
post-extract:
@ -45,7 +50,7 @@ post-extract:
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g'
.if ${OSVERSION} >= 800024
.if (${OSVERSION} >= 700110 && ${OSVERSION} < 800000) || ${OSVERSION} >= 800024
@${REINPLACE_CMD} -e 's|cpu_set_t|cpuset_t|g' ${WRKSRC}/ace/OS_NS_Thread.cpp \
${WRKSRC}/ace/OS_NS_Thread.h
.endif

View file

@ -0,0 +1,11 @@
--- ace/OS_NS_Thread.h.orig 2006-05-30 17:15:25.000000000 +0400
+++ ace/OS_NS_Thread.h 2009-04-10 17:59:13.000000000 +0400
@@ -38,6 +38,8 @@
# include "ace/ACE_export.h"
# include "ace/Object_Manager_Base.h"
+# include <sys/cpuset.h>
+
# if defined (ACE_EXPORT_MACRO)
# undef ACE_EXPORT_MACRO
# endif