galeon: get rid of -pthread from CFLAGS

[Joe Marcus Clarke]

On Thu, 2003-10-16 at 14:43, FUJISHIMA Satsuki wrote:
> o in configure "-pthread" is added to CFLAGS for FreeBSD; replaced
>   with PTHREAD_CFLAGS/LIBS.
> o find galeon-1.2.12/ -name 'Makefile.in*'|xargs grep -- -lpthread
>   exits with 1; post-patch hack removed.
> o tested on both -STABLE and -CURRENT.

Committed, thanks!

Joe

> 
> Index: Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/www/galeon/Makefile,v
> retrieving revision 1.112
> diff -u -r1.112 Makefile
> --- Makefile	11 Oct 2003 22:18:20 -0000	1.112
> +++ Makefile	16 Oct 2003 16:27:36 -0000
> @@ -74,8 +74,9 @@
>  	@${ECHO_MSG} ""
>  
>  post-patch:
> -	@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
> -		 's|-lpthread|${PTHREAD_LIBS}|g'
> +	@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \
> +			  -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
> +			  ${WRKSRC}/configure
>  	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
>  		's|malloc\.h|stdlib.h|g'
>  	@${MKDIR} ${WRKSRC}/src/libnautilus
> Index: files/patch-configure
> ===================================================================
> RCS file: /home/ncvs/ports/www/galeon/files/patch-configure,v
> retrieving revision 1.11
> diff -u -r1.11 patch-configure
> --- files/patch-configure	20 Apr 2003 04:08:54 -0000	1.11
> +++ files/patch-configure	16 Oct 2003 16:16:37 -0000
> @@ -1,6 +1,6 @@
> ---- configure.orig	Mon Mar 17 15:31:41 2003
> -+++ configure	Mon Apr  7 23:32:37 2003
> -@@ -7950,6 +7950,7 @@
> +--- configure.orig	Fri Oct 17 01:15:31 2003
> ++++ configure	Fri Oct 17 01:16:29 2003
> +@@ -7968,6 +7968,7 @@
>   
>   # This can be used to rebuild libtool when needed
>   LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
> @@ -8,3 +8,14 @@
>   
>   # Always use our own libtool.
>   LIBTOOL='$(SHELL) $(top_builddir)/libtool'
> +@@ -11890,8 +11891,8 @@
> + 		;;
> + 	FreeBSD)
> + 		USE_PTHREADS=1
> +-		_PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
> +-		_PTHREAD_LDFLAGS="";;
> ++		_PTHREAD_CFLAGS="%%PTHREAD_CFLAGS%%"
> ++		_PTHREAD_LDFLAGS="%%PTHREAD_LIBS%%";;
> + 	*)
> + 		USE_PTHREADS=1
> + 		_PTHREAD_LDFLAGS="-lc_r";;
> _______________________________________________
> freebsd-gnome at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe at freebsd.org"
-- 
PGP Key : http://www.marcuscom.com/pgp.asc


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/freebsd-gnome/attachments/20031016/94d6376e/attachment-0001.bin