| 1 |
commit: f68a3873380140c91e7ea1d8d4872649cf8d1aee |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 11 14:24:51 2020 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 11 15:47:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68a3873 |
| 7 |
|
| 8 |
prefix/winnt/profile.bashrc: rename funcs to winnt_ |
| 9 |
|
| 10 |
Provide the winnt_post_src_install and call that one in post_src_install |
| 11 |
rather than performing all the operation directly in post_src_install. |
| 12 |
|
| 13 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
| 14 |
|
| 15 |
profiles/prefix/windows/winnt/profile.bashrc | 12 ++++++++---- |
| 16 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc |
| 19 |
index 0670a48a5b1..c613a56cd98 100644 |
| 20 |
--- a/profiles/prefix/windows/winnt/profile.bashrc |
| 21 |
+++ b/profiles/prefix/windows/winnt/profile.bashrc |
| 22 |
@@ -48,7 +48,7 @@ export PKG_CONFIG_PATH="${EPREFIX}/lib/pkgconfig:${EPREFIX}/usr/lib/pkgconfig" |
| 23 |
# |
| 24 |
####################################################################### |
| 25 |
|
| 26 |
-windows_setup_dllhelper() { |
| 27 |
+winnt_setup_dllhelper() { |
| 28 |
case ${CATEGORY}/${PN} in |
| 29 |
sys-libs/zlib |\ |
| 30 |
'') |
| 31 |
@@ -58,13 +58,17 @@ windows_setup_dllhelper() { |
| 32 |
# and installation is done using cp, we override cp to |
| 33 |
# additionally copy the dll when the library is copied. |
| 34 |
ebegin "Setting up wrapper to copy the DLL along the LIB" |
| 35 |
- windows_setup_dllhelper_cp |
| 36 |
+ winnt_setup_dllhelper_cp |
| 37 |
eend $? |
| 38 |
;; |
| 39 |
esac |
| 40 |
} |
| 41 |
|
| 42 |
post_src_install() { |
| 43 |
+ winnt_post_src_install |
| 44 |
+} |
| 45 |
+ |
| 46 |
+winnt_post_src_install() { |
| 47 |
cd "${ED}" || return 0 |
| 48 |
# |
| 49 |
# File names being treated as import library: |
| 50 |
@@ -185,7 +189,7 @@ post_src_install() { |
| 51 |
done |
| 52 |
} |
| 53 |
|
| 54 |
-windows_setup_dllhelper_cp() { |
| 55 |
+winnt_setup_dllhelper_cp() { |
| 56 |
if ! [[ $(type -P cp) -ef ${T}/dllhelper/cp ]] |
| 57 |
then |
| 58 |
mkdir -p "${T}/dllhelper" |
| 59 |
@@ -288,5 +292,5 @@ EOCP |
| 60 |
|
| 61 |
if [[ ${EBUILD_PHASE} == 'setup' ]] |
| 62 |
then |
| 63 |
- windows_setup_dllhelper |
| 64 |
+ winnt_setup_dllhelper |
| 65 |
fi |
Archives