diff options
| author | flo <flo@FreeBSD.org> | 2012-02-01 17:49:58 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2012-02-01 17:49:58 +0800 |
| commit | 259de953c2c85df6c3fdfc641ce15ca8c199f816 (patch) | |
| tree | 4a70e23b3527bba1f1bffc77d88d8a5fef240c1f | |
| parent | 15fb2038d9dd868dd7657eff42ce956d01f8d5cb (diff) | |
| download | freebsd-ports-gnome-259de953c2c85df6c3fdfc641ce15ca8c199f816.tar.gz freebsd-ports-gnome-259de953c2c85df6c3fdfc641ce15ca8c199f816.tar.zst freebsd-ports-gnome-259de953c2c85df6c3fdfc641ce15ca8c199f816.zip | |
fix merge conflict
This gets the PGO build starting but it still does not finish
| -rw-r--r-- | www/firefox-esr/Makefile | 2 | ||||
| -rw-r--r-- | www/firefox/Makefile | 2 |
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 ; \ |