Skip to content

Instantly share code, notes, and snippets.

@tsutsui
Created February 26, 2021 12:02
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save tsutsui/d6d445b192d17388401d4aa4f96f0c80 to your computer and use it in GitHub Desktop.
Save tsutsui/d6d445b192d17388401d4aa4f96f0c80 to your computer and use it in GitHub Desktop.
fix build errors of pkgsrc/inputmethod/mozc-server 2.26.4282.100 on NetBSD/i386 9.1
Index: inputmethod/mozc-server/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/mozc-server/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- inputmethod/mozc-server/distinfo 15 Feb 2021 14:50:23 -0000 1.23
+++ inputmethod/mozc-server/distinfo 25 Feb 2021 22:52:54 -0000
@@ -33,7 +33,7 @@ SHA1 (patch-gui_qt__moc.gypi) = e3d42e61
SHA1 (patch-gui_qt__rcc.gypi) = d38a849fe8e81672eb441a41936f454d8e45ff5c
SHA1 (patch-gui_qt__uic.gypi) = 7dd69ee109e81f0e70f2866b77555412518b4844
SHA1 (patch-gui_word__register__dialog_word__register__dialog.cc) = 218e3706b819855814ba8871504fc7ccb4e40b23
-SHA1 (patch-gyp_common.gypi) = 18e03490d6758ce49f4b79eb1259409cd440faba
+SHA1 (patch-gyp_common.gypi) = def0f13aaaa2e294ac24315982ef9f5693f50082
SHA1 (patch-gyp_directories.gypi) = eea985113aac5b99bf3c12267ad754817eef5dcc
SHA1 (patch-ipc_ipc__path__manager.cc) = cd1352bd5333f1ed755dcf6221f931fcd0a936d3
SHA1 (patch-ipc_ipc__path__manager__test.cc) = 1b83b513383f184f5ab5a56cce734b7934998533
Index: inputmethod/mozc-server/patches/patch-gyp_common.gypi
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/mozc-server/patches/patch-gyp_common.gypi,v
retrieving revision 1.10
diff -u -p -r1.10 patch-gyp_common.gypi
--- inputmethod/mozc-server/patches/patch-gyp_common.gypi 15 Feb 2021 14:50:23 -0000 1.10
+++ inputmethod/mozc-server/patches/patch-gyp_common.gypi 25 Feb 2021 22:52:54 -0000
@@ -31,7 +31,19 @@ $NetBSD: patch-gyp_common.gypi,v 1.10 20
],
},
'target_defaults': {
-@@ -318,6 +331,24 @@
+@@ -139,6 +152,11 @@
+ # Extra cflags for gcc
+ 'release_extra_cflags%': ['-O2'],
+ 'debug_extra_cflags%': ['-O0', '-g'],
++ 'conditions': [
++ ['target_platform=="NetBSD"', {
++ 'target_arch' : '<!(uname -p)'
++ }],
++ ],
+ },
+ 'configurations': {
+ 'Debug': {
+@@ -318,6 +336,31 @@
}],
],
}],
@@ -44,6 +56,13 @@ $NetBSD: patch-gyp_common.gypi,v 1.10 20
+ '-fPIC',
+ '-fno-exceptions',
+ ],
++ 'conditions': [
++ ['target_arch=="i386"', {
++ 'cflags': [
++ '-march=i586',
++ ],
++ }],
++ ],
+ 'cflags_cc': [
+ # We use deprecated <hash_map> and <hash_set> instead of upcoming
+ # <unordered_map> and <unordered_set>.
@@ -56,7 +75,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.10 20
['OS=="mac"', {
'defines': [
'__APPLE__',
-@@ -410,7 +441,7 @@
+@@ -410,7 +453,7 @@
],
},
'conditions': [
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment