Commit a6a0ab64 authored by Felix Paul Kühne's avatar 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.
parent bd9f861c
......@@ -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:
......
......@@ -162,6 +162,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
;;
x86_64-apple-darwin*)
SDK_TARGET=10.5
......@@ -189,6 +192,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
;;
*mingw32ce)
echo "HAVE_WINCE = 1" >> config.mak
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment