--- native/Makefile.orig	2024-03-29 21:57:29 UTC
+++ native/Makefile
@@ -41,6 +41,8 @@
 # protection simply by defining HAVE_PROTECTION.  This option has been only
 # been enabled for those platforms on which it has been tested successfully.
 
+unexport LDFLAGS
+
 OS=$(shell uname | sed -e 's/CYGWIN.*/win32/g' \
 	                -e 's/MINGW32.*/win32/g' \
                         -e 's/SunOS.*/solaris/g' \
@@ -297,9 +299,12 @@ PCFLAGS+=-fPIC
 # This is a mess: X11 headers locate in /usr/local/include on FreeBSD and
 # DragonFly, in /usr/X11R7/include on NetBSD, and in /usr/X11R6/include on
 # OpenBSD.
-CINCLUDES+=-I/usr/local/include -I/usr/X11R7/include -I/usr/X11R6/include
+CINCLUDES+=-I%%LOCALBASE%%/include -I/usr/X11R7/include -I/usr/X11R6/include
 CINCLUDES+=$(X11INC)  # Allow extra X11 include path if necessary.
 LDFLAGS=-o $@ -shared
+ifeq ($(ARCH),i386)
+LDFLAGS+=-Wl,-z,notext
+endif
 CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT -DUSE_DEAFULT_LIBNAME_ENCODING
 endif
 
@@ -363,11 +368,11 @@ ifeq ($(CC),gcc)
     GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.')
     ifneq ($(GCC_MAJOR_VERSION),4)
 	ifneq ($(GCC_MAJOR_VERSION),3)
-	    LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable -Wno-alloca-larger-than
+	    LOC_CC_OPTS=-Wno-unused-variable 
 	endif
     endif
 else
-    LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered -Wno-unused-variable
+    LOC_CC_OPTS=-Wno-unused-variable
 endif
 
 # Enable 64-bit builds if the arch demands it