diff options
author | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-09-26 14:45:15 +0000 |
---|---|---|
committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-09-26 14:45:15 +0000 |
commit | c8f97ef26959f60beabda415774aad7a25e38351 (patch) | |
tree | 965834cfe7834b08bb8b24e226c6bc3d9893e502 | |
parent | 2017-09-26 14:05:40 UTC (diff) | |
parent | app-office/kexi: remove 3.0.1 (diff) | |
download | gentoo-c8f97ef26959f60beabda415774aad7a25e38351.tar.gz gentoo-c8f97ef26959f60beabda415774aad7a25e38351.tar.bz2 gentoo-c8f97ef26959f60beabda415774aad7a25e38351.zip |
Merge updates from master
-rw-r--r-- | app-office/kexi/Manifest | 1 | ||||
-rw-r--r-- | app-office/kexi/kexi-3.0.1.ebuild | 78 | ||||
-rw-r--r-- | app-office/kexi/kexi-3.0.2.ebuild | 2 | ||||
-rw-r--r-- | dev-db/kdb/Manifest | 1 | ||||
-rw-r--r-- | dev-db/kdb/kdb-3.0.1.1.ebuild | 43 | ||||
-rw-r--r-- | dev-db/kdb/kdb-3.0.2.ebuild | 2 | ||||
-rw-r--r-- | dev-libs/kproperty/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/kproperty/kproperty-3.0.1.ebuild | 23 | ||||
-rw-r--r-- | dev-libs/kproperty/kproperty-3.0.2.ebuild | 2 | ||||
-rw-r--r-- | dev-libs/kreport/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/kreport/kreport-3.0.1.ebuild | 48 | ||||
-rw-r--r-- | dev-libs/kreport/kreport-3.0.2.ebuild | 2 | ||||
-rw-r--r-- | dev-util/confix/confix-2.3.5-r3.ebuild | 70 | ||||
-rw-r--r-- | dev-util/confix/files/confix-2.3.5-nodist-shar.patch | 44 | ||||
-rw-r--r-- | dev-util/confix/files/confix-2.3.5-support-no_undefined.patch | 213 |
15 files changed, 331 insertions, 200 deletions
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest index 4a86ba3a7279..bb6ebeaa9eca 100644 --- a/app-office/kexi/Manifest +++ b/app-office/kexi/Manifest @@ -1,2 +1 @@ -DIST kexi-3.0.1.tar.xz 1967476 SHA256 23e564a8ddd3b48ddeddb9d9104820a9548fd77a116b3bb4873e5c120e4ac25c SHA512 de8c84416d10234c9cdfa57d4468023636e8a5253e2c0da93dd92b935930ef97ad173796eb0abde9ef6a027efc83618d8617eeb84062f34e52008882386628b6 WHIRLPOOL a6d400040bcc43cc504f0ff9dd4e7bcbe56b159cfdfcfca064d90a4d7aeb7844a78f15196b82cfa9eba5453034df09e7f9f72f5685de092cf9f62ecc4ad6f36c DIST kexi-3.0.2.tar.xz 3676556 SHA256 8eaea8ba6b833d9413a05496c9099d278f0ea410cf7d2af42bfdf9125d945bba SHA512 ef1da2e4a7b9d1f80200feb111f5dcedf8e3422e797bba4ac45744cb4b2f948cf3190aa0d126d0a3bb2bfb88f8fa112919e3dbb191bfcedd03e8e4512d1cf74e WHIRLPOOL 19bd5e62b88c438bb0f969f495f67c8d92846e65e21321ea5525e8d2f5ed41bffbc726670c7c0b6319b90f8aa0b5808977cbe84218164c8f5acaeba15ac7c374 diff --git a/app-office/kexi/kexi-3.0.1.ebuild b/app-office/kexi/kexi-3.0.1.ebuild deleted file mode 100644 index 0a03e64053bb..000000000000 --- a/app-office/kexi/kexi-3.0.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# KDE_HANDBOOK="true" -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="Visual database applications creator" -HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/" -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" - -KEYWORDS="amd64 x86" -IUSE="marble mdb mysql postgres sqlite webkit" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep designer) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-db/kdb[mysql?,postgres?,sqlite?] - dev-libs/kproperty - dev-libs/kreport - marble? ( $(add_kdeapps_dep marble) ) - mdb? ( dev-libs/glib:2 ) - mysql? ( virtual/libmysqlclient ) - postgres? ( - dev-db/postgresql:* - dev-libs/libpqxx - ) - webkit? ( $(add_qt_dep qtwebkit) ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep breeze-icons-rcc) - !app-office/calligra:4[calligra_features_kexi] - !app-office/calligra-l10n:4[calligra_features_kexi(+)] -" - -src_prepare() { - if ! use webkit; then - punt_bogus_dep Qt5 WebKit - punt_bogus_dep Qt5 WebKitWidgets - fi - - kde5_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package marble KexiMarble) - $(cmake-utils_use_find_package mdb GLIB2) - $(cmake-utils_use_find_package mysql MySQL) - $(cmake-utils_use_find_package postgres KexiPostgreSQL) - ) - kde5_src_configure -} diff --git a/app-office/kexi/kexi-3.0.2.ebuild b/app-office/kexi/kexi-3.0.2.ebuild index 8da42dda1fa0..fac7a700f2df 100644 --- a/app-office/kexi/kexi-3.0.2.ebuild +++ b/app-office/kexi/kexi-3.0.2.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Visual database applications creator" HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/" [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="marble mdb mysql postgres sqlite webkit" COMMON_DEPEND=" diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest index 62f57fb2938b..ce1c0859d5f4 100644 --- a/dev-db/kdb/Manifest +++ b/dev-db/kdb/Manifest @@ -1,2 +1 @@ -DIST kdb-3.0.1.1.tar.xz 480388 SHA256 b99e32076428b704c69572e3cf6d3c74ad3df03b58f257851d77c9ec3858c1af SHA512 da2aea108f1fe7edca03ae664971d0ef73fd625e7a63fb0959fc97ddb51f03ae509f0767211929c7c804f17e7bc260319d7bf71588279bc146f480899fbb2e3d WHIRLPOOL 893b43314412c42b8c3b1662d60f85c8819eedfba35d14a1b4d5d12239f4bbc9d69364336aadfadef85a7b71711783f09ea62f0fb03516032bd9234c06ab80ad DIST kdb-3.0.2.tar.xz 478576 SHA256 896804959f4e203cbafb3d345127c6d80721d79136dbfd6d51c4e93131ec21d8 SHA512 e2fcc09d9477b707bc5af23d23ebfedd21ee7445b0de8fa160969795eb608d712d74572618334fcef4aa06095fa69ce9861542851f5609e83287b23ef01fae90 WHIRLPOOL 2d94426cfdaae4f57872e6a2b9369f467327998551f893cc4a1005fa20b2b34c5eec48af25984b039f41b4eeab8e4c2d8e9b5a623c0d6ddb9283fad8c0730529 diff --git a/dev-db/kdb/kdb-3.0.1.1.ebuild b/dev-db/kdb/kdb-3.0.1.1.ebuild deleted file mode 100644 index b28f9ae45bed..000000000000 --- a/dev-db/kdb/kdb-3.0.1.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit kde5 python-any-r1 - -DESCRIPTION="Database connectivity and creation framework for various vendors" -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 x86" -IUSE="mysql postgres sqlite" - -RDEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/icu:= - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -S="${WORKDIR}/${PN}-3.0.1" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package mysql MySQL) - $(cmake-utils_use_find_package postgres PostgreSQL) - $(cmake-utils_use_find_package sqlite Sqlite) - ) - - kde5_src_configure -} diff --git a/dev-db/kdb/kdb-3.0.2.ebuild b/dev-db/kdb/kdb-3.0.2.ebuild index 0494882c2ee9..7f7b20c738f5 100644 --- a/dev-db/kdb/kdb-3.0.2.ebuild +++ b/dev-db/kdb/kdb-3.0.2.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Database connectivity and creation framework for various vendors" [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="mysql postgres sqlite" RDEPEND=" diff --git a/dev-libs/kproperty/Manifest b/dev-libs/kproperty/Manifest index 63bfe1bd3359..42b17ed8d429 100644 --- a/dev-libs/kproperty/Manifest +++ b/dev-libs/kproperty/Manifest @@ -1,2 +1 @@ -DIST kproperty-3.0.1.tar.xz 82832 SHA256 26a6ba1c4b4474f3d2ecd657ca2df09c6d1f71ceea29045a7cbd952c71b1897f SHA512 51439a2c9ef864c1b125b4c7e677e6ac9140975291c52d0c3661bbe79ecd7467c62eabe55c876271f5ddbceb7412a211ace68bc94ca4ec5808403da79d758173 WHIRLPOOL b85367e4cef3981e629cf4c0430120be5e9202f99c310e32a13b58bb2a457d03513d65419e8a74239aa723e0ecdea739f938f81b55d12ec6b7b3934ab4485af5 DIST kproperty-3.0.2.tar.xz 82556 SHA256 d5fa71ee621a30221f427b53282abe124347842bcf657269b7f7b77355dbf3c3 SHA512 de37dbe3e0aa979c0c9fa75b0b26eef708b332a4b3f65d0b4c22926aa534c54b4f39643df107fabb136071940abd791b31ad8f864e40d514e20171af6fc16ea9 WHIRLPOOL eceb132b03453c05230c1b937fa2e8a13aec81484ce83ee2a94f4911ab7021d4a12ff52d025024961c6cb1a81cc35d41397b325a8c283b89e9331608f5e49e0a diff --git a/dev-libs/kproperty/kproperty-3.0.1.ebuild b/dev-libs/kproperty/kproperty-3.0.1.ebuild deleted file mode 100644 index 832eabff04c5..000000000000 --- a/dev-libs/kproperty/kproperty-3.0.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Property editing framework with editor widget similar to Qt Designer" -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND}" diff --git a/dev-libs/kproperty/kproperty-3.0.2.ebuild b/dev-libs/kproperty/kproperty-3.0.2.ebuild index d3ad402623cf..832eabff04c5 100644 --- a/dev-libs/kproperty/kproperty-3.0.2.ebuild +++ b/dev-libs/kproperty/kproperty-3.0.2.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Property editing framework with editor widget similar to Qt Designe [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=" diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest index 2667e5b76571..4b99b73e225e 100644 --- a/dev-libs/kreport/Manifest +++ b/dev-libs/kreport/Manifest @@ -1,2 +1 @@ -DIST kreport-3.0.1.tar.xz 227944 SHA256 7a6cc7fa104bbdf0168625b365cb79cf4b6e70d6c97ead5f56a2bd921ade1401 SHA512 29a4d53ff063c35dd147e6e9b90c24fa79d94e76807eac0ea8fe3ddc17d465afdd4107805880325d9d2837c7026a678d77c3710123d8187f214f6006eaea0953 WHIRLPOOL a7e017f78fe845e3776920bc894a0807d4fa43d1027e835d9685ad6001e760b66def8307113589af1ef08f492d99edb56a40ef7861f67f55f8204f9263284cf2 DIST kreport-3.0.2.tar.xz 227508 SHA256 e04ea806381ec9fe40f63103e6ef45685a586faa5c85807347d733231cdca3fd SHA512 25580783b1424d66608c48c6f0e254a9c27802b11157eaa199a50b05122f904b970b82cc747c7d8020ebede9bac1b30667e22a6b9c23a6e481055aa3c0a407ea WHIRLPOOL 9f732f35fcfa4137b9ed696af50de6071cf43b5054fdb325fb8e5ef70329fcb5e3f737179417aa02e242e740bf378b5b9eb88df08181f7263fc5ab42e4243b10 diff --git a/dev-libs/kreport/kreport-3.0.1.ebuild b/dev-libs/kreport/kreport-3.0.1.ebuild deleted file mode 100644 index 03df9d44e7f3..000000000000 --- a/dev-libs/kreport/kreport-3.0.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 python-any-r1 - -DESCRIPTION="Framework for creation and generation of reports in multiple formats" -[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 x86" -IUSE="marble +scripting webkit" - -RESTRICT+=" test" - -RDEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/kproperty - marble? ( $(add_kdeapps_dep marble '' '' '5=') ) - scripting? ( $(add_qt_dep qtdeclarative) ) - webkit? ( $(add_qt_dep qtwebkit) ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package marble Marble) - $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) - -DKREPORT_SCRIPTING=$(usex scripting) - ) - kde5_src_configure -} diff --git a/dev-libs/kreport/kreport-3.0.2.ebuild b/dev-libs/kreport/kreport-3.0.2.ebuild index db2df1cc5ac3..03df9d44e7f3 100644 --- a/dev-libs/kreport/kreport-3.0.2.ebuild +++ b/dev-libs/kreport/kreport-3.0.2.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Framework for creation and generation of reports in multiple format [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="marble +scripting webkit" RESTRICT+=" test" diff --git a/dev-util/confix/confix-2.3.5-r3.ebuild b/dev-util/confix/confix-2.3.5-r3.ebuild new file mode 100644 index 000000000000..11af017cd57e --- /dev/null +++ b/dev-util/confix/confix-2.3.5-r3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 + +DESCRIPTION="Confix: A Build Tool on Top of GNU Automake" +HOMEPAGE="http://confix.sourceforge.net" +SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="" + +DEPEND="" +RDEPEND="dev-util/confix-wrapper + sys-devel/autoconf-archive + sys-devel/automake + sys-devel/libtool" + +S="${WORKDIR}/Confix-${PV}" + +PATCHES=( # find jni-include dirs on hpux. + "${FILESDIR}"/2.1.0/jni-hpux.patch + # add .exe extension to TESTS + "${FILESDIR}"/2.3.0/exeext.patch + # use external autoconf archive + "${FILESDIR}"/2.3.0/ext-ac-archive.patch + # link local libraries first. + "${FILESDIR}"/2.3.0/local-libs-first.patch + # don't use automake 1.9, but any newer too... + "${FILESDIR}"/2.3.0/new-automake.patch + # support -no-undefined libtool flag + "${FILESDIR}"/${P}-support-no_undefined.patch + # drop deprecated 'dist-shar' automake flag + "${FILESDIR}"/${P}-nodist-shar.patch +) + +pkg_setup() { + python-single-r1_pkg_setup +} + +pkg_preinst() { + local RV=2.3.0 + + if has_version "<dev-util/confix-${RV}"; then + einfo "After merging ${P} you might have to remerge all packages built" + einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the" + einfo "repo files useable with current ${PN}". + ewarn + ewarn "Use this command (copy&paste) to identify packages built with confix" + ewarn "needing a remerge in your particular instance of Gentoo Prefix:" + ewarn + # use 'echo' to get this command from here: + ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \ + "pattern=\$(cd ../../.. && echo \$(ls -d" \ + "usr/share/confix*/repo | grep -v confix-${RV}) |" \ + "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \ + "'No more packages were built with broken Confix.'; exit 0;" \ + "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \ + "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \ + ")" + ewarn + fi +} diff --git a/dev-util/confix/files/confix-2.3.5-nodist-shar.patch b/dev-util/confix/files/confix-2.3.5-nodist-shar.patch new file mode 100644 index 000000000000..bccc437de44c --- /dev/null +++ b/dev-util/confix/files/confix-2.3.5-nodist-shar.patch @@ -0,0 +1,44 @@ +------------------------------------------------------------------------ +r961 | mhaubi | 2017-09-26 15:34:00 +0200 (Tue, 26 Sep 2017) | 1 line + +drop 'dist-shar', deprecated by newer automake + +Index: doc/confix.texi +=================================================================== +#--- doc/confix.texi (revision 960) +#+++ doc/confix.texi (working copy) +#@@ -992,9 +992,6 @@ + @code{dist-bzip2} creates a @file{.tar.bz2} distribution. + + @item +-@code{dist-shar} creates a shell archive distribution. +- +-@item + @code{dist-zip} create a zip file (popular on Windows). + + @item +Index: libconfix/plugins/automake/out_automake.py +=================================================================== +--- libconfix/plugins/automake/out_automake.py (revision 960) ++++ libconfix/plugins/automake/out_automake.py (working copy) +@@ -175,7 +175,6 @@ + + # enable dist'ing in the following formats + self.makefile_am().add_automake_options('dist-bzip2') +- self.makefile_am().add_automake_options('dist-shar') + self.makefile_am().add_automake_options('dist-zip') + + +Index: libconfix/plugins/automake/tests/output.py +=================================================================== +--- libconfix/plugins/automake/tests/output.py (revision 960) ++++ libconfix/plugins/automake/tests/output.py (working copy) +@@ -146,7 +146,7 @@ + + self.failUnless('1.9' in rootdir_automake_builder.makefile_am().automake_options()) + self.failUnless('dist-bzip2' in rootdir_automake_builder.makefile_am().automake_options()) +- self.failUnless('dist-shar' in rootdir_automake_builder.makefile_am().automake_options()) ++ self.failUnless('dist-shar' not in rootdir_automake_builder.makefile_am().automake_options()) + self.failUnless('dist-zip' in rootdir_automake_builder.makefile_am().automake_options()) + self.failUnless(const.CONFIX2_DIR in rootdir_automake_builder.makefile_am().extra_dist()) + self.failUnless(const.CONFIX2_PKG in rootdir_automake_builder.makefile_am().extra_dist()) diff --git a/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch b/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch new file mode 100644 index 000000000000..a6ffaae89c98 --- /dev/null +++ b/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch @@ -0,0 +1,213 @@ +------------------------------------------------------------------------ +r960 | mhaubi | 2017-09-26 14:51:18 +0200 (Tue, 26 Sep 2017) | 10 lines + +add 'has_undefined_symbols' property for libraries + +Windows does not support undefined symbols in shared libraries, +so libtool refuses to create DLLs without the -no-undefined flag. + +Adding explicit HAS_UNDEFINED_SYMBOLS(False) api call per library, +and the optional (has_undefined_symbols=False) argument to AutoC(). + +For backwards compatibility, default is (has_undefined_symbols=True). + +------------------------------------------------------------------------ +Index: libconfix/plugins/automake/c/out_c.py +=================================================================== +--- libconfix/plugins/automake/c/out_c.py (revision 959) ++++ libconfix/plugins/automake/c/out_c.py (revision 960) +@@ -487,6 +487,9 @@ + elif b.default_version() is not None: + automake_output_builder.makefile_am().add_compound_ldflags(automakelibname, '-release '+b.default_version()) + pass ++ if b.has_undefined_symbols() is False: ++ automake_output_builder.makefile_am().add_compound_ldflags(automakelibname, '-no-undefined') ++ pass + pass + else: + automake_output_builder.configure_ac().add_paragraph( +Index: libconfix/plugins/c/clusterer.py +=================================================================== +--- libconfix/plugins/c/clusterer.py (revision 959) ++++ libconfix/plugins/c/clusterer.py (revision 960) +@@ -33,7 +33,7 @@ + import types + + class CClustererSetup(Setup): +- def __init__(self, linkednamefinder=None): ++ def __init__(self, linkednamefinder=None, has_undefined_symbols=True): + assert linkednamefinder is None or isinstance(linkednamefinder, NameFinder) + Setup.__init__(self) + if linkednamefinder is None: +@@ -41,10 +41,11 @@ + else: + self.__namefinder = linkednamefinder + pass ++ self.__has_undefined_symbols = has_undefined_symbols + pass + + def setup(self, dirbuilder): +- clusterer = CClusterer(namefinder=self.__namefinder) ++ clusterer = CClusterer(namefinder=self.__namefinder, has_undefined_symbols=self.__has_undefined_symbols) + dirbuilder.add_builder(clusterer) + dirbuilder.add_interface(CClustererInterfaceProxy(clusterer=clusterer)) + pass +@@ -51,11 +52,12 @@ + pass + + class CClusterer(Builder): +- def __init__(self, namefinder): ++ def __init__(self, namefinder, has_undefined_symbols=True): + Builder.__init__(self) + self.__namefinder = namefinder + self.__libname = None + self.__libtool_version_info = None ++ self.__has_undefined_symbols = has_undefined_symbols + pass + + def shortname(self): +@@ -85,6 +87,15 @@ + pass + pass + ++ def set_has_undefined_symbols(self, has_undefined_symbols): ++ self.__has_undefined_symbols = has_undefined_symbols ++ for builder in self.parentbuilder().iter_builders(): ++ if isinstance(builder, LibraryBuilder): ++ builder.set_has_undefined_symbols(has_undefined_symbols) ++ break ++ pass ++ pass ++ + def enlarge(self): + super(CClusterer, self).enlarge() + +@@ -163,7 +174,8 @@ + LibraryBuilder( + basename=libname, + version=self.__libtool_version_info, +- default_version=self.package().version())) ++ default_version=self.package().version(), ++ has_undefined_symbols=self.__has_undefined_symbols)) + for b in itertools.chain(nomain_builders, header_builders): + library.add_member(b) + pass +@@ -229,6 +241,13 @@ + pass + self.__clusterer.set_libtool_version_info(version) + pass ++ ++ def HAS_UNDEFINED_SYMBOLS(self, has_undefined_symbols): ++ if type(has_undefined_symbols) is not types.BooleanType: ++ raise Error("HAS_UNDEFINED_SYMBOLS(): 'has_undefined_symbols' argument must be a boolean") ++ self.__clusterer.set_has_undefined_symbols(has_undefined_symbols) ++ pass ++ + pass + + class NameFinder: +Index: libconfix/plugins/c/explicit_iface.py +=================================================================== +--- libconfix/plugins/c/explicit_iface.py (revision 959) ++++ libconfix/plugins/c/explicit_iface.py (revision 960) +@@ -104,7 +104,7 @@ + self.__dirbuilder.add_builder(yacc) + return yacc + +- def LIBRARY(self, members, basename=None, version=None): ++ def LIBRARY(self, members, basename=None, version=None, undefined_symbols=True): + the_basename = basename + if the_basename is None: + the_basename=LongNameFinder().find_libname( +@@ -113,7 +113,8 @@ + pass + library = LibraryBuilder(basename=the_basename, + version=version, +- default_version=self.__dirbuilder.package().version()) ++ default_version=self.__dirbuilder.package().version(), ++ has_undefined_symbols=undefined_symbols) + for m in members: + library.add_member(m) + pass +Index: libconfix/plugins/c/library.py +=================================================================== +--- libconfix/plugins/c/library.py (revision 959) ++++ libconfix/plugins/c/library.py (revision 960) +@@ -25,7 +25,8 @@ + def __init__(self, + basename, + version, +- default_version): ++ default_version, ++ has_undefined_symbols): + + # library version. passed to libtool as "-version-info + # <current>:<revision>:<age>", for example. +@@ -40,6 +41,7 @@ + self.__basename = basename + self.__version = version + self.__default_version = default_version ++ self.__has_undefined_symbols = has_undefined_symbols + + self.__buildinfo_added = False + +@@ -82,6 +84,10 @@ + super(LibraryBuilder, self).force_enlarge() + pass + ++ def set_has_undefined_symbols(self, has_undefined_symbols): ++ self.__has_undefined_symbols = has_undefined_symbols ++ pass ++ + def version(self): + return self.__version + +@@ -88,4 +94,7 @@ + def default_version(self): + return self.__default_version + ++ def has_undefined_symbols(self): ++ return self.__has_undefined_symbols ++ + pass +Index: libconfix/plugins/c/setups/default_setup.py +=================================================================== +--- libconfix/plugins/c/setups/default_setup.py (revision 959) ++++ libconfix/plugins/c/setups/default_setup.py (revision 960) +@@ -25,8 +25,8 @@ + + from libconfix.core.machinery.setup import CompositeSetup + +-def make_core_setups(linkednamefinder): +- return [CClustererSetup(linkednamefinder=linkednamefinder), ++def make_core_setups(linkednamefinder, has_undefined_symbols): ++ return [CClustererSetup(linkednamefinder=linkednamefinder, has_undefined_symbols=has_undefined_symbols), + CCreatorSetup(), + CommonInterfaceSetup(), + RelocatedHeadersSetup(), +@@ -34,8 +34,9 @@ + + class DefaultCSetup(CompositeSetup): + def __init__(self, +- linkednamefinder=None): +- setups = make_core_setups(linkednamefinder=linkednamefinder) ++ linkednamefinder=None, ++ has_undefined_symbols=True): ++ setups = make_core_setups(linkednamefinder=linkednamefinder, has_undefined_symbols=has_undefined_symbols) + setups.append(ImplicitInterfaceSetup()) + CompositeSetup.__init__( + self, +Index: libconfix/setups/c.py +=================================================================== +--- libconfix/setups/c.py (revision 959) ++++ libconfix/setups/c.py (revision 960) +@@ -26,7 +26,7 @@ + pass + + class AutoC(CompositeSetup): +- def __init__(self, libnamefinder=None): +- CompositeSetup.__init__(self, [DefaultCSetup(libnamefinder)]) ++ def __init__(self, libnamefinder=None, has_undefined_symbols=True): ++ CompositeSetup.__init__(self, [DefaultCSetup(libnamefinder, has_undefined_symbols=has_undefined_symbols)]) + pass + pass |