This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjfx.
commit 51b29cb655a430bb147b8024fa0b1be32ea05001 Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 19 17:23:11 2014 +0200 Enable SSE2 on i386 and amd64 only to avoid a build failure on other CPUs --- debian/changelog | 1 + debian/patches/08-disable-sse2.patch | 63 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 65 insertions(+) diff --git a/debian/changelog b/debian/changelog index d7f375c..365b309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ openjfx (8u20-b26-3) UNRELEASED; urgency=medium * Disabled the architecture verification in build.gradle to attempt building on more archs than i386 and amd64 * Disabled assembler in WebKit on unsupported architectures + * Enable SSE2 on i386 and amd64 only to avoid a build failure on other CPUs -- Emmanuel Bourg <[email protected]> Fri, 19 Sep 2014 13:47:51 +0200 diff --git a/debian/patches/08-disable-sse2.patch b/debian/patches/08-disable-sse2.patch new file mode 100644 index 0000000..2597a67 --- /dev/null +++ b/debian/patches/08-disable-sse2.patch @@ -0,0 +1,63 @@ +Description: Enable SSE2 on i386 and amd64 CPUs only +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile ++++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +@@ -14,7 +14,6 @@ + + CFLAGS = -fPIC \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +@@ -27,6 +26,11 @@ + CFLAGS += -g -Wall + endif + ++DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) ++ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386 amd64)) ++ CFLAGS += -msse2 ++endif ++ + PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) + PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0) + +--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile ++++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +@@ -16,7 +16,6 @@ + + CFLAGS = -fPIC \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +@@ -33,6 +32,10 @@ + CFLAGS += -g -Wall + endif + ++DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) ++ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386 amd64)) ++ CFLAGS += -msse2 ++endif + + INCLUDES = -I$(SRCBASE_DIR) \ + $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \ +--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile ++++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile +@@ -38,9 +38,13 @@ + + CFLAGS += -fPIC \ + -Werror=implicit-function-declaration \ +- -msse2 \ + -DGSTREAMER_LITE + ++DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) ++ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386 amd64)) ++ CFLAGS += -msse2 ++endif ++ + PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) + PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0) + diff --git a/debian/patches/series b/debian/patches/series index 75215e4..7df81a9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 05-set-antlr-timeout.patch 06-disable-architecture-verification.patch 07-disable-assembler-on-unsupported-archs.patch +08-disable-sse2.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
