mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Enable the use of poll() on -current.
Fix bad C++ define of NULL. Approved by: maintainer
This commit is contained in:
parent
1d2c4bc545
commit
be6e15d519
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=25697
5 changed files with 34 additions and 8 deletions
|
@ -37,7 +37,7 @@
|
|||
esac
|
||||
LIBS_orig="$LIBS"
|
||||
LDFLAGS_orig="$LDFLAGS"
|
||||
@@ -737,11 +743,14 @@
|
||||
@@ -737,11 +743,17 @@
|
||||
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
||||
fi
|
||||
;;
|
||||
|
@ -50,7 +50,10 @@
|
|||
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
|
||||
+ G_THREAD_LIBS="-pthread"
|
||||
+ have_poll=no
|
||||
+ case $host in
|
||||
+ *-*-freebsd4*) ;;
|
||||
+ default) have_poll=no ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
|
||||
+ fi
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
esac
|
||||
LIBS_orig="$LIBS"
|
||||
LDFLAGS_orig="$LDFLAGS"
|
||||
@@ -5057,11 +5063,14 @@
|
||||
@@ -5057,11 +5063,17 @@
|
||||
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
||||
fi
|
||||
;;
|
||||
|
@ -50,7 +50,10 @@
|
|||
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
|
||||
+ G_THREAD_LIBS="-pthread"
|
||||
+ have_poll=no
|
||||
+ case $host in
|
||||
+ *-*-freebsd4*) ;;
|
||||
+ default) have_poll=no ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
|
||||
+ fi
|
||||
|
|
14
devel/glib12/files/patch-af
Normal file
14
devel/glib12/files/patch-af
Normal file
|
@ -0,0 +1,14 @@
|
|||
--- glib.h.orig Sun Sep 5 23:34:07 1999
|
||||
+++ glib.h Thu Sep 16 01:32:54 1999
|
||||
@@ -108,7 +108,11 @@
|
||||
* defined then the current definition is correct.
|
||||
*/
|
||||
#ifndef NULL
|
||||
+#ifdef __cplusplus
|
||||
+#define NULL (0)
|
||||
+#else
|
||||
#define NULL ((void*) 0)
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#ifndef FALSE
|
|
@ -37,7 +37,7 @@
|
|||
esac
|
||||
LIBS_orig="$LIBS"
|
||||
LDFLAGS_orig="$LDFLAGS"
|
||||
@@ -5057,11 +5063,14 @@
|
||||
@@ -5057,11 +5063,17 @@
|
||||
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
||||
fi
|
||||
;;
|
||||
|
@ -50,7 +50,10 @@
|
|||
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
|
||||
+ G_THREAD_LIBS="-pthread"
|
||||
+ have_poll=no
|
||||
+ case $host in
|
||||
+ *-*-freebsd4*) ;;
|
||||
+ default) have_poll=no ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
|
||||
+ fi
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
esac
|
||||
LIBS_orig="$LIBS"
|
||||
LDFLAGS_orig="$LDFLAGS"
|
||||
@@ -5057,11 +5063,14 @@
|
||||
@@ -5057,11 +5063,17 @@
|
||||
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
|
||||
fi
|
||||
;;
|
||||
|
@ -50,7 +50,10 @@
|
|||
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
|
||||
+ G_THREAD_LIBS="-pthread"
|
||||
+ have_poll=no
|
||||
+ case $host in
|
||||
+ *-*-freebsd4*) ;;
|
||||
+ default) have_poll=no ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
|
||||
+ fi
|
||||
|
|
Loading…
Add table
Reference in a new issue