diff options
| author |   Johann Schmitz <ercpe@gentoo.org> | 2014-11-12 05:22:48 +0000 |
|---|---|---|
| committer | Johann Schmitz <ercpe@gentoo.org> | 2014-11-12 05:22:48 +0000 |
| commit | 8c5639ee38cc5d9e3ce534bb0a25108a1e8e50e4 (patch) | |
| tree | caf02ff1a06c76c94183dec531c0384c8486adc3 /dev-java/jffi | |
| parent | bump, drop py2.6 (diff) | |
| download | gentoo-2-8c5639ee38cc5d9e3ce534bb0a25108a1e8e50e4.tar.gz gentoo-2-8c5639ee38cc5d9e3ce534bb0a25108a1e8e50e4.tar.bz2 gentoo-2-8c5639ee38cc5d9e3ce534bb0a25108a1e8e50e4.zip | |
Dropped -Werror and optimization flags from test build flags (bug #528778)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Diffstat (limited to 'dev-java/jffi')
| -rw-r--r-- | dev-java/jffi/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jffi/files/jffi-1.2.7_no-werror.patch | 31 | ||||
| -rw-r--r-- | dev-java/jffi/jffi-1.2.7.ebuild | 4 |
3 files changed, 38 insertions, 3 deletions
diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog index b2bf24fe18bc..a08125bc2896 100644 --- a/dev-java/jffi/ChangeLog +++ b/dev-java/jffi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jffi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.33 2014/04/13 16:16:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.34 2014/11/12 05:22:48 ercpe Exp $ + + 12 Nov 2014; Johann Schmitz <ercpe@gentoo.org> + +files/jffi-1.2.7_no-werror.patch, jffi-1.2.7.ebuild: + Dropped -Werror and optimization flags from test build flags (bug #528778) 13 Apr 2014; Agostino Sarubbo <ago@gentoo.org> jffi-1.2.7.ebuild: Stable for ppc, wrt bug #492014 diff --git a/dev-java/jffi/files/jffi-1.2.7_no-werror.patch b/dev-java/jffi/files/jffi-1.2.7_no-werror.patch new file mode 100644 index 000000000000..517a1e546d8b --- /dev/null +++ b/dev-java/jffi/files/jffi-1.2.7_no-werror.patch @@ -0,0 +1,31 @@ +diff --git a/jffi-1.2.7/jni/GNUmakefile b/jffi-1.2.7/jni/GNUmakefile +index 27737be..98f147e 100755 +--- a/jffi-1.2.7/jni/GNUmakefile ++++ b/jffi-1.2.7/jni/GNUmakefile +@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG + OFLAGS = -O2 $(JFLAGS) + + # MacOS headers aren't completely warning free, so turn them off +-WERROR = -Werror ++WERROR = + ifneq ($(OS),darwin) + WFLAGS += -Wundef $(WERROR) + endif +diff --git a/jffi-1.2.7/libtest/GNUmakefile b/jffi-1.2.7/libtest/GNUmakefile +index 9e70664..72e4cc9 100644 +--- a/jffi-1.2.7/libtest/GNUmakefile ++++ b/jffi-1.2.7/libtest/GNUmakefile +@@ -44,10 +44,10 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS)) + # Compiler/linker flags from: + # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html + JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing +-OFLAGS = -O2 $(JFLAGS) +-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses ++OFLAGS = $(JFLAGS) ++WFLAGS = -W -Wall -Wno-unused -Wno-parentheses + PICFLAGS = -fPIC +-SOFLAGS = -shared -Wl,-O1 ++SOFLAGS = -shared + LDFLAGS += $(SOFLAGS) + + IFLAGS = -I"$(BUILD_DIR)" diff --git a/dev-java/jffi/jffi-1.2.7.ebuild b/dev-java/jffi/jffi-1.2.7.ebuild index a41d70e08751..a4c80775439d 100644 --- a/dev-java/jffi/jffi-1.2.7.ebuild +++ b/dev-java/jffi/jffi-1.2.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.7.ebuild,v 1.5 2014/04/13 16:16:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.7.ebuild,v 1.6 2014/11/12 05:22:48 ercpe Exp $ EAPI="5" @@ -31,7 +31,7 @@ DEPEND="${COMMON_DEP} java_prepare() { cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die - epatch "${FILESDIR}"/${PN}-1.2.6_no-werror.patch + epatch "${FILESDIR}"/${P}_no-werror.patch epatch "${FILESDIR}"/${P}-junit-4.11.patch # misc fixes for Darwin |