diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk15/Makefile | 4 | ||||
| -rw-r--r-- | java/jdk15/files/patch-j2se::common::Defs-bsd.gmk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 4f3fd878c71f..cd1ae558b568 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -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: diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk index d71e8363bf41..4fbf7360cea4 100644 --- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk +++ b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk @@ -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 |