diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2000-02-12 18:59:51 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2000-02-12 18:59:51 +0000 |
| commit | be6e15d519036bc8399d9fce18a577f6d76b73b6 (patch) | |
| tree | 21390d91385023178a876ff8d66fbd9a93260ed2 /devel/glib12 | |
| parent | 1d2c4bc5451b9d9ee247bb26c5498971766866f8 (diff) | |
Enable the use of poll() on -current.
Fix bad C++ define of NULL.
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=25697
Diffstat (limited to 'devel/glib12')
| -rw-r--r-- | devel/glib12/files/patch-ad | 7 | ||||
| -rw-r--r-- | devel/glib12/files/patch-ae | 7 | ||||
| -rw-r--r-- | devel/glib12/files/patch-af | 14 |
3 files changed, 24 insertions, 4 deletions
diff --git a/devel/glib12/files/patch-ad b/devel/glib12/files/patch-ad index 200a74992f87..29585871cb9e 100644 --- a/devel/glib12/files/patch-ad +++ b/devel/glib12/files/patch-ad @@ -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 diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-ae index bb5061b59f99..49aa09418338 100644 --- a/devel/glib12/files/patch-ae +++ b/devel/glib12/files/patch-ae @@ -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 diff --git a/devel/glib12/files/patch-af b/devel/glib12/files/patch-af new file mode 100644 index 000000000000..2af9749e9775 --- /dev/null +++ b/devel/glib12/files/patch-af @@ -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 |