diff options
| author | jperkin <jperkin> | 2016-02-26 10:57:45 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-02-26 10:57:45 +0000 |
| commit | 74877cd682e7da41d2959dc17678ec59b9af49db (patch) | |
| tree | ba40492c0d12e5e3607803f3192c1d24923347ba /www/firefox24 | |
| parent | 9ddb4f412d2c5bdbc2a1caab565d9f10f18a444a (diff) | |
| download | pkgsrc-74877cd682e7da41d2959dc17678ec59b9af49db.tar.gz | |
Use OPSYSVARS.
Diffstat (limited to 'www/firefox24')
| -rw-r--r-- | www/firefox24/Makefile | 10 | ||||
| -rw-r--r-- | www/firefox24/mozilla-common.mk | 8 |
2 files changed, 5 insertions, 13 deletions
diff --git a/www/firefox24/Makefile b/www/firefox24/Makefile index 4565bab64eb..2dcc55edafe 100644 --- a/www/firefox24/Makefile +++ b/www/firefox24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2015/11/18 14:19:55 ryoon Exp $ +# $NetBSD: Makefile,v 1.34 2016/02/26 10:57:46 jperkin Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} # Also update MOZ_BRANCH= in devel/xulrunner24/Makefile @@ -35,13 +35,9 @@ LDFLAGS.NetBSD+= -pthread ALL_ENV+= MOZILLA_PKG_NAME=firefox24 -.include "../../mk/bsd.prefs.mk" - # Avoid ld "invalid section index" errors. -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-fdata-sections -BUILDLINK_TRANSFORM+= rm:-ffunction-sections -.endif +BUILDLINK_TRANSFORM.SunOS+= rm:-fdata-sections +BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections LDFLAGS.DragonFly= -lplc4 -lnspr4 LDFLAGS.FreeBSD= -lplc4 -lnspr4 diff --git a/www/firefox24/mozilla-common.mk b/www/firefox24/mozilla-common.mk index 288001fab5b..b98eaf7d5f8 100644 --- a/www/firefox24/mozilla-common.mk +++ b/www/firefox24/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.11 2015/12/05 21:26:04 adam Exp $ +# $NetBSD: mozilla-common.mk,v 1.12 2016/02/26 10:57:46 jperkin Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -144,13 +144,9 @@ create-rm-wrapper: ${WRAPPER_DIR}/bin/rm chmod +x ${WRAPPER_DIR}/bin/rm -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" # The configure test for __thread succeeds, but later we end up with: # dist/bin/libxul.so: undefined reference to `__tls_get_addr' -CONFIGURE_ENV+= ac_cv_thread_keyword=no -.endif +CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no .if ${OPSYS} == "SunOS" # native libbz2.so hides BZ2_crc32Table |