ports/57663: [PATCH] x11-toolkits/scintilla misses gthread
library
Jens Rehsack
rehsack at liwing.de
Mon Oct 6 11:10:09 PDT 2003
The following reply was made to PR ports/57663; it has been noted by GNATS.
From: Jens Rehsack <rehsack at liwing.de>
To: freebsd-gnats-submit at FreeBSD.org, rehsack at liwing.de
Cc:
Subject: Re: ports/57663: [PATCH] x11-toolkits/scintilla misses gthread library
Date: Mon, 06 Oct 2003 18:07:13 +0000
This is a multi-part message in MIME format.
--------------060808020409000806060600
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Joe Marcus Clarke wrote:
> 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
Thanks for that hint.
New patch is attached.
Jens
--------------060808020409000806060600
Content-Type: text/plain;
name="pr-ports_x11_toolkits_scintilla_patch__2003_10_06"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="pr-ports_x11_toolkits_scintilla_patch__2003_10_06"
SEND-PR: -*- send-pr -*-
SEND-PR: Lines starting with `SEND-PR' will be removed automatically, as
SEND-PR: will all comments (text enclosed in `<' and `>').
SEND-PR:
SEND-PR: Please consult the following URL if you are not sure how to
SEND-PR: fill out a problem report:
SEND-PR: http://www.freebsd.org/doc/en/articles/problem-reports/
SEND-PR:
SEND-PR: Note that the Synopsis field is mandatory.
SEND-PR:
SEND-PR: Please note that (unless you state otherwise) if your report
SEND-PR: includes a patch then it will be taken under the same license as
SEND-PR: the one on the file(s) you want to change.
SEND-PR:
SEND-PR: BE ADVISED THAT FREEBSD PROBLEM REPORTS ARE PUBLIC INFORMATION AND
SEND-PR: WILL BE PUBLISHED AS-IS ON THE PROJECT'S MAILING LISTS AND WEB SITES.
SEND-PR: DO NOT SUBMIT ANY INFORMATION YOU DO NOT WANT MADE PUBLIC.
SEND-PR:
SEND-PR: For sensitive security issues, consider contacting the FreeBSD
SEND-PR: security officer team (security-officer at freebsd.org) directly.
SEND-PR:
SEND-PR: Choose from the following categories:
SEND-PR:
SEND-PR: advocacy alpha amd64 bin conf docs
SEND-PR: gnu i386 ia64 java kern misc
SEND-PR: ports powerpc sparc64 standards www
SEND-PR:
To: FreeBSD-gnats-submit at freebsd.org
From: Jens Rehsack <rehsack at liwing.de>
Reply-To: Jens Rehsack <rehsack at liwing.de>
Cc: Jens Rehsack <rehsack at liwing.de>, gnome at FreeBSD.org
X-send-pr-version: 3.113
X-GNATS-Notify:
>Submitter-Id: current-users
>Originator: Jens Rehsack
>Organization: LiWing IT-Services
>Confidential: no
>Synopsis: [PATCH] x11-toolkits/scintilla misses gthread library
>Severity: serious
>Priority: medium
>Category: ports
>Class: sw-bug
>Release: FreeBSD 5.1-CURRENT i386
>Environment:
System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Fri Oct 3 22:18:43 GMT 2003 root at statler:/usr/obj/usr/src/sys/STATLER i386
<machine, os, target, libraries (multiple lines)>
>Description:
Thanks to Joe Markus Clarke this patch adds the missed gthread library to
the build of the scintilla-libs. This is required for editors like
moleskine.
Of course, this is a workaround. Better would, adding the required library
to the pkg-config information.
(sorry to gnome@, I'm to stupid to merge a patch into an existing PR)
>How-To-Repeat:
<code/input/activities to reproduce the problem (multiple lines)>
>Fix:
<how to correct or work around the problem, if known (multiple lines)>
--- patch-add-libgthread begins here ---
Index: x11-toolkits/scintilla/files/patch-aa
===================================================================
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.
@@ -21,7 +21,7 @@
vpath %.h ../src ../include
vpath %.cxx ../src
-@@ -33,9 +34,9 @@
+@@ -33,29 +34,33 @@
endif
ifdef DEBUG
@@ -33,16 +33,24 @@
endif
# 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=pkg-config --cflags gtk+-2.0
++LIBS=-lgthread2.0
else
ifdef GTK1
-CONFIGFLAGS=gtk-config --cflags
+CONFIGFLAGS=pkg-config --cflags gtk+
++LIBS=-lgthread12
else
ifneq (,$(findstring /,$(shell whereis -b pkg-config)))
CONFIGFLAGS=pkg-config --cflags gtk+-2.0
-@@ -55,7 +56,7 @@
++LIBS=-lgthread2.0
+ else
+ CONFIGFLAGS=gtk-config --cflags
++LIBS=-lgthread12
+ endif
+ endif
endif
.cxx.o:
@@ -51,7 +59,7 @@
#++Autogenerated -- run src/LexGen.py to regenerate
#**LEXOBJS=\\\n\(\*.o \)
-@@ -69,7 +70,7 @@
+@@ -69,7 +74,7 @@
# The LEXOBJS have to be treated specially as the functions in them are not called from external code
@@ -60,16 +68,16 @@
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=libs)` -o $@ $^
++ $(AR) `$(CONFIGFLAGS:cflags=libs)` ${LIBS} -o $@ $^
+
+ $(LEXRLIB): $(LEXOBJS)
-+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
++ $(AR) `$(CONFIGFLAGS:cflags=libs)` ${LIBS} -o $@ $^
# Automatically generate header dependencies with "make deps"
include deps.mak
--- patch-add-libgthread ends here ---
--------------060808020409000806060600--
More information about the freebsd-gnome
mailing list