Closed Bug 486890 Opened 11 years ago Closed 11 years ago

Darwin/X11: undefined symbols in libsydneyaudio, fix toolkit==cocoa check

Categories

(Core :: Audio/Video, defect)

1.9.1 Branch
PowerPC
macOS
defect
Not set

Tracking

()

RESOLVED FIXED
mozilla1.9.2a1

People

(Reporter: jeremyhu, Assigned: jeremyhu)

Details

Attachments

(1 file, 1 obsolete file)

--- toolkit/library/Makefile.in.orig	2009-04-04 19:40:25.000000000 -0700
+++ toolkit/library/Makefile.in	2009-04-04 19:42:16.000000000 -0700
@@ -196,7 +196,7 @@ DEFINES += -DIMPL_XREAPI
 
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+ifeq ($(OS_ARCH),Darwin)
 CXXFLAGS	+= $(TK_CFLAGS)
 EXTRA_DSO_LDOPTS += \
 	-framework SystemConfiguration \
Correction:

cat ~/src/macports-trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch
--- toolkit/library/Makefile.in.orig	2009-04-04 19:40:25.000000000 -0700
+++ toolkit/library/Makefile.in	2009-04-04 19:47:10.000000000 -0700
@@ -205,7 +205,9 @@ EXTRA_DSO_LDOPTS += \
 	-lcrypto \
 	$(TK_LIBS) \
 	$(NULL)
+endif
 
+ifeq ($(OS_ARCH),Darwin)
 ifdef MOZ_SYDNEYAUDIO
 EXTRA_DSO_LDOPTS += \
 	-framework CoreAudio \
Attached patch patch to fix linking (obsolete) — Splinter Review
Actually, this should be an OS check, so we don't depend on #486782
Attachment #371097 - Flags: review?(benjamin)
No longer depends on: 486782
Assignee: nobody → jeremyhu
Status: NEW → ASSIGNED
Attachment #371097 - Flags: review?(benjamin) → review+
Keywords: checkin-needed
Attached patch updated patchSplinter Review
The fix in #486782 removed a -framework Cocoa that snuck into the Darwin/X11 LDFLAGS.  This has resulted in some additional symbols missing that sydneyaudio requires.  As such, we need to add a -framework Carbon to make sure those are linked in as well.
Attachment #371097 - Attachment is obsolete: true
Attachment #372098 - Flags: review?(benjamin)
Attachment #372098 - Flags: review?(benjamin) → review+
http://hg.mozilla.org/mozilla-central/rev/f2c759fb94cd
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Target Milestone: --- → mozilla1.9.2a1
You need to log in before you can comment on or make changes to this bug.