diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-09-09 18:36:45 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-09-09 18:36:45 +0800 |
| commit | e0d59c3a6ba045f6927827083283505fa4216f17 (patch) | |
| tree | 27ec1d8b732030cdfac966eeae7662917f30c669 /devel/glib20 | |
| parent | 11bb4a16ff471d50be16bda749cc112d819da3ea (diff) | |
| download | marcuscom-ports-e0d59c3a6ba045f6927827083283505fa4216f17.tar.gz marcuscom-ports-e0d59c3a6ba045f6927827083283505fa4216f17.tar.zst marcuscom-ports-e0d59c3a6ba045f6927827083283505fa4216f17.zip | |
Sync with FreeBSD port about "-D__STDC_ISO_10646__".
Fix a " == " -> " = " in configure.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14560 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/glib20')
| -rw-r--r-- | devel/glib20/Makefile | 4 | ||||
| -rw-r--r-- | devel/glib20/files/patch-ae | 21 |
2 files changed, 18 insertions, 7 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 677ed6f1f..daaa4128b 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.182 2010/08/29 23:00:17 marcus Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.183 2010/09/01 11:56:05 kwm Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! @@ -71,6 +71,8 @@ CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL} LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ ${FILESDIR}/extra-patch-glib_gunicollate.c +# Disable it until someone can figure why it causes net-im/pidgin crashed. +#CONFIGURE_ENV+= CFLAGS="-D__STDC_ISO_10646__" .endif post-patch: diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index b3b612e82..80fcb92b2 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig 2010-06-18 12:16:23.000000000 +0000 -+++ configure 2010-06-18 12:22:29.000000000 +0000 -@@ -714,6 +714,9 @@ +--- configure.orig 2010-09-09 12:18:43.000000000 +0200 ++++ configure 2010-09-09 12:20:56.000000000 +0200 +@@ -575,6 +575,9 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -10,7 +10,7 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -@@ -5305,7 +5308,7 @@ +@@ -5187,7 +5190,7 @@ fi GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" @@ -19,7 +19,7 @@ if test "x$with_runtime_libdir" != "x"; then -@@ -23052,7 +23055,7 @@ +@@ -22212,7 +22215,7 @@ fi done @@ -28,7 +28,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -25663,6 +25666,8 @@ +@@ -24815,6 +24818,8 @@ ;; esac fi @@ -37,3 +37,12 @@ if test x"$G_THREAD_CFLAGS" = x; then +@@ -27415,7 +27420,7 @@ + fi + + +-if test "x${enable_Bsymbolic}" == "xyes"; then ++if test "x${enable_Bsymbolic}" = "xyes"; then + GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions + fi + |