* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
@ 2010-08-15 20:20 Peter Dyballa
2010-08-16 6:37 ` Jan Djärv
0 siblings, 1 reply; 11+ messages in thread
From: Peter Dyballa @ 2010-08-15 20:20 UTC (permalink / raw)
To: 6863
Hello!
Compilation of the NS variant fails the message cited in the subject.
pete 229 /\ l src/{nsselect.m,keyboard.c}
-rw-r--r-- 1 pete admin 383764 15. Aug 20:46 src/keyboard.c
-rw-r--r-- 1 pete pete 18734 10. Aug 00:08 src/nsselect.m
pete 230 /\ grep -n QPRIMARY Quellen/Emacs_CVS/emacs-24/src/
{nsselect.m,keyboard.c}
src/nsselect.m:39:Lisp_Object QCLIPBOARD, QPRIMARY, QSECONDARY, QTEXT,
QFILE_NAME;
src/nsselect.m:66: if (EQ (sym, QPRIMARY)) return NXPrimaryPboard;
src/nsselect.m:79: return QPRIMARY;
src/nsselect.m:447: if (EQ (selection, Qnil)) selection = QPRIMARY;
src/nsselect.m:467: if (EQ (selection, Qnil)) selection = QPRIMARY;
src/nsselect.m:555: QPRIMARY = intern ("PRIMARY"); staticpro
(&QPRIMARY);
src/keyboard.c:371:Lisp_Object Qx_set_selection, QPRIMARY, Qlazy;
src/keyboard.c:1803: call2 (Qx_set_selection, QPRIMARY,
src/keyboard.c:1806: call2 (Qx_set_selection, QPRIMARY,
src/keyboard.c:11719: QPRIMARY = intern_c_string ("PRIMARY");
src/keyboard.c:11720: staticpro (&QPRIMARY);
--
Greetings
Pete
If you don't find it in the index, look very carefully through the
entire catalogue.
– Sears, Roebuck, and Co., Consumer's Guide, 1897
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-15 20:20 bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o Peter Dyballa
@ 2010-08-16 6:37 ` Jan Djärv
2010-08-16 7:39 ` Peter Dyballa
0 siblings, 1 reply; 11+ messages in thread
From: Jan Djärv @ 2010-08-16 6:37 UTC (permalink / raw)
To: Peter Dyballa; +Cc: 6863
Are you compiling with -fno-common? If not, what platform are you on?
Jan D.
2010-08-15 22:20, Peter Dyballa skrev:
> Hello!
>
> Compilation of the NS variant fails the message cited in the subject.
>
> pete 229 /\ l src/{nsselect.m,keyboard.c}
> -rw-r--r-- 1 pete admin 383764 15. Aug 20:46 src/keyboard.c
> -rw-r--r-- 1 pete pete 18734 10. Aug 00:08 src/nsselect.m
> pete 230 /\ grep -n QPRIMARY
> Quellen/Emacs_CVS/emacs-24/src/{nsselect.m,keyboard.c}
> src/nsselect.m:39:Lisp_Object QCLIPBOARD, QPRIMARY, QSECONDARY, QTEXT,
> QFILE_NAME;
> src/nsselect.m:66: if (EQ (sym, QPRIMARY)) return NXPrimaryPboard;
> src/nsselect.m:79: return QPRIMARY;
> src/nsselect.m:447: if (EQ (selection, Qnil)) selection = QPRIMARY;
> src/nsselect.m:467: if (EQ (selection, Qnil)) selection = QPRIMARY;
> src/nsselect.m:555: QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY);
> src/keyboard.c:371:Lisp_Object Qx_set_selection, QPRIMARY, Qlazy;
> src/keyboard.c:1803: call2 (Qx_set_selection, QPRIMARY,
> src/keyboard.c:1806: call2 (Qx_set_selection, QPRIMARY,
> src/keyboard.c:11719: QPRIMARY = intern_c_string ("PRIMARY");
> src/keyboard.c:11720: staticpro (&QPRIMARY);
>
>
> --
> Greetings
>
> Pete
>
> If you don't find it in the index, look very carefully through the
> entire catalogue.
> – Sears, Roebuck, and Co., Consumer's Guide, 1897
>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 6:37 ` Jan Djärv
@ 2010-08-16 7:39 ` Peter Dyballa
2010-08-16 8:10 ` Jan Djärv
0 siblings, 1 reply; 11+ messages in thread
From: Peter Dyballa @ 2010-08-16 7:39 UTC (permalink / raw)
To: Jan Djärv; +Cc: 6863
Am 16.08.2010 um 08:37 schrieb Jan Djärv:
> Are you compiling with -fno-common? If not, what platform are you on?
Yes. (Mac OS X 10.5.8)
--
Greetings
Pete
And always remember the last words of my grandfather, who said: “A
truck!”
— Emo Phillips
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 7:39 ` Peter Dyballa
@ 2010-08-16 8:10 ` Jan Djärv
2010-08-16 14:22 ` Peter Dyballa
2010-08-16 14:33 ` Peter Dyballa
0 siblings, 2 replies; 11+ messages in thread
From: Jan Djärv @ 2010-08-16 8:10 UTC (permalink / raw)
To: Peter Dyballa; +Cc: 6863
2010-08-16 09:39, Peter Dyballa skrev:
>
> Am 16.08.2010 um 08:37 schrieb Jan Djärv:
>
>> Are you compiling with -fno-common? If not, what platform are you on?
>
> Yes. (Mac OS X 10.5.8)
Ok, just wondering. I checked in a fix.
Jan D.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 8:10 ` Jan Djärv
@ 2010-08-16 14:22 ` Peter Dyballa
2010-08-16 15:06 ` Jan Djärv
2010-08-16 14:33 ` Peter Dyballa
1 sibling, 1 reply; 11+ messages in thread
From: Peter Dyballa @ 2010-08-16 14:22 UTC (permalink / raw)
To: Jan Djärv; +Cc: 6863
Am 16.08.2010 um 10:10 schrieb Jan Djärv:
> I checked in a fix.
I'm not sure whether it's your fix – but compilation of the NS variant
fails here:
gcc-4.2 -I/sw/include -L/sw/lib -c -Demacs -DHAVE_CONFIG_H -I. -I/
Users/pete/Quellen/Emacs_CVS/emacs-24/src -I/usr/X11/
include -MMD -MF deps/nsselect.d -Wimplicit-function-
declaration -Wold-style-definition -Wdeclaration-after-statement -Wno-
pointer-sign -g -H -Wno-pointer-sign -pipe -fPIC -fno-common -
mcpu=7450 -mtune=7450 -fast nsselect.m
. ./config.h
.. ./s/darwin.h
.. ./m/macppc.h
................ [902 more C header files omitted]
nsselect.m:40: error: expected identifier or ‘(’ before ‘<<’ token
nsselect.m:42: error: expected identifier or ‘(’ before ‘==’ token
nsselect.m:44: error: expected identifier or ‘(’ before ‘>>’ token
nsselect.m: In function ‘symbol_to_nsstring’:
nsselect.m:70: error: ‘QCLIPBOARD’ undeclared (first use in this
function)
nsselect.m:70: error: (Each undeclared identifier is reported only once
nsselect.m:70: error: for each function it appears in.)
nsselect.m:72: error: ‘QSECONDARY’ undeclared (first use in this
function)
nsselect.m:73: error: ‘QTEXT’ undeclared (first use in this function)
nsselect.m: In function ‘ns_string_to_symbol’:
nsselect.m:82: error: ‘QCLIPBOARD’ undeclared (first use in this
function)
nsselect.m:86: error: ‘QSECONDARY’ undeclared (first use in this
function)
nsselect.m:88: error: ‘QTEXT’ undeclared (first use in this function)
nsselect.m:90: error: ‘QFILE_NAME’ undeclared (first use in this
function)
nsselect.m: In function ‘ns_handle_selection_request’:
nsselect.m:267: error: ‘Vns_sent_selection_hooks’ undeclared (first
use in this function)
nsselect.m: In function ‘ns_string_from_pasteboard’:
nsselect.m:357: warning: ‘cString’ is deprecated (declared at /System/
Library/Frameworks/Foundation.framework/Headers/NSString.h:345)
nsselect.m:362: warning: ‘lossyCString’ is deprecated (declared at /
System/Library/Frameworks/Foundation.framework/Headers/NSString.h:346)
nsselect.m: In function ‘Fx_selection_exists_p’:
nsselect.m:453: error: ‘QSECONDARY’ undeclared (first use in this
function)
nsselect.m: In function ‘Fx_selection_owner_p’:
nsselect.m:473: error: ‘QSECONDARY’ undeclared (first use in this
function)
nsselect.m: In function ‘syms_of_nsselect’:
nsselect.m:559: error: expected expression before ‘<<’ token
nsselect.m:560: error: ‘QCLIPBOARD’ undeclared (first use in this
function)
nsselect.m:562: error: expected expression before ‘==’ token
nsselect.m:564: error: ‘QSECONDARY’ undeclared (first use in this
function)
nsselect.m:565: error: ‘QTEXT’ undeclared (first use in this function)
nsselect.m:566: error: ‘QFILE_NAME’ undeclared (first use in this
function)
nsselect.m:582: error: ‘Vns_sent_selection_hooks’ undeclared (first
use in this function)
make[1]: *** [nsselect.o] Error 1
--
Greetings
Pete
Think of XML as Lisp for COBOL programmers.
- Tony-A (some guy on /.)
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 8:10 ` Jan Djärv
2010-08-16 14:22 ` Peter Dyballa
@ 2010-08-16 14:33 ` Peter Dyballa
2010-08-16 15:09 ` Jan Djärv
1 sibling, 1 reply; 11+ messages in thread
From: Peter Dyballa @ 2010-08-16 14:33 UTC (permalink / raw)
To: Jan Djärv; +Cc: 6863
Am 16.08.2010 um 10:10 schrieb Jan Djärv:
> I checked in a fix.
Sorry, I was too fast in reporting!
>>>>>>> There are unresolved conflicts in this file <<<<<<<
One is:
<<<<<<< TREE
Lisp_Object QCLIPBOARD, QPRIMARY, QSECONDARY, QTEXT, QFILE_NAME;
=======
Lisp_Object QSECONDARY, QTEXT, QFILE_NAME;
>>>>>>> MERGE-SOURCE
Is the manual action to remove the "QCLIPBOARD, QPRIMARY, " text? The
"first line" should substitute the "second one"?
The second case is:
<<<<<<< TREE
QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD);
QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY);
=======
>>>>>>> MERGE-SOURCE
QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY);
QTEXT = intern ("TEXT"); staticpro (&QTEXT);
QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME);
The manual action is to remove two lines? Or adding them?
--
Greetings
Pete
There's no place like ~
– (UNIX Guru)
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 14:22 ` Peter Dyballa
@ 2010-08-16 15:06 ` Jan Djärv
0 siblings, 0 replies; 11+ messages in thread
From: Jan Djärv @ 2010-08-16 15:06 UTC (permalink / raw)
To: Peter Dyballa; +Cc: 6863
2010-08-16 16:22, Peter Dyballa skrev:
>
> Am 16.08.2010 um 10:10 schrieb Jan Djärv:
>
>> I checked in a fix.
>
> I'm not sure whether it's your fix – but compilation of the NS variant
> fails here:
It looks like you have conflict markers in the file.
What does bzr status say?
Jan D.
>
> gcc-4.2 -I/sw/include -L/sw/lib -c -Demacs -DHAVE_CONFIG_H -I.
> -I/Users/pete/Quellen/Emacs_CVS/emacs-24/src -I/usr/X11/include -MMD -MF
> deps/nsselect.d -Wimplicit-function-declaration -Wold-style-definition
> -Wdeclaration-after-statement -Wno-pointer-sign -g -H -Wno-pointer-sign
> -pipe -fPIC -fno-common -mcpu=7450 -mtune=7450 -fast nsselect.m
> . ./config.h
> .. ./s/darwin.h
> .. ./m/macppc.h
> ................ [902 more C header files omitted]
> nsselect.m:40: error: expected identifier or ‘(’ before ‘<<’ token
> nsselect.m:42: error: expected identifier or ‘(’ before ‘==’ token
> nsselect.m:44: error: expected identifier or ‘(’ before ‘>>’ token
> nsselect.m: In function ‘symbol_to_nsstring’:
> nsselect.m:70: error: ‘QCLIPBOARD’ undeclared (first use in this function)
> nsselect.m:70: error: (Each undeclared identifier is reported only once
> nsselect.m:70: error: for each function it appears in.)
> nsselect.m:72: error: ‘QSECONDARY’ undeclared (first use in this function)
> nsselect.m:73: error: ‘QTEXT’ undeclared (first use in this function)
> nsselect.m: In function ‘ns_string_to_symbol’:
> nsselect.m:82: error: ‘QCLIPBOARD’ undeclared (first use in this function)
> nsselect.m:86: error: ‘QSECONDARY’ undeclared (first use in this function)
> nsselect.m:88: error: ‘QTEXT’ undeclared (first use in this function)
> nsselect.m:90: error: ‘QFILE_NAME’ undeclared (first use in this function)
> nsselect.m: In function ‘ns_handle_selection_request’:
> nsselect.m:267: error: ‘Vns_sent_selection_hooks’ undeclared (first use
> in this function)
> nsselect.m: In function ‘ns_string_from_pasteboard’:
> nsselect.m:357: warning: ‘cString’ is deprecated (declared at
> /System/Library/Frameworks/Foundation.framework/Headers/NSString.h:345)
> nsselect.m:362: warning: ‘lossyCString’ is deprecated (declared at
> /System/Library/Frameworks/Foundation.framework/Headers/NSString.h:346)
> nsselect.m: In function ‘Fx_selection_exists_p’:
> nsselect.m:453: error: ‘QSECONDARY’ undeclared (first use in this function)
> nsselect.m: In function ‘Fx_selection_owner_p’:
> nsselect.m:473: error: ‘QSECONDARY’ undeclared (first use in this function)
> nsselect.m: In function ‘syms_of_nsselect’:
> nsselect.m:559: error: expected expression before ‘<<’ token
> nsselect.m:560: error: ‘QCLIPBOARD’ undeclared (first use in this function)
> nsselect.m:562: error: expected expression before ‘==’ token
> nsselect.m:564: error: ‘QSECONDARY’ undeclared (first use in this function)
> nsselect.m:565: error: ‘QTEXT’ undeclared (first use in this function)
> nsselect.m:566: error: ‘QFILE_NAME’ undeclared (first use in this function)
> nsselect.m:582: error: ‘Vns_sent_selection_hooks’ undeclared (first use
> in this function)
> make[1]: *** [nsselect.o] Error 1
>
> --
> Greetings
>
> Pete
>
> Think of XML as Lisp for COBOL programmers.
> - Tony-A (some guy on /.)
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 14:33 ` Peter Dyballa
@ 2010-08-16 15:09 ` Jan Djärv
2010-08-16 15:21 ` Peter Dyballa
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Jan Djärv @ 2010-08-16 15:09 UTC (permalink / raw)
To: Peter Dyballa; +Cc: 6863
2010-08-16 16:33, Peter Dyballa skrev:
>
> Am 16.08.2010 um 10:10 schrieb Jan Djärv:
>
>> I checked in a fix.
>
>
> Sorry, I was too fast in reporting!
>
> >>>>>>> There are unresolved conflicts in this file <<<<<<<
>
>
> One is:
>
> <<<<<<< TREE
> Lisp_Object QCLIPBOARD, QPRIMARY, QSECONDARY, QTEXT, QFILE_NAME;
> =======
> Lisp_Object QSECONDARY, QTEXT, QFILE_NAME;
> >>>>>>> MERGE-SOURCE
>
> Is the manual action to remove the "QCLIPBOARD, QPRIMARY, " text? The
> "first line" should substitute the "second one"?
It looks like you have applied a local patch. QPRIMARY shall be removed here.
If you wan't to keep your patch, keep the TREE line but remove QPRIMARY.
>
> The second case is:
>
> <<<<<<< TREE
> QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD);
> QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY);
> =======
> >>>>>>> MERGE-SOURCE
> QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY);
> QTEXT = intern ("TEXT"); staticpro (&QTEXT);
> QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME);
>
> The manual action is to remove two lines? Or adding them?
>
Keep MERGE-SOURCE but add the QCLIPBOARD = ... line to it. It is from your
local patch.
Jan D.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 15:09 ` Jan Djärv
@ 2010-08-16 15:21 ` Peter Dyballa
2010-08-16 15:43 ` Peter Dyballa
2010-08-17 6:06 ` Jan Djärv
2 siblings, 0 replies; 11+ messages in thread
From: Peter Dyballa @ 2010-08-16 15:21 UTC (permalink / raw)
To: Jan Djärv; +Cc: 6863
Am 16.08.2010 um 17:09 schrieb Jan Djärv:
> It looks like you have applied a local patch.
Yes, there is one applied because of problems with copying and
pasting, see bug#6677. I assumed, after I reported success a week ago,
that it would have been merged into TRUNK. (But did not check!)
OK, let's see whether copy&paste still works after repair!
--
Greetings
Pete
One cannot live by television, video games, top ten CDs, and dumb
movies alone.
– Amiri Baraka, 1999
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 15:09 ` Jan Djärv
2010-08-16 15:21 ` Peter Dyballa
@ 2010-08-16 15:43 ` Peter Dyballa
2010-08-17 6:06 ` Jan Djärv
2 siblings, 0 replies; 11+ messages in thread
From: Peter Dyballa @ 2010-08-16 15:43 UTC (permalink / raw)
To: Jan Djärv; +Cc: 6863
Am 16.08.2010 um 17:09 schrieb Jan Djärv:
> Keep MERGE-SOURCE but add the QCLIPBOARD =
Copy&paste still seems to work.
--
Greetings
Pete
We have to expect it, otherwise we would be surprised.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o
2010-08-16 15:09 ` Jan Djärv
2010-08-16 15:21 ` Peter Dyballa
2010-08-16 15:43 ` Peter Dyballa
@ 2010-08-17 6:06 ` Jan Djärv
2 siblings, 0 replies; 11+ messages in thread
From: Jan Djärv @ 2010-08-17 6:06 UTC (permalink / raw)
To: Peter Dyballa; +Cc: 6863-done
Closing.
Jan D.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-08-17 6:06 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-15 20:20 bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o Peter Dyballa
2010-08-16 6:37 ` Jan Djärv
2010-08-16 7:39 ` Peter Dyballa
2010-08-16 8:10 ` Jan Djärv
2010-08-16 14:22 ` Peter Dyballa
2010-08-16 15:06 ` Jan Djärv
2010-08-16 14:33 ` Peter Dyballa
2010-08-16 15:09 ` Jan Djärv
2010-08-16 15:21 ` Peter Dyballa
2010-08-16 15:43 ` Peter Dyballa
2010-08-17 6:06 ` Jan Djärv
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).