[33824] trunk/dports/www/firefox-x11
afb at macports.org
afb at macports.org
Wed Feb 6 03:53:26 PST 2008
Revision: 33824
http://trac.macosforge.org/projects/macports/changeset/33824
Author: afb at macports.org
Date: 2008-02-06 03:53:12 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
fix leopard build issues (#13150)
Modified Paths:
--------------
trunk/dports/www/firefox-x11/Portfile
Added Paths:
-----------
trunk/dports/www/firefox-x11/files/patch-export-list.diff
trunk/dports/www/firefox-x11/files/patch-pthread.diff
Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile 2008-02-06 11:32:03 UTC (rev 33823)
+++ trunk/dports/www/firefox-x11/Portfile 2008-02-06 11:53:12 UTC (rev 33824)
@@ -29,10 +29,12 @@
patchfiles patch-browser-app-profile-firefox.js \
patch-xpcom-build-Makefile \
patch-dylib_file.diff \
+ patch-export-list.diff \
patch-layout-build-Makefile.in \
patch-build-unix-mozilla-xpcom.pc \
patch-browser-app-mozilla.in \
- patch-xptcall_x86.diff
+ patch-xptcall_x86.diff \
+ patch-pthread.diff
depends_build port:pkgconfig
Added: trunk/dports/www/firefox-x11/files/patch-export-list.diff
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-export-list.diff (rev 0)
+++ trunk/dports/www/firefox-x11/files/patch-export-list.diff 2008-02-06 11:53:12 UTC (rev 33824)
@@ -0,0 +1,16 @@
+--- config/rules.mk.orig 2006-11-28 18:03:37.000000000 +0100
++++ config/rules.mk 2007-11-05 10:38:28.000000000 +0100
+@@ -1018,9 +1018,10 @@
+ ifndef NO_COMPONENT_LINK_MAP
+ ifndef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS
+ ifndef MOZ_DEBUG
+-ifeq ($(OS_ARCH)_$(IS_COMPONENT),Darwin_1)
+- nmedit -s $(BUILD_TOOLS)/gnu-ld-scripts/components-export-list $@
+-endif
++# Export list looks empty
++#ifeq ($(OS_ARCH)_$(IS_COMPONENT),Darwin_1)
++# nmedit -s $(BUILD_TOOLS)/gnu-ld-scripts/components-export-list $@
++#endif
+ endif
+ endif
+ endif
Added: trunk/dports/www/firefox-x11/files/patch-pthread.diff
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-pthread.diff (rev 0)
+++ trunk/dports/www/firefox-x11/files/patch-pthread.diff 2008-02-06 11:53:12 UTC (rev 33824)
@@ -0,0 +1,20 @@
+--- nsprpub/pr/include/md/_pth.h.orig 2005-07-21 20:22:53.000000000 +0200
++++ nsprpub/pr/include/md/_pth.h 2007-11-05 09:01:53.000000000 +0100
+@@ -98,7 +98,7 @@
+ #else
+ #define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
+ #endif
+-#if defined(DARWIN)
++#if defined(DARWIN) && !defined(__DARWIN_UNIX03)
+ #define _PT_PTHREAD_CONDATTR_INIT(x) 0
+ #else
+ #define _PT_PTHREAD_CONDATTR_INIT pthread_condattr_init
+@@ -205,7 +205,7 @@
+ /*
+ * These platforms don't have pthread_kill()
+ */
+-#if defined(DARWIN)
++#if defined(DARWIN) && !defined(__DARWIN_UNIX03)
+ #define pthread_kill(thread, sig) ENOSYS
+ #endif
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080206/8166704a/attachment.html
More information about the macports-changes
mailing list