--- api/avahi/src/Makefile.orig	2020-05-12 00:35:36.000000000 -0600
+++ api/avahi/src/Makefile	2020-05-14 11:32:56.828004978 -0600
@@ -47,9 +47,9 @@ CEFLAGS		=
 
 # Additional pthread lib for C
 ifeq "$(AVAHILIBS) " " "
-EXTRALIBS	= 
+EXTRALIBS	= $(PTHREADLIBS)
 else
-EXTRALIBS	= $(AVAHILIBS) $(GCCLOSELIB)
+EXTRALIBS	= $(AVAHILIBS) $(GCCLOSELIB) $(PTHREADLIBS)
 EXTRALIBS_S	= -lbigloopthread_s-$(RELEASE)
 EXTRALIBS_U	= -lbigloopthread_u-$(RELEASE)
 endif
--- api/pkglib/src/Makefile.orig	2020-05-12 00:35:36.000000000 -0600
+++ api/pkglib/src/Makefile	2020-05-14 11:32:56.829004976 -0600
@@ -45,8 +45,8 @@ SPIFLAGS	=
 BMISCFLAGS	= -I Llib
 
 # Extra libs
-EXTRALIBS_S	= -lbigloosqlite_s-$(RELEASE)
-EXTRALIBS_U	= -lbigloosqlite_u-$(RELEASE)
+EXTRALIBS_S	= -lbigloosqlite_s-$(RELEASE) $(SQLITELIBS)
+EXTRALIBS_U	= -lbigloosqlite_u-$(RELEASE) $(SQLITELIBS)
 
 #*---------------------------------------------------------------------*/
 #*    Scheme extended objects                                          */
--- Makefile.misc.orig	2020-05-12 00:35:36.000000000 -0600
+++ Makefile.misc	2020-05-14 11:32:56.831004970 -0600
@@ -89,8 +89,8 @@ shared-install-name:
                  $(OBJECTS) \
                  $(GCSTDOBJECTS) \
                  $(LDFLAGS) $(EXTRA_LD_OPT) \
-                 $(EXTRALIBS) $(CLOSELIBS) \
-                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) && \
+                 $(CLOSELIBS) \
+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
            mv $(notdir $(LIBDEST)) $(LIBDEST); \
          fi
@@ -102,8 +102,8 @@ MS-CARE-shared-install-name:
                  $(OBJECTS) \
                  $(GCSTDOBJECTS) \
                  $(LDFLAGS) $(EXTRA_LD_OPT) \
-                 $(EXTRALIBS) $(CLOSELIBS) \
-                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) && \
+                 $(CLOSELIBS) \
+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
            mv $(notdir $(LIBDEST)) $(LIBDEST); \
          fi
@@ -113,9 +113,9 @@ shared-sans-soname:
                  $(LDRPATH) \
                  $(OBJECTS) \
                  $(GCSTDOBJECTS) \
-                 $(LDFLAGS) \
-                 $(EXTRALIBS) $(CLOSELIBS) \
-                 $(LDLIBS) $(LDOPTS) $(EXTRA_LD_OPT) $(LDEXTRA) && \
+                 $(LDFLAGS) $(EXTRA_LD_OPT) \
+                 $(CLOSELIBS) \
+                 $(LDLIBS) $(LDOPTS) $(LDEXTRA) $(EXTRALIBS) && \
          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
            mv $(notdir $(LIBDEST)) $(LIBDEST); \
          fi
@@ -127,8 +127,8 @@ shared-soname:
                  $(OBJECTS) \
                  $(GCSTDOBJECTS) \
                  $(LDOPTS) $(EXTRA_LD_OPT) \
-                 $(EXTRALIBS) $(CLOSELIBS) \
-                 $(LDLIBS) $(LDFLAGS) $(LDEXTRA) && \
+                 $(CLOSELIBS) \
+                 $(LDLIBS) $(LDFLAGS) $(LDEXTRA) $(EXTRALIBS) && \
          if [ "$(notdir $(LIBDEST))" != "$(LIBDEST)" ]; then \
            mv $(notdir $(LIBDEST)) $(LIBDEST); \
          fi