aboutsummaryrefslogtreecommitdiff
path: root/devel/glib12
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2013-02-14 09:42:12 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2013-02-14 09:42:12 +0000
commit03cceed935615886af3d9551e9fb9b573ce3744a (patch)
treefefb362514ed477cab8a0c201ef842c790185635 /devel/glib12
parentf2a68ebb7a9de69a3ae4d9df85ad0471ad8deab9 (diff)
downloadports-03cceed935615886af3d9551e9fb9b573ce3744a.tar.gz
ports-03cceed935615886af3d9551e9fb9b573ce3744a.zip
Notes
Diffstat (limited to 'devel/glib12')
-rw-r--r--devel/glib12/Makefile7
-rw-r--r--devel/glib12/files/patch-ae27
2 files changed, 9 insertions, 25 deletions
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index cfc391ce7a3f..1702b64a48fd 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -20,17 +20,10 @@ USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
-CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
MAN1= glib-config.1
INFO= glib
-post-patch:
- @${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|-lpthread|${PTHREAD_LIBS}|g ; \
- s|-lc_r|${PTHREAD_LIBS}|g'
-
post-install:
${LN} -sf ${PREFIX}/bin/glib-config ${PREFIX}/bin/glib12-config
.for lib in glib gmodule gthread
diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-ae
index 2d7028b6563b..25f89584cd38 100644
--- a/devel/glib12/files/patch-ae
+++ b/devel/glib12/files/patch-ae
@@ -1,5 +1,5 @@
---- configure.orig Tue May 11 04:55:02 1999
-+++ configure Mon May 17 22:30:32 1999
+--- configure.orig 2001-03-15 16:44:01.000000000 +0100
++++ configure 2012-12-12 11:10:38.000000000 +0100
@@ -587,10 +587,10 @@
@@ -15,7 +15,7 @@
-@@ -3472,7 +3472,7 @@
+@@ -3496,7 +3496,7 @@
# Check for some functions
@@ -23,8 +23,8 @@
+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 @@
+ echo "configure:3503: checking for $ac_func" >&5
+@@ -4390,6 +4390,12 @@
linux*)
G_MODULE_LDFLAGS='-rdynamic'
;;
@@ -37,7 +37,7 @@
esac
LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS"
-@@ -5057,11 +5063,17 @@
+@@ -5177,11 +5183,8 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
@@ -47,20 +47,11 @@
- # 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="${PTHREAD_CFLAGS}"
-+ G_THREAD_LIBS="${PTHREAD_LIBS}"
-+ case $host in
-+ *-*-freebsd4*) ;;
-+ default) have_poll=no ;;
-+ esac
-+ else
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS} -DLINUXTHREADS"
-+ fi
++ G_THREAD_LIBS="-pthread"
;;
esac
-@@ -5349,9 +5358,6 @@
+@@ -5469,9 +5472,6 @@
@@ -70,7 +61,7 @@
case "$mutex_has_default" in
"yes")
echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
-@@ -5448,6 +5454,63 @@
+@@ -5568,6 +5568,63 @@