diff options
| author | rhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9> | 2008-09-03 03:46:06 +0000 |
|---|---|---|
| committer | rhatto <rhatto@18ef50b8-d735-4ccd-97c1-689132df3dd9> | 2008-09-03 03:46:06 +0000 |
| commit | 36765ff8fda0ca2f697346e2df6992cd418a1638 (patch) | |
| tree | d14a63fe8b770eff5b39997901c64a2e1518fe3f /media/radio | |
| parent | 17c3a82477e83d840b345ee88689cc68c5199195 (diff) | |
| download | mkbuilds-36765ff8fda0ca2f697346e2df6992cd418a1638.tar.gz mkbuilds-36765ff8fda0ca2f697346e2df6992cd418a1638.tar.bz2 | |
merging with changes made since 21th May
git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@232 18ef50b8-d735-4ccd-97c1-689132df3dd9
Diffstat (limited to 'media/radio')
| -rw-r--r-- | media/radio/gnuradio/gnuradio.mkbuild | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/media/radio/gnuradio/gnuradio.mkbuild b/media/radio/gnuradio/gnuradio.mkbuild index dcda3a5..45d3e8e 100644 --- a/media/radio/gnuradio/gnuradio.mkbuild +++ b/media/radio/gnuradio/gnuradio.mkbuild @@ -44,7 +44,7 @@ # # Install script -[[REST OF DOINST.SH]]="config etc/gnuradio/conf.d/gnuradio-core.conf.new ; config etc/gnuradio/conf.d/gr-audio-alsa.conf.new ; config etc/gnuradio/conf.d/gr-audio-jack.new ; etc/gnuradio/conf.d/gr-audio-oss.conf.new ; config etc/gnuradio/conf.d/gr-wxgui.conf.new" +[[REST OF DOINST.SH]]="config etc/gnuradio/conf.d/gnuradio-core.conf.new ; config etc/gnuradio/conf.d/gr-audio-alsa.conf.new ; config etc/gnuradio/conf.d/gr-audio-jack.conf.new ; etc/gnuradio/conf.d/gr-audio-oss.conf.new ; config etc/gnuradio/conf.d/gr-wxgui.conf.new" # # Default enable sections: @@ -83,23 +83,14 @@ off: compress_info_files #------------------ #>configure -# get boost version -boost="`basename $(ls /var/log/packages/boost-[0-9]* 2> /dev/null)`" - -if [ -z "$boost" ]; then - echo Error: missing boost package - exit $ERROR_CONF -fi - -pack="`basename $boost | sed -e 's/-[^-]*-[^-]*-[^-]*$//'`" -boost_version="`echo $boost | sed -e "s/^$pack-//" | cut -d "-" -f 1 | \ - sed -e 's/\./_/g' -e 's/\([0-9]\+\)_\([0-9]\+\)_0/\1_\2/'`" - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" --sysconfdir=/etc \ - --with-boost-include-dir=/usr/include/boost-$boost_version $CONF_OPTIONS || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" --sysconfdir=/etc $CONF_OPTIONS || exit $ERROR_CONF + +if [ "$ARCH" == "x86_64" ] && [ "$PKG_VERSION" == "3.1.2" ]; then + sed -i -e 's/-L\/usr\/lib /-L\/usr\/lib64 /g' gr-audio-alsa/src/Makefile +fi #<configure #>slackdesc |