Add detection of ranlib and ar when crosscompiling. It's not fixing the linking probl...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d1b292e611ba41879a529882130c934c3dd2d4a7..76c14f1054826220891dea03be5acf5ea77975f2 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -631,8 +631,11 @@ flac-$(FLAC_VERSION).tar.gz:
 
 flac: flac-$(FLAC_VERSION).tar.gz
        $(EXTRACT_GZ)
+ifneq ($(HOST),$(BUILD))
+       (patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf)
+endif
 
-.FLAC: flac .ogg
+.FLAC: flac 
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install  && cd .. && make -C include install)
 #      (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && make -C libOggFLAC &&make -C libOggFLAC install && cd .. && make -C include install)
        $(INSTALL_NAME)

diff --git a/extras/contrib/src/Patches/flac-cross.patch b/extras/contrib/src/Patches/flac-cross.patch
new file mode 100644 (file)
index 0000000..1913532
--- /dev/null
+++ b/extras/contrib/src/Patches/flac-cross.patch
@@ -0,0 +1,15 @@
+--- flac-orig/configure.in     2005-11-01 19:00:02.381241515 +0100
++++ flac/configure.in  2005-11-01 19:01:50.034829963 +0100
+@@ -36,6 +36,12 @@
+ AC_PROG_CXX
+ AC_PROG_MAKE_SET
+ 
++dnl Find the right ranlib, even when cross-compiling
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
++AC_CHECK_TOOL(AR, ar, :)
++AC_CHECK_TOOL(LD, ld, :)
++
+ AC_CHECK_TYPES(socklen_t, [], [])
+ 
+ dnl check for getopt in standard library