From bbb550d1210289966da2bb56e090c39f22e5469d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 10 Sep 2017 09:58:06 +0200 Subject: [PATCH] liblayout: copy the right library uname -p is "x86" even on x86_gcc2 installs, and won't handle secondary architecture properly anyway. Use haikuports provided $targetArchitecture, which I think is the right thing to do here. --- haiku-libs/liblayout/liblayout-1.4.1.recipe | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/haiku-libs/liblayout/liblayout-1.4.1.recipe b/haiku-libs/liblayout/liblayout-1.4.1.recipe index 402870dde..66f525360 100644 --- a/haiku-libs/liblayout/liblayout-1.4.1.recipe +++ b/haiku-libs/liblayout/liblayout-1.4.1.recipe @@ -14,15 +14,15 @@ Features: WARNING: This library is old and not intended for new development. It is only \ around to support legacy apps that have not migrated to the Haiku layout kit." HOMEPAGE="https://web.archive.org/web/20071227072934/http://www.xs4all.nl:80/~marcone/be.html" -COMMIT="ecec357a1ed455ddeaf66e0f8f87cbff591c52dd" -CHECKSUM_SHA256="efa2bf204cb2bf99b5f635c3db66aa654f77e97241163f6566da491f3eb5b60d" -SOURCE_URI="https://github.com/diversys/liblayout/archive/$COMMIT.tar.gz" +COMMIT="6388c704c1f816d24bf266fe15d74f642bbf5fae" +CHECKSUM_SHA256="b225631900696dd8dcdfde25f211b2db3d09978f12039c3a68bf17c7c3f415bd" +SOURCE_URI="https://github.com/pulkomandy/liblayout/archive/$COMMIT.tar.gz" SOURCE_DIR="liblayout-$COMMIT" COPYRIGHT="1996-2003 Marco Nelissen" LICENSE="LIBLAYOUT" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2" +SECONDARY_ARCHITECTURES="x86 ?x86_gcc2" PROVIDES=" liblayout$secondaryArchSuffix = $portVersion compat >= 1.4 @@ -54,7 +54,7 @@ BUILD() INSTALL() { mkdir -p $libDir - cp `uname -p`/liblayout.so $libDir + cp $targetArchitecture/liblayout.so $libDir mkdir -p $includeDir/liblayout cp headers/*.h $includeDir/liblayout