. Use OSVERSION rather than directly invoking 'sysctl kern.osreldate' to
determine whether sigignore(3) is supported or not. This fixes the build for QAT and pointyhat (or in fact any jailed situation where the kernel and headers are not in sync).
This commit is contained in:
parent
8fa3d45835
commit
a2f8232d17
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=256336
@ -289,9 +289,11 @@ post-patch:
|
||||
${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
|
||||
${WRKSRC}/$${file}; \
|
||||
done
|
||||
${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
|
||||
@${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
|
||||
-e "s:%%JDK_VERSION%%:${JDK_VERSION}:g"\
|
||||
${WRKSRC}/../../deploy/src/plugin/solaris/controlpanel/sun_java.desktop
|
||||
@${REINPLACE_CMD} -e "s:%%OSVERSION%%:${OSVERSION}:g" \
|
||||
${WRKSRC}/../../j2se/make/common/Defs-bsd.gmk
|
||||
|
||||
.if defined(WITH_LINUX_BOOTSTRAP)
|
||||
pre-build:
|
||||
|
@ -8,7 +8,7 @@ $FreeBSD$
|
||||
override HAVE_SIGIGNORE = true
|
||||
+endif
|
||||
+ifeq ($(TRUE_PLATFORM),FreeBSD)
|
||||
+OS_RELDATE := $(shell sysctl kern.osreldate | cut -d' ' -f2)
|
||||
+OS_RELDATE := %%OSVERSION%%
|
||||
+HAS_SIGIGNORE := $(shell if [ $(OS_RELDATE) -ge 800502 -a $(OS_RELDATE) -lt 900000 -o $(OS_RELDATE) -ge 900003 ]; then echo "1"; fi)
|
||||
+ifeq ($(HAS_SIGIGNORE),1)
|
||||
+override HAVE_SIGIGNORE = true
|
||||
|
Loading…
Reference in New Issue
Block a user