6 files changed, 47 insertions, 5 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index dd4d49f2ec60..8783236732db 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index dfa79677771e..7d0f78fdc5dd 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,10 +1,11 @@
 AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0
 AUX mbuffer-20200929-find-OBJDUMP.patch 279 BLAKE2B f22f74549eb2fba1061141616097fc01b987c846302a0fd59aaf8a0236a291207a02f0a85ec542fb217377eb40eb0983cd450aaf9a56f3df7838c29f31ab663a SHA512 20a9969de11f6eaf398627a306465df6b43ccb640176c4743ce8e8aa59b06f1837b0ef968223a0770c7aa1cf1959713526fa064f3eb54bbfabb067d834e510c0
 AUX mbuffer-20231216-autoconf-warning.patch 490 BLAKE2B 36cbe4201c598ae04739757546dda2c6f8803e992dec0de8c5ddfa8afba7da51719496e6c4f633ce12ca8f275b833e8d85d5bb4210decd1d77cdf924e00c4652 SHA512 2a8d13b14aa63146c67f3f4c44f39b19aa7c4101d3717dfcbc4b1ea0b3d9ba3b9826511c176822357fbb5f59f54a601f7236e47a9f52ef82ed0cc3612ccc97fe
+AUX mbuffer-20240107-O0-for-libc-name-find.patch 1153 BLAKE2B d152429b86b409828325df448657f8f208af106b6b91a05aeaf9bc34b4010f612a75bdedd448f8e534b0257b98e021aed9e2ba3bd2e1e103942d6e958153f0f9 SHA512 dc336dcfa7ae23731252916af5ace28b0e3c1b1d17e3780522874b2af91d9fd335aa448120a5bc04cabafe2a8bbada1c6f95fce61d9b87b0e52b55d09a38f97a
 DIST mbuffer-20240107.tgz 151573 BLAKE2B 9fb8d1ead6424e676f6ec0dd591cdd48b53a5b1b4a980e23101ae1e52a0f2a0d07048208f8ae6c45aee66f963b7ed9720b47b16b04495bcba97489a87d8c8d8f SHA512 14773c1193ed5e4a0dfda4ef6bd6ccb0cf104f8c4ae1d22747e52e8247aeb1db64656700f9cf317b13140fb649db889831233f0b8fef0a8463d28713b5882977
 DIST mbuffer-20240707.tgz 151887 BLAKE2B ae03f9a581ef37d7502d60df35ab7026987ca1e4cdd09b7bd0a2e90fa6f3b75aead9a6add7907f18c582ba40b110f24c9430a1e145772996641196de88a1470e SHA512 603877e86df666807c77e6147268d15242acbbc9787fbc9962af97367694a25d95eda1c66197975b858739ce4683e3c36cd1b442f65daae304f25056096319c6
 DIST mbuffer-20241007.tgz 152029 BLAKE2B d26c0d87abacc8826bf2e6f414fe9264da7b3196c62a9853a8ffb6b118df353977c38ea5b1bf79e71fadcae6585b90b1f21152f742c7fafee08ae4294acceb60 SHA512 cb8f9e962510030f8e1500dcd21a556b73144c445bc12ece3915df201fa5e8849c183546c7ce700e06d1c734c0fdf36e31046ac984e232b64f9b019b54e1ddd2
