aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2024-10-09 14:29:12 +0000
committerLaurent Bercot <ska@appnovation.com>2024-10-09 14:29:12 +0000
commit62f27d4ace2fe1ef37ab62bfd3673787a7cdbac2 (patch)
tree301db4e11176c8331985def0e46ff281e8c8cb6b
parent6fbe5f610abf1dada9f94672643d5fc6c01d4cfc (diff)
downloadshibari-62f27d4ace2fe1ef37ab62bfd3673787a7cdbac2.tar.gz
version: 0.0.1.2v0.0.1.2
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rwxr-xr-xpatch-for-solaris2
-rwxr-xr-xtools/gen-deps.sh11
2 files changed, 10 insertions, 3 deletions
diff --git a/patch-for-solaris b/patch-for-solaris
index fbefc32..df17cc8 100755
--- a/patch-for-solaris
+++ b/patch-for-solaris
@@ -1,4 +1,4 @@
-#!/usr/xpg4/bin/sh
+#!/usr/xpg4/bin/sh -e
patchit () {
echo '#!/usr/xpg4/bin/sh' > $1.tmp
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 27e5b3e..befe021 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -7,6 +7,8 @@ echo '# This file has been generated by tools/gen-deps.sh'
echo '#'
echo
+internal_libs=
+
for dir in src/include/${package} src/* ; do
for file in $(ls -1 $dir | grep -- \\.h$) ; do
{
@@ -70,8 +72,12 @@ for dir in $(ls -1 src | grep -v ^include) ; do
echo else
echo "lib${file}.a.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
echo endif
- echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
- echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
+ if grep -E "^LIB_DEFS [+:]=" package/targets.mak | grep -qF "$file" ; then
+ echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
+ echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
+ else
+ internal_libs="$internal_libs lib${file}.a.xyzzy"
+ fi
done
for file in $(ls -1 src/$dir/deps-exe) ; do
@@ -91,3 +97,4 @@ for dir in $(ls -1 src | grep -v ^include) ; do
echo "$file: src/$dir/$file.o$deps"
done
done
+echo "INTERNAL_LIBS :=$internal_libs"