commit: ad9cdc2324f0009a95f97ed4d352b6ba7a9c9f9a
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Fri Apr 27 05:11:49 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 10:32:31 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ad9cdc23
dev-lang/rust: reorganize patchsets for upcoming rust-1.25.0
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
...Explicitly-run-perl-for-OpenSSL-Configure.patch | 0
...bs-for-dependent-crates-when-linking-stat.patch | 0
...ndency-resolution-errors-to-be-more-consi.patch | 0
...tic-native-libraries-when-linking-static-.patch | 0
...-nostdlib-and-musl_root-from-musl-targets.patch | 0
...-Prefer-libgcc_eh-over-libunwind-for-musl.patch | 0
.../files/{ => 1.21.0}/0007-Fix-LLVM-build.patch | 0
...dd-openssl-configuration-for-musl-targets.patch | 0
.../rust/files/{ => 1.21.0}/0009-liblibc.patch | 0
.../{ => 1.21.0}/0010-static-linking-default.patch | 0
.../llvm4-musl-fixes.patch} | 0
...tic-native-libraries-when-linking-static-.patch | 0
...-nostdlib-and-musl_root-from-musl-targets.patch | 0
...sl-targets-to-link-dynamically-by-default.patch | 0
...-Prefer-libgcc_eh-over-libunwind-for-musl.patch | 0
.../files/{ => 1.23.0}/0005-Fix-LLVM-build.patch | 0
.../0006-Fix-rustdoc-for-cross-targets.patch | 0
...dd-openssl-configuration-for-musl-targets.patch | 0
.../0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch | 0
.../rust/files/{ => 1.23.0}/0009-liblibc.patch | 0
.../llvm4-musl-fixes.patch} | 0
dev-lang/rust/rust-1.21.0.ebuild | 22 +++++++++++-----------
dev-lang/rust/rust-1.23.0-r1.ebuild | 20 ++++++++++----------
dev-lang/rust/rust-1.23.0.ebuild | 20 ++++++++++----------
24 files changed, 31 insertions(+), 31 deletions(-)
diff --git
a/dev-lang/rust/files/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch
b/dev-lang/rust/files/1.21.0/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch
similarity index 100%
rename from
dev-lang/rust/files/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch
rename to
dev-lang/rust/files/1.21.0/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch
diff --git
a/dev-lang/rust/files/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch
b/dev-lang/rust/files/1.21.0/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch
similarity index 100%
rename from
dev-lang/rust/files/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch
rename to
dev-lang/rust/files/1.21.0/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch
diff --git
a/dev-lang/rust/files/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch
b/dev-lang/rust/files/1.21.0/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch
similarity index 100%
rename from
dev-lang/rust/files/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch
rename to
dev-lang/rust/files/1.21.0/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch
diff --git
a/dev-lang/rust/files/0004-Require-static-native-libraries-when-linking-static-.patch
b/dev-lang/rust/files/1.21.0/0004-Require-static-native-libraries-when-linking-static-.patch
similarity index 100%
rename from
dev-lang/rust/files/0004-Require-static-native-libraries-when-linking-static-.patch
rename to
dev-lang/rust/files/1.21.0/0004-Require-static-native-libraries-when-linking-static-.patch
diff --git
a/dev-lang/rust/files/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
b/dev-lang/rust/files/1.21.0/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
similarity index 100%
rename from
dev-lang/rust/files/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
rename to
dev-lang/rust/files/1.21.0/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
diff --git
a/dev-lang/rust/files/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
b/dev-lang/rust/files/1.21.0/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
similarity index 100%
rename from
dev-lang/rust/files/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
rename to
dev-lang/rust/files/1.21.0/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
diff --git a/dev-lang/rust/files/0007-Fix-LLVM-build.patch
b/dev-lang/rust/files/1.21.0/0007-Fix-LLVM-build.patch
similarity index 100%
rename from dev-lang/rust/files/0007-Fix-LLVM-build.patch
rename to dev-lang/rust/files/1.21.0/0007-Fix-LLVM-build.patch
diff --git
a/dev-lang/rust/files/0008-Add-openssl-configuration-for-musl-targets.patch
b/dev-lang/rust/files/1.21.0/0008-Add-openssl-configuration-for-musl-targets.patch
similarity index 100%
rename from
dev-lang/rust/files/0008-Add-openssl-configuration-for-musl-targets.patch
rename to
dev-lang/rust/files/1.21.0/0008-Add-openssl-configuration-for-musl-targets.patch
diff --git a/dev-lang/rust/files/0009-liblibc.patch
b/dev-lang/rust/files/1.21.0/0009-liblibc.patch
similarity index 100%
copy from dev-lang/rust/files/0009-liblibc.patch
copy to dev-lang/rust/files/1.21.0/0009-liblibc.patch
diff --git a/dev-lang/rust/files/0010-static-linking-default.patch
b/dev-lang/rust/files/1.21.0/0010-static-linking-default.patch
similarity index 100%
rename from dev-lang/rust/files/0010-static-linking-default.patch
rename to dev-lang/rust/files/1.21.0/0010-static-linking-default.patch
diff --git a/dev-lang/rust/files/llvm-musl-fixes.patch
b/dev-lang/rust/files/1.21.0/llvm4-musl-fixes.patch
similarity index 100%
copy from dev-lang/rust/files/llvm-musl-fixes.patch
copy to dev-lang/rust/files/1.21.0/llvm4-musl-fixes.patch
diff --git
a/dev-lang/rust/files/0001-Require-static-native-libraries-when-linking-static-.patch
b/dev-lang/rust/files/1.23.0/0001-Require-static-native-libraries-when-linking-static-.patch
similarity index 100%
rename from
dev-lang/rust/files/0001-Require-static-native-libraries-when-linking-static-.patch
rename to
dev-lang/rust/files/1.23.0/0001-Require-static-native-libraries-when-linking-static-.patch
diff --git
a/dev-lang/rust/files/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
b/dev-lang/rust/files/1.23.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
similarity index 100%
rename from
dev-lang/rust/files/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
rename to
dev-lang/rust/files/1.23.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch
diff --git
a/dev-lang/rust/files/0003-Switch-musl-targets-to-link-dynamically-by-default.patch
b/dev-lang/rust/files/1.23.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch
similarity index 100%
rename from
dev-lang/rust/files/0003-Switch-musl-targets-to-link-dynamically-by-default.patch
rename to
dev-lang/rust/files/1.23.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch
diff --git
a/dev-lang/rust/files/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch
b/dev-lang/rust/files/1.23.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch
similarity index 100%
rename from
dev-lang/rust/files/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch
rename to
dev-lang/rust/files/1.23.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch
diff --git a/dev-lang/rust/files/0005-Fix-LLVM-build.patch
b/dev-lang/rust/files/1.23.0/0005-Fix-LLVM-build.patch
similarity index 100%
rename from dev-lang/rust/files/0005-Fix-LLVM-build.patch
rename to dev-lang/rust/files/1.23.0/0005-Fix-LLVM-build.patch
diff --git a/dev-lang/rust/files/0006-Fix-rustdoc-for-cross-targets.patch
b/dev-lang/rust/files/1.23.0/0006-Fix-rustdoc-for-cross-targets.patch
similarity index 100%
rename from dev-lang/rust/files/0006-Fix-rustdoc-for-cross-targets.patch
rename to dev-lang/rust/files/1.23.0/0006-Fix-rustdoc-for-cross-targets.patch
diff --git
a/dev-lang/rust/files/0007-Add-openssl-configuration-for-musl-targets.patch
b/dev-lang/rust/files/1.23.0/0007-Add-openssl-configuration-for-musl-targets.patch
similarity index 100%
rename from
dev-lang/rust/files/0007-Add-openssl-configuration-for-musl-targets.patch
rename to
dev-lang/rust/files/1.23.0/0007-Add-openssl-configuration-for-musl-targets.patch
diff --git a/dev-lang/rust/files/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
b/dev-lang/rust/files/1.23.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
similarity index 100%
rename from dev-lang/rust/files/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
rename to
dev-lang/rust/files/1.23.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch
diff --git a/dev-lang/rust/files/0009-liblibc.patch
b/dev-lang/rust/files/1.23.0/0009-liblibc.patch
similarity index 100%
rename from dev-lang/rust/files/0009-liblibc.patch
rename to dev-lang/rust/files/1.23.0/0009-liblibc.patch
diff --git a/dev-lang/rust/files/llvm-musl-fixes.patch
b/dev-lang/rust/files/1.23.0/llvm4-musl-fixes.patch
similarity index 100%
rename from dev-lang/rust/files/llvm-musl-fixes.patch
rename to dev-lang/rust/files/1.23.0/llvm4-musl-fixes.patch
diff --git a/dev-lang/rust/rust-1.21.0.ebuild b/dev-lang/rust/rust-1.21.0.ebuild
index 3140b1d..1dab345 100644
--- a/dev-lang/rust/rust-1.21.0.ebuild
+++ b/dev-lang/rust/rust-1.21.0.ebuild
@@ -86,17 +86,17 @@ PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
dev-util/cargo"
PATCHES=(
- "${FILESDIR}/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch"
-
"${FILESDIR}/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch"
-
"${FILESDIR}/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch"
-
"${FILESDIR}/0004-Require-static-native-libraries-when-linking-static-.patch"
- "${FILESDIR}/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
- "${FILESDIR}/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
- "${FILESDIR}/0007-Fix-LLVM-build.patch"
- "${FILESDIR}/0008-Add-openssl-configuration-for-musl-targets.patch"
- "${FILESDIR}/0009-liblibc.patch"
- "${FILESDIR}/0010-static-linking-default.patch"
- "${FILESDIR}/llvm-musl-fixes.patch"
+
"${FILESDIR}/1.21.0/0001-Explicitly-run-perl-for-OpenSSL-Configure.patch"
+
"${FILESDIR}/1.21.0/0002-Require-rlibs-for-dependent-crates-when-linking-stat.patch"
+
"${FILESDIR}/1.21.0/0003-Adjust-dependency-resolution-errors-to-be-more-consi.patch"
+
"${FILESDIR}/1.21.0/0004-Require-static-native-libraries-when-linking-static-.patch"
+
"${FILESDIR}/1.21.0/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
+ "${FILESDIR}/1.21.0/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
+ "${FILESDIR}/1.21.0/0007-Fix-LLVM-build.patch"
+
"${FILESDIR}/1.21.0/0008-Add-openssl-configuration-for-musl-targets.patch"
+ "${FILESDIR}/1.21.0/0009-liblibc.patch"
+ "${FILESDIR}/1.21.0/0010-static-linking-default.patch"
+ "${FILESDIR}/1.21.0/llvm4-musl-fixes.patch"
)
S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild
b/dev-lang/rust/rust-1.23.0-r1.ebuild
index caf1009..935c6ba 100644
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.23.0-r1.ebuild
@@ -103,16 +103,16 @@ PDEPEND="!extended? (
>=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
PATCHES=(
"${FILESDIR}/1.23.0-separate-libdir.patch"
-
"${FILESDIR}/0001-Require-static-native-libraries-when-linking-static-.patch"
- "${FILESDIR}/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
-
"${FILESDIR}/0003-Switch-musl-targets-to-link-dynamically-by-default.patch"
- "${FILESDIR}/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
- "${FILESDIR}/0005-Fix-LLVM-build.patch"
- "${FILESDIR}/0006-Fix-rustdoc-for-cross-targets.patch"
- "${FILESDIR}/0007-Add-openssl-configuration-for-musl-targets.patch"
- "${FILESDIR}/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch"
- "${FILESDIR}/0009-liblibc.patch"
- "${FILESDIR}/llvm-musl-fixes.patch"
+
"${FILESDIR}/1.23.0/0001-Require-static-native-libraries-when-linking-static-.patch"
+
"${FILESDIR}/1.23.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
+
"${FILESDIR}/1.23.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch"
+ "${FILESDIR}/1.23.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
+ "${FILESDIR}/1.23.0/0005-Fix-LLVM-build.patch"
+ "${FILESDIR}/1.23.0/0006-Fix-rustdoc-for-cross-targets.patch"
+
"${FILESDIR}/1.23.0/0007-Add-openssl-configuration-for-musl-targets.patch"
+ "${FILESDIR}/1.23.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch"
+ "${FILESDIR}/1.23.0/0009-liblibc.patch"
+ "${FILESDIR}/1.23.0/llvm4-musl-fixes.patch"
)
S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-lang/rust/rust-1.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild
index 0153f9a..2a81e3a 100644
--- a/dev-lang/rust/rust-1.23.0.ebuild
+++ b/dev-lang/rust/rust-1.23.0.ebuild
@@ -90,16 +90,16 @@ DEPEND="${RDEPEND}
PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}"
PATCHES=(
-
"${FILESDIR}/0001-Require-static-native-libraries-when-linking-static-.patch"
- "${FILESDIR}/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
-
"${FILESDIR}/0003-Switch-musl-targets-to-link-dynamically-by-default.patch"
- "${FILESDIR}/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
- "${FILESDIR}/0005-Fix-LLVM-build.patch"
- "${FILESDIR}/0006-Fix-rustdoc-for-cross-targets.patch"
- "${FILESDIR}/0007-Add-openssl-configuration-for-musl-targets.patch"
- "${FILESDIR}/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch"
- "${FILESDIR}/0009-liblibc.patch"
- "${FILESDIR}/llvm-musl-fixes.patch"
+
"${FILESDIR}/1.23.0/0001-Require-static-native-libraries-when-linking-static-.patch"
+
"${FILESDIR}/1.23.0/0002-Remove-nostdlib-and-musl_root-from-musl-targets.patch"
+
"${FILESDIR}/1.23.0/0003-Switch-musl-targets-to-link-dynamically-by-default.patch"
+ "${FILESDIR}/1.23.0/0004-Prefer-libgcc_eh-over-libunwind-for-musl.patch"
+ "${FILESDIR}/1.23.0/0005-Fix-LLVM-build.patch"
+ "${FILESDIR}/1.23.0/0006-Fix-rustdoc-for-cross-targets.patch"
+
"${FILESDIR}/1.23.0/0007-Add-openssl-configuration-for-musl-targets.patch"
+ "${FILESDIR}/1.23.0/0008-Don-t-pass-CFLAGS-to-the-C-compiler.patch"
+ "${FILESDIR}/1.23.0/0009-liblibc.patch"
+ "${FILESDIR}/1.23.0/llvm4-musl-fixes.patch"
)
S="${WORKDIR}/${MY_P}-src"
