Hide all symbols in the compiled python extensions on unix

They were already hidden on windows. Avoids the possibility of symbol
collisions and also means ld has to do less work when loading them
extensions.

setup/build.py

@@ -34,6 +34,13 @@ class Extension(object):
         self.error = d['error'] = kwargs.get('error', None)
         self.libraries = d['libraries'] = kwargs.get('libraries', [])
         self.cflags = d['cflags'] = kwargs.get('cflags', [])
+        if iswindows:
+            self.cflags.append('/DCALIBRE_MODINIT_FUNC=PyMODINIT_FUNC')
+        else:
+            if self.needs_cxx:
+                self.cflags.append('-DCALIBRE_MODINIT_FUNC=extern "C" __attribute__ ((visibility ("default"))) void')
+            else:
+                self.cflags.append('-DCALIBRE_MODINIT_FUNC=__attribute__ ((visibility ("default"))) void')
         self.ldflags = d['ldflags'] = kwargs.get('ldflags', [])
         self.optional = d['options'] = kwargs.get('optional', False)
         of = kwargs.get('optimize_level', None)
@@ -145,6 +152,7 @@ def init_env():
         ldflags = shlex.split(ldflags)
         cflags += shlex.split(os.environ.get('CFLAGS', ''))
         ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
+        cflags += ['-fvisibility=hidden']
 
     if islinux:
         cflags.append('-pthread')

src/calibre/devices/libusb/libusb.c

