From 1cccddc05a46445c9dbb8c78f0fe7e198096bc7d Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sun, 30 Sep 2018 10:04:37 +0000
Subject: [PATCH] libnslog: !x86_gcc2, add TEST{,_REQUIRES}, simplify BUILD &
 INSTALL.

Running suite(s): Test suite for libnslog
 libnslog: Basic tests
100%: Checks: 24, Failures: 0, Errors: 0
    TEST: Testing complete
---
 dev-libs/libnslog/libnslog-0.1.0.recipe | 44 ++++++++++++++++---------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/dev-libs/libnslog/libnslog-0.1.0.recipe b/dev-libs/libnslog/libnslog-0.1.0.recipe
index e06b507e4..57a1fc8fe 100644
--- a/dev-libs/libnslog/libnslog-0.1.0.recipe
+++ b/dev-libs/libnslog/libnslog-0.1.0.recipe
@@ -9,12 +9,15 @@ REVISION="1"
 SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnslog-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="f8cc49f4fb0c8f1ebf46242e3449e5a232cae9b7925a9cabd18340cb6c2684fe"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libnslog$secondaryArchSuffix = $portVersion
-	lib:libnslog$secondaryArchSuffix = 0.1.0 compat >= 0
+	lib:libnslog$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -22,9 +25,10 @@ REQUIRES="
 
 PROVIDES_devel="
 	libnslog${secondaryArchSuffix}_devel = $portVersion
-	devel:libnslog$secondaryArchSuffix = $portVersion compat >= 0
+	devel:libnslog$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
+	libnslog$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -38,26 +42,36 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+TEST_REQUIRES="
+	cmd:pkg_config$secondaryArchSuffix
+	devel:libcheck$secondaryArchSuffix
+	"
+
 BUILD()
 {
-	# Build the static lib
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
-	# Build the shared lib
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		COMPONENT_TYPE=lib-shared
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage
+	done
 }
 
 INSTALL()
 {
-	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir
-	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir COMPONENT_TYPE=lib-shared
-
-	mkdir -p $prefix/develop/lib
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage \
+			INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir \
+			install
+	done
 
 	prepareInstalledDevelLib libnslog
 	fixPkgconfig
 
-	packageEntries devel $developDir
+	packageEntries devel \
+		"$developDir"
+}
+
+TEST()
+{
+	make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem test
 }