diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-05-29 03:46:56 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-05-29 03:46:56 +0000 |
| commit | 51ec9126d42f3b55fa2dce2d3ade3b29a7dc4f31 (patch) | |
| tree | 9b90eae110fb90dd07c65591140a50be487097cf /devel/glib12/files/patch-ad | |
| parent | Changes from maintainer: (diff) | |
Update to version 1.2.3.
PR: 11841
Submitted by: Jeremy Lea <reg@shale.csir.co.za>
Diffstat (limited to 'devel/glib12/files/patch-ad')
| -rw-r--r-- | devel/glib12/files/patch-ad | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/devel/glib12/files/patch-ad b/devel/glib12/files/patch-ad index f373a5042242..21f00017acbf 100644 --- a/devel/glib12/files/patch-ad +++ b/devel/glib12/files/patch-ad @@ -1,6 +1,21 @@ ---- configure.in.orig Thu Jan 28 09:59:01 1999 -+++ configure.in Thu Jan 28 23:13:01 1999 -@@ -268,7 +268,7 @@ +--- configure.in.orig Tue May 11 04:31:37 1999 ++++ configure.in Mon May 17 22:29:31 1999 +@@ -48,10 +48,10 @@ + AC_SUBST(GLIB_BINARY_AGE) + + # libtool versioning +-LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION +-LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE` +-LT_REVISION=$GLIB_INTERFACE_AGE +-LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE` ++LT_RELEASE=12 ++LT_CURRENT=2 ++LT_REVISION=0 ++LT_AGE=0 + AC_SUBST(LT_RELEASE) + AC_SUBST(LT_CURRENT) + AC_SUBST(LT_REVISION) +@@ -273,7 +273,7 @@ AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H)) # Check for some functions @@ -9,17 +24,20 @@ # Check for sys_errlist AC_MSG_CHECKING(for sys_errlist) -@@ -507,6 +507,9 @@ +@@ -528,6 +528,12 @@ linux*) G_MODULE_LDFLAGS='-rdynamic' ;; + freebsd*) -+ G_MODULE_LDFLAGS='-Wl,-E' ++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ if test $objformat = "elf"; then ++ G_MODULE_LDFLAGS='-Wl,-E' ++ fi + ;; esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" -@@ -716,11 +719,13 @@ +@@ -737,11 +743,14 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -30,7 +48,8 @@ - # -mthreads flag. + *-*-freebsd*) + if test x"$G_THREAD_LIBS" = x"-lc_r"; then -+ G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread" ++ G_THREAD_CFLAGS="-D_THREAD_SAFE" ++ G_THREAD_LIBS="-pthread" + have_poll=no + else + G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS" @@ -38,7 +57,16 @@ ;; esac -@@ -834,6 +839,9 @@ +@@ -858,8 +867,6 @@ + AC_SUBST(G_THREAD_CFLAGS) + AC_SUBST(G_THREAD_LIBS) + +-CFLAGS="$CFLAGS $G_THREAD_CFLAGS" +- + dnl ********************************************** + dnl *** GDefaultMutex setup and initialization *** + dnl ********************************************** +@@ -883,6 +890,9 @@ dnl **************************************** dnl *** GLib POLL* compatibility defines *** dnl **************************************** |