This is an automated email from the git hooks/post-receive script. jhe-guest pushed a commit to branch master in repository openjdk-8.
commit 18592f60707dcb69187eb42286f4fad16a4f4e9b Author: Jan Henke <[email protected]> Date: Thu Apr 10 14:17:42 2014 +0200 Some more kFreeBSD related changes. * Update kfreebsd-support-hotspot.diff to fix a compile error. * Update debian/rules to omit --no-docs and --disable-compile-against-syscalls need to be checked ad enabled again later. --- debian/patches/kfreebsd-support-hotspot.diff | 15 +++++++++++++++ debian/rules | 22 ++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/debian/patches/kfreebsd-support-hotspot.diff b/debian/patches/kfreebsd-support-hotspot.diff index 6aece82..1cc1877 100644 --- a/debian/patches/kfreebsd-support-hotspot.diff +++ b/debian/patches/kfreebsd-support-hotspot.diff @@ -120,6 +120,21 @@ } julong os::physical_memory() { +@@ -235,11 +255,11 @@ + // i386: 224, ia64: 1105, amd64: 186, sparc 143 + #ifdef __ia64__ + #define SYS_gettid 1105 +-#elif __i386__ ++#elif defined(__i386__) + #define SYS_gettid 224 +-#elif __amd64__ ++#elif defined(__amd64__) + #define SYS_gettid 186 +-#elif __sparc__ ++#elif defined(__sparc__) + #define SYS_gettid 143 + #else + #error define gettid for the arch @@ -2234,18 +2254,22 @@ st->print("Memory:"); st->print(" %dk page", os::vm_page_size()>>10); diff --git a/debian/rules b/debian/rules index bc30c37..c52344b 100755 --- a/debian/rules +++ b/debian/rules @@ -412,9 +412,10 @@ endif CONFIGURE_ARGS = --with-boot-jdk=$(BOOTJDK_HOME) # GNU/kFreeBSD don't support epoll syscall so don't try to check of it. -ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386)) - CONFIGURE_ARGS += --disable-compile-against-syscalls -endif +# FIXME need to check the flag, configure complains about it +#ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386)) +# CONFIGURE_ARGS += --disable-compile-against-syscalls +#endif #CONFIGURE_ARGS += --with-pkgversion="$(PKGVERSION)" @@ -452,13 +453,14 @@ endif EXTRA_BUILD_ENV += LIBFFI_LIBS=-lffi_pic # assume we don't build binary indep packages on these architectures -ifeq ($(with_docs),yes) - ifeq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia)) - CONFIGURE_ARGS += --disable-docs - endif -else - CONFIGURE_ARGS += --disable-docs -endif +# FIXME check is flags, configure compiles about it +#ifeq ($(with_docs),yes) +# ifeq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia)) +# CONFIGURE_ARGS += --disable-docs +# endif +#else +# CONFIGURE_ARGS += --disable-docs +#endif CONFIGURE_ARGS += --with-num-cores=$(NJOBS) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
