Index: head/mail/thunderbird/files/patch-bug1320991 =================================================================== --- head/mail/thunderbird/files/patch-bug1320991 (nonexistent) +++ head/mail/thunderbird/files/patch-bug1320991 (revision 430246) @@ -0,0 +1,43 @@ +commit 454e2dbe1b4f +Author: Mike Shal +Date: Tue Dec 20 16:37:18 2016 -0500 + + Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar; r?glandium + + The problem with the modules/libmar/tests/moz.build file when building + --with-system-nspr and --with-system-nss is that the nss libraries don't + exist in the tree, so they fail when trying to copy into the test + directory. + + However, it turns out that the libraries copied into the test directory + aren't even used when building with an in-tree copy, because the + xpcshell launcher sets LD_LIBRARY_PATH to point to dist/bin. Since we + use the dist/bin copies anyway for an in-tree build, we can stop copying + them into the test directory and simultaneously fix the --with-system + build. + + The DEFINES can also go away since this directory doesn't actually build + anything. + + MozReview-Commit-ID: Bk2f28wc9ZJ +--- + modules/libmar/tests/moz.build | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git modules/libmar/tests/moz.build modules/libmar/tests/moz.build +index ee72571b0c6b..9642553e8aa2 100644 +--- mozilla/modules/libmar/tests/Makefile.in ++++ mozilla/modules/libmar/tests/Makefile.in +@@ -10,12 +10,5 @@ ifneq ($(OS_TARGET),Android) + ifndef MOZ_PROFILE_GENERATE + libs:: + $(INSTALL) ../tool/signmar$(BIN_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX) $(TESTROOT)/unit +-ifndef MOZ_FOLD_LIBS +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nssutil3$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plds4$(DLL_SUFFIX) $(TESTROOT)/unit +-endif + endif + endif # Not Android Property changes on: head/mail/thunderbird/files/patch-bug1320991 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/firefox/files/patch-bug1320991 =================================================================== --- head/www/firefox/files/patch-bug1320991 (revision 430245) +++ head/www/firefox/files/patch-bug1320991 (revision 430246) @@ -1,24 +1,55 @@ ---- modules/libmar/tests/moz.build.orig 2016-10-31 20:15:26 UTC +commit 454e2dbe1b4f +Author: Mike Shal +Date: Tue Dec 20 16:37:18 2016 -0500 + + Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar; r?glandium + + The problem with the modules/libmar/tests/moz.build file when building + --with-system-nspr and --with-system-nss is that the nss libraries don't + exist in the tree, so they fail when trying to copy into the test + directory. + + However, it turns out that the libraries copied into the test directory + aren't even used when building with an in-tree copy, because the + xpcshell launcher sets LD_LIBRARY_PATH to point to dist/bin. Since we + use the dist/bin copies anyway for an in-tree build, we can stop copying + them into the test directory and simultaneously fix the --with-system + build. + + The DEFINES can also go away since this directory doesn't actually build + anything. + + MozReview-Commit-ID: Bk2f28wc9ZJ +--- + modules/libmar/tests/moz.build | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git modules/libmar/tests/moz.build modules/libmar/tests/moz.build +index ee72571b0c6b..9642553e8aa2 100644 +--- modules/libmar/tests/moz.build +++ modules/libmar/tests/moz.build -@@ -9,21 +9,6 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh - DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] +@@ -6,24 +6,7 @@ + XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +-DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] +- if CONFIG['OS_TARGET'] != 'Android': - nss_files = ['nss3'] - if not CONFIG['MOZ_FOLD_LIBS']: - nss_files.extend([ - 'nssutil3', - 'plc4', - 'nspr4', - 'plds4', - ]) - TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted( - ['!/dist/bin/%s%s%s' % ( - CONFIG['DLL_PREFIX'], - name, - CONFIG['DLL_SUFFIX'], - ) for name in nss_files] - ) TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [ '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'], ] Index: head/www/firefox-esr/files/patch-bug1320991 =================================================================== --- head/www/firefox-esr/files/patch-bug1320991 (nonexistent) +++ head/www/firefox-esr/files/patch-bug1320991 (revision 430246) @@ -0,0 +1,43 @@ +commit 454e2dbe1b4f +Author: Mike Shal +Date: Tue Dec 20 16:37:18 2016 -0500 + + Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar; r?glandium + + The problem with the modules/libmar/tests/moz.build file when building + --with-system-nspr and --with-system-nss is that the nss libraries don't + exist in the tree, so they fail when trying to copy into the test + directory. + + However, it turns out that the libraries copied into the test directory + aren't even used when building with an in-tree copy, because the + xpcshell launcher sets LD_LIBRARY_PATH to point to dist/bin. Since we + use the dist/bin copies anyway for an in-tree build, we can stop copying + them into the test directory and simultaneously fix the --with-system + build. + + The DEFINES can also go away since this directory doesn't actually build + anything. + + MozReview-Commit-ID: Bk2f28wc9ZJ +--- + modules/libmar/tests/moz.build | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git modules/libmar/tests/moz.build modules/libmar/tests/moz.build +index ee72571b0c6b..9642553e8aa2 100644 +--- modules/libmar/tests/Makefile.in ++++ modules/libmar/tests/Makefile.in +@@ -10,12 +10,5 @@ ifneq ($(OS_TARGET),Android) + ifndef MOZ_PROFILE_GENERATE + libs:: + $(INSTALL) ../tool/signmar$(BIN_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX) $(TESTROOT)/unit +-ifndef MOZ_FOLD_LIBS +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nssutil3$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plds4$(DLL_SUFFIX) $(TESTROOT)/unit +-endif + endif + endif # Not Android Property changes on: head/www/firefox-esr/files/patch-bug1320991 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/libxul/files/patch-bug1320991 =================================================================== --- head/www/libxul/files/patch-bug1320991 (nonexistent) +++ head/www/libxul/files/patch-bug1320991 (revision 430246) @@ -0,0 +1,43 @@ +commit 454e2dbe1b4f +Author: Mike Shal +Date: Tue Dec 20 16:37:18 2016 -0500 + + Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar; r?glandium + + The problem with the modules/libmar/tests/moz.build file when building + --with-system-nspr and --with-system-nss is that the nss libraries don't + exist in the tree, so they fail when trying to copy into the test + directory. + + However, it turns out that the libraries copied into the test directory + aren't even used when building with an in-tree copy, because the + xpcshell launcher sets LD_LIBRARY_PATH to point to dist/bin. Since we + use the dist/bin copies anyway for an in-tree build, we can stop copying + them into the test directory and simultaneously fix the --with-system + build. + + The DEFINES can also go away since this directory doesn't actually build + anything. + + MozReview-Commit-ID: Bk2f28wc9ZJ +--- + modules/libmar/tests/moz.build | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git modules/libmar/tests/moz.build modules/libmar/tests/moz.build +index ee72571b0c6b..9642553e8aa2 100644 +--- modules/libmar/tests/Makefile.in ++++ modules/libmar/tests/Makefile.in +@@ -10,12 +10,5 @@ ifneq ($(OS_TARGET),Android) + ifndef MOZ_PROFILE_GENERATE + libs:: + $(INSTALL) ../tool/signmar$(BIN_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX) $(TESTROOT)/unit +-ifndef MOZ_FOLD_LIBS +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nssutil3$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(TESTROOT)/unit +- $(INSTALL) $(DEPTH)/dist/bin/$(DLL_PREFIX)plds4$(DLL_SUFFIX) $(TESTROOT)/unit +-endif + endif + endif # Not Android Property changes on: head/www/libxul/files/patch-bug1320991 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/seamonkey/files/patch-bug1320991 =================================================================== --- head/www/seamonkey/files/patch-bug1320991 (revision 430245) +++ head/www/seamonkey/files/patch-bug1320991 (revision 430246) @@ -1,24 +1,55 @@ ---- mozilla/modules/libmar/tests/moz.build.orig 2016-10-31 20:15:26 UTC +commit 454e2dbe1b4f +Author: Mike Shal +Date: Tue Dec 20 16:37:18 2016 -0500 + + Bug 1320991 - Support --with-system-{nss,nspr} in modules/libmar; r?glandium + + The problem with the modules/libmar/tests/moz.build file when building + --with-system-nspr and --with-system-nss is that the nss libraries don't + exist in the tree, so they fail when trying to copy into the test + directory. + + However, it turns out that the libraries copied into the test directory + aren't even used when building with an in-tree copy, because the + xpcshell launcher sets LD_LIBRARY_PATH to point to dist/bin. Since we + use the dist/bin copies anyway for an in-tree build, we can stop copying + them into the test directory and simultaneously fix the --with-system + build. + + The DEFINES can also go away since this directory doesn't actually build + anything. + + MozReview-Commit-ID: Bk2f28wc9ZJ +--- + modules/libmar/tests/moz.build | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git modules/libmar/tests/moz.build modules/libmar/tests/moz.build +index ee72571b0c6b..9642553e8aa2 100644 +--- mozilla/modules/libmar/tests/moz.build +++ mozilla/modules/libmar/tests/moz.build -@@ -9,21 +9,6 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh - DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] +@@ -6,24 +6,7 @@ + XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +-DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX'] +- if CONFIG['OS_TARGET'] != 'Android': - nss_files = ['nss3'] - if not CONFIG['MOZ_FOLD_LIBS']: - nss_files.extend([ - 'nssutil3', - 'plc4', - 'nspr4', - 'plds4', - ]) - TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted( - ['!/dist/bin/%s%s%s' % ( - CONFIG['DLL_PREFIX'], - name, - CONFIG['DLL_SUFFIX'], - ) for name in nss_files] - ) TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += [ '!../tool/signmar%s' % CONFIG['BIN_SUFFIX'], ]