diff options
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 41659 -> 41665 bytes | |||
-rw-r--r-- | sci-libs/ogdi/Manifest | 2 | ||||
-rw-r--r-- | sci-libs/ogdi/ogdi-3.2.0.ebuild | 2 | ||||
-rw-r--r-- | sci-libs/proj/Manifest | 2 | ||||
-rw-r--r-- | sci-libs/proj/proj-4.9.2.ebuild | 2 | ||||
-rw-r--r-- | sci-libs/tensorflow/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/tensorflow/files/tensorflow-1.8.0-0002-dont-strip.patch | 29 | ||||
-rw-r--r-- | sci-libs/tensorflow/tensorflow-1.8.0-r1.ebuild (renamed from sci-libs/tensorflow/tensorflow-1.8.0.ebuild) | 42 |
8 files changed, 62 insertions, 20 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 97b19c4241fe..e604dfe04444 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest index 43a5c893b7af..a4661daff4ef 100644 --- a/sci-libs/ogdi/Manifest +++ b/sci-libs/ogdi/Manifest @@ -16,6 +16,6 @@ DIST ogdi-3.1.5.tar.gz 913902 BLAKE2B ec60b620823b0ac77823b4c41f828d7edb8651d4dd DIST ogdi-3.2.0.beta2.tar.gz 956839 BLAKE2B d0729d42f3224d9911bb09f8cf2f150204950739547bf8ed5349c8ed63e7ab7a4e17298fe8bbf45fc17f5781e86925ab35d8356d396ffe7f35a4cf20803fce04 SHA512 2159dfd010be9da63cf009beee7f6571cd13c4f08d1a69a5d945dd64878347b28455eb5376f184e2d91fa4a3bd409446ccbd706aa9000d3d7d2ac4b6e30ced93 DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0 EBUILD ogdi-3.1.5-r1.ebuild 1106 BLAKE2B df33e6ef2c2caf31b191662b3cbbde8c2e13dadbbacf7a46e9dcd5f595ee2845cdc0dc1fa6e8d1b4d798eca90f26a9cc4183eded2ff76c8c981ba5987b9d370a SHA512 2918251648dee47da2e1fed456e14dce64b59b16baa2128ccf0e33810c8c66780a439a5b520537e182573d4b8e99471a5f382bf9b74b895de29544acf9664120 -EBUILD ogdi-3.2.0.ebuild 1713 BLAKE2B 67711c73536ca49d3c943915e860b9f32fd0c7b1fd3e2dd35b614fc1e3336cbed59d0c1432b9af2b2c94f8230b46834bb766b26b1ddc874f0fd1db5d16899b2b SHA512 36cb92c59b133132a31512cd6a7aab7cdb2b273b2770d1f462aa0308f2e735bf869584766476daacd817aa727f5d8471c6ef45e1b92a76d4b829bcfd525b77ca +EBUILD ogdi-3.2.0.ebuild 1712 BLAKE2B 1b8e346639cbc60551e82eeaa3ad4b7958939e2aefbed3d5554179c517955dc84f08e19b8238e65b27d4b254b42c781766f42e32d933a38e23578c03715d2e5d SHA512 91903156b5c98782bcb5377d9a7820e16087c4360d18365e5f65a3cc8dea46cdcb638a3e44ded81321e5f98c9024e832ed9f4cb1fbdf825942d4fbfb28d2cd06 EBUILD ogdi-3.2.0_beta2.ebuild 1549 BLAKE2B ed66593abbf8525dc1b6282e08bc0c73863fda2a9be458f7ea9cb483690dae42ff88fc4ccf014abbd7a95dd0c6a9fdd59953519d668b2ac9ed6c81e15b8b16a2 SHA512 13418dbe5f9bdf62bee8d5a3a8e11562cadb40221fcb47f862c01e0dc52170cfcd6b10901af69c4d94da472f2b1b87f26c78954982d8cb8398453b8ddfda6fdc MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221 diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild index bdb3f530f1a1..1473c674acc2 100644 --- a/sci-libs/ogdi/ogdi-3.2.0.ebuild +++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="static-libs" DEPEND=" diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest index 66d5e7ae7c57..bb665e03e7df 100644 --- a/sci-libs/proj/Manifest +++ b/sci-libs/proj/Manifest @@ -4,5 +4,5 @@ DIST proj-4.9.2-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de DIST proj-4.9.2.tar.gz 874816 BLAKE2B a59a405298a7c8d5bcf3e1a29c5949b466fed5c3745d0f6d631fff3282f6135d6be21cd75c9b377692f4fb98ae6e10e75867fdeab868fdb49c1578073cd7e802 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda DIST proj-datumgrid-1.5.zip 2250131 BLAKE2B c83b5bab72b790c70fbf3b95782ba4e8e93e2accc93a0a8c06667908dc437de44aa3623799f685e020269090be103bac568fe6a9d73ce128b8af024ec1ca8442 SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3 EBUILD proj-4.8.0.ebuild 1299 BLAKE2B 0ebc7c73ece64fe41bf071f96becad9f416824e85e031cc1290b16e06d15717e4ef833f207687c7341a9cc09f94508aef508147ca1cd1a084b52bfda6a9e5b36 SHA512 1df5171dfd85e0eee8e49cbd9d603f016978658e73226a1809d5efc6aef96955784b7fc176b06e94e87a2ccdc13d92982d31807f104932a407e16f32f8d50254 -EBUILD proj-4.9.2.ebuild 1279 BLAKE2B 9604909916bbff45a330a4ecc656a053b493976fa1cb2d28ab9373027b58e730132424bf25f8e855b8281eab7aaa21b441703ce7ad671565d76f74da037cf468 SHA512 1f0602c08e5421a9fc9cda24cde3e6957e00daa77bcdf4ce6e987664767686c6b47103b6194e090ac560a79dc45398b04eae982c5a5556992fc65686fdaeaff6 +EBUILD proj-4.9.2.ebuild 1278 BLAKE2B 832adc77c20d87ea805ac255bd4cf56256ce14d11a982e58cd3243e1944b41cce895645308b2e6a5f6ac8a927126d808ec63e88ec47fc8dff23f5c2dc6d32b7a SHA512 b473463745084c60b535d6d6f91095a9a13ab6f0c7d72b010710d7112b16ee7991378e9bdb227657aaaed90292960160d147f4c988f674612158e6efe2a95a22 MISC metadata.xml 415 BLAKE2B 5bbcea99e5589d2c894dc19eaba8b7893d8965d4c8d25024917fa004e3905c0620a76dfaa34de4c2de156544d4ffdc94e3d05e222cb0b2b2b812ac261d0e9bf3 SHA512 8e98b001981de3b4062d8156577061b92918726c7992a3f96fb3d21c2f18d773efe343839255a4cc1ca69f50d05d16a4c48eb4aabc3db9f40a67ac62adc93e5b diff --git a/sci-libs/proj/proj-4.9.2.ebuild b/sci-libs/proj/proj-4.9.2.ebuild index 3988e3730f0f..6595cb0eed7d 100644 --- a/sci-libs/proj/proj-4.9.2.ebuild +++ b/sci-libs/proj/proj-4.9.2.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="java static-libs" RDEPEND="" diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest index eb7f4f3fa0da..9c085f2ff417 100644 --- a/sci-libs/tensorflow/Manifest +++ b/sci-libs/tensorflow/Manifest @@ -1,4 +1,5 @@ AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 5995 BLAKE2B 6f65cb3337e564fc1df01e525814fecfc00a98462563ecfea2b431f6be6f8084dc7e69ebec5a88252b7ad37f416593ca9402f032d0c055563751c7cbf1402567 SHA512 88ac3bb3ca953bec494f9187db3efdd081b76a88d4d5e04e5bff4762de603c2a5f95503d811d9ee19c236947ecf3a5467aed750977f7dc810317b3a43e777693 +AUX tensorflow-1.8.0-0002-dont-strip.patch 1181 BLAKE2B 98d25909f9b7a40e2f140dc47a6a1b79d332eba465e09c67c1088ca07301144f0fdc83d9a5b88b480bc2f4ec360da8011d281fa6b00f992f1f65b5861d4a0983 SHA512 af2311856f2efe3ea6ecf84aef4446f2a5dd79238fee26737b7ae9c1af861d8e95128046750f403c05be1c6c2a25129013f74f9d21f4204283938b50e1fc4356 DIST ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz 99753 BLAKE2B 79b0c9e2f3a8de91bb042e55cbc9f589970add4c9bdccd96c9a0f38887418c97aa67fc433b4feffb92a1384039b0d68a7cc6cda141371427a310172422bd41d6 SHA512 a21df040a5b3f67d9be006ae414113fa1ca86d38fa446acfab18afcbbb89ee7c48776fac5565d0694c99f1ff6ead3b10a9915eac7aae4d2a532ef5ac126a0072 DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191 DIST abseil_cpp-720c017e30339fd1786ce4aac68bc8559736e53f.tar.gz 529637 BLAKE2B fea7eceda492764613ffe944331e6b08af33d600036e9b2453f4c09e892f22f79a95b00a29a9bdf9e705d11502027d88659e19aa484cf4a02158209b058cec13 SHA512 3ac70cb924518627dfc6ec2eb5f65bc0e1235898eefebb0d0410867270065aa745d21456f1212b916e732b3f5dada18b03e526e02d09a09f445531798219006e @@ -41,5 +42,5 @@ DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae -EBUILD tensorflow-1.8.0.ebuild 12716 BLAKE2B 8545a75b7378b08f666cbdc0aa85d156f57b5995315c419c5f704cf9574987c2e7e61ba21a28f0f46c2824ba46c7b97662d0e998607c6967fdee9af326651653 SHA512 2d5f71375c8080f2c0103a442ab21dc4e55404b79cc6c3bdb27831ad905c9bd301821c33706c2949b400370e90ef70a8c4f5c6466a1aa1a1359162000981945f +EBUILD tensorflow-1.8.0-r1.ebuild 12704 BLAKE2B 09da9048917ec2a5919179791fe0ef6607d2453e8a0e16ea0809820629a10002fbb157b96a9aad2c4999a78a8cfe75f4d43db8d1ed428741188fa12932ed0f15 SHA512 d6ec346fa14febaefe985c428d151477243cf7f1d4f21ecc24ea19204acaf2ff28fb192879206e46bbb771bfe10958cc0c460d351c9dc9ea5798b9211a40d84e MISC metadata.xml 640 BLAKE2B 144684ba7084f37fabe0f6f89b18f75577ab847de50c4c42ea4ca74076f57f8e37469c45ed07001c537e079285cb4ed26eac0bd0169a7513576501ce53925555 SHA512 c57fa522651341c8bf9838ca7afc9dac6ae1597dc850382b255aab7e9b50d4b4eb92cdd0408d20dd9f737c1ee9b1ed7102e477c86693f7eeb498e75e51e19343 diff --git a/sci-libs/tensorflow/files/tensorflow-1.8.0-0002-dont-strip.patch b/sci-libs/tensorflow/files/tensorflow-1.8.0-0002-dont-strip.patch new file mode 100644 index 000000000000..9f828f3c8efc --- /dev/null +++ b/sci-libs/tensorflow/files/tensorflow-1.8.0-0002-dont-strip.patch @@ -0,0 +1,29 @@ +diff --git a/tensorflow/BUILD b/tensorflow/BUILD +index cfafffdd13..8ed22ccfea 100644 +--- a/tensorflow/BUILD ++++ b/tensorflow/BUILD +@@ -470,7 +470,7 @@ tf_cc_shared_object( + # excludes all but a subset of function names. + # On MacOS, the linker does not support version_script, but has an + # an "-exported_symbols_list" command. -z defs disallows undefined +-# symbols in object files and -s strips the output. ++# symbols in object files. + + tf_cc_shared_object( + name = "libtensorflow.so", +@@ -484,7 +484,6 @@ tf_cc_shared_object( + "//tensorflow:windows_msvc": [], + "//conditions:default": [ + "-z defs", +- "-s", + "-Wl,--version-script", # This line must be directly followed by the version_script.lds file + "$(location //tensorflow/c:version_script.lds)", + ], +@@ -510,7 +509,6 @@ tf_cc_shared_object( + "//tensorflow:windows_msvc": [], + "//conditions:default": [ + "-z defs", +- "-s", + "-Wl,--version-script", # This line must be directly followed by the version_script.lds file + "$(location //tensorflow:tf_version_script.lds)", + ], diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0-r1.ebuild index c12a3e04ae05..98643e5d2ceb 100644 --- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.8.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_{5,6} ) MY_PV=${PV/_rc/-rc} MY_P=${PN}-${MY_PV} @@ -101,6 +101,7 @@ S="${WORKDIR}/${MY_P}" DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md ) PATCHES=( "${FILESDIR}/0001-pip_package-modularize-build-script-to-allow-distros.patch" + "${FILESDIR}/tensorflow-1.8.0-0002-dont-strip.patch" ) bazel-get-cpu-flags() { @@ -140,24 +141,32 @@ setup_bazelrc() { # https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113 addpredict /proc - echo "startup --batch" > "${T}/bazelrc" || die + mkdir -p "${T}/bazel-cache" || die + mkdir -p "${T}/bazel-distdir" || die + + cat > "${T}/bazelrc" <<-EOF + startup --batch + + # dont strip HOME, portage sets a temp per-package dir + build --action_env HOME - # make bazel respect $MAKEOPTS - echo "build --jobs=$(makeopts_jobs) $(bazel-get-flags)" >> "${T}/bazelrc" || die - echo "build --compilation_mode=opt --host_compilation_mode=opt" >> "${T}/bazelrc" || die + # make bazel respect MAKEOPTS + build --jobs=$(makeopts_jobs) $(bazel-get-flags) + build --compilation_mode=opt --host_compilation_mode=opt # Use standalone strategy to deactivate the bazel sandbox, since it # conflicts with FEATURES=sandbox. - echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" >> "${T}/bazelrc" || die - echo "build --noshow_loading_progress" >> "${T}/bazelrc" || die - echo "test --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" >> "${T}/bazelrc" || die - echo "test --verbose_test_summary --noshow_loading_progress" >> "${T}/bazelrc" || die + build --spawn_strategy=standalone --genrule_strategy=standalone + test --spawn_strategy=standalone --genrule_strategy=standalone + + build --strip=never + build --verbose_failures --noshow_loading_progress + test --verbose_test_summary --verbose_failures --noshow_loading_progress # make bazel only fetch distfiles from the cache - mkdir -p "${T}/bazel-cache" || die - mkdir -p "${T}/bazel-distdir" || die - echo "fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/" >> "${T}/bazelrc" || die - echo "build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/" >> "${T}/bazelrc" || die + fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/ + build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/ + EOF } bazel_multibuild_wrapper() { @@ -170,8 +179,8 @@ bazel_multibuild_wrapper() { ebazel() { setup_bazelrc - echo Running: bazel --bazelrc="${T}/bazelrc" --output_base="${BAZEL_OUTPUT_BASE}" "$@" - bazel --bazelrc="${T}/bazelrc" --output_base="${BAZEL_OUTPUT_BASE}" $@ || die + echo Running: bazel --output_base="${BAZEL_OUTPUT_BASE}" "$@" + bazel --output_base="${BAZEL_OUTPUT_BASE}" $@ || die } load_distfiles() { @@ -235,6 +244,9 @@ src_configure() { export PYTHON_BIN_PATH="${PYTHON}" export PYTHON_LIB_PATH="${PYTHON_SITEDIR}" + # only one bazelrc is read, import our one before configure sets its options + echo "import ${T}/bazelrc" >> ./.bazelrc + # this is not autoconf ./configure || die } |