pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PEMA-107 Move nettle patches application to downloads Makefile

pull/30/head
ignaciogarcia 3 years ago
parent
7aec213f2f
commit
4d823359ef
No known key found for this signature in database GPG Key ID: 5E6A455C909DD623
5 changed files with 11 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      android/external/arm64-v8a/Makefile
  2. 4
      android/external/armeabi-v7a/Makefile
  3. 8
      android/external/downloads/Makefile
  4. 4
      android/external/x86/Makefile
  5. 4
      android/external/x86_64/Makefile

4
android/external/arm64-v8a/Makefile
View File

@ -256,7 +256,7 @@ gmp-install: $(LOCAL)/lib/libgmp.so
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# NETTLE # NETTLE
nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/lib/libgmp.so
tar xvf $< tar xvf $<
mv nettle-$(NETTLE_VERSION) nettle mv nettle-$(NETTLE_VERSION) nettle
touch $@ touch $@
@ -268,8 +268,6 @@ nettle-clean:
rm -rf nettle.src.stamp rm -rf nettle.src.stamp
nettle/Makefile: nettle.src.stamp nettle/Makefile: nettle.src.stamp
-patch -N -p1 --reject-file=- nettle/configure.ac ../nettle-3.4.1-remove-so-versioning.patch
-patch -N -p1 --reject-file=- nettle/Makefile.in ../nettle-3.4.1-remove-so-versioning-link.patch
cd nettle && \ cd nettle && \
CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure \ ./configure \

4
android/external/armeabi-v7a/Makefile
View File

@ -261,7 +261,7 @@ gmp-install: $(LOCAL)/lib/libgmp.so
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# NETTLE # NETTLE
nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/lib/libgmp.so
tar xvf $< tar xvf $<
mv nettle-$(NETTLE_VERSION) nettle mv nettle-$(NETTLE_VERSION) nettle
touch $@ touch $@
@ -273,8 +273,6 @@ nettle-clean:
rm -rf nettle.src.stamp rm -rf nettle.src.stamp
nettle/Makefile: nettle.src.stamp nettle/Makefile: nettle.src.stamp
-patch -N -p1 --reject-file=- nettle/configure.ac ../nettle-3.4.1-remove-so-versioning.patch
-patch -N -p1 --reject-file=- nettle/Makefile.in ../nettle-3.4.1-remove-so-versioning-link.patch
cd nettle && \ cd nettle && \
CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure \ ./configure \

8
android/external/downloads/Makefile
View File

@ -23,7 +23,7 @@ download-iconv: libiconv-1.15.tar.gz
download-uuid: ossp-uuid_1.6.2.orig.tar.gz download-uuid: ossp-uuid_1.6.2.orig.tar.gz
download-sequoia-deps: openssl-$(OPENSSL_VERSION).tar.gz gmp-$(GMP_VERSION).tar.bz2 \ download-sequoia-deps: openssl-$(OPENSSL_VERSION).tar.gz gmp-$(GMP_VERSION).tar.bz2 \
nettle-$(NETTLE_VERSION).tar.gz nettle-$(NETTLE_VERSION)-patched.tar.gz
download-etpan: libetpan.git.stamp download-etpan: libetpan.git.stamp
@ -45,6 +45,12 @@ gmp-$(GMP_VERSION).tar.bz2:
wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2
md5sum -c gmp-$(GMP_VERSION).tar.bz2.md5 md5sum -c gmp-$(GMP_VERSION).tar.bz2.md5
nettle-$(NETTLE_VERSION)-patched.tar.gz: nettle-$(NETTLE_VERSION).tar.gz
tar -xvf $<
-patch -N -p1 --reject-file=- nettle-$(NETTLE_VERSION)/configure.ac ../nettle-3.4.1-remove-so-versioning.patch
-patch -N -p1 --reject-file=- nettle-$(NETTLE_VERSION)/Makefile.in ../nettle-3.4.1-remove-so-versioning-link.patch
tar -czvf $@ nettle-$(NETTLE_VERSION)
nettle-$(NETTLE_VERSION).tar.gz: nettle-$(NETTLE_VERSION).tar.gz:
wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz
md5sum -c nettle-$(NETTLE_VERSION).tar.gz.md5 md5sum -c nettle-$(NETTLE_VERSION).tar.gz.md5

4
android/external/x86/Makefile
View File

@ -257,7 +257,7 @@ gmp-install: $(LOCAL)/lib/libgmp.so
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# NETTLE # NETTLE
nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/lib/libgmp.so
tar xvf $< tar xvf $<
mv nettle-$(NETTLE_VERSION) nettle mv nettle-$(NETTLE_VERSION) nettle
touch $@ touch $@
@ -269,8 +269,6 @@ nettle-clean:
rm -rf nettle.src.stamp rm -rf nettle.src.stamp
nettle/Makefile: nettle.src.stamp nettle/Makefile: nettle.src.stamp
-patch -N -p1 --reject-file=- nettle/configure.ac ../nettle-3.4.1-remove-so-versioning.patch
-patch -N -p1 --reject-file=- nettle/Makefile.in ../nettle-3.4.1-remove-so-versioning-link.patch
cd nettle && \ cd nettle && \
CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure \ ./configure \

4
android/external/x86_64/Makefile
View File

@ -257,7 +257,7 @@ gmp-install: $(LOCAL)/lib/libgmp.so
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# NETTLE # NETTLE
nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/lib/libgmp.so
tar xvf $< tar xvf $<
mv nettle-$(NETTLE_VERSION) nettle mv nettle-$(NETTLE_VERSION) nettle
touch $@ touch $@
@ -269,8 +269,6 @@ nettle-clean:
rm -rf nettle.src.stamp rm -rf nettle.src.stamp
nettle/Makefile: nettle.src.stamp nettle/Makefile: nettle.src.stamp
-patch -N -p1 --reject-file=- nettle/configure.ac ../nettle-3.4.1-remove-so-versioning.patch
-patch -N -p1 --reject-file=- nettle/Makefile.in ../nettle-3.4.1-remove-so-versioning-link.patch
cd nettle && \ cd nettle && \
CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure \ ./configure \

Write Preview
Loading…
Cancel
Save