[GR-16310] Ensure compatibility with musl libc 1.1.21.

PullRequest: graalpython/536

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/unicodeobject.c

@@ -138,11 +138,15 @@ PyObject* PyTruffle_Unicode_FromFormat(const char* fmt, int s, void* v0, void* v
     case 19: v19 = value; break;                \
     }
 
-    char* fmtcpy = strdup(fmt);
+    size_t fmt_size = strlen(fmt) + 1;
+    // n.b. avoid using 'strdup' for compatiblity with MUSL libc
+    char* fmtcpy = (char*) malloc(fmt_size*sizeof(char));
     char* c = fmtcpy;
     char* allocated;
     int cnt = 0;
 
+    memcpy(fmtcpy, fmt, fmt_size);
+
     while (c[0] && cnt < s) {
         if (c[0] == '%') {
             switch (c[1]) {

graalpython/lib-graalpython/modules/ginstall.py

@@ -376,9 +376,42 @@ def pandas(*args):
 
          dinfo->abstime = (double)(hour * 3600 + minute * 60) + second;
 
+diff --git a/pandas/io/msgpack/_packer.cpp b/pandas/io/msgpack/_packer.cpp
+index 8b5b382..7544707 100644
+--- a/pandas/io/msgpack/_packer.cpp
++++ b/pandas/io/msgpack/_packer.cpp
+@@ -477,10 +477,7 @@ typedef struct {PyObject **p; const char *s; const Py_ssize_t n; const char* enc
+     (sizeof(type) == sizeof(Py_ssize_t) &&\\
+           (is_signed || likely(v < (type)PY_SSIZE_T_MAX ||\\
+                                v == (type)PY_SSIZE_T_MAX)))  )
+-#if defined (__cplusplus) && __cplusplus >= 201103L
+-    #include <cstdlib>
+-    #define __Pyx_sst_abs(value) std::abs(value)
+-#elif SIZEOF_INT >= SIZEOF_SIZE_T
++#if SIZEOF_INT >= SIZEOF_SIZE_T
+     #define __Pyx_sst_abs(value) abs(value)
+ #elif SIZEOF_LONG >= SIZEOF_SIZE_T
+     #define __Pyx_sst_abs(value) labs(value)
+diff --git a/pandas/io/msgpack/_unpacker.cpp b/pandas/io/msgpack/_unpacker.cpp
+index fa08f53..49f3bf3 100644
+--- a/pandas/io/msgpack/_unpacker.cpp
++++ b/pandas/io/msgpack/_unpacker.cpp
+@@ -477,10 +477,7 @@ typedef struct {PyObject **p; const char *s; const Py_ssize_t n; const char* enc
+     (sizeof(type) == sizeof(Py_ssize_t) &&\\
+           (is_signed || likely(v < (type)PY_SSIZE_T_MAX ||\\
+                                v == (type)PY_SSIZE_T_MAX)))  )
+-#if defined (__cplusplus) && __cplusplus >= 201103L
+-    #include <cstdlib>
+-    #define __Pyx_sst_abs(value) std::abs(value)
+-#elif SIZEOF_INT >= SIZEOF_SIZE_T
++#if SIZEOF_INT >= SIZEOF_SIZE_T
+     #define __Pyx_sst_abs(value) abs(value)
+ #elif SIZEOF_LONG >= SIZEOF_SIZE_T
+     #define __Pyx_sst_abs(value) labs(value)
+
 """
         cflags = "-allowcpp" if sys.implementation.name == "graalpython" else ""
-        install_from_url("https://files.pythonhosted.org/packages/ee/aa/90c06f249cf4408fa75135ad0df7d64c09cf74c9870733862491ed5f3a50/pandas-0.20.3.tar.gz", patch=patch, extra_opts=args, cflags=cflags)
+        install_from_url("https://files.pythonhosted.org/packages/ee/aa/90c06f249cf4408fa75135ad0df7d64c09cf74c9870733862491ed5f3a50/pandas-0.20.3.tar.gz", patch=patch, extra_opts=args, add_cflags=cflags)
 
     return locals()
 
@@ -391,7 +424,7 @@ def xit(msg, status=-1):
     exit(-1)
 
 
-def install_from_url(url, patch=None, extra_opts=[], cflags=""):
+def install_from_url(url, patch=None, extra_opts=[], add_cflags=""):
     name = url[url.rfind("/")+1:]
     tempdir = tempfile.mkdtemp()
 
@@ -403,6 +436,10 @@ def install_from_url(url, patch=None, extra_opts=[], cflags=""):
     elif url.startswith("https://") and "HTTPS_PROXY" in env:
         curl_opts += ["--proxy", env["HTTPS_PROXY"]]
 
+    # honor env var 'CFLAGS' and 'CPPFLAGS'
+    cppflags = os.environ.get("CPPFLAGS", "")
+    cflags = "-v " + os.environ.get("CFLAGS", "") + ((" " + add_cflags) if add_cflags else "")
+
     system("curl %s -o %s/%s %s" % (" ".join(curl_opts), tempdir, name, url))
     if name.endswith(".tar.gz"):
         system("tar xzf %s/%s -C %s" % (tempdir, name, tempdir))
@@ -420,7 +457,7 @@ def install_from_url(url, patch=None, extra_opts=[], cflags=""):
         user_arg = "--user"
     else:
         user_arg = ""
-    system("cd %s/%s; %s %s setup.py install %s %s" % (tempdir, bare_name, "CFLAGS=%s" % cflags if cflags else "", sys.executable, user_arg, " ".join(extra_opts)))
+    system("cd %s/%s; %s %s %s setup.py install %s %s" % (tempdir, bare_name, 'CFLAGS="%s"' % cflags if cflags else "", 'CPPFLAGS="%s"' % cppflags if cppflags else "", sys.executable, user_arg, " ".join(extra_opts)))
 
 
 def install_from_pypi(package, extra_opts=[]):