From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- app-i18n/Manifest.gz | Bin 21011 -> 21012 bytes app-i18n/ibus-rime/Manifest | 2 +- app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild | 2 +- app-i18n/ibus-skk/Manifest | 4 +- app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild | 30 - app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild | 4 +- app-i18n/kcc/Manifest | 5 +- app-i18n/kcc/files/kcc-1.0-fix-build-system.patch | 24 + app-i18n/kcc/kcc-1.0.ebuild | 29 +- app-i18n/libchewing/Manifest | 5 +- ...chewing-0.5.1-autoconf-archive-2019.01.06.patch | 809 +++++++++++++++++++++ app-i18n/libchewing/libchewing-0.5.1.ebuild | 22 +- app-i18n/libchewing/libchewing-9999.ebuild | 22 +- app-i18n/librime/Manifest | 8 +- app-i18n/librime/librime-1.2.9.ebuild | 3 +- app-i18n/librime/librime-1.3.1.ebuild | 5 +- app-i18n/librime/librime-1.4.0.ebuild | 5 +- app-i18n/librime/librime-1.5.3.ebuild | 64 ++ app-i18n/libskk/Manifest | 4 +- app-i18n/libskk/libskk-1.0.1.ebuild | 48 -- app-i18n/libskk/libskk-1.0.2.ebuild | 4 +- app-i18n/mozc/Manifest | 5 +- app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch | 35 + app-i18n/mozc/mozc-2.23.2815.102.ebuild | 4 +- app-i18n/mozc/mozc-9999.ebuild | 4 +- app-i18n/opencc/Manifest | 2 +- app-i18n/opencc/opencc-1.0.5.ebuild | 4 +- app-i18n/rime-data/Manifest | 2 +- app-i18n/rime-data/rime-data-0.38.20180515.ebuild | 4 +- app-i18n/unicode-cldr/Manifest | 2 + app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild | 27 + app-i18n/unicode-data/Manifest | 5 +- app-i18n/unicode-data/unicode-data-12.0.0.ebuild | 2 +- app-i18n/unicode-data/unicode-data-12.1.0.ebuild | 31 + app-i18n/unicode-emoji/Manifest | 6 + app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild | 37 + 36 files changed, 1128 insertions(+), 141 deletions(-) delete mode 100644 app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild create mode 100644 app-i18n/kcc/files/kcc-1.0-fix-build-system.patch create mode 100644 app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch create mode 100644 app-i18n/librime/librime-1.5.3.ebuild delete mode 100644 app-i18n/libskk/libskk-1.0.1.ebuild create mode 100644 app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch create mode 100644 app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild create mode 100644 app-i18n/unicode-data/unicode-data-12.1.0.ebuild create mode 100644 app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild (limited to 'app-i18n') diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz index 7b903fb39ce5..edb30db19543 100644 Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest index 8c1230535516..7effea8dc8c2 100644 --- a/app-i18n/ibus-rime/Manifest +++ b/app-i18n/ibus-rime/Manifest @@ -3,5 +3,5 @@ DIST ibus-rime-1.3.0.tar.gz 33930 BLAKE2B 14e086382d89c990ca9f07401b68dbe26d58da DIST ibus-rime-1.4.0.tar.gz 34176 BLAKE2B 69d0392adc78b2b8935f2239c4567d001d3636d0e8ff59aca0b04b3189751a3edd0350eea9e2262b3ae3e639dbd9715c157e44727cc48ba9521801161a1508f4 SHA512 3fc24f4ce390e27d37e41775e4c075c7465cd3e90a9ab61d13ec47c2ca1c2afaafb322f327e18be573aa254a43b8cf6426415500a5d817b835bf4e0615ab9145 EBUILD ibus-rime-1.2.ebuild 759 BLAKE2B 270180498169d6f2a503dcebc3cf01b78bbdfae03a45dc8fa8cbdecbb999fb40b1d8c675c002a51e625fbeb277e9abcaffcb23ba6a8a5d0c05af46c54a21d37d SHA512 2a28941562893dd9827bd9621abc7d89ae51e50132671f8fd3fa5533df340b523a1964eeb1d71df6492c074f286a4337a2ab93863d9d303b82af62768ebcefb4 EBUILD ibus-rime-1.3.0.ebuild 759 BLAKE2B 44bd36ab9b90c93c4a7338f3921ca100c06506acd2ee65c434d26802882b41b66168910cf7ae4cdf8045bbf54222b7200314e488251156c4e8fbdd2b07e3a9fd SHA512 ee0fbc41180122bcb9aa0cb793cb248d0100f813b3bf63b4737e24fc760029299e9d701e08ed2d68cc27ecfb0286a4c76c93cbb42c9d84d21be7b7c9a3d6fffb -EBUILD ibus-rime-1.4.0.ebuild 754 BLAKE2B f44276123c3dc529d62f5ff648dff08fd2fa83ea76b1409f8a52871b38671842db74ead442374aea46ff0ca92168b04e295123861bcbbda16d828e8f3305204f SHA512 e9d7bc424b02a0e481b2bc72b6c4309281ee08b7056daa5ed4d46f0d2d9bd675790e49b531bc9a8b3a7f624ef99e5f6950b13b9a208df86cad41dca31121bdb4 +EBUILD ibus-rime-1.4.0.ebuild 761 BLAKE2B 346a2abea3aa85ea4c2f877f8321a61137106d2d2d4409d8fec47195d992afe838bb0e97a02d5ecac2ca173e880388f01c76ef0b4af4279552a4e25d6854cce2 SHA512 9bc441c6ef302907057cf44dd3f6ff1028a52e1804ab4be6258c30c54d382e6f904dd31193d2e7a6ee995047865ee9414e84a8286e76d7fad569db33965fb544 MISC metadata.xml 534 BLAKE2B 0d1888080b3fcf1b2bd5ef07456c8ed3f91dad7e11bb1c34882a43ad2396bc6b5bb62f49bf8af4936d3d5df84b6af30dd4dfcf48ef343865ac36e50da26d061b SHA512 78e2d7631f65652305b451e5b4ab95886dd8a1c2436fb95c0f344daae87feab1eb57486a0815348363858faf91f9b931f32166a9b22b7613bd3b1407ac19e317 diff --git a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild index f59ab58a8622..c5d297d74fec 100644 --- a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild +++ b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="" CDEPEND="app-i18n/ibus diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest index bacd74d6e5ae..d40442def3fc 100644 --- a/app-i18n/ibus-skk/Manifest +++ b/app-i18n/ibus-skk/Manifest @@ -1,5 +1,3 @@ -DIST ibus-skk-1.4.1.tar.gz 478018 BLAKE2B 7e5cb7cf69b5a8949c462644ca7c871d8eccfff272d553986d687bc5ede02d4f35b5830d2a96823bf1d17ea17ec32b5eec59f75713d5a3bfc52424fc234ad5a7 SHA512 d8c0bf2c92fd96486ed10e9dcac861b4fc16e741fd96764671352e9e67226887ad6aa4b76c4891411029d3f5bf692de1162f996a294cecc9e5231e90ea0df5f0 DIST ibus-skk-1.4.2.tar.gz 491882 BLAKE2B 999eb9f1b36406a8d665b2c929fcdef5e57bef5c6206075333435f46774445497d6d953bc695c22f6afa5700283c32a20c2d4e9227fd30e5552f5688cd524aab SHA512 cec7fbffaa78c406f3b9502bc64e2290fec579102a37ce61cb6424c3e06d159653f165b48e09f1256f38491bce6819460c6d226cd765ab150a8dfa80e2707fe1 -EBUILD ibus-skk-1.4.1-r1.ebuild 615 BLAKE2B 7a739e70f37df02499ff1efbc4a2074f5eb0c23662eea60d487e2ed0d73c32565258caf6a8a2c6400c216b64c0d7312a11538bcf7565b6f6f8bce955cebf6a5f SHA512 573ff5b1078f90f33cab2a021250352590cae460abbf86af793078fbe3c2ed483603aac9fa4dba7a3124c9501b34d16421512ae62a50362d32f83eb83655f937 -EBUILD ibus-skk-1.4.2.ebuild 682 BLAKE2B f314ea7ec040f6abf272a6e3b2bec66da61d150bcccf4e39d11cc4612e7f41d24a6e167340f7bc08a5eec6b47aadb47be31de1f4f9817f3f1c67152240ecd192 SHA512 18c68cf809833a68dc98e71461c008f6ae0ce987cb519a35cc275191693bf07e24cc910f4acf4322f40688ad17ec3815e65110e2c3b23ad88d81555342804bc2 +EBUILD ibus-skk-1.4.2.ebuild 677 BLAKE2B 5538513d4f7b79c2e51510fc470a0e4067d93eb3a8bfe0c33a86b64e830dcd37c05e5fec6defc0b0246e79c4e16539ba4a56ff926d6e045ab8cfa98a91847549 SHA512 52cce129f1d192217aae798513411a769cacb00fdd9449068cf00398c0dcae753c18d5194cb00caf55c91a3c49e0eea56f77b4af58f18138727823d84deeae5b MISC metadata.xml 473 BLAKE2B 8902e2b4a2bffb4243bef33353868e2c4c75c3bf36efaac1572f17a265b7084f0c136a4bf77f123016c3fe3cead11463dc1de34a981284c36228667240759705 SHA512 dc943537d163c1197dae0d85ee91fec23eba4026f0bb91d3211cf7ef2cba414c6ab65eb69c74205af35e0620f89afa553927d70b4883590b4a06823e442ae771 diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild deleted file mode 100644 index 40c0d245e466..000000000000 --- a/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -DESCRIPTION="Japanese SKK engine for IBus" -HOMEPAGE="https://github.com/ueno/ibus-skk" -SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -CDEPEND="app-i18n/ibus - <=app-i18n/libskk-1.0.1 - x11-libs/gtk+:3 - nls? ( virtual/libintl )" -RDEPEND="${CDEPEND} - app-i18n/skk-jisyo" -DEPEND="${CDEPEND} - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -DOCS="ChangeLog NEWS README THANKS" - -src_configure() { - econf $(use_enable nls) -} diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild index fe548e75e5cf..0ad3a06bbcb0 100644 --- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild +++ b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="nls" CDEPEND="app-i18n/ibus diff --git a/app-i18n/kcc/Manifest b/app-i18n/kcc/Manifest index e1a351a221f4..b85505cbafe2 100644 --- a/app-i18n/kcc/Manifest +++ b/app-i18n/kcc/Manifest @@ -1,5 +1,6 @@ +AUX kcc-1.0-fix-build-system.patch 501 BLAKE2B 716e34d3fec17ed1d5acd62502b65f4345318c112220cc22684e5c2589e479ec1060b5b75f9835047487d3a6419a66135ed06b267388844fac7ac74da997eff5 SHA512 21f5ebbaaf478cf7f5e881ffb708266de4f41ea50898cffb596869b74e55c5bea98acbcbc318257da80f383ebd7626ab7640ccbd42db86fe67e1fec129aab9cb AUX kcc-exit.diff 161 BLAKE2B 48570ac2b258a9567e9dad4075a248f5a4d685225e4f676322a3430ef43764b95d5d36fac5f68ba6de1537b59d6750be8111ea79407019debf9f3928f069427e SHA512 8ee69339db13935d54562189e86941384dc5c01caa30e4efba11e783690b863a1210a5e841ab8a5ac907af9002ac6debd3516a6928f15777a8b31c2089907214 AUX kcc-gcc3-gentoo.diff 1026 BLAKE2B e7db744d0ce7b34e5686f5e5d256eb16def94cdf83aaeac1d21a77831c7b21df3852b50313af79a570a2fe21ca24dbcdc545d9f9afa498cbb78a9a867261f5c6 SHA512 59c57ee4c34e27b8a0558896e5a94b21f976351e0cd372bc9bd85ac83757276eecdcabd81e4fb02b6f2513e06542d63bcf656140d5407a0e2804f04d5ab55303 -DIST kcc.tar.gz 18869 BLAKE2B 122e6e749a0cc6a63244d32d735a23ea3bdc6ce81e90674d4aa8c6460b57c631e504490454710601a3e057c413d5579495533320f37820d4c3afd9053325c1dc SHA512 2ec1645bb7edbe49c6845cd6e6794568bd48efec367d2d9628ddb8a72d2b5edd590be101f4d9c8856764ae85c9aad7b0adf69601b78fddffdc23235b96f65145 -EBUILD kcc-1.0.ebuild 719 BLAKE2B 12e16f98ff4a63dba5f5f1258f42d7f489fb7ed20b1d67bb8113d8796ba624655369ced9152ed31cb35a14219e2c29fa8bd658e8088e4a8e1a3aa3b5f5acb87d SHA512 be0ae39180e876b6b7a64f5e45e82d88ab8e5276f6662954b807c5082169982344b096c79f08fc820f25717438a6e0bbfba4f32f690fd2df27b62dde904e9450 +DIST kcc-1.0.tar.gz 18869 BLAKE2B 122e6e749a0cc6a63244d32d735a23ea3bdc6ce81e90674d4aa8c6460b57c631e504490454710601a3e057c413d5579495533320f37820d4c3afd9053325c1dc SHA512 2ec1645bb7edbe49c6845cd6e6794568bd48efec367d2d9628ddb8a72d2b5edd590be101f4d9c8856764ae85c9aad7b0adf69601b78fddffdc23235b96f65145 +EBUILD kcc-1.0.ebuild 609 BLAKE2B fc0121ea4e198fb75d3056a7e56133f8bfedcdf9ffcb078461e6db28b9ccec34fa742524bb9f9897e203e617e7ba159b838478d05ef834c8f0f5f0d1c9b8f259 SHA512 516f3b811dc6204ec9dab414926a9d00aed49fd5341ea8be5219316775ce9e32148c122ea7b23cca6d8fc01e61c76176843a97542fafb8db772ebe2e72c43ef5 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd diff --git a/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch b/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch new file mode 100644 index 000000000000..7818215d62fc --- /dev/null +++ b/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch @@ -0,0 +1,24 @@ +--- a/Makefile ++++ b/Makefile +@@ -10,11 +10,9 @@ + BINPATH = /usr/local/bin + MANPATH = /usr/local/man + JMANDIR = japanese +- CFLAGS = -O + + SHELL = /bin/sh + CP = cp +- MAKE = make + INSTALL = install + + CMDS = kcc +@@ -23,9 +21,6 @@ + + all: kcc + +-kcc: kcc.o +- $(CC) $(CFLAGS) -o kcc kcc.o +- + install: $(BINPATH)/kcc + @echo "\`make install' done." + @echo "Run \`make install.man' to install a manual." diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild index bcb220713949..20ee1ee57350 100644 --- a/app-i18n/kcc/kcc-1.0.ebuild +++ b/app-i18n/kcc/kcc-1.0.ebuild @@ -1,34 +1,33 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A Kanji code converter" HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/" -SRC_URI="ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/${PN}.tar.gz" +SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 x86" -IUSE="" S="${WORKDIR}/${PN}" - -src_prepare() { - epatch "${FILESDIR}/${PN}-gcc3-gentoo.diff" - epatch "${FILESDIR}/${PN}-exit.diff" - sed -i "s:\(-o kcc\):\$(LDFLAGS) \1:" Makefile -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +PATCHES=( + "${FILESDIR}"/${PN}-gcc3-gentoo.diff + "${FILESDIR}"/${PN}-exit.diff + "${FILESDIR}"/${PN}-1.0-fix-build-system.patch +) + +src_configure() { + tc-export CC } src_install() { dobin kcc - dodoc README + einstalldocs + cp -f kcc.jman kcc.1 || die doman -i18n=ja kcc.1 } diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest index 2cfcde2e9252..12330029963b 100644 --- a/app-i18n/libchewing/Manifest +++ b/app-i18n/libchewing/Manifest @@ -1,4 +1,5 @@ +AUX libchewing-0.5.1-autoconf-archive-2019.01.06.patch 34944 BLAKE2B 582e2041ff8e99c90df6726ffe0fe7c3f09672ba841def4ded4f367d704a56349da9fe8c555e9b24ec5c82d73774c8690219532c08904cda29a2a33845d2f3d6 SHA512 8e93539fdea3fc6ef01ea070a64d6bdd873ec1c2555fbcb40cc639a22c74a07f8c2936eb100ebb36d146c0e17ce5f80afa8dd3468ff1f5c26a835c3d12b98bb2 DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f -EBUILD libchewing-0.5.1.ebuild 1157 BLAKE2B f9e817f8ef01af9e0e7519784030e1fcfcee909aa1e0668c48b4bcaac1e19f751339d06438629792edf0e16e1637f4f97d8e69dec1841430bbacaf55de86c2f4 SHA512 dbf2d3b7ff80fe5ec410ce3dd8aa3ae3633d98611e053e7d7178d197669364043d9df558a9f4c3e5ba19958a4d951cb04d47da4c2e6e60c063254dbc81d85f59 -EBUILD libchewing-9999.ebuild 1126 BLAKE2B 4e5e2f52f0794e5d411be7b0fcbe28a8e1fc8abfa08e79d57554cfe2f82233072036239ec651bc53ce0cbeaf8ffb6e7c01b6ac41ac02039561afa93e78dea8cd SHA512 b346f7510b75aa0f7e28db5e66b366ae082a5fc4fcdc4b6c21679604c3021de659aa643b7da47e47ad172b11c3009411f51fbcd1179f37e8942fd2896ebe3649 +EBUILD libchewing-0.5.1.ebuild 1313 BLAKE2B b6790434e94f5e82811dfc421c00e23199fe6e6748bebd53bd370a9bd6a3dbc5747e727036de51134607728e60875f11a1df083b2da3f7224f5031aa32fdca0f SHA512 da6256d7a243a8cfb5fcd019deb9dea17fed8cdc54c0c9849efcf5e16cf8b99d3fa3587a9dbfcd22c0d11e3b0a62d6a852c8a3e6957304cbfced95195062fccb +EBUILD libchewing-9999.ebuild 1282 BLAKE2B 2f634e9bbfbd708e33a907639066f90dacf2e4d68463642223f92fadee8e43940d8a738771dba712d0326fd0689fcef313b3cafe0819fbfe799ea4c31cf6dbf0 SHA512 d31d22a67c4a7f0f5690313b11792fee0e0e3489131361ecacbd0b9e9992f19e3031de13dae03c8d0864c6aeda710663d1f8ad4f48be9b09321481961afb1f06 MISC metadata.xml 327 BLAKE2B 3f9b234590aef775dc0ae62f4eef42cc1e363e04c3dabc2464eee9cfb44ec0b1fc4fe9b233f781c15784b3a699537d67e884ee7f1648a62b3a863480a5e831cd SHA512 c9ab28ab34d940a30e97b989fd96904d2e0816e4b1bc5b843b082d64d6cd476335d9402640e71f2cf8f57f44dcae9af66d5e07075b189fa74f21faba40d819e3 diff --git a/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch b/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch new file mode 100644 index 000000000000..5db3d0a23ab0 --- /dev/null +++ b/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch @@ -0,0 +1,809 @@ +https://github.com/chewing/libchewing/issues/308 + +--- /m4/ax_pthread.m4 ++++ /m4/ax_pthread.m4 +@@ -1,5 +1,5 @@ + # =========================================================================== +-# http://www.gnu.org/software/autoconf-archive/ax_pthread.html ++# https://www.gnu.org/software/autoconf-archive/ax_pthread.html + # =========================================================================== + # + # SYNOPSIS +@@ -19,10 +19,10 @@ + # is necessary on AIX to use the special cc_r compiler alias.) + # + # NOTE: You are assumed to not only compile your program with these flags, +-# but also link it with them as well. e.g. you should link with ++# but also to link with them as well. For example, you might link with + # $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS + # +-# If you are only building threads programs, you may wish to use these ++# If you are only building threaded programs, you may wish to use these + # variables in your default LIBS, CFLAGS, and CC: + # + # LIBS="$PTHREAD_LIBS $LIBS" +@@ -30,8 +30,8 @@ + # CC="$PTHREAD_CC" + # + # In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant +-# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name +-# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). ++# has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to ++# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). + # + # Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the + # PTHREAD_PRIO_INHERIT symbol is defined when compiling with +@@ -67,7 +67,7 @@ + # Public License for more details. + # + # You should have received a copy of the GNU General Public License along +-# with this program. If not, see . ++# with this program. If not, see . + # + # As a special exception, the respective Autoconf Macro's copyright owner + # gives unlimited permission to copy, distribute and modify the configure +@@ -82,35 +82,40 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 20 ++#serial 24 + + AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) + AC_DEFUN([AX_PTHREAD], [ + AC_REQUIRE([AC_CANONICAL_HOST]) ++AC_REQUIRE([AC_PROG_CC]) ++AC_REQUIRE([AC_PROG_SED]) + AC_LANG_PUSH([C]) + ax_pthread_ok=no + + # We used to check for pthread.h first, but this fails if pthread.h +-# requires special compiler flags (e.g. on True64 or Sequent). ++# requires special compiler flags (e.g. on Tru64 or Sequent). + # It gets checked for in the link test anyway. + + # First of all, check if the user has set any of the PTHREAD_LIBS, + # etcetera environment variables, and if threads linking works using + # them: +-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then +- save_CFLAGS="$CFLAGS" ++if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then ++ ax_pthread_save_CC="$CC" ++ ax_pthread_save_CFLAGS="$CFLAGS" ++ ax_pthread_save_LIBS="$LIBS" ++ AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"]) + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +- save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" +- AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) +- AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes) +- AC_MSG_RESULT($ax_pthread_ok) +- if test x"$ax_pthread_ok" = xno; then ++ AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS]) ++ AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes]) ++ AC_MSG_RESULT([$ax_pthread_ok]) ++ if test "x$ax_pthread_ok" = "xno"; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi +- LIBS="$save_LIBS" +- CFLAGS="$save_CFLAGS" ++ CC="$ax_pthread_save_CC" ++ CFLAGS="$ax_pthread_save_CFLAGS" ++ LIBS="$ax_pthread_save_LIBS" + fi + + # We must check for the threads library under a number of different +@@ -123,7 +128,7 @@ + # which indicates that we try without any flags at all, and "pthread-config" + # which is a program returning the flags for the Pth emulation library. + +-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" ++ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + + # The ordering *is* (sometimes) important. Some notes on the + # individual items follow: +@@ -132,68 +137,225 @@ + # none: in case threads are in libc; should be tried before -Kthread and + # other compiler flags to prevent continual compiler warnings + # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +-# -pthreads: Solaris/gcc +-# -mthreads: Mingw32/gcc, Lynx/gcc ++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64 ++# (Note: HP C rejects this with "bad form for `-t' option") ++# -pthreads: Solaris/gcc (Note: HP C also rejects) + # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +-# doesn't hurt to check since this sometimes defines pthreads too; +-# also defines -D_REENTRANT) +-# ... -mt is also the pthreads flag for HP/aCC ++# doesn't hurt to check since this sometimes defines pthreads and ++# -D_REENTRANT too), HP C (must be checked before -lpthread, which ++# is present but should not be used directly; and before -mthreads, ++# because the compiler interprets this as "-mt" + "-hreads") ++# -mthreads: Mingw32/gcc, Lynx/gcc + # pthread: Linux, etcetera + # --thread-safe: KAI C++ + # pthread-config: use pthread-config program (for GNU Pth library) + +-case ${host_os} in ++case $host_os in ++ ++ freebsd*) ++ ++ # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) ++ # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) ++ ++ ax_pthread_flags="-kthread lthread $ax_pthread_flags" ++ ;; ++ ++ hpux*) ++ ++ # From the cc(1) man page: "[-mt] Sets various -D flags to enable ++ # multi-threading and also sets -lpthread." ++ ++ ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" ++ ;; ++ ++ openedition*) ++ ++ # IBM z/OS requires a feature-test macro to be defined in order to ++ # enable POSIX threads at all, so give the user a hint if this is ++ # not set. (We don't define these ourselves, as they can affect ++ # other portions of the system API in unpredictable ways.) ++ ++ AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING], ++ [ ++# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) ++ AX_PTHREAD_ZOS_MISSING ++# endif ++ ], ++ [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])]) ++ ;; ++ + solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based +- # tests will erroneously succeed. (We need to link with -pthreads/-mt/ +- # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather +- # a function called by this macro, so we could check for that, but +- # who knows whether they'll stub that too in a future libc.) So, +- # we'll just look for -pthreads and -lpthread first: ++ # tests will erroneously succeed. (N.B.: The stubs are missing ++ # pthread_cleanup_push, or rather a function called by this macro, ++ # so we could check for that, but who knows whether they'll stub ++ # that too in a future libc.) So we'll check first for the ++ # standard Solaris way of linking pthreads (-mt -lpthread). ++ ++ ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags" ++ ;; ++esac ++ ++# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) + +- ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" ++AS_IF([test "x$GCC" = "xyes"], ++ [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"]) ++ ++# The presence of a feature test macro requesting re-entrant function ++# definitions is, on some systems, a strong hint that pthreads support is ++# correctly enabled ++ ++case $host_os in ++ darwin* | hpux* | linux* | osf* | solaris*) ++ ax_pthread_check_macro="_REENTRANT" + ;; + +- darwin*) +- ax_pthread_flags="-pthread $ax_pthread_flags" ++ aix*) ++ ax_pthread_check_macro="_THREAD_SAFE" ++ ;; ++ ++ *) ++ ax_pthread_check_macro="--" + ;; + esac ++AS_IF([test "x$ax_pthread_check_macro" = "x--"], ++ [ax_pthread_check_cond=0], ++ [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"]) ++ ++# Are we compiling with Clang? ++ ++AC_CACHE_CHECK([whether $CC is Clang], ++ [ax_cv_PTHREAD_CLANG], ++ [ax_cv_PTHREAD_CLANG=no ++ # Note that Autoconf sets GCC=yes for Clang as well as GCC ++ if test "x$GCC" = "xyes"; then ++ AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], ++ [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ ++# if defined(__clang__) && defined(__llvm__) ++ AX_PTHREAD_CC_IS_CLANG ++# endif ++ ], ++ [ax_cv_PTHREAD_CLANG=yes]) ++ fi ++ ]) ++ax_pthread_clang="$ax_cv_PTHREAD_CLANG" ++ ++ax_pthread_clang_warning=no ++ ++# Clang needs special handling, because older versions handle the -pthread ++# option in a rather... idiosyncratic way ++ ++if test "x$ax_pthread_clang" = "xyes"; then ++ ++ # Clang takes -pthread; it has never supported any other flag ++ ++ # (Note 1: This will need to be revisited if a system that Clang ++ # supports has POSIX threads in a separate library. This tends not ++ # to be the way of modern systems, but it's conceivable.) ++ ++ # (Note 2: On some systems, notably Darwin, -pthread is not needed ++ # to get POSIX threads support; the API is always present and ++ # active. We could reasonably leave PTHREAD_CFLAGS empty. But ++ # -pthread does define _REENTRANT, and while the Darwin headers ++ # ignore this macro, third-party headers might not.) ++ ++ PTHREAD_CFLAGS="-pthread" ++ PTHREAD_LIBS= ++ ++ ax_pthread_ok=yes ++ ++ # However, older versions of Clang make a point of warning the user ++ # that, in an invocation where only linking and no compilation is ++ # taking place, the -pthread option has no effect ("argument unused ++ # during compilation"). They expect -pthread to be passed in only ++ # when source code is being compiled. ++ # ++ # Problem is, this is at odds with the way Automake and most other ++ # C build frameworks function, which is that the same flags used in ++ # compilation (CFLAGS) are also used in linking. Many systems ++ # supported by AX_PTHREAD require exactly this for POSIX threads ++ # support, and in fact it is often not straightforward to specify a ++ # flag that is used only in the compilation phase and not in ++ # linking. Such a scenario is extremely rare in practice. ++ # ++ # Even though use of the -pthread flag in linking would only print ++ # a warning, this can be a nuisance for well-run software projects ++ # that build with -Werror. So if the active version of Clang has ++ # this misfeature, we search for an option to squash it. ++ ++ AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread], ++ [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG], ++ [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown ++ # Create an alternate version of $ac_link that compiles and ++ # links in two steps (.c -> .o, .o -> exe) instead of one ++ # (.c -> exe), because the warning occurs only in the second ++ # step ++ ax_pthread_save_ac_link="$ac_link" ++ ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' ++ ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` ++ ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" ++ ax_pthread_save_CFLAGS="$CFLAGS" ++ for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do ++ AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) ++ CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" ++ ac_link="$ax_pthread_save_ac_link" ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], ++ [ac_link="$ax_pthread_2step_ac_link" ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], ++ [break]) ++ ]) ++ done ++ ac_link="$ax_pthread_save_ac_link" ++ CFLAGS="$ax_pthread_save_CFLAGS" ++ AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no]) ++ ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" ++ ]) ++ ++ case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in ++ no | unknown) ;; ++ *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; ++ esac ++ ++fi # $ax_pthread_clang = yes + +-if test x"$ax_pthread_ok" = xno; then +-for flag in $ax_pthread_flags; do ++if test "x$ax_pthread_ok" = "xno"; then ++for ax_pthread_try_flag in $ax_pthread_flags; do + +- case $flag in ++ case $ax_pthread_try_flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + ++ -mt,pthread) ++ AC_MSG_CHECKING([whether pthreads work with -mt -lpthread]) ++ PTHREAD_CFLAGS="-mt" ++ PTHREAD_LIBS="-lpthread" ++ ;; ++ + -*) +- AC_MSG_CHECKING([whether pthreads work with $flag]) +- PTHREAD_CFLAGS="$flag" ++ AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) ++ PTHREAD_CFLAGS="$ax_pthread_try_flag" + ;; + + pthread-config) +- AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no) +- if test x"$ax_pthread_config" = xno; then continue; fi ++ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) ++ AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) +- AC_MSG_CHECKING([for the pthreads library -l$flag]) +- PTHREAD_LIBS="-l$flag" ++ AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) ++ PTHREAD_LIBS="-l$ax_pthread_try_flag" + ;; + esac + +- save_LIBS="$LIBS" +- save_CFLAGS="$CFLAGS" +- LIBS="$PTHREAD_LIBS $LIBS" ++ ax_pthread_save_CFLAGS="$CFLAGS" ++ ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ LIBS="$PTHREAD_LIBS $LIBS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we +@@ -204,7 +366,11 @@ + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. ++ + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ++# if $ax_pthread_check_cond ++# error "$ax_pthread_check_macro must be defined" ++# endif + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; }], + [pthread_t th; pthread_attr_t attr; +@@ -213,16 +379,14 @@ + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */])], +- [ax_pthread_ok=yes], +- []) ++ [ax_pthread_ok=yes], ++ []) + +- LIBS="$save_LIBS" +- CFLAGS="$save_CFLAGS" ++ CFLAGS="$ax_pthread_save_CFLAGS" ++ LIBS="$ax_pthread_save_LIBS" + +- AC_MSG_RESULT($ax_pthread_ok) +- if test "x$ax_pthread_ok" = xyes; then +- break; +- fi ++ AC_MSG_RESULT([$ax_pthread_ok]) ++ AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +@@ -230,70 +394,74 @@ + fi + + # Various other checks: +-if test "x$ax_pthread_ok" = xyes; then +- save_LIBS="$LIBS" +- LIBS="$PTHREAD_LIBS $LIBS" +- save_CFLAGS="$CFLAGS" ++if test "x$ax_pthread_ok" = "xyes"; then ++ ax_pthread_save_CFLAGS="$CFLAGS" ++ ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ LIBS="$PTHREAD_LIBS $LIBS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. +- AC_MSG_CHECKING([for joinable pthread attribute]) +- attr_name=unknown +- for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do +- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], +- [int attr = $attr; return attr /* ; */])], +- [attr_name=$attr; break], +- []) +- done +- AC_MSG_RESULT($attr_name) +- if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then +- AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, +- [Define to necessary symbol if this constant +- uses a non-standard name on your system.]) +- fi +- +- AC_MSG_CHECKING([if more special flags are required for pthreads]) +- flag=no +- case ${host_os} in +- aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; +- osf* | hpux*) flag="-D_REENTRANT";; +- solaris*) +- if test "$GCC" = "yes"; then +- flag="-D_REENTRANT" +- else +- flag="-mt -D_REENTRANT" +- fi +- ;; +- esac +- AC_MSG_RESULT(${flag}) +- if test "x$flag" != xno; then +- PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" +- fi ++ AC_CACHE_CHECK([for joinable pthread attribute], ++ [ax_cv_PTHREAD_JOINABLE_ATTR], ++ [ax_cv_PTHREAD_JOINABLE_ATTR=unknown ++ for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], ++ [int attr = $ax_pthread_attr; return attr /* ; */])], ++ [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break], ++ []) ++ done ++ ]) ++ AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ ++ test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ ++ test "x$ax_pthread_joinable_attr_defined" != "xyes"], ++ [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], ++ [$ax_cv_PTHREAD_JOINABLE_ATTR], ++ [Define to necessary symbol if this constant ++ uses a non-standard name on your system.]) ++ ax_pthread_joinable_attr_defined=yes ++ ]) ++ ++ AC_CACHE_CHECK([whether more special flags are required for pthreads], ++ [ax_cv_PTHREAD_SPECIAL_FLAGS], ++ [ax_cv_PTHREAD_SPECIAL_FLAGS=no ++ case $host_os in ++ solaris*) ++ ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" ++ ;; ++ esac ++ ]) ++ AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ ++ test "x$ax_pthread_special_flags_added" != "xyes"], ++ [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" ++ ax_pthread_special_flags_added=yes]) + + AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], +- ax_cv_PTHREAD_PRIO_INHERIT, [ +- AC_LINK_IFELSE([ +- AC_LANG_PROGRAM([[#include ]], [[int i = PTHREAD_PRIO_INHERIT;]])], +- [ax_cv_PTHREAD_PRIO_INHERIT=yes], +- [ax_cv_PTHREAD_PRIO_INHERIT=no]) ++ [ax_cv_PTHREAD_PRIO_INHERIT], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [[int i = PTHREAD_PRIO_INHERIT;]])], ++ [ax_cv_PTHREAD_PRIO_INHERIT=yes], ++ [ax_cv_PTHREAD_PRIO_INHERIT=no]) + ]) +- AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], +- AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])) ++ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ ++ test "x$ax_pthread_prio_inherit_defined" != "xyes"], ++ [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.]) ++ ax_pthread_prio_inherit_defined=yes ++ ]) + +- LIBS="$save_LIBS" +- CFLAGS="$save_CFLAGS" ++ CFLAGS="$ax_pthread_save_CFLAGS" ++ LIBS="$ax_pthread_save_LIBS" + + # More AIX lossage: compile with *_r variant +- if test "x$GCC" != xyes; then ++ if test "x$GCC" != "xyes"; then + case $host_os in + aix*) + AS_CASE(["x/$CC"], +- [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], +- [#handle absolute path differently from PATH based program lookup +- AS_CASE(["x$CC"], +- [x/*], +- [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], +- [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) ++ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], ++ [#handle absolute path differently from PATH based program lookup ++ AS_CASE(["x$CC"], ++ [x/*], ++ [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], ++ [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) + ;; + esac + fi +@@ -301,13 +469,13 @@ + + test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" + +-AC_SUBST(PTHREAD_LIBS) +-AC_SUBST(PTHREAD_CFLAGS) +-AC_SUBST(PTHREAD_CC) ++AC_SUBST([PTHREAD_LIBS]) ++AC_SUBST([PTHREAD_CFLAGS]) ++AC_SUBST([PTHREAD_CC]) + + # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +-if test x"$ax_pthread_ok" = xyes; then +- ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) ++if test "x$ax_pthread_ok" = "xyes"; then ++ ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) + : + else + ax_pthread_ok=no +--- /m4/ax_with_curses.m4 ++++ /m4/ax_with_curses.m4 +@@ -1,5 +1,5 @@ + # =========================================================================== +-# http://www.gnu.org/software/autoconf-archive/ax_with_curses.html ++# https://www.gnu.org/software/autoconf-archive/ax_with_curses.html + # =========================================================================== + # + # SYNOPSIS +@@ -12,7 +12,9 @@ + # present, along with the associated header file. The NcursesW + # (wide-character) library is searched for first, followed by Ncurses, + # then the system-default plain Curses. The first library found is the +-# one returned. ++# one returned. Finding libraries will first be attempted by using ++# pkg-config, and should the pkg-config files not be available, will ++# fallback to combinations of known flags itself. + # + # The following options are understood: --with-ncursesw, --with-ncurses, + # --without-ncursesw, --without-ncurses. The "--with" options force the +@@ -52,23 +54,29 @@ + # + # (These preprocessor symbols are discussed later in this document.) + # +-# The following output variable is defined by this macro; it is precious +-# and may be overridden on the ./configure command line: ++# The following output variables are defined by this macro; they are ++# precious and may be overridden on the ./configure command line: + # +-# CURSES_LIB - library to add to xxx_LDADD ++# CURSES_LIBS - library to add to xxx_LDADD ++# CURSES_CFLAGS - include paths to add to xxx_CPPFLAGS + # +-# The library listed in CURSES_LIB is NOT added to LIBS by default. You +-# need to add CURSES_LIB to the appropriate xxx_LDADD line in your +-# Makefile.am. For example: +-# +-# prog_LDADD = @CURSES_LIB@ +-# +-# If CURSES_LIB is set on the configure command line (such as by running +-# "./configure CURSES_LIB=-lmycurses"), then the only header searched for +-# is . The user may use the CPPFLAGS precious variable to +-# override the standard #include search path. If the user needs to +-# specify an alternative path for a library (such as for a non-standard +-# NcurseW), the user should use the LDFLAGS variable. ++# In previous versions of this macro, the flags CURSES_LIB and ++# CURSES_CPPFLAGS were defined. These have been renamed, in keeping with ++# AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should ++# eventually supersede the use of AX_WITH_CURSES. Neither the library ++# listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS, ++# respectively CPPFLAGS, by default. You need to add both to the ++# appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For ++# example: ++# ++# prog_LDADD = @CURSES_LIBS@ ++# prog_CPPFLAGS = @CURSES_CFLAGS@ ++# ++# If CURSES_LIBS is set on the configure command line (such as by running ++# "./configure CURSES_LIBS=-lmycurses"), then the only header searched for ++# is . If the user needs to specify an alternative path for a ++# library (such as for a non-standard NcurseW), the user should use the ++# LDFLAGS variable. + # + # The following shell variables may be defined by this macro: + # +@@ -88,7 +96,7 @@ + # + # AX_WITH_CURSES + # if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then +-# AX_MSG_ERROR([requires either NcursesW or Ncurses library]) ++# AC_MSG_ERROR([requires either NcursesW or Ncurses library]) + # fi + # + # If any Curses library will do (but one must be present and must support +@@ -167,7 +175,7 @@ + # Public License for more details. + # + # You should have received a copy of the GNU General Public License along +-# with this program. If not, see . ++# with this program. If not, see . + # + # As a special exception, the respective Autoconf Macro's copyright owner + # gives unlimited permission to copy, distribute and modify the configure +@@ -182,11 +190,66 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 13 ++#serial 18 ++ ++# internal function to factorize common code that is used by both ncurses ++# and ncursesw ++AC_DEFUN([_FIND_CURSES_FLAGS], [ ++ AC_MSG_CHECKING([for $1 via pkg-config]) ++ ++ AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS]) ++ _PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1]) ++ _PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1]) ++ ++ AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[ ++ AC_MSG_RESULT([no]) ++ # No suitable .pc file found, have to find flags via fallback ++ AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [ ++ AS_ECHO() ++ pkg_cv__ax_cv_$1_libs="-l$1" ++ pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS" ++ LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" ++ CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags" ++ ++ AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs]) ++ AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], ++ [ ++ AC_MSG_RESULT([yes]) ++ AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs]) ++ AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[ ++ ax_cv_$1=yes ++ ],[ ++ AC_MSG_RESULT([no]) ++ m4_if( ++ [$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"], ++ [$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"] ++ ) ++ LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" ++ ++ AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs]) ++ AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[ ++ ax_cv_$1=yes ++ ],[ ++ ax_cv_$1=no ++ ]) ++ ]) ++ ],[ ++ ax_cv_$1=no ++ ]) ++ ]) ++ ],[ ++ AC_MSG_RESULT([yes]) ++ # Found .pc file, using its information ++ LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" ++ CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags" ++ ax_cv_$1=yes ++ ]) ++]) + + AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES]) + AC_DEFUN([AX_WITH_CURSES], [ +- AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses]) ++ AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses]) ++ AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw]) + AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses], + [force the use of Ncurses or NcursesW])], + [], [with_ncurses=check]) +@@ -195,20 +258,17 @@ + [], [with_ncursesw=check]) + + ax_saved_LIBS=$LIBS ++ ax_saved_CPPFLAGS=$CPPFLAGS ++ + AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes], + [ax_with_plaincurses=no], [ax_with_plaincurses=check]) + + ax_cv_curses_which=no + + # Test for NcursesW ++ AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [ ++ _FIND_CURSES_FLAGS([ncursesw]) + +- AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [ +- LIBS="$ax_saved_LIBS -lncursesw" +- +- AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [ +- AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], +- [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no]) +- ]) + AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [ + AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library]) + ]) +@@ -216,7 +276,8 @@ + AS_IF([test "x$ax_cv_ncursesw" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=ncursesw +- CURSES_LIB="-lncursesw" ++ CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs" ++ CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags" + AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + +@@ -318,16 +379,13 @@ + ]) + ]) + ]) ++ unset pkg_cv__ax_cv_ncursesw_libs ++ unset pkg_cv__ax_cv_ncursesw_cppflags + + # Test for Ncurses ++ AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [ ++ _FIND_CURSES_FLAGS([ncurses]) + +- AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [ +- LIBS="$ax_saved_LIBS -lncurses" +- +- AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [ +- AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], +- [ax_cv_ncurses=yes], [ax_cv_ncurses=no]) +- ]) + AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [ + AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library]) + ]) +@@ -335,7 +393,8 @@ + AS_IF([test "x$ax_cv_ncurses" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=ncurses +- CURSES_LIB="-lncurses" ++ CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs" ++ CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags" + AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + +@@ -390,12 +449,13 @@ + ]) + ]) + ]) ++ unset pkg_cv__ax_cv_ncurses_libs ++ unset pkg_cv__ax_cv_ncurses_cppflags + +- # Test for plain Curses (or if CURSES_LIB was set by user) +- ++ # Test for plain Curses (or if CURSES_LIBS was set by user) + AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [ +- AS_IF([test "x$CURSES_LIB" != x], [ +- LIBS="$ax_saved_LIBS $CURSES_LIB" ++ AS_IF([test "x$CURSES_LIBS" != x], [ ++ LIBS="$ax_saved_LIBS $CURSES_LIBS" + ], [ + LIBS="$ax_saved_LIBS -lcurses" + ]) +@@ -408,8 +468,8 @@ + AS_IF([test "x$ax_cv_plaincurses" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=plaincurses +- AS_IF([test "x$CURSES_LIB" = x], [ +- CURSES_LIB="-lcurses" ++ AS_IF([test "x$CURSES_LIBS" = x], [ ++ CURSES_LIBS="-lcurses" + ]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + +@@ -515,4 +575,8 @@ + AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no]) + + LIBS=$ax_saved_LIBS ++ CPPFLAGS=$ax_saved_CPPFLAGS ++ ++ unset ax_saved_LIBS ++ unset ax_saved_CPPFLAGS + ])dnl +--- /test/Makefile.am ++++ /test/Makefile.am +@@ -65,7 +65,8 @@ + if ENABLE_TEXT_UI + TEXT_UI_BIN=genkeystroke + genkeystroke_SOURCES = genkeystroke.c +-genkeystroke_LDADD = $(LDADD) @CURSES_LIB@ ++genkeystroke_CPPFLAGS = $(AM_CPPFLAGS) @CURSES_CFLAGS@ ++genkeystroke_LDADD = $(LDADD) @CURSES_LIBS@ + else + TEXT_UI_BIN= + endif diff --git a/app-i18n/libchewing/libchewing-0.5.1.ebuild b/app-i18n/libchewing/libchewing-0.5.1.ebuild index 4a2f116c20e0..1c78e61d60e1 100644 --- a/app-i18n/libchewing/libchewing-0.5.1.ebuild +++ b/app-i18n/libchewing/libchewing-0.5.1.ebuild @@ -3,8 +3,11 @@ EAPI="7" +inherit autotools + if [[ "${PV}" == "9999" ]]; then - inherit autotools git-r3 +# inherit autotools git-r3 + inherit git-r3 EGIT_REPO_URI="https://github.com/chewing/libchewing" fi @@ -27,12 +30,17 @@ RDEPEND="dev-db/sqlite:3" DEPEND="${RDEPEND} test? ( sys-libs/ncurses[unicode] )" +PATCHES=( + "${FILESDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch" +) + src_prepare() { default + eautoreconf - if [[ "${PV}" == "9999" ]]; then - eautoreconf - fi +# if [[ "${PV}" == "9999" ]]; then +# eautoreconf +# fi } src_configure() { @@ -48,6 +56,8 @@ src_test() { src_install() { default - find "${D}" -name "*.la" -delete || die - use static-libs || find "${D}" -name "*.a" -delete || die + find "${D}" -name "*.la" -type f -delete || die + if ! use static-libs; then + find "${D}" -name "*.a" -type f -delete || die + fi } diff --git a/app-i18n/libchewing/libchewing-9999.ebuild b/app-i18n/libchewing/libchewing-9999.ebuild index 9353fc5f3dd0..e059c2147b15 100644 --- a/app-i18n/libchewing/libchewing-9999.ebuild +++ b/app-i18n/libchewing/libchewing-9999.ebuild @@ -3,8 +3,11 @@ EAPI="7" +inherit autotools + if [[ "${PV}" == "9999" ]]; then - inherit autotools git-r3 +# inherit autotools git-r3 + inherit git-r3 EGIT_REPO_URI="https://github.com/chewing/libchewing" fi @@ -27,12 +30,17 @@ RDEPEND="dev-db/sqlite:3" DEPEND="${RDEPEND} test? ( sys-libs/ncurses[unicode] )" +PATCHES=( + "${FILESDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch" +) + src_prepare() { default + eautoreconf - if [[ "${PV}" == "9999" ]]; then - eautoreconf - fi +# if [[ "${PV}" == "9999" ]]; then +# eautoreconf +# fi } src_configure() { @@ -48,6 +56,8 @@ src_test() { src_install() { default - find "${D}" -name "*.la" -delete || die - use static-libs || find "${D}" -name "*.a" -delete || die + find "${D}" -name "*.la" -type f -delete || die + if ! use static-libs; then + find "${D}" -name "*.a" -type f -delete || die + fi } diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest index f6be7020f4be..3c48624a82f8 100644 --- a/app-i18n/librime/Manifest +++ b/app-i18n/librime/Manifest @@ -1,7 +1,9 @@ DIST librime-1.2.9.tar.gz 5516609 BLAKE2B 7b05fedb093f7595c7bf7f4893624b35b0cdde1816c9c99f9ed5d408c8fd21d34a361d16b94c43b3e5e23b10945f075711762f08ca30abee35849a332ecfee2d SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a DIST librime-1.3.1.tar.gz 8598357 BLAKE2B cd6bc6b63a89f7f11e78ceaf92007c099be34ce38f26d611b67a3d8f868a27a0e4de7b94da44d8483618f37a0c2bcfd3a1bc1c1ecb4f81829f8e12fdd777e283 SHA512 b35d3635fd776ed9be32c0998e4aac441433bc9e624765a57582690108cccf5c3beaedad4f8f1682d99533384cd10996ee8c18fd5adcea70878d6a410124922e DIST librime-1.4.0.tar.gz 8609316 BLAKE2B cce58c398057ac82f076e3b9e9a25cd6410e738460bd58277a9e3ed6cd11e80922bbb30e8b42828cdd5dd83f6058794b4b32fedb359315186b018ca88161794d SHA512 da68983638c6f25d994060a607f2ccab8917a71dbf10b9c6f1140c87c9ef4124e29a1d0ef16bbd0edc9a3a22bd5845aa894888d678607db372750f300638f562 -EBUILD librime-1.2.9.ebuild 789 BLAKE2B 7dfe12de3358c792d966dbda125976bf8c49dcd53f277d0d4e6e7ab1e5aa135810685f1586dc26d5faa4920e306d4dc98205f5376c0e6d0713b3c7ef452d5207 SHA512 8cf6bdfdac20eccfc361be603b6e8e170360655898024463e8d29cb1073a8cfa4fd5808492c759ac460ec0e6a0b72368b8c510cca9bc10d9fa5faacc8e05e10b -EBUILD librime-1.3.1.ebuild 820 BLAKE2B ddaaf7b8d38b2a344043c4582b63c07b85aa7bf540c46a0b83ec3eef2c3cad7d786c7d0ad982c9b2c3cf7df34d0a99b44078d32c5255ebd20eabecff5cf9e519 SHA512 cedf9f7fc5b31468fb4b5ea649d058b9c732de739ae6c546248b8baadf2d23399090568d968473da7511c329a3e9c3ad63cef3c1fb3eeda008bb31789cb36220 -EBUILD librime-1.4.0.ebuild 818 BLAKE2B c099f1c729f570c92c2d059d9d8645a9f67818589f6f5cc2d3c2e8480c265af5c44e9553c7513ee00554a359c3fbcd2dc664d83689ade098a6baa57c2a15a36f SHA512 a1122708179e0cdd0d75d1c3da811711ba93cb79dc24071f787206b031cac83c0b19e66cfdad9aea3e3478905e73970d53d98c4edd8f1e7c7552775a2237b212 +DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3 +EBUILD librime-1.2.9.ebuild 822 BLAKE2B efd4b54152a4251ddb8351e6be2387b3671227dd13500a670fb7ee0398e5a5a8a28543bdd29740cb617b911ab870e8fe29ef5abb00ed4400c57aa232379208a2 SHA512 2031060b96288f7e2e146d3f044369911ffb3f0a3df12016583a00f2d80c638fa39e4022ca0dd24da23defb93f63d2b0d06495305459f74db4aa38b28140d597 +EBUILD librime-1.3.1.ebuild 851 BLAKE2B 91a6651e7b7dc00faf653c4ed539174ce3c6efda8e4161c5edb23aeeefbd574f3c8874a7c1ff2a89ab80b9bd61276c810fb9f8ae7a501255b01d51453468a868 SHA512 2048f949b95239924ea40515fdfd7158912b3cae0a158b69031e7f388ed5633c21cb3d9a3ce1d23802c9cf5808db2cf90c7c41f83357962a998535e1c710aabb +EBUILD librime-1.4.0.ebuild 839 BLAKE2B cccdb15cf60fa3cdb163e0e02210e84855c52d3f8fde58c6ecee1645ff90a0d3711474a088ac9292b56d5b2426f911713a36c0ca5afc1a22f9be72ebf4856467 SHA512 c63a7fd8f6dfb89fcb4566f63efccda29c962e9679aeaa384685822da9f7586ef1e96e04c024bf1c4737e620a18dcd99754ce5d0e41de5b62a60ff77fad71b98 +EBUILD librime-1.5.3.ebuild 1431 BLAKE2B ba8f6993ea9fc606c2d48d3644049604ca3769bbb1be8bad44e0e5222253b20ea99cffe22a9d826e83fee2935c422478a8e219888a39c96a8b50637463e876cc SHA512 8df0bdfe9e473bc1ad1640a210c7fc467a7c813b69aba47d9d16dce46f4ee70c3a63af56a64fb6886fb4134e23ab948f784560d5983334ad5e1b386989e9ff6a MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800 diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild index 3a095f779484..da4b3ecb895a 100644 --- a/app-i18n/librime/librime-1.2.9.ebuild +++ b/app-i18n/librime/librime-1.2.9.ebuild @@ -13,11 +13,12 @@ LICENSE="GPL-3" SLOT="0/1" KEYWORDS="amd64 ppc ppc64 x86" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND="app-i18n/opencc:= dev-cpp/glog:= dev-cpp/yaml-cpp:= - dev-libs/boost:=[threads] +