diff options
Diffstat (limited to 'archivers/upx/files')
| -rw-r--r-- | archivers/upx/files/patch-src_Makefile | 19 | ||||
| -rw-r--r-- | archivers/upx/files/patch-src_miniacc.h | 8 |
2 files changed, 20 insertions, 7 deletions
diff --git a/archivers/upx/files/patch-src_Makefile b/archivers/upx/files/patch-src_Makefile index 17c9907cfea8..0e8e6d2398ea 100644 --- a/archivers/upx/files/patch-src_Makefile +++ b/archivers/upx/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2013-09-30 15:51:00 UTC +--- src/Makefile.orig 2017-05-12 11:01:20 UTC +++ src/Makefile -@@ -55,7 +55,7 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.c +@@ -48,7 +48,7 @@ endif # we need UCL and zlib - you can set envvar UPX_UCLDIR ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),) INCLUDES += -I$(UPX_UCLDIR)/include @@ -8,4 +8,17 @@ +LIBS += -L$(UPX_UCLDIR)/lib endif LIBS += -lucl -lz - # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK + # LZMA from https://github.com/upx/upx-lzma-sdk +@@ -62,9 +62,9 @@ CXXFLAGS_OPTIMIZE ?= -O2 + endif + CXXFLAGS += $(CXXFLAGS_OPTIMIZE) + # protect against security threats caused by misguided C++ compiler "optimizations" +-ifeq ($(findstring clang,$(CXX)),) +-CXXFLAGS += -fno-delete-null-pointer-checks +-endif ++# ifeq ($(findstring clang,$(CXX)),) ++# CXXFLAGS += -fno-delete-null-pointer-checks ++# endif + CXXFLAGS += -fno-strict-aliasing -fwrapv + CXXFLAGS += -funsigned-char + CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wshadow -Wvla -Wwrite-strings diff --git a/archivers/upx/files/patch-src_miniacc.h b/archivers/upx/files/patch-src_miniacc.h index d2a2a7217b2b..7960e5d6ad4c 100644 --- a/archivers/upx/files/patch-src_miniacc.h +++ b/archivers/upx/files/patch-src_miniacc.h @@ -1,6 +1,6 @@ ---- src/miniacc.h.orig 2013-09-30 15:51:00 UTC +--- src/miniacc.h.orig 2017-05-12 11:01:20 UTC +++ src/miniacc.h -@@ -485,7 +485,7 @@ +@@ -523,7 +523,7 @@ # if defined(_AIX) || defined(__AIX__) || defined(__aix__) # define ACC_OS_POSIX_AIX 1 # define ACC_INFO_OS_POSIX "aix" @@ -9,14 +9,14 @@ # define ACC_OS_POSIX_FREEBSD 1 # define ACC_INFO_OS_POSIX "freebsd" # elif defined(__hpux__) || defined(__hpux) -@@ -1968,11 +1968,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T == +@@ -2502,11 +2502,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEO #elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN) #if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP) # define ACC_ABI_BIG_ENDIAN 1 -#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_WIN64) +#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_POSIX_FREEBSD || ACC_OS_WIN64) # define ACC_ABI_LITTLE_ENDIAN 1 - #elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430) + #elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430 || ACC_ARCH_RISCV) # define ACC_ABI_LITTLE_ENDIAN 1 -#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU) +#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU || ACC_ARCH_SPARC) |