diff -Naur work2/live-2017.09.12/live-shared/config.gentoo-so-r1 work/live-2017.09.12/live-shared/config.gentoo-so-r1
--- work2/live-2017.09.12/live-shared/config.gentoo-so-r1	2017-11-24 23:22:11.827538675 -0600
+++ work/live-2017.09.12/live-shared/config.gentoo-so-r1	2017-11-25 19:34:07.842300100 -0600
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		$(CC)
 C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
diff -Naur work2/live-2017.09.12/live-shared/config.linux work/live-2017.09.12/live-shared/config.linux
--- work2/live-2017.09.12/live-shared/config.linux	2017-09-12 02:06:29.000000000 -0500
+++ work/live-2017.09.12/live-shared/config.linux	2017-11-25 19:34:21.214736306 -0600
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
diff -Naur work2/live-2017.09.12/live-shared/config.linux-64bit work/live-2017.09.12/live-shared/config.linux-64bit
--- work2/live-2017.09.12/live-shared/config.linux-64bit	2017-09-12 02:06:29.000000000 -0500
+++ work/live-2017.09.12/live-shared/config.linux-64bit	2017-11-25 19:34:35.027142988 -0600
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -m64  -fPIC -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -m64  -fPIC -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
diff -Naur work2/live-2017.09.12/live-shared/config.linux-gdb work/live-2017.09.12/live-shared/config.linux-gdb
--- work2/live-2017.09.12/live-shared/config.linux-gdb	2017-09-12 02:06:29.000000000 -0500
+++ work/live-2017.09.12/live-shared/config.linux-gdb	2017-11-25 19:34:46.313052497 -0600
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
diff -Naur work2/live-2017.09.12/live-shared/config.linux-with-shared-libraries work/live-2017.09.12/live-shared/config.linux-with-shared-libraries
--- work2/live-2017.09.12/live-shared/config.linux-with-shared-libraries	2017-09-12 02:06:29.000000000 -0500
+++ work/live-2017.09.12/live-shared/config.linux-with-shared-libraries	2017-11-25 19:35:00.362109956 -0600
@@ -24,7 +24,7 @@
 libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
 #####
 
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
+COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		$(CC)
 C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
diff -Naur work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.gentoo-so-r1 work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.gentoo-so-r1
--- work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.gentoo-so-r1	2017-11-24 23:22:11.827538675 -0600
+++ work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.gentoo-so-r1	2017-11-25 19:35:25.280438187 -0600
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		$(CC)
 C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
diff -Naur work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux
--- work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux	2017-09-12 02:06:29.000000000 -0500
+++ work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux	2017-11-25 19:35:34.333164168 -0600
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)
diff -Naur work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-64bit work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-64bit
--- work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-64bit	2017-09-12 02:06:29.000000000 -0500
+++ work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-64bit	2017-11-25 19:35:48.365556055 -0600
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -m64  -fPIC -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -m64  -fPIC -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
diff -Naur work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-gdb work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-gdb
--- work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-gdb	2017-09-12 02:06:29.000000000 -0500
+++ work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-gdb	2017-11-25 19:35:57.231627885 -0600
@@ -1,4 +1,4 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
diff -Naur work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-with-shared-libraries work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-with-shared-libraries
--- work2/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-with-shared-libraries	2017-09-12 02:06:29.000000000 -0500
+++ work/live-2017.09.12-abi_x86_64.amd64/live-shared/config.linux-with-shared-libraries	2017-11-25 19:36:12.683924495 -0600
@@ -24,7 +24,7 @@
 libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
 #####
 
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
+COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC -DXLOCALE_NOT_USED
 C =			c
 C_COMPILER =		$(CC)
 C_FLAGS =		$(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS)