| 1 |
commit: 73e6f2dccad9bf02902232fcc7a47300ec92e9aa |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 19 15:31:02 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 00:46:52 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e6f2dc |
| 7 |
|
| 8 |
net-fs/samba: [QA] inline ESYSROOT |
| 9 |
|
| 10 |
ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7 |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
net-fs/samba/samba-4.14.12-r3.ebuild | 2 +- |
| 15 |
net-fs/samba/samba-4.14.13.ebuild | 2 +- |
| 16 |
net-fs/samba/samba-4.15.4-r3.ebuild | 2 +- |
| 17 |
net-fs/samba/samba-4.15.6-r1.ebuild | 2 +- |
| 18 |
net-fs/samba/samba-4.15.7.ebuild | 2 +- |
| 19 |
net-fs/samba/samba-4.16.0-r1.ebuild | 2 +- |
| 20 |
net-fs/samba/samba-4.16.1.ebuild | 2 +- |
| 21 |
7 files changed, 7 insertions(+), 7 deletions(-) |
| 22 |
|
| 23 |
diff --git a/net-fs/samba/samba-4.14.12-r3.ebuild b/net-fs/samba/samba-4.14.12-r3.ebuild |
| 24 |
index 596a27073a1f..fbb716f96f4d 100644 |
| 25 |
--- a/net-fs/samba/samba-4.14.12-r3.ebuild |
| 26 |
+++ b/net-fs/samba/samba-4.14.12-r3.ebuild |
| 27 |
@@ -250,7 +250,7 @@ multilib_src_configure() { |
| 28 |
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) |
| 29 |
fi |
| 30 |
|
| 31 |
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
| 32 |
+ CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ |
| 33 |
waf-utils_src_configure ${myconf[@]} |
| 34 |
} |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/net-fs/samba/samba-4.14.13.ebuild b/net-fs/samba/samba-4.14.13.ebuild |
| 38 |
index 0b80891930e8..165914c640d6 100644 |
| 39 |
--- a/net-fs/samba/samba-4.14.13.ebuild |
| 40 |
+++ b/net-fs/samba/samba-4.14.13.ebuild |
| 41 |
@@ -250,7 +250,7 @@ multilib_src_configure() { |
| 42 |
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) |
| 43 |
fi |
| 44 |
|
| 45 |
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
| 46 |
+ CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ |
| 47 |
waf-utils_src_configure ${myconf[@]} |
| 48 |
} |
| 49 |
|
| 50 |
|
| 51 |
diff --git a/net-fs/samba/samba-4.15.4-r3.ebuild b/net-fs/samba/samba-4.15.4-r3.ebuild |
| 52 |
index bf1ff5956d07..117c8a7ef117 100644 |
| 53 |
--- a/net-fs/samba/samba-4.15.4-r3.ebuild |
| 54 |
+++ b/net-fs/samba/samba-4.15.4-r3.ebuild |
| 55 |
@@ -246,7 +246,7 @@ multilib_src_configure() { |
| 56 |
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) |
| 57 |
fi |
| 58 |
|
| 59 |
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
| 60 |
+ CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ |
| 61 |
waf-utils_src_configure ${myconf[@]} |
| 62 |
} |
| 63 |
|
| 64 |
|
| 65 |
diff --git a/net-fs/samba/samba-4.15.6-r1.ebuild b/net-fs/samba/samba-4.15.6-r1.ebuild |
| 66 |
index bfffbd68dc99..aa3c460800e1 100644 |
| 67 |
--- a/net-fs/samba/samba-4.15.6-r1.ebuild |
| 68 |
+++ b/net-fs/samba/samba-4.15.6-r1.ebuild |
| 69 |
@@ -246,7 +246,7 @@ multilib_src_configure() { |
| 70 |
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) |
| 71 |
fi |
| 72 |
|
| 73 |
- PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
| 74 |
+ PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ |
| 75 |
waf-utils_src_configure ${myconf[@]} |
| 76 |
} |
| 77 |
|
| 78 |
|
| 79 |
diff --git a/net-fs/samba/samba-4.15.7.ebuild b/net-fs/samba/samba-4.15.7.ebuild |
| 80 |
index bfffbd68dc99..aa3c460800e1 100644 |
| 81 |
--- a/net-fs/samba/samba-4.15.7.ebuild |
| 82 |
+++ b/net-fs/samba/samba-4.15.7.ebuild |
| 83 |
@@ -246,7 +246,7 @@ multilib_src_configure() { |
| 84 |
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) |
| 85 |
fi |
| 86 |
|
| 87 |
- PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
| 88 |
+ PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ |
| 89 |
waf-utils_src_configure ${myconf[@]} |
| 90 |
} |
| 91 |
|
| 92 |
|
| 93 |
diff --git a/net-fs/samba/samba-4.16.0-r1.ebuild b/net-fs/samba/samba-4.16.0-r1.ebuild |
| 94 |
index dfb87123595c..a7d3fa8bb5d3 100644 |
| 95 |
--- a/net-fs/samba/samba-4.16.0-r1.ebuild |
| 96 |
+++ b/net-fs/samba/samba-4.16.0-r1.ebuild |
| 97 |
@@ -247,7 +247,7 @@ multilib_src_configure() { |
| 98 |
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) |
| 99 |
fi |
| 100 |
|
| 101 |
- PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
| 102 |
+ PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ |
| 103 |
waf-utils_src_configure ${myconf[@]} |
| 104 |
} |
| 105 |
|
| 106 |
|
| 107 |
diff --git a/net-fs/samba/samba-4.16.1.ebuild b/net-fs/samba/samba-4.16.1.ebuild |
| 108 |
index dfb87123595c..a7d3fa8bb5d3 100644 |
| 109 |
--- a/net-fs/samba/samba-4.16.1.ebuild |
| 110 |
+++ b/net-fs/samba/samba-4.16.1.ebuild |
| 111 |
@@ -247,7 +247,7 @@ multilib_src_configure() { |
| 112 |
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) |
| 113 |
fi |
| 114 |
|
| 115 |
- PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
| 116 |
+ PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ |
| 117 |
waf-utils_src_configure ${myconf[@]} |
| 118 |
} |
Archives