Date: Thu, 16 Oct 2003 14:48:18 -0400 From: Joe Marcus Clarke <marcus@marcuscom.com> To: FUJISHIMA Satsuki <sf@freebsd.org> Cc: FreeBSD GNOME Users <gnome@freebsd.org> Subject: Re: galeon: get rid of -pthread from CFLAGS Message-ID: <1066330098.753.45.camel@gyros> In-Reply-To: <86k775qb08.wl@gray.plala.or.jp> References: <86k775qb08.wl@gray.plala.or.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-BQ3jUEirz7nIUiwgXBCz
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
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
>=20
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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} ""
> =20
> 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
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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 @@
> =20
> # This can be used to rebuild libtool when needed
> LIBTOOL_DEPS=3D"$ac_aux_dir/ltmain.sh"
> @@ -8,3 +8,14 @@
> =20
> # Always use our own libtool.
> LIBTOOL=3D'$(SHELL) $(top_builddir)/libtool'
> +@@ -11890,8 +11891,8 @@
> + ;;
> + FreeBSD)
> + USE_PTHREADS=3D1
> +- _PTHREAD_CFLAGS=3D"-pthread -D_THREAD_SAFE"
> +- _PTHREAD_LDFLAGS=3D"";;
> ++ _PTHREAD_CFLAGS=3D"%%PTHREAD_CFLAGS%%"
> ++ _PTHREAD_LDFLAGS=3D"%%PTHREAD_LIBS%%";;
> + *)
> + USE_PTHREADS=3D1
> + _PTHREAD_LDFLAGS=3D"-lc_r";;
> _______________________________________________
> freebsd-gnome@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org"
--=20
PGP Key : http://www.marcuscom.com/pgp.asc
--=-BQ3jUEirz7nIUiwgXBCz
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQA/jufyb2iPiv4Uz4cRAmHIAJ42iYqVNMCCxF34Sx8jhgmSRc+OGQCeJrTy
OlYbOD0gmSSm8kdOLelXEfM=
=8VKV
-----END PGP SIGNATURE-----
--=-BQ3jUEirz7nIUiwgXBCz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1066330098.753.45.camel>