@@ -119,7 +119,7 @@ static PyMethodDef libusb_methods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initlibusb(void) {
     PyObject *m;
 

src/calibre/devices/mtp/unix/libmtp.c

@@ -712,7 +712,7 @@ static PyMethodDef libmtp_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initlibmtp(void) {
     PyObject *m;
 

src/calibre/devices/mtp/windows/wpd.cpp

@@ -182,7 +182,7 @@ static PyMethodDef wpd_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initwpd(void) {
     PyObject *m;
 

src/calibre/devices/usbobserver/usbobserver.c

@@ -482,7 +482,7 @@ static PyMethodDef usbobserver_methods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initusbobserver(void) {
     (void) Py_InitModule("usbobserver", usbobserver_methods);
 }

src/calibre/ebooks/compression/palmdoc.c

@@ -195,7 +195,7 @@ static PyMethodDef cPalmdocMethods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initcPalmdoc(void) {
     PyObject *m;
     m = Py_InitModule3("cPalmdoc", cPalmdocMethods,

src/calibre/ebooks/djvu/bzzdecoder.c

@@ -694,7 +694,7 @@ static PyMethodDef bzzdecmethods[] = {
 
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initbzzdec(void) {
     PyObject *m;
     m = Py_InitModule3("bzzdec", bzzdecmethods,

src/calibre/gui2/tweak_book/diff/_patiencediff_c.c

@@ -1258,7 +1258,7 @@ static PyMethodDef cpatiencediff_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 init_patiencediff_c(void)
 {
     PyObject* m;

src/calibre/gui2/tweak_book/editor/syntax/html.c

@@ -474,7 +474,7 @@ static PyMethodDef html_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 inithtml(void) {
     PyObject *m, *temp;
     if (PyType_Ready(&html_TagType) < 0)

src/calibre/library/sqlite_custom.c

@@ -10,7 +10,7 @@ SQLITE_EXTENSION_INIT1
 #ifdef _MSC_VER
 #define MYEXPORT __declspec(dllexport)
 #else
-#define MYEXPORT
+#define MYEXPORT __attribute__ ((visibility ("default")))
 #endif
 
 // sortconcat {{{
@@ -271,7 +271,7 @@ static PyMethodDef sqlite_custom_methods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initsqlite_custom(void) {
     PyObject *m;
     m = Py_InitModule3("sqlite_custom", sqlite_custom_methods,

src/calibre/utils/certgen.c

@@ -379,7 +379,7 @@ static PyMethodDef certgen_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initcertgen(void) {
     PyObject *m;
     m = Py_InitModule3("certgen", certgen_methods,

src/calibre/utils/chm/extra.c

@@ -708,7 +708,7 @@ IndexMethods[] = {
 #ifdef __cplusplus
 extern "C"
 #endif
-MODEXPORT(void)
+CALIBRE_MODINIT_FUNC
 initchm_extra (void) {
   Py_InitModule ("chm_extra", IndexMethods);
 }

src/calibre/utils/chm/swig_chm.c

@@ -1106,7 +1106,7 @@ static swig_const_info swig_const_table[] = {
 #ifdef __cplusplus
 extern "C"
 #endif
-SWIGEXPORT(void) SWIG_init(void) {
+CALIBRE_MODINIT_FUNC SWIG_init(void) {
     static PyObject *SWIG_globals = 0; 
     static int       typeinit = 0;
     PyObject *m, *d;

src/calibre/utils/fonts/freetype.cpp

@@ -293,7 +293,7 @@ PyMethodDef methods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initfreetype(void) {
     PyObject *m;
 

src/calibre/utils/fonts/winfonts.cpp

@@ -235,7 +235,7 @@ PyMethodDef winfonts_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initwinfonts(void) {
     PyObject *m;
     m = Py_InitModule3(

src/calibre/utils/icu.c

@@ -1175,7 +1175,7 @@ static PyMethodDef icu_methods[] = {
 
 #define ADDUCONST(x) PyModule_AddIntConstant(m, #x, x)
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initicu(void) 
 {
     PyObject* m;

src/calibre/utils/lzx/lzxmodule.c

@@ -202,7 +202,7 @@ static PyMethodDef lzx_methods[] = {
     { NULL }
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initlzx(void)
 {
     PyObject *m;

src/calibre/utils/matcher.c

@@ -508,7 +508,7 @@ static PyMethodDef matcher_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initmatcher(void) {
     PyObject *m;
     MatcherType.tp_new = PyType_GenericNew;

src/calibre/utils/monotonic.c

@@ -71,7 +71,7 @@ static PyMethodDef monotonic_methods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initmonotonic(void) {
     PyObject *m;
 #ifdef _MSC_VER

src/calibre/utils/msdes/msdesmodule.c

@@ -78,7 +78,7 @@ static PyMethodDef msdes_methods[] = {
     { NULL, NULL }
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initmsdes(void)
 {
     PyObject *m;

src/calibre/utils/podofo/podofo.cpp

@@ -38,7 +38,7 @@ class PyLogMessage : public PdfError::LogMessageCallback {
 
 PyLogMessage log_message;
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initpodofo(void) 
 {
     PyObject* m;

src/calibre/utils/speedup.c

@@ -483,7 +483,7 @@ static PyMethodDef speedup_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initspeedup(void) {
     PyObject *m;
     m = Py_InitModule3("speedup", speedup_methods,

src/calibre/utils/spell/hunspell_wrapper.cpp

@@ -165,7 +165,7 @@ static PyTypeObject DictionaryType = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 inithunspell(void) {
     PyObject *mod;
 
@@ -185,4 +185,3 @@ inithunspell(void) {
     Py_INCREF(&DictionaryType);
     PyModule_AddObject(mod, "Dictionary", (PyObject *)&DictionaryType);
 }
-

src/calibre/utils/unrar.cpp

@@ -526,7 +526,7 @@ static PyTypeObject RARArchiveType = { // {{{
 // }}} End RARArchive
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initunrar(void) {
     PyObject *m;
 

src/calibre/utils/windows/winutil.c

@@ -384,7 +384,7 @@ be a unicode string. Returns unicode strings."
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initwinutil(void) {
     PyObject *m;
     m = Py_InitModule3("winutil", WinutilMethods,

src/calibre/utils/zlib2.c

@@ -383,7 +383,7 @@ static PyMethodDef methods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initzlib2(void) {
     PyObject *m, *ver;
     Comptype.tp_new = PyType_GenericNew;

src/duktape/module.c

@@ -63,7 +63,12 @@ static struct PyModuleDef moduledef = {
 };
 #endif
 
-PyMODINIT_FUNC
+#ifdef _MSVC
+#define EXPORTED __declspec(dllexport)
+#else
+#define EXPORTED __attribute__ ((visibility ("default")))
+#endif
+EXPORTED PyMODINIT_FUNC
 #if PY_MAJOR_VERSION >= 3
 PyInit_dukpy(void)
 #else 

src/lzma/lzma_binding.c

@@ -412,7 +412,7 @@ static PyMethodDef lzma_binding_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 initlzma_binding(void) {
     PyObject *m = NULL, *preset_map = NULL, *temp = NULL;
     int i = 0;

src/tinycss/tokenizer.c

@@ -416,7 +416,7 @@ static PyMethodDef tokenizer_methods[] = {
 };
 
 
-PyMODINIT_FUNC
+CALIBRE_MODINIT_FUNC
 inittokenizer(void) {
     PyObject *m;
     if (PyType_Ready(&tokenizer_TokenType) < 0)