diff options
author | tv <tv> | 2004-04-28 03:43:02 +0000 |
---|---|---|
committer | tv <tv> | 2004-04-28 03:43:02 +0000 |
commit | e37878341cfaf3f9c13fffd3e20430c4b18c7d51 (patch) | |
tree | 6402f3d05895b2c72c9dd3c141e2930df84ce970 /devel | |
parent | 2f7a2cf59419426bb712fda76e185d37806426e2 (diff) | |
download | pkgsrc-e37878341cfaf3f9c13fffd3e20430c4b18c7d51.tar.gz |
Make build and wotrk on Interix. (Bugzilla bugs open for these changes;
noted in each patchfile.)
Diffstat (limited to 'devel')
-rw-r--r-- | devel/glib2/distinfo | 5 | ||||
-rw-r--r-- | devel/glib2/patches/patch-aa | 37 | ||||
-rw-r--r-- | devel/glib2/patches/patch-ag | 17 |
3 files changed, 47 insertions, 12 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index cf8d1c0ccde..45f37653266 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.29 2004/04/24 04:54:07 minskim Exp $ +$NetBSD: distinfo,v 1.30 2004/04/28 03:43:02 tv Exp $ SHA1 (glib-2.4.0.tar.bz2) = 17822e7180791f18c1723110e9e757dc5526440c Size (glib-2.4.0.tar.bz2) = 2034272 bytes -SHA1 (patch-aa) = 53ae00ea0fcd545d80c4ba7e94e0a234ad482427 +SHA1 (patch-aa) = 5a1606c02d7d07d33eecc66e80efb4f93be1ac57 SHA1 (patch-ab) = a231346877b6246e086312fda107a90dffdd0adb SHA1 (patch-ac) = 5f3d1446a41e71f1bf5556a1dd2a2a04e77d45da SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 SHA1 (patch-af) = c7f29961a832b65feef0e8f4cf218491a440f68c +SHA1 (patch-ag) = 261e534ba2c17d5e35c0cd5cdec1631eb9f6545f diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index d6b3dc02f25..945095ffae3 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,11 +1,12 @@ -$NetBSD: patch-aa,v 1.12 2004/04/17 10:37:12 jmmv Exp $ +$NetBSD: patch-aa,v 1.13 2004/04/28 03:43:02 tv Exp $ http://bugzilla.gnome.org/show_bug.cgi?id=139567 http://bugzilla.gnome.org/show_bug.cgi?id=140329 +http://bugzilla.gnome.org/show_bug.cgi?id=141256 ---- configure.orig 2004-03-16 18:13:21.000000000 +0100 -+++ configure 2004-04-17 10:06:39.000000000 +0200 -@@ -465,7 +465,7 @@ +--- configure.orig Tue Mar 16 12:13:21 2004 ++++ configure +@@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" @@ -14,7 +15,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329 ac_subst_files='' # Initialize some variables set by options. -@@ -30441,6 +30441,7 @@ +@@ -30441,6 +30441,7 @@ else fi G_MODULE_NEED_USCORE=0 G_MODULE_BROKEN_RTLD_GLOBAL=0 @@ -22,7 +23,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329 G_MODULE_HAVE_DLERROR=0 if test -z "$G_MODULE_IMPL"; then case "$host" in -@@ -31048,13 +31049,13 @@ +@@ -31048,13 +31049,13 @@ cat >>conftest.$ac_ext <<_ACEOF #ifndef RTLD_LAZY # define RTLD_LAZY 0 #endif @@ -40,7 +41,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329 return global == local; } _ACEOF -@@ -31090,6 +31091,72 @@ +@@ -31090,6 +31091,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke else G_MODULE_BROKEN_RTLD_GLOBAL=0 fi @@ -113,7 +114,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329 echo "$as_me:$LINENO: checking for preceeding underscore in symbols" >&5 echo $ECHO_N "checking for preceeding underscore in symbols... $ECHO_C" >&6 if test "${glib_cv_uscore+set}" = set; then -@@ -31714,7 +31781,7 @@ +@@ -31714,7 +31781,7 @@ if test x"$have_threads" != xno; then # both CPPFLAG and LIBS. # One of them does for most gcc versions and some other platforms/compilers # too and could be considered as the canonical way to go. @@ -122,7 +123,23 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329 glib_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -$flag" if test "$cross_compiling" = yes; then -@@ -34181,7 +34248,7 @@ +@@ -31869,6 +31936,15 @@ fi + + fi + ++# for some reason, the test for -pthread "succeeds" on gcc3.3 for interix ++# even though the option is wrong and invalid ++case $host in ++*-interix*) ++ G_THREAD_CFLAGS="-D_REENTRANT" ++ G_THREAD_LIBS="-lpthread" ++ ;; ++esac ++ + # if we are not finding the localtime_r function, then we probably are + # not using the proper multithread flag + +@@ -34181,7 +34257,7 @@ fi # b) libtool doesn't recognize -pthread as a library dependency. # case $host in @@ -131,7 +148,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329 G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" ;; *) -@@ -38406,6 +38473,7 @@ +@@ -38406,6 +38482,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI s,@G_MODULE_LDFLAGS@,$G_MODULE_LDFLAGS,;t t s,@G_MODULE_HAVE_DLERROR@,$G_MODULE_HAVE_DLERROR,;t t s,@G_MODULE_BROKEN_RTLD_GLOBAL@,$G_MODULE_BROKEN_RTLD_GLOBAL,;t t diff --git a/devel/glib2/patches/patch-ag b/devel/glib2/patches/patch-ag new file mode 100644 index 00000000000..24fe2d3a14a --- /dev/null +++ b/devel/glib2/patches/patch-ag @@ -0,0 +1,17 @@ +$NetBSD: patch-ag,v 1.3 2004/04/28 03:43:02 tv Exp $ + +http://bugzilla.gnome.org/show_bug.cgi?id=141251 + +--- glib/gmain.c.orig Sun Mar 14 12:58:27 2004 ++++ glib/gmain.c +@@ -57,6 +57,10 @@ + #endif + + #endif /* GLIB_HAVE_SYS_POLL_H */ ++#ifdef __INTERIX ++/* SUS standard location is NOT <sys/poll.h> */ ++#include <poll.h> ++#endif + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif /* HAVE_UNISTD_H */ |