-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #208 from zrj-rimwis/d1512_add_netradiant
games/netradiant: fix build
- Loading branch information
Showing
2 changed files
with
31 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
|
||
dfly-patch: | ||
${REINPLACE_CMD} -e 's@\(Linux FreeBSD\)@\1 DragonFly@g' \ | ||
${WRKSRC}/Makefile | ||
${REINPLACE_CMD} -e 's@\(defined( __FreeBSD__ )\)@(\1 || defined(__DragonFly__))@g' \ | ||
${WRKSRC}/radiant/url.cpp | ||
${REINPLACE_CMD} -e 's@\(defined(__FreeBSD__)\)@(\1 || defined(__DragonFly__))@g' \ | ||
${WRKSRC}/contrib/bobtoolz/misc.cpp | ||
${REINPLACE_CMD} -e 's@\(defined ( __FreeBSD__ )\)@(\1 || defined(__DragonFly__))@g' \ | ||
${WRKSRC}/radiant/mainframe.cpp \ | ||
${WRKSRC}/radiant/watchbsp.cpp |
20 changes: 20 additions & 0 deletions
20
ports/games/netradiant/dragonfly/patch-tools_quake2_qdata_heretic2_common_threads.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
|
||
Taken-from: contrib/gold/gold-threads.cc | ||
|
||
--- tools/quake2/qdata_heretic2/common/threads.c.bak 2015-12-05 14:53:30.000000000 +0200 | ||
+++ tools/quake2/qdata_heretic2/common/threads.c | ||
@@ -539,12 +539,14 @@ void RunThreadsOn( int workcnt, qboolean | ||
if ( pthread_mutexattr_init( &mattrib ) != 0 ) { | ||
Error( "pthread_mutexattr_init failed" ); | ||
} | ||
+#ifndef __DragonFly__ | ||
#if __GLIBC_MINOR__ == 1 | ||
if ( pthread_mutexattr_settype( &mattrib, PTHREAD_MUTEX_FAST_NP ) != 0 ) | ||
#else | ||
if ( pthread_mutexattr_settype( &mattrib, PTHREAD_MUTEX_ADAPTIVE_NP ) != 0 ) | ||
#endif | ||
{ Error( "pthread_mutexattr_settype failed" ); } | ||
+#endif | ||
recursive_mutex_init( mattrib ); | ||
|
||
for ( i = 0 ; i < numthreads ; i++ ) |