[vlc-devel] commit: contribs: fixed linking on Snow Leopard ( Felix Paul Kühne )

[git version control]

vlc | branch: 1.0-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Tue Sep  1 16:54:07 2009 +0200| [031295e5c8368c29adb8a58a0ae58bcaecd30b6c] | committer: Felix Paul Kühne 

contribs: fixed linking on Snow Leopard

As libiconv.la is no longer present on Snow Leopard, we need to remove any references to it.

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=031295e5c8368c29adb8a58a0ae58bcaecd30b6c
---

 extras/contrib/Makefile  |    8 ++++++++
 extras/contrib/bootstrap |    6 ++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 32bdf2c..6ebae19 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -38,6 +38,9 @@ all: $(TARGETALL)
 
 using-src:
 	$(MAKE) -C src
+ifdef HAVE_DARWIN_10
+	(cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%' -i.orig *.la && rm -f *.la.orig)
+endif
 
 # shortcut
 src: using-src
@@ -59,6 +62,11 @@ using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
 	(cd tmp && find . -type d) | while read dir; do mkdir -p -- "$$dir"; done
 	(cd tmp && find . -not -type d) | while read i; do mv -f -- tmp/"$$i" "$$i"; done
 	rm -rf tmp
+    # libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would
+    # result in linking issues
+ifdef HAVE_DARWIN_10
+	(cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%' -i.orig *.la && rm -f *.la.orig)
+endif
 endif
 
 clean-src:
diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 79bb06b..8ff759b 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -171,6 +171,9 @@ case $HOST in
             echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
             exit 1
         fi
+        if test $HOST="i686-apple-darwin10"; then
+            echo "HAVE_DARWIN_10 = 1" >> config.mak
+        fi
     ;;
     *-apple-darwin10)
         SDK_TARGET=10.5
@@ -194,6 +197,9 @@ case $HOST in
             echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
             exit 1
         fi
+        if test $HOST="x86_64-apple-darwin10"; then
+            echo "HAVE_DARWIN_10 = 1" >> config.mak
+        fi
     ;;
     i586-pc-beos)
         if test -f /boot/beos/system/lib/libbind.so; then