diff options
Diffstat (limited to 'devel/glib13/files')
| -rw-r--r-- | devel/glib13/files/patch-ae | 69 | ||||
| -rw-r--r-- | devel/glib13/files/patch-ag | 28 | ||||
| -rw-r--r-- | devel/glib13/files/patch-ah | 11 |
3 files changed, 90 insertions, 18 deletions
diff --git a/devel/glib13/files/patch-ae b/devel/glib13/files/patch-ae index 33da4ed..3e30616 100644 --- a/devel/glib13/files/patch-ae +++ b/devel/glib13/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig Fri Jul 14 22:09:59 2000 -+++ configure Tue Jul 18 10:06:24 2000 -@@ -4580,6 +4580,12 @@ +--- configure.orig Fri Nov 17 22:45:11 2000 ++++ configure Mon Nov 20 18:27:43 2000 +@@ -4230,6 +4230,12 @@ linux*) G_MODULE_LDFLAGS='-rdynamic' ;; @@ -13,7 +13,16 @@ esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" -@@ -4864,8 +4870,8 @@ +@@ -4523,7 +4529,7 @@ + G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" + fi + ;; +- *-freebsd2.2*) ++ *-freebsd*) + G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" + + # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support +@@ -4610,8 +4616,8 @@ add_thread_lib="" IN="" else @@ -23,13 +32,47 @@ + IN=" in -$thread_lib" fi if test x"$have_threads" = xposix; then - defattr=NULL -@@ -5042,7 +5048,7 @@ - - if test x"$enable_threads" = xyes; then - -- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess -+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE" # good default guess + defattr=0 +@@ -4912,7 +4918,7 @@ + sizeof (buffer)); + ; return 0; } + EOF +-if { (eval echo configure:4916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then + rm -rf conftest* + ac_cv_func_nonposix_getpwuid_r=yes + else +@@ -5413,6 +5419,7 @@ + if eval "test \"`echo '$''{'ac_cv_func_iconv_open'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else ++# LIBS="-liconv $LIBS" + cat > conftest.$ac_ext <<EOF + #line 5418 "configure" + #include "confdefs.h" +@@ -5462,14 +5469,14 @@ + # + # Check for libiconv + # +- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 ++ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 + echo "configure:5467: checking for libiconv_open in -liconv" >&5 + ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-liconv $LIBS" ++LIBS="-lgiconv $LIBS" + cat > conftest.$ac_ext <<EOF + #line 5475 "configure" + #include "confdefs.h" +@@ -5509,7 +5516,7 @@ + fi - case $host in - *-aix*) + if test "x$with_libiconv" = "xyes" ; then +- ICONV_LIBS="-liconv" ++ ICONV_LIBS="-lgiconv" + cat >> confdefs.h <<\EOF + #define USE_LIBICONV 1 + EOF diff --git a/devel/glib13/files/patch-ag b/devel/glib13/files/patch-ag index f87e5fb..b91c8e5 100644 --- a/devel/glib13/files/patch-ag +++ b/devel/glib13/files/patch-ag @@ -1,11 +1,29 @@ ---- Makefile.in.orig Mon Jul 17 10:37:18 2000 -+++ Makefile.in Mon Jul 17 10:38:06 2000 -@@ -103,7 +103,7 @@ +--- Makefile.in.orig Fri Nov 17 22:45:29 2000 ++++ Makefile.in Mon Nov 20 12:01:17 2000 +@@ -108,7 +108,7 @@ AUTOMAKE_OPTIONS = 1.4 --SUBDIRS = . gobject gmodule gthread docs tests -+SUBDIRS = . gobject gmodule gthread docs +-SUBDIRS = . gobject gmodule gthread docs tests build ++SUBDIRS = . gobject gmodule gthread docs build bin_SCRIPTS = glib-config-2.0 +@@ -134,7 +134,7 @@ + glibinclude_HEADERS = galloca.h garray.h gasyncqueue.h gbacktrace.h gcache.h gcompletion.h gconvert.h gdataset.h gdate.h gerror.h gfileutils.h ghash.h ghook.h giochannel.h glib.h glib-object.h glist.h gmacros.h gmain.h gmarkup.h gmem.h gmessages.h gnode.h gprimes.h gquark.h gqueue.h grand.h grel.h gscanner.h gshell.h gslist.h gspawn.h gstrfuncs.h gstring.h gthread.h gthreadpool.h gtimer.h gtree.h gtypes.h gunicode.h gutils.h gwin32.h + + +-configexecincludedir = $(libdir)/glib-2.0/include ++configexecincludedir = $(glibincludedir) + + CONFIGURE_DEPENDENCIES = acglib.m4 + +@@ -594,7 +594,7 @@ + install-exec-local + install-exec: install-exec-recursive + +-install-data-am: install-m4dataDATA install-pkgconfigDATA \ ++install-data-am: install-m4dataDATA \ + install-glibincludeHEADERS + install-data: install-data-recursive + diff --git a/devel/glib13/files/patch-ah b/devel/glib13/files/patch-ah new file mode 100644 index 0000000..afb4544 --- /dev/null +++ b/devel/glib13/files/patch-ah @@ -0,0 +1,11 @@ +--- docs/reference/Makefile.in 2000/11/20 09:49:25 1.1 ++++ docs/reference/Makefile.in 2000/11/20 09:50:55 +@@ -106,7 +106,7 @@ + STRIP_END = @STRIP_END@ + VERSION = @VERSION@ + +-SUBDIRS = glib gobject ++SUBDIRS = #glib gobject + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../config.h + CONFIG_CLEAN_FILES = |
