| 1 |
commit: 52e6d5e76ec6bf7fc83f63497ca22af990bbd0bc |
| 2 |
Author: Bjorn Pagen <bjornpagen <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 10 17:23:31 2017 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 10 20:23:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=52e6d5e7 |
| 7 |
|
| 8 |
dev-qt/qtcore: added use flags "libcxx" and "libcxxabi" to qtcore |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-qt/qtcore/Manifest | 8 ++++---- |
| 13 |
dev-qt/qtcore/files/qtcore-clang-libc++abi.patch | 12 ++++++++++++ |
| 14 |
dev-qt/qtcore/qtcore-5.9.3.ebuild | 12 +++++++++++- |
| 15 |
3 files changed, 27 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest |
| 18 |
index 2967a23..99146f9 100644 |
| 19 |
--- a/dev-qt/qtcore/Manifest |
| 20 |
+++ b/dev-qt/qtcore/Manifest |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 |
| 23 |
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f |
| 24 |
-DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 BLAKE2B 311f9fd5bea4b59988d90fad55bbaf46cbb5a77ed705f2f14d6d65ce1cd6e8c950fbcb6b6f06aad4aa3abb58892e9665cdab0a4716ac3a7f9c651dac239f04b6 SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 |
| 25 |
-DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c |
| 26 |
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 |
| 27 |
+DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682 |
| 28 |
+DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95 |
| 29 |
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 SHA256 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c WHIRLPOOL 08ee846bcc99fe1af47febc8436c5c6772cb1dbb096fd1cd7126e708efbf53251ddff66f1d6ea2ac9091e75f38ce784d209c3c94130e7c48b9adedd01a59b7ed |
| 30 |
|
| 31 |
diff --git a/dev-qt/qtcore/files/qtcore-clang-libc++abi.patch b/dev-qt/qtcore/files/qtcore-clang-libc++abi.patch |
| 32 |
new file mode 100644 |
| 33 |
index 0000000..832f08b |
| 34 |
--- /dev/null |
| 35 |
+++ b/dev-qt/qtcore/files/qtcore-clang-libc++abi.patch |
| 36 |
@@ -0,0 +1,12 @@ |
| 37 |
+diff --git a/mkspecs/linux-clang-libc++/qmake.conf.orig b/mkspecs/linux-clang-libc++/qmake.conf |
| 38 |
+index c5b0b57..97256f0 100644 |
| 39 |
+--- a/mkspecs/linux-clang-libc++/qmake.conf.orig |
| 40 |
++++ b/mkspecs/linux-clang-libc++/qmake.conf |
| 41 |
+@@ -5,6 +5,6 @@ |
| 42 |
+ include(../linux-clang/qmake.conf) |
| 43 |
+ |
| 44 |
+ QMAKE_CXXFLAGS += -stdlib=libc++ |
| 45 |
+-QMAKE_LFLAGS += -stdlib=libc++ |
| 46 |
++QMAKE_LFLAGS += -stdlib=libc++ -lc++abi |
| 47 |
+ |
| 48 |
+ load(qt_config) |
| 49 |
|
| 50 |
diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild |
| 51 |
index 7c0da68..925398f 100644 |
| 52 |
--- a/dev-qt/qtcore/qtcore-5.9.3.ebuild |
| 53 |
+++ b/dev-qt/qtcore/qtcore-5.9.3.ebuild |
| 54 |
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 55 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
| 56 |
fi |
| 57 |
|
| 58 |
-IUSE="icu systemd" |
| 59 |
+IUSE="icu libcxx libcxxabi systemd" |
| 60 |
|
| 61 |
DEPEND=" |
| 62 |
dev-libs/double-conversion:= |
| 63 |
@@ -21,6 +21,11 @@ DEPEND=" |
| 64 |
icu? ( dev-libs/icu:= ) |
| 65 |
!icu? ( virtual/libiconv ) |
| 66 |
systemd? ( sys-apps/systemd:= ) |
| 67 |
+ libcxx? ( |
| 68 |
+ sys-devel/clang:= |
| 69 |
+ sys-libs/libcxx:= |
| 70 |
+ libcxxabi? ( sys-libs/libcxxabi:= ) |
| 71 |
+ ) |
| 72 |
" |
| 73 |
RDEPEND="${DEPEND}" |
| 74 |
|
| 75 |
@@ -40,10 +45,15 @@ QT5_TARGET_SUBDIRS=( |
| 76 |
) |
| 77 |
|
| 78 |
src_configure() { |
| 79 |
+ if use libcxxabi; then |
| 80 |
+ eapply "${FILESDIR}/${PN}-clang-libc++abi.patch" |
| 81 |
+ fi |
| 82 |
+ |
| 83 |
local myconf=( |
| 84 |
$(qt_use icu) |
| 85 |
$(qt_use !icu iconv) |
| 86 |
$(qt_use systemd journald) |
| 87 |
+ $(usex libcxx "-platform linux-clang-libc++") |
| 88 |
) |
| 89 |
qt5-build_src_configure |
| 90 |
} |
Archives