diff -Nru emscripten-2.0.12~dfsg/debian/changelog emscripten-2.0.12~dfsg/debian/changelog --- emscripten-2.0.12~dfsg/debian/changelog 2021-02-10 22:36:37.000000000 +0000 +++ emscripten-2.0.12~dfsg/debian/changelog 2021-02-11 21:09:52.000000000 +0000 @@ -1,8 +1,8 @@ -emscripten (2.0.12~dfsg-1ubuntu1) hirsute; urgency=medium +emscripten (2.0.12~dfsg-1ubuntu2) hirsute; urgency=medium - * Disabling one failing test due to Ubuntu ld flags injected + * Fix testsuite by ignoring LDFLAGS passed by Ubuntu build system - -- Gianfranco Costamagna Wed, 10 Feb 2021 23:36:37 +0100 + -- Gianfranco Costamagna Thu, 11 Feb 2021 22:09:52 +0100 emscripten (2.0.12~dfsg-1) unstable; urgency=medium diff -Nru emscripten-2.0.12~dfsg/debian/patches/disable-test.patch emscripten-2.0.12~dfsg/debian/patches/disable-test.patch --- emscripten-2.0.12~dfsg/debian/patches/disable-test.patch 2021-02-10 22:36:35.000000000 +0000 +++ emscripten-2.0.12~dfsg/debian/patches/disable-test.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -Description: - test_cmake_with_embind_cpp11_mode (test_other.other) ... FAIL - wasm-ld: error: unknown argument: -Bsymbolic-functions - This is something that Ubuntu adds by default to the link options. - ---- emscripten-2.0.12~dfsg.orig/tests/test_other.py -+++ emscripten-2.0.12~dfsg/tests/test_other.py -@@ -591,26 +591,26 @@ f.close() - - # Tests that it's possible to pass C++11 or GNU++11 build modes to CMake by building code that - # needs C++11 (embind) -- def test_cmake_with_embind_cpp11_mode(self): -- if WINDOWS and not utils.which('ninja'): -- self.skipTest('Skipping cmake test on windows since ninja not found') -- for args in [[], ['-DNO_GNU_EXTENSIONS=1']]: -- self.clear() -- # Use ninja generator here since we assume its always installed on our build/test machines. -- configure = [emcmake, 'cmake', path_from_root('tests', 'cmake', 'cmake_with_emval')] + args -- if WINDOWS: -- configure += ['-G', 'Ninja'] -- print(str(configure)) -- self.run_process(configure) -- build = ['cmake', '--build', '.'] -- print(str(build)) -- self.run_process(build) -- -- out = self.run_process(config.NODE_JS + ['cmake_with_emval.js'], stdout=PIPE).stdout -- if '-DNO_GNU_EXTENSIONS=1' in args: -- self.assertContained('Hello! __STRICT_ANSI__: 1, __cplusplus: 201103', out) -- else: -- self.assertContained('Hello! __STRICT_ANSI__: 0, __cplusplus: 201103', out) -+ #def test_cmake_with_embind_cpp11_mode(self): -+ # if WINDOWS and not utils.which('ninja'): -+ # self.skipTest('Skipping cmake test on windows since ninja not found') -+ # for args in [[], ['-DNO_GNU_EXTENSIONS=1']]: -+ # self.clear() -+ # # Use ninja generator here since we assume its always installed on our build/test machines. -+ # configure = [emcmake, 'cmake', path_from_root('tests', 'cmake', 'cmake_with_emval')] + args -+ # if WINDOWS: -+ # configure += ['-G', 'Ninja'] -+ # print(str(configure)) -+ # self.run_process(configure) -+ # build = ['cmake', '--build', '.'] -+ # print(str(build)) -+ # self.run_process(build) -+ # -+ # out = self.run_process(config.NODE_JS + ['cmake_with_emval.js'], stdout=PIPE).stdout -+ # if '-DNO_GNU_EXTENSIONS=1' in args: -+ # self.assertContained('Hello! __STRICT_ANSI__: 1, __cplusplus: 201103', out) -+ # else: -+ # self.assertContained('Hello! __STRICT_ANSI__: 0, __cplusplus: 201103', out) - - # Tests that the Emscripten CMake toolchain option - def test_cmake_bitcode_static_libraries(self): diff -Nru emscripten-2.0.12~dfsg/debian/patches/series emscripten-2.0.12~dfsg/debian/patches/series --- emscripten-2.0.12~dfsg/debian/patches/series 2021-02-10 22:35:43.000000000 +0000 +++ emscripten-2.0.12~dfsg/debian/patches/series 2021-02-11 21:09:52.000000000 +0000 @@ -15,4 +15,4 @@ 2009_closure-compiler.patch 2010_avoid_npm.patch 2011_system_shared_tools.patch -disable-test.patch +symbolic-functions-ignore.patch diff -Nru emscripten-2.0.12~dfsg/debian/patches/symbolic-functions-ignore.patch emscripten-2.0.12~dfsg/debian/patches/symbolic-functions-ignore.patch --- emscripten-2.0.12~dfsg/debian/patches/symbolic-functions-ignore.patch 1970-01-01 00:00:00.000000000 +0000 +++ emscripten-2.0.12~dfsg/debian/patches/symbolic-functions-ignore.patch 2021-02-11 21:09:52.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Ignore also -Bsymbolic-functions Ubuntu LDFLAG +Last-Update: 2021-02-11 + +--- emscripten-2.0.12~dfsg.orig/emcc.py ++++ emscripten-2.0.12~dfsg/emcc.py +@@ -100,6 +100,8 @@ UNSUPPORTED_LLD_FLAGS = { + '-rpath': True, + '-rpath-link': True, + '-version-script': True, ++ '-Bsymbolic-functions': True, ++ 'relro': True, + } + + LIB_PREFIXES = ('', 'lib')