From 6a1668bd76526335f849c68ebd6b5c2682d0b61c Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 20 Sep 2016 15:16:51 +0200 Subject: [PATCH] Fixing yajl --- astronaut/astronautpkg | 3 ++- satellites/yajl.sat | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/astronaut/astronautpkg b/astronaut/astronautpkg index 902d95f..5ad52a2 100755 --- a/astronaut/astronautpkg +++ b/astronaut/astronautpkg @@ -31,4 +31,5 @@ fi [ "$dir_wrapper_pkgtools" ] && mkdir -p "$dir_wrapper_pkgtools" || dir_wrapper_pkgtools="$_topdir" cd "$dir_install" -PATH=$PATH:/sbin $_fakeroot makepkg -l y -c n "$dir_wrapper_pkgtools/$_satname-$version-$(uname -m)-astro.tgz" +export PATH="$PATH:/sbin" +$_fakeroot makepkg -l y -c n "$dir_wrapper_pkgtools/$_satname-$version-$(uname -m)-astro.tgz" diff --git a/satellites/yajl.sat b/satellites/yajl.sat index 7596b2f..0708a73 100644 --- a/satellites/yajl.sat +++ b/satellites/yajl.sat @@ -14,6 +14,7 @@ cd "$name-$version" # Don't build the static library sed -i -e '/yajl_s/d' \ -e '/COMMAND ${CMAKE_COMMAND}/d' src/CMakeLists.txt +find . -name "CMakeLists.txt" -exec sed -i -e '/TARGET_LINK_LIBRARIES/s/yajl_s/yajl/' '{}' \; # Fix install dirs sed -i -e "s/lib\${LIB_SUFFIX}/$(safe_sed "$dir_libdir")/" \