--- jni/GNUmakefile.orig 2010-02-23 12:42:51.564630229 -0500 +++ jni/GNUmakefile 2010-02-23 15:15:40.773647826 -0500 @@ -62,25 +62,27 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG OFLAGS = -O2 $(JFLAGS) # MacOS headers aren't completely warning free, so turn them off ifneq ($(OS),darwin) - WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef + WFLAGS = -W -Wall -Wno-parentheses -Wundef endif PICFLAGS = -fPIC SOFLAGS = # Filled in for each OS specifically FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT FFI_CC=$(CCACHE) $(CC) FFI_LD=$(LD) FFI_CFLAGS = $(FFI_MMAP_EXEC) $(OFLAGS) -STRIP = strip -S +STRIP = /bin/true JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)" +RPMFLAGS=$(shell rpm --eval %optflags) + IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)" -CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) +CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) $(RPMFLAGS) CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE ifeq ($(OS), win64) override CPU = x86_64 JDK_INCLUDES=-I$(JNI_DIR)/win32/include -I$(JNI_DIR)/win32/include/win32
