Commit 7569953231717bb0478977d3520aae379dbba759
2021-02-23T07:01:22
fix libraries linking
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
diff --git a/config.subr b/config.subr
index 95c52e6..50e3954 100644
--- a/config.subr
+++ b/config.subr
@@ -106,8 +106,8 @@ fi
echo "RTBUF_LIBDIR = $RTBUF_LIBDIR" >> ${CONFIG_MK}
rtbuf_library() {
- RTBUF_MODULE_LIBDIR="${RTBUF_LIBDIR}/$1"
- echo "RTBUF_MODULE_LIBDIR = $RTBUF_MODULE_LIBDIR" >> ${CONFIG_MK}
+ RTBUF_LIBRARY_LIBDIR="${RTBUF_LIBDIR}/$1"
+ echo "RTBUF_LIBRARY_LIBDIR = $RTBUF_LIBRARY_LIBDIR" >> ${CONFIG_MK}
LIBRARIES=
@@ -120,7 +120,7 @@ rtbuf_library() {
SRC_LA="$(c2la "$SRC")"
echo >> ${CONFIG_MK}
echo "$SRC_LA: $SRC_LO" >> ${CONFIG_MK}
- echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath ${RTBUF_MODULE_LIBDIR}" >> ${CONFIG_MK}
+ echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -no-undefined -module \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath ${RTBUF_LIBRARY_LIBDIR}" >> ${CONFIG_MK}
LIBRARIES="$LIBRARIES $SRC_LA"
done
@@ -130,7 +130,7 @@ rtbuf_library() {
echo >> ${CONFIG_MK}
echo "install:${LIBRARIES}" >> ${CONFIG_MK}
for LIB in $LIBRARIES; do
- echo "\t\${INSTALL} -o \${OWNER} -g \${GROUP} -m 0755 -d \${RTBUF_MODULE_LIBDIR}" >> ${CONFIG_MK}
- echo "\t\${LIBTOOL} --tag=CC --mode=install \${INSTALL} -o \${OWNER} -g \${GROUP} -m 0755 $LIB \${RTBUF_MODULE_LIBDIR}/$LIB" >> ${CONFIG_MK}
+ echo "\t\${INSTALL} -o \${OWNER} -g \${GROUP} -m 0755 -d \${RTBUF_LIBRARY_LIBDIR}" >> ${CONFIG_MK}
+ echo "\t\${LIBTOOL} --tag=CC --mode=install \${INSTALL} -o \${OWNER} -g \${GROUP} -m 0755 $LIB \${RTBUF_LIBRARY_LIBDIR}/$LIB" >> ${CONFIG_MK}
done
}
diff --git a/lib/configure b/lib/configure
index f5e90a6..94d7e2b 100755
--- a/lib/configure
+++ b/lib/configure
@@ -65,7 +65,7 @@ for SRC in $SOURCES; do
SRC_LA="librtbuf_$(c2la "$SRC")"
echo >> ${CONFIG_MK}
echo "$SRC_LA: $SRC_LO" >> ${CONFIG_MK}
- echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -shared \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath $LIBDIR" >> ${CONFIG_MK}
+ echo "\t${LIBTOOL} --tag=CC --mode=link \${CC} -shared \${LDFLAGS} $SRC_LO \${LIBS} -o $SRC_LA -rpath \${LIBDIR}" >> ${CONFIG_MK}
LIBRARIES="$LIBRARIES $SRC_LA"
done
diff --git a/lib/portaudio/configure b/lib/portaudio/configure
index e139973..969d39d 100755
--- a/lib/portaudio/configure
+++ b/lib/portaudio/configure
@@ -25,7 +25,8 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
LDFLAGS=""
echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
-LIBS="$(pkg-config --libs portaudio-2.0)"
+LIBS="../librtbuf_signal.la"
+LIBS="$LIBS $(pkg-config --libs portaudio-2.0)"
echo "LIBS = $LIBS" >> ${CONFIG_MK}
rtbuf_library portaudio
diff --git a/lib/signal/configure b/lib/signal/configure
index 0c2863c..ae9f7f7 100755
--- a/lib/signal/configure
+++ b/lib/signal/configure
@@ -22,7 +22,7 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
LDFLAGS=""
echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
-LIBS=""
+LIBS="../librtbuf_signal.la -lm"
echo "LIBS = $LIBS" >> ${CONFIG_MK}
rtbuf_library signal
diff --git a/lib/sndio/configure b/lib/sndio/configure
index 26217ef..fd0b467 100755
--- a/lib/sndio/configure
+++ b/lib/sndio/configure
@@ -22,7 +22,7 @@ echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
LDFLAGS=""
echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
-LIBS="-lsndio"
+LIBS="-lsndio ../librtbuf_signal.la"
echo "LIBS = $LIBS" >> ${CONFIG_MK}
rtbuf_library sndio