FreeBSD Bugzilla – Attachment 247278 Details for
Bug 275958
benchmarks/stress-ng: namespace collision for crypt_data if libxcrypt installed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
[patch] avoid conflicting crypt_data definitions (crypt.h vs unistd.h)
pr-stress-ng-fix-crypt_data-conflict.diff (text/plain), 966 bytes, created by
John Hein
on 2023-12-27 05:09:25 UTC
(
hide
)
Description:
[patch] avoid conflicting crypt_data definitions (crypt.h vs unistd.h)
Filename:
MIME Type:
Creator:
John Hein
Created:
2023-12-27 05:09:25 UTC
Size:
966 bytes
patch
obsolete
>diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile >index 94008d6a5884..2d0d479d6070 100644 >--- a/benchmarks/stress-ng/Makefile >+++ b/benchmarks/stress-ng/Makefile >@@ -13,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING > LIB_DEPENDS+=libmpfr.so:math/mpfr > > USES= compiler:c11 gmake jpeg localbase:ldflags >+#USES= compiler:c11 gmake jpeg > USE_GITHUB= yes > GH_ACCOUNT= ColinIanKing > >@@ -53,6 +54,7 @@ USE_GL= egl glesv2 gbm > > pre-patch: > ${MKDIR} ${WRKSRC}/configs >+ ${TOUCH} ${WRKSRC}/configs/HAVE_CRYPT_H > .if ${ARCH} == i386 > ${TOUCH} ${WRKSRC}/configs/HAVE_VECMATH > .endif >@@ -86,6 +88,9 @@ post-patch-GPU-off: > ${TOUCH} ${WRKSRC}/configs/HAVE_LIB_GBM > ${TOUCH} ${WRKSRC}/configs/HAVE_GBM_H > >+xx-do-configure: >+ cd ${WRKSRC} && ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${_MAKE_JOBS} config >+ > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${STAGEDIR}${PREFIX}/bin > ${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=247278">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
jcfyecrayz
:
maintainer-approval?
(
pizzamig
)
Actions:
View
|
Diff
Attachments on
bug 275958
: 247278