chiark - git - mdw - termux-packages/blob - packages/p7zip/makefile.patch

   1 diff -u -r ../p7zip_15.09/makefile.android_arm ./makefile.android_arm
   2 --- ../p7zip_15.09/makefile.android_arm 2015-09-13 14:15:17.000000000 -0400
   3 +++ ./makefile.android_arm      2015-12-22 06:33:41.608388305 -0500
   4 @@ -1,58 +1,38 @@
   5  #
   6 -# makefile for ANDROID (generic ARM)
   7 +# makefile for Android with Termux
   8  #
   9
  10 -ANDROID_NDK_HOME=$(HOME)/ANDROID/android-ndk-r5c
  11 -ANDROID_NDK_BIN=$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
  12 -
  13 -# -fpic -Os
  14 -# -fstack-protector
  15  ANDROID_FLAGS=\
  16   -ffunction-sections \
  17   -funwind-tables \
  18 - -D__ARM_ARCH_5__ \
  19 - -D__ARM_ARCH_5T__ \
  20 - -D__ARM_ARCH_5E__  \
  21 - -D__ARM_ARCH_5TE__  \
  22   -DANDROID \
  23   -DANDROID_NDK \
  24 + -D_UNICODE \
  25 + -DUNICODE \
  26   -Wno-psabi  \
  27 - -march=armv5te  \
  28 - -mtune=xscale  \
  29 - -msoft-float  \
  30 - -mthumb \
  31   -fomit-frame-pointer \
  32   -fno-strict-aliasing -finline-limit=64 \
  33 - -I$(ANDROID_NDK_HOME)/sources/cxx-stl/system/include \
  34 - -I$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/include \
  35 - -Wa,--noexecstack
  36 + -Wa,--noexecstack
  37
  38  ANDROID_LINK=-v \
  39   -Wl,--gc-sections -Wl,-z,nocopyreloc \
  40 - --sysroot=$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm \
  41 - $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libc.so \
  42 - $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libstdc++.so \
  43 - $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libm.so  \
  44   -Wl,--no-undefined -Wl,-z,noexecstack  \
  45 - -L$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib \
  46 - -lstdc++ -Wl,-rpath-link=$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib \
  47 - -lsupc++
  48 + -lstdc++ -lsupc++
  49
  50 -OPTFLAGS=-O3 -s
  51 +OPTFLAGS=-Os -s
  52
  53  ALLFLAGS=${OPTFLAGS} -pipe \
  54         -DNDEBUG -D_REENTRANT -DENV_UNIX \
  55         $(ANDROID_FLAGS) \
  56         $(LOCAL_FLAGS)
  57
  58 -CXX=$(ANDROID_NDK_BIN)/arm-linux-androideabi-g++ -fexceptions -frtti
  59 -CC=$(ANDROID_NDK_BIN)/arm-linux-androideabi-gcc
  60 -CC_SHARED= -fpic
  61 -LINK_SHARED=-fpic -shared
  62 +CXX+= -fexceptions -frtti
  63 +
  64 +CC_SHARED=-fPIC
  65 +LINK_SHARED=-fPIC -shared
  66
  67  LOCAL_LIBS=$(ANDROID_LINK)
  68 -LOCAL_LIBS_DLL=$(LOCAL_LIBS) # -ldl
  69 +LOCAL_LIBS_DLL=$(LOCAL_LIBS)
  70
  71  OBJ_CRC32=$(OBJ_CRC32_C)
  72  OBJ_AES=
  73 -