| 1 |
commit: 838c3028555eb9d8f12017dcf43f0c7b0c8af90f |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 30 21:56:57 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 30 22:34:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838c3028 |
| 7 |
|
| 8 |
toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi support #479448 |
| 9 |
|
| 10 |
Many ebuilds have started checking multilib_is_native_abi to see if they |
| 11 |
should call gen_usr_ldscript. Since that logic always makes sense, add |
| 12 |
it directly to the gen_usr_ldscript function. |
| 13 |
|
| 14 |
app-arch/xz-utils/xz-utils-5.0.8.ebuild | 2 +- |
| 15 |
app-arch/xz-utils/xz-utils-5.2.0.ebuild | 2 +- |
| 16 |
app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild | 2 +- |
| 17 |
app-arch/xz-utils/xz-utils-5.2.2.ebuild | 2 +- |
| 18 |
app-arch/xz-utils/xz-utils-9999.ebuild | 2 +- |
| 19 |
dev-libs/libedit/libedit-20130611.3.1-r1.ebuild | 2 +- |
| 20 |
dev-libs/libedit/libedit-20130712.3.1.ebuild | 2 +- |
| 21 |
dev-libs/libpcre/libpcre-8.35.ebuild | 2 +- |
| 22 |
dev-libs/libpcre/libpcre-8.36.ebuild | 2 +- |
| 23 |
dev-libs/libpcre/libpcre-8.37-r2.ebuild | 2 +- |
| 24 |
dev-libs/libpcre/libpcre-8.38.ebuild | 2 +- |
| 25 |
dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild | 2 +- |
| 26 |
dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild | 2 +- |
| 27 |
dev-libs/lzo/lzo-2.08-r1.ebuild | 2 +- |
| 28 |
dev-libs/lzo/lzo-2.09.ebuild | 2 +- |
| 29 |
eclass/toolchain-funcs.eclass | 5 +++++ |
| 30 |
net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild | 2 +- |
| 31 |
net-libs/libtirpc/libtirpc-0.2.5.ebuild | 2 +- |
| 32 |
net-libs/libtirpc/libtirpc-0.3.1.ebuild | 2 +- |
| 33 |
net-libs/libtirpc/libtirpc-1.0.1.ebuild | 2 +- |
| 34 |
sys-apps/acl/acl-2.2.52-r1.ebuild | 2 +- |
| 35 |
sys-apps/dmapi/dmapi-2.2.12-r1.ebuild | 2 +- |
| 36 |
sys-apps/keyutils/keyutils-1.5.9-r1.ebuild | 2 +- |
| 37 |
sys-libs/cracklib/cracklib-2.9.1-r1.ebuild | 2 +- |
| 38 |
sys-libs/cracklib/cracklib-2.9.4.ebuild | 2 +- |
| 39 |
sys-libs/cracklib/cracklib-2.9.5.ebuild | 2 +- |
| 40 |
sys-libs/cracklib/cracklib-2.9.6.ebuild | 2 +- |
| 41 |
sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild | 2 +- |
| 42 |
sys-libs/gpm/gpm-1.20.7-r2.ebuild | 2 +- |
| 43 |
sys-libs/libcap/libcap-2.22-r2.ebuild | 2 +- |
| 44 |
sys-libs/libcap/libcap-2.24-r2.ebuild | 2 +- |
| 45 |
sys-libs/libcap/libcap-2.25.ebuild | 2 +- |
| 46 |
sys-libs/ncurses/ncurses-5.9-r3.ebuild | 2 +- |
| 47 |
sys-libs/ncurses/ncurses-5.9-r4.ebuild | 2 +- |
| 48 |
sys-libs/ncurses/ncurses-5.9-r5.ebuild | 2 +- |
| 49 |
35 files changed, 39 insertions(+), 34 deletions(-) |
| 50 |
|
| 51 |
diff --git a/app-arch/xz-utils/xz-utils-5.0.8.ebuild b/app-arch/xz-utils/xz-utils-5.0.8.ebuild |
| 52 |
index d736bdb..f3dbb5e 100644 |
| 53 |
--- a/app-arch/xz-utils/xz-utils-5.0.8.ebuild |
| 54 |
+++ b/app-arch/xz-utils/xz-utils-5.0.8.ebuild |
| 55 |
@@ -55,7 +55,7 @@ multilib_src_configure() { |
| 56 |
|
| 57 |
multilib_src_install() { |
| 58 |
default |
| 59 |
- multilib_is_native_abi && gen_usr_ldscript -a lzma |
| 60 |
+ gen_usr_ldscript -a lzma |
| 61 |
} |
| 62 |
|
| 63 |
multilib_src_install_all() { |
| 64 |
|
| 65 |
diff --git a/app-arch/xz-utils/xz-utils-5.2.0.ebuild b/app-arch/xz-utils/xz-utils-5.2.0.ebuild |
| 66 |
index f73bba3..f50cda4 100644 |
| 67 |
--- a/app-arch/xz-utils/xz-utils-5.2.0.ebuild |
| 68 |
+++ b/app-arch/xz-utils/xz-utils-5.2.0.ebuild |
| 69 |
@@ -55,7 +55,7 @@ multilib_src_configure() { |
| 70 |
|
| 71 |
multilib_src_install() { |
| 72 |
default |
| 73 |
- multilib_is_native_abi && gen_usr_ldscript -a lzma |
| 74 |
+ gen_usr_ldscript -a lzma |
| 75 |
} |
| 76 |
|
| 77 |
multilib_src_install_all() { |
| 78 |
|
| 79 |
diff --git a/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild |
| 80 |
index 7c2bae6..d50e82e 100644 |
| 81 |
--- a/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild |
| 82 |
+++ b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild |
| 83 |
@@ -56,7 +56,7 @@ multilib_src_configure() { |
| 84 |
|
| 85 |
multilib_src_install() { |
| 86 |
default |
| 87 |
- multilib_is_native_abi && gen_usr_ldscript -a lzma |
| 88 |
+ gen_usr_ldscript -a lzma |
| 89 |
} |
| 90 |
|
| 91 |
multilib_src_install_all() { |
| 92 |
|
| 93 |
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild |
| 94 |
index 358098a..7e69f3f 100644 |
| 95 |
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild |
| 96 |
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild |
| 97 |
@@ -56,7 +56,7 @@ multilib_src_configure() { |
| 98 |
|
| 99 |
multilib_src_install() { |
| 100 |
default |
| 101 |
- multilib_is_native_abi && gen_usr_ldscript -a lzma |
| 102 |
+ gen_usr_ldscript -a lzma |
| 103 |
} |
| 104 |
|
| 105 |
multilib_src_install_all() { |
| 106 |
|
| 107 |
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild |
| 108 |
index da8e29b..ac40bc4 100644 |
| 109 |
--- a/app-arch/xz-utils/xz-utils-9999.ebuild |
| 110 |
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild |
| 111 |
@@ -56,7 +56,7 @@ multilib_src_configure() { |
| 112 |
|
| 113 |
multilib_src_install() { |
| 114 |
default |
| 115 |
- multilib_is_native_abi && gen_usr_ldscript -a lzma |
| 116 |
+ gen_usr_ldscript -a lzma |
| 117 |
} |
| 118 |
|
| 119 |
multilib_src_install_all() { |
| 120 |
|
| 121 |
diff --git a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild |
| 122 |
index b586c50..9d46064 100644 |
| 123 |
--- a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild |
| 124 |
+++ b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild |
| 125 |
@@ -41,7 +41,7 @@ multilib_src_configure() { |
| 126 |
|
| 127 |
multilib_src_install() { |
| 128 |
emake DESTDIR="${D}" install |
| 129 |
- multilib_is_native_abi && gen_usr_ldscript -a edit |
| 130 |
+ gen_usr_ldscript -a edit |
| 131 |
} |
| 132 |
|
| 133 |
multilib_src_install_all() { |
| 134 |
|
| 135 |
diff --git a/dev-libs/libedit/libedit-20130712.3.1.ebuild b/dev-libs/libedit/libedit-20130712.3.1.ebuild |
| 136 |
index 775c345..50e38d6 100644 |
| 137 |
--- a/dev-libs/libedit/libedit-20130712.3.1.ebuild |
| 138 |
+++ b/dev-libs/libedit/libedit-20130712.3.1.ebuild |
| 139 |
@@ -41,7 +41,7 @@ multilib_src_configure() { |
| 140 |
|
| 141 |
multilib_src_install() { |
| 142 |
emake DESTDIR="${D}" install |
| 143 |
- multilib_is_native_abi && gen_usr_ldscript -a edit |
| 144 |
+ gen_usr_ldscript -a edit |
| 145 |
} |
| 146 |
|
| 147 |
multilib_src_install_all() { |
| 148 |
|
| 149 |
diff --git a/dev-libs/libpcre/libpcre-8.35.ebuild b/dev-libs/libpcre/libpcre-8.35.ebuild |
| 150 |
index 8e1311f..6339233 100644 |
| 151 |
--- a/dev-libs/libpcre/libpcre-8.35.ebuild |
| 152 |
+++ b/dev-libs/libpcre/libpcre-8.35.ebuild |
| 153 |
@@ -79,7 +79,7 @@ multilib_src_install() { |
| 154 |
DESTDIR="${D}" \ |
| 155 |
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ |
| 156 |
install |
| 157 |
- multilib_is_native_abi && gen_usr_ldscript -a pcre |
| 158 |
+ gen_usr_ldscript -a pcre |
| 159 |
} |
| 160 |
|
| 161 |
multilib_src_install_all() { |
| 162 |
|
| 163 |
diff --git a/dev-libs/libpcre/libpcre-8.36.ebuild b/dev-libs/libpcre/libpcre-8.36.ebuild |
| 164 |
index 2d8b251..7cff23e 100644 |
| 165 |
--- a/dev-libs/libpcre/libpcre-8.36.ebuild |
| 166 |
+++ b/dev-libs/libpcre/libpcre-8.36.ebuild |
| 167 |
@@ -79,7 +79,7 @@ multilib_src_install() { |
| 168 |
DESTDIR="${D}" \ |
| 169 |
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ |
| 170 |
install |
| 171 |
- multilib_is_native_abi && gen_usr_ldscript -a pcre |
| 172 |
+ gen_usr_ldscript -a pcre |
| 173 |
} |
| 174 |
|
| 175 |
multilib_src_install_all() { |
| 176 |
|
| 177 |
diff --git a/dev-libs/libpcre/libpcre-8.37-r2.ebuild b/dev-libs/libpcre/libpcre-8.37-r2.ebuild |
| 178 |
index ab2cf48..4b098ab 100644 |
| 179 |
--- a/dev-libs/libpcre/libpcre-8.37-r2.ebuild |
| 180 |
+++ b/dev-libs/libpcre/libpcre-8.37-r2.ebuild |
| 181 |
@@ -77,7 +77,7 @@ multilib_src_install() { |
| 182 |
DESTDIR="${D}" \ |
| 183 |
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ |
| 184 |
install |
| 185 |
- multilib_is_native_abi && gen_usr_ldscript -a pcre |
| 186 |
+ gen_usr_ldscript -a pcre |
| 187 |
} |
| 188 |
|
| 189 |
multilib_src_install_all() { |
| 190 |
|
| 191 |
diff --git a/dev-libs/libpcre/libpcre-8.38.ebuild b/dev-libs/libpcre/libpcre-8.38.ebuild |
| 192 |
index b0b24a6..fcda8d2 100644 |
| 193 |
--- a/dev-libs/libpcre/libpcre-8.38.ebuild |
| 194 |
+++ b/dev-libs/libpcre/libpcre-8.38.ebuild |
| 195 |
@@ -75,7 +75,7 @@ multilib_src_install() { |
| 196 |
DESTDIR="${D}" \ |
| 197 |
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ |
| 198 |
install |
| 199 |
- multilib_is_native_abi && gen_usr_ldscript -a pcre |
| 200 |
+ gen_usr_ldscript -a pcre |
| 201 |
} |
| 202 |
|
| 203 |
multilib_src_install_all() { |
| 204 |
|
| 205 |
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild |
| 206 |
index 6253f87..386d87a 100644 |
| 207 |
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild |
| 208 |
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild |
| 209 |
@@ -39,7 +39,7 @@ multilib_src_configure() { |
| 210 |
multilib_src_install() { |
| 211 |
emake DESTDIR="${D}" install |
| 212 |
|
| 213 |
- multilib_is_native_abi && gen_usr_ldscript -a usb |
| 214 |
+ gen_usr_ldscript -a usb |
| 215 |
} |
| 216 |
|
| 217 |
multilib_src_install_all() { |
| 218 |
|
| 219 |
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild |
| 220 |
index 4318c2f..39ddc74 100644 |
| 221 |
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild |
| 222 |
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild |
| 223 |
@@ -43,7 +43,7 @@ multilib_src_configure() { |
| 224 |
multilib_src_install() { |
| 225 |
emake DESTDIR="${D}" install |
| 226 |
|
| 227 |
- multilib_is_native_abi && gen_usr_ldscript -a usb |
| 228 |
+ gen_usr_ldscript -a usb |
| 229 |
} |
| 230 |
|
| 231 |
multilib_src_install_all() { |
| 232 |
|
| 233 |
diff --git a/dev-libs/lzo/lzo-2.08-r1.ebuild b/dev-libs/lzo/lzo-2.08-r1.ebuild |
| 234 |
index 616c157..f3cff4b 100644 |
| 235 |
--- a/dev-libs/lzo/lzo-2.08-r1.ebuild |
| 236 |
+++ b/dev-libs/lzo/lzo-2.08-r1.ebuild |
| 237 |
@@ -32,7 +32,7 @@ multilib_src_configure() { |
| 238 |
|
| 239 |
multilib_src_install() { |
| 240 |
emake DESTDIR="${D}" install |
| 241 |
- multilib_is_native_abi && gen_usr_ldscript -a lzo2 |
| 242 |
+ gen_usr_ldscript -a lzo2 |
| 243 |
} |
| 244 |
|
| 245 |
multilib_src_install_all() { |
| 246 |
|
| 247 |
diff --git a/dev-libs/lzo/lzo-2.09.ebuild b/dev-libs/lzo/lzo-2.09.ebuild |
| 248 |
index 616c157..f3cff4b 100644 |
| 249 |
--- a/dev-libs/lzo/lzo-2.09.ebuild |
| 250 |
+++ b/dev-libs/lzo/lzo-2.09.ebuild |
| 251 |
@@ -32,7 +32,7 @@ multilib_src_configure() { |
| 252 |
|
| 253 |
multilib_src_install() { |
| 254 |
emake DESTDIR="${D}" install |
| 255 |
- multilib_is_native_abi && gen_usr_ldscript -a lzo2 |
| 256 |
+ gen_usr_ldscript -a lzo2 |
| 257 |
} |
| 258 |
|
| 259 |
multilib_src_install_all() { |
| 260 |
|
| 261 |
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass |
| 262 |
index 59c2861..cf95d04 100644 |
| 263 |
--- a/eclass/toolchain-funcs.eclass |
| 264 |
+++ b/eclass/toolchain-funcs.eclass |
| 265 |
@@ -722,6 +722,11 @@ gen_usr_ldscript() { |
| 266 |
|
| 267 |
tc-is-static-only && return |
| 268 |
|
| 269 |
+ # We only care about stuffing / for the native ABI. #479448 |
| 270 |
+ if [[ $(type -t multilib_is_native_abi) == "function" ]] ; then |
| 271 |
+ multilib_is_native_abi || return 0 |
| 272 |
+ fi |
| 273 |
+ |
| 274 |
# Eventually we'd like to get rid of this func completely #417451 |
| 275 |
case ${CTARGET:-${CHOST}} in |
| 276 |
*-darwin*) ;; |
| 277 |
|
| 278 |
diff --git a/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild b/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild |
| 279 |
index 4b3aa4c..05974cf 100644 |
| 280 |
--- a/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild |
| 281 |
+++ b/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild |
| 282 |
@@ -43,7 +43,7 @@ multilib_src_install() { |
| 283 |
default |
| 284 |
|
| 285 |
# libtirpc replaces rpc support in glibc, so we need it in / |
| 286 |
- multilib_is_native_abi && gen_usr_ldscript -a tirpc |
| 287 |
+ gen_usr_ldscript -a tirpc |
| 288 |
} |
| 289 |
|
| 290 |
multilib_src_install_all() { |
| 291 |
|
| 292 |
diff --git a/net-libs/libtirpc/libtirpc-0.2.5.ebuild b/net-libs/libtirpc/libtirpc-0.2.5.ebuild |
| 293 |
index 304b8d8..3af0dd7 100644 |
| 294 |
--- a/net-libs/libtirpc/libtirpc-0.2.5.ebuild |
| 295 |
+++ b/net-libs/libtirpc/libtirpc-0.2.5.ebuild |
| 296 |
@@ -47,7 +47,7 @@ multilib_src_install() { |
| 297 |
default |
| 298 |
|
| 299 |
# libtirpc replaces rpc support in glibc, so we need it in / |
| 300 |
- multilib_is_native_abi && gen_usr_ldscript -a tirpc |
| 301 |
+ gen_usr_ldscript -a tirpc |
| 302 |
} |
| 303 |
|
| 304 |
multilib_src_install_all() { |
| 305 |
|
| 306 |
diff --git a/net-libs/libtirpc/libtirpc-0.3.1.ebuild b/net-libs/libtirpc/libtirpc-0.3.1.ebuild |
| 307 |
index dc5f652..978e466 100644 |
| 308 |
--- a/net-libs/libtirpc/libtirpc-0.3.1.ebuild |
| 309 |
+++ b/net-libs/libtirpc/libtirpc-0.3.1.ebuild |
| 310 |
@@ -43,7 +43,7 @@ multilib_src_install() { |
| 311 |
default |
| 312 |
|
| 313 |
# libtirpc replaces rpc support in glibc, so we need it in / |
| 314 |
- multilib_is_native_abi && gen_usr_ldscript -a tirpc |
| 315 |
+ gen_usr_ldscript -a tirpc |
| 316 |
} |
| 317 |
|
| 318 |
multilib_src_install_all() { |
| 319 |
|
| 320 |
diff --git a/net-libs/libtirpc/libtirpc-1.0.1.ebuild b/net-libs/libtirpc/libtirpc-1.0.1.ebuild |
| 321 |
index 79ba286..2fd632b 100644 |
| 322 |
--- a/net-libs/libtirpc/libtirpc-1.0.1.ebuild |
| 323 |
+++ b/net-libs/libtirpc/libtirpc-1.0.1.ebuild |
| 324 |
@@ -38,7 +38,7 @@ multilib_src_install() { |
| 325 |
default |
| 326 |
|
| 327 |
# libtirpc replaces rpc support in glibc, so we need it in / |
| 328 |
- multilib_is_native_abi && gen_usr_ldscript -a tirpc |
| 329 |
+ gen_usr_ldscript -a tirpc |
| 330 |
} |
| 331 |
|
| 332 |
multilib_src_install_all() { |
| 333 |
|
| 334 |
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild |
| 335 |
index 00869bf..d1d2169 100644 |
| 336 |
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild |
| 337 |
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild |
| 338 |
@@ -51,7 +51,7 @@ multilib_src_install() { |
| 339 |
emake DIST_ROOT="${D}" install install-dev install-lib |
| 340 |
|
| 341 |
# move shared libs to / |
| 342 |
- multilib_is_native_abi && gen_usr_ldscript -a acl |
| 343 |
+ gen_usr_ldscript -a acl |
| 344 |
} |
| 345 |
|
| 346 |
multilib_src_install_all() { |
| 347 |
|
| 348 |
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild |
| 349 |
index 8c8af81..ba4ae64 100644 |
| 350 |
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild |
| 351 |
+++ b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild |
| 352 |
@@ -40,7 +40,7 @@ multilib_src_configure() { |
| 353 |
|
| 354 |
multilib_src_install() { |
| 355 |
emake DESTDIR="${D}" install install-dev |
| 356 |
- multilib_is_native_abi && gen_usr_ldscript -a dm |
| 357 |
+ gen_usr_ldscript -a dm |
| 358 |
} |
| 359 |
|
| 360 |
multilib_src_install_all() { |
| 361 |
|
| 362 |
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild |
| 363 |
index 3792e2d..e6250c4 100644 |
| 364 |
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild |
| 365 |
+++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild |
| 366 |
@@ -74,7 +74,7 @@ multilib_src_test() { |
| 367 |
|
| 368 |
multilib_src_install() { |
| 369 |
default |
| 370 |
- multilib_is_native_abi && gen_usr_ldscript -a keyutils |
| 371 |
+ gen_usr_ldscript -a keyutils |
| 372 |
} |
| 373 |
|
| 374 |
multilib_src_install_all() { |
| 375 |
|
| 376 |
diff --git a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild |
| 377 |
index f78b893..792bb37 100644 |
| 378 |
--- a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild |
| 379 |
+++ b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild |
| 380 |
@@ -83,7 +83,7 @@ python_test() { |
| 381 |
multilib_src_install() { |
| 382 |
default |
| 383 |
# move shared libs to / |
| 384 |
- multilib_is_native_abi && gen_usr_ldscript -a crack |
| 385 |
+ gen_usr_ldscript -a crack |
| 386 |
|
| 387 |
do_python |
| 388 |
} |
| 389 |
|
| 390 |
diff --git a/sys-libs/cracklib/cracklib-2.9.4.ebuild b/sys-libs/cracklib/cracklib-2.9.4.ebuild |
| 391 |
index 519afb7..a826ef9 100644 |
| 392 |
--- a/sys-libs/cracklib/cracklib-2.9.4.ebuild |
| 393 |
+++ b/sys-libs/cracklib/cracklib-2.9.4.ebuild |
| 394 |
@@ -82,7 +82,7 @@ python_test() { |
| 395 |
multilib_src_install() { |
| 396 |
default |
| 397 |
# move shared libs to / |
| 398 |
- multilib_is_native_abi && gen_usr_ldscript -a crack |
| 399 |
+ gen_usr_ldscript -a crack |
| 400 |
|
| 401 |
do_python |
| 402 |
} |
| 403 |
|
| 404 |
diff --git a/sys-libs/cracklib/cracklib-2.9.5.ebuild b/sys-libs/cracklib/cracklib-2.9.5.ebuild |
| 405 |
index 519afb7..a826ef9 100644 |
| 406 |
--- a/sys-libs/cracklib/cracklib-2.9.5.ebuild |
| 407 |
+++ b/sys-libs/cracklib/cracklib-2.9.5.ebuild |
| 408 |
@@ -82,7 +82,7 @@ python_test() { |
| 409 |
multilib_src_install() { |
| 410 |
default |
| 411 |
# move shared libs to / |
| 412 |
- multilib_is_native_abi && gen_usr_ldscript -a crack |
| 413 |
+ gen_usr_ldscript -a crack |
| 414 |
|
| 415 |
do_python |
| 416 |
} |
| 417 |
|
| 418 |
diff --git a/sys-libs/cracklib/cracklib-2.9.6.ebuild b/sys-libs/cracklib/cracklib-2.9.6.ebuild |
| 419 |
index b430d45..dda19c0 100644 |
| 420 |
--- a/sys-libs/cracklib/cracklib-2.9.6.ebuild |
| 421 |
+++ b/sys-libs/cracklib/cracklib-2.9.6.ebuild |
| 422 |
@@ -82,7 +82,7 @@ python_test() { |
| 423 |
multilib_src_install() { |
| 424 |
default |
| 425 |
# move shared libs to / |
| 426 |
- multilib_is_native_abi && gen_usr_ldscript -a crack |
| 427 |
+ gen_usr_ldscript -a crack |
| 428 |
|
| 429 |
do_python |
| 430 |
} |
| 431 |
|
| 432 |
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild |
| 433 |
index 15bd18e..01d978d 100644 |
| 434 |
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild |
| 435 |
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild |
| 436 |
@@ -64,7 +64,7 @@ multilib_src_compile() { |
| 437 |
|
| 438 |
multilib_src_install() { |
| 439 |
emake V=1 STRIP=: DESTDIR="${D}" install || die |
| 440 |
- multilib_is_native_abi && gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') |
| 441 |
+ gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') |
| 442 |
# configure doesn't have an option to disable static libs :/ |
| 443 |
use static-libs || find "${ED}" -name '*.a' -delete |
| 444 |
} |
| 445 |
|
| 446 |
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild |
| 447 |
index 8a191dd..ee9f5a7 100644 |
| 448 |
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild |
| 449 |
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild |
| 450 |
@@ -62,7 +62,7 @@ multilib_src_install() { |
| 451 |
install |
| 452 |
|
| 453 |
dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so |
| 454 |
- multilib_is_native_abi && gen_usr_ldscript -a gpm |
| 455 |
+ gen_usr_ldscript -a gpm |
| 456 |
} |
| 457 |
|
| 458 |
multilib_src_install_all() { |
| 459 |
|
| 460 |
diff --git a/sys-libs/libcap/libcap-2.22-r2.ebuild b/sys-libs/libcap/libcap-2.22-r2.ebuild |
| 461 |
index b5e8e31..6fb3f81 100644 |
| 462 |
--- a/sys-libs/libcap/libcap-2.22-r2.ebuild |
| 463 |
+++ b/sys-libs/libcap/libcap-2.22-r2.ebuild |
| 464 |
@@ -55,7 +55,7 @@ multilib_src_install() { |
| 465 |
# no configure, needs explicit install line #444724#c3 |
| 466 |
emake install DESTDIR="${ED}" |
| 467 |
|
| 468 |
- multilib_is_native_abi && gen_usr_ldscript -a cap |
| 469 |
+ gen_usr_ldscript -a cap |
| 470 |
|
| 471 |
rm -rf "${ED}"/usr/$(get_libdir)/security |
| 472 |
if multilib_is_native_abi && use pam; then |
| 473 |
|
| 474 |
diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild |
| 475 |
index 666d3b0..e43d2e1 100644 |
| 476 |
--- a/sys-libs/libcap/libcap-2.24-r2.ebuild |
| 477 |
+++ b/sys-libs/libcap/libcap-2.24-r2.ebuild |
| 478 |
@@ -58,7 +58,7 @@ multilib_src_install() { |
| 479 |
# no configure, needs explicit install line #444724#c3 |
| 480 |
emake install DESTDIR="${ED}" |
| 481 |
|
| 482 |
- multilib_is_native_abi && gen_usr_ldscript -a cap |
| 483 |
+ gen_usr_ldscript -a cap |
| 484 |
use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a |
| 485 |
|
| 486 |
rm -rf "${ED}"/usr/$(get_libdir)/security |
| 487 |
|
| 488 |
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild |
| 489 |
index cb60459..fc4a23b 100644 |
| 490 |
--- a/sys-libs/libcap/libcap-2.25.ebuild |
| 491 |
+++ b/sys-libs/libcap/libcap-2.25.ebuild |
| 492 |
@@ -60,7 +60,7 @@ multilib_src_install() { |
| 493 |
# no configure, needs explicit install line #444724#c3 |
| 494 |
emake install DESTDIR="${ED}" |
| 495 |
|
| 496 |
- multilib_is_native_abi && gen_usr_ldscript -a cap |
| 497 |
+ gen_usr_ldscript -a cap |
| 498 |
use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a |
| 499 |
|
| 500 |
rm -rf "${ED}"/usr/$(get_libdir)/security |
| 501 |
|
| 502 |
diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild |
| 503 |
index be2a9bd..0f383d5 100644 |
| 504 |
--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild |
| 505 |
+++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild |
| 506 |
@@ -180,7 +180,7 @@ multilib_src_install() { |
| 507 |
fi |
| 508 |
|
| 509 |
# Move libncurses{,w} into /lib |
| 510 |
- multilib_is_native_abi && gen_usr_ldscript -a \ |
| 511 |
+ gen_usr_ldscript -a \ |
| 512 |
ncurses \ |
| 513 |
$(usex unicode 'ncursesw' '') \ |
| 514 |
$(use tinfo && usex unicode 'tinfow' '') \ |
| 515 |
|
| 516 |
diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild |
| 517 |
index 78abd87..ea8dacf 100644 |
| 518 |
--- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild |
| 519 |
+++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild |
| 520 |
@@ -185,7 +185,7 @@ multilib_src_install() { |
| 521 |
fi |
| 522 |
|
| 523 |
# Move libncurses{,w} into /lib |
| 524 |
- multilib_is_native_abi && gen_usr_ldscript -a \ |
| 525 |
+ gen_usr_ldscript -a \ |
| 526 |
ncurses \ |
| 527 |
$(usex unicode 'ncursesw' '') \ |
| 528 |
$(use tinfo && usex unicode 'tinfow' '') \ |
| 529 |
|
| 530 |
diff --git a/sys-libs/ncurses/ncurses-5.9-r5.ebuild b/sys-libs/ncurses/ncurses-5.9-r5.ebuild |
| 531 |
index 33f97d4..698ed64 100644 |
| 532 |
--- a/sys-libs/ncurses/ncurses-5.9-r5.ebuild |
| 533 |
+++ b/sys-libs/ncurses/ncurses-5.9-r5.ebuild |
| 534 |
@@ -187,7 +187,7 @@ multilib_src_install() { |
| 535 |
fi |
| 536 |
|
| 537 |
# Move libncurses{,w} into /lib |
| 538 |
- multilib_is_native_abi && gen_usr_ldscript -a \ |
| 539 |
+ gen_usr_ldscript -a \ |
| 540 |
ncurses \ |
| 541 |
$(usex unicode 'ncursesw' '') \ |
| 542 |
$(use tinfo && usex unicode 'tinfow' '') \ |
Archives