-EBUILD mbuffer-20240107.ebuild 1597 BLAKE2B c2cbe38fe387126a6e08ecf57f7421e3abc39a39f26bbe4ecd068c86979d88f27e2b6294fe9e7a160f7455d044ab913b6417cd2047a6c138172c1e3c384b2bbf SHA512 239b02391da30e36db7316d044432060b9ecf7ff03b09f4e0628231123353e6e98a9f4333877de6977f8938469958812a49a2b01c25006c33a9e25c4e20ce2c7
-EBUILD mbuffer-20240707.ebuild 1625 BLAKE2B d3bae2adc850780aef82281856bb016e7b9fa4a76f92a196b40300ef083d2a2c1f3bf22772c6a78dc8622b58de23917c2f6eb29300bcc6caa3f3e04a0376e099 SHA512 fdb07d200fd038053e9735605fabf1d88897eea25615a00c01390bf081b84137dacd30ffa9b57d169c84daf509a951f833082c71e980ce414c7111411c7d31ee
-EBUILD mbuffer-20241007.ebuild 1242 BLAKE2B f2512973865e40bb9f0586c8f784c2e696cb587a2ca87e077432a385dacf956935cd82294f04c4b125642f7f99db4982fe6b8c6365d74b60cac587a6efb77f28 SHA512 bbd1365336358b4abe9947e91db2d127a897b601b6fdaca4ad45d0943642c17dff6da7f2da10bea47d82c5b514d20bab292d2e2da7a96707e89f2e61c3b27402
+EBUILD mbuffer-20240107.ebuild 1655 BLAKE2B d479f5606d0ed79400d3c67ff6760f2ccc98ceaa2c82b1b31fc9156a0cc452bb828276861bcbb1a578ffbac34ddbc159e71e1c9393fc37efa458f23bfc5bc0c6 SHA512 91c4debc9158664a848ff7f6004cca1c10b215d26e863609f47ececf3f49488923fbbb10df310f17041d0900dc3cf1c300dc275136b0eb8285d3504415071c0c
+EBUILD mbuffer-20240707.ebuild 1683 BLAKE2B 2d94305ef3e528bc6a4587606b11e26cd49c6b883e9000b58da1c41b1f81d731cb1de7f1fd78e9452c299d83bcc1f7baa14b802ccf4d367d8a3682de7e7c5981 SHA512 78e9fa9ddbdf9ed6e21ec8a084907610681f0a540dad8eeadcae955d1eccf398f7cf6a48ba8138a594f13835da61509275a6ff351c0ab0d654e26435d458a291
+EBUILD mbuffer-20241007.ebuild 1300 BLAKE2B a0e9e406abe4d00eb2b8887298fd0a150da6bc99ce3c7886a1768f7f752da1f7be9079041749534bec189a17fab599b08dbb56a7a4bd44f0274444b3cfd3bd6b SHA512 d671befb96c5d4e1ba5b9974eeae5ee65c63c09aebe1fda01e44101f0a4556b768e891046601c29786be5811b10d8e11ff75578666315bc0625babca03dfc70b
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-block/mbuffer/files/mbuffer-20240107-O0-for-libc-name-find.patch b/sys-block/mbuffer/files/mbuffer-20240107-O0-for-libc-name-find.patch
new file mode 100644
index 000000000000..e2d452f966e2
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20240107-O0-for-libc-name-find.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/938689
+
+mbuffer use macro LIBC_(OPEN|READ|WRITE|FSTAT) whic are determined by
+'objdump -T ... | awk ...', but in the case of clag (at least for now),
+depend on the optimization levels, open|read will be optimized to other
+methods which cause LIBC_(OPEN|READ) become "", then error bellow:
+
+expected identifier or '('
+   55 | int LIBC_OPEN(const char *path, int oflag, ...)
+
+I don't know the reason to find the name of open|read|write|fstat by this
+test, so use -O0 for the feature test code.
+
+Upstream Replied:
+> this concept is needed for the tapedrive emulator that replicates the
+> behavior of specific devices.
+
+diff --git a/configure.in b/configure.in
+index 95d6772..081625a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -155,6 +155,8 @@ AC_LANG(C)
+ if test -z "$OBJDUMP"; then
+ 	AC_MSG_WARN([unable to find objdump, which is needed to run tests])
+ else
++	old_CFLAGS="${CFLAGS}"
++	CFLAGS="-O0"
+ 	AC_MSG_CHECKING([linking open() and write() to detect libc names])
+ 	AC_LINK_IFELSE([
+ 	AC_LANG_SOURCE([[
+@@ -191,6 +193,7 @@ else
+ 	],
+ 	[AC_MSG_FAILURE([failed to link open/write test])]
+ 	)
++	CFLAGS="${old_CFLAGS}"
+ fi
+ 
+ 
diff --git a/sys-block/mbuffer/mbuffer-20240107.ebuild b/sys-block/mbuffer/mbuffer-20240107.ebuild
index 6d8e6e093eed..9c6aaa7d7fa0 100644
--- a/sys-block/mbuffer/mbuffer-20240107.ebuild
+++ b/sys-block/mbuffer/mbuffer-20240107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
 	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
 	"${FILESDIR}/${PN}-20231216-autoconf-warning.patch"
+	"${FILESDIR}/${PN}-20240107-O0-for-libc-name-find.patch"
 )
 
 src_prepare() {
diff --git a/sys-block/mbuffer/mbuffer-20240707.ebuild b/sys-block/mbuffer/mbuffer-20240707.ebuild
index c1354afd7ec1..748d9ea7f1a3 100644
--- a/sys-block/mbuffer/mbuffer-20240707.ebuild
+++ b/sys-block/mbuffer/mbuffer-20240707.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
 	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
 	"${FILESDIR}/${PN}-20231216-autoconf-warning.patch"
+	"${FILESDIR}/${PN}-20240107-O0-for-libc-name-find.patch"
 )
 
 src_prepare() {
diff --git a/sys-block/mbuffer/mbuffer-20241007.ebuild b/sys-block/mbuffer/mbuffer-20241007.ebuild
index 975b6a812092..b8d79941c431 100644
--- a/sys-block/mbuffer/mbuffer-20241007.ebuild
+++ b/sys-block/mbuffer/mbuffer-20241007.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
 	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
 	"${FILESDIR}/${PN}-20231216-autoconf-warning.patch"
+	"${FILESDIR}/${PN}-20240107-O0-for-libc-name-find.patch"
 )
 
 src_prepare() {