Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports.cross
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fa2aea163348
Choose a base ref
...
head repository: haikuports/haikuports.cross
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e4cd4d5c464d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 22, 2021

  1. Fix ICU bootstrap recipe 

    - Move sparc to current version
- Build the host version to store data in shared libraries instead of
  separate datafiles. This fix a bug during the build of the
  cross-compiled version where the data files are not found (I assume
  other people who used this recipe had the data files available in the
  host system)
- Disable the tools and tests, which we don't need.
    @pulkomandy
    pulkomandy committed Oct 22, 2021
    Copy the full SHA
    e4cd4d5 View commit details
Showing with 25 additions and 25 deletions.
  1. +1 −1 dev-libs/icu_bootstrap/icu_bootstrap-57.1.recipe
  2. +24 −24 dev-libs/icu_bootstrap/icu_bootstrap-67.1.recipe
2 changes: 1 addition & 1 deletion dev-libs/icu_bootstrap/icu_bootstrap-57.1.recipe
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ PATCHES+="
"
fi

ARCHITECTURES="x86_gcc2 x86 x86_64 arm arm64 ppc riscv64 sparc m68k"
ARCHITECTURES="x86_gcc2 x86 x86_64 arm arm64 ppc riscv64 m68k"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"

PROVIDES="
48 changes: 24 additions & 24 deletions dev-libs/icu_bootstrap/icu_bootstrap-67.1.recipe
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ wrapping when displaying the text."
HOMEPAGE="http://www.icu-project.org"
COPYRIGHT="1995-2020 IBM Corporation and others."
LICENSE="ICU"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-src.tgz"
SOURCE_URI_2="https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-data.zip#noarchive"
#SOURCE_URI_3="http://www.iana.org/time-zones/repository/releases/tzdata2019c.tar.gz#noarchive"
@@ -50,7 +50,7 @@ CHECKSUM_SHA256_2="7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4
SOURCE_DIR="icu"
PATCHES="icu_bootstrap-67.1.patchset"

ARCHITECTURES="arm64 riscv64"
ARCHITECTURES="arm64 riscv64 sparc"
# leave inactive until full testing can be done
SECONDARY_ARCHITECTURES="!x86"

@@ -73,8 +73,6 @@ PROVIDES_devel="
devel:libicudata${secondaryArchSuffix} = $portVersion compat >= 67
devel:libicui18n${secondaryArchSuffix} = $portVersion compat >= 67
devel:libicuio${secondaryArchSuffix} = $portVersion compat >= 67
devel:libicutest${secondaryArchSuffix} = $portVersion compat >= 67
devel:libicutu${secondaryArchSuffix} = $portVersion compat >= 67
devel:libicuuc${secondaryArchSuffix} = $portVersion compat >= 67
"
REQUIRES_devel="
@@ -136,24 +134,28 @@ BUILD()
rm -f data/in/icudt??l.dat
autoconf

# make build-architecture-specific output directory and build ICU for the
# current architecture
mkdir -p $buildOutputDir
cd $buildOutputDir
runConfigure ../icu/source/configure \
--disable-samples --disable-extras --with-data-packaging=archive
make $jobArgs

# now make target-architecture-specific output directory and build ICU for
# the target architecture, pointing at the directory containing the version
# that's just been built for the build architecture
mkdir -p $targetOutputDir
cd $targetOutputDir
runConfigure ../icu/source/configure \
--host=$effectiveTargetMachineTriple \
--with-cross-build=$buildOutputDir \
--disable-samples --disable-extras --with-data-packaging=archive
make $jobArgs
# make build-architecture-specific output directory and build ICU for the
# current architecture. Use shared data packaging, which means it will
# be built as a .so file and loaded using the library path. This is
# needed because these tools are run during the next step without being
# installed, and the separate .dat files we normally use will not be
# found in that case.
mkdir -p $buildOutputDir
cd $buildOutputDir
runConfigure ../icu/source/configure --disable-tests \
--disable-samples --disable-extras --with-data-packaging=library
make $jobArgs

# now make target-architecture-specific output directory and build ICU for
# the target architecture, pointing at the directory containing the version
# that's just been built for the build architecture
mkdir -p $targetOutputDir
cd $targetOutputDir
runConfigure ../icu/source/configure \
--host=$effectiveTargetMachineTriple \
--with-cross-build=$buildOutputDir --disable-tools --disable-tests \
--disable-samples --disable-extras --with-data-packaging=archive
make $jobArgs
}

INSTALL()
@@ -165,8 +167,6 @@ INSTALL()
libicudata \
libicui18n \
libicuio \
libicutest \
libicutu \
libicuuc
fixPkgconfig