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

PEMA-107 Move uuid patch application to downloads Makefile

pull/30/head
ignaciogarcia 3 years ago
parent
4d823359ef
commit
77d9585727
No known key found for this signature in database GPG Key ID: 5E6A455C909DD623
5 changed files with 10 additions and 9 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. 3
      android/external/arm64-v8a/Makefile
  2. 3
      android/external/armeabi-v7a/Makefile
  3. 7
      android/external/downloads/Makefile
  4. 3
      android/external/x86/Makefile
  5. 3
      android/external/x86_64/Makefile

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

@ -130,7 +130,7 @@ libetpan-clean:
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# uuid # uuid
uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig.tar.gz uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz
tar xvf $< tar xvf $<
mv uuid-1.6.2 uuid mv uuid-1.6.2 uuid
touch $@ touch $@
@ -144,7 +144,6 @@ uuid-clean:
uuid/Makefile: uuid.src.stamp uuid/Makefile: uuid.src.stamp
$(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac $(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac
cd uuid && autoconf cd uuid && autoconf
-patch -N -p1 --reject-file=- uuid/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
cp ../config.sub uuid cp ../config.sub uuid
cp ../config.guess uuid cp ../config.guess uuid
cd uuid && \ cd uuid && \

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

@ -137,7 +137,7 @@ libetpan-clean:
# using released package from debian. official ftp wasn't available today # using released package from debian. official ftp wasn't available today
uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig.tar.gz uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz
tar xvf $< tar xvf $<
mv uuid-1.6.2 uuid mv uuid-1.6.2 uuid
touch $@ touch $@
@ -151,7 +151,6 @@ uuid-clean:
uuid/Makefile: uuid.src.stamp uuid/Makefile: uuid.src.stamp
$(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac $(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac
cd uuid && autoconf cd uuid && autoconf
-patch -N -p1 --reject-file=- uuid/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
cp ../config.sub uuid cp ../config.sub uuid
cp ../config.guess uuid cp ../config.guess uuid
cd uuid && \ cd uuid && \

7
android/external/downloads/Makefile
View File

@ -20,7 +20,7 @@ downloads.stamp: download-iconv download-uuid download-sequoia-deps download-etp
download-iconv: libiconv-1.15.tar.gz 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-patched.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)-patched.tar.gz nettle-$(NETTLE_VERSION)-patched.tar.gz
@ -33,6 +33,11 @@ download-sequoia: sequoia.git.stamp
libiconv-1.15.tar.gz: libiconv-1.15.tar.gz:
wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
ossp-uuid_1.6.2.orig-patched.tar.gz: ossp-uuid_1.6.2.orig.tar.gz
tar -xvf $<
-patch -N -p1 --reject-file=- uuid-1.6.2/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
tar -czvf $@ uuid-1.6.2
ossp-uuid_1.6.2.orig.tar.gz: ossp-uuid_1.6.2.orig.tar.gz:
wget http://http.debian.net/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz wget http://http.debian.net/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz
md5sum -c ossp-uuid_1.6.2.orig.tar.gz.md5 md5sum -c ossp-uuid_1.6.2.orig.tar.gz.md5

3
android/external/x86/Makefile
View File

@ -132,7 +132,7 @@ libetpan-clean:
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# uuid # uuid
uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig.tar.gz uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz
tar xvf $< tar xvf $<
mv uuid-1.6.2 uuid mv uuid-1.6.2 uuid
touch $@ touch $@
@ -146,7 +146,6 @@ uuid-clean:
uuid/Makefile: uuid.src.stamp uuid/Makefile: uuid.src.stamp
$(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac $(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac
cd uuid && autoconf cd uuid && autoconf
-patch -N -p1 --reject-file=- uuid/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
cp ../config.sub uuid cp ../config.sub uuid
cp ../config.guess uuid cp ../config.guess uuid
cd uuid && \ cd uuid && \

3
android/external/x86_64/Makefile
View File

@ -132,7 +132,7 @@ libetpan-clean:
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# uuid # uuid
uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig.tar.gz uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz
tar xvf $< tar xvf $<
mv uuid-1.6.2 uuid mv uuid-1.6.2 uuid
touch $@ touch $@
@ -146,7 +146,6 @@ uuid-clean:
uuid/Makefile: uuid.src.stamp uuid/Makefile: uuid.src.stamp
$(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac $(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac
cd uuid && autoconf cd uuid && autoconf
-patch -N -p1 --reject-file=- uuid/libtool.m4 ../libtool-Add-Android-Linux-support-iconv.patch
cp ../config.sub uuid cp ../config.sub uuid
cp ../config.guess uuid cp ../config.guess uuid
cd uuid && \ cd uuid && \

Write Preview
Loading…
Cancel
Save