diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-08 00:53:31 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-08-08 12:14:25 -0400 |
| commit | 5cc52aa0ae255b4cb091544106488aa5a936af5a (patch) | |
| tree | 34dc6eb112d3871a8692f8875809ef0abcfee59f | |
| parent | 192181c9fd0da91f6a3ff5b679b1ba1c718bdc56 (diff) | |
[pacman]: tweak for armv7h
| -rw-r--r-- | libre/pacman/PKGBUILD | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 6e7d6c845..5349428d5 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -92,6 +92,18 @@ prepare() { local carch mycarch mychost myflags myldflags for carch in "${arch[@]}"; do case $carch in + aarch64) + mycarch="aarch64" + mychost="aarch64-unknown-linux-gnu" + myflags="-march=armv8-a " + ;; + armv7h) + mycarch="armv7h" + mychost="armv7l-unknown-linux-gnueabihf" + myflags="-march=armv7-a -mfloat-abi=hard -mfpu=neon -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -fstack-clash-protection" + ;; i686) mycarch="i686" mychost="i686-pc-linux-gnu" @@ -106,17 +118,10 @@ prepare() { -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection" ;; - armv7h) - mycarch="armv7h" - mychost="armv7l-unknown-linux-gnueabihf" - myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection" - ;; esac myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" - # set things correctly in the default conf file + # configure the per-arch default makepkg.conf files sed < "$srcdir/makepkg.conf.in" > "$srcdir/makepkg.conf.$carch" \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ @@ -144,6 +149,12 @@ build() { -Dldconfig=/usr/bin/ldconfig \ build + # FIXME: armv7h fails building doxygen + # terminate called after throwing an instance of 'ghc::filesystem::filesystem_error' + # what(): Value too large for defined data type: '/build/pacman/src' + # qemu: uncaught target signal 6 (Aborted) - core dumped + [[ "${CARCH}" != armv7h ]] || meson configure -Ddoxygen=disabled build + meson compile -C build } |