From 33e003ac56cfef67835f4bc91ed460b92e9f7d7d Mon Sep 17 00:00:00 2001 From: Johann Schmitz Date: Thu, 13 Nov 2014 15:11:56 +0000 Subject: [PATCH] Added patch to strip -Werror from compile flags (bug #528780) Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x77C501ED --- dev-java/jnr-ffi/ChangeLog | 8 ++- dev-java/jnr-ffi/Manifest | 20 +++--- .../jnr-ffi/files/jnr-ffi-0.7.11-flags.patch | 18 +++++ dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild | 65 +++++++++++++++++++ 4 files changed, 101 insertions(+), 10 deletions(-) create mode 100644 dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch create mode 100644 dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild diff --git a/dev-java/jnr-ffi/ChangeLog b/dev-java/jnr-ffi/ChangeLog index 83b885eb4fa6..c9088d24dbc6 100644 --- a/dev-java/jnr-ffi/ChangeLog +++ b/dev-java/jnr-ffi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/jnr-ffi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.13 2014/01/12 03:10:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.14 2014/11/13 15:11:53 ercpe Exp $ + +*jnr-ffi-0.7.11-r1 (13 Nov 2014) + + 13 Nov 2014; Johann Schmitz + +files/jnr-ffi-0.7.11-flags.patch, +jnr-ffi-0.7.11-r1.ebuild: + Added patch to strip -Werror from compile flags (bug #528780) *jnr-ffi-1.0.10 (12 Jan 2014) diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest index e09ba0859fc5..c8eb678dd0d4 100644 --- a/dev-java/jnr-ffi/Manifest +++ b/dev-java/jnr-ffi/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX jnr-ffi-0.7.11-flags.patch 727 SHA256 aa37ae8a3d6674a141f3e2e448bf5a2ac9c6a64d41185b42fd7f50ca63922b4b SHA512 2ad0a5682d86a3c93eb5b099c919c866b40348addb8efa779cc94fe575f37e1e8638438faf34cad9641c74c0338c8bd3983c0fa940bdff4787e4b60226619d80 WHIRLPOOL 7489d8fd7f92abddd1a44943bf1eeeab8c794f747e2565ab3625cae2b37625521b62ba4801cc640e16e0ded959913fda70cf2ee502b0ac987d7da156d35ea072 AUX jnr-ffi-1.0.6-junit48.patch 467 SHA256 9aab14e22055438d5b6fc8aa50c6923fdc5775458d558ba97309277eb7455e4f SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884 WHIRLPOOL aa6317f662efd57901f986043366880b629fdd45e30ccf20c9c37aa1e92a9022479c12779a69b6b434a0f9da9da06677a7ced20e35161252b85e87633a128092 AUX jnr-ffi_maven-build.xml 11211 SHA256 8a69395ee802785c1b55f4527cf594ca18c59e2ff35b94c43a40dde8eeb06919 SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359 WHIRLPOOL 81497fd103c5f445d5ac5a3548fce4f3b138f066dbd8bff0aba58f7f2c3f17af072a152ff9e22bccfc8a787871caff68d4bb960bd72db81699e891dcbd445be4 DIST jnr-ffi-0.5.10.tar.gz 559174 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a SHA512 dc1eff430ab87dcecb798466088cc81fd92d5c44dfe473673635c3dfd7ad7e3e416d2086377b5b93b134902e7e6c3a736ef235f17a358a5a7f541dbaea41b2e5 WHIRLPOOL cef64a4e2db33262c4864b03c95303394c937682ceb9f9fad821932099c1f6e4eb6de36ae655c564aebf69bd4a99a1753839e49396b1adf1c9399bd8a16ef53f @@ -12,21 +13,22 @@ DIST jnr-ffi-1.0.10.tar.gz 169255 SHA256 baa6ba61b0e336c141d1a4a3787f946363d6c60 DIST jnr-ffi-1.0.6.tar.gz 168393 SHA256 b049161d4e327085d3c9074dd97c41000fb812b8c5ea6c70a75474db469b81a1 SHA512 7673f9d5a513713bff5992a69db848315f7961a3417c4a247bb26226535d25172b6de26bc4ecc58ae8889da2ba62de40a6e434fb3a4b21a820962e2bce2ba2fa WHIRLPOOL b39831407e3210ce5736842bce4a5ade2d1727abfcfd159ae2d376e78c8fe4f88b3757e7a97e06c56aa47845fded054506f27141ab057a9266d3b06dba0c08c1 EBUILD jnr-ffi-0.5.10.ebuild 1746 SHA256 ea839d72e3dafcf20f290002e7e2c76f26c4e710278fbbaa9b562e3402a4974a SHA512 7d8cb9c1179a5291ad07f99fa6d490f3f7177db18898a30cbba9497e499d35ebc3878d9da922d2fdfc2cf54202eb7c4d14bb82710bae5e766b97ca6b58bbd33e WHIRLPOOL daf9e228af119b18ce3226aa122883684f16ffdbbbe7efda1ab100ff1213e7e33e46ca14751ad65292b4b0d619a682b8227dab978ad69d0697a4ee3438523403 EBUILD jnr-ffi-0.6.0.ebuild 1574 SHA256 b1749c5d98efcfe5dfa41009c04eba7a9be189a4967f91642086a68ddc257104 SHA512 385095e9f0373b531fdd8a903ff4ac6ce507b47decc9e3cc53db85fe6a6cd6dada19fafe397944074e8abe87c9dc9520c894b1b3a0a3e7e0fcfacc50bb3c5d0d WHIRLPOOL fb842c514b1395229b7ed2e2723d609db6e64f7cbf73b1576506a6fe9e365522cd7c7e987a2c7a033a52b7b383355511f9284e09f6a45e16dda665d1980d8965 +EBUILD jnr-ffi-0.7.11-r1.ebuild 1824 SHA256 f82d37e1833c772d208776529ca52a83733f77a85b7333b2add0f4ff0aa89926 SHA512 a33f8fafa5bd548297f43721e4b10e18a676aef67eba3569f5b7bb3340832dd83062c5e3e9f6570d8cbcac149952596828c0837afb362b4253244207a9b82825 WHIRLPOOL eda071cec0e94631853a3d6360fd0901fa3f3fa497010db5c44fa14accc6173d691f22f72286078e94656078c75115ed3e812c429a9e67cf63cac1af08358aeb EBUILD jnr-ffi-0.7.11.ebuild 1578 SHA256 7919eb990e6cfc7a7fb158618c9bf0fc80bb5a2051cc4fd2f0f8de688e313e49 SHA512 03d3002dbe5271a0629c756a0f8ead24ccf38a38b0343f5226272ede53e1a84e5ce2d91618580b403a8fac06f69d48d29f21e722b59829379c4ad6d5d965696c WHIRLPOOL b0530fb7a62a9b678d7fc48f22ea82c35ca234fbecf64e7346f893342ab81be983719d9c1605d26cd5768524110573c27ec1ca47f4c8056c58b3116069c60b08 EBUILD jnr-ffi-0.7.7.ebuild 1580 SHA256 0fcc5c2ec8d688bb2f4748950e3a1bd4bb037d3bd5b903a5b1d054b36bab53e3 SHA512 5e97cc87d9dca8428bb94191aa6bbd7bb29570d2d98afbaa2f3318fe41e3493a1cc78bb4ace62a37f50c142ddedb966c8b82c0880b5af39ab4b2d91253a8d7b5 WHIRLPOOL bb83600aed3954ccb27e116f25597858946a7ed1f5e95e83f4d035ae6032fe34030f61889c45302558d6be3c3a7d7f5b7a528e8f25c41ea388aa39cfe2e32a10 EBUILD jnr-ffi-0.7.9.ebuild 1580 SHA256 bf5cdfed3383fa9c008e0317be9a8f3278b314fa16e9d9ae786e9ecad29e42ed SHA512 f671f992842419dc8349ffb9a98ab443cd4cf93a87e5d69175a00be7d42faa7f6e79373d8f13ccd2ed52e4e1760b6de1dfd1fef03a9c9fa8a255c278a74db95a WHIRLPOOL 9406931780b528f935779df2823b357ea1e274f3e2cd9aea1c3ddc8352c304d7389f843fb76c2316dbea5dfcca09ac3a32cb08bb002df768423f0386bf6ce7c0 EBUILD jnr-ffi-1.0.10.ebuild 1625 SHA256 af64207a6d98a2adf0dea61ce860df5f38e123f66545967acd312409b15ba615 SHA512 7d218206a6505effc1c6f21f48aadf9e6ea9d5075e3dd1420a703f2c1590efc423f97217622321c6da8e975419041021b426f5cedfb53861dc830bed77a59d8c WHIRLPOOL ac532a0755cda425f3db3aec4eb1371abfce0db5abb04f2ddb66c0bcab3599cf54e49e40cab61f3d277eac9c86d7652421eded745962502a85d8e858386b7933 EBUILD jnr-ffi-1.0.6.ebuild 1617 SHA256 34035ffa32adc5da455323d84b87c4de7b93fd59f52f25f23a9f76a39ca2d8e4 SHA512 8447d4f5b48623633dce0de91dc3ea52ca86dc9f46949709bc26fe2be2d01536efce1c7b13e19f3aa9787c6c44785c3addceefa584042c2837faa2b6068df4a0 WHIRLPOOL 68237f3fc01c613758f9db1a5c2a66058a52b55221917852a34357b731dd06861a6290910ee215689458c550dbd6f6ef3210704e0aa23356bd1f6cd65275f76d -MISC ChangeLog 2308 SHA256 2a09d32f89474368cf63627ea89a2ab6c0fc4dc078672dc7c24987a279fa888f SHA512 776ab0bbaffbca43f82aa68a78e2d03e303093129b087d564bc731b0740da5bd298dcf72153ecd30e8177155842143cc5a1fa46161203363ad4893b0fa95f3d7 WHIRLPOOL d2b005a8cd0a606735a9f3a1c2b971e8b9af4bf5f454065d2981463e08880ca1f3a1119605c15b48233d1f86183c95772821b70b713bf7804665b6a6987f17a7 +MISC ChangeLog 2519 SHA256 4269e8f21d0a4298325fe77122e3cf3305eac97506600d9d011c0d73ebf95d3a SHA512 1be3a1cb3e5454412bd874ebc8e1cb1f972f066d648dbd5473a339be14fe7de28ff46ede8a27e9644174e9e220126777dfc1f07729719deb72e15d74ca7aaf3b WHIRLPOOL f42d02d2ebf2f6901d01ad64140c7e97c550e804d16e04c727a2c564ba2439ce07e673d0f7bfa2eb461485837c60aae835a1bee4b7b0190a523c946da1ef6222 MISC metadata.xml 205 SHA256 e319f1701f6be29c8e077049d77738b69b72be0458754ef90ad9a684f2ec1722 SHA512 fb7831a8a05e9995888eaef748c98a12adcb911ef1c9901a3555765782d87cd3172cfb2c47ffa89d8a5454e7aa1f5bd27358b88a035c97f1ff388d7fc85a9d7e WHIRLPOOL 673d7b564054942d04b33cfcd01f7c5ff16ad9f9f2a60586ccc54c60443bf2dc34fa037e4e1de889539838342eea62022a3b9a7cae65b0c2f34fcbacfcfd0c73 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQEcBAEBCAAGBQJS0gd9AAoJEJWyH81tNOV9HQ0IAI3LE36/nfqTzZ3jJMO9Ebia -+lBnq628pRIJnQbODxPPBy2FYaEptlQXWasqlg3Ysx9XrXc4Rvo0Shq/hmbXWgFK -O/krAe8cDZdXBK6vJD6730pH/f93Vm/Fl5/TSTQTfU0S5rNMIgreVTPSceY6rk6B -9h4F44LLsv4yefgPDLugOFN4SC/hYRxL7drNtv+gvXAUJ5i0tFI3UWx8vylbpGoX -jLcDVzNeESiRbnrDZRwyiDfIWhsaH1GlQ4Z4xqImuUzMF1eNMWd/HVasFHG7bJXq -1LpC0ig0hboJqHPuTfY3vpsBigDolc4nWyY+cFRdKlBfLvyzWHi1l2eNuGingIo= -=UreU +iQEcBAEBCAAGBQJUZMo6AAoJEKCEBkJ3xQHtE6EH/0T9SiJES//2Ml1LfNXS9PYa +tDf6zMDTQC7fQ3F3fQrOBOw3F1csSZYXg2QyXeaR15rLltZlqzz665ZsO3HIh0sT +9/qLnNmr0OfnTIzPzxw8Oh7mlTu1uXQxLw+6E+Vpo2xZEzCA9XKk2+WomcXpPUii +RPTAecL8FmcDoMUDTQhb67p9I2QK+f22js5HpkiqA7TqT/i8QIxbJprUCaW91+kx +0lHS5xbkzp5Vc1lW+Zngwrl6WZJfeQl47EUy66LFWm+fTzjjeECanrydCeBWbRl1 +yaukOJgn+p6xXNcoijpeD1K7AKX8VWUPnlL9T6ye0//K7pwR8/WCDI1N6InHAZM= +=IRSM -----END PGP SIGNATURE----- diff --git a/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch b/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch new file mode 100644 index 000000000000..f47e8d259b15 --- /dev/null +++ b/dev-java/jnr-ffi/files/jnr-ffi-0.7.11-flags.patch @@ -0,0 +1,18 @@ +diff --git a/jnr-ffi-0.7.11/libtest/GNUmakefile b/jnr-ffi-0.7.11/libtest/GNUmakefile +index 1906219..c9a9c11 100644 +--- a/jnr-ffi-0.7.11/libtest/GNUmakefile ++++ b/jnr-ffi-0.7.11/libtest/GNUmakefile +@@ -37,10 +37,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/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild new file mode 100644 index 000000000000..32c85f0612e8 --- /dev/null +++ b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild,v 1.1 2014/11/13 15:11:53 ercpe Exp $ + +EAPI="5" + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 vcs-snapshot + +DESCRIPTION="An abstracted interface to invoking native functions from java" +HOMEPAGE="https://github.com/jnr/jnr-ffi" +SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="|| ( Apache-2.0 LGPL-3 )" +SLOT="0.7" +KEYWORDS="~amd64 ~x86" + +COMMON_DEP=" + >=dev-java/jffi-1.2.7-r1:1.2 + dev-java/jnr-x86asm:1.0 + dev-java/asm:4" + +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.5" + +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.5 + test? ( + dev-java/ant-junit:0 + >=dev-java/junit-4.8:4 + )" + +java_prepare() { + cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die + epatch "${FILESDIR}"/${P}-flags.patch +} + +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc" +JAVA_ANT_ENCODING="UTF-8" + +EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0" +EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" + +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" + +src_test() { + # Fails, upstream pom has ignore test failures enabled. + rm -v src/test/java/jnr/ffi/StringArrayTest.java || die + + # build native test library + emake BUILD_DIR=build -f libtest/GNUmakefile + +# _JAVA_OPTIONS="-Djffi.boot.library.path=${EPREFIX}/usr/$(get_libdir)/jffi-1.2 -Djffi.boot.library.path=${EPREFIX}/usr/$(get_libdir)/jffi -Djava.library.path=${EPREFIX}/usr/$(get_libdir)/jffi" + _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \ + java-pkg-2_src_test +} + +src_install() { + java-pkg_dojar target/${PN}.jar + + use doc && java-pkg_dojavadoc target/site/apidocs + use source && java-pkg_dosrc src/main/java/* +} -- 2.26.2