summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-02-01 09:49:58 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-02-01 09:49:58 +0000
commit9a23ec12f19d508923e145ab4089ef9830657b74 (patch)
treeb900cfd8d2fc67b03589a315f0c9384072def5e9
parentdocument recent mozilla vulnerabilities (diff)
fix merge conflict
This gets the PGO build starting but it still does not finish
Notes
Notes: svn path=/head/; revision=290223
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox/Makefile2
2 files changed, 0 insertions, 4 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 42848707839b..e0923401c7d7 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -120,8 +120,6 @@ post-patch:
${WRKSRC}/js/src/config/config.mk \
${WRKSRC}/config/mkdepend/Makefile.in \
${WRKSRC}/config/config.mk \
- ${WRKSRC}/config/mkdepend/Makefile.in \
- ${WRKSRC}/config/config.mk \
${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
s|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 42848707839b..e0923401c7d7 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -120,8 +120,6 @@ post-patch:
${WRKSRC}/js/src/config/config.mk \
${WRKSRC}/config/mkdepend/Makefile.in \
${WRKSRC}/config/config.mk \
- ${WRKSRC}/config/mkdepend/Makefile.in \
- ${WRKSRC}/config/config.mk \
${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
s|-lpthread|${PTHREAD_LIBS}|g ; \