Date: Sun, 13 May 2018 20:30:03 +0000 (UTC) From: "Bradley T. Hughes" <bhughes@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469828 - head/www/node/files Message-ID: <201805132030.w4DKU3Ik005322@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bhughes Date: Sun May 13 20:30:03 2018 New Revision: 469828 URL: https://svnweb.freebsd.org/changeset/ports/469828 Log: www/node: fix build on i386 Add patch files missing from r469781, which ensure that the Node.js build on i386 falls back to the linux-elf OpenSSL config. PR: 228135 Reported by: Marcin Cieslak <saper@saper.info> Added: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi (contents, props changed) head/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi (contents, props changed) head/www/node/files/patch-deps_openssl_config_bn__conf__asm.h (contents, props changed) head/www/node/files/patch-deps_openssl_config_dso__conf__asm.h (contents, props changed) head/www/node/files/patch-deps_openssl_config_opensslconf__asm.h (contents, props changed) head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi (contents, props changed) Added: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi Sun May 13 20:30:03 2018 (r469828) @@ -0,0 +1,15 @@ +--- deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi.orig 2018-05-11 12:05:05 UTC ++++ deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi +@@ -26,10 +26,10 @@ + 'POLY1305_ASM', + ], + 'openssl_cflags_linux-elf': [ +- '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer', ++ '-Wall -O3 -pthread -DL_ENDIAN', + ], + 'openssl_ex_libs_linux-elf': [ +- '-ldl -pthread', ++ '', + ], + 'openssl_cli_srcs_linux-elf': [ + 'openssl/apps/app_rand.c', Added: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi Sun May 13 20:30:03 2018 (r469828) @@ -0,0 +1,15 @@ +--- deps/openssl/config/archs/linux-elf/asm/openssl.gypi.orig 2018-05-11 12:05:18 UTC ++++ deps/openssl/config/archs/linux-elf/asm/openssl.gypi +@@ -681,10 +681,10 @@ + 'POLY1305_ASM', + ], + 'openssl_cflags_linux-elf': [ +- '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer', ++ '-Wall -O3 -pthread -DL_ENDIAN', + ], + 'openssl_ex_libs_linux-elf': [ +- '-ldl -pthread', ++ '', + ], + }, + 'include_dirs': [ Added: head/www/node/files/patch-deps_openssl_config_bn__conf__asm.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_openssl_config_bn__conf__asm.h Sun May 13 20:30:03 2018 (r469828) @@ -0,0 +1,13 @@ +--- deps/openssl/config/bn_conf_asm.h.orig 2018-05-11 12:01:43 UTC ++++ deps/openssl/config/bn_conf_asm.h +@@ -21,8 +21,8 @@ + # include "./archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h" + #elif defined(_WIN32) && defined(_M_X64) + # include "./archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h" +-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) +-# include "./archs/BSD-x86/asm/crypto/include/internal/bn_conf.h" ++//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) ++//# include "./archs/BSD-x86/asm/crypto/include/internal/bn_conf.h" + #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) + # include "./archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h" + #elif defined(__sun) && defined(__i386__) Added: head/www/node/files/patch-deps_openssl_config_dso__conf__asm.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_openssl_config_dso__conf__asm.h Sun May 13 20:30:03 2018 (r469828) @@ -0,0 +1,13 @@ +--- deps/openssl/config/dso_conf_asm.h.orig 2018-05-11 12:02:07 UTC ++++ deps/openssl/config/dso_conf_asm.h +@@ -21,8 +21,8 @@ + # include "./archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h" + #elif defined(_WIN32) && defined(_M_X64) + # include "./archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h" +-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) +-# include "./archs/BSD-x86/asm/crypto/include/internal/dso_conf.h" ++//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) ++//# include "./archs/BSD-x86/asm/crypto/include/internal/dso_conf.h" + #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) + # include "./archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h" + #elif defined(__sun) && defined(__i386__) Added: head/www/node/files/patch-deps_openssl_config_opensslconf__asm.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_openssl_config_opensslconf__asm.h Sun May 13 20:30:03 2018 (r469828) @@ -0,0 +1,13 @@ +--- deps/openssl/config/opensslconf_asm.h.orig 2018-05-11 11:27:00 UTC ++++ deps/openssl/config/opensslconf_asm.h +@@ -108,8 +108,8 @@ + # include "./archs/VC-WIN32/asm/include/openssl/opensslconf.h" + #elif defined(_WIN32) && defined(_M_X64) + # include "./archs/VC-WIN64A/asm/include/openssl/opensslconf.h" +-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) +-# include "./archs/BSD-x86/asm/include/openssl/opensslconf.h" ++//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) ++//# include "./archs/BSD-x86/asm/include/openssl/opensslconf.h" + #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) + # include "./archs/BSD-x86_64/asm/include/openssl/opensslconf.h" + #elif defined(__sun) && defined(__i386__) Added: head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi Sun May 13 20:30:03 2018 (r469828) @@ -0,0 +1,11 @@ +--- deps/openssl/openssl_no_asm.gypi.orig 2018-05-11 12:27:27 UTC ++++ deps/openssl/openssl_no_asm.gypi +@@ -42,7 +42,7 @@ + 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], + }, { + # Other architectures don't use assembly +- 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], ++ 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'], + }], + ], + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805132030.w4DKU3Ik005322>