Skip to content

Commit

Permalink
Fix soname of android-*-icu, update version and rebuild boost against it
Browse files Browse the repository at this point in the history
  • Loading branch information
@Martchus
Martchus committed Jan 13, 2025
1 parent d986536 commit e7155b2
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 57 deletions.
2 changes: 1 addition & 1 deletion boost/android-aarch64/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
_android_arch=aarch64
pkgname=android-${_android_arch}-boost
pkgver=1.87.0
pkgrel=1
pkgrel=2
_srcname=boost_${pkgver//./_}
arch=('any')
pkgdesc="Free peer-reviewed portable C++ source libraries (Android, ${_android_arch})"
Expand Down
2 changes: 1 addition & 1 deletion boost/android-armv7a-eabi/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
_android_arch=armv7a-eabi
pkgname=android-${_android_arch}-boost
pkgver=1.87.0
pkgrel=1
pkgrel=2
_srcname=boost_${pkgver//./_}
arch=('any')
pkgdesc="Free peer-reviewed portable C++ source libraries (Android, ${_android_arch})"
Expand Down
2 changes: 1 addition & 1 deletion boost/android-x86-64/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
_android_arch=x86-64
pkgname=android-${_android_arch}-boost
pkgver=1.87.0
pkgrel=1
pkgrel=2
_srcname=boost_${pkgver//./_}
arch=('any')
pkgdesc="Free peer-reviewed portable C++ source libraries (Android, ${_android_arch})"
Expand Down
2 changes: 1 addition & 1 deletion boost/android-x86/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
_android_arch=x86
pkgname=android-${_android_arch}-boost
pkgver=1.87.0
pkgrel=1
pkgrel=2
_srcname=boost_${pkgver//./_}
arch=('any')
pkgdesc="Free peer-reviewed portable C++ source libraries (Android, ${_android_arch})"
Expand Down
18 changes: 0 additions & 18 deletions icu/android-aarch64/0001-Unversioned-libs.patch
View file

This file was deleted.

19 changes: 11 additions & 8 deletions icu/android-aarch64/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
_android_arch=aarch64

pkgname=android-${_android_arch}-icu
pkgver=75.1
pkgver=76.1
pkgrel=1
arch=('any')
pkgdesc="International Components for Unicode library (Android ${_android_arch})"
Expand All @@ -20,20 +20,22 @@ license=('custom')
url="https://icu.unicode.org/"
source=("https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz"{,.asc}
"0001-Unversioned-libs.patch")
sha256sums=('cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef'
sha256sums=('dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e'
'SKIP'
'8a49d3231bfb2aff95d1f82c21af8183423692b020a883de7a347c60446d3b36')
validpgpkeys=("FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7"
"3DA35301A7C330257B8755754058F67406EAA6AB"
"0E51E7F06EF719FBD072782A5F56E5AFA63CCD33"
"4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0")
"4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0"
"E52F07877A5805F9AF4AB0ACD46C5610D06E7001")

prepare() {
cd "${srcdir}/icu"

patch -p1 -i ../0001-Unversioned-libs.patch

cd source
cd "${srcdir}/icu/source"
find -iname 'Makefile*' -o -iname '*.mk.in' -exec sed -i \
-e 's|SO_TARGET_VERSION = .*|SO_TARGET_VERSION = ""|g' \
-e 's|SO_TARGET_VERSION_MAJOR = .*|SO_TARGET_VERSION_MAJOR = ""|g' \
-e 's|FINAL_SO_TARGET = .*|FINAL_SO_TARGET = $(SO_TARGET)|g' \
-e 's|MIDDLE_SO_TARGET = .*|MIDDLE_SO_TARGET = $(SO_TARGET)|g' {} \+
autoreconf -fi
}

Expand Down Expand Up @@ -64,6 +66,7 @@ build() {
--with-cross-build="${PWD}/nativebuild" \
--with-data-packaging=library \
--disable-rpath \
--disable-renaming \
--enable-release \
--disable-extras \
--disable-tools \
Expand Down
1 change: 0 additions & 1 deletion icu/android-armv7a-eabi/0001-Unversioned-libs.patch
View file

This file was deleted.

19 changes: 11 additions & 8 deletions icu/android-armv7a-eabi/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
_android_arch=armv7a-eabi

pkgname=android-${_android_arch}-icu
pkgver=75.1
pkgver=76.1
pkgrel=1
arch=('any')
pkgdesc="International Components for Unicode library (Android ${_android_arch})"
Expand All @@ -20,20 +20,22 @@ license=('custom')
url="https://icu.unicode.org/"
source=("https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz"{,.asc}
"0001-Unversioned-libs.patch")
sha256sums=('cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef'
sha256sums=('dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e'
'SKIP'
'8a49d3231bfb2aff95d1f82c21af8183423692b020a883de7a347c60446d3b36')
validpgpkeys=("FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7"
"3DA35301A7C330257B8755754058F67406EAA6AB"
"0E51E7F06EF719FBD072782A5F56E5AFA63CCD33"
"4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0")
"4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0"
"E52F07877A5805F9AF4AB0ACD46C5610D06E7001")

prepare() {
cd "${srcdir}/icu"

patch -p1 -i ../0001-Unversioned-libs.patch

cd source
cd "${srcdir}/icu/source"
find -iname 'Makefile*' -o -iname '*.mk.in' -exec sed -i \
-e 's|SO_TARGET_VERSION = .*|SO_TARGET_VERSION = ""|g' \
-e 's|SO_TARGET_VERSION_MAJOR = .*|SO_TARGET_VERSION_MAJOR = ""|g' \
-e 's|FINAL_SO_TARGET = .*|FINAL_SO_TARGET = $(SO_TARGET)|g' \
-e 's|MIDDLE_SO_TARGET = .*|MIDDLE_SO_TARGET = $(SO_TARGET)|g' {} \+
autoreconf -fi
}

Expand Down Expand Up @@ -64,6 +66,7 @@ build() {
--with-cross-build="${PWD}/nativebuild" \
--with-data-packaging=library \
--disable-rpath \
--disable-renaming \
--enable-release \
--disable-extras \
--disable-tools \
Expand Down
1 change: 0 additions & 1 deletion icu/android-x86-64/0001-Unversioned-libs.patch
View file

This file was deleted.

19 changes: 11 additions & 8 deletions icu/android-x86-64/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
_android_arch=x86-64

pkgname=android-${_android_arch}-icu
pkgver=75.1
pkgver=76.1
pkgrel=1
arch=('any')
pkgdesc="International Components for Unicode library (Android ${_android_arch})"
Expand All @@ -20,20 +20,22 @@ license=('custom')
url="https://icu.unicode.org/"
source=("https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz"{,.asc}
"0001-Unversioned-libs.patch")
sha256sums=('cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef'
sha256sums=('dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e'
'SKIP'
'8a49d3231bfb2aff95d1f82c21af8183423692b020a883de7a347c60446d3b36')
validpgpkeys=("FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7"
"3DA35301A7C330257B8755754058F67406EAA6AB"
"0E51E7F06EF719FBD072782A5F56E5AFA63CCD33"
"4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0")
"4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0"
"E52F07877A5805F9AF4AB0ACD46C5610D06E7001")

prepare() {
cd "${srcdir}/icu"

patch -p1 -i ../0001-Unversioned-libs.patch

cd source
cd "${srcdir}/icu/source"
find -iname 'Makefile*' -o -iname '*.mk.in' -exec sed -i \
-e 's|SO_TARGET_VERSION = .*|SO_TARGET_VERSION = ""|g' \
-e 's|SO_TARGET_VERSION_MAJOR = .*|SO_TARGET_VERSION_MAJOR = ""|g' \
-e 's|FINAL_SO_TARGET = .*|FINAL_SO_TARGET = $(SO_TARGET)|g' \
-e 's|MIDDLE_SO_TARGET = .*|MIDDLE_SO_TARGET = $(SO_TARGET)|g' {} \+
autoreconf -fi
}

Expand Down Expand Up @@ -64,6 +66,7 @@ build() {
--with-cross-build="${PWD}/nativebuild" \
--with-data-packaging=library \
--disable-rpath \
--disable-renaming \
--enable-release \
--disable-extras \
--disable-tools \
Expand Down
1 change: 0 additions & 1 deletion icu/android-x86/0001-Unversioned-libs.patch
View file

This file was deleted.

19 changes: 11 additions & 8 deletions icu/android-x86/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
_android_arch=x86

pkgname=android-${_android_arch}-icu
pkgver=75.1
pkgver=76.1
pkgrel=1
arch=('any')
pkgdesc="International Components for Unicode library (Android ${_android_arch})"
Expand All @@ -20,20 +20,22 @@ license=('custom')
url="https://icu.unicode.org/"
source=("https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz"{,.asc}
"0001-Unversioned-libs.patch")
sha256sums=('cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef'
sha256sums=('dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e'
'SKIP'
'8a49d3231bfb2aff95d1f82c21af8183423692b020a883de7a347c60446d3b36')
validpgpkeys=("FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7"
"3DA35301A7C330257B8755754058F67406EAA6AB"
"0E51E7F06EF719FBD072782A5F56E5AFA63CCD33"
"4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0")
"4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0"
"E52F07877A5805F9AF4AB0ACD46C5610D06E7001")

prepare() {
cd "${srcdir}/icu"

patch -p1 -i ../0001-Unversioned-libs.patch

cd source
cd "${srcdir}/icu/source"
find -iname 'Makefile*' -o -iname '*.mk.in' -exec sed -i \
-e 's|SO_TARGET_VERSION = .*|SO_TARGET_VERSION = ""|g' \
-e 's|SO_TARGET_VERSION_MAJOR = .*|SO_TARGET_VERSION_MAJOR = ""|g' \
-e 's|FINAL_SO_TARGET = .*|FINAL_SO_TARGET = $(SO_TARGET)|g' \
-e 's|MIDDLE_SO_TARGET = .*|MIDDLE_SO_TARGET = $(SO_TARGET)|g' {} \+
autoreconf -fi
}

Expand Down Expand Up @@ -64,6 +66,7 @@ build() {
--with-cross-build="${PWD}/nativebuild" \
--with-data-packaging=library \
--disable-rpath \
--disable-renaming \
--enable-release \
--disable-extras \
--disable-tools \
Expand Down

0 comments on commit e7155b2

Please sign in to comment.