Work in Progress

Signed-off-by: Yong Tang <[email protected]>

Author: yongtang

third_party/libapr1.BUILD

@@ -152,7 +152,14 @@ cc_library(
     ],
     copts = [
         "-pthread",
-    ],
+    ] + select({
+        "@bazel_tools//src/conditions:darwin": [
+            "-DAPR_HAVE_UNION_SEMUN=1",
+        ],
+        "//conditions:default": [
+            "-DAPR_HAVE_UNION_SEMUN=0",
+        ],
+    }),
     defines = [
         "_GNU_SOURCE",
         "HAVE_CONFIG_H",
@@ -165,8 +172,6 @@ cc_library(
         "include/private",
     ],
     linkopts = [
-        "-lrt",
-        "-lcrypt",
         "-lpthread",
         "-ldl",
     ],

third_party/libapr1.patch

@@ -264,14 +264,14 @@ diff -urN libapr1/include/apr.h libapr/include/apr.h
 +#define APR_HAVE_STRSTR         1
 +#define APR_HAVE_MEMCHR         1
 +#define APR_HAVE_STRUCT_RLIMIT  1
-+#define APR_HAVE_UNION_SEMUN    0
++/* #define APR_HAVE_UNION_SEMUN    1 */
 +#define APR_HAVE_SCTP           0
 +#define APR_HAVE_IOVEC          1
 +
 +/*  APR Feature Macros */
 +#define APR_HAS_SHARED_MEMORY     1
 +#define APR_HAS_THREADS           1
-+#define APR_HAS_SENDFILE          1
++/* #define APR_HAS_SENDFILE          1 */
 +#define APR_HAS_MMAP              1
 +#define APR_HAS_FORK              1
 +#define APR_HAS_RANDOM            1
@@ -734,7 +734,7 @@ diff -urN libapr1/include/arch/unix/apr_private.h libapr/include/arch/unix/apr_p
 +/* #undef GETSERVBYNAME_R_SOLARIS */
 +
 +/* Define if accept4 function is supported */
-+#define HAVE_ACCEPT4 1
++/* #undef HAVE_ACCEPT4 */
 +
 +/* Define if async i/o supports message q's */
 +/* #undef HAVE_AIO_MSGQ */
@@ -793,7 +793,7 @@ diff -urN libapr1/include/arch/unix/apr_private.h libapr/include/arch/unix/apr_p
 +/* #undef HAVE_DL_H */
 +
 +/* Define if dup3 function is supported */
-+#define HAVE_DUP3 1
++/* #undef HAVE_DUP3 */
 +
 +/* Define if EGD is supported */
 +/* #undef HAVE_EGD */
@@ -868,7 +868,7 @@ diff -urN libapr1/include/arch/unix/apr_private.h libapr/include/arch/unix/apr_p
 +#define HAVE_GETRLIMIT 1
 +
 +/* Define to 1 if you have the `getservbyname_r' function. */
-+#define HAVE_GETSERVBYNAME_R 1
++/* #undef HAVE_GETSERVBYNAME_R */
 +
 +/* Define to 1 if you have the `gmtime_r' function. */
 +#define HAVE_GMTIME_R 1
@@ -1021,7 +1021,7 @@ diff -urN libapr1/include/arch/unix/apr_private.h libapr/include/arch/unix/apr_p
 +#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
 +
 +/* Define if cross-process robust mutexes are available */
-+#define HAVE_PTHREAD_MUTEX_ROBUST 1
++/* #undef HAVE_PTHREAD_MUTEX_ROBUST */
 +
 +/* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */
 +#define HAVE_PTHREAD_PROCESS_SHARED 1
@@ -1033,7 +1033,7 @@ diff -urN libapr1/include/arch/unix/apr_private.h libapr/include/arch/unix/apr_p
 +#define HAVE_PTHREAD_RWLOCK_INIT 1
 +
 +/* Define to 1 if you have the `pthread_yield' function. */
-+#define HAVE_PTHREAD_YIELD 1
++/* #undef HAVE_PTHREAD_YIELD */
 +
 +/* Define to 1 if you have the `putenv' function. */
 +#define HAVE_PUTENV 1
@@ -1135,7 +1135,7 @@ diff -urN libapr1/include/arch/unix/apr_private.h libapr/include/arch/unix/apr_p
 +#define HAVE_SOCKLEN_T 1
 +
 +/* Define if the SOCK_CLOEXEC flag is supported */
-+#define HAVE_SOCK_CLOEXEC 1
++/* #undef HAVE_SOCK_CLOEXEC */
 +
 +/* Define if SO_ACCEPTFILTER is defined in sys/socket.h */
 +/* #undef HAVE_SO_ACCEPTFILTER */

third_party/libaprutil1.BUILD

@@ -111,7 +111,6 @@ cc_library(
         "include/private",
     ],
     linkopts = [
-        "-lrt",
         "-lpthread",
     ],
     strip_include_prefix = "include",