Date: Mon, 06 Oct 2003 13:59:04 -0400 From: Joe Marcus Clarke <marcus@marcuscom.com> To: Jens Rehsack <rehsack@liwing.de> Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: [PATCH] x11-toolkits/scintilla misses gthread library Message-ID: <1065463144.748.58.camel@gyros> In-Reply-To: <200310061745.h96Hjwr4037843@helo.liwing.de> References: <200310061745.h96Hjwr4037843@helo.liwing.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-EjnrzqmxdLnfUMR80brx
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On Mon, 2003-10-06 at 13:45, Jens Rehsack wrote:
> =09
> >Description:
> Thanks to Joe Markus Clarke this patch adds the missed gthread library t=
o
> the build of the scintilla-libs. This is required for editors like
> moleskine.
> Of course, this is a workaround. Better would, adding the required libra=
ry
> to the pkg-config information.
I don't think your patch is correct. Simply linking in gthread will not
work as it will leave unresolved symbols to pthread*. You might want to
add a call to pkg-config --libs gthread instead of linking in the
libraries explicitly.
Joe
> >How-To-Repeat:
> =09
> >Fix:
> =09
> =09
> =09
> --- patch-add-libgthread begins here ---
> Index: x11-toolkits/scintilla/files/patch-aa
> =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
> diff -u x11-toolkits/scintilla/files/patch-aa.orig x11-toolkits/scintilla=
/files/patch-aa
> --- x11-toolkits/scintilla/files/patch-aa.orig Mon Oct 6 17:21:45 2003
> +++ x11-toolkits/scintilla/files/patch-aa Mon Oct 6 17:25:37 2003
> @@ -1,5 +1,5 @@
> ---- makefile.orig Sun Sep 21 11:19:30 2003
> -+++ makefile Sun Sep 28 11:48:04 2003
> +--- makefile.orig Sun Sep 21 02:19:30 2003
> ++++ makefile Mon Oct 6 17:25:24 2003
> @@ -8,8 +8,8 @@
> # To force GTK+ 1 build, define GTK1 on the make command line.
> =20
> @@ -21,7 +21,7 @@
> =20
> vpath %.h ../src ../include
> vpath %.cxx ../src
> -@@ -33,9 +34,9 @@
> +@@ -33,29 +34,33 @@
> endif
> =20
> ifdef DEBUG
> @@ -33,16 +33,24 @@
> endif
> =20
> # If explicit setting of GTK1 or GTK2 then use that else look for
> -@@ -44,7 +45,7 @@
> + # pkg-config which is an OK indication that GTK2 is available
> + ifdef GTK2
> CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0
> ++LIBS=3D-lgthread2.0
> else
> ifdef GTK1
> -CONFIGFLAGS=3Dgtk-config --cflags
> +CONFIGFLAGS=3Dpkg-config --cflags gtk+
> ++LIBS=3D-lgthread12
> else
> ifneq (,$(findstring /,$(shell whereis -b pkg-config)))
> CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0
> -@@ -55,7 +56,7 @@
> ++LIBS=3D-lgthread2.0
> + else
> + CONFIGFLAGS=3Dgtk-config --cflags
> ++LIBS=3D-lgthread12
> + endif
> + endif
> endif
> =20
> .cxx.o:
> @@ -51,7 +59,7 @@
> =20
> #++Autogenerated -- run src/LexGen.py to regenerate
> #**LEXOBJS=3D\\\n\(\*.o \)
> -@@ -69,7 +70,7 @@
> +@@ -69,7 +74,7 @@
> =20
> # The LEXOBJS have to be treated specially as the functions in them are=
not called from external code
> =20
> @@ -60,16 +68,16 @@
> =20
> clean:
> rm -f *.o $(COMPLIB)
> -@@ -81,8 +82,10 @@
> +@@ -81,8 +86,10 @@
> ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o =
PlatGTK.o \
> KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
> RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o
> - $(AR) rc $@ $^
> - $(RANLIB) $@
> -+ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` -o $@ $^
> ++ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` ${LIBS} -o $@ $^
> +
> + $(LEXRLIB): $(LEXOBJS)
> -+ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` -o $@ $^
> ++ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` ${LIBS} -o $@ $^
> =20
> # Automatically generate header dependencies with "make deps"
> include deps.mak
> --- patch-add-libgthread ends here ---
>=20
>=20
> _______________________________________________
> 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
--=-EjnrzqmxdLnfUMR80brx
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)
iD4DBQA/ga1ob2iPiv4Uz4cRApY5AJ9m2T24P5O6pN+Bh9mJiXiz5G0QOwCYgCFa
ZCAfP6veS/qE/GBxi/3ivw==
=nA8b
-----END PGP SIGNATURE-----
--=-EjnrzqmxdLnfUMR80brx--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1065463144.748.58.camel>