svn commit: r435362 - in head: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey...
Jan Beich
jbeich at FreeBSD.org
Fri Mar 3 19:38:16 UTC 2017
Author: jbeich
Date: Fri Mar 3 19:38:13 2017
New Revision: 435362
URL: https://svnweb.freebsd.org/changeset/ports/435362
Log:
gecko: attempt to drop RPATH for libxul.so dependencies
Added:
head/mail/thunderbird/files/patch-bug1336791 (contents, props changed)
head/www/firefox-esr/files/patch-bug1336791 (contents, props changed)
head/www/firefox/files/patch-bug1336791 (contents, props changed)
head/www/libxul/files/patch-bug1336791 (contents, props changed)
head/www/seamonkey/files/patch-bug1336791 (contents, props changed)
Modified:
head/Mk/bsd.gecko.mk (contents, props changed)
head/mail/thunderbird/Makefile (contents, props changed)
head/www/firefox-esr/Makefile (contents, props changed)
head/www/firefox/Makefile (contents, props changed)
head/www/libxul/Makefile (contents, props changed)
head/www/seamonkey/Makefile (contents, props changed)
Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk Fri Mar 3 19:30:10 2017 (r435361)
+++ head/Mk/bsd.gecko.mk Fri Mar 3 19:38:13 2017 (r435362)
@@ -85,7 +85,7 @@ MOZILLA_VER?= ${PORTVERSION}
MOZILLA_BIN?= ${PORTNAME}-bin
MOZILLA_EXEC_NAME?=${MOZILLA}
MOZ_RPATH?= ${MOZILLA}
-USES+= cpe gmake iconv perl5 pkgconfig \
+USES+= cpe gmake iconv localbase perl5 pkgconfig \
python:2.7,build desktop-file-utils
CPE_VENDOR?=mozilla
USE_PERL5= build
@@ -137,9 +137,7 @@ MOZ_EXPORT+= ${CONFIGURE_ENV} \
MOZ_OPTIONS+= --prefix="${PREFIX}"
MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}"
-CPPFLAGS+= -isystem${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib \
- -Wl,-rpath,${PREFIX}/lib/${MOZILLA} -Wl,--as-needed
+LDFLAGS+= -Wl,--as-needed
.if ${OPSYS} != DragonFly # XXX xpcshell crash during install
# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning
Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile Fri Mar 3 19:30:10 2017 (r435361)
+++ head/mail/thunderbird/Makefile Fri Mar 3 19:38:13 2017 (r435362)
@@ -3,6 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 45.7.1
+PORTREVISION= 1
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
Added: head/mail/thunderbird/files/patch-bug1336791
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1336791 Fri Mar 3 19:38:13 2017 (r435362)
@@ -0,0 +1,21 @@
+# Allow readelf to print types without parentheses
+
+--- mozilla/toolkit/library/dependentlibs.py
++++ mozilla/toolkit/library/dependentlibs.py
+@@ -57,11 +57,15 @@ def dependentlibs_readelf(lib):
+ for line in proc.stdout:
+ # Each line has the following format:
+ # tag (TYPE) value
++ # or with BSD readelf:
++ # tag TYPE value
+ # Looking for NEEDED type entries
+ tmp = line.split(' ', 3)
+- if len(tmp) > 3 and tmp[2] == '(NEEDED)':
++ if len(tmp) > 3 and 'NEEDED' in tmp[2]:
+ # NEEDED lines look like:
+ # 0x00000001 (NEEDED) Shared library: [libname]
++ # or with BSD readelf:
++ # 0x00000001 NEEDED Shared library: [libname]
+ match = re.search('\[(.*)\]', tmp[3])
+ if match:
+ deps.append(match.group(1))
Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile Fri Mar 3 19:30:10 2017 (r435361)
+++ head/www/firefox-esr/Makefile Fri Mar 3 19:38:13 2017 (r435362)
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 45.8.0
DISTVERSIONSUFFIX=esr.source
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
Added: head/www/firefox-esr/files/patch-bug1336791
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug1336791 Fri Mar 3 19:38:13 2017 (r435362)
@@ -0,0 +1,21 @@
+# Allow readelf to print types without parentheses
+
+--- toolkit/library/dependentlibs.py
++++ toolkit/library/dependentlibs.py
+@@ -57,11 +57,15 @@ def dependentlibs_readelf(lib):
+ for line in proc.stdout:
+ # Each line has the following format:
+ # tag (TYPE) value
++ # or with BSD readelf:
++ # tag TYPE value
+ # Looking for NEEDED type entries
+ tmp = line.split(' ', 3)
+- if len(tmp) > 3 and tmp[2] == '(NEEDED)':
++ if len(tmp) > 3 and 'NEEDED' in tmp[2]:
+ # NEEDED lines look like:
+ # 0x00000001 (NEEDED) Shared library: [libname]
++ # or with BSD readelf:
++ # 0x00000001 NEEDED Shared library: [libname]
+ match = re.search('\[(.*)\]', tmp[3])
+ if match:
+ deps.append(match.group(1))
Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile Fri Mar 3 19:30:10 2017 (r435361)
+++ head/www/firefox/Makefile Fri Mar 3 19:38:13 2017 (r435362)
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 52.0
DISTVERSIONSUFFIX=.source
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
Added: head/www/firefox/files/patch-bug1336791
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox/files/patch-bug1336791 Fri Mar 3 19:38:13 2017 (r435362)
@@ -0,0 +1,21 @@
+# Allow readelf to print types without parentheses
+
+--- toolkit/library/dependentlibs.py
++++ toolkit/library/dependentlibs.py
+@@ -57,11 +57,15 @@ def dependentlibs_readelf(lib):
+ for line in proc.stdout:
+ # Each line has the following format:
+ # tag (TYPE) value
++ # or with BSD readelf:
++ # tag TYPE value
+ # Looking for NEEDED type entries
+ tmp = line.split(' ', 3)
+- if len(tmp) > 3 and tmp[2] == '(NEEDED)':
++ if len(tmp) > 3 and 'NEEDED' in tmp[2]:
+ # NEEDED lines look like:
+ # 0x00000001 (NEEDED) Shared library: [libname]
++ # or with BSD readelf:
++ # 0x00000001 NEEDED Shared library: [libname]
+ match = re.search('\[(.*)\]', tmp[3])
+ if match:
+ deps.append(match.group(1))
Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile Fri Mar 3 19:30:10 2017 (r435361)
+++ head/www/libxul/Makefile Fri Mar 3 19:38:13 2017 (r435362)
@@ -3,7 +3,7 @@
PORTNAME= libxul
DISTVERSION= 45.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source
Added: head/www/libxul/files/patch-bug1336791
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/libxul/files/patch-bug1336791 Fri Mar 3 19:38:13 2017 (r435362)
@@ -0,0 +1,21 @@
+# Allow readelf to print types without parentheses
+
+--- toolkit/library/dependentlibs.py
++++ toolkit/library/dependentlibs.py
+@@ -57,11 +57,15 @@ def dependentlibs_readelf(lib):
+ for line in proc.stdout:
+ # Each line has the following format:
+ # tag (TYPE) value
++ # or with BSD readelf:
++ # tag TYPE value
+ # Looking for NEEDED type entries
+ tmp = line.split(' ', 3)
+- if len(tmp) > 3 and tmp[2] == '(NEEDED)':
++ if len(tmp) > 3 and 'NEEDED' in tmp[2]:
+ # NEEDED lines look like:
+ # 0x00000001 (NEEDED) Shared library: [libname]
++ # or with BSD readelf:
++ # 0x00000001 NEEDED Shared library: [libname]
+ match = re.search('\[(.*)\]', tmp[3])
+ if match:
+ deps.append(match.group(1))
Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile Fri Mar 3 19:30:10 2017 (r435361)
+++ head/www/seamonkey/Makefile Fri Mar 3 19:38:13 2017 (r435362)
@@ -4,7 +4,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.46
MOZILLA_VER= 49 # above + 3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source
Added: head/www/seamonkey/files/patch-bug1336791
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/seamonkey/files/patch-bug1336791 Fri Mar 3 19:38:13 2017 (r435362)
@@ -0,0 +1,21 @@
+# Allow readelf to print types without parentheses
+
+--- mozilla/toolkit/library/dependentlibs.py
++++ mozilla/toolkit/library/dependentlibs.py
+@@ -57,11 +57,15 @@ def dependentlibs_readelf(lib):
+ for line in proc.stdout:
+ # Each line has the following format:
+ # tag (TYPE) value
++ # or with BSD readelf:
++ # tag TYPE value
+ # Looking for NEEDED type entries
+ tmp = line.split(' ', 3)
+- if len(tmp) > 3 and tmp[2] == '(NEEDED)':
++ if len(tmp) > 3 and 'NEEDED' in tmp[2]:
+ # NEEDED lines look like:
+ # 0x00000001 (NEEDED) Shared library: [libname]
++ # or with BSD readelf:
++ # 0x00000001 NEEDED Shared library: [libname]
+ match = re.search('\[(.*)\]', tmp[3])
+ if match:
+ deps.append(match.group(1))
More information about the svn-ports-head
mailing list