1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-13 23:36:08 +00:00
freebsd-ports/devel/glib20/files/patch-ae

137 lines
3.6 KiB
Plaintext
Raw Normal View History

--- configure.orig Tue May 11 04:55:02 1999
+++ configure Mon May 17 22:30:32 1999
@@ -587,10 +587,10 @@
# 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=3
+LT_REVISION=0
+LT_AGE=0
@@ -3472,7 +3472,7 @@
# Check for some functions
-for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll
+for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3479: checking for $ac_func" >&5
@@ -4365,6 +4365,12 @@
Upgrade to GNOME 1.0. The following are the details: ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422 ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426 ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421 ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435 ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423 ports/devel/gettext shared libs now PR ports/10293 ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419 ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430 ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436 ports/graphics/electriceyes distfile moved PR ports/10437 ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424 ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441 ports/math/gnumeric 0.6 -> 0.15 PR ports/10439 ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442 ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445 ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446 ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477 ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438 ports/www/libghttp distfile moved PR ports/10429 ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450 ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432 ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425 ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448 ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427 ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420 Note that repository copies were made before this commit, as follows: ports/devel/glib11-devel -> ports/devel/glib12 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
1999-03-09 01:13:40 +00:00
linux*)
G_MODULE_LDFLAGS='-rdynamic'
;;
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ if test $objformat = "elf"; then
+ G_MODULE_LDFLAGS='-Wl,-E'
+ fi
Upgrade to GNOME 1.0. The following are the details: ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422 ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426 ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421 ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435 ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423 ports/devel/gettext shared libs now PR ports/10293 ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419 ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430 ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436 ports/graphics/electriceyes distfile moved PR ports/10437 ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424 ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441 ports/math/gnumeric 0.6 -> 0.15 PR ports/10439 ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442 ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445 ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446 ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477 ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438 ports/www/libghttp distfile moved PR ports/10429 ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450 ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432 ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425 ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448 ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427 ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420 Note that repository copies were made before this commit, as follows: ports/devel/glib11-devel -> ports/devel/glib12 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
1999-03-09 01:13:40 +00:00
+ ;;
esac
LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS"
@@ -5057,11 +5063,17 @@
1999-01-20 18:31:00 +00:00
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
- *-freebsd2.2*)
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
-
- # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
- # -mthreads flag.
+ *-*-freebsd*)
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
+ G_THREAD_LIBS="-pthread"
+ case $host in
+ *-*-freebsd4*) ;;
+ default) have_poll=no ;;
+ esac
+ else
Upgrade to GNOME 1.0. The following are the details: ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422 ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426 ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421 ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435 ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423 ports/devel/gettext shared libs now PR ports/10293 ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419 ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430 ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436 ports/graphics/electriceyes distfile moved PR ports/10437 ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424 ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441 ports/math/gnumeric 0.6 -> 0.15 PR ports/10439 ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442 ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445 ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446 ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477 ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438 ports/www/libghttp distfile moved PR ports/10429 ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450 ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432 ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425 ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448 ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427 ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420 Note that repository copies were made before this commit, as follows: ports/devel/glib11-devel -> ports/devel/glib12 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
1999-03-09 01:13:40 +00:00
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
+ fi
1999-01-20 18:31:00 +00:00
;;
esac
@@ -5349,9 +5358,6 @@
-CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
-
-
case "$mutex_has_default" in
"yes")
echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
@@ -5448,6 +5454,63 @@
+if test x"$have_poll" != xno; then
+ for ac_func in poll
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
Upgrade to GNOME 1.0. The following are the details: ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422 ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426 ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421 ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435 ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423 ports/devel/gettext shared libs now PR ports/10293 ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419 ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430 ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436 ports/graphics/electriceyes distfile moved PR ports/10437 ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424 ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441 ports/math/gnumeric 0.6 -> 0.15 PR ports/10439 ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442 ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445 ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446 ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477 ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438 ports/www/libghttp distfile moved PR ports/10429 ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450 ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432 ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425 ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448 ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427 ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420 Note that repository copies were made before this commit, as follows: ports/devel/glib11-devel -> ports/devel/glib12 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
1999-03-09 01:13:40 +00:00
+echo "configure:5636: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
Upgrade to GNOME 1.0. The following are the details: ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422 ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426 ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421 ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435 ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423 ports/devel/gettext shared libs now PR ports/10293 ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419 ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430 ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436 ports/graphics/electriceyes distfile moved PR ports/10437 ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424 ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441 ports/math/gnumeric 0.6 -> 0.15 PR ports/10439 ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442 ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445 ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446 ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477 ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438 ports/www/libghttp distfile moved PR ports/10429 ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450 ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432 ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425 ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448 ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427 ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420 Note that repository copies were made before this commit, as follows: ports/devel/glib11-devel -> ports/devel/glib12 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
1999-03-09 01:13:40 +00:00
+#line 5641 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
Upgrade to GNOME 1.0. The following are the details: ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422 ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426 ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421 ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435 ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423 ports/devel/gettext shared libs now PR ports/10293 ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419 ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430 ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436 ports/graphics/electriceyes distfile moved PR ports/10437 ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424 ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441 ports/math/gnumeric 0.6 -> 0.15 PR ports/10439 ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442 ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445 ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446 ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477 ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438 ports/www/libghttp distfile moved PR ports/10429 ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450 ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432 ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425 ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448 ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427 ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420 Note that repository copies were made before this commit, as follows: ports/devel/glib11-devel -> ports/devel/glib12 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
1999-03-09 01:13:40 +00:00
+if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+fi
glib_sysdefso="glibconfig-sysdefs.h"
glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'`
1999-01-20 18:31:00 +00:00
if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then