diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2013-10-21 21:38:51 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2013-10-21 21:38:51 +0200 |
| commit | 60e78c36b5e665d2ccd7b830d4c3b4b578ccbd87 (patch) | |
| tree | 34b591a18fb60eb4dfd2dbd47547c87f6e480f4e | |
| parent | 5b9b643ae6f8553cbda7ad0a88b60bfdc1fd287b (diff) | |
fixed static build of cdda
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/cdda/Makefile.am | 2 | ||||
| -rwxr-xr-x | scripts/static_build.sh | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e8d32f9b..b1faabe4 100644 --- a/configure.ac +++ b/configure.ac @@ -389,7 +389,9 @@ AS_IF([test "${enable_cdda}" != "no"], [ AS_IF([test "${enable_staticlink}" != "no"], [ HAVE_CDDAPLUGIN=yes CDDA_LIBS="../../$LIB/lib/libcdio.a ../../$LIB/lib/libudf.a ../../$LIB/lib/libiso9660.a ../../$LIB/lib/libcddb.a" + CDDA_CFLAGS="-I../../$LIB/include" AC_SUBST(CDDA_LIBS) + AC_SUBST(CDDA_CFLAGS) ], [ AC_CHECK_LIB([cdio], [main], [HAVE_CDIO=yes]) AC_CHECK_LIB([cddb], [main], [HAVE_CDDB=yes]) diff --git a/plugins/cdda/Makefile.am b/plugins/cdda/Makefile.am index 875cf9ae..fd5be951 100644 --- a/plugins/cdda/Makefile.am +++ b/plugins/cdda/Makefile.am @@ -5,5 +5,5 @@ cdda_la_SOURCES = cdda.c cdda_la_LDFLAGS = -module cdda_la_LIBADD = $(LDADD) $(CDDA_LIBS) -AM_CFLAGS = $(CFLAGS) -std=c99 +AM_CFLAGS = $(CFLAGS) -std=c99 $(CDDA_CFLAGS) endif diff --git a/scripts/static_build.sh b/scripts/static_build.sh index 221de2f4..77e4e1d4 100755 --- a/scripts/static_build.sh +++ b/scripts/static_build.sh @@ -11,11 +11,15 @@ cd ../../ ./autogen.sh export APBUILD_STATIC_LIBGCC=1 -CC=$AP/apgcc CXX=$AP/apgcc ./configure --enable-staticlink --disable-artwork-imlib2 --prefix=/opt/deadbeef +export CC=$AP/apgcc +export CXX=$AP/apgcc + +./configure --enable-staticlink --disable-artwork-imlib2 --disable-gtk3 --prefix=/opt/deadbeef sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool sed -i 's/hardcode_into_libs=yes/hardcode_into_libs=no/g' libtool make clean -make DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION -j8 install +make DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION +make DESTDIR=`pwd`/static/$ARCH/deadbeef-$VERSION install echo "building pluginfo tool..." cd tools/pluginfo |